Skip to content

Commit

Permalink
Merge pull request #39 from aml-org/model-update-id-adoption
Browse files Browse the repository at this point in the history 
Update canonical dialect and vocabularies due to changes in ModelDoc in the AMF Model for Id Adoption feature.
  • Loading branch information
@tomsfernandez
tomsfernandez authored Oct 7, 2020
2 parents 9cf27bd + 91365be commit cd91efa
Show file tree
Hide file tree
Showing 27 changed files with 361 additions and 364 deletions.
4 changes: 2 additions & 2 deletions exporters/src/main/scala/amf/exporters/CanonicalWebAPISpecDialectExporter.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,15 +257,15 @@ class CanonicalWebAPISpecDialectExporter(logger: Logger = new ConsoleLogger()) {
| OAuth2: OAuth2Settings
| OAuth1: OAuth1Settings
| APIKey: APIKeySettings
| Http: HTTPSettings
| Http: HttpSettings
| OpenID: OpenIDSettings
""".stripMargin

val settingsUnionRange: String =
""" - OAuth2Settings
| - OAuth1Settings
| - APIKeySettings
| - HTTPSettings
| - HttpSettings
| - OpenIDSettings
""".stripMargin

Expand Down
24 changes: 12 additions & 12 deletions transform/src/test/resources/client/webapi.canonical.jsonld
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,14 +162,14 @@
]
}
],
"shacl:minCount": [
"shacl:name": [
{
"@value": 1
"@value": "c"
}
],
"shacl:name": [
"shacl:minCount": [
{
"@value": "c"
"@value": 1
}
],
"shacl:path": [
Expand Down Expand Up @@ -286,14 +286,14 @@
]
}
],
"shacl:minCount": [
"shacl:name": [
{
"@value": 1
"@value": "b"
}
],
"shacl:name": [
"shacl:minCount": [
{
"@value": "b"
"@value": 1
}
],
"shacl:path": [
Expand Down Expand Up @@ -331,14 +331,14 @@
]
}
],
"shacl:minCount": [
"shacl:name": [
{
"@value": 1
"@value": "a"
}
],
"shacl:name": [
"shacl:minCount": [
{
"@value": "a"
"@value": 1
}
],
"shacl:path": [
Expand Down
120 changes: 60 additions & 60 deletions transform/src/test/resources/transformations/annotations/webapi.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,14 +182,14 @@
"http://a.ml/vocabularies/meta#DialectDomainElement",
"http://a.ml/vocabularies/document#DomainElement"
],
"http://a.ml/vocabularies/core#name": [
"http://a.ml/vocabularies/document#design-link-target": [
{
"@value": "clearanceLevel"
"@id": "file://transform/src/test/resources/transformations/annotations/api.raml#/declarations/annotations/clearanceLevel"
}
],
"http://a.ml/vocabularies/document#design-link-target": [
"http://a.ml/vocabularies/core#name": [
{
"@id": "file://transform/src/test/resources/transformations/annotations/api.raml#/declarations/annotations/clearanceLevel"
"@value": "clearanceLevel"
}
]
}
Expand Down Expand Up @@ -263,14 +263,14 @@
"http://a.ml/vocabularies/meta#DialectDomainElement",
"http://a.ml/vocabularies/document#DomainElement"
],
"http://a.ml/vocabularies/core#name": [
"http://a.ml/vocabularies/document#design-link-target": [
{
"@value": "arrAnot"
"@id": "file://transform/src/test/resources/transformations/annotations/api.raml#/declarations/annotations/arrAnot"
}
],
"http://a.ml/vocabularies/document#design-link-target": [
"http://a.ml/vocabularies/core#name": [
{
"@id": "file://transform/src/test/resources/transformations/annotations/api.raml#/declarations/annotations/arrAnot"
"@value": "arrAnot"
}
]
}
Expand Down Expand Up @@ -339,14 +339,14 @@
"http://a.ml/vocabularies/meta#DialectDomainElement",
"http://a.ml/vocabularies/document#DomainElement"
],
"http://a.ml/vocabularies/core#name": [
"http://a.ml/vocabularies/document#design-link-target": [
{
"@value": "simple"
"@id": "file://transform/src/test/resources/transformations/annotations/api.raml#/declarations/annotations/simple"
}
],
"http://a.ml/vocabularies/document#design-link-target": [
"http://a.ml/vocabularies/core#name": [
{
"@id": "file://transform/src/test/resources/transformations/annotations/api.raml#/declarations/annotations/simple"
"@value": "simple"
}
]
}
Expand Down Expand Up @@ -417,14 +417,14 @@
"http://a.ml/vocabularies/meta#DialectDomainElement",
"http://a.ml/vocabularies/document#DomainElement"
],
"http://a.ml/vocabularies/core#name": [
"http://a.ml/vocabularies/document#design-link-target": [
{
"@value": "annot"
"@id": "file://transform/src/test/resources/transformations/annotations/api.raml#/declarations/annotations/annot"
}
],
"http://a.ml/vocabularies/document#design-link-target": [
"http://a.ml/vocabularies/core#name": [
{
"@id": "file://transform/src/test/resources/transformations/annotations/api.raml#/declarations/annotations/annot"
"@value": "annot"
}
]
}
Expand Down Expand Up @@ -489,14 +489,14 @@
]
}
],
"http://www.w3.org/ns/shacl#minCount": [
"http://www.w3.org/ns/shacl#name": [
{
"@value": 1
"@value": "c"
}
],
"http://www.w3.org/ns/shacl#name": [
"http://www.w3.org/ns/shacl#minCount": [
{
"@value": "c"
"@value": 1
}
],
"http://www.w3.org/ns/shacl#path": [
Expand Down Expand Up @@ -613,14 +613,14 @@
]
}
],
"http://www.w3.org/ns/shacl#minCount": [
"http://www.w3.org/ns/shacl#name": [
{
"@value": 1
"@value": "b"
}
],
"http://www.w3.org/ns/shacl#name": [
"http://www.w3.org/ns/shacl#minCount": [
{
"@value": "b"
"@value": 1
}
],
"http://www.w3.org/ns/shacl#path": [
Expand Down Expand Up @@ -658,14 +658,14 @@
]
}
],
"http://www.w3.org/ns/shacl#minCount": [
"http://www.w3.org/ns/shacl#name": [
{
"@value": 1
"@value": "a"
}
],
"http://www.w3.org/ns/shacl#name": [
"http://www.w3.org/ns/shacl#minCount": [
{
"@value": "a"
"@value": 1
}
],
"http://www.w3.org/ns/shacl#path": [
Expand Down Expand Up @@ -694,11 +694,6 @@
"http://a.ml/vocabularies/meta#DialectDomainElement",
"http://a.ml/vocabularies/document#DomainElement"
],
"http://a.ml/vocabularies/core#name": [
{
"@value": "simple"
}
],
"http://a.ml/vocabularies/shapes#schema": [
{
"@id": "file://transform/src/test/resources/transformations/annotations/api.raml#/declarations/annotations/simple/scalar/schema",
Expand All @@ -719,6 +714,11 @@
}
]
}
],
"http://a.ml/vocabularies/core#name": [
{
"@value": "simple"
}
]
},
{
Expand All @@ -729,11 +729,6 @@
"http://a.ml/vocabularies/meta#DialectDomainElement",
"http://a.ml/vocabularies/document#DomainElement"
],
"http://a.ml/vocabularies/core#name": [
{
"@value": "clearanceLevel"
}
],
"http://a.ml/vocabularies/shapes#schema": [
{
"@id": "file://transform/src/test/resources/transformations/annotations/api.raml#/declarations/annotations/clearanceLevel/schema",
Expand Down Expand Up @@ -778,14 +773,14 @@
]
}
],
"http://www.w3.org/ns/shacl#minCount": [
"http://www.w3.org/ns/shacl#name": [
{
"@value": 1
"@value": "signature"
}
],
"http://www.w3.org/ns/shacl#name": [
"http://www.w3.org/ns/shacl#minCount": [
{
"@value": "signature"
"@value": 1
}
],
"http://www.w3.org/ns/shacl#path": [
Expand Down Expand Up @@ -892,14 +887,14 @@
]
}
],
"http://www.w3.org/ns/shacl#minCount": [
"http://www.w3.org/ns/shacl#name": [
{
"@value": 1
"@value": "level"
}
],
"http://www.w3.org/ns/shacl#name": [
"http://www.w3.org/ns/shacl#minCount": [
{
"@value": "level"
"@value": 1
}
],
"http://www.w3.org/ns/shacl#path": [
Expand All @@ -920,6 +915,11 @@
}
]
}
],
"http://a.ml/vocabularies/core#name": [
{
"@value": "clearanceLevel"
}
]
},
{
Expand All @@ -930,11 +930,6 @@
"http://a.ml/vocabularies/meta#DialectDomainElement",
"http://a.ml/vocabularies/document#DomainElement"
],
"http://a.ml/vocabularies/core#name": [
{
"@value": "arrAnot"
}
],
"http://a.ml/vocabularies/shapes#schema": [
{
"@id": "file://transform/src/test/resources/transformations/annotations/api.raml#/declarations/annotations/arrAnot/array/schema",
Expand Down Expand Up @@ -971,6 +966,11 @@
}
]
}
],
"http://a.ml/vocabularies/core#name": [
{
"@value": "arrAnot"
}
]
},
{
Expand All @@ -981,11 +981,6 @@
"http://a.ml/vocabularies/meta#DialectDomainElement",
"http://a.ml/vocabularies/document#DomainElement"
],
"http://a.ml/vocabularies/core#name": [
{
"@value": "annot"
}
],
"http://a.ml/vocabularies/shapes#schema": [
{
"@id": "file://transform/src/test/resources/transformations/annotations/api.raml#/declarations/annotations/annot/schema",
Expand Down Expand Up @@ -1039,14 +1034,14 @@
]
}
],
"http://www.w3.org/ns/shacl#minCount": [
"http://www.w3.org/ns/shacl#name": [
{
"@value": 1
"@value": "lala"
}
],
"http://www.w3.org/ns/shacl#name": [
"http://www.w3.org/ns/shacl#minCount": [
{
"@value": "lala"
"@value": 1
}
],
"http://www.w3.org/ns/shacl#path": [
Expand Down Expand Up @@ -1074,6 +1069,11 @@
}
]
}
],
"http://a.ml/vocabularies/core#name": [
{
"@value": "annot"
}
]
}
],
Expand Down
16 changes: 8 additions & 8 deletions transform/src/test/resources/transformations/declares/webapi.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,14 +156,14 @@
]
}
],
"http://www.w3.org/ns/shacl#minCount": [
"http://www.w3.org/ns/shacl#name": [
{
"@value": 1
"@value": "employeeType"
}
],
"http://www.w3.org/ns/shacl#name": [
"http://www.w3.org/ns/shacl#minCount": [
{
"@value": "employeeType"
"@value": 1
}
],
"http://www.w3.org/ns/shacl#path": [
Expand Down Expand Up @@ -201,14 +201,14 @@
]
}
],
"http://www.w3.org/ns/shacl#minCount": [
"http://www.w3.org/ns/shacl#name": [
{
"@value": 1
"@value": "employeeId"
}
],
"http://www.w3.org/ns/shacl#name": [
"http://www.w3.org/ns/shacl#minCount": [
{
"@value": "employeeId"
"@value": 1
}
],
"http://www.w3.org/ns/shacl#path": [
Expand Down
Loading

0 comments on commit cd91efa

Please sign in to comment.