Commit 4852d800 authored by canterafonsj's avatar canterafonsj
Browse files

Refining more and more. Now using RegExp for Names

parent f27a46e1

schema/ContextSourceRegistration.json

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
          "type": "array",

          "minItems": 1,

          "items": {

            "type": "string"

            "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/Name"

          },

          "uniqueItems": true

        },
@@ -29,7 +29,7 @@ 
          "type": "array",

          "minItems": 1,

          "items": {

            "type": "string"

            "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/Name"

          },

          "uniqueItems": true

        }

schema/Entity.json

+1 −7
Original line number Diff line number Diff line
@@ -4,12 +4,6 @@ 
  "title": "NGSI-LD Entity",

  "description": "NGSI-LD Entity",

  "definitions": {

    "EntityType": {

      "type": "string",

      "pattern": "^(\\d|[a-zA-Z]|_)+$",

      "minLength": 1,

      "description": "NGSI Entity type"

    },

    "datasetId": {

      "type": "string",

      "format": "uri"
@@ -150,7 +144,7 @@ 
      "format": "uri"

    },

    "type": {

      "$ref": "#/definitions/EntityType"

      "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/Name"

    },

    "@context": {

      "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/LdContext"

schema/EntityList.json

+1 −2
Original line number Diff line number Diff line
@@ -6,6 +6,5 @@ 
  "type": "array",

  "items": {

    "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/Entity.json#"

  },

  "minItems": 1

  }

}

schema/EntityTemporal.json

+2 −2
Original line number Diff line number Diff line 
{

  "$schema": "http://json-schema.org/schema#",

  "id": "https://uri.etsi.org/ngsi-ld/schema/EntityTemporal.json",

  "id": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/EntityTemporal.json",

  "title": "NGSI-LD Entity",

  "description": "NGSI-LD Temporal Representation of an Entity",

  "type": "object",
@@ -10,7 +10,7 @@ 
      "format": "uri"

    },

    "type": {

      "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/Entity.json#/definitions/EntityType"

      "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/Name"

    },

    "@context": {

      "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/common.json#/definitions/LdContext"

schema/EntityTemporalList.json

0 → 100644
+10 −0
Original line number Diff line number Diff line 
{

  "$schema": "http://json-schema.org/schema#",

  "id": "https://uri.etsi.org/ngsi-ld/schema/EntityTemporalList.json",

  "title": "NGSI-LD Entity",

  "description": "NGSI-LD Temporal Representation List",

  "type": "array",

  "items": {

    "$ref": "https://forge.etsi.org/gitlab/NGSI-LD/NGSI-LD/raw/master/schema/EntityTemporal.json#"

  }

}