Merge pull request #259 from aml-org/publish-46.0.0

W-14875427 Publish 46.0.0

exporters/src/test/scala/amf/exporters/VocabularyPropertiesTest.scala

@@ -26,7 +26,7 @@ class VocabularyPropertiesTest extends AsyncFunSuite with VocabularyTest {
   }
 
   test("Vocabularies parsing api_contract") {
-    testVocabulary(api_contract, 32, 47)
+    testVocabulary(api_contract, 32, 49)
   }
 
   test("Vocabularies parsing core") {

transform/dependencies.properties

@@ -1,4 +1,4 @@
 # 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.apicontract=5.4.8
-amf.rdf=6.4.8
+amf.apicontract=5.4.9
+amf.rdf=6.4.9

versions.yaml

@@ -1,2 +1,2 @@
-amf.vocabulary: 45.0.0
-amf.transform: 2.29.0
+amf.vocabulary: 46.0.0
+amf.transform: 2.30.0

vocabulary/src/main/resources/dialects/canonical_webapi_spec.yaml

@@ -594,6 +594,33 @@ nodeMappings:
         range: string
 
 
+  AnypointMQChannelBinding:
+    classTerm: apiBinding.AnypointMQChannelBinding
+    extends: ChannelBinding
+    mapping:
+      destination:
+        propertyTerm: apiBinding.destination
+        range: string
+      destinationType:
+        propertyTerm: apiBinding.destinationType
+        range: string
+      bindingVersion:
+        propertyTerm: apiBinding.bindingVersion
+        range: string
+
+
+  AnypointMQMessageBinding:
+    classTerm: apiBinding.AnypointMQMessageBinding
+    extends: MessageBinding
+    mapping:
+      headers:
+        propertyTerm: apiBinding.headers
+        range: DataShapesUnion
+      bindingVersion:
+        propertyTerm: apiBinding.bindingVersion
+        range: string
+
+
   ArrayNode:
     classTerm: data.Array
     extends: DataNode
@@ -1230,6 +1257,112 @@ nodeMappings:
         range: string
 
 
+  IBMMQChannelBinding:
+    classTerm: apiBinding.IBMMQChannelBinding
+    extends: ChannelBinding
+    mapping:
+      destinationType:
+        propertyTerm: apiBinding.destinationType
+        range: string
+      queue:
+        propertyTerm: apiBinding.queue
+        range: IBMMQChannelQueue
+      topic:
+        propertyTerm: apiBinding.topic
+        range: IBMMQChannelTopic
+      maxMsgLength:
+        propertyTerm: apiBinding.maxMsgLength
+        range: integer
+      bindingVersion:
+        propertyTerm: apiBinding.bindingVersion
+        range: string
+
+
+  IBMMQChannelQueue:
+    classTerm: apiBinding.IBMMQChannelQueue
+    mapping:
+      objectName:
+        propertyTerm: apiBinding.objectName
+        range: string
+      isPartitioned:
+        propertyTerm: apiBinding.isPartitioned
+        range: boolean
+      exclusive:
+        propertyTerm: apiBinding.exclusive
+        range: boolean
+      designAnnotations:
+        propertyTerm: doc.designAnnotation
+        range: DomainExtension
+        allowMultiple: true
+
+
+  IBMMQChannelTopic:
+    classTerm: apiBinding.IBMMQChannelTopic
+    mapping:
+      string:
+        propertyTerm: apiBinding.string
+        range: string
+      objectName:
+        propertyTerm: apiBinding.objectName
+        range: string
+      durablePermitted:
+        propertyTerm: apiBinding.durablePermitted
+        range: boolean
+      lastMsgRetained:
+        propertyTerm: apiBinding.lastMsgRetained
+        range: boolean
+      designAnnotations:
+        propertyTerm: doc.designAnnotation
+        range: DomainExtension
+        allowMultiple: true
+
+
+  IBMMQMessageBinding:
+    classTerm: apiBinding.IBMMQMessageBinding
+    extends: MessageBinding
+    mapping:
+      type:
+        propertyTerm: apiBinding.messageType
+        range: string
+      headers:
+        propertyTerm: apiBinding.headers
+        range: string
+        allowMultiple: true
+      ProvidesAdditionalInformationForApplicationDevelopers:DescribesTheMessageTypeOrFormat.:
+        propertyTerm: core.description
+        range: string
+      expiry:
+        propertyTerm: apiBinding.expiry
+        range: integer
+      bindingVersion:
+        propertyTerm: apiBinding.bindingVersion
+        range: string
+
+
+  IBMMQServerBinding:
+    classTerm: apiBinding.IBMMQServerBinding
+    extends: ServerBinding
+    mapping:
+      groupId:
+        propertyTerm: apiBinding.groupId
+        range: string
+      ccdtQueueManagerName:
+        propertyTerm: apiBinding.ccdtQueueManagerName
+        range: string
+      cipherSpec:
+        propertyTerm: apiBinding.cipherSpec
+        range: string
+      multiEndpointServer:
+        propertyTerm: apiBinding.multiEndpointServer
+        range: boolean
+      heartBeatInterval:
+        propertyTerm: apiBinding.heartBeatInterval
+        range: integer
+      bindingVersion:
+        propertyTerm: apiBinding.bindingVersion
+        range: string
+
+
   IriTemplate:
     classTerm: apiContract.IriTemplateMapping
     mapping:
@@ -1401,6 +1534,9 @@ nodeMappings:
       headerSchema:
         propertyTerm: apiContract.headerSchema
         range: NodeShape
+      messageId:
+        propertyTerm: apiContract.messageId
+        range: string
       designLink:
         propertyTerm: doc.design-link-target
         range: link
@@ -2143,6 +2279,9 @@ nodeMappings:
       headerSchema:
         propertyTerm: apiContract.headerSchema
         range: NodeShape
+      messageId:
+        propertyTerm: apiContract.messageId
+        range: string
       designLink:
         propertyTerm: doc.design-link-target
         range: link
@@ -2221,6 +2360,9 @@ nodeMappings:
       headerSchema:
         propertyTerm: apiContract.headerSchema
         range: NodeShape
+      messageId:
+        propertyTerm: apiContract.messageId
+        range: string
       designLink:
         propertyTerm: doc.design-link-target
         range: link
@@ -2403,6 +2545,10 @@ nodeMappings:
       description:
         propertyTerm: core.description
         range: string
+      tags:
+        propertyTerm: apiContract.tags
+        range: Parameter
+        allowMultiple: true
       variable:
         propertyTerm: apiContract.variable
         range: Parameter

vocabulary/src/main/resources/vocabularies/api_binding.yaml

@@ -18,6 +18,12 @@ classTerms:
   Amqp091OperationBinding:
     displayName: Amqp091OperationBinding
     extends: OperationBinding
+  AnypointMQChannelBinding:
+    displayName: AnypointMQChannelBinding
+    extends: ChannelBinding
+  AnypointMQMessageBinding:
+    displayName: AnypointMQMessageBinding
+    extends: MessageBinding
   ChannelBinding:
     displayName: ChannelBinding
   ChannelBindings:
@@ -35,6 +41,19 @@ classTerms:
   HttpOperationBinding:
     displayName: HttpOperationBinding
     extends: OperationBinding
+  IBMMQChannelBinding:
+    displayName: IBMMQChannelBinding
+    extends: ChannelBinding
+  IBMMQChannelQueue:
+    displayName: IBMMQChannelQueue
+  IBMMQChannelTopic:
+    displayName: IBMMQChannelTopic
+  IBMMQMessageBinding:
+    displayName: IBMMQMessageBinding
+    extends: MessageBinding
+  IBMMQServerBinding:
+    displayName: IBMMQServerBinding
+    extends: ServerBinding
   KafkaMessageBinding:
     displayName: KafkaMessageBinding
     extends:
@@ -98,6 +117,14 @@ propertyTerms:
     displayName: cc
     description: The routing keys the message should be routed to at the time of publishing
     range: string
+  ccdtQueueManagerName:
+    displayName: ccdtQueueManagerName
+    description: The name of the IBM MQ queue manager to bind to in the CCDT file.
+    range: string
+  cipherSpec:
+    displayName: cipherSpec
+    description: The recommended cipher specification used to establish a TLS connection between the client and the IBM MQ queue manager.
+    range: string
   cleanSession:
     displayName: cleanSession
     description: Whether to create a persistent connection or not
@@ -114,10 +141,22 @@ propertyTerms:
     displayName: deliveryMode
     description: Delivery mode of the message
     range: integer
+  destination:
+    displayName: destination
+    description: The destination (queue or exchange) name for this channel.
+    range: string
+  destinationType:
+    displayName: destinationType
+    description: The type of destination (either exchange or queue or fifo-queue).
+    range: string
   durable:
     displayName: durable
     description: Whether the exchange should survive broker restarts or not
     range: boolean
+  durablePermitted:
+    displayName: durablePermitted
+    description: Defines if the subscription may be durable.
+    range: boolean
   exchange:
     displayName: exchange
     description: Defines the exchange properties
@@ -130,6 +169,10 @@ propertyTerms:
     displayName: expiration
     description: TTL (Time-To-Live) for the message
     range: integer
+  expiry:
+    displayName: expiry
+    description: This is a period of time expressed in milliseconds and set by the application that puts the message.
+    range: integer
   groupId:
     displayName: groupId
     description: Schema that defines the id of the consumer group
@@ -138,14 +181,26 @@ propertyTerms:
     displayName: headers
     description: A Schema object containing the definitions for HTTP-specific headers
     range: shacl.Shape
+  heartBeatInterval:
+    displayName: heartBeatInterval
+    description: The recommended value (in seconds) for the heartbeat sent to the queue manager during periods of inactivity. A value of zero means that no heart beats are sent. A value of 1 means that the client will use the value defined by the queue manager.
+    range: integer
   is:
     displayName: is
     description: Defines what type of channel is it
     range: string
+  isPartitioned:
+    displayName: isPartitioned
+    description: Defines if the queue is a cluster queue and therefore partitioned. If true, a binding option MAY be specified when accessing the queue.
+    range: boolean
   keepAlive:
     displayName: keepAlive
     description: Interval in seconds of the longest period of time the broker and the client can endure without sending a message
     range: integer
+  lastMsgRetained:
+    displayName: lastMsgRetained
+    description: Defines if the last message published will be made available to new subscriptions.
+    range: boolean
   lastWill:
     displayName: lastWill
     description: Last Will and Testament configuration
@@ -154,6 +209,10 @@ propertyTerms:
     displayName: mandatory
     description: Whether the message is mandatory or not
     range: boolean
+  maxMsgLength:
+    displayName: maxMsgLength
+    description: The maximum length of the physical message (in bytes) accepted by the Topic or Queue. Messages produced that are greater in size than this value may fail to be delivered.
+    range: integer
   message:
     displayName: message
     description: Message used to notify other clients about an ungracefully disconnected client.
@@ -170,6 +229,14 @@ propertyTerms:
     displayName: method
     description: The HTTP method to use when establishing the connection
     range: string
+  multiEndpointServer:
+    displayName: multiEndpointServer
+    description: If multiEndpointServer is true then multiple connections can be workload balanced and applications should not make assumptions as to where messages are processed. Where message ordering, or affinity to specific message resources is necessary, a single endpoint (multiEndpointServer = false) may be required.
+    range: boolean
+  objectName:
+    displayName: objectName
+    description: The name of the IBM MQ topic object.
+    range: string
   operationType:
     displayName: type
     description: Type of operation
@@ -198,6 +265,10 @@ propertyTerms:
     displayName: retain
     description: Whether the broker should retain the Last Will and Testament message or not
     range: boolean
+  string:
+    displayName: string
+    description: The value of the IBM MQ topic string to be used.
+    range: string
   timestamp:
     displayName: timestamp
     description: Whether the message should include a timestamp or not

vocabulary/src/main/resources/vocabularies/api_contract.yaml

@@ -236,6 +236,10 @@ propertyTerms:
     displayName: mapping
     description: Variable mapping for the URL template
     range: IriTemplateMapping
+  messageId:
+    displayName: messageId
+    description: Unique Id for request and response message
+    range: string
   method:
     displayName: method
     description: HTTP method required to invoke the operation
@@ -319,6 +323,10 @@ propertyTerms:
     displayName: tag
     description: Additionally custom tagged information
     range: Tag
+  tags:
+    displayName: tags
+    description: Tags for the different Servers
+    range: Parameter
   template:
     displayName: template
     description: URL template for a templated link