Move "media" from Hyper-Schema into Validation as "contentEncoding"+"contentMediaType"

Author: dlax

hyper-schema.json

@@ -103,19 +103,6 @@
             "type": "array",
             "items": { "$ref": "#/definitions/linkDescription" }
         },
-        "media": {
-            "type": "object",
-            "properties": {
-                "type": {
-                    "description": "A media type, as described in RFC 2046",
-                    "type": "string"
-                },
-                "binaryEncoding": {
-                    "description": "A content encoding scheme, as described in RFC 2045",
-                    "type": "string"
-                }
-            }
-        },
         "readOnly": {
             "description": "If true, indicates that the value of this property is controlled by the server.",
             "type": "boolean",

schema.json

@@ -141,6 +141,14 @@
             ]
         },
         "format": { "type": "string" },
+        "contentMediaType": {
+            "type": "string",
+            "description": "A media type, as described in RFC 2046"
+        },
+        "contentEncoding": {
+            "type": "string",
+            "description": "A content encoding scheme, as described in RFC 2045"
+        },
         "allOf": { "$ref": "#/definitions/schemaArray" },
         "anyOf": { "$ref": "#/definitions/schemaArray" },
         "oneOf": { "$ref": "#/definitions/schemaArray" },