dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/onomondo-eim/+/42880?usp=email )

Change subject: rest_api: move "required" member to the correct level ......................................................................

rest_api: move "required" member to the correct level

In some locations in the JSON schema files we find the "required" member on the same lavel as the "properties" (likewise "items") members. This is incorrect, the "required" member should always be on the same level as the "properties" member

(At the moment the JSON schema files serve only documentation purposes, they are not used to do any actual validation yet.)

Change-Id: I07d51d0e809a718144bd51a6540ab51187bb4daa Related: SYS#8100 --- M contrib/rest_api_resource_schema.json M contrib/rest_api_response_schema.json 2 files changed, 69 insertions(+), 69 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/onomondo-eim refs/changes/80/42880/1

diff --git a/contrib/rest_api_resource_schema.json b/contrib/rest_api_resource_schema.json index 12fd049..1bc0fcf 100644 --- a/contrib/rest_api_resource_schema.json +++ b/contrib/rest_api_resource_schema.json @@ -21,11 +21,11 @@ "activationCode": { "description": "see GSMA SGP.22, section 4.1", "type": "string" - }, - "required": [ - "activationCode" - ] - } + } + }, + "required": [ + "activationCode" + ] } }, { @@ -121,11 +121,11 @@ "description": "concatonation of the BER-TLV tags that shall be included in the response", "type": "string", "pattern": "^[0-9,A-F]{2,32}$" - }, - "required": [ - "searchCriteria" - ] - } + } + }, + "required": [ + "searchCriteria" + ] } }, { @@ -151,11 +151,11 @@ "defaultSmdpAddress": { "description": "FQDN of the default SMDP+", "type": "string" - }, - "required": [ - "immediateEnableFlag" - ] - } + } + }, + "required": [ + "immediateEnableFlag" + ] } } ] @@ -239,11 +239,11 @@ "description": "see GSMA SGP.32, section 2.11.1.2", "type": "string", "pattern": "^[0-9,A-F]{2,32}$" - }, - "required": [ - "tagList" - ] - } + } + }, + "required": [ + "tagList" + ] } }, { diff --git a/contrib/rest_api_response_schema.json b/contrib/rest_api_response_schema.json index 45ccb79..c36c6c7 100644 --- a/contrib/rest_api_response_schema.json +++ b/contrib/rest_api_response_schema.json @@ -129,11 +129,11 @@ } } } - }, - "required": [ - "finalResult" - ] - } + } + }, + "required": [ + "finalResult" + ] } }, { @@ -173,24 +173,24 @@ "description": "referring to content of EF GID2 (file identifier '6F3F') as defined in 3GPP TS 31.102", "type": "string", "pattern": "^[0-9,A-F]{2,32}$" - }, - "required": [ - "mccMnc" - ] - } + } + }, + "required": [ + "mccMnc" + ] }, "consentRequired": { "description": "indicates that the End User consent is required", "type": "boolean" - }, - "required": [ - "pprUpdateControl", - "ppr1", - "ppr2", - "allowedOperators", - "consentRequired" - ] - } + } + }, + "required": [ + "pprUpdateControl", + "ppr1", + "ppr2", + "allowedOperators", + "consentRequired" + ] } } }, @@ -228,11 +228,11 @@ "associationToken": { "description": "resulting association token, see also GSMA SGP.32, section 2.11.1.1.1", "type": "integer" - }, - "required": [ - "addEimResultCode" - ] - } + } + }, + "required": [ + "addEimResultCode" + ] } }, { @@ -291,16 +291,16 @@ "eimIdTypeFqdn", "eimIdTypeProprietary" ] - }, - "required": [ - "eimId" - ] - } - }, - "required": [ - "finalResult" - ] - } + } + }, + "required": [ + "eimId" + ] + } + }, + "required": [ + "finalResult" + ] } }, { @@ -360,11 +360,11 @@ "description": "ICCID of the profile. (ICCID in nibble-swapped raw format)", "type": "string", "pattern": "^[0-9,A-F]{2,32}$" - }, - "required": [ - "finalResult" - ] - } + } + }, + "required": [ + "finalResult" + ] } }, { @@ -445,11 +445,11 @@ "pattern": "^[0-9,A-F]{2,32}$" } } - }, - "required": [ - "edrResult" - ] - } + } + }, + "required": [ + "edrResult" + ] } }, { @@ -483,10 +483,10 @@ "description": "Erlang ETS encoded debug information string, for debugging/diagnosis only", "type": "string", "pattern": "^[0-9,A-F]{2,32}$" - }, - "required": [ - "status" - ] + } } - } + }, + "required": [ + "status" + ] }