Merge pull request #1360 from aml-org/W-10881268-allOf-resolution-stage

W-10881268 - Changed tranformer to use allOf and oneOf instead of inh…
aml-org · Mar 29, 2022 · d37b309 · d37b309
2 parents 9dbddae + 68a1fa2
commit d37b309
Show file tree

Hide file tree

Showing 23 changed files with 633 additions and 158 deletions.
diff --git a/amf-cli/shared/src/test/resources/semantic-jsonschema/dialects/allOf-complex.jsonld b/amf-cli/shared/src/test/resources/semantic-jsonschema/dialects/allOf-complex.jsonld
diff --git a/amf-cli/shared/src/test/resources/semantic-jsonschema/dialects/allOf-complex.yaml b/amf-cli/shared/src/test/resources/semantic-jsonschema/dialects/allOf-complex.yaml
@@ -0,0 +1,71 @@
+#%Dialect 1.0
+nodeMappings:
+ allOf-Complex:
+ allOf:
+ - SchemaNode
+ - SchemaNode_1
+ - SchemaNode_5
+ - extension_allOf-Complex
+ extension_allOf-Complex:
+ mapping:
+ d:
+ range: number
+ mandatory: true
+ additionalProperties: true
+ SchemaNode:
+ mapping:
+ a:
+ range: string
+ mandatory: false
+ additionalProperties: true
+ SchemaNode_1:
+ conditional:
+ if: SchemaNode_2
+ then: SchemaNode_3
+ else: SchemaNode_4
+ SchemaNode_2:
+ mapping:
+ a:
+ range: any
+ mandatory: false
+ enum:
+ - condition
+ additionalProperties: true
+ SchemaNode_3:
+ mapping:
+ a:
+ range: string
+ propertyTerm: config.sensitive
+ mandatory: false
+ additionalProperties: true
+ SchemaNode_4:
+ mapping:
+ a:
+ range: string
+ propertyTerm: config.dataweaveExpression
+ mandatory: false
+ additionalProperties: true
+ SchemaNode_5:
+ oneOf:
+ - SchemaNode_6
+ - SchemaNode_7
+ SchemaNode_6:
+ mapping:
+ b:
+ range: integer
+ mandatory: false
+ additionalProperties: true
+ SchemaNode_7:
+ mapping:
+ c:
+ range: boolean
+ mandatory: false
+ additionalProperties: true
+external:
+ config: anypoint://vocabulary/policy.yaml#
+ ns0: http://test.com/vocab#
+dialect: amf-json-schema-generated-dialect
+version: "1.0"
+documents:
+ root:
+ encodes: allOf-Complex
diff --git a/amf-cli/shared/src/test/resources/semantic-jsonschema/dialects/allOf-custom.jsonld b/amf-cli/shared/src/test/resources/semantic-jsonschema/dialects/allOf-custom.jsonld
@@ -123,12 +123,12 @@
  "doc:DomainElement"
  ],
  "core:name": "Child",
- "doc:extends": [
+ "http://a.ml/vocabularies/amf/aml#and": [
  {
- "@id": "#/declarations/Child/null"
+ "@id": "#/declarations/SchemaNode"
  },
  {
- "@id": "#/declarations/Child/null"
+ "@id": "#/declarations/extension_Child"
  }
  ]
  },
@@ -174,20 +174,6 @@
  ],
  "shacl:minCount": 0
  },
- {
- "@id": "#/declarations/Child/null",
- "@type": [
- "meta:NodeMapping",
- "shacl:Shape",
- "doc:DomainElement"
- ],
- "doc:link-target": [
- {
- "@id": "#/declarations/SchemaNode"
- }
- ],
- "doc:link-label": "SchemaNode"
- },
  {
  "@id": "/property/property/name",
  "@type": [

diff --git a/amf-cli/shared/src/test/resources/semantic-jsonschema/dialects/allOf-custom.yaml b/amf-cli/shared/src/test/resources/semantic-jsonschema/dialects/allOf-custom.yaml
@@ -1,7 +1,7 @@
 #%Dialect 1.0
 nodeMappings:
  Child:
- extends:
+ allOf:
  - SchemaNode
  - extension_Child
  extension_Child:

diff --git a/.../shared/src/test/resources/semantic-jsonschema/dialects/allOf-with-extended-schema.jsonld b/.../shared/src/test/resources/semantic-jsonschema/dialects/allOf-with-extended-schema.jsonld
@@ -118,18 +118,18 @@
  "doc:DomainElement"
  ],
  "core:name": "Child",
- "doc:extends": [
+ "http://a.ml/vocabularies/amf/aml#and": [
  {
- "@id": "#/declarations/Child/null"
+ "@id": "#/declarations/SchemaNode"
  },
  {
- "@id": "#/declarations/Child/null"
+ "@id": "#/declarations/SchemaNode_1"
  },
  {
- "@id": "#/declarations/Child/null"
+ "@id": "#/declarations/SchemaNode_2"
  },
  {
- "@id": "#/declarations/Child/null"
+ "@id": "#/declarations/extension_Child"
  }
  ]
  },
@@ -191,20 +191,6 @@
  ],
  "shacl:minCount": 0
  },
