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/02/19 08:53:50 UTC
[3/4] lucene-solr git commit: SOLR-8677: Fix broken build
SOLR-8677: Fix broken build
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/9b9a64a9
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/9b9a64a9
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/9b9a64a9
Branch: refs/heads/branch_5x
Commit: 9b9a64a9d6a6b334c93ae18dbc8da534f4198b22
Parents: 55162f2
Author: anshum <an...@apache.org>
Authored: Thu Feb 18 18:05:11 2016 -0800
Committer: anshum <an...@apache.org>
Committed: Thu Feb 18 23:53:19 2016 -0800
----------------------------------------------------------------------
.../org/apache/solr/handler/admin/CollectionsHandler.java | 4 ++--
.../solr/client/solrj/request/CollectionAdminRequest.java | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9b9a64a9/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
index 1f3680a..af6a1b6 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
@@ -486,7 +486,7 @@ public class CollectionsHandler extends RequestHandlerBase {
final String newShardName = req.getParams().get(SHARD_ID_PROP);
if (!SolrIdentifierValidator.validateShardName(newShardName)) {
throw new SolrException(ErrorCode.BAD_REQUEST, "Invalid shard: " + newShardName
- + ". Shard names must consist entirely of periods, underscores and alphanumerics");
+ + ". Shard names must consist entirely of periods, underscores, and alphanumerics");
}
if (!ImplicitDocRouter.NAME.equals(((Map) clusterState.getCollection(req.getParams().get(COLLECTION_PROP)).get(DOC_ROUTER)).get(NAME)))
throw new SolrException(ErrorCode.BAD_REQUEST, "shards can be added only to 'implicit' collections");
@@ -918,7 +918,7 @@ public class CollectionsHandler extends RequestHandlerBase {
for (String shard : shardsParam.split(",")) {
if (!SolrIdentifierValidator.validateShardName(shard))
throw new SolrException(ErrorCode.BAD_REQUEST, "Invalid shard: " + shard
- + ". Shard names must consist entirely of periods, underscores and alphanumerics");;
+ + ". Shard names must consist entirely of periods, underscores, and alphanumerics");;
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9b9a64a9/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
index 700954f..441be5d 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
@@ -300,7 +300,7 @@ public abstract class CollectionAdminRequest <Q extends CollectionAdminRequest<Q
/**
* Provide the name of the shards to be created, separated by commas
*
- * Shard names must consist entirely of periods, underscores and alphanumerics. Other characters are not allowed.
+ * Shard names must consist entirely of periods, underscores, and alphanumerics. Other characters are not allowed.
*
* @throws IllegalArgumentException if any of the shard names contain invalid characters.
*/
@@ -308,7 +308,7 @@ public abstract class CollectionAdminRequest <Q extends CollectionAdminRequest<Q
for (String shard : shards.split(",")) {
if (!SolrIdentifierValidator.validateShardName(shard)) {
throw new IllegalArgumentException("Invalid shard: " + shard
- + ". Shard names must consist entirely of periods, underscores and alphanumerics");
+ + ". Shard names must consist entirely of periods, underscores, and alphanumerics");
}
}
this.shards = shards;
@@ -448,7 +448,7 @@ public abstract class CollectionAdminRequest <Q extends CollectionAdminRequest<Q
/**
* Provide the name of the shard to be created.
*
- * Shard names must consist entirely of periods, underscores and alphanumerics. Other characters are not allowed.
+ * Shard names must consist entirely of periods, underscores, and alphanumerics. Other characters are not allowed.
*
* @throws IllegalArgumentException if the shard name contains invalid characters.
*/
@@ -456,7 +456,7 @@ public abstract class CollectionAdminRequest <Q extends CollectionAdminRequest<Q
public CreateShard setShardName(String shardName) {
if (!SolrIdentifierValidator.validateShardName(shardName)) {
throw new IllegalArgumentException("Invalid shard: " + shardName
- + ". Shard names must consist entirely of periods, underscores and alphanumerics");
+ + ". Shard names must consist entirely of periods, underscores, and alphanumerics");
}
this.shardName = shardName;
return this;