Remove remaining title/description metadata properties. Change "type"…

… values from arrays to strings.
open-contracting · Jun 24, 2020 · be2da56 · be2da56
1 parent 633bc1c
commit be2da56
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 21 deletions.
diff --git a/kingfisher_scrapy/item_schema/File.json b/kingfisher_scrapy/item_schema/File.json
@@ -5,23 +5,16 @@
       "$ref": "item.json#/definitions/KingfisherFileItem"
     }
   ],
-  "title": "File",
   "type": "object",
   "properties": {
     "post_to_api": {
-      "type": [
-        "boolean"
-      ]
+      "type": "boolean"
     },
     "path": {
-      "type": [
-        "string"
-      ]
+      "type": "string"
     },
     "files_store": {
-      "type": [
-        "string"
-      ]
+      "type": "string"
     }
   }
 }
diff --git a/kingfisher_scrapy/item_schema/FileError.json b/kingfisher_scrapy/item_schema/FileError.json
@@ -1,12 +1,11 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "title": "File Error",
-  "type": "object",
   "allOf": [
     {
       "$ref": "item.json#/definitions/KingfisherItem"
     }
   ],
+  "type": "object",
   "properties": {
     "errors": {
       "type": "string",

diff --git a/kingfisher_scrapy/item_schema/FileItem.json b/kingfisher_scrapy/item_schema/FileItem.json
@@ -5,7 +5,6 @@
       "$ref": "item.json#/definitions/KingfisherFileItem"
     }
   ],
-  "title": "File Item",
   "type": "object",
   "properties": {
     "number": {

diff --git a/kingfisher_scrapy/item_schema/item.json b/kingfisher_scrapy/item_schema/item.json
@@ -2,8 +2,6 @@
   "$schema": "http://json-schema.org/draft-04/schema#",
   "definitions": {
     "KingfisherItem": {
-      "title": "Kingfisher Item",
-      "description": "A generic item with file_name and url to be extended by other items",
       "type": "object",
       "properties": {
         "file_name": {
@@ -21,14 +19,12 @@
       ]
     },
     "KingfisherFileItem": {
-      "title": "Kingfisher Item",
-      "description": "A base object to be extended by other File type items",
-      "type": "object",
       "allOf": [
         {
           "$ref": "#/definitions/KingfisherItem"
         }
       ],
+      "type": "object",
       "properties": {
         "data_type": {
           "type": "string",
@@ -51,9 +47,7 @@
           ]
         },
         "encoding": {
-          "type": [
-            "string"
-          ]
+          "type": "string"
         },
         "data": {
           "type": "string",