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/12/22 17:58:45 UTC
[2/3] lucene-solr:branch_5x: Revert "SOLR-8677: Fix broken build"
Revert "SOLR-8677: Fix broken build"
This reverts commit 55162f2255a1f707603cc81134996cfb2a5968ec.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/69a8aa77
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/69a8aa77
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/69a8aa77
Branch: refs/heads/branch_5x
Commit: 69a8aa77e36216b329dc159c391ad2f0155de740
Parents: 7415d10
Author: anshum <an...@apache.org>
Authored: Wed Dec 21 12:24:09 2016 -0800
Committer: anshum <an...@apache.org>
Committed: Wed Dec 21 12:24:09 2016 -0800
----------------------------------------------------------------------
.../org/apache/solr/client/solrj/request/CoreAdminRequest.java | 4 ++--
.../org/apache/solr/client/solrj/request/TestCoreAdmin.java | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/69a8aa77/solr/solrj/src/java/org/apache/solr/client/solrj/request/CoreAdminRequest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/CoreAdminRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/CoreAdminRequest.java
index c1f986e..2a2d4ae 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/CoreAdminRequest.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/CoreAdminRequest.java
@@ -111,7 +111,7 @@ public class CoreAdminRequest extends SolrRequest<CoreAdminResponse> {
@Override
public void setCoreName(String coreName) {
if (!SolrIdentifierValidator.validateCoreName(coreName)) {
- throw new IllegalArgumentException("Invalid core: " + coreName
+ throw new IllegalArgumentException("Invalid collection: " + coreName
+ ". Core names must consist entirely of periods, underscores, and alphanumerics");
}
this.core = coreName;
@@ -560,7 +560,7 @@ public class CoreAdminRequest extends SolrRequest<CoreAdminResponse> {
public static CoreAdminResponse renameCore(String coreName, String newName, SolrClient client )
throws SolrServerException, IOException {
if (!SolrIdentifierValidator.validateCoreName(newName)) {
- throw new IllegalArgumentException("Invalid core: " + newName
+ throw new IllegalArgumentException("Invalid collection: " + newName
+ ". Core names must consist entirely of periods, underscores, and alphanumerics");
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/69a8aa77/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java
index 143d2c3..8275ff1 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java
@@ -171,7 +171,7 @@ public class TestCoreAdmin extends AbstractEmbeddedSolrServerTestCase {
final String exceptionMessage = e.getMessage();
assertTrue(exceptionMessage.contains("Invalid core"));
assertTrue(exceptionMessage.contains("invalid$core@name"));
- assertTrue(exceptionMessage.contains("must consist entirely of periods, underscores, and alphanumerics"));
+ assertTrue(exceptionMessage.contains("must consist entirely of periods, underscores and alphanumerics"));
}
}
@@ -182,9 +182,9 @@ public class TestCoreAdmin extends AbstractEmbeddedSolrServerTestCase {
fail();
} catch (IllegalArgumentException e) {
final String exceptionMessage = e.getMessage();
- assertTrue(e.getMessage(), exceptionMessage.contains("Invalid core"));
+ assertTrue(exceptionMessage.contains("Invalid core"));
assertTrue(exceptionMessage.contains("invalid$core@name"));
- assertTrue(exceptionMessage.contains("must consist entirely of periods, underscores, and alphanumerics"));
+ assertTrue(exceptionMessage.contains("must consist entirely of periods, underscores and alphanumerics"));
}
}