lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sar...@apache.org
Subject lucene-solr:apiv2: SOLR-8029: API spec resource names: s/commands/Commands/
Date Sun, 24 Jul 2016 22:19:30 GMT
Repository: lucene-solr
Updated Branches:
  refs/heads/apiv2 f9f148fb7 -> 003f9b74a


SOLR-8029: API spec resource names: s/commands/Commands/


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/003f9b74
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/003f9b74
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/003f9b74

Branch: refs/heads/apiv2
Commit: 003f9b74a55d73473d8f58670f09c5abd4253c96
Parents: f9f148f
Author: Steve Rowe <sarowe@gmail.com>
Authored: Sun Jul 24 18:15:42 2016 -0400
Committer: Steve Rowe <sarowe@gmail.com>
Committed: Sun Jul 24 18:15:42 2016 -0400

----------------------------------------------------------------------
 .../handler/admin/ConfigSetsHandlerApi.java     |  2 +-
 .../apispec/cluster.config.Commands.json        | 33 ++++++++++++++++++++
 .../apispec/cluster.config.commands.json        | 33 --------------------
 .../org/apache/solr/util/JsonValidatorTest.java |  6 ++--
 4 files changed, 37 insertions(+), 37 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/003f9b74/solr/core/src/java/org/apache/solr/handler/admin/ConfigSetsHandlerApi.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/ConfigSetsHandlerApi.java b/solr/core/src/java/org/apache/solr/handler/admin/ConfigSetsHandlerApi.java
index 6be540b..349f4d1 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/ConfigSetsHandlerApi.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/ConfigSetsHandlerApi.java
@@ -100,7 +100,7 @@ public class ConfigSetsHandlerApi extends BaseHandlerApiSupport {
   }
   enum EndPoint implements V2EndPoint {
     LIST_CONFIG("cluster.config"),
-    CONFIG_COMMANDS("cluster.config.commands"),
+    CONFIG_COMMANDS("cluster.config.Commands"),
     CONFIG_DEL("cluster.config.delete");
 
     public final String spec;

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/003f9b74/solr/core/src/resources/apispec/cluster.config.Commands.json
----------------------------------------------------------------------
diff --git a/solr/core/src/resources/apispec/cluster.config.Commands.json b/solr/core/src/resources/apispec/cluster.config.Commands.json
new file mode 100644
index 0000000..eda56d6
--- /dev/null
+++ b/solr/core/src/resources/apispec/cluster.config.Commands.json
@@ -0,0 +1,33 @@
+{
+  "documentation": "https://cwiki.apache.org/confluence/display/solr/ConfigSets+API",
+  "methods": [
+    "POST"
+  ],
+  "url": {
+    "paths": [
+      "/cluster/configs"]
+  },
+  "commands": {
+    "create": {
+      "type" :"object",
+      "properties": {
+        "name" :{
+          "type" :"string",
+          "description" : "ConfigSet to be created"
+        },
+        "baseConfigSet":{
+          "type" : "string",
+          "description" :"ConfigSet to copy as a base"
+        },
+        "properties" : {
+          "type":"object",
+          "additionalProperties" : true
+        }
+      },
+      "required" : ["name", "baseConfigSet"]
+    },
+    "delete" : {
+      "type":"string"
+    }
+  }
+}

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/003f9b74/solr/core/src/resources/apispec/cluster.config.commands.json
----------------------------------------------------------------------
diff --git a/solr/core/src/resources/apispec/cluster.config.commands.json b/solr/core/src/resources/apispec/cluster.config.commands.json
deleted file mode 100644
index eda56d6..0000000
--- a/solr/core/src/resources/apispec/cluster.config.commands.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "documentation": "https://cwiki.apache.org/confluence/display/solr/ConfigSets+API",
-  "methods": [
-    "POST"
-  ],
-  "url": {
-    "paths": [
-      "/cluster/configs"]
-  },
-  "commands": {
-    "create": {
-      "type" :"object",
-      "properties": {
-        "name" :{
-          "type" :"string",
-          "description" : "ConfigSet to be created"
-        },
-        "baseConfigSet":{
-          "type" : "string",
-          "description" :"ConfigSet to copy as a base"
-        },
-        "properties" : {
-          "type":"object",
-          "additionalProperties" : true
-        }
-      },
-      "required" : ["name", "baseConfigSet"]
-    },
-    "delete" : {
-      "type":"string"
-    }
-  }
-}

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/003f9b74/solr/core/src/test/org/apache/solr/util/JsonValidatorTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/util/JsonValidatorTest.java b/solr/core/src/test/org/apache/solr/util/JsonValidatorTest.java
index 6b58d5b..eafac1b 100644
--- a/solr/core/src/test/org/apache/solr/util/JsonValidatorTest.java
+++ b/solr/core/src/test/org/apache/solr/util/JsonValidatorTest.java
@@ -33,7 +33,7 @@ public class JsonValidatorTest extends SolrTestCaseJ4 {
 
   public void testSchema() {
     checkSchema("collections.Commands");
-    checkSchema("collections.collection.commands");
+    checkSchema("collections.collection.Commands");
     checkSchema("collections.collection.shards.Commands");
     checkSchema("collections.collection.shards.shard.Commands");
     checkSchema("collections.collection.shards.shard.replica.Commands");
@@ -44,12 +44,12 @@ public class JsonValidatorTest extends SolrTestCaseJ4 {
     checkSchema("cluster.security.RuleBasedAuthorization");
     checkSchema("core.config.Commands");
     checkSchema("core.SchemaEdit");
-    checkSchema("cluster.config.commands");
+    checkSchema("cluster.config.Commands");
   }
 
 
   public void testSchemaValidation() {
-    Map2 spec = ApiBag.getSpec("collections.commands").getSpec();
+    Map2 spec = ApiBag.getSpec("collections.Commands").getSpec();
     Map createSchema = spec.getMap("commands", NOT_NULL).getMap("create-alias", NOT_NULL);
     JsonSchemaValidator validator = new JsonSchemaValidator(createSchema);
     List<String> errs = validator.validateJson(Utils.fromJSONString("{name : x, collections:
[ c1 , c2]}"));


Mime
View raw message