Merge pull request #51 from plantbreeding/brapi-v2-patch-2

small changes to v1.3 collection caused by changes in the server code
plantbreeding · May 18, 2020 · b6b7a88 · b6b7a88
2 parents ffc47f6 + fce34b0
commit b6b7a88
Show file tree

Hide file tree

Showing 10 changed files with 160 additions and 116 deletions.
diff --git a/src/main/resources/collections/CompleteBrapiTest.v1.3.json b/src/main/resources/collections/CompleteBrapiTest.v1.3.json
diff --git a/src/main/resources/collections/CompleteBrapiTest.v2.0.json b/src/main/resources/collections/CompleteBrapiTest.v2.0.json
@@ -3736,36 +3736,6 @@
                         "imageDbId0"
                     ]
                 },
-                {
-                    "description": "Update an image with the image file content\n\nImplementation Notes\n\n- This call should be paired with 'PUT /images/{imageDbId}' for full capability\n\n- A server may choose to modify the image meta data object based on the actually image which has been uploaded. \n\n- Image data may be stored in a database or file system. Servers should generate and provide the \"imageURL\" for retrieving the image, wherever it happens to live.",
-                    "endpoint": "/images/{imageDbId}/imagecontent",
-                    "event": [
-                        {
-                            "exec": [
-                                "StatusCode:200:breakiffalse",
-                                "ContentType:application/json",
-                                "Schema:/v2.0/metadata",
-                                "Schema:/v2.0/Images/putImagesImagedbidImagecontentResponse"
-                            ],
-                            "listen": "test",
-                            "type": "text/plain"
-                        }
-                    ],
-                    "name": "PUT /images/{imageDbId}/imagecontent",
-                    "parameters": [
-                        {
-                            "param": "json",
-                            "value": "{}"
-                        }
-                    ],
-                    "request": {
-                        "method": "PUT",
-                        "url": "{baseurl}/images/{imageDbId0}/imagecontent"
-                    },
-                    "requires": [
-                        "imageDbId0"
-                    ]
-                },
                 {
                     "description": "Get filtered set of image meta data\n\nImplementation Notes\n\n- ''imageURL'' should be a complete URL describing the location of the image. There is no BrAPI call for retrieving the image content, so it could be on a different path, or a different host.\n\n- 'descriptiveOntologyTerm' can be thought of as Tags for the image. These could be simple descriptive words, or ontology references, or full ontology URI's.\n\nSee Search Services for additional implementation details.",
                     "endpoint": "/search/images",
@@ -5214,7 +5184,7 @@
                     "parameters": [
                         {
                             "param": "json",
-                            "value": "[{}]"
+                            "value": "{}"
                         }
                     ],
                     "request": {

diff --git a/src/main/resources/schemas/v1.3/Lists/getListsListdbidResponse.json b/src/main/resources/schemas/v1.3/Lists/getListsListdbidResponse.json
@@ -7,7 +7,6 @@
                     "items": {
                         "type": "string"
                     },
-                    "minItems": 1,
                     "type": [
                         "null",
                         "array"

diff --git a/src/main/resources/schemas/v1.3/Lists/postListsListdbidItemsResponse.json b/src/main/resources/schemas/v1.3/Lists/postListsListdbidItemsResponse.json
@@ -7,7 +7,6 @@
                     "items": {
                         "type": "string"
                     },
-                    "minItems": 1,
                     "type": [
                         "null",
                         "array"

diff --git a/src/main/resources/schemas/v1.3/Lists/postListsResponse.json b/src/main/resources/schemas/v1.3/Lists/postListsResponse.json
@@ -7,7 +7,6 @@
                     "items": {
                         "type": "string"
                     },
-                    "minItems": 1,
                     "type": [
                         "null",
                         "array"

diff --git a/src/main/resources/schemas/v1.3/Lists/putListsListdbidResponse.json b/src/main/resources/schemas/v1.3/Lists/putListsListdbidResponse.json
@@ -7,7 +7,6 @@
                     "items": {
                         "type": "string"
                     },
-                    "minItems": 1,
                     "type": [
                         "null",
                         "array"

diff --git a/src/main/resources/schemas/v1.3/Studies/getStudiesResponse.json b/src/main/resources/schemas/v1.3/Studies/getStudiesResponse.json
@@ -10,7 +10,7 @@
                                 "description": "Is this study currently active",
                                 "type": [
                                     "null",
-                                    "boolean"
+                                    "string"
                                 ]
                             },
                             "additionalInfo": {

diff --git a/src/main/resources/schemas/v1.3/Studies/getStudiesStudydbidLayoutsResponse.json b/src/main/resources/schemas/v1.3/Studies/getStudiesStudydbidLayoutsResponse.json
@@ -28,7 +28,8 @@
                                 "enum": [
                                     "CHECK",
                                     "TEST",
-                                    "FILLER"
+                                    "FILLER",
+                                    null
                                 ],
                                 "type": [
                                     "null",

diff --git a/src/main/resources/schemas/v1.3/Studies/getStudiesStudydbidResponse.json b/src/main/resources/schemas/v1.3/Studies/getStudiesStudydbidResponse.json
@@ -7,7 +7,7 @@
                     "description": "Is this study currently active",
                     "type": [
                         "null",
-                        "boolean"
+                        "string"
                     ]
                 },
                 "additionalInfo": {

diff --git a/src/main/resources/schemas/v1.3/Studies/putStudiesStudydbidLayoutsResponse.json b/src/main/resources/schemas/v1.3/Studies/putStudiesStudydbidLayoutsResponse.json
@@ -28,7 +28,8 @@
                                 "enum": [
                                     "CHECK",
                                     "TEST",
-                                    "FILLER"
+                                    "FILLER",
+                                    null
                                 ],
                                 "type": [
                                     "null",
@@ -136,7 +137,6 @@
                         "title": "observationUnitPosition",
                         "type": "object"
                     },
-                    "minItems": 1,
                     "type": "array"
                 }
             },