Merge pull request #110 from redmitry/uri-template

for templates the format must be "uri-template".
ga4gh-beacon · Oct 8, 2024 · 5ea17fb · 5ea17fb
2 parents 7e98b1e + 1d4730a
commit 5ea17fb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/framework/json/configuration/beaconMapSchema.json b/framework/json/configuration/beaconMapSchema.json
@@ -18,7 +18,7 @@
                 },
                 "filteringTermsUrl": {
                     "description": "Optional. Returns the list of filtering terms that could be applied to this entry type. It is added here for convenience of the Beacon clients, so they don't need to parse the OpenAPI endpoints definition to get that endpoint. Also, in very simple Beacons, that endpoint could be the one of the few implemented, together with \u00b4rootUrl` and \u00b4singleEntryUrl`, in which case the whole map of endpoints is found in the current Map.",
-                    "format": "uri",
+                    "format": "uri-template",
                     "type": "string"
                 },
                 "openAPIEndpointsDefinition": {
@@ -32,7 +32,7 @@
                 },
                 "singleEntryUrl": {
                     "description": "Optional, but recommended. Returns only one instance of this entry, identified by an `id`. It is added here for convenience of the Beacon clients, so they don't need to parse the OpenAPI endpoints definition to get that base endpoint. Also, in very simple Beacons, that endpoint could be the only one implemented, together with \u00b4rootUrl`, in which case the whole map of endpoints is found in the current Map.",
-                    "format": "uri",
+                    "format": "uri-template",
                     "type": "string"
                 }
             },
@@ -50,7 +50,7 @@
                 },
                 "url": {
                     "description": "Endpoint URL",
-                    "format": "uri",
+                    "format": "uri-template",
                     "type": "string"
                 }
             },

diff --git a/framework/src/configuration/beaconMapSchema.yaml b/framework/src/configuration/beaconMapSchema.yaml
@@ -46,7 +46,7 @@ definitions:
           be the only one implemented, together with ´rootUrl`, in which case the
           whole map of endpoints is found in the current Map.
         type: string
-        format: uri
+        format: uri-template
       filteringTermsUrl:
         description: Optional. Returns the list of filtering terms that could be applied
           to this entry type. It is added here for convenience of the Beacon clients,
@@ -55,7 +55,7 @@ definitions:
           the few implemented, together with ´rootUrl` and ´singleEntryUrl`, in which
           case the whole map of endpoints is found in the current Map.
         type: string
-        format: uri
+        format: uri-template
       endpoints:
         description: Optional. A list describing additional endpoints implemented
           by this Beacon instance for that entry type. Additional details on the endpoint
@@ -74,7 +74,7 @@ definitions:
       url:
         description: Endpoint URL
         type: string
-        format: uri
+        format: uri-template
       returnedEntryType:
         description: Which entry type is returned by querying this endpoint. It MUST
           match one of the entry types defined in the Beacon configuration file (`beaconConfiguration.json`).