Removed use of $def, fixing broken tests (#40)

covjson · Sep 25, 2024 · 1317396 · 1317396
1 parent a2dd434
commit 1317396
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 17 deletions.
diff --git a/schemas/referenceSystem.json b/schemas/referenceSystem.json
@@ -39,32 +39,18 @@
                     "id" : { "type" : "string" },
                     "label" : { "$ref" : "/schemas/i18n" },
                     "description" : { "$ref" : "/schemas/i18n" },
-                    "targetConcept" : { "$ref" : "#/$defs/targetConcept" },
+                    "targetConcept" : { "$ref" : "/schemas/targetConcept" },
                     "identifiers" :
                     {
                         "type" : "object",
                         "patternProperties" :
                         {
-                            ".+" : { "$ref" : "#/$defs/targetConcept" }
+                            ".+" : { "$ref" : "/schemas/targetConcept" }
                         }
                     }
                 },
                 "required" : [ "targetConcept" ]
             }
         }
-    ],
-    "$defs" :
-    {
-        "targetConcept" :
-        {
-            "type" : "object",
-            "properties" :
-            {
-                "id" : { "type" : "string" },
-                "label" : { "$ref" : "/schemas/i18n" },
-                "description" : { "$ref" : "/schemas/i18n" }
-            },
-            "required" : [ "label" ]
-        }
-    }
+    ]
 }
diff --git a/schemas/targetConcept.json b/schemas/targetConcept.json
@@ -0,0 +1,11 @@
+{
+    "$id": "/schemas/targetConcept",
+    "description" : "A concept in an identifier-based reference system",
+    "properties" :
+    {
+        "id" : { "type" : "string" },
+        "label" : { "$ref" : "/schemas/i18n" },
+        "description" : { "$ref" : "/schemas/i18n" }
+    },
+    "required" : [ "label" ]
+}