Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-8677: Fix broken build

This commit is contained in:
anshum 2016-02-18 18:05:11 -08:00
parent 8fe946bde2
commit c7c5b8fe49
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
View File

@ -498,7 +498,7 @@ public class CollectionsHandler extends RequestHandlerBase {
final String newShardName = req.getParams().get(SHARD_ID_PROP); final String newShardName = req.getParams().get(SHARD_ID_PROP);
if (!SolrIdentifierValidator.validateShardName(newShardName)) { if (!SolrIdentifierValidator.validateShardName(newShardName)) {
throw new SolrException(ErrorCode.BAD_REQUEST, "Invalid shard: " + 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))) 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"); throw new SolrException(ErrorCode.BAD_REQUEST, "shards can be added only to 'implicit' collections");
@ -985,7 +985,7 @@ public class CollectionsHandler extends RequestHandlerBase {
for (String shard : shardsParam.split(",")) { for (String shard : shardsParam.split(",")) {
if (!SolrIdentifierValidator.validateShardName(shard)) if (!SolrIdentifierValidator.validateShardName(shard))
throw new SolrException(ErrorCode.BAD_REQUEST, "Invalid shard: " + 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");;
} }
} }

8
solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
View File

@ -300,7 +300,7 @@ public abstract class CollectionAdminRequest <Q extends CollectionAdminRequest<Q
/** /**
* Provide the name of the shards to be created, separated by commas * 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. * @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(",")) { for (String shard : shards.split(",")) {
if (!SolrIdentifierValidator.validateShardName(shard)) { if (!SolrIdentifierValidator.validateShardName(shard)) {
throw new IllegalArgumentException("Invalid shard: " + 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; this.shards = shards;
@ -448,7 +448,7 @@ public abstract class CollectionAdminRequest <Q extends CollectionAdminRequest<Q
/** /**
* Provide the name of the shard to be created. * 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. * @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) { public CreateShard setShardName(String shardName) {
if (!SolrIdentifierValidator.validateShardName(shardName)) { if (!SolrIdentifierValidator.validateShardName(shardName)) {
throw new IllegalArgumentException("Invalid shard: " + 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; this.shardName = shardName;
return this; return this;