You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by an...@apache.org on 2016/03/03 22:23:25 UTC
[2/2] lucene-solr git commit: SOLR-8725: Fix precommit check
SOLR-8725: Fix precommit check
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/73d2d112
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/73d2d112
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/73d2d112
Branch: refs/heads/branch_6x
Commit: 73d2d1125f43d6f482b0be7ecfccd673d1fe6d41
Parents: 7e59ba4
Author: anshum <an...@apache.org>
Authored: Thu Mar 3 13:03:31 2016 -0800
Committer: anshum <an...@apache.org>
Committed: Thu Mar 3 13:22:42 2016 -0800
----------------------------------------------------------------------
.../solr/client/solrj/util/SolrIdentifierValidator.java | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/73d2d112/solr/solrj/src/java/org/apache/solr/client/solrj/util/SolrIdentifierValidator.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/util/SolrIdentifierValidator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/util/SolrIdentifierValidator.java
index 2b1f3b5..449c621 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/util/SolrIdentifierValidator.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/util/SolrIdentifierValidator.java
@@ -1,7 +1,3 @@
-package org.apache.solr.client.solrj.util;
-
-import java.util.regex.Pattern;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -18,6 +14,10 @@ import java.util.regex.Pattern;
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package org.apache.solr.client.solrj.util;
+
+import java.util.Locale;
+import java.util.regex.Pattern;
/**
* Ensures that provided identifiers align with Solr's recommendations/requirements for choosing
@@ -52,7 +52,8 @@ public class SolrIdentifierValidator {
}
public static String getIdentifierMessage(IdentifierType identifierType, String name) {
- return "Invalid " + identifierType.toString().toLowerCase() + ": " + name + ". " + identifierType.toString().toLowerCase()
+ return "Invalid " + identifierType.toString().toLowerCase(Locale.ROOT) + ": " + name + ". "
+ + identifierType.toString().toLowerCase(Locale.ROOT)
+ " names must consist entirely of periods, underscores, hyphens, and alphanumerics";
}
Re: [2/2] lucene-solr git commit: SOLR-8725: Fix precommit check
Posted by Anshum Gupta <an...@apache.org>.
fixed
On Thu, Mar 3, 2016 at 1:23 PM, <an...@apache.org> wrote:
> SOLR-8725: Fix precommit check
>
>
> Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
> Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/73d2d112
> Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/73d2d112
> Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/73d2d112
>
> Branch: refs/heads/branch_6x
> Commit: 73d2d1125f43d6f482b0be7ecfccd673d1fe6d41
> Parents: 7e59ba4
> Author: anshum <an...@apache.org>
> Authored: Thu Mar 3 13:03:31 2016 -0800
> Committer: anshum <an...@apache.org>
> Committed: Thu Mar 3 13:22:42 2016 -0800
>
> ----------------------------------------------------------------------
> .../solr/client/solrj/util/SolrIdentifierValidator.java | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
> ----------------------------------------------------------------------
>
>
>
> http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/73d2d112/solr/solrj/src/java/org/apache/solr/client/solrj/util/SolrIdentifierValidator.java
> ----------------------------------------------------------------------
> diff --git
> a/solr/solrj/src/java/org/apache/solr/client/solrj/util/SolrIdentifierValidator.java
> b/solr/solrj/src/java/org/apache/solr/client/solrj/util/SolrIdentifierValidator.java
> index 2b1f3b5..449c621 100644
> ---
> a/solr/solrj/src/java/org/apache/solr/client/solrj/util/SolrIdentifierValidator.java
> +++
> b/solr/solrj/src/java/org/apache/solr/client/solrj/util/SolrIdentifierValidator.java
> @@ -1,7 +1,3 @@
> -package org.apache.solr.client.solrj.util;
> -
> -import java.util.regex.Pattern;
> -
> /*
> * Licensed to the Apache Software Foundation (ASF) under one or more
> * contributor license agreements. See the NOTICE file distributed with
> @@ -18,6 +14,10 @@ import java.util.regex.Pattern;
> * See the License for the specific language governing permissions and
> * limitations under the License.
> */
> +package org.apache.solr.client.solrj.util;
> +
> +import java.util.Locale;
> +import java.util.regex.Pattern;
>
> /**
> * Ensures that provided identifiers align with Solr's
> recommendations/requirements for choosing
> @@ -52,7 +52,8 @@ public class SolrIdentifierValidator {
> }
>
> public static String getIdentifierMessage(IdentifierType
> identifierType, String name) {
> - return "Invalid " + identifierType.toString().toLowerCase() + ": "
> + name + ". " + identifierType.toString().toLowerCase()
> + return "Invalid " +
> identifierType.toString().toLowerCase(Locale.ROOT) + ": " + name + ". "
> + + identifierType.toString().toLowerCase(Locale.ROOT)
> + " names must consist entirely of periods, underscores,
> hyphens, and alphanumerics";
>
> }
>
>