Merge pull request #75 from aml-org/release/4.7.2

Publish 4.7.2 - amf-vocabulary 9.0.0 and amf-transform 1.9.0
aml-org · Apr 8, 2021 · e507f6d · e507f6d
2 parents 2558735 + 8bc9a60
commit e507f6d
Show file tree

Hide file tree

Showing 13 changed files with 60 additions and 37 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -57,27 +57,6 @@ pipeline {
         }
       }
     }
-    stage('Nexus IQ') {
-      when {
-        anyOf {
-          branch 'develop'
-        }
-      }
-      steps {
-        wrap([$class: 'AnsiColorBuildWrapper', 'colorMapName': 'XTerm']) {
-          script {
-            try{
-              if (failedStage.isEmpty()){
-                sh './gradlew nexusIq'
-              }
-            } catch(ignored) {
-              failedStage = failedStage + " NEXUSIQ "
-              unstable "Failed Nexus IQ"
-            }
-          }
-        }
-      }
-    }
     stage('Publish Vocabulary Artifact') {
       when {
         anyOf {
@@ -156,6 +135,27 @@ pipeline {
         }
       }
     }
+    stage('Nexus IQ') {
+      when {
+        anyOf {
+          branch 'develop'
+        }
+      }
+      steps {
+        wrap([$class: 'AnsiColorBuildWrapper', 'colorMapName': 'XTerm']) {
+          script {
+            try{
+              if (failedStage.isEmpty()){
+                sh './gradlew nexusIq'
+              }
+            } catch(ignored) {
+              failedStage = failedStage + " NEXUSIQ "
+              unstable "Failed Nexus IQ"
+            }
+          }
+        }
+      }
+    }
     stage("Report to Slack") {
       when {
         anyOf {

diff --git a/exporters/src/main/scala/amf/exporters/CanonicalWebAPISpecDialectExporter.scala b/exporters/src/main/scala/amf/exporters/CanonicalWebAPISpecDialectExporter.scala
@@ -388,6 +388,8 @@ class CanonicalWebAPISpecDialectExporter(logger: Logger = ConsoleLogger) {
       |      Server: Server
       |      ResourceType: ResourceType
       |      CustomDomainProperty: CustomDomainProperty
+      |      Operation: Operation
+      |      Message: Message
       |
       |    union:
       |      - UnionShape
@@ -415,6 +417,8 @@ class CanonicalWebAPISpecDialectExporter(logger: Logger = ConsoleLogger) {
       |      - Server
       |      - ResourceType
       |      - CustomDomainProperty
+      |      - Operation
+      |      - Message
       |""".stripMargin
 
   val parsedUnitUnionDeclaration = "ParsedUnitUnion"

diff --git a/transform/dependencies.properties b/transform/dependencies.properties
@@ -1,3 +1,3 @@
 # Leave here for the publication process to detect if amf-transform has to be published!
 # Because we publish a version of amf-transform for each version of amf-client publish.
-amf.client=4.7.1
+amf.client=4.7.2
diff --git a/transform/src/test/resources/transformations/fragments/raml/security-scheme/webapi.json b/transform/src/test/resources/transformations/fragments/raml/security-scheme/webapi.json
@@ -67,7 +67,7 @@
                 ],
                 "http://a.ml/vocabularies/shapes#schema": [
                   {
-                    "@id": "file://transform/src/test/resources/transformations/fragments/raml/security-scheme/api.raml#/fragment/parameter/default-binding/access_token/scalar/schema",
+                    "@id": "file://transform/src/test/resources/transformations/fragments/raml/security-scheme/api.raml#/fragment/parameter/query/access_token/scalar/schema",
                     "@type": [
                       "http://a.ml/vocabularies/shapes#ScalarShape",
                       "file://vocabulary/src/main/resources/dialects/canonical_webapi_spec.yaml#/declarations/ScalarShape",
@@ -226,7 +226,7 @@
                 ],
                 "http://a.ml/vocabularies/shapes#schema": [
                   {
-                    "@id": "file://transform/src/test/resources/transformations/fragments/raml/security-scheme/api.raml#/fragment/parameter/default-binding/Authorization/scalar/schema",
+                    "@id": "file://transform/src/test/resources/transformations/fragments/raml/security-scheme/api.raml#/fragment/parameter/header/Authorization/scalar/schema",
                     "@type": [
                       "http://a.ml/vocabularies/shapes#ScalarShape",
                       "file://vocabulary/src/main/resources/dialects/canonical_webapi_spec.yaml#/declarations/ScalarShape",

diff --git a/transform/src/test/resources/transformations/fragments/raml/security-scheme/webapi.yaml b/transform/src/test/resources/transformations/fragments/raml/security-scheme/webapi.yaml
@@ -18,7 +18,7 @@ encodes:
       binding: query
       schema:
         shapeType: Scalar
-        $id: file://transform/src/test/resources/transformations/fragments/raml/security-scheme/api.raml#/fragment/parameter/default-binding/access_token/scalar/schema
+        $id: file://transform/src/test/resources/transformations/fragments/raml/security-scheme/api.raml#/fragment/parameter/query/access_token/scalar/schema
         name: schema
         description: |
           Used to send a valid OAuth 2 access token. Do not use together with the "Authorization" header.
@@ -59,7 +59,7 @@ encodes:
       binding: header
       schema:
         shapeType: Scalar
-        $id: file://transform/src/test/resources/transformations/fragments/raml/security-scheme/api.raml#/fragment/parameter/default-binding/Authorization/scalar/schema
+        $id: file://transform/src/test/resources/transformations/fragments/raml/security-scheme/api.raml#/fragment/parameter/header/Authorization/scalar/schema
         name: schema
         description: |
           Used to send a valid OAuth 2 access token. Do not use with the "access_token" query. string parameter.

diff --git a/transform/src/test/resources/transformations/message-trait/webapi.yaml b/transform/src/test/resources/transformations/message-trait/webapi.yaml
@@ -1,7 +1,14 @@
 #%WebAPI Spec 1.0
 unitType: Document
 $id: file://transform/src/test/resources/transformations/message-trait/api.yaml#/rootAsset
-declares: []
+declares:
+  -
+    elementType: Message
+    $id: file://transform/src/test/resources/transformations/message-trait/api.yaml#/declarations/messageTraits/myMessageTrait
+    name: myMessageTrait
+    title: something
+    isAbstract: true
+    displayName: human friendly name
 version: 3.0.0
 root: true
 location: file://transform/src/test/resources/transformations/message-trait/api.yaml

diff --git a/transform/src/test/resources/transformations/operation-trait/webapi.yaml b/transform/src/test/resources/transformations/operation-trait/webapi.yaml
@@ -1,7 +1,15 @@
 #%WebAPI Spec 1.0
 unitType: Document
 $id: file://transform/src/test/resources/transformations/operation-trait/api.yaml#/rootAsset
-declares: []
+declares:
+  -
+    elementType: Operation
+    $id: file://transform/src/test/resources/transformations/operation-trait/api.yaml#/declarations/operationTraits/firstTrait
+    name: firstTrait
+    guiSummary: aSummary
+    operationId: traitThing
+    isAbstract: true
+    method: firstTrait
 version: 3.0.0
 root: true
 location: file://transform/src/test/resources/transformations/operation-trait/api.yaml

diff --git a/transform/src/test/resources/transformations/raml-overlay/webapi.json b/transform/src/test/resources/transformations/raml-overlay/webapi.json
@@ -111,7 +111,7 @@
                         ],
                         "http://a.ml/vocabularies/shapes#schema": [
                           {
-                            "@id": "file://transform/src/test/resources/transformations/raml-overlay/base.raml#/web-api/end-points/%2Fbooks%2F%7Bcustomer_id%7D/parameter/default-binding/customer_id/scalar/schema",
+                            "@id": "file://transform/src/test/resources/transformations/raml-overlay/base.raml#/web-api/end-points/%2Fbooks%2F%7Bcustomer_id%7D/parameter/path/customer_id/scalar/schema",
                             "@type": [
                               "http://a.ml/vocabularies/shapes#ScalarShape",
                               "file://vocabulary/src/main/resources/dialects/canonical_webapi_spec.yaml#/declarations/ScalarShape",
@@ -313,7 +313,7 @@
                         ],
                         "http://a.ml/vocabularies/shapes#schema": [
                           {
-                            "@id": "file://transform/src/test/resources/transformations/raml-overlay/base.raml#/web-api/end-points/%2Fbooks%2F%7Bcustomer_id%7D/parameter/default-binding/customer_id/scalar/schema",
+                            "@id": "file://transform/src/test/resources/transformations/raml-overlay/base.raml#/web-api/end-points/%2Fbooks%2F%7Bcustomer_id%7D/parameter/path/customer_id/scalar/schema",
                             "@type": [
                               "http://a.ml/vocabularies/shapes#ScalarShape",
                               "file://vocabulary/src/main/resources/dialects/canonical_webapi_spec.yaml#/declarations/ScalarShape",

diff --git a/transform/src/test/resources/transformations/raml-overlay/webapi.yaml b/transform/src/test/resources/transformations/raml-overlay/webapi.yaml
@@ -34,7 +34,7 @@ references:
               binding: path
               schema:
                 shapeType: Scalar
-                $id: file://transform/src/test/resources/transformations/raml-overlay/base.raml#/web-api/end-points/%2Fbooks%2F%7Bcustomer_id%7D/parameter/default-binding/customer_id/scalar/schema
+                $id: file://transform/src/test/resources/transformations/raml-overlay/base.raml#/web-api/end-points/%2Fbooks%2F%7Bcustomer_id%7D/parameter/path/customer_id/scalar/schema
                 name: schema
                 datatype: http://www.w3.org/2001/XMLSchema#string
           path: /books/{customer_id}

diff --git a/transform/src/test/resources/transformations/security/webapi.json b/transform/src/test/resources/transformations/security/webapi.json
@@ -167,7 +167,7 @@
                 ],
                 "http://a.ml/vocabularies/shapes#schema": [
                   {
-                    "@id": "file://transform/src/test/resources/transformations/security/api.raml#/declarations/securitySchemes/oauth_2_0/parameter/default-binding/Authorization/scalar/schema",
+                    "@id": "file://transform/src/test/resources/transformations/security/api.raml#/declarations/securitySchemes/oauth_2_0/parameter/header/Authorization/scalar/schema",
                     "@type": [
                       "http://a.ml/vocabularies/shapes#ScalarShape",
                       "file://vocabulary/src/main/resources/dialects/canonical_webapi_spec.yaml#/declarations/ScalarShape",
@@ -463,7 +463,7 @@
                                     ],
                                     "http://a.ml/vocabularies/shapes#schema": [
                                       {
-                                        "@id": "file://transform/src/test/resources/transformations/security/api.raml#/declarations/securitySchemes/oauth_2_0/parameter/default-binding/Authorization/scalar/schema",
+                                        "@id": "file://transform/src/test/resources/transformations/security/api.raml#/declarations/securitySchemes/oauth_2_0/parameter/header/Authorization/scalar/schema",
                                         "@type": [
                                           "http://a.ml/vocabularies/shapes#ScalarShape",
                                           "file://vocabulary/src/main/resources/dialects/canonical_webapi_spec.yaml#/declarations/ScalarShape",

diff --git a/transform/src/test/resources/transformations/security/webapi.yaml b/transform/src/test/resources/transformations/security/webapi.yaml
@@ -45,7 +45,7 @@ declares:
         binding: header
         schema:
           shapeType: Scalar
-          $id: file://transform/src/test/resources/transformations/security/api.raml#/declarations/securitySchemes/oauth_2_0/parameter/default-binding/Authorization/scalar/schema
+          $id: file://transform/src/test/resources/transformations/security/api.raml#/declarations/securitySchemes/oauth_2_0/parameter/header/Authorization/scalar/schema
           name: schema
           description: |
             Used to send a valid OAuth 2 access token.
@@ -129,7 +129,7 @@ encodes:
                         binding: header
                         schema:
                           shapeType: Scalar
-                          $id: file://transform/src/test/resources/transformations/security/api.raml#/declarations/securitySchemes/oauth_2_0/parameter/default-binding/Authorization/scalar/schema
+                          $id: file://transform/src/test/resources/transformations/security/api.raml#/declarations/securitySchemes/oauth_2_0/parameter/header/Authorization/scalar/schema
                           name: schema
                           description: |
                             Used to send a valid OAuth 2 access token.

diff --git a/versions.yaml b/versions.yaml
@@ -1,2 +1,2 @@
-amf.vocabulary: 8.0.0
-amf.transform: 1.8.0
+amf.vocabulary: 9.0.0
+amf.transform: 1.9.0
diff --git a/vocabulary/src/main/resources/dialects/canonical_webapi_spec.yaml b/vocabulary/src/main/resources/dialects/canonical_webapi_spec.yaml
@@ -106,6 +106,8 @@ nodeMappings:
       Server: Server
       ResourceType: ResourceType
       CustomDomainProperty: CustomDomainProperty
+      Operation: Operation
+      Message: Message
 
     union:
       - UnionShape
@@ -133,6 +135,8 @@ nodeMappings:
       - Server
       - ResourceType
       - CustomDomainProperty
+      - Operation
+      - Message
 
 
   AbstractDeclarationUnion: