3.1 Schema: Add media-range format for content objects

Author: jdesrosiers

schemas/v3.1/schema.json

@@ -429,10 +429,7 @@
           "$dynamicRef": "#meta"
         },
         "content": {
-          "type": "object",
-          "additionalProperties": {
-            "$ref": "#/$defs/media-type"
-          }
+          "$ref": "#/$defs/content"
         }
       },
       "required": [
@@ -636,10 +633,7 @@
           "type": "string"
         },
         "content": {
-          "type": "object",
-          "additionalProperties": {
-            "$ref": "#/$defs/media-type"
-          }
+          "$ref": "#/$defs/content"
         },
         "required": {
           "default": false,
@@ -665,6 +659,15 @@
         "$ref": "#/$defs/request-body"
       }
     },
+    "content": {
+      "type": "object",
+      "additionalProperties": {
+        "$ref": "#/$defs/media-type"
+      },
+      "propertyNames": {
+        "format": "media-range"
+      }
+    },
     "media-type": {
       "type": "object",
       "properties": {
@@ -692,7 +695,8 @@
       "type": "object",
       "properties": {
         "contentType": {
-          "type": "string"
+          "type": "string",
+          "format": "media-range"
         },
         "headers": {
           "type": "object",
@@ -783,10 +787,7 @@
           }
         },
         "content": {
-          "type": "object",
-          "addtionalProperties": {
-            "$ref": "#/$defs/media-type"
-          }
+          "$ref": "#/$defs/content"
         },
         "links": {
           "type": "object",
@@ -955,10 +956,7 @@
         "content": {
           "properties": {
             "content": {
-              "type": "object",
-              "additionalProperties": {
-                "$ref": "#/$defs/media-type"
-              }
+              "$ref": "#/$defs/content"
             }
           }
         }

schemas/v3.1/schema.yaml

@@ -299,9 +299,7 @@ $defs:
       schema:
         $dynamicRef: '#meta'
       content:
-        type: object
-        additionalProperties:
-          $ref: '#/$defs/media-type'
+        $ref: '#/$defs/content'
     required:
       - in
     oneOf:
@@ -427,9 +425,7 @@ $defs:
       description:
         type: string
       content:
-        type: object
-        additionalProperties:
-          $ref: '#/$defs/media-type'
+        $ref: '#/$defs/content'
       required:
         default: false
         type: boolean
@@ -447,6 +443,13 @@ $defs:
     else:
       $ref: '#/$defs/request-body'
 
+  content:
+    type: object
+    additionalProperties:
+      $ref: '#/$defs/media-type'
+    propertyNames:
+      format: media-range
+
   media-type:
     type: object
     properties:
@@ -466,6 +469,7 @@ $defs:
     properties:
       contentType:
         type: string
+        format: media-range
       headers:
         type: object
         additionalProperties:
@@ -525,9 +529,7 @@ $defs:
         additionalProperties:
           $ref: '#/$defs/header-or-reference'
       content:
-        type: object
-        addtionalProperties:
-          $ref: '#/$defs/media-type'
+        $ref: '#/$defs/content'
       links:
         type: object
         additionalProperties:
@@ -646,9 +648,7 @@ $defs:
       content:
         properties:
           content:
-            type: object
-            additionalProperties:
-              $ref: '#/$defs/media-type'
+            $ref: '#/$defs/content'
     $ref: '#/$defs/specification-extensions'
     unevaluatedProperties: false