- {
- "@id": "#/declarations/Child/null",
- "@type": [
- "meta:NodeMapping",
- "shacl:Shape",
- "doc:DomainElement"
- ],
- "doc:link-target": [
- {
- "@id": "#/declarations/SchemaNode"
- }
- ],
- "doc:link-label": "SchemaNode"
- },
  {
  "@id": "/and/shape/item1/property/property/b",
  "@type": [

diff --git a/...li/shared/src/test/resources/semantic-jsonschema/dialects/allOf-with-extended-schema.yaml b/...li/shared/src/test/resources/semantic-jsonschema/dialects/allOf-with-extended-schema.yaml
@@ -1,7 +1,7 @@
 #%Dialect 1.0
 nodeMappings:
  Child:
- extends:
+ allOf:
  - SchemaNode
  - SchemaNode_1
  - SchemaNode_2

diff --git a/amf-cli/shared/src/test/resources/semantic-jsonschema/dialects/allOf.jsonld b/amf-cli/shared/src/test/resources/semantic-jsonschema/dialects/allOf.jsonld
@@ -115,15 +115,15 @@
  "doc:DomainElement"
  ],
  "core:name": "Child",
- "doc:extends": [
+ "http://a.ml/vocabularies/amf/aml#and": [
  {
- "@id": "#/declarations/Child/null"
+ "@id": "#/declarations/SchemaNode"
  },
  {
- "@id": "#/declarations/Child/null"
+ "@id": "#/declarations/SchemaNode_1"
  },
  {
- "@id": "#/declarations/Child/null"
+ "@id": "#/declarations/SchemaNode_2"
  }
  ]
  },
@@ -170,20 +170,6 @@
  ],
  "shacl:minCount": 0
  },
- {
- "@id": "#/declarations/Child/null",
- "@type": [
- "meta:NodeMapping",
- "shacl:Shape",
- "doc:DomainElement"
- ],
- "doc:link-target": [
- {
- "@id": "#/declarations/SchemaNode"
- }
- ],
- "doc:link-label": "SchemaNode"
- },
  {
  "@id": "/and/shape/item1/property/property/b",
  "@type": [

diff --git a/amf-cli/shared/src/test/resources/semantic-jsonschema/dialects/allOf.yaml b/amf-cli/shared/src/test/resources/semantic-jsonschema/dialects/allOf.yaml
@@ -1,7 +1,7 @@
 #%Dialect 1.0
 nodeMappings:
  Child:
- extends:
+ allOf:
  - SchemaNode
  - SchemaNode_1
  - SchemaNode_2

diff --git a/.../shared/src/test/resources/semantic-jsonschema/dialects/extended-if-then-semantics.jsonld b/.../shared/src/test/resources/semantic-jsonschema/dialects/extended-if-then-semantics.jsonld
@@ -184,12 +184,12 @@
  "doc:DomainElement"
  ],
  "core:name": "SomePolicy",
- "doc:extends": [
+ "http://a.ml/vocabularies/amf/aml#and": [
  {
- "@id": "#/declarations/SomePolicy/null"
+ "@id": "#/declarations/SchemaNode"
  },
  {
- "@id": "#/declarations/SomePolicy/null"
+ "@id": "#/declarations/extension_SomePolicy"
  }
  ]
  },
@@ -253,20 +253,6 @@
  "@id": "/and/any/item0/shape/if/property/property/logStatistics/list"
  }
  },
