Do not reference primitive types in rule JSON schema defs

scitran · Oct 31, 2017 · e126ebf · e126ebf
1 parent 2d7b6df
commit e126ebf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 17 deletions.
diff --git a/raml/schemas/definitions/rule.json b/raml/schemas/definitions/rule.json
@@ -1,12 +1,6 @@
 {
     "$schema": "http://json-schema.org/draft-04/schema#",
     "definitions": {
-        "_id":         { "type": "string" },
-        "project_id":  { "type": "string" },
-        "alg":         { "type": "string" },
-        "name":        { "type": "string" },
-        "config":      { "type": "object" },
-
         "rule-items": {
             "type": "array",
             "items": {
@@ -29,15 +23,14 @@
             }
         },
 
-
         "rule-input": {
             "type": "object",
             "properties": {
-                "_id":        { "$ref": "#/definitions/_id" },
-                "project_id": { "$ref": "#/definitions/project_id" },
-                "alg":        { "$ref": "#/definitions/alg" },
-                "name":       { "$ref": "#/definitions/name" },
-                "config":     { "$ref": "#/definitions/config" },
+                "_id":        { "type": "string" },
+                "project_id": { "type": "string" },
+                "alg":        { "type": "string" },
+                "name":       { "type": "string" },
+                "config":     { "type": "object" },
                 "any":        { "$ref": "#/definitions/rule-items" },
                 "all":        { "$ref": "#/definitions/rule-items" }
             },
@@ -47,10 +40,10 @@
         "rule-output": {
             "type": "object",
             "properties": {
-                "_id":        { "$ref": "#/definitions/_id" },
-                "alg":        { "$ref": "#/definitions/alg" },
-                "name":       { "$ref": "#/definitions/name" },
-                "config":     { "$ref": "#/definitions/config" },
+                "_id":        { "type": "string" },
+                "alg":        { "type": "string" },
+                "name":       { "type": "string" },
+                "config":     { "type": "object" },
                 "any":        { "$ref": "#/definitions/rule-items" },
                 "all":        { "$ref": "#/definitions/rule-items" }
             }

diff --git a/raml/schemas/output/rule-list.json b/raml/schemas/output/rule-list.json
@@ -1,5 +1,5 @@
 {
     "$schema": "http://json-schema.org/draft-04/schema#",
     "type": "array",
-    "items": { "$ref":"../definitions/rule.json#/definitions/rule-output" }
+    "items": { "$ref": "../definitions/rule.json#/definitions/rule-output" }
 }