You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2016/09/16 07:28:11 UTC
[2/2] lucene-solr:apiv2: SOLR-8029:test failure addressed
SOLR-8029:test failure addressed
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/befedca2
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/befedca2
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/befedca2
Branch: refs/heads/apiv2
Commit: befedca2d63a1abdd7989f75d9e2af0678a2b96d
Parents: 9d18a53
Author: Noble Paul <no...@apache.org>
Authored: Fri Sep 16 12:57:59 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Fri Sep 16 12:57:59 2016 +0530
----------------------------------------------------------------------
solr/core/src/java/org/apache/solr/api/ApiBag.java | 8 ++++----
.../test/org/apache/solr/handler/admin/TestApiFramework.java | 7 +++----
2 files changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/befedca2/solr/core/src/java/org/apache/solr/api/ApiBag.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/api/ApiBag.java b/solr/core/src/java/org/apache/solr/api/ApiBag.java
index 8077485..44449a0 100644
--- a/solr/core/src/java/org/apache/solr/api/ApiBag.java
+++ b/solr/core/src/java/org/apache/solr/api/ApiBag.java
@@ -214,19 +214,19 @@ public class ApiBag {
ValidatingJsonMap result = map;
ValidatingJsonMap cmds = result.getMap("commands", null);
if (cmds != null) {
- Map comands2BReplaced = new ValidatingJsonMap();
+ Map commands2BReplaced = new ValidatingJsonMap();
for (Object o : cmds.keySet()) {
Object val = cmds.get(o);
if (val instanceof String) {
String s = (String) val;
ValidatingJsonMap cmdSpec = getResource(APISPEC_LOCATION + s + ".json");
- comands2BReplaced.put(o.toString(), cmdSpec);
+ commands2BReplaced.put(o.toString(), cmdSpec);
}
}
- if (!comands2BReplaced.isEmpty()) {
+ if (!commands2BReplaced.isEmpty()) {
ValidatingJsonMap mapCopy = ValidatingJsonMap.getDeepCopy(result, 4, true);
- mapCopy.getMap("commands", NOT_NULL).putAll(comands2BReplaced);
+ mapCopy.getMap("commands", NOT_NULL).putAll(commands2BReplaced);
result = ValidatingJsonMap.getDeepCopy(mapCopy, 4, false);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/befedca2/solr/core/src/test/org/apache/solr/handler/admin/TestApiFramework.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/TestApiFramework.java b/solr/core/src/test/org/apache/solr/handler/admin/TestApiFramework.java
index d674e5d..4e7b182 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/TestApiFramework.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/TestApiFramework.java
@@ -95,15 +95,14 @@ public class TestApiFramework extends SolrTestCaseJ4 {
parts = new HashMap<>();
- api = V2HttpCall.getApiInfo(containerHandlers, "/collections/hello/shards/shard1/replica1", "POST",
+ api = V2HttpCall.getApiInfo(containerHandlers, "/collections/hello", "POST",
mockCC, "collections", null, parts);
assertConditions(api.getSpec(), Utils.makeMap(
"/methods[0]", "POST",
- "/commands/set-property", NOT_NULL
+ "/commands/add-replica-property", NOT_NULL,
+ "/commands/delete-replica-property", NOT_NULL
));
assertEquals("hello", parts.get("collection"));
- assertEquals("shard1", parts.get("shard"));
- assertEquals("replica1", parts.get("replica"));
api = V2HttpCall.getApiInfo(containerHandlers, "/collections/hello/shards/shard1/replica1", "DELETE",
mockCC, "collections", null, parts);