- {
- "@id": "#/declarations/SomePolicy/null",
- "@type": [
- "meta:ConditionalNodeMapping",
- "shacl:Shape",
- "doc:DomainElement"
- ],
- "doc:link-target": [
- {
- "@id": "#/declarations/SchemaNode"
- }
- ],
- "doc:link-label": "SchemaNode"
- },
  {
  "@id": "/property/property/thisApiName",
  "@type": [

diff --git a/...li/shared/src/test/resources/semantic-jsonschema/dialects/extended-if-then-semantics.yaml b/...li/shared/src/test/resources/semantic-jsonschema/dialects/extended-if-then-semantics.yaml
@@ -1,7 +1,7 @@
 #%Dialect 1.0
 nodeMappings:
  SomePolicy:
- extends:
+ allOf:
  - SchemaNode
  - extension_SomePolicy
  extension_SomePolicy:

diff --git a/amf-cli/shared/src/test/resources/semantic-jsonschema/dialects/oneOf-custom.jsonld b/amf-cli/shared/src/test/resources/semantic-jsonschema/dialects/oneOf-custom.jsonld
@@ -97,14 +97,19 @@
  {
  "@id": "#/declarations/Child",
  "@type": [
- "meta:UnionNodeMapping",
+ "meta:NodeMapping",
  "shacl:Shape",
  "doc:DomainElement"
  ],
  "core:name": "Child",
- "shacl:node": {
- "@id": "#/declarations/Child/list"
- }
+ "http://a.ml/vocabularies/amf/aml#or": [
+ {
+ "@id": "#/declarations/SchemaNode"
+ },
+ {
+ "@id": "#/declarations/SchemaNode_1"
+ }
+ ]
  },
  {
  "@id": "#/declarations/SchemaNode_1",
@@ -145,16 +150,6 @@
  ],
  "shacl:minCount": 0
  },
- {
- "@id": "#/declarations/Child/list",
- "@type": "rdfs:Seq",
- "rdfs:_1": {
- "@id": "#/declarations/SchemaNode"
- },
- "rdfs:_2": {
- "@id": "#/declarations/SchemaNode_1"
- }
- },
  {
  "@id": "/exclusiveOr/shape/item1/property/property/address",
  "@type": [
@@ -178,7 +173,6 @@
  "@context": {
  "@base": "file://amf-cli/shared/src/test/resources/semantic-jsonschema/json-schemas/oneOf-custom.json",
  "shacl": "http://www.w3.org/ns/shacl#",
- "rdfs": "http://www.w3.org/2000/01/rdf-schema#",
  "doc": "http://a.ml/vocabularies/document#",
  "core": "http://a.ml/vocabularies/core#",
  "owl": "http://www.w3.org/2002/07/owl#",

diff --git a/amf-cli/shared/src/test/resources/semantic-jsonschema/dialects/oneOf-custom.yaml b/amf-cli/shared/src/test/resources/semantic-jsonschema/dialects/oneOf-custom.yaml
@@ -1,7 +1,7 @@
 #%Dialect 1.0
 nodeMappings:
  Child:
- union:
+ oneOf:
  - SchemaNode
  - SchemaNode_1
  SchemaNode_1:

diff --git a/.../shared/src/test/resources/semantic-jsonschema/dialects/oneOf-with-extended-schema.jsonld b/.../shared/src/test/resources/semantic-jsonschema/dialects/oneOf-with-extended-schema.jsonld
@@ -123,14 +123,22 @@
  {
  "@id": "#/declarations/Child",
  "@type": [
- "meta:UnionNodeMapping",
+ "meta:NodeMapping",
  "shacl:Shape",
  "doc:DomainElement"
  ],
  "core:name": "Child",
- "shacl:node": {
- "@id": "#/declarations/Child/list"
- }
+ "http://a.ml/vocabularies/amf/aml#or": [
+ {
+ "@id": "#/declarations/SchemaNode"
+ },
+ {
+ "@id": "#/declarations/SchemaNode_1"
+ },
+ {
+ "@id": "#/declarations/SchemaNode_2"
+ }
+ ]
  },
  {
  "@id": "#/declarations/SchemaNode_1",
@@ -223,19 +231,6 @@
  ],
  "doc:link-label": "extension_Child"
  },
- {
- "@id": "#/declarations/Child/list",
- "@type": "rdfs:Seq",
- "rdfs:_1": {
- "@id": "#/declarations/SchemaNode"
- },
- "rdfs:_2": {
- "@id": "#/declarations/SchemaNode_1"
- },
- "rdfs:_3": {
- "@id": "#/declarations/SchemaNode_2"
- }
- },
  {
  "@id": "/exclusiveOr/shape/item1/property/property/b",
  "@type": [
@@ -282,7 +277,6 @@
  "@context": {
  "@base": "file://amf-cli/shared/src/test/resources/semantic-jsonschema/json-schemas/oneOf-with-extended-schema.json",
  "shacl": "http://www.w3.org/ns/shacl#",
- "rdfs": "http://www.w3.org/2000/01/rdf-schema#",
  "doc": "http://a.ml/vocabularies/document#",
  "core": "http://a.ml/vocabularies/core#",
  "owl": "http://www.w3.org/2002/07/owl#",

diff --git a/...li/shared/src/test/resources/semantic-jsonschema/dialects/oneOf-with-extended-schema.yaml b/...li/shared/src/test/resources/semantic-jsonschema/dialects/oneOf-with-extended-schema.yaml
@@ -1,7 +1,7 @@
 #%Dialect 1.0
 nodeMappings:
  Child:
- union:
+ oneOf:
  - SchemaNode
  - SchemaNode_1
  - SchemaNode_2