Merge pull request #1960 from aml-org/W-14931280-bis

W-14931280 Add Reolution test for new stages
aml-org · Apr 8, 2024 · d704582 · d704582
2 parents aa48e85 + 5dc125b
commit d704582
Show file tree

Hide file tree

Showing 20 changed files with 2,768 additions and 16 deletions.
diff --git a/...contract/internal/spec/async/parser/bindings/operation/SolaceOperationBindingParser.scala b/...contract/internal/spec/async/parser/bindings/operation/SolaceOperationBindingParser.scala
@@ -1,20 +1,10 @@
 package amf.apicontract.internal.spec.async.parser.bindings.operation
 
-import amf.apicontract.client.scala.model.domain.bindings.solace.{
-  SolaceOperationBinding,
-  SolaceOperationDestination,
-  SolaceOperationQueue,
-  SolaceOperationTopic
-}
-import amf.apicontract.internal.metamodel.domain.bindings.{
-  SolaceOperationBindingModel,
-  SolaceOperationDestinationModel,
-  SolaceOperationQueueModel,
-  SolaceOperationTopicModel
-}
+import amf.apicontract.client.scala.model.domain.bindings.solace.{SolaceOperationBinding, SolaceOperationDestination, SolaceOperationQueue, SolaceOperationTopic}
+import amf.apicontract.internal.metamodel.domain.bindings.{SolaceOperationBindingModel, SolaceOperationDestinationModel, SolaceOperationQueueModel, SolaceOperationTopicModel}
 import amf.apicontract.internal.spec.async.parser.bindings.BindingParser
 import amf.apicontract.internal.spec.async.parser.context.AsyncWebApiContext
-import amf.core.client.scala.model.domain.AmfScalar
+import amf.core.client.scala.model.domain.{AmfArray, AmfScalar}
 import amf.core.internal.parser.domain.Annotations
 import org.yaml.model.{YMap, YMapEntry}
 import amf.core.internal.parser.YMapOps
@@ -26,7 +16,7 @@ object SolaceOperationBindingParser extends BindingParser[SolaceOperationBinding
 
     map.key("destinations").foreach { entry =>
       val destinations = entry.value.as[Seq[YMap]].map(parseDestination)
-      binding.setArrayWithoutId(SolaceOperationBindingModel.Destinations, destinations)
+      binding.setWithoutId(SolaceOperationBindingModel.Destinations, AmfArray(destinations, Annotations(entry.value)), Annotations(entry))
     }
 
     parseBindingVersion(binding, SolaceOperationBindingModel.BindingVersion, map)
@@ -39,7 +29,7 @@ object SolaceOperationBindingParser extends BindingParser[SolaceOperationBinding
   private def parseDestination(map: YMap)(implicit
       ctx: AsyncWebApiContext
   ): SolaceOperationDestination = {
-    val destination = SolaceOperationDestination(Annotations())
+    val destination = SolaceOperationDestination(Annotations(map))
 
     map.key("destinationType", SolaceOperationDestinationModel.DestinationType in destination)
 

diff --git a/amf-cli/shared/src/test/resources/resolution/async20/channel-server-2.4.yaml b/amf-cli/shared/src/test/resources/resolution/async20/channel-server-2.4.yaml
@@ -0,0 +1,27 @@
+asyncapi: 2.4.0
+info:
+  title: API
+  version: "1.0"
+
+channels:
+  users/signup:
+    servers:
+      - development
+      - staging
+
+servers:
+  development:
+    url: development.gigantic-server.com
+    protocol: amqp
+    protocolVersion: 0.9.1
+    description: Development server
+  staging:
+    url: staging.gigantic-server.com
+    protocol: amqp
+    protocolVersion: 0.9.1
+    description: Staging server
+  production:
+    url: api.gigantic-server.com
+    protocol: amqp
+    protocolVersion: 0.9.1
+    description: Production server
diff --git a/amf-cli/shared/src/test/resources/resolution/async20/channel-server-2.5.yaml b/amf-cli/shared/src/test/resources/resolution/async20/channel-server-2.5.yaml
@@ -0,0 +1,27 @@
+asyncapi: 2.5.0
+info:
+  title: API
+  version: "1.0"
+
+channels:
+  users/signup:
+    servers:
+      - development
+      - staging
+
+servers:
+  development:
+    url: development.gigantic-server.com
+    protocol: amqp
+    protocolVersion: 0.9.1
+    description: Development server
+  staging:
+    url: staging.gigantic-server.com
+    protocol: amqp
+    protocolVersion: 0.9.1
+    description: Staging server
+  production:
+    url: api.gigantic-server.com
+    protocol: amqp
+    protocolVersion: 0.9.1
+    description: Production server
diff --git a/amf-cli/shared/src/test/resources/resolution/async20/channel-server-2.6.yaml b/amf-cli/shared/src/test/resources/resolution/async20/channel-server-2.6.yaml
@@ -0,0 +1,27 @@
+asyncapi: 2.6.0
+info:
+  title: API
+  version: "1.0"
+
+channels:
+  users/signup:
+    servers:
+      - development
+      - staging
+
+servers:
+  development:
+    url: development.gigantic-server.com
+    protocol: amqp
+    protocolVersion: 0.9.1
+    description: Development server
+  staging:
+    url: staging.gigantic-server.com
+    protocol: amqp
+    protocolVersion: 0.9.1
+    description: Staging server
+  production:
+    url: api.gigantic-server.com
+    protocol: amqp
+    protocolVersion: 0.9.1
+    description: Production server