diff --git a/.jvmopts b/.jvmopts index b2cb4a3bcd..3288aa8c23 100644 --- a/.jvmopts +++ b/.jvmopts @@ -1,4 +1,4 @@ --Xms512M --Xmx4096M +-Xms1G +-Xmx16G -Xss2M -XX:MaxMetaspaceSize=1024M diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 0000000000..e0325e5adb --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +v16.17.1 diff --git a/.sdkmanrc b/.sdkmanrc new file mode 100644 index 0000000000..113d5f7f5b --- /dev/null +++ b/.sdkmanrc @@ -0,0 +1,5 @@ +# Enable auto-env through the sdkman_auto_env config +# Add key=value pairs of SDKs to use below +java=17.0.10-tem +scala=2.12.15 +sbt=1.7.3 \ No newline at end of file diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/model/domain/Message.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/model/domain/Message.scala index ad2424c1c2..9818f72e51 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/model/domain/Message.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/model/domain/Message.scala @@ -34,6 +34,7 @@ class Message(override private[amf] val _internal: InternalMessage) def summary: StrField = _internal.summary def bindings: MessageBindings = _internal.bindings def headerSchema: NodeShape = _internal.headerSchema + def messageId: StrField = _internal.messageId /** Set name property of this Response. */ override def withName(name: String): this.type = { @@ -95,6 +96,10 @@ class Message(override private[amf] val _internal: InternalMessage) _internal.withHeaderSchema(schema) this } + def withMessageId(messageId: String): this.type = { + _internal.withMessageId(messageId) + this + } def withPayload(mediaType: ClientOption[String]): Payload = _internal.withPayload(mediaType.toScala) diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/model/domain/bindings/googlepubsub/GooglePubSubChannelBinding.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/model/domain/bindings/googlepubsub/GooglePubSubChannelBinding.scala new file mode 100644 index 0000000000..87f023e201 --- /dev/null +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/model/domain/bindings/googlepubsub/GooglePubSubChannelBinding.scala @@ -0,0 +1,92 @@ +package amf.apicontract.client.platform.model.domain.bindings.googlepubsub + +import amf.apicontract.client.platform.model.domain.bindings.{BindingVersion, ChannelBinding} +import amf.apicontract.client.scala.model.domain.bindings.googlepubsub.{GooglePubSubChannelBinding => InternalGooglePubSubChannelBinding, GooglePubSubMessageStoragePolicy => InternalGooglePubSubMessageStoragePolicy, GooglePubSubSchemaSettings => InternalGooglePubSubSchemaSettings} +import amf.apicontract.internal.convert.ApiClientConverters._ +import amf.core.client.platform.model.StrField +import amf.core.client.platform.model.domain.{DomainElement, Linkable, ObjectNode} +import amf.shapes.client.scala.model.domain.NodeShape + +import scala.scalajs.js.annotation.{JSExportAll, JSExportTopLevel} + +@JSExportAll +case class GooglePubSubChannelBinding(override private[amf] val _internal: InternalGooglePubSubChannelBinding) + extends ChannelBinding + with BindingVersion { + @JSExportTopLevel("GooglePubSubChannelBinding") + def this() = this(InternalGooglePubSubChannelBinding()) + + override def bindingVersion: StrField = _internal.bindingVersion + + def labels: ObjectNode = _internal.labels + def messageRetentionDuration: StrField = _internal.messageRetentionDuration + def messageStoragePolicy: GooglePubSubMessageStoragePolicy = _internal.messageStoragePolicy + def schemaSettings: GooglePubSubSchemaSettings = _internal.schemaSettings + def topic: StrField = _internal.topic + + + def withLabels(labels: ObjectNode): this.type = { + _internal.withLabels(labels) + this + } + def withMessageRetentionDuration(messageRetentionDuration: String): this.type = { + _internal.withMessageRetentionDuration(messageRetentionDuration) + this + } + def withMessageStoragePolicy(messageStoragePolicy: GooglePubSubMessageStoragePolicy): this.type = { + _internal.withMessageStoragePolicy(messageStoragePolicy._internal) + this + } + def withSchemaSettings(schemaSettings: GooglePubSubSchemaSettings): this.type = { + _internal.withSchemaSettings(schemaSettings._internal) + this + } + def withTopic(topic: String): this.type = { + _internal.withTopic(topic) + this + } + + override def withBindingVersion(bindingVersion: String): this.type = { + _internal.withBindingVersion(bindingVersion) + this + } + + override def linkCopy(): GooglePubSubChannelBinding = _internal.linkCopy() +} + +@JSExportAll +case class GooglePubSubMessageStoragePolicy(override private[amf] val _internal: InternalGooglePubSubMessageStoragePolicy) extends DomainElement { + @JSExportTopLevel("GooglePubSubMessageStoragePolicy") + def this() = this(InternalGooglePubSubMessageStoragePolicy()) + def allowedPersistenceRegions: ClientList[StrField] = _internal.allowedPersistenceRegions.asClient + def withAllowedPersistenceRegions(allowedPersistenceRegions: ClientList[String]): this.type = { + _internal.withAllowedPersistenceRegions(allowedPersistenceRegions.asInternal) + this + } +} + +@JSExportAll +case class GooglePubSubSchemaSettings(override private[amf] val _internal: InternalGooglePubSubSchemaSettings) extends DomainElement { + @JSExportTopLevel("GooglePubSubSchemaSettings") + def this() = this(InternalGooglePubSubSchemaSettings()) + def encoding: StrField = _internal.encoding + def firstRevisionId: StrField = _internal.firstRevisionId + def lastRevisionId: StrField = _internal.lastRevisionId + def name: StrField = _internal.name + def withEncoding(encoding: String): this.type = { + _internal.withEncoding(encoding) + this + } + def withFirstRevisionId(firstRevisionId: String): this.type = { + _internal.withFirstRevisionId(firstRevisionId) + this + } + def withLastRevisionId(lastRevisionId: String): this.type = { + _internal.withLastRevisionId(lastRevisionId) + this + } + def withName(name: String): this.type = { + _internal.withName(name) + this + } +} diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/model/domain/bindings/googlepubsub/GooglePubSubMessageBinding.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/model/domain/bindings/googlepubsub/GooglePubSubMessageBinding.scala new file mode 100644 index 0000000000..f567c00c07 --- /dev/null +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/model/domain/bindings/googlepubsub/GooglePubSubMessageBinding.scala @@ -0,0 +1,62 @@ +package amf.apicontract.client.platform.model.domain.bindings.googlepubsub + +import amf.apicontract.client.platform.model.domain.bindings.{BindingVersion, MessageBinding} +import amf.apicontract.client.scala.model.domain.bindings.googlepubsub.{GooglePubSubMessageBinding => InternalGooglePubSubMessageBinding, GooglePubSubSchemaDefinition => InternalGooglePubSubSchemaDefinition} +import amf.core.client.platform.model.StrField +import amf.core.client.platform.model.domain.{DomainElement, ObjectNode} +import amf.apicontract.internal.convert.ApiClientConverters._ + +import scala.scalajs.js.annotation.{JSExportAll, JSExportTopLevel} + + +@JSExportAll +case class GooglePubSubMessageBinding(override private[amf] val _internal: InternalGooglePubSubMessageBinding) + extends MessageBinding + with BindingVersion { + @JSExportTopLevel("GooglePubSubMessageBinding") + def this() = this(InternalGooglePubSubMessageBinding()) + + override protected def bindingVersion: StrField = _internal.bindingVersion + def attributes: ObjectNode = _internal.attributes + def orderingKey: StrField = _internal.orderingKey + def schema: GooglePubSubSchemaDefinition = new GooglePubSubSchemaDefinition(_internal.schema) + + def withAttributes(attributes: ObjectNode): this.type = { + _internal.withAttributes(attributes) + this + } + def withOrderingKey(orderingKey: String): this.type = { + _internal.withOrderingKey(orderingKey) + this + } + def withSchema(schema: GooglePubSubSchemaDefinition): this.type = { + _internal.withSchema(schema) + this + } + override def withBindingVersion(bindingVersion: String): GooglePubSubMessageBinding.this.type = { + _internal.withBindingVersion(bindingVersion) + this + } + + override def linkCopy(): GooglePubSubMessageBinding = new GooglePubSubMessageBinding(_internal.linkCopy()) + +} + +@JSExportAll +case class GooglePubSubSchemaDefinition(override private[amf] val _internal: InternalGooglePubSubSchemaDefinition) extends DomainElement { + @JSExportTopLevel("GooglePubSubSchemaDefinition") + def this() = this(InternalGooglePubSubSchemaDefinition()) + + def name: StrField = _internal.name + def fieldType: StrField = _internal.fieldType + + def withName(name: String): this.type = { + _internal.withName(name) + this + } + def withFieldType(fieldType: String): this.type = { + _internal.withFieldType(fieldType) + this + } + +} diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/model/domain/bindings/ibmmq/IBMMQChannelBinding.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/model/domain/bindings/ibmmq/IBMMQChannelBinding.scala index 7723033976..93ed690ec1 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/model/domain/bindings/ibmmq/IBMMQChannelBinding.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/model/domain/bindings/ibmmq/IBMMQChannelBinding.scala @@ -67,7 +67,7 @@ case class IBMMQChannelQueue(override private[amf] val _internal: InternalIBMMQC def isPartitioned: BoolField = _internal.isPartitioned def exclusive: BoolField = _internal.exclusive - def withObjectName(objectName: Boolean): this.type = { + def withObjectName(objectName: String): this.type = { _internal.withObjectName(objectName) this } @@ -98,17 +98,17 @@ case class IBMMQChannelTopic(override private[amf] val _internal: InternalIBMMQC @JSExportTopLevel("IBMMQChannelTopic") def this() = this(InternalIBMMQChannelTopic()) - def string: BoolField = _internal.string + def string: StrField = _internal.string def objectName: StrField = _internal.objectName def durablePermitted: BoolField = _internal.durablePermitted def lastMsgRetained: BoolField = _internal.lastMsgRetained - def withString(string: Boolean): this.type = { + def withString(string: String): this.type = { _internal.withString(string) this } - def withObjectName(objectName: Boolean): this.type = { + def withObjectName(objectName: String): this.type = { _internal.withObjectName(objectName) this } diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/model/domain/bindings/ibmmq/IBMMQMessageBinding.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/model/domain/bindings/ibmmq/IBMMQMessageBinding.scala index 9fe123b4f4..2047443d9b 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/model/domain/bindings/ibmmq/IBMMQMessageBinding.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/model/domain/bindings/ibmmq/IBMMQMessageBinding.scala @@ -40,7 +40,7 @@ case class IBMMQMessageBinding(override private[amf] val _internal: InternalIBMM this } - override protected def bindingVersion: model.StrField = _internal.bindingVersion + override protected def bindingVersion: StrField = _internal.bindingVersion override def withBindingVersion(bindingVersion: String): this.type = { _internal.withBindingVersion(bindingVersion) diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/model/domain/bindings/ibmmq/IBMMQServerBinding.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/model/domain/bindings/ibmmq/IBMMQServerBinding.scala index 1e6c514515..8c5737d1cb 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/model/domain/bindings/ibmmq/IBMMQServerBinding.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/model/domain/bindings/ibmmq/IBMMQServerBinding.scala @@ -46,7 +46,7 @@ case class IBMMQServerBinding(override private[amf] val _internal: InternalIBMMQ this } - override protected def bindingVersion: model.StrField = _internal.bindingVersion + override protected def bindingVersion: StrField = _internal.bindingVersion override def withBindingVersion(bindingVersion: String): this.type = { _internal.withBindingVersion(bindingVersion) diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/model/domain/bindings/pulsar/PulsarChannelBinding.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/model/domain/bindings/pulsar/PulsarChannelBinding.scala new file mode 100644 index 0000000000..eeea7786f8 --- /dev/null +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/model/domain/bindings/pulsar/PulsarChannelBinding.scala @@ -0,0 +1,93 @@ +package amf.apicontract.client.platform.model.domain.bindings.pulsar + +import amf.apicontract.client.platform.model.domain.bindings.{BindingVersion, ChannelBinding} +import amf.apicontract.client.scala.model.domain.bindings.pulsar.{ + PulsarChannelBinding => InternalPulsarChannelBinding, + PulsarChannelRetention => InternalPulsarChannelRetention +} +import amf.apicontract.internal.convert.ApiClientConverters._ +import amf.core.client.platform.model +import amf.core.client.platform.model.domain.DomainElement +import amf.core.client.platform.model.{IntField, StrField, BoolField} + +import scala.scalajs.js.annotation.{JSExportAll, JSExportTopLevel} + +@JSExportAll +case class PulsarChannelBinding(override private[amf] val _internal: InternalPulsarChannelBinding) + extends ChannelBinding + with BindingVersion { + @JSExportTopLevel("PulsarChannelBinding") + def this() = this(InternalPulsarChannelBinding()) + + def namespace: StrField = _internal.namespace + def persistence: StrField = _internal.persistence + def compaction: IntField = _internal.compaction + def geoReplication: ClientList[StrField] = _internal.geoReplication.asClient + def retention: PulsarChannelRetention = _internal.retention + def ttl: IntField = _internal.ttl + def deduplication: BoolField = _internal.deduplication + + def withNamespace(namespace: String): this.type = { + _internal.withNamespace(namespace) + this + } + + def withPersistence(persistence: String): this.type = { + _internal.withPersistence(persistence) + this + } + + def withCompaction(compaction: Int): this.type = { + _internal.withCompaction(compaction) + this + } + + def withGeoReplication(geoReplication: ClientList[String]): this.type = { + _internal.withGeoReplication(geoReplication.asInternal) + this + } + + def withRetention(retention: PulsarChannelRetention): this.type = { + _internal.withRetention(retention) + this + } + + def withTtl(ttl: Int): this.type = { + _internal.withTtl(ttl) + this + } + + def withDeduplication(deduplication: Boolean): this.type = { + _internal.withDeduplication(deduplication) + this + } + + override protected def bindingVersion: StrField = _internal.bindingVersion + + override def withBindingVersion(bindingVersion: String): this.type = { + _internal.withBindingVersion(bindingVersion) + this + } + + override def linkCopy(): PulsarChannelBinding = _internal.linkCopy() +} + +@JSExportAll +case class PulsarChannelRetention(override private[amf] val _internal: InternalPulsarChannelRetention) + extends DomainElement { + + @JSExportTopLevel("PulsarChannelRetention") + def this() = this(InternalPulsarChannelRetention()) + + def time: IntField = _internal.time + def size: IntField = _internal.size + + def withTime(time: Int): this.type = { + _internal.withTime(time) + this + } + def withSize(size: Int): this.type = { + _internal.withSize(size) + this + } +} diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/model/domain/bindings/pulsar/PulsarServerBinding.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/model/domain/bindings/pulsar/PulsarServerBinding.scala new file mode 100644 index 0000000000..d35078bf0b --- /dev/null +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/model/domain/bindings/pulsar/PulsarServerBinding.scala @@ -0,0 +1,33 @@ +package amf.apicontract.client.platform.model.domain.bindings.pulsar + +import amf.apicontract.client.platform.model.domain.bindings.{BindingVersion, ServerBinding} +import amf.apicontract.client.scala.model.domain.bindings.pulsar.{PulsarServerBinding => InternalPulsarServerBinding} +import amf.apicontract.internal.convert.ApiClientConverters._ +import amf.core.client.platform.model +import amf.core.client.platform.model.StrField + +import scala.scalajs.js.annotation.{JSExportAll, JSExportTopLevel} + +@JSExportAll +case class PulsarServerBinding(override private[amf] val _internal: InternalPulsarServerBinding) + extends ServerBinding + with BindingVersion { + @JSExportTopLevel("PulsarServerBinding") + def this() = this(InternalPulsarServerBinding()) + + def tenant: StrField = _internal.tenant + + def withTenant(tenant: String): this.type = { + _internal.withTenant(tenant) + this + } + + override protected def bindingVersion: model.StrField = _internal.bindingVersion + + override def withBindingVersion(bindingVersion: String): this.type = { + _internal.withBindingVersion(bindingVersion) + this + } + + override def linkCopy(): PulsarServerBinding = _internal.linkCopy() +} diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/model/domain/bindings/solace/SolaceOperationBinding.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/model/domain/bindings/solace/SolaceOperationBinding.scala new file mode 100644 index 0000000000..6490dbb0ca --- /dev/null +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/model/domain/bindings/solace/SolaceOperationBinding.scala @@ -0,0 +1,127 @@ +package amf.apicontract.client.platform.model.domain.bindings.solace + +import amf.apicontract.client.platform.model.domain.bindings.{BindingVersion, OperationBinding} +import amf.apicontract.client.scala.model.domain.bindings.solace.{ + SolaceOperationBinding => InternalSolaceOperationBinding, + SolaceOperationDestination => InternalSolaceOperationDestination, + SolaceOperationQueue => InternalSolaceOperationQueue, + SolaceOperationTopic => InternalSolaceOperationTopic +} +import amf.apicontract.internal.convert.ApiClientConverters._ +import amf.core.client.platform.model.StrField +import amf.core.client.platform.model.domain.{DomainElement, NamedDomainElement} + +import scala.scalajs.js.annotation.{JSExportAll, JSExportTopLevel} + +@JSExportAll +case class SolaceOperationBinding(override private[amf] val _internal: InternalSolaceOperationBinding) + extends OperationBinding + with BindingVersion { + @JSExportTopLevel("SolaceOperationBinding") + def this() = this(InternalSolaceOperationBinding()) + + def destinations: ClientList[SolaceOperationDestination] = _internal.destinations.asClient + + def withDestinations(destinations: ClientList[SolaceOperationDestination]): this.type = { + _internal.withDestinations(destinations.asInternal) + this + } + + override protected def bindingVersion: StrField = _internal.bindingVersion + + override def withBindingVersion(bindingVersion: String): this.type = { + _internal.withBindingVersion(bindingVersion) + this + } + + override def linkCopy(): SolaceOperationBinding = _internal.linkCopy() +} + +@JSExportAll +case class SolaceOperationDestination(override private[amf] val _internal: InternalSolaceOperationDestination) + extends DomainElement { + + @JSExportTopLevel("SolaceOperationDestination") + def this() = this(InternalSolaceOperationDestination()) + + def destinationType: StrField = _internal.destinationType + def deliveryMode: StrField = _internal.deliveryMode + + def withDestinationType(destinationType: String): this.type = { + _internal.withDestinationType(destinationType) + this + } + def withDeliveryMode(deliveryMode: String): this.type = { + _internal.withDeliveryMode(deliveryMode) + this + } + + def queue: SolaceOperationQueue = _internal.queue + def topic: SolaceOperationTopic = _internal.topic + + def withQueue(queue: SolaceOperationQueue): this.type = { + _internal.withQueue(queue) + this + } + + def withTopic(topic: SolaceOperationTopic): this.type = { + _internal.withTopic(topic) + this + } +} + +@JSExportAll +case class SolaceOperationQueue(override private[amf] val _internal: InternalSolaceOperationQueue) + extends DomainElement + with NamedDomainElement { + + @JSExportTopLevel("SolaceOperationQueue") + def this() = this(InternalSolaceOperationQueue()) + + def topicSubscriptions: ClientList[StrField] = _internal.topicSubscriptions.asClient + def accessType: StrField = _internal.accessType + def maxMsgSpoolSize: StrField = _internal.maxMsgSpoolSize + def maxTtl: StrField = _internal.maxTtl + + def withTopicSubscriptions(topicSubscriptions: ClientList[String]): this.type = { + _internal.withTopicSubscriptions(topicSubscriptions.asInternal) + this + } + + def withAccessType(accessType: String): this.type = { + _internal.withAccessType(accessType) + this + } + + def withMaxMsgSpoolSize(maxMsgSpoolSize: String): this.type = { + _internal.withMaxMsgSpoolSize(maxMsgSpoolSize) + this + } + + def withMaxTtl(maxTtl: String): this.type = { + _internal.withMaxTtl(maxTtl) + this + } + + override def name: StrField = _internal.name + + override def withName(name: String): this.type = { + _internal.withName(name) + this + } +} + +@JSExportAll +case class SolaceOperationTopic(override private[amf] val _internal: InternalSolaceOperationTopic) + extends DomainElement { + + @JSExportTopLevel("SolaceOperationTopic") + def this() = this(InternalSolaceOperationTopic()) + + def topicSubscriptions: ClientList[StrField] = _internal.topicSubscriptions.asClient + + def withTopicSubscriptions(topicSubscriptions: ClientList[String]): this.type = { + _internal.withTopicSubscriptions(topicSubscriptions.asInternal) + this + } +} diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/model/domain/bindings/solace/SolaceServerBinding.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/model/domain/bindings/solace/SolaceServerBinding.scala new file mode 100644 index 0000000000..f5d343c3b1 --- /dev/null +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/model/domain/bindings/solace/SolaceServerBinding.scala @@ -0,0 +1,33 @@ +package amf.apicontract.client.platform.model.domain.bindings.solace + +import amf.apicontract.client.platform.model.domain.bindings.{BindingVersion, ServerBinding} +import amf.apicontract.client.scala.model.domain.bindings.solace.{SolaceServerBinding => InternalSolaceServerBinding} +import amf.apicontract.internal.convert.ApiClientConverters._ +import amf.core.client.platform.model +import amf.core.client.platform.model.StrField + +import scala.scalajs.js.annotation.{JSExportAll, JSExportTopLevel} + +@JSExportAll +case class SolaceServerBinding(override private[amf] val _internal: InternalSolaceServerBinding) + extends ServerBinding + with BindingVersion { + @JSExportTopLevel("SolaceServerBinding") + def this() = this(InternalSolaceServerBinding()) + + def msgVpn: StrField = _internal.msgVpn + + def withMsgVpn(msgVpn: String): this.type = { + _internal.withMsgVpn(msgVpn) + this + } + + override protected def bindingVersion: model.StrField = _internal.bindingVersion + + override def withBindingVersion(bindingVersion: String): this.type = { + _internal.withBindingVersion(bindingVersion) + this + } + + override def linkCopy(): SolaceServerBinding = _internal.linkCopy() +} diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/client/scala/AMFConfiguration.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/scala/AMFConfiguration.scala index e1a52e005d..32ecd483f9 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/client/scala/AMFConfiguration.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/scala/AMFConfiguration.scala @@ -325,11 +325,12 @@ object APIConfiguration extends APIConfigurationBuilder { .withTransformationPipelines(unsupportedTransformationsSet(name)) def fromSpec(spec: Spec): AMFConfiguration = spec match { - case Spec.RAML08 => RAMLConfiguration.RAML08() - case Spec.RAML10 => RAMLConfiguration.RAML10() - case Spec.OAS20 => OASConfiguration.OAS20() - case Spec.OAS30 => OASConfiguration.OAS30() - case Spec.ASYNC20 => AsyncAPIConfiguration.Async20() + case Spec.RAML08 => RAMLConfiguration.RAML08() + case Spec.RAML10 => RAMLConfiguration.RAML10() + case Spec.OAS20 => OASConfiguration.OAS20() + case Spec.OAS30 => OASConfiguration.OAS30() + case Spec.ASYNC20 | Spec.ASYNC21 | Spec.ASYNC22 | Spec.ASYNC23 | Spec.ASYNC24 | Spec.ASYNC25 | Spec.ASYNC26 => + AsyncAPIConfiguration.Async20() case Spec.JSONSCHEMA => ConfigurationAdapter.adapt(JsonSchemaConfiguration.JsonSchema()) case _ => throw UnrecognizedSpecException( diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/client/scala/model/domain/Message.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/scala/model/domain/Message.scala index d33ec8fa98..306272087d 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/client/scala/model/domain/Message.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/scala/model/domain/Message.scala @@ -29,6 +29,7 @@ class Message(override val fields: Fields, override val annotations: Annotations def headerExamples: Seq[Example] = fields.field(HeaderExamples) def headers: Seq[Parameter] = fields.field(Headers) def headerSchema: NodeShape = fields.field(HeaderSchema) + def messageId: StrField = fields.field(MessageId) def withDescription(description: String): this.type = set(Description, description) def isAbstract(isAbstract: Boolean): this.type = set(IsAbstract, isAbstract) @@ -43,6 +44,7 @@ class Message(override val fields: Fields, override val annotations: Annotations def withHeaders(headers: Seq[Parameter]): this.type = setArray(Headers, headers) def withHeaderExamples(examples: Seq[Example]): this.type = setArray(HeaderExamples, examples) def withHeaderSchema(obj: NodeShape): this.type = set(HeaderSchema, obj) + def withMessageId(messageId: String): this.type = set(MessageId, messageId) def withPayload(mediaType: Option[String] = None): Payload = { val result = Payload() diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/client/scala/model/domain/bindings/BindingVersion.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/scala/model/domain/bindings/BindingVersion.scala index 1b48dfef75..c921343b52 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/client/scala/model/domain/bindings/BindingVersion.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/scala/model/domain/bindings/BindingVersion.scala @@ -1,4 +1,5 @@ package amf.apicontract.client.scala.model.domain.bindings + import amf.core.client.scala.model.StrField import amf.core.client.scala.model.domain.DomainElement import amf.core.internal.metamodel.Field diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/client/scala/model/domain/bindings/googlepubsub/GooglePubSubChannelBinding.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/scala/model/domain/bindings/googlepubsub/GooglePubSubChannelBinding.scala new file mode 100644 index 0000000000..2957996dbf --- /dev/null +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/scala/model/domain/bindings/googlepubsub/GooglePubSubChannelBinding.scala @@ -0,0 +1,94 @@ +package amf.apicontract.client.scala.model.domain.bindings.googlepubsub + +import amf.apicontract.client.scala.model.domain.bindings.{BindingVersion, ChannelBinding} +import amf.apicontract.internal.metamodel.domain.bindings.GooglePubSubChannelBindingModel._ +import amf.apicontract.internal.metamodel.domain.bindings.GooglePubSubSchemaSettingsModel._ +import amf.apicontract.internal.metamodel.domain.bindings.{GooglePubSubChannelBindingModel, GooglePubSubMessageStoragePolicyModel, GooglePubSubSchemaSettingsModel} +import amf.apicontract.internal.spec.async.parser.bindings.Bindings.GooglePubSub +import amf.core.client.scala.model.StrField +import amf.core.client.scala.model.domain.{DomainElement, Linkable, ObjectNode} +import amf.core.internal.metamodel.Field +import amf.core.internal.parser.domain.{Annotations, Fields} +import amf.shapes.client.scala.model.domain.Key +class GooglePubSubChannelBinding(override val fields: Fields, override val annotations: Annotations) + extends ChannelBinding + with BindingVersion + with Key { + override protected def bindingVersionField: Field = BindingVersion + def labels: ObjectNode = fields.field(Labels) + def messageRetentionDuration: StrField = fields.field(MessageRetentionDuration) + def messageStoragePolicy: GooglePubSubMessageStoragePolicy = fields.field(MessageStoragePolicy) + def schemaSettings: GooglePubSubSchemaSettings = fields.field(SchemaSettings) + def topic: StrField = fields.field(Topic) + + def withLabels(labels: ObjectNode): this.type = set(Labels, labels) + def withMessageRetentionDuration(messageRetentionDuration: String): this.type = + set(MessageRetentionDuration, messageRetentionDuration) + def withSchemaSettings(schemaSettings: GooglePubSubSchemaSettings): this.type = + set(SchemaSettings, schemaSettings) + def withMessageStoragePolicy(messageStoragePolicy: GooglePubSubMessageStoragePolicy): this.type = + set(MessageStoragePolicy, messageStoragePolicy) + def withTopic(topic: String): this.type = set(Topic, topic) + + override def key: StrField = fields.field(GooglePubSubChannelBindingModel.key) + + override def linkCopy(): GooglePubSubChannelBinding = GooglePubSubChannelBinding().withId(id) + + /** apply method for create a new instance with fields and annotations. Aux method for copy */ + override protected def classConstructor: (Fields, Annotations) => Linkable with DomainElement = + GooglePubSubChannelBinding.apply + + override def meta: GooglePubSubChannelBindingModel.type = GooglePubSubChannelBindingModel + + /** Value , path + field value that is used to compose the id when the object its adopted */ + override def componentId: String = s"/$GooglePubSub-operation" +} + +object GooglePubSubChannelBinding { + def apply(): GooglePubSubChannelBinding = apply(Annotations()) + def apply(annotations: Annotations): GooglePubSubChannelBinding = apply(Fields(), annotations) + def apply(fields: Fields, annotations: Annotations): GooglePubSubChannelBinding = + new GooglePubSubChannelBinding(fields, annotations) +} + +class GooglePubSubMessageStoragePolicy(override val fields: Fields, override val annotations: Annotations) + extends DomainElement { + def meta: GooglePubSubMessageStoragePolicyModel.type = GooglePubSubMessageStoragePolicyModel + + def allowedPersistenceRegions: Seq[StrField] = + fields.field(GooglePubSubMessageStoragePolicyModel.AllowedPersistenceRegions) + def withAllowedPersistenceRegions(allowedPersistenceRegions: Seq[String]): this.type = + set(GooglePubSubMessageStoragePolicyModel.AllowedPersistenceRegions, allowedPersistenceRegions) + + override def componentId: String = s"/$GooglePubSub-messageStoragePolicy" +} + +object GooglePubSubMessageStoragePolicy { + def apply(): GooglePubSubMessageStoragePolicy = apply(Annotations()) + def apply(annotations: Annotations): GooglePubSubMessageStoragePolicy = apply(Fields(), annotations) + def apply(fields: Fields, annotations: Annotations): GooglePubSubMessageStoragePolicy = + new GooglePubSubMessageStoragePolicy(fields, annotations) +} + +class GooglePubSubSchemaSettings(val fields: Fields, val annotations: Annotations) extends DomainElement { + def meta: GooglePubSubSchemaSettingsModel.type = GooglePubSubSchemaSettingsModel + def encoding: StrField = fields.field(Encoding) + def firstRevisionId: StrField = fields.field(FirstRevisionId) + def lastRevisionId: StrField = fields.field(LastRevisionId) + def name: StrField = fields.field(Name) + + def withEncoding(encoding: String): this.type = set(Encoding, encoding) + def withFirstRevisionId(firstRevisionId: String): this.type = set(FirstRevisionId, firstRevisionId) + def withLastRevisionId(lastRevisionId: String): this.type = set(LastRevisionId, lastRevisionId) + def withName(name: String): this.type = set(Name, name) + + def componentId: String = s"/$GooglePubSub-schemaSettings" + +} + +object GooglePubSubSchemaSettings { + def apply(): GooglePubSubSchemaSettings = apply(Annotations()) + def apply(annotations: Annotations): GooglePubSubSchemaSettings = apply(Fields(), annotations) + def apply(fields: Fields, annotations: Annotations): GooglePubSubSchemaSettings = + new GooglePubSubSchemaSettings(fields, annotations) +} diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/client/scala/model/domain/bindings/googlepubsub/GooglePubSubMessageBinding.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/scala/model/domain/bindings/googlepubsub/GooglePubSubMessageBinding.scala new file mode 100644 index 0000000000..1a979d804e --- /dev/null +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/scala/model/domain/bindings/googlepubsub/GooglePubSubMessageBinding.scala @@ -0,0 +1,66 @@ +package amf.apicontract.client.scala.model.domain.bindings.googlepubsub + +import amf.apicontract.client.scala.model.domain.bindings.{BindingVersion, MessageBinding} +import amf.apicontract.internal.metamodel.domain.bindings.BindingVersion.BindingVersion +import amf.apicontract.internal.metamodel.domain.bindings.GooglePubSubMessageBindingModel._ +import amf.apicontract.internal.metamodel.domain.bindings.{ + GooglePubSubMessageBindingModel, + GooglePubSubSchemaDefinitionModel +} +import amf.apicontract.internal.spec.async.parser.bindings.Bindings.GooglePubSub +import amf.core.client.scala.model.StrField +import amf.core.client.scala.model.domain.{DomainElement, Linkable, ObjectNode} +import amf.core.internal.metamodel.Field +import amf.core.internal.parser.domain.{Annotations, Fields} +import amf.shapes.client.scala.model.domain.Key + +class GooglePubSubMessageBinding(override val fields: Fields, override val annotations: Annotations) + extends MessageBinding + with BindingVersion + with Key { + + override protected def bindingVersionField: Field = BindingVersion + override def meta: GooglePubSubMessageBindingModel.type = GooglePubSubMessageBindingModel + def attributes: ObjectNode = fields.field(Attributes) + def orderingKey: StrField = fields.field(OrderingKey) + def schema: GooglePubSubSchemaDefinition = fields.field(Schema) + def withAttributes(attributes: ObjectNode): this.type = set(Attributes, attributes) + def withOrderingKey(orderingKey: String): this.type = set(OrderingKey, orderingKey) + def withSchema(schema: GooglePubSubSchemaDefinition): this.type = set(Schema, schema) + + override def key: StrField = fields.field(GooglePubSubMessageBindingModel.key) + + override def componentId: String = s"/$GooglePubSub-message" + + override def linkCopy(): GooglePubSubMessageBinding = GooglePubSubMessageBinding().withId(id) + + override protected def classConstructor: (Fields, Annotations) => Linkable with DomainElement = + GooglePubSubMessageBinding.apply + +} + +object GooglePubSubMessageBinding { + def apply(): GooglePubSubMessageBinding = apply(Annotations()) + def apply(annotations: Annotations): GooglePubSubMessageBinding = apply(Fields(), annotations) + def apply(fields: Fields, annotations: Annotations): GooglePubSubMessageBinding = + new GooglePubSubMessageBinding(fields, annotations) + +} + +class GooglePubSubSchemaDefinition(val fields: Fields, val annotations: Annotations) extends DomainElement { + def meta: GooglePubSubSchemaDefinitionModel.type = GooglePubSubSchemaDefinitionModel + def name: StrField = fields.field(GooglePubSubSchemaDefinitionModel.Name) + def fieldType: StrField = fields.field(GooglePubSubSchemaDefinitionModel.FieldType) + def withName(name: String): this.type = set(GooglePubSubSchemaDefinitionModel.Name, name) + def withFieldType(fieldType: String): this.type = set(GooglePubSubSchemaDefinitionModel.FieldType, fieldType) + def componentId: String = s"/$GooglePubSub-schemaDefinition" + +} + +object GooglePubSubSchemaDefinition { + def apply(): GooglePubSubSchemaDefinition = apply(Annotations()) + def apply(annotations: Annotations): GooglePubSubSchemaDefinition = apply(Fields(), annotations) + def apply(fields: Fields, annotations: Annotations): GooglePubSubSchemaDefinition = + new GooglePubSubSchemaDefinition(fields, annotations) + +} diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/client/scala/model/domain/bindings/ibmmq/IBMMQChannelBinding.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/scala/model/domain/bindings/ibmmq/IBMMQChannelBinding.scala index 786f54ad08..73381a335c 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/client/scala/model/domain/bindings/ibmmq/IBMMQChannelBinding.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/scala/model/domain/bindings/ibmmq/IBMMQChannelBinding.scala @@ -63,7 +63,7 @@ class IBMMQChannelQueue(override val fields: Fields, override val annotations: A def isPartitioned: BoolField = fields.field(IBMMQChannelQueueModel.IsPartitioned) def exclusive: BoolField = fields.field(IBMMQChannelQueueModel.Exclusive) - def withObjectName(objectName: Boolean): this.type = set(IBMMQChannelQueueModel.ObjectName, objectName) + def withObjectName(objectName: String): this.type = set(IBMMQChannelQueueModel.ObjectName, objectName) def withIsPartitioned(isPartitioned: Boolean): this.type = set(IBMMQChannelQueueModel.IsPartitioned, isPartitioned) def withExclusive(exclusive: Boolean): this.type = set(IBMMQChannelQueueModel.Exclusive, exclusive) @@ -86,13 +86,13 @@ class IBMMQChannelTopic(override val fields: Fields, override val annotations: A override def nameField: Field = IBMMQChannelTopicModel.Name - def string: BoolField = fields.field(IBMMQChannelTopicModel.String) + def string: StrField = fields.field(IBMMQChannelTopicModel.String) def objectName: StrField = fields.field(IBMMQChannelTopicModel.ObjectName) def durablePermitted: BoolField = fields.field(IBMMQChannelTopicModel.DurablePermitted) def lastMsgRetained: BoolField = fields.field(IBMMQChannelTopicModel.LastMsgRetained) - def withString(string: Boolean): this.type = set(IBMMQChannelTopicModel.String, string) - def withObjectName(objectName: Boolean): this.type = set(IBMMQChannelTopicModel.ObjectName, objectName) + def withString(string: String): this.type = set(IBMMQChannelTopicModel.String, string) + def withObjectName(objectName: String): this.type = set(IBMMQChannelTopicModel.ObjectName, objectName) def withDurablePermitted(durablePermitted: Boolean): this.type = set(IBMMQChannelTopicModel.DurablePermitted, durablePermitted) def withLastMsgRetained(lastMsgRetained: Boolean): this.type = diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/client/scala/model/domain/bindings/pulsar/PulsarChannelBinding.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/scala/model/domain/bindings/pulsar/PulsarChannelBinding.scala new file mode 100644 index 0000000000..e0c7608e29 --- /dev/null +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/scala/model/domain/bindings/pulsar/PulsarChannelBinding.scala @@ -0,0 +1,75 @@ +package amf.apicontract.client.scala.model.domain.bindings.pulsar + +import amf.apicontract.client.scala.model.domain.bindings.{BindingVersion, ChannelBinding} +import amf.apicontract.internal.metamodel.domain.bindings.PulsarChannelBindingModel._ +import amf.apicontract.internal.metamodel.domain.bindings.{PulsarChannelBindingModel, PulsarChannelRetentionModel} +import amf.apicontract.internal.spec.async.parser.bindings.Bindings.Pulsar +import amf.core.client.scala.model.{BoolField, IntField, StrField} +import amf.core.client.scala.model.domain.{DomainElement, Linkable} +import amf.core.internal.metamodel.Field +import amf.core.internal.parser.domain.{Annotations, Fields} +import amf.shapes.client.scala.model.domain.Key + +class PulsarChannelBinding(override val fields: Fields, override val annotations: Annotations) + extends ChannelBinding + with BindingVersion + with Key { + override protected def bindingVersionField: Field = BindingVersion + override def meta: PulsarChannelBindingModel.type = PulsarChannelBindingModel + + def namespace: StrField = fields.field(Namespace) + def persistence: StrField = fields.field(Persistence) + def compaction: IntField = fields.field(Compaction) + def geoReplication: Seq[StrField] = fields.field(GeoReplication) + def retention: PulsarChannelRetention = fields.field(Retention) + def ttl: IntField = fields.field(Ttl) + def deduplication: BoolField = fields.field(Deduplication) + + def withNamespace(namespace: String): this.type = set(Namespace, namespace) + def withPersistence(persistence: String): this.type = set(Persistence, persistence) + def withCompaction(compaction: Int): this.type = set(Compaction, compaction) + def withGeoReplication(geoReplication: Seq[String]): this.type = set(GeoReplication, geoReplication) + def withRetention(retention: PulsarChannelRetention): this.type = set(Retention, retention) + def withTtl(ttl: Int): this.type = set(Ttl, ttl) + def withDeduplication(deduplication: Boolean): this.type = set(Deduplication, deduplication) + + override def key: StrField = fields.field(PulsarChannelBindingModel.key) + + override def componentId: String = s"/$Pulsar-operation" + override def linkCopy(): PulsarChannelBinding = PulsarChannelBinding().withId(id) + + override protected def classConstructor: (Fields, Annotations) => Linkable with DomainElement = + PulsarChannelBinding.apply +} + +object PulsarChannelBinding { + + def apply(): PulsarChannelBinding = apply(Annotations()) + + def apply(annotations: Annotations): PulsarChannelBinding = apply(Fields(), annotations) + + def apply(fields: Fields, annotations: Annotations): PulsarChannelBinding = + new PulsarChannelBinding(fields, annotations) +} + +class PulsarChannelRetention(override val fields: Fields, override val annotations: Annotations) extends DomainElement { + override def meta: PulsarChannelRetentionModel.type = PulsarChannelRetentionModel + + def time: IntField = fields.field(PulsarChannelRetentionModel.Time) + def size: IntField = fields.field(PulsarChannelRetentionModel.Size) + + def withTime(time: Int): this.type = set(PulsarChannelRetentionModel.Time, time) + def withSize(size: Int): this.type = set(PulsarChannelRetentionModel.Size, size) + + override def componentId: String = s"/$Pulsar-retention" +} + +object PulsarChannelRetention { + + def apply(): PulsarChannelRetention = apply(Annotations()) + + def apply(annotations: Annotations): PulsarChannelRetention = apply(Fields(), annotations) + + def apply(fields: Fields, annotations: Annotations): PulsarChannelRetention = + new PulsarChannelRetention(fields, annotations) +} diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/client/scala/model/domain/bindings/pulsar/PulsarServerBinding.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/scala/model/domain/bindings/pulsar/PulsarServerBinding.scala new file mode 100644 index 0000000000..ac1312fdc6 --- /dev/null +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/scala/model/domain/bindings/pulsar/PulsarServerBinding.scala @@ -0,0 +1,40 @@ +package amf.apicontract.client.scala.model.domain.bindings.pulsar + +import amf.apicontract.client.scala.model.domain.bindings.{BindingVersion, ServerBinding} +import amf.apicontract.internal.metamodel.domain.bindings.PulsarServerBindingModel +import amf.apicontract.internal.metamodel.domain.bindings.PulsarServerBindingModel._ +import amf.apicontract.internal.spec.async.parser.bindings.Bindings.Pulsar +import amf.core.client.scala.model.StrField +import amf.core.client.scala.model.domain.{DomainElement, Linkable} +import amf.core.internal.metamodel.Field +import amf.core.internal.parser.domain.{Annotations, Fields} +import amf.shapes.client.scala.model.domain.Key + +class PulsarServerBinding(override val fields: Fields, override val annotations: Annotations) + extends ServerBinding + with BindingVersion + with Key { + override protected def bindingVersionField: Field = BindingVersion + override def meta: PulsarServerBindingModel.type = PulsarServerBindingModel + + def tenant: StrField = fields.field(Tenant) + def withTenant(tenant: String): this.type = set(Tenant, tenant) + + override def componentId: String = s"/$Pulsar-server" + override def linkCopy(): PulsarServerBinding = PulsarServerBinding().withId(id) + + override protected def classConstructor: (Fields, Annotations) => Linkable with DomainElement = + PulsarServerBinding.apply + + override def key: StrField = fields.field(PulsarServerBindingModel.key) +} + +object PulsarServerBinding { + + def apply(): PulsarServerBinding = apply(Annotations()) + + def apply(annotations: Annotations): PulsarServerBinding = apply(Fields(), annotations) + + def apply(fields: Fields, annotations: Annotations): PulsarServerBinding = + new PulsarServerBinding(fields, annotations) +} diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/client/scala/model/domain/bindings/solace/SolaceOperationBinding.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/scala/model/domain/bindings/solace/SolaceOperationBinding.scala new file mode 100644 index 0000000000..599e4bc79f --- /dev/null +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/scala/model/domain/bindings/solace/SolaceOperationBinding.scala @@ -0,0 +1,128 @@ +package amf.apicontract.client.scala.model.domain.bindings.solace + +import amf.apicontract.client.scala.model.domain.bindings.{BindingVersion, OperationBinding} +import amf.apicontract.internal.metamodel.domain.bindings.{ + SolaceOperationBindingModel, + SolaceOperationDestinationModel, + SolaceOperationQueueModel, + SolaceOperationTopicModel +} +import amf.apicontract.internal.metamodel.domain.bindings.SolaceOperationBindingModel._ +import amf.apicontract.internal.spec.async.parser.bindings.Bindings.Solace +import amf.core.client.scala.model.domain.{DomainElement, Linkable, NamedDomainElement} +import amf.core.client.scala.model.{BoolField, IntField, StrField} +import amf.core.internal.metamodel.Field +import amf.core.internal.parser.domain.{Annotations, Fields} +import amf.shapes.client.scala.model.domain.Key + +class SolaceOperationBinding(override val fields: Fields, override val annotations: Annotations) + extends OperationBinding + with BindingVersion + with Key { + override protected def bindingVersionField: Field = BindingVersion + override def meta: SolaceOperationBindingModel.type = SolaceOperationBindingModel + + def destinations: Seq[SolaceOperationDestination] = fields.field(Destinations) + + def withDestinations(destinations: Seq[SolaceOperationDestination]): this.type = setArray(Destinations, destinations) + + override def key: StrField = fields.field(SolaceOperationBindingModel.key) + + override def componentId: String = s"/$Solace-operation" + override def linkCopy(): SolaceOperationBinding = SolaceOperationBinding().withId(id) + + override protected def classConstructor: (Fields, Annotations) => Linkable with DomainElement = + SolaceOperationBinding.apply +} + +object SolaceOperationBinding { + + def apply(): SolaceOperationBinding = apply(Annotations()) + + def apply(annotations: Annotations): SolaceOperationBinding = apply(Fields(), annotations) + + def apply(fields: Fields, annotations: Annotations): SolaceOperationBinding = + new SolaceOperationBinding(fields, annotations) +} + +class SolaceOperationDestination(override val fields: Fields, override val annotations: Annotations) + extends DomainElement { + override def meta: SolaceOperationDestinationModel.type = SolaceOperationDestinationModel + + def destinationType: StrField = fields.field(SolaceOperationDestinationModel.DestinationType) + def deliveryMode: StrField = fields.field(SolaceOperationDestinationModel.DeliveryMode) + def queue: SolaceOperationQueue = fields.field(SolaceOperationDestinationModel.Queue) + def topic: SolaceOperationTopic = fields.field(SolaceOperationDestinationModel.Topic) + + def withDestinationType(destinationType: String): this.type = + set(SolaceOperationDestinationModel.DestinationType, destinationType) + def withDeliveryMode(deliveryMode: String): this.type = + set(SolaceOperationDestinationModel.DeliveryMode, deliveryMode) + def withQueue(queue: SolaceOperationQueue): this.type = set(SolaceOperationDestinationModel.Queue, queue) + def withTopic(topic: SolaceOperationTopic): this.type = set(SolaceOperationDestinationModel.Topic, topic) + + override def componentId: String = s"/$Solace-destination" +} + +object SolaceOperationDestination { + + def apply(): SolaceOperationDestination = apply(Annotations()) + + def apply(annotations: Annotations): SolaceOperationDestination = apply(Fields(), annotations) + + def apply(fields: Fields, annotations: Annotations): SolaceOperationDestination = + new SolaceOperationDestination(fields, annotations) +} + +class SolaceOperationQueue(override val fields: Fields, override val annotations: Annotations) + extends DomainElement + with NamedDomainElement { + override def meta: SolaceOperationQueueModel.type = SolaceOperationQueueModel + + override def nameField: Field = SolaceOperationQueueModel.Name + + def topicSubscriptions: Seq[StrField] = fields.field(SolaceOperationQueueModel.TopicSubscriptions) + def accessType: StrField = fields.field(SolaceOperationQueueModel.AccessType) + def maxMsgSpoolSize: StrField = fields.field(SolaceOperationQueueModel.MaxMsgSpoolSize) + def maxTtl: StrField = fields.field(SolaceOperationQueueModel.MaxTtl) + + def withTopicSubscriptions(topicSubscriptions: Seq[String]): this.type = + set(SolaceOperationQueueModel.TopicSubscriptions, topicSubscriptions) + def withAccessType(accessType: String): this.type = set(SolaceOperationQueueModel.AccessType, accessType) + def withMaxMsgSpoolSize(maxMsgSpoolSize: String): this.type = + set(SolaceOperationQueueModel.MaxMsgSpoolSize, maxMsgSpoolSize) + def withMaxTtl(maxTtl: String): this.type = set(SolaceOperationQueueModel.MaxTtl, maxTtl) + + override def componentId: String = s"/$Solace-queue" +} + +object SolaceOperationQueue { + + def apply(): SolaceOperationQueue = apply(Annotations()) + + def apply(annotations: Annotations): SolaceOperationQueue = apply(Fields(), annotations) + + def apply(fields: Fields, annotations: Annotations): SolaceOperationQueue = + new SolaceOperationQueue(fields, annotations) +} + +class SolaceOperationTopic(override val fields: Fields, override val annotations: Annotations) extends DomainElement { + override def meta: SolaceOperationTopicModel.type = SolaceOperationTopicModel + + def topicSubscriptions: Seq[StrField] = fields.field(SolaceOperationQueueModel.TopicSubscriptions) + + def withTopicSubscriptions(topicSubscriptions: Seq[String]): this.type = + set(SolaceOperationQueueModel.TopicSubscriptions, topicSubscriptions) + + override def componentId: String = s"/$Solace-topic" +} + +object SolaceOperationTopic { + + def apply(): SolaceOperationTopic = apply(Annotations()) + + def apply(annotations: Annotations): SolaceOperationTopic = apply(Fields(), annotations) + + def apply(fields: Fields, annotations: Annotations): SolaceOperationTopic = + new SolaceOperationTopic(fields, annotations) +} diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/client/scala/model/domain/bindings/solace/SolaceServerBinding.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/scala/model/domain/bindings/solace/SolaceServerBinding.scala new file mode 100644 index 0000000000..eec2f483cb --- /dev/null +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/scala/model/domain/bindings/solace/SolaceServerBinding.scala @@ -0,0 +1,40 @@ +package amf.apicontract.client.scala.model.domain.bindings.solace + +import amf.apicontract.client.scala.model.domain.bindings.{BindingVersion, ServerBinding} +import amf.apicontract.internal.metamodel.domain.bindings.SolaceServerBindingModel._ +import amf.apicontract.internal.metamodel.domain.bindings.SolaceServerBindingModel +import amf.apicontract.internal.spec.async.parser.bindings.Bindings.Solace +import amf.core.client.scala.model.domain.{DomainElement, Linkable} +import amf.core.client.scala.model.StrField +import amf.core.internal.metamodel.Field +import amf.core.internal.parser.domain.{Annotations, Fields} +import amf.shapes.client.scala.model.domain.Key + +class SolaceServerBinding(override val fields: Fields, override val annotations: Annotations) + extends ServerBinding + with BindingVersion + with Key { + override protected def bindingVersionField: Field = BindingVersion + override def meta: SolaceServerBindingModel.type = SolaceServerBindingModel + + def msgVpn: StrField = fields.field(MsgVpn) + def withMsgVpn(msgVpn: String): this.type = set(MsgVpn, msgVpn) + + override def componentId: String = s"/$Solace-server" + override def linkCopy(): SolaceServerBinding = SolaceServerBinding().withId(id) + + override protected def classConstructor: (Fields, Annotations) => Linkable with DomainElement = + SolaceServerBinding.apply + + override def key: StrField = fields.field(SolaceServerBindingModel.key) +} + +object SolaceServerBinding { + + def apply(): SolaceServerBinding = apply(Annotations()) + + def apply(annotations: Annotations): SolaceServerBinding = apply(Fields(), annotations) + + def apply(fields: Fields, annotations: Annotations): SolaceServerBinding = + new SolaceServerBinding(fields, annotations) +} diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/convert/ApiBaseConverter.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/convert/ApiBaseConverter.scala index f86269ee65..650635bdc5 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/convert/ApiBaseConverter.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/convert/ApiBaseConverter.scala @@ -4,34 +4,27 @@ import amf.apicontract.client.platform import amf.apicontract.client.platform.model.domain.federation import amf.apicontract.client.platform.model.{document, domain} import amf.apicontract.client.scala.model.document.{APIContractProcessingData, ComponentModule} -import amf.apicontract.client.scala.model.domain.{ - Callback, - CorrelationId, - Encoding, - EndPoint, - License, - Message, - Operation, - Organization, - Parameter, - Payload, - Request, - Response, - Server, - Tag, - TemplatedLink -} -import amf.apicontract.client.scala.model.domain.federation._ +import amf.apicontract.client.scala.model.domain.bindings._ import amf.apicontract.client.scala.model.domain.bindings.amqp._ import amf.apicontract.client.scala.model.domain.bindings.anypointmq._ +import amf.apicontract.client.scala.model.domain.bindings.googlepubsub.{ + GooglePubSubChannelBinding, + GooglePubSubMessageBinding, + GooglePubSubMessageStoragePolicy, + GooglePubSubSchemaDefinition, + GooglePubSubSchemaSettings +} import amf.apicontract.client.scala.model.domain.bindings.http._ import amf.apicontract.client.scala.model.domain.bindings.ibmmq._ import amf.apicontract.client.scala.model.domain.bindings.kafka._ import amf.apicontract.client.scala.model.domain.bindings.mqtt._ import amf.apicontract.client.scala.model.domain.bindings.websockets._ -import amf.apicontract.client.scala.model.domain.bindings._ +import amf.apicontract.client.scala.model.domain.federation._ +import amf.apicontract.client.scala.model.domain.bindings.pulsar._ +import amf.apicontract.client.scala.model.domain.bindings.solace._ import amf.apicontract.client.scala.model.domain.security._ import amf.apicontract.client.scala.model.domain.templates.{ResourceType, Trait} +import amf.apicontract.client.scala.model.domain._ import amf.apicontract.client.scala.{AMFConfiguration, AMFDocumentResult, AMFLibraryResult} import amf.core.internal.convert.{BidirectionalMatcher, CoreBaseConverter} import amf.core.internal.unsafe.PlatformSecrets @@ -80,6 +73,11 @@ trait ApiBaseConverter with MqttServerLastWillConverter with Amqp091ChannelExchangeConverter with Amqp091QueueConverter + with SolaceServerBindingConverter + with SolaceOperationBindingConverter + with SolaceOperationDestinationConverter + with SolaceOperationQueueConverter + with SolaceOperationTopicConverter with AnypointMQMessageBindingConverter with AnypointMQChannelBindingConverter with IBMMQMessageBindingConverter @@ -100,6 +98,14 @@ trait ApiBaseConverter with ComponentModuleConverter with ParameterFederationMetadataConverter with EndpointFederationMetadataConverter + with PulsarServerBindingConverter + with PulsarChannelBindingConverter + with PulsarChannelRetentionConverter + with GooglePubSubMessageBindingConverter + with GooglePubSubSchemaDefinitionConverter + with GooglePubSubChannelBindingConverter + with GooglePubSubMessageStoragePolicyConverter + with GooglePubSubSchemaSettingsConverter trait ChannelBindingConverter extends PlatformSecrets { implicit object ChannelBindingMatcher extends BidirectionalMatcher[ChannelBinding, domain.bindings.ChannelBinding] { @@ -286,6 +292,86 @@ trait Amqp091QueueConverter extends PlatformSecrets { } } +trait PulsarServerBindingConverter extends PlatformSecrets { + implicit object PulsarServerBindingMatcher + extends BidirectionalMatcher[PulsarServerBinding, domain.bindings.pulsar.PulsarServerBinding] { + override def asClient(from: PulsarServerBinding): domain.bindings.pulsar.PulsarServerBinding = + platform.wrap[domain.bindings.pulsar.PulsarServerBinding](from) + override def asInternal(from: domain.bindings.pulsar.PulsarServerBinding): PulsarServerBinding = + from._internal + } +} + +trait PulsarChannelBindingConverter extends PlatformSecrets { + implicit object PulsarChannelBindingMatcher + extends BidirectionalMatcher[PulsarChannelBinding, domain.bindings.pulsar.PulsarChannelBinding] { + override def asClient(from: PulsarChannelBinding): domain.bindings.pulsar.PulsarChannelBinding = + platform.wrap[domain.bindings.pulsar.PulsarChannelBinding](from) + override def asInternal(from: domain.bindings.pulsar.PulsarChannelBinding): PulsarChannelBinding = + from._internal + } +} + +trait PulsarChannelRetentionConverter extends PlatformSecrets { + implicit object PulsarChannelRetentionMatcher + extends BidirectionalMatcher[PulsarChannelRetention, domain.bindings.pulsar.PulsarChannelRetention] { + override def asClient(from: PulsarChannelRetention): domain.bindings.pulsar.PulsarChannelRetention = + platform.wrap[domain.bindings.pulsar.PulsarChannelRetention](from) + override def asInternal(from: domain.bindings.pulsar.PulsarChannelRetention): PulsarChannelRetention = + from._internal + } +} + +trait SolaceServerBindingConverter extends PlatformSecrets { + implicit object SolaceServerBindingMatcher + extends BidirectionalMatcher[SolaceServerBinding, domain.bindings.solace.SolaceServerBinding] { + override def asClient(from: SolaceServerBinding): domain.bindings.solace.SolaceServerBinding = + platform.wrap[domain.bindings.solace.SolaceServerBinding](from) + override def asInternal(from: domain.bindings.solace.SolaceServerBinding): SolaceServerBinding = + from._internal + } +} + +trait SolaceOperationBindingConverter extends PlatformSecrets { + implicit object SolaceOperationBindingMatcher + extends BidirectionalMatcher[SolaceOperationBinding, domain.bindings.solace.SolaceOperationBinding] { + override def asClient(from: SolaceOperationBinding): domain.bindings.solace.SolaceOperationBinding = + platform.wrap[domain.bindings.solace.SolaceOperationBinding](from) + override def asInternal(from: domain.bindings.solace.SolaceOperationBinding): SolaceOperationBinding = + from._internal + } +} + +trait SolaceOperationDestinationConverter extends PlatformSecrets { + implicit object SolaceOperationDestinationMatcher + extends BidirectionalMatcher[SolaceOperationDestination, domain.bindings.solace.SolaceOperationDestination] { + override def asClient(from: SolaceOperationDestination): domain.bindings.solace.SolaceOperationDestination = + platform.wrap[domain.bindings.solace.SolaceOperationDestination](from) + override def asInternal(from: domain.bindings.solace.SolaceOperationDestination): SolaceOperationDestination = + from._internal + } +} + +trait SolaceOperationQueueConverter extends PlatformSecrets { + implicit object SolaceOperationQueueMatcher + extends BidirectionalMatcher[SolaceOperationQueue, domain.bindings.solace.SolaceOperationQueue] { + override def asClient(from: SolaceOperationQueue): domain.bindings.solace.SolaceOperationQueue = + platform.wrap[domain.bindings.solace.SolaceOperationQueue](from) + override def asInternal(from: domain.bindings.solace.SolaceOperationQueue): SolaceOperationQueue = + from._internal + } +} + +trait SolaceOperationTopicConverter extends PlatformSecrets { + implicit object SolaceOperationTopicMatcher + extends BidirectionalMatcher[SolaceOperationTopic, domain.bindings.solace.SolaceOperationTopic] { + override def asClient(from: SolaceOperationTopic): domain.bindings.solace.SolaceOperationTopic = + platform.wrap[domain.bindings.solace.SolaceOperationTopic](from) + override def asInternal(from: domain.bindings.solace.SolaceOperationTopic): SolaceOperationTopic = + from._internal + } +} + trait AnypointMQMessageBindingConverter extends PlatformSecrets { implicit object AnypointMQMessageBindingMatcher extends BidirectionalMatcher[AnypointMQMessageBinding, domain.bindings.anypointmq.AnypointMQMessageBinding] { @@ -351,6 +437,73 @@ trait IBMMQChannelTopicConverter extends PlatformSecrets { } } +trait GooglePubSubMessageBindingConverter extends PlatformSecrets { + implicit object GooglePubSubMessageBindingMatcher + extends BidirectionalMatcher[ + GooglePubSubMessageBinding, + domain.bindings.googlepubsub.GooglePubSubMessageBinding + ] { + override def asClient(from: GooglePubSubMessageBinding): domain.bindings.googlepubsub.GooglePubSubMessageBinding = + platform.wrap[domain.bindings.googlepubsub.GooglePubSubMessageBinding](from) + override def asInternal(from: domain.bindings.googlepubsub.GooglePubSubMessageBinding): GooglePubSubMessageBinding = + from._internal + } +} +trait GooglePubSubSchemaDefinitionConverter extends PlatformSecrets { + implicit object GooglePubSubSchemaDefinitionMatcher + extends BidirectionalMatcher[ + GooglePubSubSchemaDefinition, + domain.bindings.googlepubsub.GooglePubSubSchemaDefinition + ] { + override def asClient( + from: GooglePubSubSchemaDefinition + ): domain.bindings.googlepubsub.GooglePubSubSchemaDefinition = + platform.wrap[domain.bindings.googlepubsub.GooglePubSubSchemaDefinition](from) + override def asInternal( + from: domain.bindings.googlepubsub.GooglePubSubSchemaDefinition + ): GooglePubSubSchemaDefinition = from._internal + } +} +trait GooglePubSubChannelBindingConverter extends PlatformSecrets { + implicit object GooglePubSubChannelBindingMatcher + extends BidirectionalMatcher[ + GooglePubSubChannelBinding, + domain.bindings.googlepubsub.GooglePubSubChannelBinding + ] { + override def asClient(from: GooglePubSubChannelBinding): domain.bindings.googlepubsub.GooglePubSubChannelBinding = + platform.wrap[domain.bindings.googlepubsub.GooglePubSubChannelBinding](from) + override def asInternal(from: domain.bindings.googlepubsub.GooglePubSubChannelBinding): GooglePubSubChannelBinding = + from._internal + } +} +trait GooglePubSubMessageStoragePolicyConverter extends PlatformSecrets { + implicit object GooglePubSubMessageStoragePolicyMatcher + extends BidirectionalMatcher[ + GooglePubSubMessageStoragePolicy, + domain.bindings.googlepubsub.GooglePubSubMessageStoragePolicy + ] { + override def asClient( + from: GooglePubSubMessageStoragePolicy + ): domain.bindings.googlepubsub.GooglePubSubMessageStoragePolicy = + platform.wrap[domain.bindings.googlepubsub.GooglePubSubMessageStoragePolicy](from) + override def asInternal( + from: domain.bindings.googlepubsub.GooglePubSubMessageStoragePolicy + ): GooglePubSubMessageStoragePolicy = from._internal + } +} +trait GooglePubSubSchemaSettingsConverter extends PlatformSecrets { + implicit object GooglePubSubSchemaSettingsMatcher + extends BidirectionalMatcher[ + GooglePubSubSchemaSettings, + domain.bindings.googlepubsub.GooglePubSubSchemaSettings + ] { + override def asClient(from: GooglePubSubSchemaSettings): domain.bindings.googlepubsub.GooglePubSubSchemaSettings = + platform.wrap[domain.bindings.googlepubsub.GooglePubSubSchemaSettings](from) + override def asInternal(from: domain.bindings.googlepubsub.GooglePubSubSchemaSettings): GooglePubSubSchemaSettings = + from._internal + } +} + trait EndPointConverter extends PlatformSecrets { implicit object EndPointMatcher extends BidirectionalMatcher[EndPoint, domain.EndPoint] { diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/convert/ApiRegister.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/convert/ApiRegister.scala index 1f9b301973..868fd00a3a 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/convert/ApiRegister.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/convert/ApiRegister.scala @@ -6,21 +6,19 @@ import amf.apicontract.client.platform.model.domain.api.{AsyncApi, WebApi} import amf.apicontract.client.platform.model.domain.bindings._ import amf.apicontract.client.platform.model.domain.bindings.amqp._ import amf.apicontract.client.platform.model.domain.bindings.anypointmq._ -import amf.apicontract.client.platform.model.domain.bindings.http.{HttpMessageBinding, HttpOperationBinding} -import amf.apicontract.client.platform.model.domain.bindings.ibmmq.{ - IBMMQChannelBinding, - IBMMQChannelQueue, - IBMMQChannelTopic, - IBMMQMessageBinding, - IBMMQServerBinding -} -import amf.apicontract.client.platform.model.domain.bindings.kafka.{KafkaMessageBinding, KafkaOperationBinding} -import amf.apicontract.client.platform.model.domain.bindings.mqtt.{ - MqttMessageBinding, - MqttOperationBinding, - MqttServerBinding, - MqttServerLastWill +import amf.apicontract.client.platform.model.domain.bindings.googlepubsub.{ + GooglePubSubChannelBinding, + GooglePubSubMessageBinding, + GooglePubSubMessageStoragePolicy, + GooglePubSubSchemaDefinition, + GooglePubSubSchemaSettings } +import amf.apicontract.client.platform.model.domain.bindings.http._ +import amf.apicontract.client.platform.model.domain.bindings.ibmmq._ +import amf.apicontract.client.platform.model.domain.bindings.kafka._ +import amf.apicontract.client.platform.model.domain.bindings.mqtt._ +import amf.apicontract.client.platform.model.domain.bindings.pulsar._ +import amf.apicontract.client.platform.model.domain.bindings.solace._ import amf.apicontract.client.platform.model.domain.bindings.websockets.WebSocketsChannelBinding import amf.apicontract.client.platform.model.domain.federation._ import amf.apicontract.client.platform.model.domain.security._ @@ -282,6 +280,26 @@ private[amf] object ApiRegister extends UniqueInitializer with PlatformSecrets { platform.registerWrapper(EmptyBindingModel) { case s: amf.apicontract.client.scala.model.domain.bindings.EmptyBinding => EmptyBinding(s) } + platform.registerWrapper(SolaceServerBindingModel) { + case s: amf.apicontract.client.scala.model.domain.bindings.solace.SolaceServerBinding => + SolaceServerBinding(s) + } + platform.registerWrapper(SolaceOperationBindingModel) { + case s: amf.apicontract.client.scala.model.domain.bindings.solace.SolaceOperationBinding => + SolaceOperationBinding(s) + } + platform.registerWrapper(SolaceOperationDestinationModel) { + case s: amf.apicontract.client.scala.model.domain.bindings.solace.SolaceOperationDestination => + SolaceOperationDestination(s) + } + platform.registerWrapper(SolaceOperationQueueModel) { + case s: amf.apicontract.client.scala.model.domain.bindings.solace.SolaceOperationQueue => + SolaceOperationQueue(s) + } + platform.registerWrapper(SolaceOperationTopicModel) { + case s: amf.apicontract.client.scala.model.domain.bindings.solace.SolaceOperationTopic => + SolaceOperationTopic(s) + } platform.registerWrapper(AnypointMQMessageBindingModel) { case s: amf.apicontract.client.scala.model.domain.bindings.anypointmq.AnypointMQMessageBinding => AnypointMQMessageBinding(s) @@ -305,6 +323,26 @@ private[amf] object ApiRegister extends UniqueInitializer with PlatformSecrets { platform.registerWrapper(IBMMQChannelTopicModel) { case s: amf.apicontract.client.scala.model.domain.bindings.ibmmq.IBMMQChannelTopic => IBMMQChannelTopic(s) } + platform.registerWrapper(GooglePubSubChannelBindingModel) { + case s: amf.apicontract.client.scala.model.domain.bindings.googlepubsub.GooglePubSubChannelBinding => + GooglePubSubChannelBinding(s) + } + platform.registerWrapper(GooglePubSubMessageStoragePolicyModel) { + case s: amf.apicontract.client.scala.model.domain.bindings.googlepubsub.GooglePubSubMessageStoragePolicy => + GooglePubSubMessageStoragePolicy(s) + } + platform.registerWrapper(GooglePubSubSchemaSettingsModel) { + case s: amf.apicontract.client.scala.model.domain.bindings.googlepubsub.GooglePubSubSchemaSettings => + GooglePubSubSchemaSettings(s) + } + platform.registerWrapper(GooglePubSubMessageBindingModel) { + case s: amf.apicontract.client.scala.model.domain.bindings.googlepubsub.GooglePubSubMessageBinding => + GooglePubSubMessageBinding(s) + } + platform.registerWrapper(GooglePubSubSchemaDefinitionModel) { + case s: amf.apicontract.client.scala.model.domain.bindings.googlepubsub.GooglePubSubSchemaDefinition => + GooglePubSubSchemaDefinition(s) + } platform.registerWrapper(APIContractProcessingDataModel) { case s: amf.apicontract.client.scala.model.document.APIContractProcessingData => APIContractProcessingData(s) } @@ -326,6 +364,18 @@ private[amf] object ApiRegister extends UniqueInitializer with PlatformSecrets { case s: amf.apicontract.client.scala.model.domain.federation.ParameterFederationMetadata => ParameterFederationMetadata(s) } + platform.registerWrapper(PulsarServerBindingModel) { + case s: amf.apicontract.client.scala.model.domain.bindings.pulsar.PulsarServerBinding => + PulsarServerBinding(s) + } + platform.registerWrapper(PulsarChannelBindingModel) { + case s: amf.apicontract.client.scala.model.domain.bindings.pulsar.PulsarChannelBinding => + PulsarChannelBinding(s) + } + platform.registerWrapper(PulsarChannelRetentionModel) { + case s: amf.apicontract.client.scala.model.domain.bindings.pulsar.PulsarChannelRetention => + PulsarChannelRetention(s) + } } } diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/entities/APIEntities.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/entities/APIEntities.scala index 8a5cf9cd5c..25af2c8ca3 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/entities/APIEntities.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/entities/APIEntities.scala @@ -101,6 +101,19 @@ private[amf] object APIEntities extends Entities { IBMMQChannelQueueModel, IBMMQChannelTopicModel, AnypointMQMessageBindingModel, - AnypointMQChannelBindingModel + AnypointMQChannelBindingModel, + SolaceServerBindingModel, + SolaceOperationBindingModel, + SolaceOperationDestinationModel, + SolaceOperationQueueModel, + SolaceOperationTopicModel, + PulsarServerBindingModel, + PulsarChannelBindingModel, + PulsarChannelRetentionModel, + GooglePubSubMessageBindingModel, + GooglePubSubChannelBindingModel, + GooglePubSubMessageStoragePolicyModel, + GooglePubSubSchemaSettingsModel, + GooglePubSubSchemaDefinitionModel ) } diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/metamodel/domain/bindings/GooglePubSubBindingModel.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/metamodel/domain/bindings/GooglePubSubBindingModel.scala new file mode 100644 index 0000000000..f0943f0ea9 --- /dev/null +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/metamodel/domain/bindings/GooglePubSubBindingModel.scala @@ -0,0 +1,219 @@ +package amf.apicontract.internal.metamodel.domain.bindings + +import amf.apicontract.client.scala.model.domain.bindings.googlepubsub.{GooglePubSubChannelBinding, GooglePubSubMessageBinding, GooglePubSubMessageStoragePolicy, GooglePubSubSchemaDefinition, GooglePubSubSchemaSettings} +import amf.apicontract.internal.metamodel.domain.bindings.GooglePubSubChannelBindingModel.Type +import amf.core.client.scala.model.domain.AmfObject +import amf.core.client.scala.vocabulary.Namespace.ApiBinding +import amf.core.client.scala.vocabulary.ValueType +import amf.core.internal.metamodel.Field +import amf.core.internal.metamodel.Type.{Array, Str} +import amf.core.internal.metamodel.domain._ + +object GooglePubSubMessageBindingModel extends MessageBindingModel with BindingVersion { + + val Attributes: Field = + Field( + ObjectNodeModel, + ApiBinding + "attribute", + ModelDoc(ModelVocabularies.ApiBinding, "attributes", "Attributes for this message") + ) + + val OrderingKey: Field = + Field( + Str, + ApiBinding + "orderingKey", + ModelDoc( + ModelVocabularies.ApiBinding, + "orderingKey", + "If non-empty, identifies related messages for which publish order should be respected" + ) + ) + + val Schema: Field = + Field( + GooglePubSubSchemaDefinitionModel, + ApiBinding + "schemaDefinition", + ModelDoc( + ModelVocabularies.ApiBinding, + "schema", + "Define Schema" + ) + ) + + override def modelInstance: AmfObject = GooglePubSubMessageBinding() + + override def fields: List[Field] = List(Attributes, OrderingKey, Schema, BindingVersion) ++ MessageBindingModel.fields + + override val `type`: List[ValueType] = ApiBinding + "GooglePubSubMessageBinding" :: MessageBindingModel.`type` + + override val key: Field = Type + + override val doc: ModelDoc = ModelDoc(ModelVocabularies.ApiBinding, "GooglePubSubMessageBinding") +} +object GooglePubSubChannelBindingModel extends ChannelBindingModel with BindingVersion { + val Labels: Field = + Field( + ObjectNodeModel, + ApiBinding + "labels", + ModelDoc(ModelVocabularies.ApiBinding, "labels", "An object of key-value pairs ") + ) + + val MessageRetentionDuration: Field = + Field( + Str, + ApiBinding + "messageRetentionDuration", + ModelDoc( + ModelVocabularies.ApiBinding, + "messageRetentionDuration", + "Indicates the minimum duration to retain a message after it is published to the topic" + ) + ) + + val MessageStoragePolicy: Field = + Field( + GooglePubSubMessageStoragePolicyModel, + ApiBinding + "messageStoragePolicy", + ModelDoc( + ModelVocabularies.ApiBinding, + "messageStoragePolicy", + "Policy constraining the set of Google Cloud Platform regions where messages published to the topic may be stored" + ) + ) + + val SchemaSettings: Field = + Field( + GooglePubSubSchemaSettingsModel, + ApiBinding + "schemaSettings", + ModelDoc( + ModelVocabularies.ApiBinding, + "schemaSettings", + "Settings for validating messages published against a schema" + ) + ) + + val Topic: Field = + Field( + Str, + ApiBinding + "topic", + ModelDoc(ModelVocabularies.ApiBinding, "topic", "The Google Cloud Pub/Sub Topic name") + ) + + override def modelInstance: AmfObject = GooglePubSubChannelBinding() + + override def fields: List[Field] = List( + Labels, + MessageRetentionDuration, + MessageStoragePolicy, + SchemaSettings, + Topic, + BindingVersion + ) ++ ChannelBindingModel.fields + + override val `type`: List[ValueType] = ApiBinding + "GooglePubSubChannelBinding" :: ChannelBindingModel.`type` + + override val key: Field = Type + + override val doc: ModelDoc = ModelDoc(ModelVocabularies.ApiBinding, "GooglePubSubChannelBinding") +} +object GooglePubSubMessageStoragePolicyModel extends DomainElementModel { + + val AllowedPersistenceRegions: Field = + Field( + Array(Str), + ApiBinding + "allowedPersistenceRegions", + ModelDoc( + ModelVocabularies.ApiBinding, + "allowedPersistenceRegions", + "A list of IDs of GCP regions where messages that are published to the topic may be persisted in storage" + ) + ) + def modelInstance: AmfObject = GooglePubSubMessageStoragePolicy() + + def fields: List[Field] = List(AllowedPersistenceRegions) ++ DomainElementModel.fields + + val `type`: List[ValueType] = ApiBinding + "GooglePubSubMessageStoragePolicy" :: DomainElementModel.`type` + + val key: Field = Type + + override val doc: ModelDoc = ModelDoc(ModelVocabularies.ApiBinding, "GooglePubSubMessageStoragePolicy") + +} +object GooglePubSubSchemaSettingsModel extends DomainElementModel { + + val Encoding: Field = + Field( + Str, + ApiBinding + "encoding", + ModelDoc(ModelVocabularies.ApiBinding, "encoding", "The encoding of the message ") + ) + + val FirstRevisionId: Field = + Field( + Str, + ApiBinding + "firstRevisionId", + ModelDoc( + ModelVocabularies.ApiBinding, + "firstRevisionId", + "The minimum (inclusive) revision allowed for validating messages" + ) + ) + + val LastRevisionId: Field = + Field( + Str, + ApiBinding + "lastRevisionId", + ModelDoc( + ModelVocabularies.ApiBinding, + "lastRevisionId", + "The maximum (inclusive) revision allowed for validating messages" + ) + ) + + val Name: Field = + Field( + Str, + ApiBinding + "name", + ModelDoc( + ModelVocabularies.ApiBinding, + "name", + "Name of the schema that messages published should be validated against" + ) + ) + + def modelInstance: AmfObject = GooglePubSubSchemaSettings() + + def fields: List[Field] = List(Encoding, FirstRevisionId, LastRevisionId, Name) ++ DomainElementModel.fields + + val `type`: List[ValueType] = ApiBinding + "GooglePubSubSchemaSettings" :: DomainElementModel.`type` + + val key: Field = Type + + override val doc: ModelDoc = ModelDoc(ModelVocabularies.ApiBinding, "GooglePubSubSchemaSettings") + +} +object GooglePubSubSchemaDefinitionModel extends DomainElementModel { + val Name: Field = + Field( + Str, + ApiBinding + "name", + ModelDoc(ModelVocabularies.ApiBinding, "name", "The name of the schema") + ) + + val FieldType: Field = + Field( + Str, + ApiBinding + "type", + ModelDoc(ModelVocabularies.ApiBinding, "type", "The type of the schema") + ) + + def modelInstance: AmfObject = GooglePubSubSchemaDefinition() + + def fields: List[Field] = List(Name, FieldType) ++ DomainElementModel.fields + + val `type`: List[ValueType] = ApiBinding + "GooglePubSubSchemaDefinition" :: DomainElementModel.`type` + + val key: Field = Type + + override val doc: ModelDoc = ModelDoc(ModelVocabularies.ApiBinding, "GooglePubSubSchemaDefinition") + +} diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/metamodel/domain/bindings/PulsarBindingModel.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/metamodel/domain/bindings/PulsarBindingModel.scala new file mode 100644 index 0000000000..4e94754bd1 --- /dev/null +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/metamodel/domain/bindings/PulsarBindingModel.scala @@ -0,0 +1,135 @@ +package amf.apicontract.internal.metamodel.domain.bindings + +import amf.apicontract.client.scala.model.domain.bindings.pulsar.{ + PulsarChannelBinding, + PulsarChannelRetention, + PulsarServerBinding +} +import amf.core.client.scala.model.domain.AmfObject +import amf.core.client.scala.vocabulary.Namespace.ApiBinding +import amf.core.client.scala.vocabulary.ValueType +import amf.core.internal.metamodel.Field +import amf.core.internal.metamodel.Type.{Array, Bool, Int, Str} +import amf.core.internal.metamodel.domain.{DomainElementModel, ModelDoc, ModelVocabularies} + +object PulsarServerBindingModel extends ServerBindingModel with BindingVersion { + val Tenant: Field = + Field( + Str, + ApiBinding + "tenant", + ModelDoc(ModelVocabularies.ApiBinding, "tenant", "The pulsar tenant. If omitted, \"public\" MUST be assumed.") + ) + + override def modelInstance: AmfObject = PulsarServerBinding() + + override def fields: List[Field] = List(Tenant, BindingVersion) ++ ServerBindingModel.fields + + override val `type`: List[ValueType] = ApiBinding + "PulsarServerBinding" :: ServerBindingModel.`type` + + override val key: Field = Type + + override val doc: ModelDoc = ModelDoc(ModelVocabularies.ApiBinding, "PulsarServerBinding") +} + +object PulsarChannelBindingModel extends ChannelBindingModel with BindingVersion { + val Namespace: Field = + Field( + Str, + ApiBinding + "namespace", + ModelDoc(ModelVocabularies.ApiBinding, "namespace", "The namespace the channel is associated with.") + ) + + val Persistence: Field = + Field( + Str, + ApiBinding + "persistence", + ModelDoc( + ModelVocabularies.ApiBinding, + "persistence", + "Persistence of the topic in Pulsar. It MUST be either persistent or non-persistent." + ) + ) + + val Compaction: Field = + Field( + Int, + ApiBinding + "compaction", + ModelDoc(ModelVocabularies.ApiBinding, "compaction", "Topic compaction threshold given in Megabytes.") + ) + + val GeoReplication: Field = + Field( + Array(Str), + ApiBinding + "geo-replication", + ModelDoc(ModelVocabularies.ApiBinding, "geo-replication", "A list of clusters the topic is replicated to.") + ) + + val Retention: Field = + Field( + PulsarChannelRetentionModel, + ApiBinding + "retention", + ModelDoc(ModelVocabularies.ApiBinding, "retention", "Topic retention policy.") + ) + + val Ttl: Field = + Field( + Int, + ApiBinding + "ttl", + ModelDoc(ModelVocabularies.ApiBinding, "ttl", "Message time-to-live in seconds.") + ) + + val Deduplication: Field = + Field( + Bool, + ApiBinding + "deduplication", + ModelDoc( + ModelVocabularies.ApiBinding, + "deduplication", + "Message deduplication. When true, it ensures that each message produced on Pulsar topics is persisted to disk only once." + ) + ) + + override def modelInstance: AmfObject = PulsarChannelBinding() + + override def fields: List[Field] = List( + Namespace, + Persistence, + Compaction, + GeoReplication, + Retention, + Ttl, + Deduplication, + BindingVersion + ) ++ ChannelBindingModel.fields + + override val `type`: List[ValueType] = ApiBinding + "PulsarChannelBinding" :: ChannelBindingModel.`type` + + override val key: Field = Type + + override val doc: ModelDoc = ModelDoc(ModelVocabularies.ApiBinding, "PulsarChannelBinding") +} + +object PulsarChannelRetentionModel extends DomainElementModel { + + val Time: Field = + Field( + Int, + ApiBinding + "time", + ModelDoc(ModelVocabularies.ApiBinding, "time", "Time given in Minutes. Defaults to 0") + ) + + val Size: Field = + Field( + Int, + ApiBinding + "size", + ModelDoc(ModelVocabularies.ApiBinding, "size", "Size given in MegaBytes. Defaults to 0") + ) + + override def fields: List[Field] = List(Time, Size) ++ DomainElementModel.fields + + override val `type`: List[ValueType] = ApiBinding + "PulsarChannelRetention" :: DomainElementModel.`type` + + override def modelInstance: AmfObject = PulsarChannelRetention() + + override val doc: ModelDoc = ModelDoc(ModelVocabularies.ApiBinding, "PulsarChannelRetention") +} diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/metamodel/domain/bindings/SolaceBindingModel.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/metamodel/domain/bindings/SolaceBindingModel.scala new file mode 100644 index 0000000000..962bb31f05 --- /dev/null +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/metamodel/domain/bindings/SolaceBindingModel.scala @@ -0,0 +1,183 @@ +package amf.apicontract.internal.metamodel.domain.bindings + +import amf.apicontract.client.scala.model.domain.bindings.solace.{ + SolaceOperationBinding, + SolaceOperationDestination, + SolaceOperationQueue, + SolaceOperationTopic, + SolaceServerBinding +} +import amf.core.client.scala.model.domain.AmfObject +import amf.core.client.scala.vocabulary.Namespace.ApiBinding +import amf.core.client.scala.vocabulary.ValueType +import amf.core.internal.metamodel.Field +import amf.core.internal.metamodel.Type.{Array, Str} +import amf.core.internal.metamodel.domain.{DomainElementModel, ModelDoc, ModelVocabularies} +import amf.core.internal.metamodel.domain.common.NameFieldSchema + +object SolaceServerBindingModel extends ServerBindingModel with BindingVersion { + val MsgVpn: Field = + Field( + Str, + ApiBinding + "msgVpn", + ModelDoc(ModelVocabularies.ApiBinding, "msgVpn", "The Virtual Private Network name on the Solace broker.") + ) + + override def modelInstance: AmfObject = SolaceServerBinding() + + override def fields: List[Field] = List(MsgVpn, BindingVersion) ++ ServerBindingModel.fields + + override val `type`: List[ValueType] = ApiBinding + "SolaceServerBinding" :: ServerBindingModel.`type` + + override val key: Field = Type + + override val doc: ModelDoc = ModelDoc(ModelVocabularies.ApiBinding, "SolaceServerBinding") +} + +object SolaceOperationBindingModel extends OperationBindingModel with BindingVersion { + val Destinations: Field = + Field( + Array(SolaceOperationDestinationModel), + ApiBinding + "destinations", + ModelDoc( + ModelVocabularies.ApiBinding, + "destinations" + ) + ) + + override def modelInstance: AmfObject = SolaceOperationBinding() + + override def fields: List[Field] = List(Destinations, BindingVersion) ++ OperationBindingModel.fields + + override val `type`: List[ValueType] = ApiBinding + "SolaceOperationBinding" :: OperationBindingModel.`type` + + override val key: Field = Type + + override val doc: ModelDoc = ModelDoc(ModelVocabularies.ApiBinding, "SolaceOperationBinding") +} + +object SolaceOperationDestinationModel extends DomainElementModel { + + val DestinationType: Field = Field( + Str, + ApiBinding + "destinationType", + ModelDoc( + ModelVocabularies.ApiBinding, + "destinationType", + "'queue' or 'topic'. If the type is queue, then the subscriber can bind to the queue, which in turn will subscribe to the topic as represented by the channel name or to the provided topicSubscriptions." + ) + ) + + val DeliveryMode: Field = Field( + Str, + ApiBinding + "deliveryMode", + ModelDoc( + ModelVocabularies.ApiBinding, + "deliveryMode", + "'direct' or 'persistent'. This determines the quality of service for publishing messages. Default is 'persistent'." + ) + ) + + val Queue: Field = + Field( + SolaceOperationQueueModel, + ApiBinding + "queue", + ModelDoc( + ModelVocabularies.ApiBinding, + "queue", + "Defines the properties of a queue." + ) + ) + + val Topic: Field = + Field( + SolaceOperationTopicModel, + ApiBinding + "topic", + ModelDoc( + ModelVocabularies.ApiBinding, + "topic", + "Defines the properties of a topic." + ) + ) + + override def fields: List[Field] = List(DestinationType, DeliveryMode, Queue, Topic) ++ DomainElementModel.fields + + override val `type`: List[ValueType] = ApiBinding + "SolaceOperationDestination" :: DomainElementModel.`type` + + override def modelInstance: AmfObject = SolaceOperationDestination() + + override val doc: ModelDoc = ModelDoc(ModelVocabularies.ApiBinding, "SolaceOperationDestination") +} + +object SolaceOperationQueueModel extends DomainElementModel with NameFieldSchema { + + val TopicSubscriptions: Field = Field( + Array(Str), + ApiBinding + "topicSubscriptions", + ModelDoc( + ModelVocabularies.ApiBinding, + "topicSubscriptions", + "A list of topics that the queue subscribes to, only applicable when destinationType is 'queue'. If none is given, the queue subscribes to the topic as represented by the channel name." + ) + ) + + val AccessType: Field = Field( + Str, + ApiBinding + "accessType", + ModelDoc( + ModelVocabularies.ApiBinding, + "accessType", + "'exclusive' or 'nonexclusive'. Only applicable when destinationType is 'queue'." + ) + ) + + val MaxMsgSpoolSize: Field = Field( + Str, + ApiBinding + "maxMsgSpoolSize", + ModelDoc( + ModelVocabularies.ApiBinding, + "maxMsgSpoolSize", + "The maximum amount of message spool that the given queue may use. Only applicable when destinationType is 'queue'." + ) + ) + + val MaxTtl: Field = Field( + Str, + ApiBinding + "maxTtl", + ModelDoc( + ModelVocabularies.ApiBinding, + "maxTtl", + "The maximum TTL to apply to messages to be spooled. Only applicable when destinationType is 'queue'." + ) + ) + + override def fields: List[Field] = + List(TopicSubscriptions, AccessType, MaxMsgSpoolSize, MaxTtl) ++ DomainElementModel.fields + + override val `type`: List[ValueType] = ApiBinding + "SolaceOperationQueue" :: DomainElementModel.`type` + + override def modelInstance: AmfObject = SolaceOperationQueue() + + override val doc: ModelDoc = ModelDoc(ModelVocabularies.ApiBinding, "SolaceOperationQueue") +} + +object SolaceOperationTopicModel extends DomainElementModel { + + val TopicSubscriptions: Field = Field( + Array(Str), + ApiBinding + "topicSubscriptions", + ModelDoc( + ModelVocabularies.ApiBinding, + "topicSubscriptions", + "A list of topics that the client subscribes to, only applicable when destinationType is 'topic'. If none is given, the client subscribes to the topic as represented by the channel name." + ) + ) + + override def fields: List[Field] = List(TopicSubscriptions) ++ DomainElementModel.fields + + override val `type`: List[ValueType] = ApiBinding + "SolaceOperationTopic" :: DomainElementModel.`type` + + override def modelInstance: AmfObject = SolaceOperationTopic() + + override val doc: ModelDoc = ModelDoc(ModelVocabularies.ApiBinding, "SolaceOperationTopic") +} diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/Async20ParsePlugin.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/Async20ParsePlugin.scala index a5bfe502e8..eee4a0fca4 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/Async20ParsePlugin.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/Async20ParsePlugin.scala @@ -1,21 +1,8 @@ package amf.apicontract.internal.spec.async -import amf.apicontract.internal.spec.async.AsyncHeader.{ - Async20Header, - Async21Header, - Async22Header, - Async23Header, - Async24Header, - Async25Header, - Async26Header -} +import amf.apicontract.internal.spec.async.AsyncHeader._ import amf.apicontract.internal.spec.async.parser.context.{Async2WebApiContext, AsyncWebApiContext} import amf.apicontract.internal.spec.async.parser.document -import amf.apicontract.internal.spec.async.parser.domain.declarations.{ - Async20DeclarationParser, - Async23DeclarationParser, - Async24DeclarationParser -} import amf.apicontract.internal.spec.common.AsyncWebApiDeclarations import amf.apicontract.internal.spec.oas.OasLikeParsePlugin import amf.apicontract.internal.spec.raml.Raml10ParsePlugin @@ -52,6 +39,12 @@ object Async20ParsePlugin extends OasLikeParsePlugin { private def parseAsyncUnit(header: AsyncHeader, root: Root)(implicit ctx: AsyncWebApiContext): BaseUnit = { header match { case Async20Header => document.AsyncApi20DocumentParser(root).parseDocument() + case Async21Header => document.AsyncApi21DocumentParser(root).parseDocument() + case Async22Header => document.AsyncApi22DocumentParser(root).parseDocument() + case Async23Header => document.AsyncApi23DocumentParser(root).parseDocument() + case Async24Header => document.AsyncApi24DocumentParser(root).parseDocument() + case Async25Header => document.AsyncApi25DocumentParser(root).parseDocument() + case Async26Header => document.AsyncApi26DocumentParser(root).parseDocument() case _ => throw new InvalidDocumentHeaderException(spec.id) } diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/NotFinishedAsync20ParsePlugin.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/NotFinishedAsync20ParsePlugin.scala deleted file mode 100644 index 9bda10594b..0000000000 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/NotFinishedAsync20ParsePlugin.scala +++ /dev/null @@ -1,69 +0,0 @@ -package amf.apicontract.internal.spec.async - -import amf.apicontract.internal.spec.async.AsyncHeader._ -import amf.apicontract.internal.spec.async.parser.context.{Async2WebApiContext, AsyncWebApiContext} -import amf.apicontract.internal.spec.async.parser.document -import amf.apicontract.internal.spec.common.AsyncWebApiDeclarations -import amf.apicontract.internal.spec.oas.OasLikeParsePlugin -import amf.apicontract.internal.spec.raml.Raml10ParsePlugin -import amf.core.client.scala.config.ParsingOptions -import amf.core.client.scala.exception.InvalidDocumentHeaderException -import amf.core.client.scala.model.document.BaseUnit -import amf.core.client.scala.parse.document.{EmptyFutureDeclarations, ParsedReference, ParserContext} -import amf.core.internal.parser.Root -import amf.core.internal.remote.{AsyncApi20, Mimes, Spec} - -/* - * This plugin should be merged with Async20ParsePlugin after Async 2.x feature is finished - */ -object NotFinishedAsync20ParsePlugin extends OasLikeParsePlugin { - - override def spec: Spec = AsyncApi20 - - override def applies(element: Root): Boolean = AsyncHeader(element).isDefined - - override def validSpecsToReference: Seq[Spec] = - super.validSpecsToReference :+ Raml10ParsePlugin.spec - - override def mediaTypes: Seq[String] = Seq(Mimes.`application/yaml`, Mimes.`application/json`) - - override def parse(document: Root, ctx: ParserContext): BaseUnit = { - val header = parseHeader(document) - implicit val newCtx: AsyncWebApiContext = - context(document.location, document.references, ctx.parsingOptions, ctx, spec = header.spec) - restrictCrossSpecReferences(document, ctx) - val parsed = parseAsyncUnit(header, document) - promoteFragments(parsed, newCtx) - } - - private def parseHeader(root: Root): AsyncHeader = - AsyncHeader(root).getOrElse(throw new InvalidDocumentHeaderException(spec.id)) - - private def parseAsyncUnit(header: AsyncHeader, root: Root)(implicit ctx: AsyncWebApiContext): BaseUnit = { - header match { - case Async20Header => document.AsyncApi20DocumentParser(root).parseDocument() - case Async21Header => document.AsyncApi21DocumentParser(root).parseDocument() - case Async22Header => document.AsyncApi22DocumentParser(root).parseDocument() - case Async23Header => document.AsyncApi23DocumentParser(root).parseDocument() - case Async24Header => document.AsyncApi24DocumentParser(root).parseDocument() - case Async25Header => document.AsyncApi25DocumentParser(root).parseDocument() - case Async26Header => document.AsyncApi26DocumentParser(root).parseDocument() - case _ => - throw new InvalidDocumentHeaderException(spec.id) - } - } - - private def context( - loc: String, - refs: Seq[ParsedReference], - options: ParsingOptions, - wrapped: ParserContext, - ds: Option[AsyncWebApiDeclarations] = None, - spec: Spec - ): Async2WebApiContext = { - // ensure unresolved references in external fragments are not resolved with main api definitions - val cleanContext = wrapped.copy(futureDeclarations = EmptyFutureDeclarations()) - cleanContext.globalSpace = wrapped.globalSpace - Async2WebApiContext(loc, refs, cleanContext, ds, options, spec) - } -} diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/emitters/bindings/AsyncApiChannelBindingsEmitter.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/emitters/bindings/AsyncApiChannelBindingsEmitter.scala index 8982e9c2a3..9b641f1aa8 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/emitters/bindings/AsyncApiChannelBindingsEmitter.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/emitters/bindings/AsyncApiChannelBindingsEmitter.scala @@ -7,33 +7,54 @@ import amf.apicontract.client.scala.model.domain.bindings.amqp.{ Amqp091Queue } import amf.apicontract.client.scala.model.domain.bindings.anypointmq.AnypointMQChannelBinding +import amf.apicontract.client.scala.model.domain.bindings.googlepubsub.{ + GooglePubSubChannelBinding, + GooglePubSubMessageStoragePolicy, + GooglePubSubSchemaSettings +} import amf.apicontract.client.scala.model.domain.bindings.ibmmq.{ IBMMQChannelBinding, IBMMQChannelQueue, IBMMQChannelTopic } +import amf.apicontract.client.scala.model.domain.bindings.pulsar.{PulsarChannelBinding, PulsarChannelRetention} import amf.apicontract.client.scala.model.domain.bindings.websockets.WebSocketsChannelBinding import amf.apicontract.internal.metamodel.domain.bindings.{ Amqp091ChannelBindingModel, Amqp091ChannelExchangeModel, Amqp091QueueModel, AnypointMQChannelBindingModel, + GooglePubSubChannelBindingModel, + GooglePubSubMessageStoragePolicyModel, + GooglePubSubSchemaDefinitionModel, + GooglePubSubSchemaSettingsModel, IBMMQChannelBindingModel, IBMMQChannelQueueModel, IBMMQChannelTopicModel, - WebSocketsChannelBindingModel + PulsarChannelBindingModel, + PulsarChannelRetentionModel, WebSocketsChannelBindingModel } import amf.apicontract.internal.spec.async.emitters.domain -import amf.apicontract.internal.spec.async.parser.bindings.Bindings.{Amqp, AnypointMQ, IBMMQ, WebSockets} +import amf.apicontract.internal.spec.async.parser.bindings.Bindings.{Amqp, AnypointMQ, GooglePubSub, IBMMQ, Pulsar, WebSockets} import amf.apicontract.internal.spec.oas.emitter.context.OasLikeSpecEmitterContext import org.mulesoft.common.client.lexical.Position -import amf.core.client.scala.model.domain.Shape +import amf.core.client.scala.model.domain.{AmfScalar, ObjectNode, Shape} import amf.core.internal.annotations.SynthesizedField +import amf.core.internal.datanode.DataNodeEmitter import amf.core.internal.parser.domain.FieldEntry -import amf.core.internal.render.BaseEmitters.{ValueEmitter, pos, traverse} +import amf.core.internal.render.BaseEmitters.{ + ArrayEmitter, + EntryPartEmitter, + ScalarEmitter, + ValueEmitter, + pos, + traverse +} +import amf.core.internal.render.BaseEmitters.{ArrayEmitter, ValueEmitter, pos, traverse} import amf.core.internal.render.SpecOrdering -import amf.core.internal.render.emitters.EntryEmitter -import org.yaml.model.YDocument.EntryBuilder +import amf.core.internal.render.emitters.{EntryEmitter, PartEmitter} +import amf.shapes.internal.spec.oas.emitter.{OasNodeShapeEmitter, OasScalarShapeEmitter} +import org.yaml.model.YDocument.{EntryBuilder, PartBuilder} import org.yaml.model.{YDocument, YNode} import scala.collection.mutable.ListBuffer @@ -47,11 +68,13 @@ class AsyncApiChannelBindingsEmitter(binding: ChannelBinding, ordering: SpecOrde } private def emitterFor(binding: ChannelBinding): Option[EntryEmitter] = binding match { - case binding: Amqp091ChannelBinding => Some(new Amqp091ChannelBindingEmitter(binding, ordering)) - case binding: WebSocketsChannelBinding => Some(new WebSocketChannelBindingEmitter(binding, ordering)) - case binding: IBMMQChannelBinding => Some(new IBMMQChannelBindingEmitter(binding, ordering)) - case binding: AnypointMQChannelBinding => Some(new AnypointMQChannelBindingEmitter(binding, ordering)) - case _ => None + case binding: Amqp091ChannelBinding => Some(new Amqp091ChannelBindingEmitter(binding, ordering)) + case binding: WebSocketsChannelBinding => Some(new WebSocketChannelBindingEmitter(binding, ordering)) + case binding: IBMMQChannelBinding => Some(new IBMMQChannelBindingEmitter(binding, ordering)) + case binding: AnypointMQChannelBinding => Some(new AnypointMQChannelBindingEmitter(binding, ordering)) + case binding: PulsarChannelBinding => Some(new PulsarChannelBindingEmitter(binding, ordering)) + case binding: GooglePubSubChannelBinding => Some(new GooglePubSubChannelBindingEmitter(binding, ordering)) + case _ => None } override def position(): Position = pos(binding.annotations) @@ -257,3 +280,130 @@ class AnypointMQChannelBindingEmitter(binding: AnypointMQChannelBinding, orderin override def position(): Position = pos(binding.annotations) } + +class GooglePubSubChannelBindingEmitter(binding: GooglePubSubChannelBinding, ordering: SpecOrdering)(implicit + val spec: OasLikeSpecEmitterContext +) extends AsyncApiCommonBindingEmitter { + override def emit(b: YDocument.EntryBuilder): Unit = { + b.entry( + YNode(GooglePubSub), + _.obj { emitter => + val result = ListBuffer[EntryEmitter]() + val fs = binding.fields + + fs.entry(GooglePubSubChannelBindingModel.Labels) + .foreach(f => + result += EntryPartEmitter( + "labels", + DataNodeEmitter(binding.labels, ordering)(spec.eh), + position = pos(f.value.annotations) + ) + ) + fs.entry(GooglePubSubChannelBindingModel.MessageRetentionDuration) + .foreach(f => result += ValueEmitter("messageRetentionDuration", f)) + fs.entry(GooglePubSubChannelBindingModel.Topic).foreach(f => result += ValueEmitter("topic", f)) + Option(binding.messageStoragePolicy).foreach(policy => + result += new GooglePubSubStoragePolicyEmitter(policy, ordering) + ) + Option(binding.schemaSettings).foreach(settings => + result += new GooglePubSubSchemaSettingsEmitter(settings, ordering) + ) + + emitBindingVersion(fs, result) + traverse(ordering.sorted(result), emitter) + + } + ) + } + override def position(): Position = pos(binding.annotations) +} + +class GooglePubSubStoragePolicyEmitter(binding: GooglePubSubMessageStoragePolicy, ordering: SpecOrdering) + extends EntryEmitter { + override def emit(b: EntryBuilder): Unit = { + b.entry( + YNode("messageStoragePolicy"), + _.obj { emitter => + val result = ListBuffer[EntryEmitter]() + val fs = binding.fields + + fs.entry(GooglePubSubMessageStoragePolicyModel.AllowedPersistenceRegions) + .foreach(f => result += ArrayEmitter("allowedPersistenceRegions", f, ordering)) + + traverse(ordering.sorted(result), emitter) + } + ) + } + override def position(): Position = pos(binding.annotations) +} +class GooglePubSubSchemaSettingsEmitter(binding: GooglePubSubSchemaSettings, ordering: SpecOrdering) + extends EntryEmitter { + override def emit(b: EntryBuilder): Unit = { + b.entry( + YNode("schemaSettings"), + _.obj { emitter => + val result = ListBuffer[EntryEmitter]() + val fs = binding.fields + + fs.entry(GooglePubSubSchemaSettingsModel.Encoding).foreach(f => result += ValueEmitter("encoding", f)) + fs.entry(GooglePubSubSchemaSettingsModel.FirstRevisionId) + .foreach(f => result += ValueEmitter("firstRevisionId", f)) + fs.entry(GooglePubSubSchemaSettingsModel.LastRevisionId) + .foreach(f => result += ValueEmitter("lastRevisionId", f)) + fs.entry(GooglePubSubSchemaSettingsModel.Name).foreach(f => result += ValueEmitter("name", f)) + + traverse(ordering.sorted(result), emitter) + } + ) + } + override def position(): Position = pos(binding.annotations) +} + +class PulsarChannelBindingEmitter(binding: PulsarChannelBinding, ordering: SpecOrdering) + extends AsyncApiCommonBindingEmitter { + + override def emit(b: YDocument.EntryBuilder): Unit = { + b.entry( + YNode(Pulsar), + _.obj { emitter => + val result = ListBuffer[EntryEmitter]() + val fs = binding.fields + + fs.entry(PulsarChannelBindingModel.Namespace).foreach(f => result += ValueEmitter("namespace", f)) + fs.entry(PulsarChannelBindingModel.Persistence).foreach(f => result += ValueEmitter("persistence", f)) + fs.entry(PulsarChannelBindingModel.Compaction).foreach(f => result += ValueEmitter("compaction", f)) + fs.entry(PulsarChannelBindingModel.GeoReplication) + .foreach(f => result += ArrayEmitter("geo-replication", f, ordering)) + Option(binding.retention).foreach(retention => result += new PulsarChannelRetentionEmitter(retention, ordering)) + fs.entry(PulsarChannelBindingModel.Ttl).foreach(f => result += ValueEmitter("ttl", f)) + fs.entry(PulsarChannelBindingModel.Deduplication).foreach(f => result += ValueEmitter("deduplication", f)) + + emitBindingVersion(fs, result) + + traverse(ordering.sorted(result), emitter) + } + ) + } + + override def position(): Position = pos(binding.annotations) +} + +class PulsarChannelRetentionEmitter(binding: PulsarChannelRetention, ordering: SpecOrdering) extends EntryEmitter { + + override def emit(b: EntryBuilder): Unit = { + b.entry( + YNode("retention"), + _.obj { emitter => + val result = ListBuffer[EntryEmitter]() + val fs = binding.fields + + fs.entry(PulsarChannelRetentionModel.Time).foreach(f => result += ValueEmitter("time", f)) + fs.entry(PulsarChannelRetentionModel.Size).foreach(f => result += ValueEmitter("size", f)) + + traverse(ordering.sorted(result), emitter) + } + ) + } + + override def position(): Position = pos(binding.annotations) +} diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/emitters/bindings/AsyncApiCommonBindingEmitter.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/emitters/bindings/AsyncApiCommonBindingEmitter.scala index 5919481f4e..d287ac28e2 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/emitters/bindings/AsyncApiCommonBindingEmitter.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/emitters/bindings/AsyncApiCommonBindingEmitter.scala @@ -1,6 +1,5 @@ package amf.apicontract.internal.spec.async.emitters.bindings -import amf.core.internal.annotations.SynthesizedField import amf.core.internal.parser.domain.Fields import amf.core.internal.render.BaseEmitters.ValueEmitter import amf.core.internal.render.emitters.EntryEmitter @@ -8,11 +7,11 @@ import amf.apicontract.internal.metamodel.domain.bindings.BindingVersion import scala.collection.mutable.ListBuffer -abstract class AsyncApiCommonBindingEmitter() extends EntryEmitter { +abstract class AsyncApiCommonBindingEmitter extends EntryEmitter { def emitBindingVersion(fs: Fields, result: ListBuffer[EntryEmitter]): Unit = { fs.entry(BindingVersion.BindingVersion).foreach { f => - if (!f.value.annotations.contains(classOf[SynthesizedField])) result += ValueEmitter("bindingVersion", f) + if (!f.value.annotations.isSynthesized) result += ValueEmitter("bindingVersion", f) } } } diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/emitters/bindings/AsyncApiMessageBindingsEmitter.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/emitters/bindings/AsyncApiMessageBindingsEmitter.scala index 0a67346c08..db72b20e0c 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/emitters/bindings/AsyncApiMessageBindingsEmitter.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/emitters/bindings/AsyncApiMessageBindingsEmitter.scala @@ -3,6 +3,10 @@ package amf.apicontract.internal.spec.async.emitters.bindings import amf.apicontract.client.scala.model.domain.bindings.MessageBinding import amf.apicontract.client.scala.model.domain.bindings.amqp.Amqp091MessageBinding import amf.apicontract.client.scala.model.domain.bindings.anypointmq.AnypointMQMessageBinding +import amf.apicontract.client.scala.model.domain.bindings.googlepubsub.{ + GooglePubSubMessageBinding, + GooglePubSubSchemaDefinition +} import amf.apicontract.client.scala.model.domain.bindings.http.HttpMessageBinding import amf.apicontract.client.scala.model.domain.bindings.ibmmq.IBMMQMessageBinding import amf.apicontract.client.scala.model.domain.bindings.kafka.KafkaMessageBinding @@ -10,17 +14,29 @@ import amf.apicontract.client.scala.model.domain.bindings.mqtt.MqttMessageBindin import amf.apicontract.internal.metamodel.domain.bindings.{ Amqp091MessageBindingModel, AnypointMQMessageBindingModel, + GooglePubSubMessageBindingModel, + GooglePubSubSchemaDefinitionModel, HttpMessageBindingModel, IBMMQMessageBindingModel, KafkaMessageBindingModel } import amf.apicontract.internal.spec.async.emitters.domain -import amf.apicontract.internal.spec.async.parser.bindings.Bindings.{Amqp, AnypointMQ, Http, IBMMQ, Kafka, Mqtt} +import amf.apicontract.internal.spec.async.parser.bindings.Bindings.{ + Amqp, + AnypointMQ, + GooglePubSub, + Http, + IBMMQ, + Kafka, + Mqtt +} import amf.apicontract.internal.spec.oas.emitter.context.OasLikeSpecEmitterContext +import amf.apicontract.internal.spec.spec import org.mulesoft.common.client.lexical.Position -import amf.core.client.scala.model.domain.{AmfArray, AmfScalar, Shape} +import amf.core.client.scala.model.domain.{AmfArray, AmfScalar, ObjectNode, Shape} +import amf.core.internal.datanode.DataNodeEmitter import amf.core.internal.parser.domain.{Annotations, FieldEntry, Value} -import amf.core.internal.render.BaseEmitters.{ValueEmitter, pos, traverse} +import amf.core.internal.render.BaseEmitters.{EntryPartEmitter, ValueEmitter, pos, traverse} import amf.core.internal.render.SpecOrdering import amf.core.internal.render.emitters.EntryEmitter import org.yaml.model.YDocument.EntryBuilder @@ -37,13 +53,14 @@ class AsyncApiMessageBindingsEmitter(binding: MessageBinding, ordering: SpecOrde } private def emitterFor(binding: MessageBinding): Option[EntryEmitter] = binding match { - case binding: Amqp091MessageBinding => Some(new Amqp091MessageEmitter(binding, ordering)) - case binding: HttpMessageBinding => Some(new HttpMessageEmitter(binding, ordering)) - case binding: KafkaMessageBinding => Some(new KafkaMessageEmitter(binding, ordering)) - case binding: MqttMessageBinding => Some(new MqttMessageEmitter(binding, ordering)) - case binding: IBMMQMessageBinding => Some(new IBMMQMessageEmitter(binding, ordering)) - case binding: AnypointMQMessageBinding => Some(new AnypointMQMessageEmitter(binding, ordering)) - case _ => None + case binding: Amqp091MessageBinding => Some(new Amqp091MessageEmitter(binding, ordering)) + case binding: HttpMessageBinding => Some(new HttpMessageEmitter(binding, ordering)) + case binding: KafkaMessageBinding => Some(new KafkaMessageEmitter(binding, ordering)) + case binding: MqttMessageBinding => Some(new MqttMessageEmitter(binding, ordering)) + case binding: IBMMQMessageBinding => Some(new IBMMQMessageEmitter(binding, ordering)) + case binding: AnypointMQMessageBinding => Some(new AnypointMQMessageEmitter(binding, ordering)) + case binding: GooglePubSubMessageBinding => Some(new GooglePubSubMessageBindingEmitter(binding, ordering)) + case _ => None } override def position(): Position = pos(binding.annotations) @@ -179,3 +196,51 @@ class AnypointMQMessageEmitter(binding: AnypointMQMessageBinding, ordering: Spec override def position(): Position = pos(binding.annotations) } + +class GooglePubSubMessageBindingEmitter(binding: GooglePubSubMessageBinding, ordering: SpecOrdering)(implicit + val spec: OasLikeSpecEmitterContext +) extends AsyncApiCommonBindingEmitter { + override def emit(b: YDocument.EntryBuilder): Unit = { + b.entry( + YNode(GooglePubSub), + _.obj { emitter => + val result = ListBuffer[EntryEmitter]() + val fs = binding.fields + + fs.entry(GooglePubSubMessageBindingModel.Attributes) + .foreach(f => + result += EntryPartEmitter( + "attributes", + DataNodeEmitter(binding.attributes, ordering)(spec.eh), + position = pos(f.value.annotations) + ) + ) + fs.entry(GooglePubSubMessageBindingModel.OrderingKey).foreach(f => result += ValueEmitter("orderingKey", f)) + Option(binding.schema).foreach(schema => result += new GooglePubSubSchemaDefinitionEmitter(schema, ordering)) + + emitBindingVersion(fs, result) + traverse(ordering.sorted(result), emitter) + + } + ) + } + override def position(): Position = pos(binding.annotations) +} +class GooglePubSubSchemaDefinitionEmitter(binding: GooglePubSubSchemaDefinition, ordering: SpecOrdering) + extends EntryEmitter { + override def emit(b: EntryBuilder): Unit = { + b.entry( + YNode("schema"), + _.obj { emitter => + val result = ListBuffer[EntryEmitter]() + val fs = binding.fields + + fs.entry(GooglePubSubSchemaDefinitionModel.Name).foreach(f => result += ValueEmitter("name", f)) + fs.entry(GooglePubSubSchemaDefinitionModel.FieldType).foreach(f => result += ValueEmitter("type", f)) + + traverse(ordering.sorted(result), emitter) + } + ) + } + override def position(): Position = pos(binding.annotations) +} diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/emitters/bindings/AsyncApiOperationBindingsEmitter.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/emitters/bindings/AsyncApiOperationBindingsEmitter.scala index c40f053075..602e84f10b 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/emitters/bindings/AsyncApiOperationBindingsEmitter.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/emitters/bindings/AsyncApiOperationBindingsEmitter.scala @@ -5,20 +5,32 @@ import amf.apicontract.client.scala.model.domain.bindings.amqp.Amqp091OperationB import amf.apicontract.client.scala.model.domain.bindings.http.HttpOperationBinding import amf.apicontract.client.scala.model.domain.bindings.kafka.KafkaOperationBinding import amf.apicontract.client.scala.model.domain.bindings.mqtt.MqttOperationBinding +import amf.apicontract.client.scala.model.domain.bindings.solace.{ + SolaceOperationBinding, + SolaceOperationDestination, + SolaceOperationQueue, + SolaceOperationTopic +} import amf.apicontract.internal.metamodel.domain.bindings.{ Amqp091OperationBindingModel, HttpOperationBindingModel, KafkaOperationBindingModel, - MqttOperationBindingModel + MqttOperationBindingModel, + SolaceOperationBindingModel, + SolaceOperationQueueModel, + SolaceOperationTopicModel } import amf.apicontract.internal.spec.async.emitters.domain +import amf.apicontract.internal.spec.async.emitters.domain.AsyncApiDestinationsEmitter +import amf.apicontract.internal.spec.async.parser.bindings.Bindings.Solace import amf.apicontract.internal.spec.oas.emitter.context.OasLikeSpecEmitterContext import org.mulesoft.common.client.lexical.Position import amf.core.client.scala.model.domain.Shape import amf.core.internal.render.BaseEmitters.{ValueEmitter, pos, traverse} import amf.core.internal.render.SpecOrdering import amf.core.internal.render.emitters.EntryEmitter -import org.yaml.model.{YDocument, YNode} +import org.yaml.model.YDocument.EntryBuilder +import org.yaml.model.{YDocument, YMap, YNode} import scala.collection.mutable.ListBuffer @@ -35,6 +47,7 @@ class AsyncApiOperationBindingsEmitter(binding: OperationBinding, ordering: Spec case binding: HttpOperationBinding => Some(new HttpOperationBindingEmitter(binding, ordering)) case binding: KafkaOperationBinding => Some(new KafkaOperationBindingEmitter(binding, ordering)) case binding: MqttOperationBinding => Some(new MqttOperationBindingEmitter(binding, ordering)) + case binding: SolaceOperationBinding => Some(new SolaceOperationBindingEmitter(binding, ordering)) case _ => None } @@ -140,3 +153,27 @@ class Amqp091OperationBindingEmitter(binding: Amqp091OperationBinding, ordering: override def position(): Position = pos(binding.annotations) } + +class SolaceOperationBindingEmitter(binding: SolaceOperationBinding, ordering: SpecOrdering)(implicit + val spec: OasLikeSpecEmitterContext +) extends AsyncApiCommonBindingEmitter { + + override def emit(b: YDocument.EntryBuilder): Unit = { + b.entry( + YNode(Solace), + _.obj { emitter => + val result = ListBuffer[EntryEmitter]() + val fs = binding.fields + + fs.entry(SolaceOperationBindingModel.Destinations) + .foreach(f => result += AsyncApiDestinationsEmitter(f, ordering)) + + emitBindingVersion(fs, result) + + traverse(ordering.sorted(result), emitter) + } + ) + } + + override def position(): Position = pos(binding.annotations) +} diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/emitters/bindings/AsyncApiServerBindingsEmitter.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/emitters/bindings/AsyncApiServerBindingsEmitter.scala index e6e87ff28e..3bf431f669 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/emitters/bindings/AsyncApiServerBindingsEmitter.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/emitters/bindings/AsyncApiServerBindingsEmitter.scala @@ -7,13 +7,18 @@ import amf.core.internal.render.emitters.EntryEmitter import amf.apicontract.internal.metamodel.domain.bindings.{ IBMMQServerBindingModel, MqttServerBindingModel, - MqttServerLastWillModel + MqttServerLastWillModel, + PulsarServerBindingModel, + SolaceServerBindingModel } import amf.apicontract.client.scala.model.domain.bindings.ServerBinding import amf.apicontract.client.scala.model.domain.bindings.ibmmq.IBMMQServerBinding import amf.apicontract.client.scala.model.domain.bindings.mqtt.{MqttServerBinding, MqttServerLastWill} +import amf.apicontract.client.scala.model.domain.bindings.pulsar.PulsarServerBinding +import amf.apicontract.client.scala.model.domain.bindings.solace.SolaceServerBinding import amf.apicontract.internal.spec.async.parser.bindings.Bindings._ import amf.apicontract.internal.spec.oas.emitter.context.OasLikeSpecEmitterContext +import amf.core.internal.annotations.SynthesizedField import org.yaml.model.{YDocument, YNode} import scala.collection.mutable.ListBuffer @@ -27,9 +32,11 @@ class AsyncApiServerBindingsEmitter(binding: ServerBinding, ordering: SpecOrderi } private def emitterFor(binding: ServerBinding): Option[EntryEmitter] = binding match { - case binding: MqttServerBinding => Some(new MqttServerBindingEmitter(binding, ordering)) - case binding: IBMMQServerBinding => Some(new IBMMQServerBindingEmitter(binding, ordering)) - case _ => None + case binding: MqttServerBinding => Some(new MqttServerBindingEmitter(binding, ordering)) + case binding: IBMMQServerBinding => Some(new IBMMQServerBindingEmitter(binding, ordering)) + case binding: SolaceServerBinding => Some(new SolaceServerBindingEmitter(binding, ordering)) + case binding: PulsarServerBinding => Some(new PulsarServerBindingEmitter(binding, ordering)) + case _ => None } override def position(): Position = pos(binding.annotations) @@ -108,3 +115,48 @@ class IBMMQServerBindingEmitter(binding: IBMMQServerBinding, ordering: SpecOrder override def position(): Position = pos(binding.annotations) } + +class SolaceServerBindingEmitter(binding: SolaceServerBinding, ordering: SpecOrdering) + extends AsyncApiCommonBindingEmitter { + + override def emit(b: YDocument.EntryBuilder): Unit = { + b.entry( + YNode(Solace), + _.obj { emitter => + val result = ListBuffer[EntryEmitter]() + val fs = binding.fields + + fs.entry(SolaceServerBindingModel.MsgVpn).foreach(f => result += ValueEmitter("msgVpn", f)) + emitBindingVersion(fs, result) + + traverse(ordering.sorted(result), emitter) + } + ) + } + + override def position(): Position = pos(binding.annotations) +} + +class PulsarServerBindingEmitter(binding: PulsarServerBinding, ordering: SpecOrdering) + extends AsyncApiCommonBindingEmitter { + + override def emit(b: YDocument.EntryBuilder): Unit = { + b.entry( + YNode(Pulsar), + _.obj { emitter => + val result = ListBuffer[EntryEmitter]() + val fs = binding.fields + + fs.entry(PulsarServerBindingModel.Tenant).foreach { f => + if (!f.value.annotations.contains(classOf[SynthesizedField])) result += ValueEmitter("tenant", f) + } + + emitBindingVersion(fs, result) + + traverse(ordering.sorted(result), emitter) + } + ) + } + + override def position(): Position = pos(binding.annotations) +} diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/emitters/document/AsyncDeclarationsEmitters.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/emitters/document/AsyncDeclarationsEmitters.scala index abeb5ea7d9..e8ecf0f465 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/emitters/document/AsyncDeclarationsEmitters.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/emitters/document/AsyncDeclarationsEmitters.scala @@ -76,6 +76,13 @@ case class AsyncDeclarationsEmitters(declares: Seq[DomainElement], ordering: Spe ordering ) + if (declarations.serverVariables.nonEmpty) + result += AsyncApiServerVariablesDeclarationEmitter( + "serverVariables", + declarations.serverVariables.values.toSeq, + ordering + ) + if (declarations.channels.nonEmpty) result += AsyncApiChannelsDeclarationEmitter( "channels", diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/emitters/domain/AsyncApiDestinationsEmitter.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/emitters/domain/AsyncApiDestinationsEmitter.scala new file mode 100644 index 0000000000..5c8bec9a46 --- /dev/null +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/emitters/domain/AsyncApiDestinationsEmitter.scala @@ -0,0 +1,123 @@ +package amf.apicontract.internal.spec.async.emitters.domain + +import amf.apicontract.client.scala.model.domain.bindings.solace.{ + SolaceOperationDestination, + SolaceOperationQueue, + SolaceOperationTopic +} +import amf.apicontract.internal.metamodel.domain.bindings.{ + SolaceOperationDestinationModel, + SolaceOperationQueueModel, + SolaceOperationTopicModel +} +import amf.apicontract.internal.spec.common.emitter.AgnosticShapeEmitterContextAdapter +import amf.apicontract.internal.spec.oas.emitter.context.OasLikeSpecEmitterContext +import amf.core.internal.parser.domain.FieldEntry +import amf.core.internal.render.BaseEmitters.{ArrayEmitter, RawEmitter, ValueEmitter, pos, traverse} +import amf.core.internal.render.SpecOrdering +import amf.core.internal.render.emitters.{EntryEmitter, PartEmitter} +import amf.shapes.internal.annotations.OrphanOasExtension +import amf.shapes.internal.spec.common.emitter.annotations.AnnotationsEmitter +import org.mulesoft.common.client.lexical.Position +import org.mulesoft.common.client.lexical.Position.ZERO +import org.yaml.model.YDocument.{EntryBuilder, PartBuilder} +import org.yaml.model.{YDocument, YNode} + +import scala.collection.mutable.ListBuffer + +case class AsyncApiDestinationsEmitter(f: FieldEntry, ordering: SpecOrdering)(implicit + val spec: OasLikeSpecEmitterContext +) extends EntryEmitter { + + val key = "destinations" + + override def emit(b: YDocument.EntryBuilder): Unit = { + val destinations = + f.array.values + .map(_.asInstanceOf[SolaceOperationDestination]) + .map(new SingleDestinationEmitter(_, ordering)) + + b.entry( + key, + _.list(traverse(destinations, _)) + ) + } + + override def position(): Position = pos(f.element.annotations) +} + +class SingleDestinationEmitter(destination: SolaceOperationDestination, ordering: SpecOrdering)(implicit + val spec: OasLikeSpecEmitterContext +) extends PartEmitter { + protected implicit val shapeCtx = AgnosticShapeEmitterContextAdapter(spec) + override def emit(b: YDocument.PartBuilder): Unit = { + + val result = ListBuffer[EntryEmitter]() + val fs = destination.fields + + fs.entry(SolaceOperationDestinationModel.DestinationType).foreach(f => result += ValueEmitter("destinationType", f)) + fs.entry(SolaceOperationDestinationModel.DeliveryMode).foreach { f => + // in parsing the field may have been added as default value and synthesized, if so we should not emit it + if (!f.value.annotations.isSynthesized) { + result += ValueEmitter("deliveryMode", f) + } + } + + Option(destination.queue).foreach(queue => result += new SolaceOperationQueueEmitter(queue, ordering)) + Option(destination.topic).foreach(topic => result += new SolaceOperationTopicEmitter(topic, ordering)) + + result ++= AnnotationsEmitter(destination, ordering).emitters + + b.obj(traverse(ordering.sorted(result), _)) + } + + override def position(): Position = pos(destination.annotations) +} + +class SolaceOperationQueueEmitter(queue: SolaceOperationQueue, ordering: SpecOrdering)(implicit + val spec: OasLikeSpecEmitterContext +) extends EntryEmitter { + + override def emit(b: EntryBuilder): Unit = { + b.entry( + YNode("queue"), + _.obj { emitter => + val result = ListBuffer[EntryEmitter]() + val fs = queue.fields + + fs.entry(SolaceOperationQueueModel.Name).foreach(f => result += ValueEmitter("name", f)) + fs.entry(SolaceOperationQueueModel.TopicSubscriptions) + .foreach(f => result += spec.arrayEmitter("topicSubscriptions", f, ordering)) + fs.entry(SolaceOperationQueueModel.AccessType).foreach(f => result += ValueEmitter("accessType", f)) + fs.entry(SolaceOperationQueueModel.MaxMsgSpoolSize).foreach(f => result += ValueEmitter("maxMsgSpoolSize", f)) + fs.entry(SolaceOperationQueueModel.MaxTtl).foreach(f => result += ValueEmitter("maxTtl", f)) + + traverse(ordering.sorted(result), emitter) + } + ) + } + + override def position(): Position = pos(queue.annotations) +} + +class SolaceOperationTopicEmitter(topic: SolaceOperationTopic, ordering: SpecOrdering)(implicit + val spec: OasLikeSpecEmitterContext +) extends EntryEmitter { + + override def emit(b: EntryBuilder): Unit = { + b.entry( + YNode("topic"), + _.obj { emitter => + val result = ListBuffer[EntryEmitter]() + val fs = topic.fields + + fs.entry(SolaceOperationQueueModel.TopicSubscriptions) + .foreach(f => result += spec.arrayEmitter("topicSubscriptions", f, ordering)) + + traverse(ordering.sorted(result), emitter) + } + ) + } + + override def position(): Position = pos(topic.annotations) +} diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/emitters/domain/AsyncApiOperationEmitter.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/emitters/domain/AsyncApiOperationEmitter.scala index 20d436e1b1..8ec822d760 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/emitters/domain/AsyncApiOperationEmitter.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/emitters/domain/AsyncApiOperationEmitter.scala @@ -3,6 +3,7 @@ package amf.apicontract.internal.spec.async.emitters.domain import amf.apicontract.client.scala.model.domain.{Operation, Tag} import amf.apicontract.internal.metamodel.domain.OperationModel import amf.apicontract.internal.spec.async.AsyncHelper +import amf.apicontract.internal.spec.common.emitter.SecurityRequirementsEmitter import amf.apicontract.internal.spec.oas.emitter.context.OasLikeSpecEmitterContext import amf.apicontract.internal.spec.oas.emitter.domain.{ OasLikeOperationEmitter, @@ -52,6 +53,11 @@ case class AsyncOperationPartEmitter(operation: Operation, isTrait: Boolean, ord emitMessage(fs).map(reqOrRes => tempResult += reqOrRes) fs.entry(OperationModel.Extends).foreach(f => emitTraits(f, tempResult)) } + fs.entry(OperationModel.Security) + .foreach(f => + if (!f.value.annotations.isSynthesized) + tempResult += SecurityRequirementsEmitter("security", f, ordering) + ) traverse(ordering.sorted(super.commonEmitters ++ tempResult), eb) } } diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/emitters/domain/AsyncApiServerVariablesDeclarationEmitter.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/emitters/domain/AsyncApiServerVariablesDeclarationEmitter.scala new file mode 100644 index 0000000000..95ce8585da --- /dev/null +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/emitters/domain/AsyncApiServerVariablesDeclarationEmitter.scala @@ -0,0 +1,26 @@ +package amf.apicontract.internal.spec.async.emitters.domain +import amf.apicontract.client.scala.model.domain.Parameter +import amf.apicontract.internal.spec.common.emitter.{OasServerVariableEmitter, OasServerVariablesEmitter} +import amf.apicontract.internal.spec.oas.emitter.context.OasLikeSpecEmitterContext +import amf.core.internal.render.BaseEmitters.pos +import amf.core.internal.render.SpecOrdering +import amf.core.internal.render.emitters.EntryEmitter +import org.mulesoft.common.client.lexical.Position +import org.mulesoft.common.client.lexical.Position.ZERO +import org.yaml.model.YDocument.{EntryBuilder, PartBuilder} + +case class AsyncApiServerVariablesDeclarationEmitter( + key: String, + serverVariable: Seq[Parameter], + ordering: SpecOrdering +)(implicit val spec: OasLikeSpecEmitterContext) + extends EntryEmitter { + override def emit(b: EntryBuilder): Unit = { + val namedServersVariableEmitters = serverVariable.map(s => OasServerVariableEmitter(s, ordering)) + b.entry( + key, + _.obj(pb => namedServersVariableEmitters.foreach(e => e.emit(pb))) + ) + } + override def position(): Position = serverVariable.headOption.map(b => pos(b.annotations)).getOrElse(ZERO) +} diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/emitters/domain/AsyncApiServersEmitter.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/emitters/domain/AsyncApiServersEmitter.scala index 51708a5ade..6e9210908b 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/emitters/domain/AsyncApiServersEmitter.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/emitters/domain/AsyncApiServersEmitter.scala @@ -88,7 +88,7 @@ class AsyncApiServerPartEmitter(server: Server, ordering: SpecOrdering)(implicit fs.entry(ServerModel.ProtocolVersion).foreach(f => result += ValueEmitter("protocolVersion", f)) fs.entry(ServerModel.Description).foreach(f => result += ValueEmitter("description", f)) fs.entry(ServerModel.Tags).foreach(f => result += TagsEmitter("tags", f.array.values.asInstanceOf[Seq[Tag]], ordering)) - fs.entry(ServerModel.Variables).foreach(f => result += OasServerVariablesEmitter(f, ordering)) + fs.entry(ServerModel.Variables).foreach(f => result += OasServerVariablesEmitter("variables", f, ordering)) fs.entry(ServerModel.Security).foreach(f => result += SecurityRequirementsEmitter("security", f, ordering)) fs.entry(ServerModel.Bindings) .foreach(f => result += AsyncApiBindingsEmitter(f.value.value, ordering, bindingOrphanAnnotations)) diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/AsyncBindingsParser.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/AsyncBindingsParser.scala index 2cf7e0c152..e228fed935 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/AsyncBindingsParser.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/AsyncBindingsParser.scala @@ -103,20 +103,23 @@ abstract class AsyncBindingsParser(entryLike: YMapEntryLike)(implicit ctx: Async } object Bindings { - val Http = "http" - val WebSockets = "ws" - val Kafka = "kafka" - val Amqp = "amqp" - val Amqp1 = "amqp1" - val Mqtt = "mqtt" - val Mqtt5 = "mqtt5" - val Nats = "nats" - val Jms = "jms" - val Sns = "sns" - val Sqs = "sqs" - val Stomp = "stomp" - val Redis = "redis" - val Mercure = "mercure" - val IBMMQ = "ibmmq" - val AnypointMQ = "anypointmq" + val Http = "http" + val WebSockets = "ws" + val Kafka = "kafka" + val Amqp = "amqp" + val Amqp1 = "amqp1" + val Mqtt = "mqtt" + val Mqtt5 = "mqtt5" + val Nats = "nats" + val Jms = "jms" + val Sns = "sns" + val Sqs = "sqs" + val Stomp = "stomp" + val Redis = "redis" + val Mercure = "mercure" + val IBMMQ = "ibmmq" + val GooglePubSub = "googlepubsub" + val AnypointMQ = "anypointmq" + val Solace = "solace" + val Pulsar = "pulsar" } diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/AsyncChannelBindingsParser.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/AsyncChannelBindingsParser.scala index b8e260fda5..f536b9b0b4 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/AsyncChannelBindingsParser.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/AsyncChannelBindingsParser.scala @@ -1,14 +1,10 @@ package amf.apicontract.internal.spec.async.parser.bindings +import amf.apicontract.client.scala.model.domain.bindings.googlepubsub.GooglePubSubChannelBinding import amf.apicontract.client.scala.model.domain.bindings.{ChannelBinding, ChannelBindings} import amf.apicontract.internal.metamodel.domain.bindings._ -import amf.apicontract.internal.spec.async.parser.bindings.Bindings.{Amqp, AnypointMQ, IBMMQ, WebSockets} -import amf.apicontract.internal.spec.async.parser.bindings.channel.{ - Amqp091ChannelBindingParser, - AnypointMQChannelBindingParser, - IBMMQChannelBindingParser, - WebSocketsChannelBindingParser -} +import amf.apicontract.internal.spec.async.parser.bindings.Bindings.{Amqp, AnypointMQ, GooglePubSub, IBMMQ, Pulsar, WebSockets} +//import amf.apicontract.internal.spec.async.parser.bindings.channel.{Amqp091ChannelBindingParser, AnypointMQChannelBindingParser, GooglePubSubChannelBindingParser, IBMMQChannelBindingParser,PulsarChannelBindingParser, WebSocketsChannelBindingParser} import amf.apicontract.internal.spec.async.parser.context.AsyncWebApiContext import amf.apicontract.internal.spec.common.WebApiDeclarations.ErrorChannelBindings import amf.apicontract.internal.spec.spec.OasDefinitions @@ -16,13 +12,16 @@ import amf.core.client.scala.model.domain.AmfScalar import amf.core.internal.metamodel.Field import amf.core.internal.parser.domain.{Annotations, SearchScope} import amf.shapes.internal.spec.common.parser.YMapEntryLike +import amf.apicontract.internal.spec.async.parser.bindings.channel._ object AsyncChannelBindingsParser { private val parserMap: Map[String, BindingParser[ChannelBinding]] = Map( Amqp -> Amqp091ChannelBindingParser, WebSockets -> WebSocketsChannelBindingParser, IBMMQ -> IBMMQChannelBindingParser, - AnypointMQ -> AnypointMQChannelBindingParser + AnypointMQ -> AnypointMQChannelBindingParser, + Pulsar -> PulsarChannelBindingParser, + GooglePubSub -> GooglePubSubChannelBindingParser ) } diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/AsyncMessageBindingsParser.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/AsyncMessageBindingsParser.scala index a1f42db13a..ca8da7710b 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/AsyncMessageBindingsParser.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/AsyncMessageBindingsParser.scala @@ -2,7 +2,7 @@ package amf.apicontract.internal.spec.async.parser.bindings import amf.apicontract.client.scala.model.domain.bindings.{MessageBinding, MessageBindings} import amf.apicontract.internal.metamodel.domain.bindings._ -import amf.apicontract.internal.spec.async.parser.bindings.Bindings._ +import amf.apicontract.internal.spec.async.parser.bindings.Bindings.{GooglePubSub, _} import amf.apicontract.internal.spec.async.parser.bindings.message._ import amf.apicontract.internal.spec.async.parser.context.AsyncWebApiContext import amf.apicontract.internal.spec.common.WebApiDeclarations.ErrorMessageBindings @@ -19,7 +19,8 @@ object AsyncMessageBindingsParser { Kafka -> KafkaMessageBindingParser, Mqtt -> MqttMessageBindingParser, IBMMQ -> IBMMQMessageBindingParser, - AnypointMQ -> AnypointMQMessageBindingParser + AnypointMQ -> AnypointMQMessageBindingParser, + GooglePubSub -> GooglePubSubMessageBindingParser ) } diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/AsyncOperationBindingsParser.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/AsyncOperationBindingsParser.scala index 4139ae41fd..e67c80847f 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/AsyncOperationBindingsParser.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/AsyncOperationBindingsParser.scala @@ -3,12 +3,13 @@ package amf.apicontract.internal.spec.async.parser.bindings import amf.apicontract.client.scala.model.domain.bindings.{OperationBinding, OperationBindings} import amf.apicontract.internal.metamodel.domain.bindings._ import amf.apicontract.internal.spec.async.parser.bindings.AsyncOperationBindingsParser.parserMap -import amf.apicontract.internal.spec.async.parser.bindings.Bindings.{Amqp, Http, Kafka, Mqtt} +import amf.apicontract.internal.spec.async.parser.bindings.Bindings.{Amqp, Http, Kafka, Mqtt, Solace} import amf.apicontract.internal.spec.async.parser.bindings.operation.{ Amqp091OperationBindingParser, HttpOperationBindingParser, KafkaOperationBindingParser, - MqttOperationBindingParser + MqttOperationBindingParser, + SolaceOperationBindingParser } import amf.apicontract.internal.spec.async.parser.context.AsyncWebApiContext import amf.apicontract.internal.spec.common.WebApiDeclarations.ErrorOperationBindings @@ -20,10 +21,11 @@ import amf.shapes.internal.spec.common.parser.YMapEntryLike object AsyncOperationBindingsParser { private val parserMap: Map[String, BindingParser[OperationBinding]] = Map( - Amqp -> Amqp091OperationBindingParser, - Http -> HttpOperationBindingParser, - Kafka -> KafkaOperationBindingParser, - Mqtt -> MqttOperationBindingParser + Amqp -> Amqp091OperationBindingParser, + Http -> HttpOperationBindingParser, + Kafka -> KafkaOperationBindingParser, + Mqtt -> MqttOperationBindingParser, + Solace -> SolaceOperationBindingParser ) } diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/AsyncServerBindingsParser.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/AsyncServerBindingsParser.scala index cd65930a25..238c53bce1 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/AsyncServerBindingsParser.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/AsyncServerBindingsParser.scala @@ -2,7 +2,7 @@ package amf.apicontract.internal.spec.async.parser.bindings import amf.apicontract.client.scala.model.domain.bindings.{ServerBinding, ServerBindings} import amf.apicontract.internal.metamodel.domain.bindings.ServerBindingsModel -import amf.apicontract.internal.spec.async.parser.bindings.Bindings.{IBMMQ, Mqtt} +import amf.apicontract.internal.spec.async.parser.bindings.Bindings.{IBMMQ, Mqtt, Pulsar, Solace} import amf.apicontract.internal.spec.async.parser.bindings.server._ import amf.apicontract.internal.spec.async.parser.context.AsyncWebApiContext import amf.apicontract.internal.spec.common.WebApiDeclarations.ErrorServerBindings @@ -14,8 +14,10 @@ import amf.shapes.internal.spec.common.parser.YMapEntryLike object AsyncServerBindingsParser { private val parserMap: Map[String, BindingParser[ServerBinding]] = Map( - Mqtt -> MqttServerBindingParser, - IBMMQ -> IBMMQServerBindingParser + Mqtt -> MqttServerBindingParser, + IBMMQ -> IBMMQServerBindingParser, + Solace -> SolaceServerBindingParser, + Pulsar -> PulsarServerBindingParser ) } case class AsyncServerBindingsParser(entryLike: YMapEntryLike)(implicit ctx: AsyncWebApiContext) diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/BindingParser.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/BindingParser.scala index 9706c079da..001af28229 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/BindingParser.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/BindingParser.scala @@ -3,13 +3,14 @@ package amf.apicontract.internal.spec.async.parser.bindings import amf.apicontract.client.scala.model.domain.bindings.BindingVersion import amf.apicontract.internal.spec.async.parser.context.AsyncWebApiContext import amf.apicontract.internal.spec.common.parser.SpecParserOps -import amf.core.client.scala.model.domain.{AmfElement, AmfScalar, DomainElement, Linkable} +import amf.core.client.scala.model.domain.{AmfElement, AmfObject, AmfScalar, DomainElement} import amf.core.internal.metamodel.Field import amf.core.internal.parser.YMapOps import amf.core.internal.parser.domain.Annotations import amf.shapes.internal.spec.common.JSONSchemaDraft7SchemaVersion import amf.shapes.internal.spec.common.parser.YMapEntryLike import amf.shapes.internal.spec.oas.parser.OasTypeParser +import amf.shapes.internal.validation.definitions.ShapeParserSideValidations.RequiredField import org.yaml.model.{YMap, YMapEntry} trait BindingParser[+Binding <: DomainElement] extends SpecParserOps { @@ -24,8 +25,9 @@ trait BindingParser[+Binding <: DomainElement] extends SpecParserOps { if (bindingVersionIsEmpty(binding)) setDefaultBindingVersionValue(binding, field) } - protected def setDefaultValue(binding: BindingVersion, field: Field, element: AmfElement): binding.type = { - binding.setWithoutId(field, element, Annotations.synthesized()) + protected def setDefaultValue(obj: AmfObject, field: Field, element: AmfElement): obj.type = { + // TODO: if field not explicit in spec we should check for synthesized and not emit it + obj.setWithoutId(field, element, Annotations.synthesized()) } private def setDefaultBindingVersionValue(binding: BindingVersion, field: Field) = { @@ -51,4 +53,13 @@ trait BindingParser[+Binding <: DomainElement] extends SpecParserOps { shape } } + + protected def missingRequiredFieldViolation( + ctx: AsyncWebApiContext, + node: AmfObject, + missingField: String, + schema: String + ): Unit = { + ctx.violation(RequiredField, node, s"field '$missingField' is required in a $schema") + } } diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/channel/GooglePubSubChannelBindingParser.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/channel/GooglePubSubChannelBindingParser.scala new file mode 100644 index 0000000000..3493b8a619 --- /dev/null +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/channel/GooglePubSubChannelBindingParser.scala @@ -0,0 +1,82 @@ +package amf.apicontract.internal.spec.async.parser.bindings.channel + +import amf.apicontract.client.scala.model.domain.bindings.googlepubsub.{ + GooglePubSubChannelBinding, + GooglePubSubMessageStoragePolicy, + GooglePubSubSchemaSettings +} +import amf.apicontract.internal.metamodel.domain.bindings.{ + GooglePubSubChannelBindingModel, + GooglePubSubMessageStoragePolicyModel, + GooglePubSubSchemaSettingsModel +} +import amf.apicontract.internal.spec.async.parser.bindings.BindingParser +import amf.apicontract.internal.spec.async.parser.context.AsyncWebApiContext +import amf.core.internal.datanode.DataNodeParser +import amf.core.internal.parser.YMapOps +import amf.core.internal.parser.domain.Annotations +import org.yaml.model.{YMap, YMapEntry} + +object GooglePubSubChannelBindingParser extends BindingParser[GooglePubSubChannelBinding] { + override def parse(entry: YMapEntry, parent: String)(implicit ctx: AsyncWebApiContext): GooglePubSubChannelBinding = { + val binding = GooglePubSubChannelBinding(Annotations(entry)) + val map = entry.value.as[YMap] + + map.key( + "labels", + entry => { + val valueDataNode = DataNodeParser(entry.value).parse() + binding.setWithoutId(GooglePubSubChannelBindingModel.Labels, valueDataNode, Annotations(entry)) + } + ) + map.key("messageRetentionDuration", GooglePubSubChannelBindingModel.MessageRetentionDuration in binding) + map.key("topic", GooglePubSubChannelBindingModel.Topic in binding) + + parseMessageStoragePolicy(binding, map) + parseSchemaSettings(binding, map) + parseBindingVersion(binding, GooglePubSubChannelBindingModel.BindingVersion, map) + + ctx.closedShape(binding, map, "GooglePubSubChannelBinding") + binding + + } + private def parseSchemaSettings(binding: GooglePubSubChannelBinding, map: YMap)(implicit + ctx: AsyncWebApiContext + ): Unit = { + map.key( + "schemaSettings", + { entry => + val schemaSettings = GooglePubSubSchemaSettings(Annotations(entry.value)) + val schemaSettingsMap = entry.value.as[YMap] + + schemaSettingsMap.key("encoding", GooglePubSubSchemaSettingsModel.Encoding in schemaSettings) + schemaSettingsMap.key("firstRevisionId", GooglePubSubSchemaSettingsModel.FirstRevisionId in schemaSettings) + schemaSettingsMap.key("lastRevisionId", GooglePubSubSchemaSettingsModel.LastRevisionId in schemaSettings) + schemaSettingsMap.key("name", GooglePubSubSchemaSettingsModel.Name in schemaSettings) + + ctx.closedShape(schemaSettings, schemaSettingsMap, "GooglePubSubSchemaSettings") + binding.setWithoutId(GooglePubSubChannelBindingModel.SchemaSettings, schemaSettings, Annotations(entry)) + } + ) + } + + private def parseMessageStoragePolicy(binding: GooglePubSubChannelBinding, map: YMap)(implicit + ctx: AsyncWebApiContext + ): Unit = { + map.key( + "messageStoragePolicy", + { entry => + val policy = GooglePubSubMessageStoragePolicy(Annotations(entry.value)) + val policyMap = entry.value.as[YMap] + policyMap.key( + "allowedPersistenceRegions", + GooglePubSubMessageStoragePolicyModel.AllowedPersistenceRegions in policy + ) + + ctx.closedShape(policy, policyMap, "GooglePubSubMessageStoragePolicy") + binding.setWithoutId(GooglePubSubChannelBindingModel.MessageStoragePolicy, policy, Annotations(entry)) + } + ) + } + +} diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/channel/IBMMQChannelBindingParser.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/channel/IBMMQChannelBindingParser.scala index 3bd325ae1d..229eae7c78 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/channel/IBMMQChannelBindingParser.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/channel/IBMMQChannelBindingParser.scala @@ -46,7 +46,10 @@ object IBMMQChannelBindingParser extends BindingParser[IBMMQChannelBinding] { val queue = IBMMQChannelQueue(Annotations(entry.value)) val queueMap = entry.value.as[YMap] - queueMap.key("objectName", IBMMQChannelQueueModel.ObjectName in queue) + queueMap.key("objectName") match { + case Some(value) => Some(value).foreach(IBMMQChannelQueueModel.ObjectName in queue) + case None => missingRequiredFieldViolation(ctx, binding, "objectName", "IBMMQ Channel Queue") + } queueMap.key("isPartitioned") match { case Some(value) => Some(value).foreach(IBMMQChannelQueueModel.IsPartitioned in queue) diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/channel/PulsarChannelBindingParser.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/channel/PulsarChannelBindingParser.scala new file mode 100644 index 0000000000..a81164390e --- /dev/null +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/channel/PulsarChannelBindingParser.scala @@ -0,0 +1,63 @@ +package amf.apicontract.internal.spec.async.parser.bindings.channel + +import amf.apicontract.client.scala.model.domain.bindings.pulsar.{PulsarChannelBinding, PulsarChannelRetention} +import amf.apicontract.internal.metamodel.domain.bindings.{PulsarChannelBindingModel, PulsarChannelRetentionModel} +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.internal.parser.YMapOps +import amf.core.internal.parser.domain.Annotations +import org.yaml.model.{YMap, YMapEntry} + +object PulsarChannelBindingParser extends BindingParser[PulsarChannelBinding] { + override def parse(entry: YMapEntry, parent: String)(implicit ctx: AsyncWebApiContext): PulsarChannelBinding = { + val binding = PulsarChannelBinding(Annotations(entry)) + val map = entry.value.as[YMap] + + map.key("namespace") match { + case Some(value) => Some(value).foreach(PulsarChannelBindingModel.Namespace in binding) + case None => missingRequiredFieldViolation(ctx, binding, "namespace", "Pulsar Channel Binding") + } + + map.key("persistence") match { + case Some(value) => Some(value).foreach(PulsarChannelBindingModel.Persistence in binding) + case None => missingRequiredFieldViolation(ctx, binding, "persistence", "Pulsar Channel Binding") + } + + map.key("compaction", PulsarChannelBindingModel.Compaction in binding) + map.key("geo-replication", PulsarChannelBindingModel.GeoReplication in binding) + parseRetention(binding, map) + map.key("ttl", PulsarChannelBindingModel.Ttl in binding) + map.key("deduplication", PulsarChannelBindingModel.Deduplication in binding) + + parseBindingVersion(binding, PulsarChannelBindingModel.BindingVersion, map) + + ctx.closedShape(binding, map, "PulsarChannelBinding") + + binding + } + + private def parseRetention(binding: PulsarChannelBinding, map: YMap)(implicit ctx: AsyncWebApiContext): Unit = { + map.key( + "retention", + { entry => + val retention = PulsarChannelRetention(Annotations(entry.value)) + val retentionMap = entry.value.as[YMap] + + retentionMap.key("time") match { + case Some(value) => Some(value).foreach(PulsarChannelRetentionModel.Time in retention) + case None => setDefaultValue(binding, PulsarChannelRetentionModel.Time, AmfScalar(0)) + } + + retentionMap.key("size") match { + case Some(value) => Some(value).foreach(PulsarChannelRetentionModel.Size in retention) + case None => setDefaultValue(binding, PulsarChannelRetentionModel.Size, AmfScalar(0)) + } + + ctx.closedShape(retention, retentionMap, "PulsarChannelRetention") + + binding.setWithoutId(PulsarChannelBindingModel.Retention, retention, Annotations(entry)) + } + ) + } +} diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/message/GooglePubSubMessageBindingParser.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/message/GooglePubSubMessageBindingParser.scala new file mode 100644 index 0000000000..6d7681c05e --- /dev/null +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/message/GooglePubSubMessageBindingParser.scala @@ -0,0 +1,56 @@ +package amf.apicontract.internal.spec.async.parser.bindings.message + +import amf.apicontract.client.scala.model.domain.bindings.googlepubsub.{ + GooglePubSubMessageBinding, + GooglePubSubSchemaDefinition +} +import amf.apicontract.internal.metamodel.domain.bindings.{ + GooglePubSubMessageBindingModel, + GooglePubSubSchemaDefinitionModel +} +import amf.apicontract.internal.spec.async.parser.bindings.BindingParser +import amf.apicontract.internal.spec.async.parser.context.AsyncWebApiContext +import amf.core.internal.datanode.DataNodeParser +import amf.core.internal.parser.YMapOps +import amf.core.internal.parser.domain.Annotations +import org.yaml.model.{YMap, YMapEntry} + +object GooglePubSubMessageBindingParser extends BindingParser[GooglePubSubMessageBinding] { + override def parse(entry: YMapEntry, parent: String)(implicit ctx: AsyncWebApiContext): GooglePubSubMessageBinding = { + val binding = GooglePubSubMessageBinding(Annotations(entry)) + val map = entry.value.as[YMap] + + map.key( + "attributes", + entry => { + val valueDataNode = DataNodeParser(entry.value).parse() + binding.setWithoutId(GooglePubSubMessageBindingModel.Attributes, valueDataNode, Annotations(entry)) + } + ) + map.key("orderingKey", GooglePubSubMessageBindingModel.OrderingKey in binding) + parseSchemaDefinition(binding, map) + + parseBindingVersion(binding, GooglePubSubMessageBindingModel.BindingVersion, map) + + ctx.closedShape(binding, map, "GooglePubSubMessageBinding") + binding + } + + private def parseSchemaDefinition(binding: GooglePubSubMessageBinding, map: YMap)(implicit + ctx: AsyncWebApiContext + ): Unit = { + map.key( + "schema", + { entry => + val schema = GooglePubSubSchemaDefinition(Annotations(entry.value)) + val schemaMap = entry.value.as[YMap] + + schemaMap.key("name", GooglePubSubSchemaDefinitionModel.Name in schema) + schemaMap.key("type", GooglePubSubSchemaDefinitionModel.FieldType in schema) + + ctx.closedShape(schema, schemaMap, "GooglePubSubMessageSchema") + binding.setWithoutId(GooglePubSubMessageBindingModel.Schema, schema, Annotations(entry)) + } + ) + } +} diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/message/IBMMQMessageBindingParser.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/message/IBMMQMessageBindingParser.scala index d553f8e2cb..36c44f9675 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/message/IBMMQMessageBindingParser.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/message/IBMMQMessageBindingParser.scala @@ -21,11 +21,13 @@ object IBMMQMessageBindingParser extends BindingParser[IBMMQMessageBinding] { map.key("headers").foreach { entry => val values = entry.value.toString.split(",").map(AmfScalar(_)).toSeq - binding.setWithoutId( - IBMMQMessageBindingModel.Headers, - AmfArray(values, Annotations.virtual()), - Annotations(entry) - ) + if (values.nonEmpty) { + binding.setWithoutId( + IBMMQMessageBindingModel.Headers, + AmfArray(values, Annotations.virtual()), + Annotations(entry) + ) + } } map.key("description", IBMMQMessageBindingModel.Description in binding) diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/operation/SolaceOperationBindingParser.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/operation/SolaceOperationBindingParser.scala new file mode 100644 index 0000000000..eb3b66ce86 --- /dev/null +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/operation/SolaceOperationBindingParser.scala @@ -0,0 +1,96 @@ +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.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.internal.parser.domain.Annotations +import org.yaml.model.{YMap, YMapEntry} +import amf.core.internal.parser.YMapOps + +object SolaceOperationBindingParser extends BindingParser[SolaceOperationBinding] { + override def parse(entry: YMapEntry, parent: String)(implicit ctx: AsyncWebApiContext): SolaceOperationBinding = { + val binding = SolaceOperationBinding(Annotations(entry)) + val map = entry.value.as[YMap] + + map.key("destinations").foreach { entry => + val destinations = entry.value.as[Seq[YMap]].map(parseDestination) + binding.setArrayWithoutId(SolaceOperationBindingModel.Destinations, destinations) + } + + parseBindingVersion(binding, SolaceOperationBindingModel.BindingVersion, map) + + ctx.closedShape(binding, map, "SolaceOperationBinding") + + binding + } + + private def parseDestination(map: YMap)(implicit + ctx: AsyncWebApiContext + ): SolaceOperationDestination = { + val destination = SolaceOperationDestination(Annotations()) + + map.key("destinationType", SolaceOperationDestinationModel.DestinationType in destination) + + map.key("deliveryMode") match { + case Some(value) => Some(value).foreach(SolaceOperationDestinationModel.DeliveryMode in destination) + case None => setDefaultValue(destination, SolaceOperationDestinationModel.DeliveryMode, AmfScalar("persistent")) + } + + parseQueue(destination, map) + parseTopic(destination, map) + + destination + } + + private def parseQueue(destination: SolaceOperationDestination, map: YMap)(implicit ctx: AsyncWebApiContext): Unit = { + map.key( + "queue", + { entry => + val queue = SolaceOperationQueue(Annotations(entry.value)) + val queueMap = entry.value.as[YMap] + + queueMap.key("name", SolaceOperationQueueModel.Name in queue) + + queueMap.key("topicSubscriptions", SolaceOperationQueueModel.TopicSubscriptions in queue) + + queueMap.key("accessType", SolaceOperationQueueModel.AccessType in queue) + + queueMap.key("maxMsgSpoolSize", SolaceOperationQueueModel.MaxMsgSpoolSize in queue) + + queueMap.key("maxTtl", SolaceOperationQueueModel.MaxTtl in queue) + + ctx.closedShape(queue, queueMap, "SolaceOperationQueue") + + destination.setWithoutId(SolaceOperationDestinationModel.Queue, queue, Annotations(entry)) + } + ) + } + + private def parseTopic(destination: SolaceOperationDestination, map: YMap)(implicit ctx: AsyncWebApiContext): Unit = { + map.key( + "topic", + { entry => + val topic = SolaceOperationTopic(Annotations(entry.value)) + val topicMap = entry.value.as[YMap] + + topicMap.key("topicSubscriptions", SolaceOperationTopicModel.TopicSubscriptions in topic) + + ctx.closedShape(topic, topicMap, "SolaceOperationTopic") + + destination.setWithoutId(SolaceOperationDestinationModel.Topic, topic, Annotations(entry)) + } + ) + } +} diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/server/PulsarServerBindingParser.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/server/PulsarServerBindingParser.scala new file mode 100644 index 0000000000..0343ac0d5f --- /dev/null +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/server/PulsarServerBindingParser.scala @@ -0,0 +1,28 @@ +package amf.apicontract.internal.spec.async.parser.bindings.server + +import amf.apicontract.client.scala.model.domain.bindings.pulsar.PulsarServerBinding +import amf.apicontract.internal.metamodel.domain.bindings.PulsarServerBindingModel +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.internal.parser.YMapOps +import amf.core.internal.parser.domain.Annotations +import org.yaml.model.{YMap, YMapEntry} + +object PulsarServerBindingParser extends BindingParser[PulsarServerBinding] { + override def parse(entry: YMapEntry, parent: String)(implicit ctx: AsyncWebApiContext): PulsarServerBinding = { + val binding = PulsarServerBinding(Annotations(entry)) + val map = entry.value.as[YMap] + + map.key("tenant") match { + case Some(value) => Some(value).foreach(PulsarServerBindingModel.Tenant in binding) + case None => setDefaultValue(binding, PulsarServerBindingModel.Tenant, AmfScalar("public")) + } + + parseBindingVersion(binding, PulsarServerBindingModel.BindingVersion, map) + + ctx.closedShape(binding, map, "PulsarServerBinding") + + binding + } +} diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/server/SolaceServerBindingParser.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/server/SolaceServerBindingParser.scala new file mode 100644 index 0000000000..d01b88f927 --- /dev/null +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/bindings/server/SolaceServerBindingParser.scala @@ -0,0 +1,24 @@ +package amf.apicontract.internal.spec.async.parser.bindings.server + +import amf.apicontract.client.scala.model.domain.bindings.solace.SolaceServerBinding +import amf.apicontract.internal.metamodel.domain.bindings.SolaceServerBindingModel +import amf.apicontract.internal.spec.async.parser.bindings.BindingParser +import amf.apicontract.internal.spec.async.parser.context.AsyncWebApiContext +import amf.core.internal.parser.YMapOps +import amf.core.internal.parser.domain.Annotations +import org.yaml.model.{YMap, YMapEntry} + +object SolaceServerBindingParser extends BindingParser[SolaceServerBinding] { + override def parse(entry: YMapEntry, parent: String)(implicit ctx: AsyncWebApiContext): SolaceServerBinding = { + val binding = SolaceServerBinding(Annotations(entry)) + val map = entry.value.as[YMap] + + map.key("msgVpn", SolaceServerBindingModel.MsgVpn in binding) + + parseBindingVersion(binding, SolaceServerBindingModel.BindingVersion, map) + + ctx.closedShape(binding, map, "SolaceServerBinding") + + binding + } +} diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/context/AsyncSpecAwareContext.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/context/AsyncSpecAwareContext.scala index 2a74ea2dc7..84238b9f3a 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/context/AsyncSpecAwareContext.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/context/AsyncSpecAwareContext.scala @@ -32,9 +32,9 @@ trait AsyncSpecVersionFactory extends OasLikeSpecVersionFactory { class Async20VersionFactory()(implicit ctx: AsyncWebApiContext) extends AsyncSpecVersionFactory { override def serverVariableParser(entry: YMapEntry, parent: String): OasLikeServerVariableParser = - AsyncServerVariableParser(entry, parent)(ctx) + Async20ServerVariableParser(YMapEntryLike(entry), parent)(ctx) override def operationParser(entry: YMapEntry, adopt: Operation => Operation): OasLikeOperationParser = - AsyncOperationParser(entry, adopt)(ctx) + Async20OperationParser(entry, adopt)(ctx) override def endPointParser(entry: YMapEntry, parentId: String, collector: List[EndPoint]): OasLikeEndpointParser = new Async20EndpointParser(entry, parentId, collector)(ctx) override def securitySchemeParser: (YMapEntryLike, SecurityScheme => SecurityScheme) => SecuritySchemeParser = @@ -48,7 +48,8 @@ class Async20VersionFactory()(implicit ctx: AsyncWebApiContext) extends AsyncSpe parent: String, messageType: Option[MessageType], isTrait: Boolean = false - )(implicit ctx: AsyncWebApiContext): AsyncMessageParser = Async20MessageParser(entryLike, parent, messageType, isTrait) + )(implicit ctx: AsyncWebApiContext): AsyncMessageParser = + Async20MessageParser(entryLike, parent, messageType, isTrait) } object Async20VersionFactory { @@ -61,14 +62,15 @@ class Async21VersionFactory()(implicit ctx: AsyncWebApiContext) extends Async20V parent: String, messageType: Option[MessageType], isTrait: Boolean - )(implicit ctx: AsyncWebApiContext): AsyncMessageParser = Async21MessageParser(entryLike, parent, messageType, isTrait) + )(implicit ctx: AsyncWebApiContext): AsyncMessageParser = + Async21MessageParser(entryLike, parent, messageType, isTrait) } object Async21VersionFactory { def apply()(implicit ctx: AsyncWebApiContext): Async21VersionFactory = new Async21VersionFactory()(ctx) } -class Async22VersionFactory()(implicit ctx: AsyncWebApiContext) extends Async20VersionFactory { +class Async22VersionFactory()(implicit ctx: AsyncWebApiContext) extends Async21VersionFactory { override def endPointParser(entry: YMapEntry, parentId: String, collector: List[EndPoint]): OasLikeEndpointParser = new Async22EndpointParser(entry, parentId, collector)(ctx) } @@ -77,7 +79,7 @@ object Async22VersionFactory { def apply()(implicit ctx: AsyncWebApiContext): Async22VersionFactory = new Async22VersionFactory()(ctx) } -class Async23VersionFactory()(implicit ctx: AsyncWebApiContext) extends Async21VersionFactory { +class Async23VersionFactory()(implicit ctx: AsyncWebApiContext) extends Async22VersionFactory { override def endPointParser(entry: YMapEntry, parentId: String, collector: List[EndPoint]): OasLikeEndpointParser = new Async23EndpointParser(entry, parentId, collector)(ctx) override def serversParser(map: YMap, api: AsyncApi): AsyncServersParser = new Async23ServersParser(map, api) @@ -87,20 +89,27 @@ object Async23VersionFactory { def apply()(implicit ctx: AsyncWebApiContext): Async23VersionFactory = new Async23VersionFactory()(ctx) } -class Async24VersionFactory()(implicit ctx: AsyncWebApiContext) extends Async23VersionFactory{ +class Async24VersionFactory()(implicit ctx: AsyncWebApiContext) extends Async23VersionFactory { override def messageParser( entryLike: YMapEntryLike, parent: String, messageType: Option[MessageType], isTrait: Boolean - )(implicit ctx: AsyncWebApiContext): AsyncMessageParser = Async24MessageParser(entryLike, parent, messageType, isTrait) + )(implicit ctx: AsyncWebApiContext): AsyncMessageParser = + Async24MessageParser(entryLike, parent, messageType, isTrait) + + override def serverVariableParser(entry: YMapEntry, parent: String): OasLikeServerVariableParser = + new Async24ServerVariableParser(YMapEntryLike(entry), parent)(ctx) + + override def operationParser(entry: YMapEntry, adopt: Operation => Operation): OasLikeOperationParser = + Async24OperationParser(entry, adopt)(ctx) } object Async24VersionFactory { def apply()(implicit ctx: AsyncWebApiContext): Async24VersionFactory = new Async24VersionFactory()(ctx) } -class Async25VersionFactory(implicit ctx: AsyncWebApiContext) extends Async24VersionFactory { +class Async25VersionFactory(implicit ctx: AsyncWebApiContext) extends Async24VersionFactory { override def serversParser(map: YMap, api: AsyncApi): AsyncServersParser = new Async25ServersParser(map, api) } diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/context/AsyncValidBindingSet.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/context/AsyncValidBindingSet.scala index 2e1ebcca98..b09cea9ce5 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/context/AsyncValidBindingSet.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/context/AsyncValidBindingSet.scala @@ -13,8 +13,8 @@ object AsyncValidBindingSet { val async20: AsyncValidBindingSet = AsyncValidBindingSet(basic) val async21: AsyncValidBindingSet = async20.add(Mercure, IBMMQ) val async22: AsyncValidBindingSet = async21.add(AnypointMQ) - val async23: AsyncValidBindingSet = async22 + val async23: AsyncValidBindingSet = async22.add(Solace) val async24: AsyncValidBindingSet = async23 - val async25: AsyncValidBindingSet = async24 - val async26: AsyncValidBindingSet = async25 + val async25: AsyncValidBindingSet = async24.add(GooglePubSub) + val async26: AsyncValidBindingSet = async25.add(Pulsar) } diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/context/syntax/Async21Syntax.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/context/syntax/Async21Syntax.scala index f698d94c98..524b34947f 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/context/syntax/Async21Syntax.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/context/syntax/Async21Syntax.scala @@ -40,6 +40,10 @@ object Async21Syntax extends SpecSyntax { "objectName", "durablePermitted", "lastMsgRetained" + ), + "message examples" -> Set( + "name", + "summary" ) ) } diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/context/syntax/Async23Syntax.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/context/syntax/Async23Syntax.scala index 0e4418ca66..2d7e89206c 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/context/syntax/Async23Syntax.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/context/syntax/Async23Syntax.scala @@ -1,7 +1,36 @@ package amf.apicontract.internal.spec.async.parser.context.syntax +import amf.apicontract.internal.spec.async.parser.bindings.Bindings.Solace import amf.shapes.internal.spec.common.parser.SpecSyntax object Async23Syntax extends SpecSyntax { - override val nodes: Map[String, Set[String]] = Async22Syntax.nodes + override val nodes: Map[String, Set[String]] = + add( + Async22Syntax.nodes, + "bindings" -> Set(Solace), + "SolaceServerBinding" -> Set( + "msgVpn", + "bindingVersion" + ), + "SolaceOperationBinding" -> Set( + "destinations", + "bindingVersion" + ), + "SolaceOperationDestination" -> Set( + "destinationType", + "deliveryMode", + "queue", + "topic" + ), + "SolaceOperationQueue" -> Set( + "name", + "topicSubscriptions", + "accessType", + "maxMsgSpoolSize", + "maxTtl" + ), + "SolaceOperationTopic" -> Set( + "topicSubscriptions" + ) + ) } diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/context/syntax/Async24Syntax.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/context/syntax/Async24Syntax.scala index 28e00fe265..3c99b941f2 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/context/syntax/Async24Syntax.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/context/syntax/Async24Syntax.scala @@ -6,6 +6,12 @@ object Async24Syntax extends SpecSyntax { override val nodes: Map[String, Set[String]] = add( Async23Syntax.nodes, - "message" -> Set("messageId") + "message" -> Set("messageId"), + "components" -> Set( + "serverVariables" + ), + "operation" -> Set( + "security" + ) ) } diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/context/syntax/Async25Syntax.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/context/syntax/Async25Syntax.scala index f40594cbd6..8e2904cab1 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/context/syntax/Async25Syntax.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/context/syntax/Async25Syntax.scala @@ -1,11 +1,40 @@ package amf.apicontract.internal.spec.async.parser.context.syntax import amf.shapes.internal.spec.common.parser.SpecSyntax +import amf.apicontract.internal.spec.async.parser.bindings.Bindings.GooglePubSub object Async25Syntax extends SpecSyntax { override val nodes: Map[String, Set[String]] = add(Async24Syntax.nodes, "server" -> Set( "tags" + ), + "bindings"-> Set(GooglePubSub), + "GooglePubSubChannelBinding" -> Set( + "labels", + "messageRetentionDuration", + "messageStoragePolicy", + "schemaSettings", + "topic", + "bindingVersion" + ), + "GooglePubSubMessageStoragePolicy" -> Set( + "allowedPersistenceRegions" + ), + "GooglePubSubSchemaSettings" -> Set( + "encoding", + "firstRevisionId", + "lastRevisionId", + "name" + ), + "GooglePubSubMessageBinding" -> Set( + "attributes", + "orderingKey", + "schema", + "bindingVersion" + ), + "GooglePubSubMessageSchema" -> Set( + "name", + "type" ) ) } diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/context/syntax/Async26Syntax.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/context/syntax/Async26Syntax.scala index a429bf5308..ca81a58a44 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/context/syntax/Async26Syntax.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/context/syntax/Async26Syntax.scala @@ -1,7 +1,30 @@ package amf.apicontract.internal.spec.async.parser.context.syntax +import amf.apicontract.internal.spec.async.parser.bindings.Bindings.Pulsar import amf.shapes.internal.spec.common.parser.SpecSyntax object Async26Syntax extends SpecSyntax { - override val nodes: Map[String, Set[String]] = Async25Syntax.nodes + override val nodes: Map[String, Set[String]] = + add( + Async25Syntax.nodes, + "bindings" -> Set(Pulsar), + "PulsarServerBinding" -> Set( + "tenant", + "bindingVersion" + ), + "PulsarChannelBinding" -> Set( + "namespace", + "persistence", + "compaction", + "geo-replication", + "retention", + "ttl", + "deduplication", + "bindingVersion" + ), + "PulsarChannelRetention" -> Set( + "time", + "size" + ) + ) } diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/domain/Async20EndpointParser.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/domain/Async20EndpointParser.scala index 960878a199..bac596b415 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/domain/Async20EndpointParser.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/domain/Async20EndpointParser.scala @@ -1,6 +1,6 @@ package amf.apicontract.internal.spec.async.parser.domain -import amf.apicontract.client.scala.model.domain.{EndPoint, Operation, Server} +import amf.apicontract.client.scala.model.domain.{EndPoint, Server} import amf.apicontract.internal.metamodel.domain.{EndPointModel, ServerModel} import amf.apicontract.internal.spec.async.parser.bindings.AsyncChannelBindingsParser import amf.apicontract.internal.spec.async.parser.context.AsyncWebApiContext @@ -14,8 +14,6 @@ import amf.core.internal.validation.CoreValidations import amf.shapes.internal.spec.common.parser.{AnnotationParser, YMapEntryLike} import org.yaml.model.{YMap, YMapEntry, YNode, YSequence} -import scala.collection.mutable - class Async20EndpointParser(entry: YMapEntry, parentId: String, collector: List[EndPoint])( override implicit val ctx: AsyncWebApiContext ) extends OasLikeEndpointParser(entry, parentId, collector) { @@ -50,11 +48,7 @@ class Async20EndpointParser(entry: YMapEntry, parentId: String, collector: List[ map.regex( "subscribe|publish", entries => { - val operations = mutable.ListBuffer[Operation]() - entries.foreach { entry => - val operationParser = ctx.factory.operationParser(entry, (o: Operation) => o) - operations += operationParser.parse() - } + val operations = parseOperations(entries) endpoint.setWithoutId(EndPointModel.Operations, AmfArray(operations, Annotations(map)), Annotations(map)) } ) diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/domain/AsyncOperationParser.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/domain/AsyncOperationParser.scala index 37bd62824e..0767c9a34b 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/domain/AsyncOperationParser.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/domain/AsyncOperationParser.scala @@ -17,12 +17,20 @@ import amf.core.internal.validation.CoreValidations import amf.shapes.internal.spec.common.parser.{AnnotationParser, YMapEntryLike} import org.yaml.model._ -object AsyncOperationParser { +object Async20OperationParser { def apply(entry: YMapEntry, adopt: Operation => Operation, isTrait: Boolean = false)(implicit ctx: AsyncWebApiContext ): AsyncOperationParser = - if (isTrait) new AsyncOperationTraitParser(entry, adopt) - else new AsyncConcreteOperationParser(entry, adopt) + if (isTrait) new Async20OperationTraitParser(entry, adopt) + else new Async20ConcreteOperationParser(entry, adopt) +} + +object Async24OperationParser { + def apply(entry: YMapEntry, adopt: Operation => Operation, isTrait: Boolean = false)(implicit + ctx: AsyncWebApiContext + ): AsyncOperationParser = + if (isTrait) Async24OperationTraitParser(entry, adopt) + else Async24ConcreteOperationParser(entry, adopt) } abstract class AsyncOperationParser(entry: YMapEntry, adopt: Operation => Operation)( @@ -52,6 +60,8 @@ abstract class AsyncOperationParser(entry: YMapEntry, adopt: Operation => Operat parseTraits(map, operation) + map.key("security").foreach(entry => parseSecuritySchemas(entry, operation)) + operation } @@ -59,12 +69,14 @@ abstract class AsyncOperationParser(entry: YMapEntry, adopt: Operation => Operat map.key("operationId", OperationModel.OperationId in operation) } - protected def parseMessages(map: YMap, operation: Operation) + protected def parseMessages(map: YMap, operation: Operation): Unit = {} + + protected def parseTraits(map: YMap, operation: Operation): Unit = {} - protected def parseTraits(map: YMap, operation: Operation) + protected def parseSecuritySchemas(entry: YMapEntry, operation: Operation): Unit = {} } -private class AsyncConcreteOperationParser(entry: YMapEntry, adopt: Operation => Operation)(implicit +class Async20ConcreteOperationParser(entry: YMapEntry, adopt: Operation => Operation)(implicit ctx: AsyncWebApiContext ) extends AsyncOperationParser(entry, adopt) { @@ -92,9 +104,11 @@ private class AsyncConcreteOperationParser(entry: YMapEntry, adopt: Operation => ) } ) + + override protected def parseSecuritySchemas(entry: YMapEntry, operation: Operation): Unit = {} } -private class AsyncOperationTraitParser(entry: YMapEntry, adopt: Operation => Operation)( +class Async20OperationTraitParser(entry: YMapEntry, adopt: Operation => Operation)( override implicit val ctx: AsyncWebApiContext ) extends AsyncOperationParser(entry, adopt) { @@ -113,9 +127,11 @@ private class AsyncOperationTraitParser(entry: YMapEntry, adopt: Operation => Op } } - override protected def parseMessages(map: YMap, operation: Operation): Unit = Unit + override protected def parseMessages(map: YMap, operation: Operation): Unit = {} + + override protected def parseTraits(map: YMap, operation: Operation): Unit = {} - override protected def parseTraits(map: YMap, operation: Operation): Unit = Unit + override protected def parseSecuritySchemas(entry: YMapEntry, operation: Operation): Unit = {} } case class AsyncOperationTraitRefParser(node: YNode, adopt: Operation => Operation, name: Option[String] = None)( @@ -162,9 +178,43 @@ case class AsyncOperationTraitRefParser(node: YNode, adopt: Operation => Operati ctx.navigateToRemoteYNode(url) match { case Some(result) => val operationNode = result.remoteNode - AsyncOperationParser(YMapEntry(name.getOrElse(url), operationNode), adopt, isTrait = true)(result.context) + Async20OperationParser(YMapEntry(name.getOrElse(url), operationNode), adopt, isTrait = true)(result.context) .parse() case None => linkError(url, node) } } } + +case class Async24ConcreteOperationParser(entry: YMapEntry, adopt: Operation => Operation)( + override implicit val ctx: AsyncWebApiContext +) extends Async20ConcreteOperationParser(entry, adopt) + with SecuritySchemeParser { + + override protected def parseMessages(map: YMap, operation: Operation): Unit = + super.parseMessages(map: YMap, operation: Operation) + + override protected def parseTraits(map: YMap, operation: Operation): Unit = + super.parseTraits(map: YMap, operation: Operation) + + override protected def parseSecuritySchemas(entry: YMapEntry, operation: Operation): Unit = { + super.parseSecuritySchemas(entry, operation) + parseSecurityScheme(entry, OperationModel.Security, operation) + } +} + +case class Async24OperationTraitParser(entry: YMapEntry, adopt: Operation => Operation)( + override implicit val ctx: AsyncWebApiContext +) extends Async20OperationTraitParser(entry, adopt) + with SecuritySchemeParser { + + override protected def parseMessages(map: YMap, operation: Operation): Unit = + super.parseMessages(map: YMap, operation: Operation) + + override protected def parseTraits(map: YMap, operation: Operation): Unit = + super.parseTraits(map: YMap, operation: Operation) + + override protected def parseSecuritySchemas(entry: YMapEntry, operation: Operation): Unit = { + super.parseSecuritySchemas(entry, operation) + parseSecurityScheme(entry, OperationModel.Security, operation) + } +} diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/domain/AsyncServerParser.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/domain/AsyncServerParser.scala index c782eb7a44..5366d46258 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/domain/AsyncServerParser.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/domain/AsyncServerParser.scala @@ -2,18 +2,15 @@ package amf.apicontract.internal.spec.async.parser.domain import amf.apicontract.client.scala.model.domain.{Server, Tag} import amf.apicontract.client.scala.model.domain.api.AsyncApi -import amf.apicontract.client.scala.model.domain.security.SecurityRequirement import amf.apicontract.internal.metamodel.domain.ServerModel import amf.apicontract.internal.spec.async.parser.bindings.AsyncServerBindingsParser import amf.apicontract.internal.spec.async.parser.context.AsyncWebApiContext import amf.apicontract.internal.spec.common.WebApiDeclarations.ErrorServer -import amf.apicontract.internal.spec.common.parser.OasLikeSecurityRequirementParser import amf.apicontract.internal.spec.oas.parser.domain.{OasLikeServerParser, TagsParser} import amf.apicontract.internal.spec.spec.OasDefinitions import amf.core.client.scala.model.domain.{AmfArray, AmfScalar} import amf.core.internal.parser.YMapOps import amf.core.internal.parser.domain.{Annotations, ScalarNode, SearchScope} -import amf.core.internal.utils.IdCounter import amf.core.internal.validation.CoreValidations import amf.shapes.internal.spec.common.parser.{AnnotationParser, YMapEntryLike} import org.yaml.model.{YMap, YNode} @@ -49,14 +46,16 @@ class Async23ServersParser(map: YMap, api: AsyncApi)( new Async23ServerParser(api.id, entryLike) } -class Async25ServersParser(map: YMap, api: AsyncApi)(override implicit val ctx: AsyncWebApiContext) extends AsyncServersParser(map, api){ +class Async25ServersParser(map: YMap, api: AsyncApi)(override implicit val ctx: AsyncWebApiContext) + extends AsyncServersParser(map, api) { override protected def serverParser(entryLike: YMapEntryLike): OasLikeServerParser = new Async25SeverParser(api.id, entryLike) } class Async20ServerParser(parent: String, entryLike: YMapEntryLike)(implicit override val ctx: AsyncWebApiContext -) extends OasLikeServerParser(parent, entryLike) { +) extends OasLikeServerParser(parent, entryLike) + with SecuritySchemeParser { override def parse(): Server = { val server = super.parse() @@ -71,14 +70,7 @@ class Async20ServerParser(parent: String, entryLike: YMapEntryLike)(implicit map.key( "security", - entry => { - val idCounter = new IdCounter() - val securedBy = entry.value - .as[Seq[YNode]] - .flatMap(s => OasLikeSecurityRequirementParser(s, (_: SecurityRequirement) => Unit, idCounter).parse()) - - server.setWithoutId(ServerModel.Security, AmfArray(securedBy, Annotations(entry.value)), Annotations(entry)) - } + entry => parseSecurityScheme(entry, ServerModel.Security, server) ) server @@ -143,10 +135,10 @@ class Async23ServerParser(parent: String, entryLike: YMapEntryLike)(implicit ove } class Async25SeverParser(parent: String, entryLike: YMapEntryLike)(implicit override val ctx: AsyncWebApiContext) - extends Async23ServerParser(parent, entryLike){ + extends Async23ServerParser(parent, entryLike) { override def parse(): Server = { val server = super.parse() - map.key("tags").foreach{ entry => + map.key("tags").foreach { entry => val tags = entry.value.as[Seq[YMap]].map(tag => TagsParser(tag, (tag: Tag) => tag).parse()) server.setWithoutId(ServerModel.Tags, AmfArray(tags, Annotations(entry.value)), Annotations(entry)) } diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/domain/AsyncServerVariableParser.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/domain/AsyncServerVariableParser.scala index ec4eb65c4c..fb0062363a 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/domain/AsyncServerVariableParser.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/domain/AsyncServerVariableParser.scala @@ -1,19 +1,24 @@ package amf.apicontract.internal.spec.async.parser.domain -import amf.apicontract.client.scala.model.domain.Parameter +import amf.apicontract.client.scala.model.domain.{Parameter, Server} +import amf.apicontract.internal.metamodel.domain.{ParameterModel, ServerModel} import amf.apicontract.internal.spec.async.parser.context.AsyncWebApiContext +import amf.apicontract.internal.spec.common.WebApiDeclarations.{ErrorServer, ErrorServerVariable} import amf.apicontract.internal.spec.oas.parser.domain.OasLikeServerVariableParser +import amf.apicontract.internal.spec.spec.OasDefinitions import amf.core.client.scala.model.domain.{AmfArray, AmfScalar} import amf.core.internal.metamodel.domain.ExternalSourceElementModel import amf.core.internal.parser.YMapOps -import amf.core.internal.parser.domain.Annotations +import amf.core.internal.parser.domain.{Annotations, ScalarNode, SearchScope} import amf.core.internal.utils.IdCounter +import amf.core.internal.validation.CoreValidations import amf.shapes.client.scala.model.domain.Example import amf.shapes.internal.domain.metamodel.common.ExamplesField +import amf.shapes.internal.spec.common.parser.YMapEntryLike import amf.shapes.internal.validation.definitions.ShapeParserSideValidations.ExamplesMustBeASeq -import org.yaml.model.{YMap, YMapEntry, YSequence, YType} +import org.yaml.model.{YMap, YMapEntry, YNode, YSequence, YType} -case class AsyncServerVariableParser(entry: YMapEntry, parent: String)(implicit override val ctx: AsyncWebApiContext) +case class Async20ServerVariableParser(entry: YMapEntryLike, parent: String)(implicit override val ctx: AsyncWebApiContext) extends OasLikeServerVariableParser(entry, parent)(ctx) { override protected def parseMap(variable: Parameter, map: YMap): Unit = { @@ -45,3 +50,58 @@ case class AsyncServerVariableParser(entry: YMapEntry, parent: String)(implicit ) } } +class Async24ServerVariableParser(override val entry: YMapEntryLike, override val parent: String)(implicit override val ctx: AsyncWebApiContext) + extends Async20ServerVariableParser(entry, parent)(ctx) { + override def parse(): Parameter = { + val map: YMap = entry.asMap + ctx.link(map) match { + case Left(fullRef) => handleRef(fullRef) + case Right(_) => super.parse() + } + } + + private def handleRef(fullRef: String): Parameter = { + val label = OasDefinitions.stripOas3ComponentsPrefix(fullRef, "serverVariables") + ctx.declarations + .findServerVariable(label, SearchScope.Named) + .map(serverVariables => nameAndAdopt(generateLink(label, serverVariables, entry), entry.key)) + .getOrElse(remote(fullRef, entry)) + } + + private def remote(fullRef: String, entryLike: YMapEntryLike)(implicit ctx: AsyncWebApiContext): Parameter = { + ctx.navigateToRemoteYNode(fullRef) match { + case Some(result) => + val serverVariableNode = result.remoteNode + val external = Async20ServerVariableParser(YMapEntryLike(serverVariableNode), parent)(result.context).parse() + nameAndAdopt( + external.link(AmfScalar(fullRef), entryLike.annotations, Annotations.synthesized()), + entryLike.key + ) + case None => + ctx.eh.violation( + CoreValidations.UnresolvedReference, + "", + s"Cannot find link reference $fullRef", + entryLike.asMap.location + ) + val errorServerVariable = ErrorServerVariable(fullRef, entryLike.asMap) + nameAndAdopt(errorServerVariable.link(fullRef, errorServerVariable.annotations), entryLike.key) + } + } + + private def generateLink(label: String, effectiveTarget: Parameter, entryLike: YMapEntryLike): Parameter = { + val serverVariable = Parameter(entryLike.annotations) + val hash = s"${serverVariable.id}$label".hashCode + serverVariable + .withId(s"${serverVariable.id}/link-$hash") + .withLinkTarget(effectiveTarget) + .withLinkLabel(label, Annotations(entryLike.value)) + } + + def nameAndAdopt(serverVariable: Parameter, key: Option[YNode]): Parameter = { + key foreach { k => + serverVariable.setWithoutId(ParameterModel.Name, ScalarNode(k).string(), Annotations(k)) + } + serverVariable + } +} diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/domain/SecuritySchemeParser.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/domain/SecuritySchemeParser.scala new file mode 100644 index 0000000000..7489db1d6d --- /dev/null +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/domain/SecuritySchemeParser.scala @@ -0,0 +1,20 @@ +package amf.apicontract.internal.spec.async.parser.domain + +import amf.apicontract.client.scala.model.domain.security.SecurityRequirement +import amf.apicontract.internal.spec.async.parser.context.AsyncWebApiContext +import amf.apicontract.internal.spec.common.parser.OasLikeSecurityRequirementParser +import amf.core.client.scala.model.domain.{AmfArray, AmfObject} +import amf.core.internal.metamodel.Field +import amf.core.internal.parser.domain.Annotations +import amf.core.internal.utils.IdCounter +import org.yaml.model.{YMapEntry, YNode} + +trait SecuritySchemeParser { + def parseSecurityScheme(entry: YMapEntry, field: Field, parent: AmfObject)(implicit ctx: AsyncWebApiContext): Unit = { + val idCounter = new IdCounter() + val securedBy = entry.value + .as[Seq[YNode]] + .flatMap(s => OasLikeSecurityRequirementParser(s, (_: SecurityRequirement) => Unit, idCounter).parse()) + parent.setWithoutId(field, AmfArray(securedBy, Annotations(entry.value)), Annotations(entry)) + } +} diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/domain/declarations/Async20DeclarationParser.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/domain/declarations/Async20DeclarationParser.scala index d9156af8bf..e8594c959d 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/domain/declarations/Async20DeclarationParser.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/domain/declarations/Async20DeclarationParser.scala @@ -24,7 +24,7 @@ import amf.apicontract.internal.spec.async.parser.bindings.{ import amf.apicontract.internal.spec.async.parser.context.AsyncWebApiContext import amf.apicontract.internal.spec.async.parser.domain.{ AsyncCorrelationIdParser, - AsyncOperationParser, + Async20OperationParser, AsyncParametersParser } import amf.apicontract.internal.spec.oas.parser.document.OasLikeDeclarationsHelper @@ -81,7 +81,7 @@ case class Async20DeclarationParser() extends AsyncDeclarationParser with OasLik addDeclarationKey(DeclarationKey(entry, isAbstract = true)) entry.value.as[YMap].entries.foreach { entry => val adopt = (o: Operation) => o - val operation = AsyncOperationParser(entry, adopt, isTrait = true).parse() + val operation = Async20OperationParser(entry, adopt, isTrait = true).parse() operation.add(DeclaredElement()) ctx.declarations += operation } diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/domain/declarations/Async24DeclarationParser.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/domain/declarations/Async24DeclarationParser.scala index eb12a7eefb..e567175554 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/domain/declarations/Async24DeclarationParser.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/domain/declarations/Async24DeclarationParser.scala @@ -1,14 +1,34 @@ package amf.apicontract.internal.spec.async.parser.domain.declarations +import amf.aml.internal.parse.common.DeclarationKey +import amf.aml.internal.parse.dialects.DialectAstOps.DialectYMapOps import amf.apicontract.internal.spec.async.parser.context.AsyncWebApiContext +import amf.apicontract.internal.spec.async.parser.domain.{Async20ServerVariableParser, Async24ServerVariableParser} import amf.core.client.scala.model.document.Document +import amf.core.internal.annotations.{DeclaredElement, DeclaredServerVariable} +import amf.shapes.internal.spec.common.parser.YMapEntryLike import org.yaml.model.YMap object Async24DeclarationParser extends AsyncDeclarationParser { override def parseDeclarations(map: YMap, parent: String, document: Document)(implicit ctx: AsyncWebApiContext ): Unit = { + parseServerVariableDeclarations(map, parent) Async23DeclarationParser.parseDeclarations(map, parent, document) - // TODO: add stuff.... } + + private def parseServerVariableDeclarations(componentsMap: YMap, parent: String)(implicit ctx: AsyncWebApiContext): Unit = + componentsMap.key( + "serverVariables", + entry => { + addDeclarationKey(DeclarationKey(entry)) + entry.value.as[YMap].entries.foreach { entry => + val serverVariable = ctx.factory.serverVariableParser(entry, parent).parse() + serverVariable.add(DeclaredElement()) + serverVariable.add(DeclaredServerVariable()) + ctx.declarations += serverVariable + } + } + ) + } diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/common/WebApiDeclarations.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/common/WebApiDeclarations.scala index 0f7efd6d43..33e31ae990 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/common/WebApiDeclarations.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/common/WebApiDeclarations.scala @@ -2,21 +2,11 @@ package amf.apicontract.internal.spec.common import amf.aml.client.scala.model.document.Dialect import amf.apicontract.client.scala.model.domain._ -import amf.apicontract.client.scala.model.domain.bindings.{ - ChannelBindings, - MessageBindings, - OperationBindings, - ServerBindings -} +import amf.apicontract.client.scala.model.domain.bindings.{ChannelBindings, MessageBindings, OperationBindings, ServerBindings} import amf.apicontract.client.scala.model.domain.security.SecurityScheme import amf.apicontract.client.scala.model.domain.templates.{ResourceType, Trait} import amf.apicontract.internal.metamodel.domain._ -import amf.apicontract.internal.metamodel.domain.bindings.{ - ChannelBindingsModel, - MessageBindingsModel, - OperationBindingsModel, - ServerBindingsModel -} +import amf.apicontract.internal.metamodel.domain.bindings.{ChannelBindingsModel, MessageBindingsModel, OperationBindingsModel, ServerBindingsModel} import amf.apicontract.internal.metamodel.domain.security.SecuritySchemeModel import amf.apicontract.internal.metamodel.domain.templates.{ResourceTypeModel, TraitModel} import amf.apicontract.internal.spec.common.WebApiDeclarations._ @@ -24,7 +14,7 @@ import amf.core.client.scala.errorhandling.AMFErrorHandler import amf.core.client.scala.model.document.BaseUnit import amf.core.client.scala.model.domain.{DataNode, DomainElement, ObjectNode, Shape} import amf.core.client.scala.parse.document.EmptyFutureDeclarations -import amf.core.internal.annotations.{DeclaredElement, DeclaredHeader, ErrorDeclaration} +import amf.core.internal.annotations.{DeclaredElement, DeclaredHeader, DeclaredServerVariable, ErrorDeclaration} import amf.core.internal.parser.domain.SearchScope.Named import amf.core.internal.parser.domain._ import amf.core.internal.utils.QName @@ -62,6 +52,7 @@ class WebApiDeclarations( var messageTraits: Map[String, Message] = Map() var servers: Map[String, Server] = Map() var channels: Map[String, EndPoint] = Map() + var serverVariables: Map[String, Parameter] = Map() var others: Map[String, BaseUnit] = Map() override def addLibrary(alias: String, declarations: Declarations): Unit = { @@ -95,6 +86,7 @@ class WebApiDeclarations( other.responses.foreach { case (k, s) => merged.responses += (k -> s) } extensions.foreach { case (k, s) => merged.extensions = merged.extensions + (k -> s) } servers.foreach { case (k, s) => merged.servers = merged.servers + (k -> s) } + serverVariables.foreach {case (k,s) => merged.serverVariables = merged.serverVariables + (k -> s) } channels.foreach { case (k, s) => merged.channels = merged.channels + (k -> s) } } @@ -128,6 +120,7 @@ class WebApiDeclarations( next.operationTraits = operationTraits next.messageTraits = next.messageTraits next.servers = next.servers + next.serverVariables = next.serverVariables next.channels = next.channels next.others = others next @@ -142,6 +135,8 @@ class WebApiDeclarations( traits = traits + (indexKey -> t) case h: Parameter if h.annotations.contains(classOf[DeclaredHeader]) => headers = headers + (indexKey -> h) + case sv: Parameter if sv.annotations.contains(classOf[DeclaredServerVariable]) => + serverVariables = serverVariables + (indexKey -> sv) case p: Parameter => parameters = parameters + (indexKey -> p) case p: Payload => @@ -224,7 +219,7 @@ class WebApiDeclarations( override def declarables(): Seq[DomainElement] = super .declarables() - .toList ++ (shapes.values ++ resourceTypes.values ++ traits.values ++ parameters.values ++ payloads.values ++ securitySchemes.values ++ responses.values ++ examples.values ++ requests.values ++ links.values ++ callbacks.values.flatten ++ headers.values ++ correlationIds.values ++ messageBindings.values ++ operationBindings.values ++ channelBindings.values ++ serverBindings.values ++ messages.values ++ operationTraits.values ++ messageTraits.values ++ servers.values ++ channels.values).toList + .toList ++ (shapes.values ++ resourceTypes.values ++ traits.values ++ parameters.values ++ payloads.values ++ securitySchemes.values ++ responses.values ++ examples.values ++ requests.values ++ links.values ++ callbacks.values.flatten ++ headers.values ++ correlationIds.values ++ messageBindings.values ++ operationBindings.values ++ channelBindings.values ++ serverBindings.values ++ messages.values ++ operationTraits.values ++ messageTraits.values ++ servers.values ++ serverVariables.values ++ channels.values).toList def findParameterOrError(ast: YPart)(key: String, scope: SearchScope.Scope): Parameter = findParameter(key, scope) match { @@ -323,6 +318,9 @@ class WebApiDeclarations( def findServer(key: String, scope: SearchScope.Scope): Option[Server] = findForType(key, _.asInstanceOf[WebApiDeclarations].servers, scope) collect { case s: Server => s } + def findServerVariable(key: String, scope: SearchScope.Scope): Option[Parameter] = + findForType(key, _.asInstanceOf[WebApiDeclarations].serverVariables, scope) collect { case s: Parameter => s } + def findChannel(key: String, scope: SearchScope.Scope): Option[EndPoint] = findForType(key, _.asInstanceOf[WebApiDeclarations].channels, scope) collect { case c: EndPoint => c } @@ -609,6 +607,16 @@ object WebApiDeclarations { override val model: ServerModel.type = ServerModel } + case class ErrorServerVariable(idPart: String, ast: YPart) + extends Parameter(Fields(), Annotations(ast)) + with ErrorDeclaration[ParameterModel.type] { + override val namespace: String = "http://amferror.com/#errorServerVariable/" + withId(idPart) + + override protected def newErrorInstance: ErrorDeclaration[ParameterModel.type] = ErrorServerVariable(idPart, ast) + override val model: ParameterModel.type = ParameterModel + } + case class ErrorChannel(idPart: String, ast: YPart) extends EndPoint(Fields(), Annotations(ast)) with ErrorDeclaration[EndPointModel.type] { diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/common/emitter/AbstractSecurityRequirementEmitter.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/common/emitter/AbstractSecurityRequirementEmitter.scala index 88505694f2..b58cf86f1d 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/common/emitter/AbstractSecurityRequirementEmitter.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/common/emitter/AbstractSecurityRequirementEmitter.scala @@ -41,7 +41,7 @@ case class OasWithExtensionsSecurityRequirementsEmitter(key: String, f: FieldEnt ) } - def allSchemesAreValidInOas(schemes: Seq[ParametrizedSecurityScheme], spec: Spec): Boolean = { + private def allSchemesAreValidInOas(schemes: Seq[ParametrizedSecurityScheme], spec: Spec): Boolean = { schemes.forall(s => { s.scheme match { case linkable: Linkable if linkable.isLink => return true diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/common/emitter/ServerEmitters.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/common/emitter/ServerEmitters.scala index 300e95d19a..6d680ac62c 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/common/emitter/ServerEmitters.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/common/emitter/ServerEmitters.scala @@ -5,6 +5,7 @@ import amf.apicontract.client.scala.model.domain.{EndPoint, Operation, Parameter import amf.apicontract.internal.metamodel.domain.ServerModel import amf.apicontract.internal.metamodel.domain.api.BaseApiModel import amf.apicontract.internal.spec.oas.emitter.context.{Oas3SpecEmitterFactory, OasSpecEmitterContext} +import amf.apicontract.internal.spec.oas.emitter.domain.OasTagToReferenceEmitter import amf.apicontract.internal.spec.oas.parser.domain.BaseUriSplitter import amf.apicontract.internal.spec.raml.emitter.context.RamlSpecEmitterContext import amf.apicontract.internal.spec.spec.toRaml @@ -25,7 +26,8 @@ import amf.shapes.internal.spec.common.emitter.annotations.AnnotationsEmitter import amf.shapes.internal.spec.common.emitter.{EnumValuesEmitter, ShapeEmitterContext} import amf.shapes.internal.spec.contexts.emitter.raml.RamlScalarEmitter import org.yaml.model.YDocument -import org.yaml.model.YDocument.EntryBuilder +import org.yaml.model.YDocument.{EntryBuilder, PartBuilder} + import scala.collection.mutable.ListBuffer case class RamlServersEmitter(f: FieldEntry, ordering: SpecOrdering, references: Seq[BaseUnit])(implicit @@ -214,7 +216,7 @@ case class OasServerEmitter(server: Server, ordering: SpecOrdering)(implicit spe fs.entry(ServerModel.Description).map(f => result += ValueEmitter("description", f)) - fs.entry(ServerModel.Variables).map(f => result += OasServerVariablesEmitter(f, ordering)) + fs.entry(ServerModel.Variables).map(f => result += OasServerVariablesEmitter("variables", f, ordering)) result ++= AnnotationsEmitter(server, ordering).emitters @@ -224,8 +226,9 @@ case class OasServerEmitter(server: Server, ordering: SpecOrdering)(implicit spe override def position(): Position = pos(server.annotations) } -case class OasServerVariablesEmitter(f: FieldEntry, ordering: SpecOrdering)(implicit spec: SpecEmitterContext) - extends EntryEmitter { +case class OasServerVariablesEmitter(key: String, f: FieldEntry, ordering: SpecOrdering)(implicit + spec: SpecEmitterContext +) extends EntryEmitter { override def emit(b: EntryBuilder): Unit = { val all = f.arrayValues(classOf[Parameter]) val hasNonOas3Variables = all.exists(!Servers.isVariable(_)) @@ -247,7 +250,7 @@ case class OasServerVariablesEmitter(f: FieldEntry, ordering: SpecOrdering)(impl } /** This emitter reduces the parameter to the fields that the oas3 variables support. */ -private case class OasServerVariableEmitter(variable: Parameter, ordering: SpecOrdering)(implicit +case class OasServerVariableEmitter(variable: Parameter, ordering: SpecOrdering)(implicit spec: SpecEmitterContext ) extends EntryEmitter { @@ -256,10 +259,22 @@ private case class OasServerVariableEmitter(variable: Parameter, ordering: SpecO override def emit(b: EntryBuilder): Unit = { b.entry( variable.name.value(), - _.obj(traverse(entries(variable), _)) + emitEntries _ ) } + private def emitEntries(p: PartBuilder): Unit = { + if (variable.isLink) { + emitLink(p) + } else { + p.obj(traverse(ordering.sorted(entries(variable)), _)) + } + } + + def emitLink(b: PartBuilder): Unit = { + OasTagToReferenceEmitter(variable).emit(b) + } + private def entries(variable: Parameter): Seq[EntryEmitter] = { val result = ListBuffer[EntryEmitter]() val shape = variable.schema @@ -299,21 +314,26 @@ private object Servers { } } - def isVariable(parameter: Parameter): Boolean = parameter.schema match { - case s: ScalarShape => - val variableFields = Seq( - ShapeModel.Name, - ShapeModel.Default, - ShapeModel.DefaultValueString, - ShapeModel.Values, - ScalarShapeModel.DataType, - ShapeModel.Description, - DomainElementModel.CustomDomainProperties - ) - s.fields.foreach { case (field, _) => - if (!variableFields.contains(field)) return false - } - true - case _ => false + def isVariable(parameter: Parameter): Boolean = { + if (parameter.isLink) + return true + + parameter.schema match { + case s: ScalarShape => + val variableFields = Seq( + ShapeModel.Name, + ShapeModel.Default, + ShapeModel.DefaultValueString, + ShapeModel.Values, + ScalarShapeModel.DataType, + ShapeModel.Description, + DomainElementModel.CustomDomainProperties + ) + s.fields.foreach { case (field, _) => + if (!variableFields.contains(field)) return false + } + true + case _ => false + } } } diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/common/transformation/stage/OperationsSecurityResolutionStage.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/common/transformation/stage/OperationsSecurityResolutionStage.scala new file mode 100644 index 0000000000..1e8615d4bc --- /dev/null +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/common/transformation/stage/OperationsSecurityResolutionStage.scala @@ -0,0 +1,61 @@ +package amf.apicontract.internal.spec.common.transformation.stage + +import amf.apicontract.client.scala.model.domain.api.AsyncApi +import amf.apicontract.client.scala.model.domain.{Operation, Server} +import amf.apicontract.internal.metamodel.domain.OperationModel +import amf.core.client.common.validation.{Async20Profile, ProfileName} +import amf.core.client.scala.AMFGraphConfiguration +import amf.core.client.scala.errorhandling.AMFErrorHandler +import amf.core.client.scala.model.document.{BaseUnit, Document} +import amf.core.client.scala.model.domain.AmfArray +import amf.core.client.scala.transform.TransformationStep +import amf.core.internal.parser.domain.Annotations + +/** Places all available security schemes in all operations unless an operation defines a subset of those */ +class OperationsSecurityResolutionStage(profile: ProfileName, val keepEditingInfo: Boolean = false) + extends TransformationStep() { + + override def transform( + model: BaseUnit, + errorHandler: AMFErrorHandler, + configuration: AMFGraphConfiguration + ): BaseUnit = { + profile match { + case Async20Profile => resolveOperationSecuritySchemas(model) + case _ => model + } + } + + private def resolveOperationSecuritySchemas(unit: BaseUnit): BaseUnit = { + unit match { + case doc: Document if doc.encodes.isInstanceOf[AsyncApi] => + val asyncApi = doc.encodes.asInstanceOf[AsyncApi] + asyncApi.endPoints.foreach { endpoint => + endpoint.operations.foreach(resolveOperationSecurity(_, endpoint.servers)) + } + doc + case _ => unit + } + } + + private def resolveOperationSecurity( + operation: Operation, + endpointServers: Seq[Server] + ): Unit = { + val securities = endpointServers.flatMap(_.security) + operation.fields.?[AmfArray](OperationModel.Security) match { + // security keyword not defined, channel has every security that's available in every server it applies + case None => + if (securities.nonEmpty) + operation.setArrayWithoutId(OperationModel.Security, securities, Annotations.synthesized()) + + // security keyword declared with an empty list `servers: []`, same as above + case Some(array: AmfArray) if array.values.isEmpty => + if (securities.nonEmpty) + operation.setArrayWithoutId(OperationModel.Security, securities, Annotations.synthesized()) + + // security keyword defined with a list of security schemas from parsing, do nothing + case _ => // ignore + } + } +} diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/emitter/domain/OasTagToReferenceEmitter.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/emitter/domain/OasTagToReferenceEmitter.scala index a4c41dd34f..15203f7047 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/emitter/domain/OasTagToReferenceEmitter.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/emitter/domain/OasTagToReferenceEmitter.scala @@ -7,7 +7,7 @@ import amf.apicontract.client.scala.model.domain.bindings.{ ServerBindings } import amf.apicontract.client.scala.model.domain._ -import amf.apicontract.internal.spec.common.emitter.AgnosticShapeEmitterContextAdapter +import amf.apicontract.internal.spec.common.emitter.{AgnosticShapeEmitterContextAdapter, SpecEmitterContext} import amf.apicontract.internal.spec.oas.emitter.context.OasLikeSpecEmitterContext import amf.apicontract.internal.spec.spec.OasDefinitions.{ appendParameterDefinitionsPrefix, @@ -15,12 +15,13 @@ import amf.apicontract.internal.spec.spec.OasDefinitions.{ } import org.mulesoft.common.client.lexical.Position import amf.core.client.scala.model.domain.DomainElement +import amf.core.internal.annotations.DeclaredServerVariable import amf.core.internal.render.BaseEmitters.pos import amf.shapes.internal.spec.common.emitter.{ShapeEmitterContext, ShapeReferenceEmitter} import amf.shapes.internal.spec.oas.OasShapeDefinitions.appendOas3ComponentsPrefix import amf.shapes.internal.spec.oas.emitter.OasSpecEmitter -case class OasTagToReferenceEmitter(link: DomainElement)(implicit val specContext: OasLikeSpecEmitterContext) +case class OasTagToReferenceEmitter(link: DomainElement)(implicit val specContext: SpecEmitterContext) extends OasSpecEmitter with ShapeReferenceEmitter { @@ -29,6 +30,8 @@ case class OasTagToReferenceEmitter(link: DomainElement)(implicit val specContex override protected def getRefUrlFor(element: DomainElement, default: String = referenceLabel)(implicit spec: ShapeEmitterContext ) = element match { + case p: Parameter if p.annotations.contains(classOf[DeclaredServerVariable]) => + appendOas3ComponentsPrefix(referenceLabel, "serverVariables") case _: Parameter => appendParameterDefinitionsPrefix(referenceLabel) case _: Payload => appendParameterDefinitionsPrefix(referenceLabel) case _: Response => appendResponsesDefinitionsPrefix(referenceLabel) diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/parser/context/OasLikeWebApiContext.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/parser/context/OasLikeWebApiContext.scala index 887186ceb9..3310d7e9ff 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/parser/context/OasLikeWebApiContext.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/parser/context/OasLikeWebApiContext.scala @@ -1,6 +1,5 @@ package amf.apicontract.internal.spec.oas.parser.context -import amf.aml.internal.semantic.SemanticExtensionsFacadeBuilder import amf.apicontract.client.scala.model.domain.security.SecurityScheme import amf.apicontract.client.scala.model.domain.{EndPoint, Operation} import amf.apicontract.internal.spec.common.OasLikeWebApiDeclarations @@ -16,8 +15,8 @@ import amf.core.client.scala.config.ParsingOptions import amf.core.client.scala.model.document.ExternalFragment import amf.core.client.scala.model.domain.Shape import amf.core.client.scala.parse.document.{ParsedReference, ParserContext} -import amf.shapes.internal.spec.common.parser.{IgnoreAnnotationSchemaValidatorBuilder, IgnoreCriteria, SpecSettings} -import org.yaml.model.{YMap, YMapEntry, YNode} +import amf.shapes.internal.spec.common.parser.{IgnoreCriteria, SpecSettings} +import org.yaml.model.{YMap, YMapEntry} import scala.collection.mutable import scala.language.postfixOps @@ -87,7 +86,3 @@ abstract class OasLikeWebApiContext( override def autoGeneratedAnnotation(s: Shape): Unit = ParsingHelpers.oasAutoGeneratedAnnotation(s) } - - - - diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/parser/domain/OasEndpointParser.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/parser/domain/OasEndpointParser.scala index 9c0c3f4566..65f88801ea 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/parser/domain/OasEndpointParser.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/parser/domain/OasEndpointParser.scala @@ -106,11 +106,7 @@ abstract class OasEndpointParser(entry: YMapEntry, parentId: String, collector: map.regex( operationsRegex, entries => { - val operations = mutable.ListBuffer[Operation]() - entries.foreach { entry => - val operationParser = ctx.factory.operationParser(entry, (o: Operation) => o) - operations += operationParser.parse() - } + val operations = parseOperations(entries) endpoint.setWithoutId( EndPointModel.Operations, AmfArray(operations, Annotations.inferred()), diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/parser/domain/OasLikeEndpointParser.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/parser/domain/OasLikeEndpointParser.scala index 20742eea42..333d05c029 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/parser/domain/OasLikeEndpointParser.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/parser/domain/OasLikeEndpointParser.scala @@ -1,6 +1,6 @@ package amf.apicontract.internal.spec.oas.parser.domain -import amf.apicontract.client.scala.model.domain.EndPoint +import amf.apicontract.client.scala.model.domain.{EndPoint, Operation} import amf.apicontract.internal.metamodel.domain.EndPointModel import amf.apicontract.internal.spec.common.parser._ import amf.apicontract.internal.spec.oas.parser.context.{OasLikeWebApiContext, RemoteNodeNavigation} @@ -11,6 +11,8 @@ import amf.core.internal.utils.{AmfStrings, TemplateUri} import amf.shapes.internal.spec.common.parser.AnnotationParser import org.yaml.model._ +import scala.collection.mutable + abstract class OasLikeEndpointParser(entry: YMapEntry, parentId: String, collector: List[EndPoint])(implicit val ctx: OasLikeWebApiContext ) extends SpecParserOps { @@ -86,4 +88,13 @@ abstract class OasLikeEndpointParser(entry: YMapEntry, parentId: String, collect endpoint } + + protected def parseOperations(entries: Iterable[YMapEntry]): Seq[Operation] = { + val operations = mutable.ListBuffer[Operation]() + entries.foreach { entry => + val operationParser = ctx.factory.operationParser(entry, (o: Operation) => o) + operations += operationParser.parse() + } + operations + } } diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/parser/domain/OasLikeServerParser.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/parser/domain/OasLikeServerParser.scala index fc8910b5ef..adbb9608e9 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/parser/domain/OasLikeServerParser.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/parser/domain/OasLikeServerParser.scala @@ -7,6 +7,7 @@ import amf.core.client.scala.model.DataType import amf.core.client.scala.model.domain.{AmfArray, AmfScalar} import amf.core.internal.datanode.DataNodeParser import amf.core.internal.metamodel.domain.ShapeModel +import amf.core.internal.metamodel.domain.ShapeModel.DefaultValueString import amf.core.internal.parser.YMapOps import amf.core.internal.parser.domain.{Annotations, ScalarNode} import amf.core.internal.utils.IdCounter @@ -50,13 +51,13 @@ class OasLikeServerParser(parent: String, entryLike: YMapEntryLike)(implicit val } } -class OasLikeServerVariableParser(entry: YMapEntry, parent: String)(implicit val ctx: OasLikeWebApiContext) +class OasLikeServerVariableParser(entry: YMapEntryLike, parent: String)(implicit val ctx: OasLikeWebApiContext) extends QuickFieldParserOps { - + private val key = entry.key.get def parse(): Parameter = { - val node = ScalarNode(entry.key) - val variable = Parameter(entry).setWithoutId(ParameterModel.Name, node.string(), Annotations(entry.key)) + val node = ScalarNode(key) + val variable = Parameter(entry.ast).setWithoutId(ParameterModel.Name, node.string(), Annotations(key)) variable.setWithoutId(ParameterModel.Binding, AmfScalar("path"), Annotations.synthesized()) variable.setWithoutId(ParameterModel.ParameterName, AmfScalar(node.string()), Annotations.synthesized()) variable.setWithoutId(ParameterModel.Required, AmfScalar(true), Annotations.synthesized()) @@ -70,7 +71,7 @@ class OasLikeServerVariableParser(entry: YMapEntry, parent: String)(implicit val protected def parseMap(variable: Parameter, map: YMap): Unit = { ctx.closedShape(variable, map, "serverVariable") val schema = variable - .withScalarSchema(entry.key) + .withScalarSchema(key) .add(Annotations(map)) .withDataType(DataType.String, Annotations.synthesized()) val counter: IdCounter = new IdCounter(); @@ -78,8 +79,8 @@ class OasLikeServerVariableParser(entry: YMapEntry, parent: String)(implicit val map.key( "default", entry => { - schema.withDefaultStr(entry.value) - schema.withDefault(DataNodeParser(entry.value).parse(), Annotations(entry.value)) + schema.set(DefaultValueString, AmfScalar(entry.value.as[String], Annotations(entry.value)), Annotations(entry)) + schema.withDefault(DataNodeParser(entry.value).parse(), Annotations(entry)) } ) map.key("description", ShapeModel.Description in schema) diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/parser/domain/OasServerVariableParser.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/parser/domain/OasServerVariableParser.scala index 739c9cfaac..ef7c4df622 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/parser/domain/OasServerVariableParser.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/parser/domain/OasServerVariableParser.scala @@ -4,10 +4,11 @@ import amf.apicontract.client.scala.model.domain.Parameter import amf.apicontract.internal.spec.oas.parser.context.OasWebApiContext import amf.apicontract.internal.validation.definitions.ParserSideValidations.ServerVariableMissingDefault import amf.core.internal.parser.YMapOps +import amf.shapes.internal.spec.common.parser.YMapEntryLike import org.yaml.model.{YMap, YMapEntry} case class OasServerVariableParser(entry: YMapEntry, parent: String)(implicit override val ctx: OasWebApiContext) - extends OasLikeServerVariableParser(entry, parent)(ctx) { + extends OasLikeServerVariableParser(YMapEntryLike(entry), parent)(ctx) { override protected def parseMap(variable: Parameter, map: YMap): Unit = { requiredDefaultField(variable, map) diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/transformation/Async20EditingPipeline.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/transformation/Async20EditingPipeline.scala index 61c8c41261..f17ebcf187 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/transformation/Async20EditingPipeline.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/transformation/Async20EditingPipeline.scala @@ -11,6 +11,7 @@ import amf.apicontract.internal.spec.common.transformation.stage.{ AnnotationRemovalStage, ChannelServersResolutionStage, OpenApiParametersNormalizationStage, + OperationsSecurityResolutionStage, ParametersNormalizationStage, PathDescriptionNormalizationStage } @@ -18,7 +19,6 @@ import amf.apicontract.internal.transformation.stages.WebApiReferenceResolutionS import amf.core.client.common.transform._ import amf.core.client.common.validation.{Async20Profile, ProfileName} import amf.core.client.scala.transform.TransformationStep -import amf.core.internal.remote.AsyncApi20 import amf.core.internal.transform.stages.SourceInformationStage import amf.shapes.internal.domain.resolution.ShapeNormalizationForUnitStage @@ -42,7 +42,8 @@ class Async20EditingPipeline private (urlShortening: Boolean = true, override va new PathDescriptionNormalizationStage(profileName, keepEditingInfo = true), new AnnotationRemovalStage(), new SemanticExtensionFlatteningStage, - new ChannelServersResolutionStage(Async20Profile) + new ChannelServersResolutionStage(Async20Profile), + new OperationsSecurityResolutionStage(Async20Profile) ) ++ url :+ SourceInformationStage } diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/transformation/Async20TransformationPipeline.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/transformation/Async20TransformationPipeline.scala index 16304258eb..1a8c966a89 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/transformation/Async20TransformationPipeline.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/transformation/Async20TransformationPipeline.scala @@ -10,6 +10,7 @@ import amf.apicontract.internal.spec.async.transformation.{ import amf.apicontract.internal.spec.common.transformation.stage.{ AnnotationRemovalStage, ChannelServersResolutionStage, + OperationsSecurityResolutionStage, PathDescriptionNormalizationStage } import amf.apicontract.internal.transformation.stages.WebApiReferenceResolutionStage @@ -42,7 +43,8 @@ class Async20TransformationPipeline private (override val name: String) extends new AnnotationRemovalStage(), new SemanticExtensionFlatteningStage, SourceInformationStage, - new ChannelServersResolutionStage(Async20Profile) + new ChannelServersResolutionStage(Async20Profile), + new OperationsSecurityResolutionStage(Async20Profile) ) } diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/transformation/ValidationTransformationPipeline.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/transformation/ValidationTransformationPipeline.scala index 98af3bb786..514bd703da 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/transformation/ValidationTransformationPipeline.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/transformation/ValidationTransformationPipeline.scala @@ -7,6 +7,7 @@ import amf.apicontract.internal.spec.common.transformation.stage.{ ChannelServersResolutionStage, MediaTypeResolutionStage, OpenApiParametersNormalizationStage, + OperationsSecurityResolutionStage, ParametersNormalizationStage, PayloadAndParameterResolutionStage, Raml10ParametersNormalizationStage, @@ -48,7 +49,8 @@ class ValidationTransformationPipeline private[amf] ( new SemanticExtensionFlatteningStage, SourceInformationStage, new AnnotationRemovalStage(), - new ChannelServersResolutionStage(profile) + new ChannelServersResolutionStage(profile), + new OperationsSecurityResolutionStage(profile) ) private def parameterNormalizationStageFor(profile: ProfileName): ParametersNormalizationStage = { diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/transformation/stages/WebApiReferenceResolutionStage.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/transformation/stages/WebApiReferenceResolutionStage.scala index 9214870121..19250e71c8 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/transformation/stages/WebApiReferenceResolutionStage.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/transformation/stages/WebApiReferenceResolutionStage.scala @@ -3,6 +3,7 @@ package amf.apicontract.internal.transformation.stages import amf.apicontract.client.scala.model.domain.{EndPoint, Message, Parameter, Request, Response, Server} import amf.apicontract.internal.metamodel.domain.MessageModel import amf.core.client.scala.model.domain.{DomainElement, Linkable} +import amf.core.internal.annotations.DeclaredServerVariable import amf.core.internal.transform.stages.ReferenceResolutionStage import amf.core.internal.parser.domain.{Annotations, Fields} @@ -45,6 +46,13 @@ class WebApiReferenceResolutionStage(keepEditingInfo: Boolean = false) copy.withId(sourceServer.id).withName(sourceServer.name.value()) case _ => domain } + case sourceServerVariable: Parameter if sourceServerVariable.annotations.contains(classOf[DeclaredServerVariable]) => + domain match { + case serverVariable: Parameter => + val copy = serverVariable.copyElement().asInstanceOf[Parameter] + copy.withId(sourceServerVariable.id).withName(sourceServerVariable.name.value()) + case _ => domain + } case sourceEndpoint: EndPoint => // asyncApi channel domain match { case channel: EndPoint => diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/validation/model/APIRawValidations.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/validation/model/APIRawValidations.scala index c4504f81f5..b9a476a2ad 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/validation/model/APIRawValidations.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/validation/model/APIRawValidations.scala @@ -1088,6 +1088,105 @@ object APIRawValidations extends CommonValidationDefinitions { constraint = sh("pattern"), value = "^(Api\\sKey|OAuth\\s2.0|http|httpApiKey|openIdConnect|userPassword|X509|symmetricEncryption|asymmetricEncryption|plain|scramSha256|scramSha512|gssapi|x-.+)$" + ), + AMFValidation( + message = "Invalid 'destinationType' value. The options are: 'queue' or 'topic'.", + owlClass = apiBinding("SolaceOperationDestination"), + owlProperty = apiBinding("destinationType"), + constraint = sh("in"), + value = "queue,topic" + ), + AMFValidation( + message = "Invalid 'deliveryMode' value. The options are: 'direct' or 'persistent'.", + owlClass = apiBinding("SolaceOperationDestination"), + owlProperty = apiBinding("deliveryMode"), + constraint = sh("in"), + value = "direct,persistent" + ), + AMFValidation( + message = "Invalid 'accessType' value. The options are: 'exclusive' or 'nonexclusive'.", + owlClass = apiBinding("SolaceOperationQueue"), + owlProperty = apiBinding("accessType"), + constraint = sh("in"), + value = "exclusive,nonexclusive" + ), + AMFValidation( + message = "Invalid 'destinationType' value. The options are: 'exchange', 'queue' or 'fifo-queue'.", + owlClass = apiBinding("AnypointMQChannelBinding"), + owlProperty = apiBinding("destinationType"), + constraint = sh("in"), + value = "exchange,queue,fifo-queue" + ), + AMFValidation( + owlClass = apiBinding("AnypointMQMessageBinding"), + owlProperty = apiBinding("headers"), + constraint = shape("anypointMQHeadersValidation") + ), + AMFValidation( + message = "IBMMQ Server Binding 'heartBeatInterval' field must be a number between 0-999999", + owlClass = apiBinding("IBMMQServerBinding"), + owlProperty = apiBinding("heartBeatInterval"), + constraint = sh("pattern"), + value = "^\\d{1,6}$" + ), + AMFValidation( + message = "IBMMQ Channel Binding 'destinationType' field must be either 'topic' or 'queue'", + owlClass = apiBinding("IBMMQChannelBinding"), + owlProperty = apiBinding("destinationType"), + constraint = sh("in"), + value = "topic,queue" + ), + AMFValidation( + message = "IBMMQ queue 'objectName' field MUST NOT exceed 48 characters in length", + owlClass = apiBinding("IBMMQChannelQueue"), + owlProperty = apiBinding("objectName"), + constraint = sh("maxLength"), + value = "48" + ), + AMFValidation( + message = "'queue' and 'topic' fields MUST NOT coexist within an IBMMQ channel binding", + owlClass = apiBinding("IBMMQChannelBinding"), + owlProperty = apiBinding("queue"), + constraint = shape("IBMMQDestinationValidation") + ), + AMFValidation( + message = "IBMMQ topic 'string' field MUST NOT exceed 10240 characters in length", + owlClass = apiBinding("IBMMQChannelTopic"), + owlProperty = apiBinding("string"), + constraint = sh("maxLength"), + value = "10240" + ), + AMFValidation( + message = "IBMMQ topic 'objectName' field MUST NOT exceed 48 characters in length", + owlClass = apiBinding("IBMMQChannelTopic"), + owlProperty = apiBinding("objectName"), + constraint = sh("maxLength"), + value = "48" + ), + AMFValidation( + message = "IBMMQ channel Binding 'maxMsgLength' field must be a number between 0-104857600 (100MB)", + owlClass = apiBinding("IBMMQChannelBinding"), + owlProperty = apiBinding("maxMsgLength"), + constraint = shape("IBMMQMaxMsgLengthValidation") + ), + AMFValidation( + message = "IBMMQ message Binding 'type' field must be either 'string', 'jms' or 'binary'", + owlClass = apiBinding("IBMMQMessageBinding"), + owlProperty = apiBinding("messageType"), + constraint = sh("in"), + value = "string,jms,binary" + ), + AMFValidation( + message = "IBMMQ message Binding 'expiry' field must be 0 or greater", + owlClass = apiBinding("IBMMQMessageBinding"), + owlProperty = apiBinding("expiry"), + constraint = sh("minInclusive") + ), + AMFValidation( + message = "IBMMQ message Binding 'headers' MUST NOT be specified if 'type' field is 'string' or 'jms'", + owlClass = apiBinding("IBMMQMessageBinding"), + owlProperty = apiBinding("headers"), + constraint = shape("IBMMQHeadersValidation") ) ) ++ baseApiValidations("AsyncAPI") diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/validation/shacl/APICustomShaclFunctions.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/validation/shacl/APICustomShaclFunctions.scala index 11821bfc76..c4a4e8e469 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/validation/shacl/APICustomShaclFunctions.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/validation/shacl/APICustomShaclFunctions.scala @@ -2,10 +2,19 @@ package amf.apicontract.internal.validation.shacl import amf.apicontract.client.scala.model.domain.{EndPoint, Request} import amf.apicontract.client.scala.model.domain.api.{Api, WebApi} +import amf.apicontract.client.scala.model.domain.bindings.anypointmq.AnypointMQMessageBinding +import amf.apicontract.client.scala.model.domain.bindings.ibmmq.{IBMMQChannelBinding, IBMMQMessageBinding} import amf.apicontract.client.scala.model.domain.security.{OAuth2Settings, OpenIdConnectSettings, SecurityScheme} import amf.apicontract.internal.metamodel.domain._ import amf.apicontract.internal.metamodel.domain.api.BaseApiModel -import amf.apicontract.internal.metamodel.domain.bindings.{BindingHeaders, BindingQuery, HttpMessageBindingModel} +import amf.apicontract.internal.metamodel.domain.bindings.{ + AnypointMQMessageBindingModel, + BindingHeaders, + BindingQuery, + HttpMessageBindingModel, + IBMMQChannelBindingModel, + IBMMQMessageBindingModel +} import amf.apicontract.internal.metamodel.domain.security.{ OAuth2SettingsModel, OpenIdConnectSettingsModel, @@ -741,6 +750,86 @@ object APICustomShaclFunctions extends BaseCustomShaclFunctions { case _ => // ignore } } + }, + new CustomShaclFunction { + override val name: String = "anypointMQHeadersValidation" + + override def run(element: AmfObject, validate: Option[ValidationInfo] => Unit): Unit = { + + element.asInstanceOf[AnypointMQMessageBinding].headers match { + case node: NodeShape => + node.fields.?[AmfArray](NodeShapeModel.Properties) match { + case Some(_) => // ignore + case None => + validate( + validationInfo( + AnypointMQMessageBindingModel.Headers, + "AnypointMQ Message Binding 'headers' field must have a 'properties' field", + element.annotations + ) + ) + } + + case elem => + validate( + validationInfo( + AnypointMQMessageBindingModel.Headers, + "AnypointMQ Message Binding 'headers' field must be an object", + elem.annotations + ) + ) + } + } + }, + new CustomShaclFunction { + override val name: String = "IBMMQDestinationValidation" + + override def run(element: AmfObject, validate: Option[ValidationInfo] => Unit): Unit = { + val binding = element.asInstanceOf[IBMMQChannelBinding] + if (binding.topic != null && binding.queue != null) { + validate( + validationInfo( + IBMMQChannelBindingModel.Queue, + "'queue' and 'topic' fields MUST NOT coexist within an IBMMQ channel binding", + element.annotations + ) + ) + } + } + }, + new CustomShaclFunction { + override val name: String = "IBMMQHeadersValidation" + + override def run(element: AmfObject, validate: Option[ValidationInfo] => Unit): Unit = { + val binding = element.asInstanceOf[IBMMQMessageBinding] + if (Seq("string", "jms").contains(binding.messageType.value()) && binding.headers.nonEmpty) { + validate( + validationInfo( + IBMMQMessageBindingModel.Headers, + "headers MUST NOT be specified if type = string or jms in an IBMMQ Message Binding", + element.annotations + ) + ) + } + } + }, + new CustomShaclFunction { + override val name: String = "IBMMQMaxMsgLengthValidation" + + override def run(element: AmfObject, validate: Option[ValidationInfo] => Unit): Unit = { + val binding = element.asInstanceOf[IBMMQChannelBinding] + val length = binding.maxMsgLength.value() + val isMaxMsgLengthValid = 0 <= length && length <= 104857600 + if (!isMaxMsgLengthValid) { + validate( + validationInfo( + IBMMQChannelBindingModel.MaxMsgLength, + "IBMMQ channel Binding 'maxMsgLength' field must be a number between 0-104857600 (100MB)", + element.annotations + ) + ) + } + } } ) diff --git a/amf-apicontract.versions b/amf-apicontract.versions index 2d5ace926f..7d1fa9dd8e 100644 --- a/amf-apicontract.versions +++ b/amf-apicontract.versions @@ -1,6 +1,6 @@ -amf.apicontract=5.4.9 -amf.aml=6.4.9 -amf.model=3.8.2 +amf.apicontract=5.5.0 +amf.aml=6.5.0 +amf.model=3.9.0 antlr4Version=0.7.25 amf.validation.profile.dialect=1.6.0 amf.validation.report.dialect=1.2.0 diff --git a/amf-cli/js/typings/amf-client-js.d.ts b/amf-cli/js/typings/amf-client-js.d.ts index 100d31ee8e..66e3ffce89 100644 --- a/amf-cli/js/typings/amf-client-js.d.ts +++ b/amf-cli/js/typings/amf-client-js.d.ts @@ -337,6 +337,8 @@ declare module "amf-client-js" { getDialects(): Array; getExtensions(): Array; + + getResourceLoaders(): Array; } export class AMLDialectInstanceResult extends AMFResult { dialectInstance: DialectInstance; @@ -993,6 +995,69 @@ declare module "amf-client-js" { withThenMapping(thenMapping: string): AnyMapping; } + export class AnypointMQChannelBinding implements ChannelBinding { + + destination: StrField; + destinationType: StrField; + bindingVersion: StrField + + withDestination(destination: string): this; + withDestinationType(destinationType: string): this; + withBindingVersion(bindingVersion: string): this; + + customDomainProperties: Array; + extendsNode: Array; + id: string; + isExternalLink: BoolField; + isLink: boolean; + linkLabel: StrField; + linkTarget: DomainElement | undefined; + position: Range; + + annotations(): Annotations; + graph(): Graph; + link(): T; + link(label: string): T; + linkCopy(): Linkable; + withCustomDomainProperties(extensions: Array): this; + withCustomDomainProperties(extensions: Array): this; + withExtendsNode(extension: Array): this; + withId(id: string): this; + withIsExternalLink(isExternalLink: boolean): DomainElement; + withLinkLabel(label: string): this; + withLinkTarget(target: undefined): this; + + } + export class AnypointMQMessageBinding implements MessageBinding { + + headers: Shape; + bindingVersion: StrField; + + withHeaders(headers: Shape): this; + withBindingVersion(bindingVersion: string): this; + + customDomainProperties: Array; + extendsNode: Array; + id: string; + isExternalLink: BoolField; + isLink: boolean; + linkLabel: StrField; + linkTarget: DomainElement | undefined; + position: Range; + + annotations(): Annotations; + graph(): Graph; + link(): T; + link(label: string): T; + linkCopy(): Linkable; + withCustomDomainProperties(extensions: Array): this; + withCustomDomainProperties(extensions: Array): this; + withExtendsNode(extension: Array): this; + withId(id: string): this; + withIsExternalLink(isExternalLink: boolean): DomainElement; + withLinkLabel(label: string): this; + withLinkTarget(target: undefined): this; + } export class AnyShape implements Shape { and: Array; comment: StrField; @@ -2789,7 +2854,7 @@ declare module "amf-client-js" { withStyle(style: string): this; } - export class EndPoint implements DomainElement { + export class EndPoint implements DomainElement, Linkable { bindings: ChannelBindings; customDomainProperties: Array; description: StrField; @@ -2850,6 +2915,16 @@ declare module "amf-client-js" { withServers(servers: Array): this; withSummary(summary: string): this; + + isLink: boolean; + linkLabel: StrField; + linkTarget: DomainElement | undefined; + + link(): T; + link(label: string): T; + linkCopy(): Linkable; + withLinkLabel(label: string): this; + withLinkTarget(target: undefined): this; } export class EndPointFederationMetadata { constructor(); @@ -3173,6 +3248,144 @@ declare module "amf-client-js" { withUsage(usage: string): this; } + export class GooglePubSubChannelBinding implements ChannelBinding { + + labels: ObjectNode; + messageRetentionDuration: StrField; + messageStoragePolicy: GooglePubSubMessageStoragePolicy; + schemaSettings: GooglePubSubSchemaSettings; + topic: StrField; + bindingVersion: StrField; + + withLabels(labels: ObjectNode): this; + withMessageRetentionDuration(messageRetentionDuration: string): this; + withMessageStoragePolicy(messageStoragePolicy: GooglePubSubMessageStoragePolicy): this; + withSchemaSettings(schemaSettings: GooglePubSubSchemaSettings): this; + withTopic(topic: string): this; + withBindingVersion(bindingVersion: string): this; + + customDomainProperties: Array; + extendsNode: Array; + id: string; + isExternalLink: BoolField; + isLink: boolean; + linkLabel: StrField; + linkTarget: DomainElement | undefined; + position: Range; + + annotations(): Annotations; + graph(): Graph; + link(): T; + link(label: string): T; + linkCopy(): Linkable; + withCustomDomainProperties(extensions: Array): this; + withCustomDomainProperties(extensions: Array): this; + withExtendsNode(extension: Array): this; + withId(id: string): this; + withIsExternalLink(isExternalLink: boolean): DomainElement; + withLinkLabel(label: string): this; + withLinkTarget(target: undefined): this; + } + export class GooglePubSubMessageStoragePolicy implements DomainElement { + + allowedPersistenceRegions: Array; + + withAllowedPersistenceRegions(allowedPersistenceRegions: Array): this + + customDomainProperties: Array; + extendsNode: Array; + id: string; + isExternalLink: BoolField; + position: Range; + + annotations(): Annotations; + graph(): Graph; + withCustomDomainProperties(extensions: Array): this; + withCustomDomainProperties(extensions: Array): this; + withExtendsNode(extension: Array): this; + withId(id: string): this; + withIsExternalLink(isExternalLink: boolean): DomainElement; + } + export class GooglePubSubSchemaSettings implements DomainElement { + + encoding: StrField; + firstRevisionId: StrField; + lastRevisionId: StrField; + name: StrField; + + withEncoding(encoding: string): this; + withFirstRevisionId(firstRevisionId: string): this; + withLastRevisionId(lastRevisionId: string): this; + withName(name: string): this; + + customDomainProperties: Array; + extendsNode: Array; + id: string; + isExternalLink: BoolField; + position: Range; + + annotations(): Annotations; + graph(): Graph; + withCustomDomainProperties(extensions: Array): this; + withCustomDomainProperties(extensions: Array): this; + withExtendsNode(extension: Array): this; + withId(id: string): this; + withIsExternalLink(isExternalLink: boolean): DomainElement; + } + export class GooglePubSubMessageBinding implements MessageBinding { + + attributes: ObjectNode; + orderingKey: StrField; + schema: GooglePubSubSchemaDefinition; + + withAttributes(attributes: ObjectNode): this; + withOrderingKey(orderingKey: string): this; + withSchema(schema: GooglePubSubSchemaDefinition): this; + + customDomainProperties: Array; + extendsNode: Array; + id: string; + isExternalLink: BoolField; + isLink: boolean; + linkLabel: StrField; + linkTarget: DomainElement | undefined; + position: Range; + + annotations(): Annotations; + graph(): Graph; + link(): T; + link(label: string): T; + linkCopy(): Linkable; + withCustomDomainProperties(extensions: Array): this; + withCustomDomainProperties(extensions: Array): this; + withExtendsNode(extension: Array): this; + withId(id: string): this; + withIsExternalLink(isExternalLink: boolean): DomainElement; + withLinkLabel(label: string): this; + withLinkTarget(target: undefined): this; + } + export class GooglePubSubSchemaDefinition implements DomainElement { + + name: StrField; + fieldType: StrField; + + withName(name: string): this; + withFieldType(fieldType: string): this; + + customDomainProperties: Array; + extendsNode: Array; + id: string; + isExternalLink: BoolField; + position: Range; + + annotations(): Annotations; + graph(): Graph; + withCustomDomainProperties(extensions: Array): this; + withCustomDomainProperties(extensions: Array): this; + withExtendsNode(extension: Array): this; + withId(id: string): this; + withIsExternalLink(isExternalLink: boolean): DomainElement; + } export class Graph { containsProperty(uri: string): boolean; @@ -3188,7 +3401,7 @@ declare module "amf-client-js" { types(): Array; - propertyLexical(uri: String): Range; + propertyLexical(uri: string): Range; } export class GraphQLConfiguration { static GraphQL(): AMFConfiguration; @@ -3304,6 +3517,169 @@ declare module "amf-client-js" { withScheme(scheme: string): this; } + export class IBMMQChannelBinding implements ChannelBinding { + + destinationType: StrField; + queue: IBMMQChannelQueue; + topic: IBMMQChannelTopic; + maxMsgLength: IntField; + bindingVersion: StrField; + + withDestinationType(destinationType: string): this; + withQueue(queue: IBMMQChannelQueue): this; + withTopic(topic: IBMMQChannelTopic): this; + withMaxMsgLength(maxMsgLength: number): this; + withBindingVersion(bindingVersion: string): this; + + customDomainProperties: Array; + extendsNode: Array; + id: string; + isExternalLink: BoolField; + isLink: boolean; + linkLabel: StrField; + linkTarget: DomainElement | undefined; + position: Range; + + annotations(): Annotations; + graph(): Graph; + link(): T; + link(label: string): T; + linkCopy(): Linkable; + withCustomDomainProperties(extensions: Array): this; + withCustomDomainProperties(extensions: Array): this; + withExtendsNode(extension: Array): this; + withId(id: string): this; + withIsExternalLink(isExternalLink: boolean): DomainElement; + withLinkLabel(label: string): this; + withLinkTarget(target: undefined): this; + } + export class IBMMQChannelQueue implements DomainElement { + + objectName: StrField; + isPartitioned: BoolField; + exclusive: BoolField; + name: StrField; + + withObjectName(objectName: string): this; + withIsPartitioned(isPartitioned: boolean): this; + withExclusive(exclusive: boolean): this; + withName(name: string): this; + + customDomainProperties: Array; + extendsNode: Array; + id: string; + isExternalLink: BoolField; + position: Range; + + annotations(): Annotations; + graph(): Graph; + withCustomDomainProperties(extensions: Array): this; + withCustomDomainProperties(extensions: Array): this; + withExtendsNode(extension: Array): this; + withId(id: string): this; + withIsExternalLink(isExternalLink: boolean): DomainElement; + } + export class IBMMQChannelTopic implements DomainElement { + + string: StrField; + objectName: StrField; + durablePermitted: BoolField; + lastMsgRetained: BoolField; + name: StrField; + + withString(string: string): this; + withObjectName(objectName: string): this; + withDurablePermitted(durablePermitted: boolean): this; + withLastMsgRetained(lastMsgRetained: boolean): this; + withName(name: string): this; + + customDomainProperties: Array; + extendsNode: Array; + id: string; + isExternalLink: BoolField; + position: Range; + + annotations(): Annotations; + graph(): Graph; + withCustomDomainProperties(extensions: Array): this; + withCustomDomainProperties(extensions: Array): this; + withExtendsNode(extension: Array): this; + withId(id: string): this; + withIsExternalLink(isExternalLink: boolean): DomainElement; + } + export class IBMMQMessageBinding implements MessageBinding { + + messageType: StrField; + headers: Array; + description: StrField; + expiry: IntField; + bindingVersion: StrField; + + withType(messageType: string): this; + withHeaders(headers: string): this; + withDescription(description: string): this; + withExpiry(expiry: number): this; + withBindingVersion(bindingVersion: string): this; + + customDomainProperties: Array; + extendsNode: Array; + id: string; + isExternalLink: BoolField; + isLink: boolean; + linkLabel: StrField; + linkTarget: DomainElement | undefined; + position: Range; + + annotations(): Annotations; + graph(): Graph; + link(): T; + link(label: string): T; + linkCopy(): Linkable; + withCustomDomainProperties(extensions: Array): this; + withCustomDomainProperties(extensions: Array): this; + withExtendsNode(extension: Array): this; + withId(id: string): this; + withIsExternalLink(isExternalLink: boolean): DomainElement; + withLinkLabel(label: string): this; + withLinkTarget(target: undefined): this; + } + export class IBMMQServerBinding implements ServerBinding { + + groupId: StrField; + ccdtQueueManagerName: StrField; + cipherSpec: StrField; + multiEndpointServer: BoolField; + heartBeatInterval: IntField; + bindingVersion: StrField; + + withCcdtQueueManagerName(ccdtQueueManagerName: string): this; + withCipherSpec(cipherSpec: string): this; + withMultiEndpointServer(multiEndpointServer: boolean): this; + withHeartBeatInterval(heartBeatInterval: number): this; + withBindingVersion(bindingVersion: string): this; + + customDomainProperties: Array; + extendsNode: Array; + id: string; + isExternalLink: BoolField; + isLink: boolean; + linkLabel: StrField; + linkTarget: DomainElement | undefined; + position: Range; + + annotations(): Annotations; + graph(): Graph; + link(): T; + link(label: string): T; + linkCopy(): Linkable; + withCustomDomainProperties(extensions: Array): this; + withCustomDomainProperties(extensions: Array): this; + withExtendsNode(extension: Array): this; + withId(id: string): this; + withIsExternalLink(isExternalLink: boolean): DomainElement; + withLinkLabel(label: string): this; + withLinkTarget(target: undefined): this; + } export class IntField implements ValueField { isNull: boolean; nonNull: boolean; @@ -3857,6 +4233,7 @@ declare module "amf-client-js" { summary: StrField; tags: Array; title: StrField; + messageId: StrField; constructor(); @@ -3915,6 +4292,8 @@ declare module "amf-client-js" { withTags(tags: Array): this; withTitle(title: string): this; + + withMessageId(messageId: string): this; } export interface MessageBinding extends DomainElement, Linkable {} export class MessageBindings implements DomainElement, Linkable { @@ -5281,6 +5660,69 @@ declare module "amf-client-js" { withName(name: string): PublicNodeMapping; } + export class PulsarChannelBinding implements ChannelBinding { + + namespace: StrField; + persistence: StrField; + compaction: IntField; + geoReplication: Array; + retention: PulsarChannelRetention; + ttl: IntField; + deduplication: BoolField; + bindingVersion: StrField; + + withPersistence(persistence: string): this; + withCompaction(compaction: number): this; + withGeoReplication(geoReplication: Array): this; + withRetention(retention: PulsarChannelRetention): this; + withTtl(ttl: number): this; + withDeduplication(deduplication: boolean): this; + withBindingVersion(bindingVersion: string): this; + + customDomainProperties: Array; + extendsNode: Array; + id: string; + isExternalLink: BoolField; + isLink: boolean; + linkLabel: StrField; + linkTarget: DomainElement | undefined; + position: Range; + + annotations(): Annotations; + graph(): Graph; + link(): T; + link(label: string): T; + linkCopy(): Linkable; + withCustomDomainProperties(extensions: Array): this; + withCustomDomainProperties(extensions: Array): this; + withExtendsNode(extension: Array): this; + withId(id: string): this; + withIsExternalLink(isExternalLink: boolean): DomainElement; + withLinkLabel(label: string): this; + withLinkTarget(target: undefined): this; + } + export class PulsarChannelRetention implements DomainElement { + + time: IntField; + size: IntField; + + withTime(time: number): this; + withSize(size: number): this; + + customDomainProperties: Array; + extendsNode: Array; + id: string; + isExternalLink: BoolField; + position: Range; + + annotations(): Annotations; + graph(): Graph; + withCustomDomainProperties(extensions: Array): this; + withCustomDomainProperties(extensions: Array): this; + withExtendsNode(extension: Array): this; + withId(id: string): this; + withIsExternalLink(isExternalLink: boolean): DomainElement; + } export class RAMLConfiguration { static RAML(): AMFConfiguration; @@ -6010,7 +6452,7 @@ declare module "amf-client-js" { withUnitCache(cache: UnitCache): SemanticJsonSchemaConfiguration; } - export class Server implements DomainElement { + export class Server implements DomainElement, Linkable { bindings: ServerBindings; customDomainProperties: Array; description: StrField; @@ -6024,6 +6466,7 @@ declare module "amf-client-js" { security: Array; url: StrField; variables: Array; + tags: Array constructor(); @@ -6054,6 +6497,18 @@ declare module "amf-client-js" { withVariable(name: string): Parameter; withVariables(variables: Array): this; + + withTags(tags:Array): this; + + isLink: boolean; + linkLabel: StrField; + linkTarget: DomainElement | undefined; + + link(): T; + link(label: string): T; + linkCopy(): Linkable; + withLinkLabel(label: string): this; + withLinkTarget(target: undefined): this; } export interface ServerBinding extends DomainElement, Linkable {} export class ServerBindings implements DomainElement, Linkable { @@ -6373,6 +6828,110 @@ declare module "amf-client-js" { getConfiguration(): ShapesConfiguration; } export class SkippedValidationPluginEvent {} + export class SolaceOperationBinding implements OperationBinding { + + destinations: Array; + bindingVersion: StrField; + + withDestinations(destinations: Array): this; + withBindingVersion(bindingVersion: string): this; + + customDomainProperties: Array; + extendsNode: Array; + id: string; + isExternalLink: BoolField; + isLink: boolean; + linkLabel: StrField; + linkTarget: DomainElement | undefined; + position: Range; + + annotations(): Annotations; + graph(): Graph; + link(): T; + link(label: string): T; + linkCopy(): Linkable; + withCustomDomainProperties(extensions: Array): this; + withCustomDomainProperties(extensions: Array): this; + withExtendsNode(extension: Array): this; + withId(id: string): this; + withIsExternalLink(isExternalLink: boolean): DomainElement; + withLinkLabel(label: string): this; + withLinkTarget(target: undefined): this; + } + export class SolaceOperationDestination implements DomainElement { + + destinationType: StrField; + deliveryMode: StrField; + queue: SolaceOperationQueue; + topic: SolaceOperationTopic; + + withDestinationType(destinationType: string): this; + withDeliveryMode(deliveryMode: string): this; + withQueue(queue: SolaceOperationQueue): this; + withTopic(topic: SolaceOperationTopic): this; + + customDomainProperties: Array; + extendsNode: Array; + id: string; + isExternalLink: BoolField; + position: Range; + + annotations(): Annotations; + graph(): Graph; + withCustomDomainProperties(extensions: Array): this; + withCustomDomainProperties(extensions: Array): this; + withExtendsNode(extension: Array): this; + withId(id: string): this; + withIsExternalLink(isExternalLink: boolean): DomainElement; + } + export class SolaceOperationQueue implements DomainElement { + + topicSubscriptions: Array; + accessType: StrField; + maxMsgSpoolSize: StrField; + maxTtl: StrField; + name: StrField; + + withTopicSubscriptions(topicSubscriptions: Array): this; + withAccessType(accessType: string): this; + withMaxMsgSpoolSize(maxMsgSpoolSize: string): this; + withMaxTtl(maxTtl: string): this; + withName(name: string): this; + + customDomainProperties: Array; + extendsNode: Array; + id: string; + isExternalLink: BoolField; + position: Range; + + annotations(): Annotations; + graph(): Graph; + withCustomDomainProperties(extensions: Array): this; + withCustomDomainProperties(extensions: Array): this; + withExtendsNode(extension: Array): this; + withId(id: string): this; + withIsExternalLink(isExternalLink: boolean): DomainElement; + } + export class SolaceOperationTopic implements DomainElement { + + topicSubscriptions: Array; + + withTopicSubscriptions(topicSubscriptions: Array): this; + + customDomainProperties: Array; + extendsNode: Array; + id: string; + isExternalLink: BoolField; + position: Range; + + annotations(): Annotations; + graph(): Graph; + withCustomDomainProperties(extensions: Array): this; + withCustomDomainProperties(extensions: Array): this; + withExtendsNode(extension: Array): this; + withId(id: string): this; + withIsExternalLink(isExternalLink: boolean): DomainElement; + } export interface Spec { readonly id: string; isAsync: boolean; @@ -6384,6 +6943,12 @@ declare module "amf-client-js" { static readonly AMF: Spec; static readonly AML: Spec; static readonly ASYNC20: Spec; + static readonly ASYNC21: Spec; + static readonly ASYNC22: Spec; + static readonly ASYNC23: Spec; + static readonly ASYNC24: Spec; + static readonly ASYNC25: Spec; + static readonly ASYNC26: Spec; static readonly GRAPHQL: Spec; static readonly GRAPHQL_FEDERATION: Spec; static readonly GRPC: Spec; @@ -7008,7 +7573,7 @@ declare module "amf-client-js" { static readonly FileNotFound: "file-not-found"; } export class ExceptionUtil { - static isExceptionType(exception: AmfException, exceptionCode: String): Boolean; + static isExceptionType(exception: AmfException, exceptionCode: string): boolean; } export class TypeIRI { static readonly Shape: string; @@ -7040,8 +7605,8 @@ declare module "amf-client-js" { static readonly WebApi: string; } export class TypeUtil { - static isTypeOf(element: AmfObjectWrapper, typeIri: String): Boolean; - static isTypeOf(element: AmfObjectWrapper, typeIri: Array): Boolean; + static isTypeOf(element: AmfObjectWrapper, typeIri: String): boolean; + static isTypeOf(element: AmfObjectWrapper, typeIri: Array): boolean; } namespace org { diff --git a/amf-cli/shared/src/test/resources/configuration/async-model.jsonld b/amf-cli/shared/src/test/resources/configuration/async-model.jsonld index 03f8c2a6a2..4b6bf2c4c6 100644 --- a/amf-cli/shared/src/test/resources/configuration/async-model.jsonld +++ b/amf-cli/shared/src/test/resources/configuration/async-model.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], -"http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2" +"http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0" }, { "@id": "root/async-api", diff --git a/amf-cli/shared/src/test/resources/configuration/webapi-model.jsonld b/amf-cli/shared/src/test/resources/configuration/webapi-model.jsonld index 1701e000e9..9fbb211a98 100644 --- a/amf-cli/shared/src/test/resources/configuration/webapi-model.jsonld +++ b/amf-cli/shared/src/test/resources/configuration/webapi-model.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], -"http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2" +"http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0" }, { "@id": "root/web-api", diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/transformation/introspected-types.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/transformation/introspected-types.jsonld index b835588553..95b217f3ea 100644 --- a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/transformation/introspected-types.jsonld +++ b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/transformation/introspected-types.jsonld @@ -23,7 +23,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "GraphQLFederation" }, diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/directive-with-directives.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/directive-with-directives.jsonld index 6f2a21d0b9..debe6f71ea 100644 --- a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/directive-with-directives.jsonld +++ b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/directive-with-directives.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/external-extend-type.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/external-extend-type.jsonld index 859f19fbf9..5f028e7116 100644 --- a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/external-extend-type.jsonld +++ b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/external-extend-type.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/external-type.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/external-type.jsonld index 53c455c5e5..58b0f6b40d 100644 --- a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/external-type.jsonld +++ b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/external-type.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/federation-directives.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/federation-directives.jsonld index 5116ced1d3..dd772e930b 100644 --- a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/federation-directives.jsonld +++ b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/federation-directives.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/graphql-directives.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/graphql-directives.jsonld index 443d282119..0bf0f58969 100644 --- a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/graphql-directives.jsonld +++ b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/graphql-directives.jsonld @@ -300,7 +300,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-argument.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-argument.jsonld index a086acda69..f4ea086bf7 100644 --- a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-argument.jsonld +++ b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-argument.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-enum-value.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-enum-value.jsonld index e86429751d..6dd6371c86 100644 --- a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-enum-value.jsonld +++ b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-enum-value.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-enum.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-enum.jsonld index 3509d2d921..40f98858b2 100644 --- a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-enum.jsonld +++ b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-enum.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-field-with-argument.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-field-with-argument.jsonld index 694f8a7e99..be091e561e 100644 --- a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-field-with-argument.jsonld +++ b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-field-with-argument.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-field.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-field.jsonld index 6d6de527a5..788a843905 100644 --- a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-field.jsonld +++ b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-field.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-input-field.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-input-field.jsonld index 803730b206..25c8dacb4d 100644 --- a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-input-field.jsonld +++ b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-input-field.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-input-object.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-input-object.jsonld index 4afa59311d..60a7ded6e2 100644 --- a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-input-object.jsonld +++ b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-input-object.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-interface.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-interface.jsonld index e7bcc44f79..b3c3526016 100644 --- a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-interface.jsonld +++ b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-interface.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-object.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-object.jsonld index b26aba561c..b60ba8d60f 100644 --- a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-object.jsonld +++ b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-object.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-scalar.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-scalar.jsonld index a6712aefdf..b993fc672c 100644 --- a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-scalar.jsonld +++ b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-scalar.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-union.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-union.jsonld index feaa86d6aa..240d078ace 100644 --- a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-union.jsonld +++ b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/inaccessible-union.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/key-extend-interface.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/key-extend-interface.jsonld index a5b674c822..bc13b3d459 100644 --- a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/key-extend-interface.jsonld +++ b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/key-extend-interface.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/key-extend-type-complex.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/key-extend-type-complex.jsonld index 88e6587b47..3e085380fe 100644 --- a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/key-extend-type-complex.jsonld +++ b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/key-extend-type-complex.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/key-extend-type-resolvable.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/key-extend-type-resolvable.jsonld index ca5b2879e9..98180452ac 100644 --- a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/key-extend-type-resolvable.jsonld +++ b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/key-extend-type-resolvable.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/key-extend-type.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/key-extend-type.jsonld index 97a2d09951..51ba8b6349 100644 --- a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/key-extend-type.jsonld +++ b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/key-extend-type.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/key-interface.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/key-interface.jsonld index e3c9bf787c..a35a33580f 100644 --- a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/key-interface.jsonld +++ b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/key-interface.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/key-type-complex.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/key-type-complex.jsonld index e7b781d1e0..07ce972e2b 100644 --- a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/key-type-complex.jsonld +++ b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/key-type-complex.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/key-type-multi-resolvable.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/key-type-multi-resolvable.jsonld index 6768900327..21be04510d 100644 --- a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/key-type-multi-resolvable.jsonld +++ b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/key-type-multi-resolvable.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/key-type-resolvable.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/key-type-resolvable.jsonld index d1f81c83d0..3b07a69527 100644 --- a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/key-type-resolvable.jsonld +++ b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/key-type-resolvable.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/key-type.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/key-type.jsonld index 993a7e00d1..93c22f99da 100644 --- a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/key-type.jsonld +++ b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/key-type.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/link.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/link.jsonld index ed75cc1dc6..c17517b77a 100644 --- a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/link.jsonld +++ b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/link.jsonld @@ -178,7 +178,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/override.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/override.jsonld index 1409c6e54c..008c2a7fbb 100644 --- a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/override.jsonld +++ b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/override.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/provides.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/provides.jsonld index d964b6ef94..5fecc8ff8d 100644 --- a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/provides.jsonld +++ b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/provides.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/requires.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/requires.jsonld index 85a395124c..480ded3cb8 100644 --- a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/requires.jsonld +++ b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/requires.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/root-field-directives.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/root-field-directives.jsonld index 3507c96cad..c04aa36441 100644 --- a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/root-field-directives.jsonld +++ b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/root-field-directives.jsonld @@ -905,7 +905,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/root-innacessible-arg.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/root-innacessible-arg.jsonld index 081f013adb..beab5da0d3 100644 --- a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/root-innacessible-arg.jsonld +++ b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/root-innacessible-arg.jsonld @@ -405,7 +405,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/shareable-field.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/shareable-field.jsonld index c1a5efec60..f3e658e6d8 100644 --- a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/shareable-field.jsonld +++ b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/shareable-field.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/shareable-object.jsonld b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/shareable-object.jsonld index f3eb6e60e4..c836dffa0f 100644 --- a/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/shareable-object.jsonld +++ b/amf-cli/shared/src/test/resources/graphql-federation/tck/apis/valid/shareable-object.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/corner-cases/recursion-with-query.jsonld b/amf-cli/shared/src/test/resources/graphql/corner-cases/recursion-with-query.jsonld index d3a119af35..490c5619be 100644 --- a/amf-cli/shared/src/test/resources/graphql/corner-cases/recursion-with-query.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/corner-cases/recursion-with-query.jsonld @@ -144,7 +144,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/corner-cases/recursion-with-unions.jsonld b/amf-cli/shared/src/test/resources/graphql/corner-cases/recursion-with-unions.jsonld index a733d88c41..78e2c742d9 100644 --- a/amf-cli/shared/src/test/resources/graphql/corner-cases/recursion-with-unions.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/corner-cases/recursion-with-unions.jsonld @@ -160,7 +160,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous-!-token.jsonld b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous-!-token.jsonld index e2e14076c1..1b40a75799 100644 --- a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous-!-token.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous-!-token.jsonld @@ -37,7 +37,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git "a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous-\"-token.jsonld" "b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous-\"-token.jsonld" index 2a2cbfe214..997842b7ff 100644 --- "a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous-\"-token.jsonld" +++ "b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous-\"-token.jsonld" @@ -37,7 +37,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous-&-token.jsonld b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous-&-token.jsonld index 0b9217aea0..5357b25a7a 100644 --- a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous-&-token.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous-&-token.jsonld @@ -37,7 +37,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous-*-token.jsonld b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous-*-token.jsonld index 997d31f22f..e4aceae119 100644 --- a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous-*-token.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous-*-token.jsonld @@ -160,7 +160,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous---token.jsonld b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous---token.jsonld index 36715162a1..8894c9d52a 100644 --- a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous---token.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous---token.jsonld @@ -37,7 +37,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous-:-token.jsonld b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous-:-token.jsonld index 7908d3e7fb..c89bd2c4a7 100644 --- a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous-:-token.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous-:-token.jsonld @@ -37,7 +37,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous-;-token.jsonld b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous-;-token.jsonld index 2dd0ef0c98..2983db7394 100644 --- a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous-;-token.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous-;-token.jsonld @@ -160,7 +160,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous-@-token.jsonld b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous-@-token.jsonld index bb6650a310..d16f1dbc24 100644 --- a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous-@-token.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous-@-token.jsonld @@ -37,7 +37,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous-tokens.jsonld b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous-tokens.jsonld index bb40cafaa5..8fe57057f3 100644 --- a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous-tokens.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous-tokens.jsonld @@ -37,7 +37,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous-|-token.jsonld b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous-|-token.jsonld index 92ac111ab7..3865ba200a 100644 --- a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous-|-token.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/extraneous-|-token.jsonld @@ -37,7 +37,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-colon.jsonld b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-colon.jsonld index 7e295d5151..ef1db19579 100644 --- a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-colon.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-colon.jsonld @@ -37,7 +37,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-field-type-0.jsonld b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-field-type-0.jsonld index 77ad1c2518..c91774f452 100644 --- a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-field-type-0.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-field-type-0.jsonld @@ -133,7 +133,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-field-type-1.jsonld b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-field-type-1.jsonld index e2d3afd552..b76597f871 100644 --- a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-field-type-1.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-field-type-1.jsonld @@ -133,7 +133,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-field-type-2.jsonld b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-field-type-2.jsonld index 83e8094169..8bf06bd611 100644 --- a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-field-type-2.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-field-type-2.jsonld @@ -255,7 +255,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-field-type-3.jsonld b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-field-type-3.jsonld index 9ad34d7d66..a2336ab780 100644 --- a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-field-type-3.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-field-type-3.jsonld @@ -160,7 +160,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-field-type-4.jsonld b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-field-type-4.jsonld index 7052df66b5..fd3f838c56 100644 --- a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-field-type-4.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-field-type-4.jsonld @@ -160,7 +160,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-field-type-5.jsonld b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-field-type-5.jsonld index dac53744e1..ad73b1a3b3 100644 --- a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-field-type-5.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-field-type-5.jsonld @@ -160,7 +160,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-field-type-6.jsonld b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-field-type-6.jsonld index b6fb9de7b6..3b829d313f 100644 --- a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-field-type-6.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-field-type-6.jsonld @@ -297,7 +297,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-field-type-7.jsonld b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-field-type-7.jsonld index 11d4fbccdb..fc09c00d4c 100644 --- a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-field-type-7.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-field-type-7.jsonld @@ -323,7 +323,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-field-type-8.jsonld b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-field-type-8.jsonld index 9171b07d6b..7f3d63b783 100644 --- a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-field-type-8.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-field-type-8.jsonld @@ -160,7 +160,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-lbracket-and-lparen.jsonld b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-lbracket-and-lparen.jsonld index 3bcb271b93..60478ee19f 100644 --- a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-lbracket-and-lparen.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-lbracket-and-lparen.jsonld @@ -37,7 +37,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-lbracket.jsonld b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-lbracket.jsonld index f5244637fa..88afd821b0 100644 --- a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-lbracket.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-lbracket.jsonld @@ -37,7 +37,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-rbracket-and-rparen.jsonld b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-rbracket-and-rparen.jsonld index a57ea0e495..0ecb4518c0 100644 --- a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-rbracket-and-rparen.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-rbracket-and-rparen.jsonld @@ -37,7 +37,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-rbracket.jsonld b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-rbracket.jsonld index 4db73b82c5..adeb984568 100644 --- a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-rbracket.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-rbracket.jsonld @@ -37,7 +37,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-rparen.jsonld b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-rparen.jsonld index 8c12dd92c4..501de79d51 100644 --- a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-rparen.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-rparen.jsonld @@ -37,7 +37,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-slbracket.jsonld b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-slbracket.jsonld index 3db17ded64..0d92147976 100644 --- a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-slbracket.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-slbracket.jsonld @@ -37,7 +37,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-srbracket.jsonld b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-srbracket.jsonld index 7bdbb2d183..d1228cca4a 100644 --- a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-srbracket.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-srbracket.jsonld @@ -193,7 +193,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-union-member-remixed.jsonld b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-union-member-remixed.jsonld index 9d30928b28..26182e3f01 100644 --- a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-union-member-remixed.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-union-member-remixed.jsonld @@ -160,7 +160,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-union-member.jsonld b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-union-member.jsonld index 644ca67f45..4c4f1f5e48 100644 --- a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-union-member.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/missing-union-member.jsonld @@ -160,7 +160,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/misspelling-type.jsonld b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/misspelling-type.jsonld index 131036a657..2f771a623d 100644 --- a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/misspelling-type.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/misspelling-type.jsonld @@ -160,7 +160,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/replace-{-with-[.jsonld b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/replace-{-with-[.jsonld index 8547de1653..fe6093c39c 100644 --- a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/replace-{-with-[.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/replace-{-with-[.jsonld @@ -37,7 +37,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/scalar-inside-type.jsonld b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/scalar-inside-type.jsonld index 6a53916b30..24d7bb1fc2 100644 --- a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/scalar-inside-type.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/scalar-inside-type.jsonld @@ -37,7 +37,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/type-inside-type.jsonld b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/type-inside-type.jsonld index 600c094c3b..359d2366fb 100644 --- a/amf-cli/shared/src/test/resources/graphql/syntax-recovery/type-inside-type.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/syntax-recovery/type-inside-type.jsonld @@ -37,7 +37,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/argument-enum-values.api.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/argument-enum-values.api.jsonld index 19cb317d29..c53424ce7d 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/argument-enum-values.api.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/argument-enum-values.api.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/argument-enum-values.api.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/argument-enum-values.api.resolved.jsonld index cdd701292b..6735c391ad 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/argument-enum-values.api.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/argument-enum-values.api.resolved.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/argument-input-object-values.api.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/argument-input-object-values.api.jsonld index 646fc2716f..b453100ef3 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/argument-input-object-values.api.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/argument-input-object-values.api.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/argument-input-object-values.api.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/argument-input-object-values.api.resolved.jsonld index 596c62d440..e1f3f1a93a 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/argument-input-object-values.api.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/argument-input-object-values.api.resolved.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/argument-scalar-values.api.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/argument-scalar-values.api.jsonld index ab3c91cc4b..3b9f366d37 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/argument-scalar-values.api.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/argument-scalar-values.api.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/argument-scalar-values.api.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/argument-scalar-values.api.resolved.jsonld index 6785ab1a78..be4569eafa 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/argument-scalar-values.api.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/argument-scalar-values.api.resolved.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/covariance.api.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/covariance.api.jsonld index 33972a0d0f..a7d0d5fe7c 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/covariance.api.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/covariance.api.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/covariance.api.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/covariance.api.resolved.jsonld index ebcb84103e..8f87495397 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/covariance.api.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/covariance.api.resolved.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/custom-scalar.api.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/custom-scalar.api.jsonld index 6d85873afc..aa66a527ed 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/custom-scalar.api.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/custom-scalar.api.jsonld @@ -165,7 +165,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/custom-scalar.api.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/custom-scalar.api.resolved.jsonld index eb2be95bcb..0d45371118 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/custom-scalar.api.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/custom-scalar.api.resolved.jsonld @@ -165,7 +165,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/deprecated.api.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/deprecated.api.jsonld index e0651510f1..2ea5c9ef56 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/deprecated.api.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/deprecated.api.jsonld @@ -165,7 +165,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/deprecated.api.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/deprecated.api.resolved.jsonld index 9535aa1e1b..cdadc41311 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/deprecated.api.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/deprecated.api.resolved.jsonld @@ -165,7 +165,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/descriptions-enum.api.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/descriptions-enum.api.jsonld index 2dafc6fb99..9c88aab088 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/descriptions-enum.api.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/descriptions-enum.api.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/descriptions-enum.api.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/descriptions-enum.api.resolved.jsonld index a545f46b35..0724fd5864 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/descriptions-enum.api.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/descriptions-enum.api.resolved.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/descriptions.api.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/descriptions.api.jsonld index 4cc2434c0c..eb92e772bc 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/descriptions.api.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/descriptions.api.jsonld @@ -217,7 +217,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/descriptions.api.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/descriptions.api.resolved.jsonld index 4982317243..4e2cc235f9 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/descriptions.api.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/descriptions.api.resolved.jsonld @@ -217,7 +217,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-applications.api.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-applications.api.jsonld index 23784093a1..4a614ee6af 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-applications.api.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-applications.api.jsonld @@ -246,7 +246,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-applications.api.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-applications.api.resolved.jsonld index be91fcf689..4b2130ec25 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-applications.api.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-applications.api.resolved.jsonld @@ -246,7 +246,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-arguments.api.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-arguments.api.jsonld index 14be72dac6..d51c490efb 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-arguments.api.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-arguments.api.jsonld @@ -203,7 +203,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-arguments.api.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-arguments.api.resolved.jsonld index c83a84626d..3d9dbfb79f 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-arguments.api.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-arguments.api.resolved.jsonld @@ -203,7 +203,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-locations.api.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-locations.api.jsonld index a267114bae..f90ec63c35 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-locations.api.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-locations.api.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-locations.api.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-locations.api.resolved.jsonld index 64cbdc25cc..b450541d32 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-locations.api.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-locations.api.resolved.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-multitarget.api.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-multitarget.api.jsonld index e41404f8ea..f1c7704c82 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-multitarget.api.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-multitarget.api.jsonld @@ -178,7 +178,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-multitarget.api.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-multitarget.api.resolved.jsonld index 5d098d50f6..1f9ca87d89 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-multitarget.api.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-multitarget.api.resolved.jsonld @@ -178,7 +178,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-repeatable.flattened.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-repeatable.flattened.jsonld index 8caa7e36b2..e5a07bf70a 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-repeatable.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-repeatable.flattened.jsonld @@ -15,7 +15,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "GraphQL" }, { diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-repeatable.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-repeatable.jsonld index 898d207c97..3756759afa 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-repeatable.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-repeatable.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-repeatable.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-repeatable.resolved.jsonld index 98a82f40ab..dd1f8e89dd 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-repeatable.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-repeatable.resolved.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-simple.api.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-simple.api.jsonld index 5f1ee4f26a..bc959a2e1b 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-simple.api.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-simple.api.jsonld @@ -178,7 +178,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-simple.api.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-simple.api.resolved.jsonld index c17cb0bdc2..4e80133aa4 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-simple.api.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/directive-simple.api.resolved.jsonld @@ -178,7 +178,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-enum.api.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-enum.api.jsonld index 3316830e19..32317ab42c 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-enum.api.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-enum.api.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-enum.api.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-enum.api.resolved.jsonld index 4a5c85511e..bc9b8ddb71 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-enum.api.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-enum.api.resolved.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-input-type.api.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-input-type.api.jsonld index a9f651bbd8..3b71979bcd 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-input-type.api.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-input-type.api.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-input-type.api.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-input-type.api.resolved.jsonld index 72c7dfa412..23d3aa6b9d 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-input-type.api.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-input-type.api.resolved.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-interface.api.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-interface.api.jsonld index 11b971e297..b7e3ec17a4 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-interface.api.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-interface.api.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-interface.api.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-interface.api.resolved.jsonld index 9c3aedf5cd..5f2e67abf5 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-interface.api.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-interface.api.resolved.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-objects.api.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-objects.api.jsonld index ad5231bc0b..8c3182e505 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-objects.api.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-objects.api.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-objects.api.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-objects.api.resolved.jsonld index 1d08a6c06d..69d4488732 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-objects.api.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-objects.api.resolved.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-scalars.api.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-scalars.api.jsonld index 73b60bf656..66bf83ab26 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-scalars.api.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-scalars.api.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-scalars.api.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-scalars.api.resolved.jsonld index f2c3fbcd77..b8fd65a8f3 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-scalars.api.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-scalars.api.resolved.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-union.api.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-union.api.jsonld index b8b79c3938..f4db149fd1 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-union.api.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-union.api.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-union.api.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-union.api.resolved.jsonld index 3a1e9d68af..27802d8d0d 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-union.api.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/extension-union.api.resolved.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/interface-chain-covariant.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/interface-chain-covariant.jsonld index 9564ccd904..13b76db167 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/interface-chain-covariant.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/interface-chain-covariant.jsonld @@ -139,7 +139,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/interface-chain-covariant.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/interface-chain-covariant.resolved.jsonld index a39cc52cce..ad8e76b98a 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/interface-chain-covariant.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/interface-chain-covariant.resolved.jsonld @@ -139,7 +139,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/interface-double.api.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/interface-double.api.jsonld index 9685ab95d9..bbd3e57661 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/interface-double.api.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/interface-double.api.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/interface-double.api.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/interface-double.api.resolved.jsonld index bed7eb383f..576a4cbbe6 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/interface-double.api.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/interface-double.api.resolved.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/interface-simple.api.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/interface-simple.api.jsonld index 80ae7b46cd..410f764e3a 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/interface-simple.api.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/interface-simple.api.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/interface-simple.api.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/interface-simple.api.resolved.jsonld index 711a94e00a..ada9803f37 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/interface-simple.api.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/interface-simple.api.resolved.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/interface-with-interface.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/interface-with-interface.jsonld index a064166160..0ab992dba2 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/interface-with-interface.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/interface-with-interface.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/interface-with-interface.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/interface-with-interface.resolved.jsonld index 4ed1dd8b7f..ce17db7abd 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/interface-with-interface.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/interface-with-interface.resolved.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/is-input-type-directive-arguments.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/is-input-type-directive-arguments.jsonld index 1d2b8a40fc..910b68f3fb 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/is-input-type-directive-arguments.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/is-input-type-directive-arguments.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/is-input-type-directive-arguments.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/is-input-type-directive-arguments.resolved.jsonld index 67382fa129..16403d2fb2 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/is-input-type-directive-arguments.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/is-input-type-directive-arguments.resolved.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/is-input-type-fields.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/is-input-type-fields.jsonld index bf6099be66..7039350698 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/is-input-type-fields.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/is-input-type-fields.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/is-input-type-interface-arguments.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/is-input-type-interface-arguments.jsonld index db9813deb1..ca67576965 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/is-input-type-interface-arguments.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/is-input-type-interface-arguments.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/is-input-type-interface-arguments.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/is-input-type-interface-arguments.resolved.jsonld index facbd2e549..a635509a94 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/is-input-type-interface-arguments.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/is-input-type-interface-arguments.resolved.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/is-input-type-object-arguments.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/is-input-type-object-arguments.jsonld index c558c045da..e6b3c588dc 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/is-input-type-object-arguments.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/is-input-type-object-arguments.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/is-input-type-object-arguments.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/is-input-type-object-arguments.resolved.jsonld index 67e33a6396..27b8414513 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/is-input-type-object-arguments.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/is-input-type-object-arguments.resolved.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/is-output-type-interface-fields.api.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/is-output-type-interface-fields.api.jsonld index 3d017f4d14..e4c6f1accf 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/is-output-type-interface-fields.api.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/is-output-type-interface-fields.api.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/is-output-type-interface-fields.api.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/is-output-type-interface-fields.api.resolved.jsonld index 0959601413..82c0e7782b 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/is-output-type-interface-fields.api.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/is-output-type-interface-fields.api.resolved.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/is-output-type-object-fields.api.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/is-output-type-object-fields.api.jsonld index 541ed58b9a..bf9ae2afed 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/is-output-type-object-fields.api.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/is-output-type-object-fields.api.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/is-output-type-object-fields.api.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/is-output-type-object-fields.api.resolved.jsonld index 527757f26e..2146133a15 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/is-output-type-object-fields.api.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/is-output-type-object-fields.api.resolved.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/nested-interfaces.api.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/nested-interfaces.api.jsonld index 2e8664a4dc..fe30954b4a 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/nested-interfaces.api.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/nested-interfaces.api.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/nested-interfaces.api.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/nested-interfaces.api.resolved.jsonld index 9f974478ae..1656eb991c 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/nested-interfaces.api.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/nested-interfaces.api.resolved.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/no-schema.api.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/no-schema.api.jsonld index db147f4788..0b5f0a6f4f 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/no-schema.api.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/no-schema.api.jsonld @@ -324,7 +324,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/no-schema.api.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/no-schema.api.resolved.jsonld index 7fa25816a2..9514cffe3b 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/no-schema.api.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/no-schema.api.resolved.jsonld @@ -324,7 +324,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/recursion.api.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/recursion.api.jsonld index df43938e20..3e94a6fc0b 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/recursion.api.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/recursion.api.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/root-types-extends.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/root-types-extends.jsonld index c37be2e5f8..16aebf2708 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/root-types-extends.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/root-types-extends.jsonld @@ -404,7 +404,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/root-types-extends.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/root-types-extends.resolved.jsonld index 4477d4abf5..6c050d883d 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/root-types-extends.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/root-types-extends.resolved.jsonld @@ -404,7 +404,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/root-types-in-schema-extends.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/root-types-in-schema-extends.jsonld index 9642ed2e97..604117e6dd 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/root-types-in-schema-extends.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/root-types-in-schema-extends.jsonld @@ -404,7 +404,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/root-types-in-schema-extends.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/root-types-in-schema-extends.resolved.jsonld index a1782c71c5..282c923b64 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/root-types-in-schema-extends.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/root-types-in-schema-extends.resolved.jsonld @@ -404,7 +404,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/root-types-in-schema.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/root-types-in-schema.jsonld index fc3e3f7d2e..18f36b8945 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/root-types-in-schema.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/root-types-in-schema.jsonld @@ -404,7 +404,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/root-types-in-schema.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/root-types-in-schema.resolved.jsonld index 11f33fe7f0..92d9f48bde 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/root-types-in-schema.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/root-types-in-schema.resolved.jsonld @@ -404,7 +404,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/root-types.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/root-types.jsonld index 551f6b8033..717ce2c90a 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/root-types.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/root-types.jsonld @@ -404,7 +404,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/root-types.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/root-types.resolved.jsonld index 02716090a6..38bc17523c 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/root-types.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/root-types.resolved.jsonld @@ -404,7 +404,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/specified-by.api.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/specified-by.api.jsonld index f1843ca7d4..4f0e530e35 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/specified-by.api.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/specified-by.api.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/specified-by.api.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/specified-by.api.resolved.jsonld index a28a2bdc89..b6220f63ba 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/specified-by.api.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/specified-by.api.resolved.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-arguments.api.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-arguments.api.jsonld index 0520409d84..a9b8906a8f 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-arguments.api.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-arguments.api.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-arguments.api.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-arguments.api.resolved.jsonld index 832b2fe88d..b25675d3f8 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-arguments.api.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-arguments.api.resolved.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-enum.api.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-enum.api.jsonld index c1454ff833..6fcb67d3b5 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-enum.api.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-enum.api.jsonld @@ -165,7 +165,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-enum.api.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-enum.api.resolved.jsonld index b355009b4d..e8337101c6 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-enum.api.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-enum.api.resolved.jsonld @@ -165,7 +165,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-input-type.api.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-input-type.api.jsonld index 2efbc8e449..543ccff2c7 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-input-type.api.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-input-type.api.jsonld @@ -334,7 +334,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-input-type.api.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-input-type.api.resolved.jsonld index 94a6062954..3782c00fd5 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-input-type.api.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-input-type.api.resolved.jsonld @@ -334,7 +334,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-list.api.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-list.api.jsonld index 193b03f16a..d60d0d1ef6 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-list.api.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-list.api.jsonld @@ -193,7 +193,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-list.api.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-list.api.resolved.jsonld index c7d7b73eae..4fdceb5e57 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-list.api.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-list.api.resolved.jsonld @@ -193,7 +193,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-matrix.api.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-matrix.api.jsonld index 2535f35228..38502eb339 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-matrix.api.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-matrix.api.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-matrix.api.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-matrix.api.resolved.jsonld index 945a8d8c46..557607593f 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-matrix.api.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-matrix.api.resolved.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-non-null.api.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-non-null.api.jsonld index 690730e9ef..6abc9165e9 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-non-null.api.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-non-null.api.jsonld @@ -386,7 +386,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-non-null.api.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-non-null.api.resolved.jsonld index 1a95510b16..c6083b4d62 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-non-null.api.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-non-null.api.resolved.jsonld @@ -386,7 +386,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-object.api.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-object.api.jsonld index 8fb83f847c..be789623d2 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-object.api.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-object.api.jsonld @@ -165,7 +165,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-object.api.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-object.api.resolved.jsonld index b255da4187..d358a3d584 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-object.api.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-object.api.resolved.jsonld @@ -165,7 +165,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-scalars.api.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-scalars.api.jsonld index fd3c2de4fc..5685754269 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-scalars.api.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-scalars.api.jsonld @@ -653,7 +653,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-scalars.api.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-scalars.api.resolved.jsonld index f7adf164a2..687ee82355 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-scalars.api.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-scalars.api.resolved.jsonld @@ -653,7 +653,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-union.api.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-union.api.jsonld index f5124b9154..cb6bbc3bd2 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-union.api.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-union.api.jsonld @@ -165,7 +165,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-union.api.resolved.jsonld b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-union.api.resolved.jsonld index fa9a4b415b..6c87bd8716 100644 --- a/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-union.api.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/graphql/tck/apis/valid/types-union.api.resolved.jsonld @@ -165,7 +165,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/jsonschema/cycled/api-2019.raml.jsonld b/amf-cli/shared/src/test/resources/jsonschema/cycled/api-2019.raml.jsonld index 4fc9ef587d..ea73570072 100644 --- a/amf-cli/shared/src/test/resources/jsonschema/cycled/api-2019.raml.jsonld +++ b/amf-cli/shared/src/test/resources/jsonschema/cycled/api-2019.raml.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/jsonschema/cycled/api.raml.jsonld b/amf-cli/shared/src/test/resources/jsonschema/cycled/api.raml.jsonld index 9581da9e6c..e3667d476f 100644 --- a/amf-cli/shared/src/test/resources/jsonschema/cycled/api.raml.jsonld +++ b/amf-cli/shared/src/test/resources/jsonschema/cycled/api.raml.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/jsonschema/cycled/oas20-2019.yaml.jsonld b/amf-cli/shared/src/test/resources/jsonschema/cycled/oas20-2019.yaml.jsonld index 39480e29b7..d7a2b2df24 100644 --- a/amf-cli/shared/src/test/resources/jsonschema/cycled/oas20-2019.yaml.jsonld +++ b/amf-cli/shared/src/test/resources/jsonschema/cycled/oas20-2019.yaml.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "OAS 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/jsonschema/cycled/oas20.yaml.jsonld b/amf-cli/shared/src/test/resources/jsonschema/cycled/oas20.yaml.jsonld index 1fe09ea2fd..0da6929b79 100644 --- a/amf-cli/shared/src/test/resources/jsonschema/cycled/oas20.yaml.jsonld +++ b/amf-cli/shared/src/test/resources/jsonschema/cycled/oas20.yaml.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "OAS 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/parser/array-type-expressions/base-type-array.expanded.jsonld b/amf-cli/shared/src/test/resources/parser/array-type-expressions/base-type-array.expanded.jsonld index 5a6f96b849..c80aeac6b9 100644 --- a/amf-cli/shared/src/test/resources/parser/array-type-expressions/base-type-array.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/parser/array-type-expressions/base-type-array.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/parser/array-type-expressions/base-type-array.flattened.jsonld b/amf-cli/shared/src/test/resources/parser/array-type-expressions/base-type-array.flattened.jsonld index 26dca83adb..071e128385 100644 --- a/amf-cli/shared/src/test/resources/parser/array-type-expressions/base-type-array.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/parser/array-type-expressions/base-type-array.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/parser/array-type-expressions/matrix-type-array.expanded.jsonld b/amf-cli/shared/src/test/resources/parser/array-type-expressions/matrix-type-array.expanded.jsonld index fb161447d0..3cc8eacfca 100644 --- a/amf-cli/shared/src/test/resources/parser/array-type-expressions/matrix-type-array.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/parser/array-type-expressions/matrix-type-array.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/parser/array-type-expressions/matrix-type-array.flattened.jsonld b/amf-cli/shared/src/test/resources/parser/array-type-expressions/matrix-type-array.flattened.jsonld index d37ee47343..29c38c1022 100644 --- a/amf-cli/shared/src/test/resources/parser/array-type-expressions/matrix-type-array.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/parser/array-type-expressions/matrix-type-array.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/parser/array-type-expressions/type-expression-with-inheritance.expanded.jsonld b/amf-cli/shared/src/test/resources/parser/array-type-expressions/type-expression-with-inheritance.expanded.jsonld index 205f632a49..47fa77fae2 100644 --- a/amf-cli/shared/src/test/resources/parser/array-type-expressions/type-expression-with-inheritance.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/parser/array-type-expressions/type-expression-with-inheritance.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/parser/array-type-expressions/type-expression-with-inheritance.flattened.jsonld b/amf-cli/shared/src/test/resources/parser/array-type-expressions/type-expression-with-inheritance.flattened.jsonld index 41a0e4117c..eb1e309ad3 100644 --- a/amf-cli/shared/src/test/resources/parser/array-type-expressions/type-expression-with-inheritance.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/parser/array-type-expressions/type-expression-with-inheritance.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/parser/array-type-expressions/union-type-array.expanded.jsonld b/amf-cli/shared/src/test/resources/parser/array-type-expressions/union-type-array.expanded.jsonld index a80fa905bb..848ad08f49 100644 --- a/amf-cli/shared/src/test/resources/parser/array-type-expressions/union-type-array.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/parser/array-type-expressions/union-type-array.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/parser/array-type-expressions/union-type-array.flattened.jsonld b/amf-cli/shared/src/test/resources/parser/array-type-expressions/union-type-array.flattened.jsonld index 108840a19a..5e1fbc3d95 100644 --- a/amf-cli/shared/src/test/resources/parser/array-type-expressions/union-type-array.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/parser/array-type-expressions/union-type-array.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/parser/union-expressions/child-declaration-links.expanded.jsonld b/amf-cli/shared/src/test/resources/parser/union-expressions/child-declaration-links.expanded.jsonld index 6a396f1e84..b05341ec53 100644 --- a/amf-cli/shared/src/test/resources/parser/union-expressions/child-declaration-links.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/parser/union-expressions/child-declaration-links.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/parser/union-expressions/child-declaration-links.flattened.jsonld b/amf-cli/shared/src/test/resources/parser/union-expressions/child-declaration-links.flattened.jsonld index 120b3b55dd..3c8a7107e4 100644 --- a/amf-cli/shared/src/test/resources/parser/union-expressions/child-declaration-links.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/parser/union-expressions/child-declaration-links.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/parser/union-expressions/union-right-declaration.expanded.jsonld b/amf-cli/shared/src/test/resources/parser/union-expressions/union-right-declaration.expanded.jsonld index a3eadbe98c..15ae0f28f8 100644 --- a/amf-cli/shared/src/test/resources/parser/union-expressions/union-right-declaration.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/parser/union-expressions/union-right-declaration.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/parser/union-expressions/union-right-declaration.flattened.jsonld b/amf-cli/shared/src/test/resources/parser/union-expressions/union-right-declaration.flattened.jsonld index 1985582f1b..0dff162840 100644 --- a/amf-cli/shared/src/test/resources/parser/union-expressions/union-right-declaration.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/parser/union-expressions/union-right-declaration.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/parser/union-with-lib/api.expanded.jsonld b/amf-cli/shared/src/test/resources/parser/union-with-lib/api.expanded.jsonld index de5962b909..1d31242c8b 100644 --- a/amf-cli/shared/src/test/resources/parser/union-with-lib/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/parser/union-with-lib/api.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -370,7 +370,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/parser/union-with-lib/api.flattened.jsonld b/amf-cli/shared/src/test/resources/parser/union-with-lib/api.flattened.jsonld index 31a61736c5..f86ad2f8c3 100644 --- a/amf-cli/shared/src/test/resources/parser/union-with-lib/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/parser/union-with-lib/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -187,7 +187,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/poc/inheritance-item.resolved.jsonld b/amf-cli/shared/src/test/resources/poc/inheritance-item.resolved.jsonld index 55039ebe33..0159a966ee 100644 --- a/amf-cli/shared/src/test/resources/poc/inheritance-item.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/poc/inheritance-item.resolved.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/poc/inheritance-nested-object.resolved.jsonld b/amf-cli/shared/src/test/resources/poc/inheritance-nested-object.resolved.jsonld index c960dc8552..83e652c52b 100644 --- a/amf-cli/shared/src/test/resources/poc/inheritance-nested-object.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/poc/inheritance-nested-object.resolved.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/poc/recursion-in-inherited-property.resolved.jsonld b/amf-cli/shared/src/test/resources/poc/recursion-in-inherited-property.resolved.jsonld index 9f6118ff48..ae608cddb8 100644 --- a/amf-cli/shared/src/test/resources/poc/recursion-in-inherited-property.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/poc/recursion-in-inherited-property.resolved.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/poc/recursion-inheritance-cycle.resolved.jsonld b/amf-cli/shared/src/test/resources/poc/recursion-inheritance-cycle.resolved.jsonld index 87a4c56d29..60ffb8728c 100644 --- a/amf-cli/shared/src/test/resources/poc/recursion-inheritance-cycle.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/poc/recursion-inheritance-cycle.resolved.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/poc/recursion-invalid-mandatory-property.resolved.jsonld b/amf-cli/shared/src/test/resources/poc/recursion-invalid-mandatory-property.resolved.jsonld index bcfb6f1c53..da61daedb8 100644 --- a/amf-cli/shared/src/test/resources/poc/recursion-invalid-mandatory-property.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/poc/recursion-invalid-mandatory-property.resolved.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/poc/recursion-invalid-mandatory-type.resolved.jsonld b/amf-cli/shared/src/test/resources/poc/recursion-invalid-mandatory-type.resolved.jsonld index dc37378ee9..88c56c5584 100644 --- a/amf-cli/shared/src/test/resources/poc/recursion-invalid-mandatory-type.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/poc/recursion-invalid-mandatory-type.resolved.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/poc/recursion-invalid-minitems-no-zero.resolved.jsonld b/amf-cli/shared/src/test/resources/poc/recursion-invalid-minitems-no-zero.resolved.jsonld index d15940d59a..9c793bfe2b 100644 --- a/amf-cli/shared/src/test/resources/poc/recursion-invalid-minitems-no-zero.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/poc/recursion-invalid-minitems-no-zero.resolved.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/poc/recursion-invalid-optional-property-complex.resolved.jsonld b/amf-cli/shared/src/test/resources/poc/recursion-invalid-optional-property-complex.resolved.jsonld index f8c0678178..803c3825a8 100644 --- a/amf-cli/shared/src/test/resources/poc/recursion-invalid-optional-property-complex.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/poc/recursion-invalid-optional-property-complex.resolved.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/poc/recursion-invalid-union-nested.resolved.jsonld b/amf-cli/shared/src/test/resources/poc/recursion-invalid-union-nested.resolved.jsonld index c4b41a2739..90309666bf 100644 --- a/amf-cli/shared/src/test/resources/poc/recursion-invalid-union-nested.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/poc/recursion-invalid-union-nested.resolved.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/poc/recursion-invalid-union.resolved.jsonld b/amf-cli/shared/src/test/resources/poc/recursion-invalid-union.resolved.jsonld index 2f8a58ee94..932b65e336 100644 --- a/amf-cli/shared/src/test/resources/poc/recursion-invalid-union.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/poc/recursion-invalid-union.resolved.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/poc/recursion-valid-additionalproperties.resolved.jsonld b/amf-cli/shared/src/test/resources/poc/recursion-valid-additionalproperties.resolved.jsonld index d1a3d5f0e7..17bd9b8b2d 100644 --- a/amf-cli/shared/src/test/resources/poc/recursion-valid-additionalproperties.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/poc/recursion-valid-additionalproperties.resolved.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, diff --git a/amf-cli/shared/src/test/resources/poc/recursion-valid-minitems-zero.resolved.jsonld b/amf-cli/shared/src/test/resources/poc/recursion-valid-minitems-zero.resolved.jsonld index cc7a9c7e25..af592bdbdd 100644 --- a/amf-cli/shared/src/test/resources/poc/recursion-valid-minitems-zero.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/poc/recursion-valid-minitems-zero.resolved.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/poc/recursion-valid-optional-property.resolved.jsonld b/amf-cli/shared/src/test/resources/poc/recursion-valid-optional-property.resolved.jsonld index ff9b094f87..2bd3e87581 100644 --- a/amf-cli/shared/src/test/resources/poc/recursion-valid-optional-property.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/poc/recursion-valid-optional-property.resolved.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/poc/recursion-valid-optional-type.resolved.jsonld b/amf-cli/shared/src/test/resources/poc/recursion-valid-optional-type.resolved.jsonld index 7d784c7e4c..8435b9a1ac 100644 --- a/amf-cli/shared/src/test/resources/poc/recursion-valid-optional-type.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/poc/recursion-valid-optional-type.resolved.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/poc/recursion-valid-union-nested-exit-at-first.resolved.jsonld b/amf-cli/shared/src/test/resources/poc/recursion-valid-union-nested-exit-at-first.resolved.jsonld index 5938eba197..c555e36a32 100644 --- a/amf-cli/shared/src/test/resources/poc/recursion-valid-union-nested-exit-at-first.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/poc/recursion-valid-union-nested-exit-at-first.resolved.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/poc/recursion-valid-union-nested-exit-at-second.resolved.jsonld b/amf-cli/shared/src/test/resources/poc/recursion-valid-union-nested-exit-at-second.resolved.jsonld index b57aa6b781..4a6e68b739 100644 --- a/amf-cli/shared/src/test/resources/poc/recursion-valid-union-nested-exit-at-second.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/poc/recursion-valid-union-nested-exit-at-second.resolved.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/poc/recursion-valid-union.resolved.jsonld b/amf-cli/shared/src/test/resources/poc/recursion-valid-union.resolved.jsonld index 9e4bd24521..d5db0e3fc5 100644 --- a/amf-cli/shared/src/test/resources/poc/recursion-valid-union.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/poc/recursion-valid-union.resolved.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/production/enum-id-with-applied-trait/golden.expanded.jsonld b/amf-cli/shared/src/test/resources/production/enum-id-with-applied-trait/golden.expanded.jsonld index d07cb3c1d8..b22e629f95 100644 --- a/amf-cli/shared/src/test/resources/production/enum-id-with-applied-trait/golden.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/production/enum-id-with-applied-trait/golden.expanded.jsonld @@ -726,7 +726,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/production/enum-id-with-applied-trait/golden.flattened.jsonld b/amf-cli/shared/src/test/resources/production/enum-id-with-applied-trait/golden.flattened.jsonld index 7f08148264..7b449bf05f 100644 --- a/amf-cli/shared/src/test/resources/production/enum-id-with-applied-trait/golden.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/production/enum-id-with-applied-trait/golden.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/production/event-api/api.expanded.jsonld b/amf-cli/shared/src/test/resources/production/event-api/api.expanded.jsonld index 86cb0d7881..6398468506 100644 --- a/amf-cli/shared/src/test/resources/production/event-api/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/production/event-api/api.expanded.jsonld @@ -830,7 +830,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/production/event-api/api.flattened.jsonld b/amf-cli/shared/src/test/resources/production/event-api/api.flattened.jsonld index 6ba9f6c89d..5756907300 100644 --- a/amf-cli/shared/src/test/resources/production/event-api/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/production/event-api/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/production/example-in-union.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/production/example-in-union.raml.expanded.jsonld index 8639214a39..9c726f522a 100644 --- a/amf-cli/shared/src/test/resources/production/example-in-union.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/production/example-in-union.raml.expanded.jsonld @@ -952,7 +952,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/production/example-in-union.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/production/example-in-union.raml.flattened.jsonld index 967472c64e..09acf873b3 100644 --- a/amf-cli/shared/src/test/resources/production/example-in-union.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/production/example-in-union.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/production/googleapis.compredictionv1.2swagger.raml.resolved.expanded.jsonld b/amf-cli/shared/src/test/resources/production/googleapis.compredictionv1.2swagger.raml.resolved.expanded.jsonld index efd19d466b..5f71ae2de9 100644 --- a/amf-cli/shared/src/test/resources/production/googleapis.compredictionv1.2swagger.raml.resolved.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/production/googleapis.compredictionv1.2swagger.raml.resolved.expanded.jsonld @@ -21622,7 +21622,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/production/googleapis.compredictionv1.2swagger.raml.resolved.flattened.jsonld b/amf-cli/shared/src/test/resources/production/googleapis.compredictionv1.2swagger.raml.resolved.flattened.jsonld index d038893c79..243a9cf9c2 100644 --- a/amf-cli/shared/src/test/resources/production/googleapis.compredictionv1.2swagger.raml.resolved.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/production/googleapis.compredictionv1.2swagger.raml.resolved.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/production/inherits-resolution-declares/add-facet.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/production/inherits-resolution-declares/add-facet.raml.expanded.jsonld index a12721a071..d6ede15963 100644 --- a/amf-cli/shared/src/test/resources/production/inherits-resolution-declares/add-facet.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/production/inherits-resolution-declares/add-facet.raml.expanded.jsonld @@ -506,7 +506,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/production/inherits-resolution-declares/add-facet.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/production/inherits-resolution-declares/add-facet.raml.flattened.jsonld index 47a5f6a9af..065b53318e 100644 --- a/amf-cli/shared/src/test/resources/production/inherits-resolution-declares/add-facet.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/production/inherits-resolution-declares/add-facet.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/production/inherits-resolution-declares/test-ramlfragment.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/production/inherits-resolution-declares/test-ramlfragment.raml.expanded.jsonld index 9f7ed57faf..8cb644251a 100644 --- a/amf-cli/shared/src/test/resources/production/inherits-resolution-declares/test-ramlfragment.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/production/inherits-resolution-declares/test-ramlfragment.raml.expanded.jsonld @@ -517,7 +517,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/production/inherits-resolution-declares/test-ramlfragment.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/production/inherits-resolution-declares/test-ramlfragment.raml.flattened.jsonld index 95683815e3..f531e7f83a 100644 --- a/amf-cli/shared/src/test/resources/production/inherits-resolution-declares/test-ramlfragment.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/production/inherits-resolution-declares/test-ramlfragment.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/production/knowledge-graph-reduced/api.jsonld b/amf-cli/shared/src/test/resources/production/knowledge-graph-reduced/api.jsonld index 14244a56da..d8fc687120 100644 --- a/amf-cli/shared/src/test/resources/production/knowledge-graph-reduced/api.jsonld +++ b/amf-cli/shared/src/test/resources/production/knowledge-graph-reduced/api.jsonld @@ -2486,7 +2486,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/production/lib-trait-location/api.resolved.expanded.jsonld b/amf-cli/shared/src/test/resources/production/lib-trait-location/api.resolved.expanded.jsonld index 6ba30a16a2..2f033bd6a3 100644 --- a/amf-cli/shared/src/test/resources/production/lib-trait-location/api.resolved.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/production/lib-trait-location/api.resolved.expanded.jsonld @@ -325,7 +325,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ @@ -502,7 +502,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/production/lib-trait-location/api.resolved.flattened.jsonld b/amf-cli/shared/src/test/resources/production/lib-trait-location/api.resolved.flattened.jsonld index a4f70f5af3..2da965a78a 100644 --- a/amf-cli/shared/src/test/resources/production/lib-trait-location/api.resolved.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/production/lib-trait-location/api.resolved.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, @@ -328,7 +328,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "RAML 1.0" } ], diff --git a/amf-cli/shared/src/test/resources/production/lib-types/lib.expanded.jsonld b/amf-cli/shared/src/test/resources/production/lib-types/lib.expanded.jsonld index 4b1314b8a3..b7da24da85 100644 --- a/amf-cli/shared/src/test/resources/production/lib-types/lib.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/production/lib-types/lib.expanded.jsonld @@ -18,7 +18,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/production/lib-types/lib.flattened.jsonld b/amf-cli/shared/src/test/resources/production/lib-types/lib.flattened.jsonld index a115b161f0..2a869dd0b1 100644 --- a/amf-cli/shared/src/test/resources/production/lib-types/lib.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/production/lib-types/lib.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/production/microsoft_azure_blob_service.raml.resolved.expanded.jsonld b/amf-cli/shared/src/test/resources/production/microsoft_azure_blob_service.raml.resolved.expanded.jsonld index 6371cbe867..a8f0b0aa87 100644 --- a/amf-cli/shared/src/test/resources/production/microsoft_azure_blob_service.raml.resolved.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/production/microsoft_azure_blob_service.raml.resolved.expanded.jsonld @@ -443,7 +443,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/production/microsoft_azure_blob_service.raml.resolved.flattened.jsonld b/amf-cli/shared/src/test/resources/production/microsoft_azure_blob_service.raml.resolved.flattened.jsonld index 732d90f46b..f945a5f1b7 100644 --- a/amf-cli/shared/src/test/resources/production/microsoft_azure_blob_service.raml.resolved.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/production/microsoft_azure_blob_service.raml.resolved.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/production/oas-complex-example/api.resolved.expanded.jsonld b/amf-cli/shared/src/test/resources/production/oas-complex-example/api.resolved.expanded.jsonld index b5796c06ab..6ee6d650ff 100644 --- a/amf-cli/shared/src/test/resources/production/oas-complex-example/api.resolved.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/production/oas-complex-example/api.resolved.expanded.jsonld @@ -3448,7 +3448,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/production/oas-complex-example/api.resolved.flattened.jsonld b/amf-cli/shared/src/test/resources/production/oas-complex-example/api.resolved.flattened.jsonld index cd310b47c0..f8f824ff2c 100644 --- a/amf-cli/shared/src/test/resources/production/oas-complex-example/api.resolved.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/production/oas-complex-example/api.resolved.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, diff --git a/amf-cli/shared/src/test/resources/production/oas-example.json.expanded.jsonld b/amf-cli/shared/src/test/resources/production/oas-example.json.expanded.jsonld index 6712b6d054..22687df700 100644 --- a/amf-cli/shared/src/test/resources/production/oas-example.json.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/production/oas-example.json.expanded.jsonld @@ -4276,7 +4276,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/production/oas-example.json.flattened.jsonld b/amf-cli/shared/src/test/resources/production/oas-example.json.flattened.jsonld index 38282aedec..685c687f3b 100644 --- a/amf-cli/shared/src/test/resources/production/oas-example.json.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/production/oas-example.json.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, diff --git a/amf-cli/shared/src/test/resources/production/oas-multiple-example.json.expanded.jsonld b/amf-cli/shared/src/test/resources/production/oas-multiple-example.json.expanded.jsonld index 780c3c3cbc..a1d63f1f1b 100644 --- a/amf-cli/shared/src/test/resources/production/oas-multiple-example.json.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/production/oas-multiple-example.json.expanded.jsonld @@ -2408,7 +2408,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/production/oas-multiple-example.json.flattened.jsonld b/amf-cli/shared/src/test/resources/production/oas-multiple-example.json.flattened.jsonld index b78ee46e80..fef28f8c98 100644 --- a/amf-cli/shared/src/test/resources/production/oas-multiple-example.json.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/production/oas-multiple-example.json.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, diff --git a/amf-cli/shared/src/test/resources/production/oas-multiple-example.resolved.expanded.jsonld b/amf-cli/shared/src/test/resources/production/oas-multiple-example.resolved.expanded.jsonld index f6a5a5b012..a0d1eadb91 100644 --- a/amf-cli/shared/src/test/resources/production/oas-multiple-example.resolved.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/production/oas-multiple-example.resolved.expanded.jsonld @@ -1108,7 +1108,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/production/oas-multiple-example.resolved.flattened.jsonld b/amf-cli/shared/src/test/resources/production/oas-multiple-example.resolved.flattened.jsonld index 9f0cd25975..7341484294 100644 --- a/amf-cli/shared/src/test/resources/production/oas-multiple-example.resolved.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/production/oas-multiple-example.resolved.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "OAS 2.0" }, diff --git a/amf-cli/shared/src/test/resources/production/oas20/xml-payload.json.expanded.jsonld b/amf-cli/shared/src/test/resources/production/oas20/xml-payload.json.expanded.jsonld index 57cf7dc3a5..45b35b572d 100644 --- a/amf-cli/shared/src/test/resources/production/oas20/xml-payload.json.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/production/oas20/xml-payload.json.expanded.jsonld @@ -488,7 +488,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/production/oas20/xml-payload.json.flattened.jsonld b/amf-cli/shared/src/test/resources/production/oas20/xml-payload.json.flattened.jsonld index 97608e52f4..cec0a74b69 100644 --- a/amf-cli/shared/src/test/resources/production/oas20/xml-payload.json.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/production/oas20/xml-payload.json.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, diff --git a/amf-cli/shared/src/test/resources/production/raml08/definitions-loops-crossfiles/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/production/raml08/definitions-loops-crossfiles/api.raml.expanded.jsonld index 417869b80a..9f084693b3 100644 --- a/amf-cli/shared/src/test/resources/production/raml08/definitions-loops-crossfiles/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/production/raml08/definitions-loops-crossfiles/api.raml.expanded.jsonld @@ -219,7 +219,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/production/raml08/definitions-loops-crossfiles/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/production/raml08/definitions-loops-crossfiles/api.raml.flattened.jsonld index d854426fe0..58e8be8056 100644 --- a/amf-cli/shared/src/test/resources/production/raml08/definitions-loops-crossfiles/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/production/raml08/definitions-loops-crossfiles/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 0.8" }, { diff --git a/amf-cli/shared/src/test/resources/production/raml08/definitions-loops-crossfiles2/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/production/raml08/definitions-loops-crossfiles2/api.raml.expanded.jsonld index 2bd9dce18b..b833129ad4 100644 --- a/amf-cli/shared/src/test/resources/production/raml08/definitions-loops-crossfiles2/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/production/raml08/definitions-loops-crossfiles2/api.raml.expanded.jsonld @@ -493,7 +493,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/production/raml08/definitions-loops-crossfiles2/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/production/raml08/definitions-loops-crossfiles2/api.raml.flattened.jsonld index dde6e8be88..f29fe586e5 100644 --- a/amf-cli/shared/src/test/resources/production/raml08/definitions-loops-crossfiles2/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/production/raml08/definitions-loops-crossfiles2/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 0.8" }, { diff --git a/amf-cli/shared/src/test/resources/production/raml08/definitions-loops/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/production/raml08/definitions-loops/api.raml.expanded.jsonld index 05371f0b2e..4692ccf162 100644 --- a/amf-cli/shared/src/test/resources/production/raml08/definitions-loops/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/production/raml08/definitions-loops/api.raml.expanded.jsonld @@ -219,7 +219,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/production/raml08/definitions-loops/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/production/raml08/definitions-loops/api.raml.flattened.jsonld index ba2c289daf..9b71bbd7fb 100644 --- a/amf-cli/shared/src/test/resources/production/raml08/definitions-loops/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/production/raml08/definitions-loops/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 0.8" }, { diff --git a/amf-cli/shared/src/test/resources/production/raml08/lock-unlock/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/production/raml08/lock-unlock/api.raml.expanded.jsonld index 9042b1c931..b5f9919ea8 100644 --- a/amf-cli/shared/src/test/resources/production/raml08/lock-unlock/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/production/raml08/lock-unlock/api.raml.expanded.jsonld @@ -3495,7 +3495,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/production/raml08/lock-unlock/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/production/raml08/lock-unlock/api.raml.flattened.jsonld index f1f5aa95ff..a0ef9fb4af 100644 --- a/amf-cli/shared/src/test/resources/production/raml08/lock-unlock/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/production/raml08/lock-unlock/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 0.8" }, { diff --git a/amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml.expanded.jsonld index 18563e2c0b..bbf6d40d20 100644 --- a/amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml.expanded.jsonld @@ -8444,7 +8444,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -10057,7 +10057,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -10130,7 +10130,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -10203,7 +10203,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -10276,7 +10276,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml.flattened.jsonld index 483040cc35..5ed79a08b3 100644 --- a/amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -6529,7 +6529,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -6557,7 +6557,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -6585,7 +6585,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -6613,7 +6613,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml.expanded.jsonld index a513d27ca9..e7441b9ce0 100644 --- a/amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml.expanded.jsonld @@ -10432,7 +10432,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -35562,7 +35562,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -37505,7 +37505,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -37986,7 +37986,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -40040,7 +40040,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -40610,7 +40610,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -40676,7 +40676,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -41514,7 +41514,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -43555,7 +43555,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml.flattened.jsonld index 11851aeb79..f76af3d80e 100644 --- a/amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -9171,7 +9171,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -9341,7 +9341,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -9408,7 +9408,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -9443,7 +9443,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -13214,7 +13214,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -13252,7 +13252,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -13290,7 +13290,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/production/raml10/demo-api/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/production/raml10/demo-api/api.raml.expanded.jsonld index 68aa3b299f..dcdfa952ac 100644 --- a/amf-cli/shared/src/test/resources/production/raml10/demo-api/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/production/raml10/demo-api/api.raml.expanded.jsonld @@ -12165,7 +12165,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/production/raml10/demo-api/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/production/raml10/demo-api/api.raml.flattened.jsonld index e67b144b94..e10c4e5519 100644 --- a/amf-cli/shared/src/test/resources/production/raml10/demo-api/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/production/raml10/demo-api/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/production/raml10/jsonchema-apiexternalexample/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/production/raml10/jsonchema-apiexternalexample/api.raml.expanded.jsonld index 59641353c5..1795362296 100644 --- a/amf-cli/shared/src/test/resources/production/raml10/jsonchema-apiexternalexample/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/production/raml10/jsonchema-apiexternalexample/api.raml.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/production/raml10/jsonchema-apiexternalexample/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/production/raml10/jsonchema-apiexternalexample/api.raml.flattened.jsonld index 3904c5f92a..6d1c6fa23a 100644 --- a/amf-cli/shared/src/test/resources/production/raml10/jsonchema-apiexternalexample/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/production/raml10/jsonchema-apiexternalexample/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/production/raml10/jsonschema-apiwithfragmentref/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/production/raml10/jsonschema-apiwithfragmentref/api.raml.expanded.jsonld index 0961cf3f34..175e55bfec 100644 --- a/amf-cli/shared/src/test/resources/production/raml10/jsonschema-apiwithfragmentref/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/production/raml10/jsonschema-apiwithfragmentref/api.raml.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/production/raml10/jsonschema-apiwithfragmentref/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/production/raml10/jsonschema-apiwithfragmentref/api.raml.flattened.jsonld index 513f53aa26..de85c80d7c 100644 --- a/amf-cli/shared/src/test/resources/production/raml10/jsonschema-apiwithfragmentref/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/production/raml10/jsonschema-apiwithfragmentref/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/production/raml10/jsonschema/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/production/raml10/jsonschema/api.raml.expanded.jsonld index ba6e852a44..ce92da5e98 100644 --- a/amf-cli/shared/src/test/resources/production/raml10/jsonschema/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/production/raml10/jsonschema/api.raml.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/production/raml10/jsonschema/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/production/raml10/jsonschema/api.raml.flattened.jsonld index 1c04a6fb03..858a9fc2ad 100644 --- a/amf-cli/shared/src/test/resources/production/raml10/jsonschema/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/production/raml10/jsonschema/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml.expanded.jsonld index d1b3592944..b43d6d1b16 100644 --- a/amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml.expanded.jsonld @@ -3737,7 +3737,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -6256,7 +6256,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -6337,7 +6337,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -6468,7 +6468,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml.flattened.jsonld index c6c618b489..3a4e4f6e45 100644 --- a/amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -3095,7 +3095,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -3141,7 +3141,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -3532,7 +3532,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/production/raml10/xsdexample/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/production/raml10/xsdexample/api.raml.expanded.jsonld index 190c98dc74..fbcc7f20f4 100644 --- a/amf-cli/shared/src/test/resources/production/raml10/xsdexample/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/production/raml10/xsdexample/api.raml.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/production/raml10/xsdexample/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/production/raml10/xsdexample/api.raml.flattened.jsonld index 911df89372..edc6cba65e 100644 --- a/amf-cli/shared/src/test/resources/production/raml10/xsdexample/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/production/raml10/xsdexample/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/production/raml10/xsdschema-withfragmentref/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/production/raml10/xsdschema-withfragmentref/api.raml.expanded.jsonld index ea0cf4d8a6..8ff7ce40d0 100644 --- a/amf-cli/shared/src/test/resources/production/raml10/xsdschema-withfragmentref/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/production/raml10/xsdschema-withfragmentref/api.raml.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/production/raml10/xsdschema-withfragmentref/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/production/raml10/xsdschema-withfragmentref/api.raml.flattened.jsonld index e27f4807cc..b603f03d3c 100644 --- a/amf-cli/shared/src/test/resources/production/raml10/xsdschema-withfragmentref/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/production/raml10/xsdschema-withfragmentref/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/production/raml10/xsdschema/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/production/raml10/xsdschema/api.raml.expanded.jsonld index 4f7b5bc9ef..b19153f1f2 100644 --- a/amf-cli/shared/src/test/resources/production/raml10/xsdschema/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/production/raml10/xsdschema/api.raml.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/production/raml10/xsdschema/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/production/raml10/xsdschema/api.raml.flattened.jsonld index fa466811d4..55c5db8b3d 100644 --- a/amf-cli/shared/src/test/resources/production/raml10/xsdschema/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/production/raml10/xsdschema/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/production/recursive-union.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/production/recursive-union.raml.expanded.jsonld index e23b6ed5bb..437653ae3a 100644 --- a/amf-cli/shared/src/test/resources/production/recursive-union.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/production/recursive-union.raml.expanded.jsonld @@ -269,7 +269,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/production/recursive-union.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/production/recursive-union.raml.flattened.jsonld index 5b3191ce71..daee6b948a 100644 --- a/amf-cli/shared/src/test/resources/production/recursive-union.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/production/recursive-union.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/production/recursive3.editing.expanded.jsonld b/amf-cli/shared/src/test/resources/production/recursive3.editing.expanded.jsonld index 1c54551278..9e8b644d1a 100644 --- a/amf-cli/shared/src/test/resources/production/recursive3.editing.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/production/recursive3.editing.expanded.jsonld @@ -48,7 +48,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/production/recursive3.editing.flattened.jsonld b/amf-cli/shared/src/test/resources/production/recursive3.editing.flattened.jsonld index 2caf48bd6b..9cfd0e8f1d 100644 --- a/amf-cli/shared/src/test/resources/production/recursive3.editing.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/production/recursive3.editing.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/production/recursive4.editing.expanded.jsonld b/amf-cli/shared/src/test/resources/production/recursive4.editing.expanded.jsonld index 72ad544af9..bde7c835ca 100644 --- a/amf-cli/shared/src/test/resources/production/recursive4.editing.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/production/recursive4.editing.expanded.jsonld @@ -48,7 +48,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/production/recursive4.editing.flattened.jsonld b/amf-cli/shared/src/test/resources/production/recursive4.editing.flattened.jsonld index 02c9baa385..c15fe9e5c7 100644 --- a/amf-cli/shared/src/test/resources/production/recursive4.editing.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/production/recursive4.editing.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/production/resolution-dumpjsonld/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/production/resolution-dumpjsonld/api.raml.expanded.jsonld index 25d65d26ee..1363c58146 100644 --- a/amf-cli/shared/src/test/resources/production/resolution-dumpjsonld/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/production/resolution-dumpjsonld/api.raml.expanded.jsonld @@ -556,7 +556,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/production/resolution-dumpjsonld/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/production/resolution-dumpjsonld/api.raml.flattened.jsonld index 207e64ae7a..6ccdbd47de 100644 --- a/amf-cli/shared/src/test/resources/production/resolution-dumpjsonld/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/production/resolution-dumpjsonld/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/production/resolution-dumpjsonld/api.resolved.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/production/resolution-dumpjsonld/api.resolved.raml.expanded.jsonld index f493895b21..562be94421 100644 --- a/amf-cli/shared/src/test/resources/production/resolution-dumpjsonld/api.resolved.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/production/resolution-dumpjsonld/api.resolved.raml.expanded.jsonld @@ -414,7 +414,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/production/resolution-dumpjsonld/api.resolved.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/production/resolution-dumpjsonld/api.resolved.raml.flattened.jsonld index 3029404361..0e0c526129 100644 --- a/amf-cli/shared/src/test/resources/production/resolution-dumpjsonld/api.resolved.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/production/resolution-dumpjsonld/api.resolved.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/production/union-type-with-composing-closed-type/additional-prop-and-defined-after.expanded.jsonld b/amf-cli/shared/src/test/resources/production/union-type-with-composing-closed-type/additional-prop-and-defined-after.expanded.jsonld index a42af921e2..0c79f539f0 100644 --- a/amf-cli/shared/src/test/resources/production/union-type-with-composing-closed-type/additional-prop-and-defined-after.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/production/union-type-with-composing-closed-type/additional-prop-and-defined-after.expanded.jsonld @@ -150,7 +150,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/production/union-type-with-composing-closed-type/additional-prop-and-defined-after.flattened.jsonld b/amf-cli/shared/src/test/resources/production/union-type-with-composing-closed-type/additional-prop-and-defined-after.flattened.jsonld index 8cb813cbae..01cad67999 100644 --- a/amf-cli/shared/src/test/resources/production/union-type-with-composing-closed-type/additional-prop-and-defined-after.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/production/union-type-with-composing-closed-type/additional-prop-and-defined-after.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/production/union-type-with-composing-closed-type/additional-prop-and-defined-before.expanded.jsonld b/amf-cli/shared/src/test/resources/production/union-type-with-composing-closed-type/additional-prop-and-defined-before.expanded.jsonld index e7b662f4e2..ef76a4f2be 100644 --- a/amf-cli/shared/src/test/resources/production/union-type-with-composing-closed-type/additional-prop-and-defined-before.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/production/union-type-with-composing-closed-type/additional-prop-and-defined-before.expanded.jsonld @@ -150,7 +150,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/production/union-type-with-composing-closed-type/additional-prop-and-defined-before.flattened.jsonld b/amf-cli/shared/src/test/resources/production/union-type-with-composing-closed-type/additional-prop-and-defined-before.flattened.jsonld index d33a029b8e..0d52e83f6a 100644 --- a/amf-cli/shared/src/test/resources/production/union-type-with-composing-closed-type/additional-prop-and-defined-before.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/production/union-type-with-composing-closed-type/additional-prop-and-defined-before.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/production/union-type/api.raml.resolved.jsonld b/amf-cli/shared/src/test/resources/production/union-type/api.raml.resolved.jsonld index a796f16c76..fa9eaa5589 100644 --- a/amf-cli/shared/src/test/resources/production/union-type/api.raml.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/production/union-type/api.raml.resolved.jsonld @@ -290,7 +290,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/production/unions-example.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/production/unions-example.raml.expanded.jsonld index 45f7f724a8..b2cb7fc3ec 100644 --- a/amf-cli/shared/src/test/resources/production/unions-example.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/production/unions-example.raml.expanded.jsonld @@ -4852,7 +4852,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/production/unions-example.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/production/unions-example.raml.flattened.jsonld index 9754d45788..0d4415f517 100644 --- a/amf-cli/shared/src/test/resources/production/unions-example.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/production/unions-example.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/rdf/apis/banking.jsonld b/amf-cli/shared/src/test/resources/rdf/apis/banking.jsonld index a3df7d0f6d..626e41602e 100644 --- a/amf-cli/shared/src/test/resources/rdf/apis/banking.jsonld +++ b/amf-cli/shared/src/test/resources/rdf/apis/banking.jsonld @@ -41,7 +41,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/references/data-type-fragment.json.expanded.jsonld b/amf-cli/shared/src/test/resources/references/data-type-fragment.json.expanded.jsonld index f76dd6d60d..45a0d9c1f1 100644 --- a/amf-cli/shared/src/test/resources/references/data-type-fragment.json.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/references/data-type-fragment.json.expanded.jsonld @@ -104,7 +104,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -358,7 +358,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/references/data-type-fragment.json.flattened.jsonld b/amf-cli/shared/src/test/resources/references/data-type-fragment.json.flattened.jsonld index 1e7f61357e..c099af0959 100644 --- a/amf-cli/shared/src/test/resources/references/data-type-fragment.json.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/references/data-type-fragment.json.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { @@ -161,7 +161,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/references/data-type-fragment.reference.resolved.expanded.jsonld b/amf-cli/shared/src/test/resources/references/data-type-fragment.reference.resolved.expanded.jsonld index cbb8c0382e..81953f239e 100644 --- a/amf-cli/shared/src/test/resources/references/data-type-fragment.reference.resolved.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/references/data-type-fragment.reference.resolved.expanded.jsonld @@ -48,7 +48,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ @@ -181,7 +181,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/references/data-type-fragment.reference.resolved.flattened.jsonld b/amf-cli/shared/src/test/resources/references/data-type-fragment.reference.resolved.flattened.jsonld index 4f69166bf7..2cc1cb4dda 100644 --- a/amf-cli/shared/src/test/resources/references/data-type-fragment.reference.resolved.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/references/data-type-fragment.reference.resolved.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, @@ -137,7 +137,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/references/lib/lib.json.expanded.jsonld b/amf-cli/shared/src/test/resources/references/lib/lib.json.expanded.jsonld index 17a7435bd5..f6e05044bd 100644 --- a/amf-cli/shared/src/test/resources/references/lib/lib.json.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/references/lib/lib.json.expanded.jsonld @@ -23,7 +23,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { -"@value": "3.8.2" +"@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/references/lib/lib.json.flattened.jsonld b/amf-cli/shared/src/test/resources/references/lib/lib.json.flattened.jsonld index 9ae87d3216..ca6073d4d2 100644 --- a/amf-cli/shared/src/test/resources/references/lib/lib.json.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/references/lib/lib.json.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], -"http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", +"http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/references/lib/lib.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/references/lib/lib.raml.expanded.jsonld index ed19c7bed7..576fa8a6e9 100644 --- a/amf-cli/shared/src/test/resources/references/lib/lib.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/references/lib/lib.raml.expanded.jsonld @@ -23,7 +23,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { -"@value": "3.8.2" +"@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/references/lib/lib.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/references/lib/lib.raml.flattened.jsonld index f8b042ce4e..2a9572f7a2 100644 --- a/amf-cli/shared/src/test/resources/references/lib/lib.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/references/lib/lib.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], -"http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", +"http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/references/libraries.json.expanded.jsonld b/amf-cli/shared/src/test/resources/references/libraries.json.expanded.jsonld index 9122295104..d345fcaa50 100644 --- a/amf-cli/shared/src/test/resources/references/libraries.json.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/references/libraries.json.expanded.jsonld @@ -104,7 +104,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -550,7 +550,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/references/libraries.json.flattened.jsonld b/amf-cli/shared/src/test/resources/references/libraries.json.flattened.jsonld index 8916a7f720..6b370e3317 100644 --- a/amf-cli/shared/src/test/resources/references/libraries.json.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/references/libraries.json.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { @@ -154,7 +154,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/references/oas/oas-references/oas-2-root.jsonld b/amf-cli/shared/src/test/resources/references/oas/oas-references/oas-2-root.jsonld index 1fcac2c575..5366c72766 100644 --- a/amf-cli/shared/src/test/resources/references/oas/oas-references/oas-2-root.jsonld +++ b/amf-cli/shared/src/test/resources/references/oas/oas-references/oas-2-root.jsonld @@ -104,7 +104,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/references/oas/oas-references/oas-3-root.jsonld b/amf-cli/shared/src/test/resources/references/oas/oas-references/oas-3-root.jsonld index 2580b87c14..3e441ad8d0 100644 --- a/amf-cli/shared/src/test/resources/references/oas/oas-references/oas-3-root.jsonld +++ b/amf-cli/shared/src/test/resources/references/oas/oas-references/oas-3-root.jsonld @@ -104,7 +104,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/render/governance-mode/async/api.expanded.jsonld b/amf-cli/shared/src/test/resources/render/governance-mode/async/api.expanded.jsonld index d0de5fc546..08ddea83da 100644 --- a/amf-cli/shared/src/test/resources/render/governance-mode/async/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/render/governance-mode/async/api.expanded.jsonld @@ -141,7 +141,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/render/governance-mode/async/api.flattened.jsonld b/amf-cli/shared/src/test/resources/render/governance-mode/async/api.flattened.jsonld index d68a3bd6e1..2eb8e897e2 100644 --- a/amf-cli/shared/src/test/resources/render/governance-mode/async/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/render/governance-mode/async/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, diff --git a/amf-cli/shared/src/test/resources/render/governance-mode/oas/api.expanded.jsonld b/amf-cli/shared/src/test/resources/render/governance-mode/oas/api.expanded.jsonld index 295f29c395..e5dca00303 100644 --- a/amf-cli/shared/src/test/resources/render/governance-mode/oas/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/render/governance-mode/oas/api.expanded.jsonld @@ -192,7 +192,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/render/governance-mode/oas/api.flattened.jsonld b/amf-cli/shared/src/test/resources/render/governance-mode/oas/api.flattened.jsonld index 9741bce9f7..2113f84a17 100644 --- a/amf-cli/shared/src/test/resources/render/governance-mode/oas/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/render/governance-mode/oas/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "OAS 3.0" }, diff --git a/amf-cli/shared/src/test/resources/render/governance-mode/raml/api.expanded.jsonld b/amf-cli/shared/src/test/resources/render/governance-mode/raml/api.expanded.jsonld index b5cfd6e14e..be0193aa29 100644 --- a/amf-cli/shared/src/test/resources/render/governance-mode/raml/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/render/governance-mode/raml/api.expanded.jsonld @@ -151,7 +151,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/render/governance-mode/raml/api.flattened.jsonld b/amf-cli/shared/src/test/resources/render/governance-mode/raml/api.flattened.jsonld index 9c28fa0aca..f85bdd7797 100644 --- a/amf-cli/shared/src/test/resources/render/governance-mode/raml/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/render/governance-mode/raml/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/render/recursion.expanded.jsonld b/amf-cli/shared/src/test/resources/render/recursion.expanded.jsonld index b3cbf9cae6..58e64a84a7 100644 --- a/amf-cli/shared/src/test/resources/render/recursion.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/render/recursion.expanded.jsonld @@ -282,7 +282,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/render/recursion.flattened.jsonld b/amf-cli/shared/src/test/resources/render/recursion.flattened.jsonld index 2d69077e98..1d20ced15d 100644 --- a/amf-cli/shared/src/test/resources/render/recursion.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/render/recursion.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/render/types.expanded.jsonld b/amf-cli/shared/src/test/resources/render/types.expanded.jsonld index 138583ec34..08fa4a7193 100644 --- a/amf-cli/shared/src/test/resources/render/types.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/render/types.expanded.jsonld @@ -282,7 +282,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/render/types.flattened.jsonld b/amf-cli/shared/src/test/resources/render/types.flattened.jsonld index e8813fdb8d..7cf7fde6c2 100644 --- a/amf-cli/shared/src/test/resources/render/types.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/render/types.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/render/union.expanded.jsonld b/amf-cli/shared/src/test/resources/render/union.expanded.jsonld index b6ffe603f3..47eb2b6323 100644 --- a/amf-cli/shared/src/test/resources/render/union.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/render/union.expanded.jsonld @@ -282,7 +282,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/render/union.flattened.jsonld b/amf-cli/shared/src/test/resources/render/union.flattened.jsonld index 973135a880..b9e207a852 100644 --- a/amf-cli/shared/src/test/resources/render/union.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/render/union.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/08/included-schema-and-example/api.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/08/included-schema-and-example/api.expanded.jsonld index 34346ceb86..4a572d0bfb 100644 --- a/amf-cli/shared/src/test/resources/resolution/08/included-schema-and-example/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/08/included-schema-and-example/api.expanded.jsonld @@ -405,7 +405,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/08/included-schema-and-example/api.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/08/included-schema-and-example/api.flattened.jsonld index c80315128d..36bea37c89 100644 --- a/amf-cli/shared/src/test/resources/resolution/08/included-schema-and-example/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/08/included-schema-and-example/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 0.8" }, diff --git a/amf-cli/shared/src/test/resources/resolution/async20/async-2.3-components.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/async20/async-2.3-components.expanded.jsonld index 1b0d37bd90..b3829bd5b3 100644 --- a/amf-cli/shared/src/test/resources/resolution/async20/async-2.3-components.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/async20/async-2.3-components.expanded.jsonld @@ -172,7 +172,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/async20/async-2.3-components.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/async20/async-2.3-components.flattened.jsonld index e0c1f6e4e3..6f84ef0a83 100644 --- a/amf-cli/shared/src/test/resources/resolution/async20/async-2.3-components.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/async20/async-2.3-components.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "ASYNC 2.3" }, diff --git a/amf-cli/shared/src/test/resources/resolution/async20/channel-servers-2.4.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/async20/channel-servers-2.4.expanded.jsonld new file mode 100644 index 0000000000..df4e31903d --- /dev/null +++ b/amf-cli/shared/src/test/resources/resolution/async20/channel-servers-2.4.expanded.jsonld @@ -0,0 +1,303 @@ +[ + { + "@id": "", + "@type": [ + "doc:Document", + "doc:Fragment", + "doc:Module", + "doc:Unit" + ], + "doc:encodes": [ + { + "@id": "#2", + "@type": [ + "apiContract:AsyncAPI", + "apiContract:API", + "doc:RootDomainElement", + "doc:DomainElement" + ], + "core:name": [ + { + "@value": "API" + } + ], + "apiContract:server": [ + { + "@id": "#4", + "@type": [ + "apiContract:Server", + "doc:DomainElement" + ], + "core:name": [ + { + "@value": "development" + } + ], + "core:urlTemplate": [ + { + "@value": "development.gigantic-server.com" + } + ], + "core:description": [ + { + "@value": "Development server" + } + ], + "apiContract:protocol": [ + { + "@value": "amqp" + } + ], + "apiContract:protocolVersion": [ + { + "@value": "0.9.1" + } + ], + "smaps": { + "lexical": { + "apiContract:protocolVersion": "[(16,4)-(17,0)]", + "core:description": "[(17,4)-(18,0)]", + "#4": "[(13,2)-(18,0)]", + "core:urlTemplate": "[(14,4)-(15,0)]", + "apiContract:protocol": "[(15,4)-(16,0)]" + } + } + }, + { + "@id": "#5", + "@type": [ + "apiContract:Server", + "doc:DomainElement" + ], + "core:name": [ + { + "@value": "staging" + } + ], + "core:urlTemplate": [ + { + "@value": "staging.gigantic-server.com" + } + ], + "core:description": [ + { + "@value": "Staging server" + } + ], + "apiContract:protocol": [ + { + "@value": "amqp" + } + ], + "apiContract:protocolVersion": [ + { + "@value": "0.9.1" + } + ], + "smaps": { + "lexical": { + "apiContract:protocolVersion": "[(21,4)-(22,0)]", + "core:description": "[(22,4)-(23,0)]", + "#5": "[(18,2)-(23,0)]", + "core:urlTemplate": "[(19,4)-(20,0)]", + "apiContract:protocol": "[(20,4)-(21,0)]" + } + } + }, + { + "@id": "#6", + "@type": [ + "apiContract:Server", + "doc:DomainElement" + ], + "core:name": [ + { + "@value": "production" + } + ], + "core:urlTemplate": [ + { + "@value": "api.gigantic-server.com" + } + ], + "core:description": [ + { + "@value": "Production server" + } + ], + "apiContract:protocol": [ + { + "@value": "amqp" + } + ], + "apiContract:protocolVersion": [ + { + "@value": "0.9.1" + } + ], + "smaps": { + "lexical": { + "apiContract:protocolVersion": "[(26,4)-(27,0)]", + "core:description": "[(27,4)-(28,0)]", + "#6": "[(23,2)-(28,0)]", + "core:urlTemplate": "[(24,4)-(25,0)]", + "apiContract:protocol": "[(25,4)-(26,0)]" + } + } + } + ], + "core:version": [ + { + "@value": "1.0" + } + ], + "apiContract:endpoint": [ + { + "@id": "#3", + "@type": [ + "apiContract:EndPoint", + "doc:DomainElement" + ], + "apiContract:path": [ + { + "@value": "users/signup" + } + ], + "apiContract:server": [ + { + "@id": "#4", + "@type": [ + "apiContract:Server", + "doc:DomainElement" + ], + "core:name": [ + { + "@value": "development" + } + ], + "core:urlTemplate": [ + { + "@value": "development.gigantic-server.com" + } + ], + "core:description": [ + { + "@value": "Development server" + } + ], + "apiContract:protocol": [ + { + "@value": "amqp" + } + ], + "apiContract:protocolVersion": [ + { + "@value": "0.9.1" + } + ], + "smaps": { + "lexical": { + "apiContract:protocolVersion": "[(16,4)-(17,0)]", + "core:description": "[(17,4)-(18,0)]", + "#4": "[(13,2)-(18,0)]", + "core:urlTemplate": "[(14,4)-(15,0)]", + "apiContract:protocol": "[(15,4)-(16,0)]" + } + } + }, + { + "@id": "#5", + "@type": [ + "apiContract:Server", + "doc:DomainElement" + ], + "core:name": [ + { + "@value": "staging" + } + ], + "core:urlTemplate": [ + { + "@value": "staging.gigantic-server.com" + } + ], + "core:description": [ + { + "@value": "Staging server" + } + ], + "apiContract:protocol": [ + { + "@value": "amqp" + } + ], + "apiContract:protocolVersion": [ + { + "@value": "0.9.1" + } + ], + "smaps": { + "lexical": { + "apiContract:protocolVersion": "[(21,4)-(22,0)]", + "core:description": "[(22,4)-(23,0)]", + "#5": "[(18,2)-(23,0)]", + "core:urlTemplate": "[(19,4)-(20,0)]", + "apiContract:protocol": "[(20,4)-(21,0)]" + } + } + } + ], + "smaps": { + "lexical": { + "#3": "[(7,2)-(12,0)]" + } + } + } + ], + "smaps": { + "lexical": { + "apiContract:endpoint": "[(6,0)-(12,0)]", + "apiContract:server": "[(12,0)-(28,0)]", + "#2": "[(1,0)-(28,0)]", + "core:name": "[(3,2)-(4,0)]", + "core:version": "[(4,2)-(6,0)]" + } + } + } + ], + "doc:root": [ + { + "@value": true + } + ], + "doc:processingData": [ + { + "@id": "#1", + "@type": [ + "doc:APIContractProcessingData" + ], + "apiContract:modelVersion": [ + { + "@value": "3.9.0" + } + ], + "doc:transformed": [ + { + "@value": true + } + ], + "doc:sourceSpec": [ + { + "@value": "ASYNC 2.4" + } + ] + } + ], + "@context": { + "@base": "amf://id", + "doc": "http://a.ml/vocabularies/document#", + "apiContract": "http://a.ml/vocabularies/apiContract#", + "core": "http://a.ml/vocabularies/core#" + } + } +] diff --git a/amf-cli/shared/src/test/resources/resolution/async20/channel-servers-2.4.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/async20/channel-servers-2.4.flattened.jsonld new file mode 100644 index 0000000000..7adf74e51c --- /dev/null +++ b/amf-cli/shared/src/test/resources/resolution/async20/channel-servers-2.4.flattened.jsonld @@ -0,0 +1,155 @@ +{ + "@graph": [ + { + "@id": "#1", + "@type": [ + "doc:APIContractProcessingData" + ], + "apiContract:modelVersion": "3.9.0", + "doc:transformed": true, + "doc:sourceSpec": "ASYNC 2.4" + }, + { + "@id": "#2", + "@type": [ + "apiContract:AsyncAPI", + "apiContract:API", + "doc:RootDomainElement", + "doc:DomainElement" + ], + "core:name": "API", + "apiContract:server": [ + { + "@id": "#4" + }, + { + "@id": "#5" + }, + { + "@id": "#6" + } + ], + "core:version": "1.0", + "apiContract:endpoint": [ + { + "@id": "#3" + } + ], + "smaps": { + "lexical": { + "apiContract:endpoint": "[(6,0)-(12,0)]", + "apiContract:server": "[(12,0)-(28,0)]", + "#2": "[(1,0)-(28,0)]", + "core:name": "[(3,2)-(4,0)]", + "core:version": "[(4,2)-(6,0)]" + } + } + }, + { + "@id": "#4", + "@type": [ + "apiContract:Server", + "doc:DomainElement" + ], + "core:name": "development", + "core:urlTemplate": "development.gigantic-server.com", + "core:description": "Development server", + "apiContract:protocol": "amqp", + "apiContract:protocolVersion": "0.9.1", + "smaps": { + "lexical": { + "apiContract:protocolVersion": "[(16,4)-(17,0)]", + "core:description": "[(17,4)-(18,0)]", + "#4": "[(13,2)-(18,0)]", + "core:urlTemplate": "[(14,4)-(15,0)]", + "apiContract:protocol": "[(15,4)-(16,0)]" + } + } + }, + { + "@id": "#5", + "@type": [ + "apiContract:Server", + "doc:DomainElement" + ], + "core:name": "staging", + "core:urlTemplate": "staging.gigantic-server.com", + "core:description": "Staging server", + "apiContract:protocol": "amqp", + "apiContract:protocolVersion": "0.9.1", + "smaps": { + "lexical": { + "apiContract:protocolVersion": "[(21,4)-(22,0)]", + "core:description": "[(22,4)-(23,0)]", + "#5": "[(18,2)-(23,0)]", + "core:urlTemplate": "[(19,4)-(20,0)]", + "apiContract:protocol": "[(20,4)-(21,0)]" + } + } + }, + { + "@id": "#6", + "@type": [ + "apiContract:Server", + "doc:DomainElement" + ], + "core:name": "production", + "core:urlTemplate": "api.gigantic-server.com", + "core:description": "Production server", + "apiContract:protocol": "amqp", + "apiContract:protocolVersion": "0.9.1", + "smaps": { + "lexical": { + "apiContract:protocolVersion": "[(26,4)-(27,0)]", + "core:description": "[(27,4)-(28,0)]", + "#6": "[(23,2)-(28,0)]", + "core:urlTemplate": "[(24,4)-(25,0)]", + "apiContract:protocol": "[(25,4)-(26,0)]" + } + } + }, + { + "@id": "#3", + "@type": [ + "apiContract:EndPoint", + "doc:DomainElement" + ], + "apiContract:path": "users/signup", + "apiContract:server": [ + { + "@id": "#4" + }, + { + "@id": "#5" + } + ], + "smaps": { + "lexical": { + "#3": "[(7,2)-(12,0)]" + } + } + }, + { + "@id": "", + "@type": [ + "doc:Document", + "doc:Fragment", + "doc:Module", + "doc:Unit" + ], + "doc:encodes": { + "@id": "#2" + }, + "doc:root": true, + "doc:processingData": { + "@id": "#1" + } + } + ], + "@context": { + "@base": "amf://id", + "doc": "http://a.ml/vocabularies/document#", + "apiContract": "http://a.ml/vocabularies/apiContract#", + "core": "http://a.ml/vocabularies/core#" + } +} diff --git a/amf-cli/shared/src/test/resources/resolution/async20/channel-servers-2.5.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/async20/channel-servers-2.5.expanded.jsonld new file mode 100644 index 0000000000..1af8c0491c --- /dev/null +++ b/amf-cli/shared/src/test/resources/resolution/async20/channel-servers-2.5.expanded.jsonld @@ -0,0 +1,303 @@ +[ + { + "@id": "", + "@type": [ + "doc:Document", + "doc:Fragment", + "doc:Module", + "doc:Unit" + ], + "doc:encodes": [ + { + "@id": "#2", + "@type": [ + "apiContract:AsyncAPI", + "apiContract:API", + "doc:RootDomainElement", + "doc:DomainElement" + ], + "core:name": [ + { + "@value": "API" + } + ], + "apiContract:server": [ + { + "@id": "#4", + "@type": [ + "apiContract:Server", + "doc:DomainElement" + ], + "core:name": [ + { + "@value": "development" + } + ], + "core:urlTemplate": [ + { + "@value": "development.gigantic-server.com" + } + ], + "core:description": [ + { + "@value": "Development server" + } + ], + "apiContract:protocol": [ + { + "@value": "amqp" + } + ], + "apiContract:protocolVersion": [ + { + "@value": "0.9.1" + } + ], + "smaps": { + "lexical": { + "apiContract:protocolVersion": "[(16,4)-(17,0)]", + "core:description": "[(17,4)-(18,0)]", + "#4": "[(13,2)-(18,0)]", + "core:urlTemplate": "[(14,4)-(15,0)]", + "apiContract:protocol": "[(15,4)-(16,0)]" + } + } + }, + { + "@id": "#5", + "@type": [ + "apiContract:Server", + "doc:DomainElement" + ], + "core:name": [ + { + "@value": "staging" + } + ], + "core:urlTemplate": [ + { + "@value": "staging.gigantic-server.com" + } + ], + "core:description": [ + { + "@value": "Staging server" + } + ], + "apiContract:protocol": [ + { + "@value": "amqp" + } + ], + "apiContract:protocolVersion": [ + { + "@value": "0.9.1" + } + ], + "smaps": { + "lexical": { + "apiContract:protocolVersion": "[(21,4)-(22,0)]", + "core:description": "[(22,4)-(23,0)]", + "#5": "[(18,2)-(23,0)]", + "core:urlTemplate": "[(19,4)-(20,0)]", + "apiContract:protocol": "[(20,4)-(21,0)]" + } + } + }, + { + "@id": "#6", + "@type": [ + "apiContract:Server", + "doc:DomainElement" + ], + "core:name": [ + { + "@value": "production" + } + ], + "core:urlTemplate": [ + { + "@value": "api.gigantic-server.com" + } + ], + "core:description": [ + { + "@value": "Production server" + } + ], + "apiContract:protocol": [ + { + "@value": "amqp" + } + ], + "apiContract:protocolVersion": [ + { + "@value": "0.9.1" + } + ], + "smaps": { + "lexical": { + "apiContract:protocolVersion": "[(26,4)-(27,0)]", + "core:description": "[(27,4)-(28,0)]", + "#6": "[(23,2)-(28,0)]", + "core:urlTemplate": "[(24,4)-(25,0)]", + "apiContract:protocol": "[(25,4)-(26,0)]" + } + } + } + ], + "core:version": [ + { + "@value": "1.0" + } + ], + "apiContract:endpoint": [ + { + "@id": "#3", + "@type": [ + "apiContract:EndPoint", + "doc:DomainElement" + ], + "apiContract:path": [ + { + "@value": "users/signup" + } + ], + "apiContract:server": [ + { + "@id": "#4", + "@type": [ + "apiContract:Server", + "doc:DomainElement" + ], + "core:name": [ + { + "@value": "development" + } + ], + "core:urlTemplate": [ + { + "@value": "development.gigantic-server.com" + } + ], + "core:description": [ + { + "@value": "Development server" + } + ], + "apiContract:protocol": [ + { + "@value": "amqp" + } + ], + "apiContract:protocolVersion": [ + { + "@value": "0.9.1" + } + ], + "smaps": { + "lexical": { + "apiContract:protocolVersion": "[(16,4)-(17,0)]", + "core:description": "[(17,4)-(18,0)]", + "#4": "[(13,2)-(18,0)]", + "core:urlTemplate": "[(14,4)-(15,0)]", + "apiContract:protocol": "[(15,4)-(16,0)]" + } + } + }, + { + "@id": "#5", + "@type": [ + "apiContract:Server", + "doc:DomainElement" + ], + "core:name": [ + { + "@value": "staging" + } + ], + "core:urlTemplate": [ + { + "@value": "staging.gigantic-server.com" + } + ], + "core:description": [ + { + "@value": "Staging server" + } + ], + "apiContract:protocol": [ + { + "@value": "amqp" + } + ], + "apiContract:protocolVersion": [ + { + "@value": "0.9.1" + } + ], + "smaps": { + "lexical": { + "apiContract:protocolVersion": "[(21,4)-(22,0)]", + "core:description": "[(22,4)-(23,0)]", + "#5": "[(18,2)-(23,0)]", + "core:urlTemplate": "[(19,4)-(20,0)]", + "apiContract:protocol": "[(20,4)-(21,0)]" + } + } + } + ], + "smaps": { + "lexical": { + "#3": "[(7,2)-(12,0)]" + } + } + } + ], + "smaps": { + "lexical": { + "apiContract:endpoint": "[(6,0)-(12,0)]", + "apiContract:server": "[(12,0)-(28,0)]", + "#2": "[(1,0)-(28,0)]", + "core:name": "[(3,2)-(4,0)]", + "core:version": "[(4,2)-(6,0)]" + } + } + } + ], + "doc:root": [ + { + "@value": true + } + ], + "doc:processingData": [ + { + "@id": "#1", + "@type": [ + "doc:APIContractProcessingData" + ], + "apiContract:modelVersion": [ + { + "@value": "3.9.0" + } + ], + "doc:transformed": [ + { + "@value": true + } + ], + "doc:sourceSpec": [ + { + "@value": "ASYNC 2.5" + } + ] + } + ], + "@context": { + "@base": "amf://id", + "doc": "http://a.ml/vocabularies/document#", + "apiContract": "http://a.ml/vocabularies/apiContract#", + "core": "http://a.ml/vocabularies/core#" + } + } +] diff --git a/amf-cli/shared/src/test/resources/resolution/async20/channel-servers-2.5.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/async20/channel-servers-2.5.flattened.jsonld new file mode 100644 index 0000000000..9dd5b0d8b5 --- /dev/null +++ b/amf-cli/shared/src/test/resources/resolution/async20/channel-servers-2.5.flattened.jsonld @@ -0,0 +1,155 @@ +{ + "@graph": [ + { + "@id": "#1", + "@type": [ + "doc:APIContractProcessingData" + ], + "apiContract:modelVersion": "3.9.0", + "doc:transformed": true, + "doc:sourceSpec": "ASYNC 2.5" + }, + { + "@id": "#2", + "@type": [ + "apiContract:AsyncAPI", + "apiContract:API", + "doc:RootDomainElement", + "doc:DomainElement" + ], + "core:name": "API", + "apiContract:server": [ + { + "@id": "#4" + }, + { + "@id": "#5" + }, + { + "@id": "#6" + } + ], + "core:version": "1.0", + "apiContract:endpoint": [ + { + "@id": "#3" + } + ], + "smaps": { + "lexical": { + "apiContract:endpoint": "[(6,0)-(12,0)]", + "apiContract:server": "[(12,0)-(28,0)]", + "#2": "[(1,0)-(28,0)]", + "core:name": "[(3,2)-(4,0)]", + "core:version": "[(4,2)-(6,0)]" + } + } + }, + { + "@id": "#4", + "@type": [ + "apiContract:Server", + "doc:DomainElement" + ], + "core:name": "development", + "core:urlTemplate": "development.gigantic-server.com", + "core:description": "Development server", + "apiContract:protocol": "amqp", + "apiContract:protocolVersion": "0.9.1", + "smaps": { + "lexical": { + "apiContract:protocolVersion": "[(16,4)-(17,0)]", + "core:description": "[(17,4)-(18,0)]", + "#4": "[(13,2)-(18,0)]", + "core:urlTemplate": "[(14,4)-(15,0)]", + "apiContract:protocol": "[(15,4)-(16,0)]" + } + } + }, + { + "@id": "#5", + "@type": [ + "apiContract:Server", + "doc:DomainElement" + ], + "core:name": "staging", + "core:urlTemplate": "staging.gigantic-server.com", + "core:description": "Staging server", + "apiContract:protocol": "amqp", + "apiContract:protocolVersion": "0.9.1", + "smaps": { + "lexical": { + "apiContract:protocolVersion": "[(21,4)-(22,0)]", + "core:description": "[(22,4)-(23,0)]", + "#5": "[(18,2)-(23,0)]", + "core:urlTemplate": "[(19,4)-(20,0)]", + "apiContract:protocol": "[(20,4)-(21,0)]" + } + } + }, + { + "@id": "#6", + "@type": [ + "apiContract:Server", + "doc:DomainElement" + ], + "core:name": "production", + "core:urlTemplate": "api.gigantic-server.com", + "core:description": "Production server", + "apiContract:protocol": "amqp", + "apiContract:protocolVersion": "0.9.1", + "smaps": { + "lexical": { + "apiContract:protocolVersion": "[(26,4)-(27,0)]", + "core:description": "[(27,4)-(28,0)]", + "#6": "[(23,2)-(28,0)]", + "core:urlTemplate": "[(24,4)-(25,0)]", + "apiContract:protocol": "[(25,4)-(26,0)]" + } + } + }, + { + "@id": "#3", + "@type": [ + "apiContract:EndPoint", + "doc:DomainElement" + ], + "apiContract:path": "users/signup", + "apiContract:server": [ + { + "@id": "#4" + }, + { + "@id": "#5" + } + ], + "smaps": { + "lexical": { + "#3": "[(7,2)-(12,0)]" + } + } + }, + { + "@id": "", + "@type": [ + "doc:Document", + "doc:Fragment", + "doc:Module", + "doc:Unit" + ], + "doc:encodes": { + "@id": "#2" + }, + "doc:root": true, + "doc:processingData": { + "@id": "#1" + } + } + ], + "@context": { + "@base": "amf://id", + "doc": "http://a.ml/vocabularies/document#", + "apiContract": "http://a.ml/vocabularies/apiContract#", + "core": "http://a.ml/vocabularies/core#" + } +} diff --git a/amf-cli/shared/src/test/resources/resolution/async20/channel-servers-2.6.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/async20/channel-servers-2.6.expanded.jsonld new file mode 100644 index 0000000000..f9e8190e91 --- /dev/null +++ b/amf-cli/shared/src/test/resources/resolution/async20/channel-servers-2.6.expanded.jsonld @@ -0,0 +1,303 @@ +[ + { + "@id": "", + "@type": [ + "doc:Document", + "doc:Fragment", + "doc:Module", + "doc:Unit" + ], + "doc:encodes": [ + { + "@id": "#2", + "@type": [ + "apiContract:AsyncAPI", + "apiContract:API", + "doc:RootDomainElement", + "doc:DomainElement" + ], + "core:name": [ + { + "@value": "API" + } + ], + "apiContract:server": [ + { + "@id": "#4", + "@type": [ + "apiContract:Server", + "doc:DomainElement" + ], + "core:name": [ + { + "@value": "development" + } + ], + "core:urlTemplate": [ + { + "@value": "development.gigantic-server.com" + } + ], + "core:description": [ + { + "@value": "Development server" + } + ], + "apiContract:protocol": [ + { + "@value": "amqp" + } + ], + "apiContract:protocolVersion": [ + { + "@value": "0.9.1" + } + ], + "smaps": { + "lexical": { + "apiContract:protocolVersion": "[(16,4)-(17,0)]", + "core:description": "[(17,4)-(18,0)]", + "#4": "[(13,2)-(18,0)]", + "core:urlTemplate": "[(14,4)-(15,0)]", + "apiContract:protocol": "[(15,4)-(16,0)]" + } + } + }, + { + "@id": "#5", + "@type": [ + "apiContract:Server", + "doc:DomainElement" + ], + "core:name": [ + { + "@value": "staging" + } + ], + "core:urlTemplate": [ + { + "@value": "staging.gigantic-server.com" + } + ], + "core:description": [ + { + "@value": "Staging server" + } + ], + "apiContract:protocol": [ + { + "@value": "amqp" + } + ], + "apiContract:protocolVersion": [ + { + "@value": "0.9.1" + } + ], + "smaps": { + "lexical": { + "apiContract:protocolVersion": "[(21,4)-(22,0)]", + "core:description": "[(22,4)-(23,0)]", + "#5": "[(18,2)-(23,0)]", + "core:urlTemplate": "[(19,4)-(20,0)]", + "apiContract:protocol": "[(20,4)-(21,0)]" + } + } + }, + { + "@id": "#6", + "@type": [ + "apiContract:Server", + "doc:DomainElement" + ], + "core:name": [ + { + "@value": "production" + } + ], + "core:urlTemplate": [ + { + "@value": "api.gigantic-server.com" + } + ], + "core:description": [ + { + "@value": "Production server" + } + ], + "apiContract:protocol": [ + { + "@value": "amqp" + } + ], + "apiContract:protocolVersion": [ + { + "@value": "0.9.1" + } + ], + "smaps": { + "lexical": { + "apiContract:protocolVersion": "[(26,4)-(27,0)]", + "core:description": "[(27,4)-(28,0)]", + "#6": "[(23,2)-(28,0)]", + "core:urlTemplate": "[(24,4)-(25,0)]", + "apiContract:protocol": "[(25,4)-(26,0)]" + } + } + } + ], + "core:version": [ + { + "@value": "1.0" + } + ], + "apiContract:endpoint": [ + { + "@id": "#3", + "@type": [ + "apiContract:EndPoint", + "doc:DomainElement" + ], + "apiContract:path": [ + { + "@value": "users/signup" + } + ], + "apiContract:server": [ + { + "@id": "#4", + "@type": [ + "apiContract:Server", + "doc:DomainElement" + ], + "core:name": [ + { + "@value": "development" + } + ], + "core:urlTemplate": [ + { + "@value": "development.gigantic-server.com" + } + ], + "core:description": [ + { + "@value": "Development server" + } + ], + "apiContract:protocol": [ + { + "@value": "amqp" + } + ], + "apiContract:protocolVersion": [ + { + "@value": "0.9.1" + } + ], + "smaps": { + "lexical": { + "apiContract:protocolVersion": "[(16,4)-(17,0)]", + "core:description": "[(17,4)-(18,0)]", + "#4": "[(13,2)-(18,0)]", + "core:urlTemplate": "[(14,4)-(15,0)]", + "apiContract:protocol": "[(15,4)-(16,0)]" + } + } + }, + { + "@id": "#5", + "@type": [ + "apiContract:Server", + "doc:DomainElement" + ], + "core:name": [ + { + "@value": "staging" + } + ], + "core:urlTemplate": [ + { + "@value": "staging.gigantic-server.com" + } + ], + "core:description": [ + { + "@value": "Staging server" + } + ], + "apiContract:protocol": [ + { + "@value": "amqp" + } + ], + "apiContract:protocolVersion": [ + { + "@value": "0.9.1" + } + ], + "smaps": { + "lexical": { + "apiContract:protocolVersion": "[(21,4)-(22,0)]", + "core:description": "[(22,4)-(23,0)]", + "#5": "[(18,2)-(23,0)]", + "core:urlTemplate": "[(19,4)-(20,0)]", + "apiContract:protocol": "[(20,4)-(21,0)]" + } + } + } + ], + "smaps": { + "lexical": { + "#3": "[(7,2)-(12,0)]" + } + } + } + ], + "smaps": { + "lexical": { + "apiContract:endpoint": "[(6,0)-(12,0)]", + "apiContract:server": "[(12,0)-(28,0)]", + "#2": "[(1,0)-(28,0)]", + "core:name": "[(3,2)-(4,0)]", + "core:version": "[(4,2)-(6,0)]" + } + } + } + ], + "doc:root": [ + { + "@value": true + } + ], + "doc:processingData": [ + { + "@id": "#1", + "@type": [ + "doc:APIContractProcessingData" + ], + "apiContract:modelVersion": [ + { + "@value": "3.9.0" + } + ], + "doc:transformed": [ + { + "@value": true + } + ], + "doc:sourceSpec": [ + { + "@value": "ASYNC 2.6" + } + ] + } + ], + "@context": { + "@base": "amf://id", + "doc": "http://a.ml/vocabularies/document#", + "apiContract": "http://a.ml/vocabularies/apiContract#", + "core": "http://a.ml/vocabularies/core#" + } + } +] diff --git a/amf-cli/shared/src/test/resources/resolution/async20/channel-servers-2.6.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/async20/channel-servers-2.6.flattened.jsonld new file mode 100644 index 0000000000..0d25b8ccab --- /dev/null +++ b/amf-cli/shared/src/test/resources/resolution/async20/channel-servers-2.6.flattened.jsonld @@ -0,0 +1,155 @@ +{ + "@graph": [ + { + "@id": "#1", + "@type": [ + "doc:APIContractProcessingData" + ], + "apiContract:modelVersion": "3.9.0", + "doc:transformed": true, + "doc:sourceSpec": "ASYNC 2.6" + }, + { + "@id": "#2", + "@type": [ + "apiContract:AsyncAPI", + "apiContract:API", + "doc:RootDomainElement", + "doc:DomainElement" + ], + "core:name": "API", + "apiContract:server": [ + { + "@id": "#4" + }, + { + "@id": "#5" + }, + { + "@id": "#6" + } + ], + "core:version": "1.0", + "apiContract:endpoint": [ + { + "@id": "#3" + } + ], + "smaps": { + "lexical": { + "apiContract:endpoint": "[(6,0)-(12,0)]", + "apiContract:server": "[(12,0)-(28,0)]", + "#2": "[(1,0)-(28,0)]", + "core:name": "[(3,2)-(4,0)]", + "core:version": "[(4,2)-(6,0)]" + } + } + }, + { + "@id": "#4", + "@type": [ + "apiContract:Server", + "doc:DomainElement" + ], + "core:name": "development", + "core:urlTemplate": "development.gigantic-server.com", + "core:description": "Development server", + "apiContract:protocol": "amqp", + "apiContract:protocolVersion": "0.9.1", + "smaps": { + "lexical": { + "apiContract:protocolVersion": "[(16,4)-(17,0)]", + "core:description": "[(17,4)-(18,0)]", + "#4": "[(13,2)-(18,0)]", + "core:urlTemplate": "[(14,4)-(15,0)]", + "apiContract:protocol": "[(15,4)-(16,0)]" + } + } + }, + { + "@id": "#5", + "@type": [ + "apiContract:Server", + "doc:DomainElement" + ], + "core:name": "staging", + "core:urlTemplate": "staging.gigantic-server.com", + "core:description": "Staging server", + "apiContract:protocol": "amqp", + "apiContract:protocolVersion": "0.9.1", + "smaps": { + "lexical": { + "apiContract:protocolVersion": "[(21,4)-(22,0)]", + "core:description": "[(22,4)-(23,0)]", + "#5": "[(18,2)-(23,0)]", + "core:urlTemplate": "[(19,4)-(20,0)]", + "apiContract:protocol": "[(20,4)-(21,0)]" + } + } + }, + { + "@id": "#6", + "@type": [ + "apiContract:Server", + "doc:DomainElement" + ], + "core:name": "production", + "core:urlTemplate": "api.gigantic-server.com", + "core:description": "Production server", + "apiContract:protocol": "amqp", + "apiContract:protocolVersion": "0.9.1", + "smaps": { + "lexical": { + "apiContract:protocolVersion": "[(26,4)-(27,0)]", + "core:description": "[(27,4)-(28,0)]", + "#6": "[(23,2)-(28,0)]", + "core:urlTemplate": "[(24,4)-(25,0)]", + "apiContract:protocol": "[(25,4)-(26,0)]" + } + } + }, + { + "@id": "#3", + "@type": [ + "apiContract:EndPoint", + "doc:DomainElement" + ], + "apiContract:path": "users/signup", + "apiContract:server": [ + { + "@id": "#4" + }, + { + "@id": "#5" + } + ], + "smaps": { + "lexical": { + "#3": "[(7,2)-(12,0)]" + } + } + }, + { + "@id": "", + "@type": [ + "doc:Document", + "doc:Fragment", + "doc:Module", + "doc:Unit" + ], + "doc:encodes": { + "@id": "#2" + }, + "doc:root": true, + "doc:processingData": { + "@id": "#1" + } + } + ], + "@context": { + "@base": "amf://id", + "doc": "http://a.ml/vocabularies/document#", + "apiContract": "http://a.ml/vocabularies/apiContract#", + "core": "http://a.ml/vocabularies/core#" + } +} diff --git a/amf-cli/shared/src/test/resources/resolution/async20/channel-servers-23.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/async20/channel-servers-23.expanded.jsonld new file mode 100644 index 0000000000..5fff473037 --- /dev/null +++ b/amf-cli/shared/src/test/resources/resolution/async20/channel-servers-23.expanded.jsonld @@ -0,0 +1,303 @@ +[ + { + "@id": "", + "@type": [ + "doc:Document", + "doc:Fragment", + "doc:Module", + "doc:Unit" + ], + "doc:encodes": [ + { + "@id": "#2", + "@type": [ + "apiContract:AsyncAPI", + "apiContract:API", + "doc:RootDomainElement", + "doc:DomainElement" + ], + "core:name": [ + { + "@value": "API" + } + ], + "apiContract:server": [ + { + "@id": "#4", + "@type": [ + "apiContract:Server", + "doc:DomainElement" + ], + "core:name": [ + { + "@value": "development" + } + ], + "core:urlTemplate": [ + { + "@value": "development.gigantic-server.com" + } + ], + "core:description": [ + { + "@value": "Development server" + } + ], + "apiContract:protocol": [ + { + "@value": "amqp" + } + ], + "apiContract:protocolVersion": [ + { + "@value": "0.9.1" + } + ], + "smaps": { + "lexical": { + "apiContract:protocolVersion": "[(16,4)-(17,0)]", + "core:description": "[(17,4)-(18,0)]", + "#4": "[(13,2)-(18,0)]", + "core:urlTemplate": "[(14,4)-(15,0)]", + "apiContract:protocol": "[(15,4)-(16,0)]" + } + } + }, + { + "@id": "#5", + "@type": [ + "apiContract:Server", + "doc:DomainElement" + ], + "core:name": [ + { + "@value": "staging" + } + ], + "core:urlTemplate": [ + { + "@value": "staging.gigantic-server.com" + } + ], + "core:description": [ + { + "@value": "Staging server" + } + ], + "apiContract:protocol": [ + { + "@value": "amqp" + } + ], + "apiContract:protocolVersion": [ + { + "@value": "0.9.1" + } + ], + "smaps": { + "lexical": { + "apiContract:protocolVersion": "[(21,4)-(22,0)]", + "core:description": "[(22,4)-(23,0)]", + "#5": "[(18,2)-(23,0)]", + "core:urlTemplate": "[(19,4)-(20,0)]", + "apiContract:protocol": "[(20,4)-(21,0)]" + } + } + }, + { + "@id": "#6", + "@type": [ + "apiContract:Server", + "doc:DomainElement" + ], + "core:name": [ + { + "@value": "production" + } + ], + "core:urlTemplate": [ + { + "@value": "api.gigantic-server.com" + } + ], + "core:description": [ + { + "@value": "Production server" + } + ], + "apiContract:protocol": [ + { + "@value": "amqp" + } + ], + "apiContract:protocolVersion": [ + { + "@value": "0.9.1" + } + ], + "smaps": { + "lexical": { + "apiContract:protocolVersion": "[(26,4)-(27,0)]", + "core:description": "[(27,4)-(28,0)]", + "#6": "[(23,2)-(28,0)]", + "core:urlTemplate": "[(24,4)-(25,0)]", + "apiContract:protocol": "[(25,4)-(26,0)]" + } + } + } + ], + "core:version": [ + { + "@value": "1.0" + } + ], + "apiContract:endpoint": [ + { + "@id": "#3", + "@type": [ + "apiContract:EndPoint", + "doc:DomainElement" + ], + "apiContract:path": [ + { + "@value": "users/signup" + } + ], + "apiContract:server": [ + { + "@id": "#4", + "@type": [ + "apiContract:Server", + "doc:DomainElement" + ], + "core:name": [ + { + "@value": "development" + } + ], + "core:urlTemplate": [ + { + "@value": "development.gigantic-server.com" + } + ], + "core:description": [ + { + "@value": "Development server" + } + ], + "apiContract:protocol": [ + { + "@value": "amqp" + } + ], + "apiContract:protocolVersion": [ + { + "@value": "0.9.1" + } + ], + "smaps": { + "lexical": { + "apiContract:protocolVersion": "[(16,4)-(17,0)]", + "core:description": "[(17,4)-(18,0)]", + "#4": "[(13,2)-(18,0)]", + "core:urlTemplate": "[(14,4)-(15,0)]", + "apiContract:protocol": "[(15,4)-(16,0)]" + } + } + }, + { + "@id": "#5", + "@type": [ + "apiContract:Server", + "doc:DomainElement" + ], + "core:name": [ + { + "@value": "staging" + } + ], + "core:urlTemplate": [ + { + "@value": "staging.gigantic-server.com" + } + ], + "core:description": [ + { + "@value": "Staging server" + } + ], + "apiContract:protocol": [ + { + "@value": "amqp" + } + ], + "apiContract:protocolVersion": [ + { + "@value": "0.9.1" + } + ], + "smaps": { + "lexical": { + "apiContract:protocolVersion": "[(21,4)-(22,0)]", + "core:description": "[(22,4)-(23,0)]", + "#5": "[(18,2)-(23,0)]", + "core:urlTemplate": "[(19,4)-(20,0)]", + "apiContract:protocol": "[(20,4)-(21,0)]" + } + } + } + ], + "smaps": { + "lexical": { + "#3": "[(7,2)-(12,0)]" + } + } + } + ], + "smaps": { + "lexical": { + "apiContract:endpoint": "[(6,0)-(12,0)]", + "apiContract:server": "[(12,0)-(28,0)]", + "#2": "[(1,0)-(28,0)]", + "core:name": "[(3,2)-(4,0)]", + "core:version": "[(4,2)-(6,0)]" + } + } + } + ], + "doc:root": [ + { + "@value": true + } + ], + "doc:processingData": [ + { + "@id": "#1", + "@type": [ + "doc:APIContractProcessingData" + ], + "apiContract:modelVersion": [ + { + "@value": "3.9.0" + } + ], + "doc:transformed": [ + { + "@value": true + } + ], + "doc:sourceSpec": [ + { + "@value": "ASYNC 2.3" + } + ] + } + ], + "@context": { + "@base": "amf://id", + "doc": "http://a.ml/vocabularies/document#", + "apiContract": "http://a.ml/vocabularies/apiContract#", + "core": "http://a.ml/vocabularies/core#" + } + } +] diff --git a/amf-cli/shared/src/test/resources/resolution/async20/channel-servers-23.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/async20/channel-servers-23.flattened.jsonld new file mode 100644 index 0000000000..d1b5e5ebf4 --- /dev/null +++ b/amf-cli/shared/src/test/resources/resolution/async20/channel-servers-23.flattened.jsonld @@ -0,0 +1,155 @@ +{ + "@graph": [ + { + "@id": "#1", + "@type": [ + "doc:APIContractProcessingData" + ], + "apiContract:modelVersion": "3.9.0", + "doc:transformed": true, + "doc:sourceSpec": "ASYNC 2.3" + }, + { + "@id": "#2", + "@type": [ + "apiContract:AsyncAPI", + "apiContract:API", + "doc:RootDomainElement", + "doc:DomainElement" + ], + "core:name": "API", + "apiContract:server": [ + { + "@id": "#4" + }, + { + "@id": "#5" + }, + { + "@id": "#6" + } + ], + "core:version": "1.0", + "apiContract:endpoint": [ + { + "@id": "#3" + } + ], + "smaps": { + "lexical": { + "apiContract:endpoint": "[(6,0)-(12,0)]", + "apiContract:server": "[(12,0)-(28,0)]", + "#2": "[(1,0)-(28,0)]", + "core:name": "[(3,2)-(4,0)]", + "core:version": "[(4,2)-(6,0)]" + } + } + }, + { + "@id": "#4", + "@type": [ + "apiContract:Server", + "doc:DomainElement" + ], + "core:name": "development", + "core:urlTemplate": "development.gigantic-server.com", + "core:description": "Development server", + "apiContract:protocol": "amqp", + "apiContract:protocolVersion": "0.9.1", + "smaps": { + "lexical": { + "apiContract:protocolVersion": "[(16,4)-(17,0)]", + "core:description": "[(17,4)-(18,0)]", + "#4": "[(13,2)-(18,0)]", + "core:urlTemplate": "[(14,4)-(15,0)]", + "apiContract:protocol": "[(15,4)-(16,0)]" + } + } + }, + { + "@id": "#5", + "@type": [ + "apiContract:Server", + "doc:DomainElement" + ], + "core:name": "staging", + "core:urlTemplate": "staging.gigantic-server.com", + "core:description": "Staging server", + "apiContract:protocol": "amqp", + "apiContract:protocolVersion": "0.9.1", + "smaps": { + "lexical": { + "apiContract:protocolVersion": "[(21,4)-(22,0)]", + "core:description": "[(22,4)-(23,0)]", + "#5": "[(18,2)-(23,0)]", + "core:urlTemplate": "[(19,4)-(20,0)]", + "apiContract:protocol": "[(20,4)-(21,0)]" + } + } + }, + { + "@id": "#6", + "@type": [ + "apiContract:Server", + "doc:DomainElement" + ], + "core:name": "production", + "core:urlTemplate": "api.gigantic-server.com", + "core:description": "Production server", + "apiContract:protocol": "amqp", + "apiContract:protocolVersion": "0.9.1", + "smaps": { + "lexical": { + "apiContract:protocolVersion": "[(26,4)-(27,0)]", + "core:description": "[(27,4)-(28,0)]", + "#6": "[(23,2)-(28,0)]", + "core:urlTemplate": "[(24,4)-(25,0)]", + "apiContract:protocol": "[(25,4)-(26,0)]" + } + } + }, + { + "@id": "#3", + "@type": [ + "apiContract:EndPoint", + "doc:DomainElement" + ], + "apiContract:path": "users/signup", + "apiContract:server": [ + { + "@id": "#4" + }, + { + "@id": "#5" + } + ], + "smaps": { + "lexical": { + "#3": "[(7,2)-(12,0)]" + } + } + }, + { + "@id": "", + "@type": [ + "doc:Document", + "doc:Fragment", + "doc:Module", + "doc:Unit" + ], + "doc:encodes": { + "@id": "#2" + }, + "doc:root": true, + "doc:processingData": { + "@id": "#1" + } + } + ], + "@context": { + "@base": "amf://id", + "doc": "http://a.ml/vocabularies/document#", + "apiContract": "http://a.ml/vocabularies/apiContract#", + "core": "http://a.ml/vocabularies/core#" + } +} diff --git a/amf-cli/shared/src/test/resources/resolution/async20/channel-servers-empty.yaml b/amf-cli/shared/src/test/resources/resolution/async20/channel-servers-empty.yaml index dea58a2d76..319fb31a9a 100644 --- a/amf-cli/shared/src/test/resources/resolution/async20/channel-servers-empty.yaml +++ b/amf-cli/shared/src/test/resources/resolution/async20/channel-servers-empty.yaml @@ -20,4 +20,4 @@ servers: description: Production server channels: users/signup: - servers: [ ] + servers: [] diff --git a/amf-cli/shared/src/test/resources/resolution/async20/channel-servers-implicit.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/async20/channel-servers-implicit.expanded.jsonld index 8449ed7392..a433bc1183 100644 --- a/amf-cli/shared/src/test/resources/resolution/async20/channel-servers-implicit.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/async20/channel-servers-implicit.expanded.jsonld @@ -434,7 +434,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/async20/channel-servers-implicit.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/async20/channel-servers-implicit.flattened.jsonld index e123aa84c7..e5bd0e00ed 100644 --- a/amf-cli/shared/src/test/resources/resolution/async20/channel-servers-implicit.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/async20/channel-servers-implicit.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "ASYNC 2.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/async20/channel-servers.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/async20/channel-servers.expanded.jsonld index 6995b932ce..7f8ba7ce43 100644 --- a/amf-cli/shared/src/test/resources/resolution/async20/channel-servers.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/async20/channel-servers.expanded.jsonld @@ -278,7 +278,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/async20/channel-servers.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/async20/channel-servers.flattened.jsonld index ab0fa90ddb..51a02afdaa 100644 --- a/amf-cli/shared/src/test/resources/resolution/async20/channel-servers.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/async20/channel-servers.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "ASYNC 2.2" }, diff --git a/amf-cli/shared/src/test/resources/resolution/async20/content-type-override.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/async20/content-type-override.expanded.jsonld index 4e1d373a3b..29fb14c0cd 100644 --- a/amf-cli/shared/src/test/resources/resolution/async20/content-type-override.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/async20/content-type-override.expanded.jsonld @@ -741,7 +741,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/async20/content-type-override.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/async20/content-type-override.flattened.jsonld index e19209c075..0d42b42dbd 100644 --- a/amf-cli/shared/src/test/resources/resolution/async20/content-type-override.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/async20/content-type-override.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "ASYNC 2.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/async20/message-example-propagation.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/async20/message-example-propagation.expanded.jsonld index 4aeb87f1a0..0210dcd503 100644 --- a/amf-cli/shared/src/test/resources/resolution/async20/message-example-propagation.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/async20/message-example-propagation.expanded.jsonld @@ -882,7 +882,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/async20/message-example-propagation.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/async20/message-example-propagation.flattened.jsonld index 68a9a0dfaa..abb253ee74 100644 --- a/amf-cli/shared/src/test/resources/resolution/async20/message-example-propagation.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/async20/message-example-propagation.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "ASYNC 2.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/async20/message-references.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/async20/message-references.expanded.jsonld index 6bbcd6079f..64064fc4d5 100644 --- a/amf-cli/shared/src/test/resources/resolution/async20/message-references.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/async20/message-references.expanded.jsonld @@ -537,7 +537,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/async20/message-references.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/async20/message-references.flattened.jsonld index ba7ba76425..00b8e7d661 100644 --- a/amf-cli/shared/src/test/resources/resolution/async20/message-references.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/async20/message-references.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "ASYNC 2.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/async20/message-trait-merging-and-removed.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/async20/message-trait-merging-and-removed.expanded.jsonld index 6f7758d335..2a6d920745 100644 --- a/amf-cli/shared/src/test/resources/resolution/async20/message-trait-merging-and-removed.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/async20/message-trait-merging-and-removed.expanded.jsonld @@ -149,7 +149,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/async20/message-trait-merging-and-removed.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/async20/message-trait-merging-and-removed.flattened.jsonld index eabbc1e7a9..dd8c53c7dd 100644 --- a/amf-cli/shared/src/test/resources/resolution/async20/message-trait-merging-and-removed.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/async20/message-trait-merging-and-removed.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "ASYNC 2.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/async20/message-trait-merging.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/async20/message-trait-merging.expanded.jsonld index 37d3d28832..8b13979d50 100644 --- a/amf-cli/shared/src/test/resources/resolution/async20/message-trait-merging.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/async20/message-trait-merging.expanded.jsonld @@ -246,7 +246,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/async20/message-trait-merging.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/async20/message-trait-merging.flattened.jsonld index 0722bbefb1..3dcc043f03 100644 --- a/amf-cli/shared/src/test/resources/resolution/async20/message-trait-merging.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/async20/message-trait-merging.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "ASYNC 2.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/async20/named-parameter-with-ref.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/async20/named-parameter-with-ref.expanded.jsonld index 4881d74223..a57499ea88 100644 --- a/amf-cli/shared/src/test/resources/resolution/async20/named-parameter-with-ref.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/async20/named-parameter-with-ref.expanded.jsonld @@ -146,7 +146,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/async20/named-parameter-with-ref.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/async20/named-parameter-with-ref.flattened.jsonld index 9b1597fc8f..2e58d74df5 100644 --- a/amf-cli/shared/src/test/resources/resolution/async20/named-parameter-with-ref.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/async20/named-parameter-with-ref.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "ASYNC 2.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/async20/operation-security-explicit.yaml b/amf-cli/shared/src/test/resources/resolution/async20/operation-security-explicit.yaml new file mode 100644 index 0000000000..8c34cd5299 --- /dev/null +++ b/amf-cli/shared/src/test/resources/resolution/async20/operation-security-explicit.yaml @@ -0,0 +1,32 @@ +asyncapi: 2.4.0 +info: + title: API + version: "1.0" +components: + securitySchemes: + oauth2: + type: oauth2 + description: oauth2 security scheme + flows: + implicit: + authorizationUrl: https://a.ml/ + refreshUrl: https://a.ml/ + scopes: + write:pets: modify pets in your account + read:pets: read your pets +servers: + production: + url: mykafkacluster.org:8092 + protocol: kafka-secure + security: + - + oauth2: + - write:pets + - read:pets +channels: + some/events: + subscribe: + security: + - + oauth2: + - read:pets diff --git a/amf-cli/shared/src/test/resources/resolution/async20/operation-security-implicit.yaml b/amf-cli/shared/src/test/resources/resolution/async20/operation-security-implicit.yaml new file mode 100644 index 0000000000..eccffb11a1 --- /dev/null +++ b/amf-cli/shared/src/test/resources/resolution/async20/operation-security-implicit.yaml @@ -0,0 +1,28 @@ +asyncapi: 2.4.0 +info: + title: API + version: "1.0" +components: + securitySchemes: + oauth2: + type: oauth2 + description: oauth2 security scheme + flows: + implicit: + authorizationUrl: https://a.ml/ + refreshUrl: https://a.ml/ + scopes: + write:pets: modify pets in your account + read:pets: read your pets +servers: + production: + url: mykafkacluster.org:8092 + protocol: kafka-secure + security: + - + oauth2: + - write:pets + - read:pets +channels: + some/events: + subscribe: {} diff --git a/amf-cli/shared/src/test/resources/resolution/async20/operation-trait-merging-and-removed.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/async20/operation-trait-merging-and-removed.expanded.jsonld index 3fa7df791b..d80675041e 100644 --- a/amf-cli/shared/src/test/resources/resolution/async20/operation-trait-merging-and-removed.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/async20/operation-trait-merging-and-removed.expanded.jsonld @@ -109,7 +109,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/async20/operation-trait-merging-and-removed.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/async20/operation-trait-merging-and-removed.flattened.jsonld index 6f5274b807..14e8e874ed 100644 --- a/amf-cli/shared/src/test/resources/resolution/async20/operation-trait-merging-and-removed.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/async20/operation-trait-merging-and-removed.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "ASYNC 2.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/async20/operation-trait-merging.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/async20/operation-trait-merging.expanded.jsonld index e7ed2c23f8..21ce0d979d 100644 --- a/amf-cli/shared/src/test/resources/resolution/async20/operation-trait-merging.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/async20/operation-trait-merging.expanded.jsonld @@ -212,7 +212,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/async20/operation-trait-merging.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/async20/operation-trait-merging.flattened.jsonld index 229cdcec25..d35582f0ac 100644 --- a/amf-cli/shared/src/test/resources/resolution/async20/operation-trait-merging.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/async20/operation-trait-merging.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "ASYNC 2.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/async20/type-forward-referencing.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/async20/type-forward-referencing.expanded.jsonld index 000360dfa3..2370d50850 100644 --- a/amf-cli/shared/src/test/resources/resolution/async20/type-forward-referencing.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/async20/type-forward-referencing.expanded.jsonld @@ -50,7 +50,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/async20/type-forward-referencing.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/async20/type-forward-referencing.flattened.jsonld index 393b0e8079..eae43446de 100644 --- a/amf-cli/shared/src/test/resources/resolution/async20/type-forward-referencing.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/async20/type-forward-referencing.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "ASYNC 2.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/binary-fragment/api.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/binary-fragment/api.expanded.jsonld index 5cc2fd49e0..39c8011f9a 100644 --- a/amf-cli/shared/src/test/resources/resolution/binary-fragment/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/binary-fragment/api.expanded.jsonld @@ -388,7 +388,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/binary-fragment/api.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/binary-fragment/api.flattened.jsonld index 9bba143bd1..aebfcc8b27 100644 --- a/amf-cli/shared/src/test/resources/resolution/binary-fragment/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/binary-fragment/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/declared-from-library/api.resolved.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/declared-from-library/api.resolved.expanded.jsonld index 515e189620..2f9e8a3488 100644 --- a/amf-cli/shared/src/test/resources/resolution/declared-from-library/api.resolved.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/declared-from-library/api.resolved.expanded.jsonld @@ -42,7 +42,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ @@ -180,7 +180,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/resolution/declared-from-library/api.resolved.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/declared-from-library/api.resolved.flattened.jsonld index 74f0de4acf..ed2b24a9c3 100644 --- a/amf-cli/shared/src/test/resources/resolution/declared-from-library/api.resolved.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/declared-from-library/api.resolved.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, @@ -148,7 +148,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/resolution/double-declare-type/api.resolved.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/double-declare-type/api.resolved.expanded.jsonld index e726e300ae..4730de5574 100644 --- a/amf-cli/shared/src/test/resources/resolution/double-declare-type/api.resolved.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/double-declare-type/api.resolved.expanded.jsonld @@ -42,7 +42,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ @@ -172,7 +172,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/resolution/double-declare-type/api.resolved.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/double-declare-type/api.resolved.flattened.jsonld index 4a0aa28872..9bd4001971 100644 --- a/amf-cli/shared/src/test/resources/resolution/double-declare-type/api.resolved.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/double-declare-type/api.resolved.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, @@ -172,7 +172,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/resolution/double-union-inheritance/api.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/double-union-inheritance/api.expanded.jsonld index f50873b4ea..ff061ccb84 100644 --- a/amf-cli/shared/src/test/resources/resolution/double-union-inheritance/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/double-union-inheritance/api.expanded.jsonld @@ -48,7 +48,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/double-union-inheritance/api.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/double-union-inheritance/api.flattened.jsonld index e4133fdee1..1950a547d8 100644 --- a/amf-cli/shared/src/test/resources/resolution/double-union-inheritance/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/double-union-inheritance/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/encoded-uris-in-properties/api.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/encoded-uris-in-properties/api.expanded.jsonld index e17c66a0b2..63f1cd68f5 100644 --- a/amf-cli/shared/src/test/resources/resolution/encoded-uris-in-properties/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/encoded-uris-in-properties/api.expanded.jsonld @@ -42,7 +42,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/encoded-uris-in-properties/api.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/encoded-uris-in-properties/api.flattened.jsonld index e17c66a0b2..63f1cd68f5 100644 --- a/amf-cli/shared/src/test/resources/resolution/encoded-uris-in-properties/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/encoded-uris-in-properties/api.flattened.jsonld @@ -42,7 +42,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/example-in-resource-type/examples-defined-in-rt.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/example-in-resource-type/examples-defined-in-rt.expanded.jsonld index 7b12b1fa5a..2b12fe8892 100644 --- a/amf-cli/shared/src/test/resources/resolution/example-in-resource-type/examples-defined-in-rt.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/example-in-resource-type/examples-defined-in-rt.expanded.jsonld @@ -471,7 +471,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/example-in-resource-type/examples-defined-in-rt.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/example-in-resource-type/examples-defined-in-rt.flattened.jsonld index 79cda256fa..61b445b9e5 100644 --- a/amf-cli/shared/src/test/resources/resolution/example-in-resource-type/examples-defined-in-rt.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/example-in-resource-type/examples-defined-in-rt.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/example-in-trait/example-in-trait.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/example-in-trait/example-in-trait.expanded.jsonld index b648f63ab5..1d38676c47 100644 --- a/amf-cli/shared/src/test/resources/resolution/example-in-trait/example-in-trait.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/example-in-trait/example-in-trait.expanded.jsonld @@ -716,7 +716,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/example-in-trait/example-in-trait.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/example-in-trait/example-in-trait.flattened.jsonld index daab6ea3e8..d798eb3997 100644 --- a/amf-cli/shared/src/test/resources/resolution/example-in-trait/example-in-trait.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/example-in-trait/example-in-trait.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/examples-shortener.resolved.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/examples-shortener.resolved.expanded.jsonld index cb82a8ddec..3106af0b42 100644 --- a/amf-cli/shared/src/test/resources/resolution/examples-shortener.resolved.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/examples-shortener.resolved.expanded.jsonld @@ -42,7 +42,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/examples-shortener.resolved.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/examples-shortener.resolved.flattened.jsonld index 12357aba75..5e1bfa3a4a 100644 --- a/amf-cli/shared/src/test/resources/resolution/examples-shortener.resolved.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/examples-shortener.resolved.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/examples/response-declarations-with-multiple-media-types.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/examples/response-declarations-with-multiple-media-types.expanded.jsonld index 78a304b84d..32536d6f1c 100644 --- a/amf-cli/shared/src/test/resources/resolution/examples/response-declarations-with-multiple-media-types.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/examples/response-declarations-with-multiple-media-types.expanded.jsonld @@ -579,7 +579,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/examples/response-declarations-with-multiple-media-types.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/examples/response-declarations-with-multiple-media-types.flattened.jsonld index 8aa7f34b7e..b4f38db334 100644 --- a/amf-cli/shared/src/test/resources/resolution/examples/response-declarations-with-multiple-media-types.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/examples/response-declarations-with-multiple-media-types.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/examples/response-examples.json.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/examples/response-examples.json.expanded.jsonld index 7ab2347e2d..d9fbf2ae23 100644 --- a/amf-cli/shared/src/test/resources/resolution/examples/response-examples.json.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/examples/response-examples.json.expanded.jsonld @@ -5285,7 +5285,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/examples/response-examples.json.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/examples/response-examples.json.flattened.jsonld index b16aad1b31..6270168bf8 100644 --- a/amf-cli/shared/src/test/resources/resolution/examples/response-examples.json.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/examples/response-examples.json.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/examples/response-examples.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/examples/response-examples.raml.expanded.jsonld index 2a2b94e36a..821edd8a08 100644 --- a/amf-cli/shared/src/test/resources/resolution/examples/response-examples.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/examples/response-examples.raml.expanded.jsonld @@ -888,7 +888,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/examples/response-examples.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/examples/response-examples.raml.flattened.jsonld index 4f8ba0edc5..0f89672e04 100644 --- a/amf-cli/shared/src/test/resources/resolution/examples/response-examples.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/examples/response-examples.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/extends/08/trait-with-quoted-value.resolved.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/extends/08/trait-with-quoted-value.resolved.expanded.jsonld index 0c768a2c59..f83f5aa9a7 100644 --- a/amf-cli/shared/src/test/resources/resolution/extends/08/trait-with-quoted-value.resolved.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/extends/08/trait-with-quoted-value.resolved.expanded.jsonld @@ -574,7 +574,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/extends/08/trait-with-quoted-value.resolved.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/extends/08/trait-with-quoted-value.resolved.flattened.jsonld index 8a771b148b..29e9f83503 100644 --- a/amf-cli/shared/src/test/resources/resolution/extends/08/trait-with-quoted-value.resolved.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/extends/08/trait-with-quoted-value.resolved.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 0.8" }, diff --git a/amf-cli/shared/src/test/resources/resolution/extends/api-with-complex-rt-trait-file-structure/api.jsonld b/amf-cli/shared/src/test/resources/resolution/extends/api-with-complex-rt-trait-file-structure/api.jsonld index d5a31b4750..3a53c7b350 100644 --- a/amf-cli/shared/src/test/resources/resolution/extends/api-with-complex-rt-trait-file-structure/api.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/extends/api-with-complex-rt-trait-file-structure/api.jsonld @@ -534,7 +534,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ @@ -1192,7 +1192,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -1303,7 +1303,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -1333,7 +1333,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -1358,7 +1358,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -1388,7 +1388,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -1689,7 +1689,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -1800,7 +1800,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -1830,7 +1830,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/resolution/extends/complex-traits-resource-types.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/extends/complex-traits-resource-types.raml.expanded.jsonld index 00969d0fee..503359503e 100644 --- a/amf-cli/shared/src/test/resources/resolution/extends/complex-traits-resource-types.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/extends/complex-traits-resource-types.raml.expanded.jsonld @@ -4111,7 +4111,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/extends/complex-traits-resource-types.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/extends/complex-traits-resource-types.raml.flattened.jsonld index 476780136a..39d541be1d 100644 --- a/amf-cli/shared/src/test/resources/resolution/extends/complex-traits-resource-types.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/extends/complex-traits-resource-types.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/extends/data.editing.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/extends/data.editing.expanded.jsonld index bb2ae6182a..bdcc678b22 100644 --- a/amf-cli/shared/src/test/resources/resolution/extends/data.editing.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/extends/data.editing.expanded.jsonld @@ -612,7 +612,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/extends/data.editing.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/extends/data.editing.flattened.jsonld index 65fd860802..f9afbfa988 100644 --- a/amf-cli/shared/src/test/resources/resolution/extends/data.editing.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/extends/data.editing.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/extends/extends-with-references-to-declares/merging/api.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/extends/extends-with-references-to-declares/merging/api.expanded.jsonld index c562424ae1..2fb69e68b0 100644 --- a/amf-cli/shared/src/test/resources/resolution/extends/extends-with-references-to-declares/merging/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/extends/extends-with-references-to-declares/merging/api.expanded.jsonld @@ -218,7 +218,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/extends/extends-with-references-to-declares/merging/api.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/extends/extends-with-references-to-declares/merging/api.flattened.jsonld index 7b86f0bc06..92eeb9e047 100644 --- a/amf-cli/shared/src/test/resources/resolution/extends/extends-with-references-to-declares/merging/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/extends/extends-with-references-to-declares/merging/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/extends/extends-with-references-to-declares/resource-type/api.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/extends/extends-with-references-to-declares/resource-type/api.expanded.jsonld index df5a7dade5..f954842439 100644 --- a/amf-cli/shared/src/test/resources/resolution/extends/extends-with-references-to-declares/resource-type/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/extends/extends-with-references-to-declares/resource-type/api.expanded.jsonld @@ -308,7 +308,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/extends/extends-with-references-to-declares/resource-type/api.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/extends/extends-with-references-to-declares/resource-type/api.flattened.jsonld index eeb129dd4f..5d3973d1c6 100644 --- a/amf-cli/shared/src/test/resources/resolution/extends/extends-with-references-to-declares/resource-type/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/extends/extends-with-references-to-declares/resource-type/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/extends/extends-with-references-to-declares/trait/api.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/extends/extends-with-references-to-declares/trait/api.expanded.jsonld index 944ca48e82..7e4dfb091b 100644 --- a/amf-cli/shared/src/test/resources/resolution/extends/extends-with-references-to-declares/trait/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/extends/extends-with-references-to-declares/trait/api.expanded.jsonld @@ -280,7 +280,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/extends/extends-with-references-to-declares/trait/api.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/extends/extends-with-references-to-declares/trait/api.flattened.jsonld index 2446cc4b32..5729686e92 100644 --- a/amf-cli/shared/src/test/resources/resolution/extends/extends-with-references-to-declares/trait/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/extends/extends-with-references-to-declares/trait/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/extends/optional-method.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/extends/optional-method.raml.expanded.jsonld index b751e1e705..c7c64660e0 100644 --- a/amf-cli/shared/src/test/resources/resolution/extends/optional-method.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/extends/optional-method.raml.expanded.jsonld @@ -490,7 +490,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/extends/optional-method.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/extends/optional-method.raml.flattened.jsonld index 29b290bec7..db1beae6dd 100644 --- a/amf-cli/shared/src/test/resources/resolution/extends/optional-method.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/extends/optional-method.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/extends/parameters.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/extends/parameters.raml.expanded.jsonld index d5ce88b1c3..bd21b75093 100644 --- a/amf-cli/shared/src/test/resources/resolution/extends/parameters.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/extends/parameters.raml.expanded.jsonld @@ -929,7 +929,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/extends/parameters.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/extends/parameters.raml.flattened.jsonld index d7c99aabdf..e6c42ed864 100644 --- a/amf-cli/shared/src/test/resources/resolution/extends/parameters.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/extends/parameters.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/extends/simple-merge.editing.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/extends/simple-merge.editing.expanded.jsonld index e36f932aed..71b9b18ced 100644 --- a/amf-cli/shared/src/test/resources/resolution/extends/simple-merge.editing.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/extends/simple-merge.editing.expanded.jsonld @@ -438,7 +438,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/extends/simple-merge.editing.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/extends/simple-merge.editing.flattened.jsonld index a903fb86f1..f772c4817a 100644 --- a/amf-cli/shared/src/test/resources/resolution/extends/simple-merge.editing.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/extends/simple-merge.editing.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/extends/simple-merge.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/extends/simple-merge.raml.expanded.jsonld index e82cbd2f7d..ef1ae8a081 100644 --- a/amf-cli/shared/src/test/resources/resolution/extends/simple-merge.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/extends/simple-merge.raml.expanded.jsonld @@ -515,7 +515,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/extends/simple-merge.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/extends/simple-merge.raml.flattened.jsonld index 9f620aca09..d4cf9408fd 100644 --- a/amf-cli/shared/src/test/resources/resolution/extends/simple-merge.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/extends/simple-merge.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/extends/to-jsonld-and-back/api.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/extends/to-jsonld-and-back/api.expanded.jsonld index 1df92f8b80..0ef0c5a35e 100644 --- a/amf-cli/shared/src/test/resources/resolution/extends/to-jsonld-and-back/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/extends/to-jsonld-and-back/api.expanded.jsonld @@ -46,7 +46,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/extends/to-jsonld-and-back/api.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/extends/to-jsonld-and-back/api.flattened.jsonld index 7a3d09b35f..b3939e1c80 100644 --- a/amf-cli/shared/src/test/resources/resolution/extends/to-jsonld-and-back/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/extends/to-jsonld-and-back/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/extension/operation/output.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/extension/operation/output.expanded.jsonld index c6deb98c20..d3d80dc194 100644 --- a/amf-cli/shared/src/test/resources/resolution/extension/operation/output.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/extension/operation/output.expanded.jsonld @@ -645,7 +645,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/extension/operation/output.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/extension/operation/output.flattened.jsonld index 670f50deb4..1ff4967341 100644 --- a/amf-cli/shared/src/test/resources/resolution/extension/operation/output.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/extension/operation/output.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/extension/traits/input.resolved.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/extension/traits/input.resolved.expanded.jsonld index 935956e328..9d4f31f10e 100644 --- a/amf-cli/shared/src/test/resources/resolution/extension/traits/input.resolved.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/extension/traits/input.resolved.expanded.jsonld @@ -309,7 +309,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/extension/traits/input.resolved.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/extension/traits/input.resolved.flattened.jsonld index 1e04d4c791..72edf749c1 100644 --- a/amf-cli/shared/src/test/resources/resolution/extension/traits/input.resolved.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/extension/traits/input.resolved.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/extension/traits/output.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/extension/traits/output.expanded.jsonld index a4fcb44558..5e63215a05 100644 --- a/amf-cli/shared/src/test/resources/resolution/extension/traits/output.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/extension/traits/output.expanded.jsonld @@ -144,7 +144,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/extension/traits/output.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/extension/traits/output.flattened.jsonld index 6c6f55171f..5e74c43b61 100644 --- a/amf-cli/shared/src/test/resources/resolution/extension/traits/output.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/extension/traits/output.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/externalfragment/jsonexample.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/externalfragment/jsonexample.raml.expanded.jsonld index 42f31764a9..e7f9ef7e4e 100644 --- a/amf-cli/shared/src/test/resources/resolution/externalfragment/jsonexample.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/externalfragment/jsonexample.raml.expanded.jsonld @@ -960,7 +960,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/externalfragment/jsonexample.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/externalfragment/jsonexample.raml.flattened.jsonld index 974845a32d..3707dc2c79 100644 --- a/amf-cli/shared/src/test/resources/resolution/externalfragment/jsonexample.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/externalfragment/jsonexample.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/externalfragment/jsonschema.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/externalfragment/jsonschema.raml.expanded.jsonld index d01b9abfbe..988e2a58b2 100644 --- a/amf-cli/shared/src/test/resources/resolution/externalfragment/jsonschema.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/externalfragment/jsonschema.raml.expanded.jsonld @@ -485,7 +485,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/externalfragment/jsonschema.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/externalfragment/jsonschema.raml.flattened.jsonld index a66fa077fe..d7fe6413aa 100644 --- a/amf-cli/shared/src/test/resources/resolution/externalfragment/jsonschema.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/externalfragment/jsonschema.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/externalfragment/test-links-with-references/api.resolved.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/externalfragment/test-links-with-references/api.resolved.expanded.jsonld index 51604e8511..eac9e4acd5 100644 --- a/amf-cli/shared/src/test/resources/resolution/externalfragment/test-links-with-references/api.resolved.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/externalfragment/test-links-with-references/api.resolved.expanded.jsonld @@ -240,7 +240,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/externalfragment/test-links-with-references/api.resolved.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/externalfragment/test-links-with-references/api.resolved.flattened.jsonld index 6bb24ea63e..405afd4ec0 100644 --- a/amf-cli/shared/src/test/resources/resolution/externalfragment/test-links-with-references/api.resolved.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/externalfragment/test-links-with-references/api.resolved.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/externalfragment/xmlexample.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/externalfragment/xmlexample.raml.expanded.jsonld index 484837a8a7..c321ae7e0f 100644 --- a/amf-cli/shared/src/test/resources/resolution/externalfragment/xmlexample.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/externalfragment/xmlexample.raml.expanded.jsonld @@ -404,7 +404,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/externalfragment/xmlexample.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/externalfragment/xmlexample.raml.flattened.jsonld index a20c9e257d..d5a38a487d 100644 --- a/amf-cli/shared/src/test/resources/resolution/externalfragment/xmlexample.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/externalfragment/xmlexample.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/externalfragment/xmlschema.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/externalfragment/xmlschema.raml.expanded.jsonld index bcb147d673..a6abc46de2 100644 --- a/amf-cli/shared/src/test/resources/resolution/externalfragment/xmlschema.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/externalfragment/xmlschema.raml.expanded.jsonld @@ -345,7 +345,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/externalfragment/xmlschema.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/externalfragment/xmlschema.raml.flattened.jsonld index b218f9ba28..89de7c9347 100644 --- a/amf-cli/shared/src/test/resources/resolution/externalfragment/xmlschema.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/externalfragment/xmlschema.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/jsonld-example/api.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/jsonld-example/api.expanded.jsonld index 35fcec29f7..8ff55c5176 100644 --- a/amf-cli/shared/src/test/resources/resolution/jsonld-example/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/jsonld-example/api.expanded.jsonld @@ -301,7 +301,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/jsonld-example/api.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/jsonld-example/api.flattened.jsonld index 1d5b4da41c..24c8a9817a 100644 --- a/amf-cli/shared/src/test/resources/resolution/jsonld-example/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/jsonld-example/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/link-of-link/in-api/link-of-link-in-api.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/link-of-link/in-api/link-of-link-in-api.expanded.jsonld index 876fc58905..b3bccfae20 100644 --- a/amf-cli/shared/src/test/resources/resolution/link-of-link/in-api/link-of-link-in-api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/link-of-link/in-api/link-of-link-in-api.expanded.jsonld @@ -152,7 +152,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ @@ -448,7 +448,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/resolution/link-of-link/in-api/link-of-link-in-api.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/link-of-link/in-api/link-of-link-in-api.flattened.jsonld index b79366896f..8a2c9ed42a 100644 --- a/amf-cli/shared/src/test/resources/resolution/link-of-link/in-api/link-of-link-in-api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/link-of-link/in-api/link-of-link-in-api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, @@ -329,7 +329,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "RAML 1.0" } ], diff --git a/amf-cli/shared/src/test/resources/resolution/link-of-link/link-of-link-of-link.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/link-of-link/link-of-link-of-link.expanded.jsonld index f58819b4eb..1844ba6dfb 100644 --- a/amf-cli/shared/src/test/resources/resolution/link-of-link/link-of-link-of-link.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/link-of-link/link-of-link-of-link.expanded.jsonld @@ -18,7 +18,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/link-of-link/link-of-link-of-link.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/link-of-link/link-of-link-of-link.flattened.jsonld index a8cd7b4ec3..fb300714a3 100644 --- a/amf-cli/shared/src/test/resources/resolution/link-of-link/link-of-link-of-link.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/link-of-link/link-of-link-of-link.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/link-of-link/link-of-link.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/link-of-link/link-of-link.expanded.jsonld index 6d06db7470..2a5a28b9e5 100644 --- a/amf-cli/shared/src/test/resources/resolution/link-of-link/link-of-link.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/link-of-link/link-of-link.expanded.jsonld @@ -18,7 +18,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/link-of-link/link-of-link.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/link-of-link/link-of-link.flattened.jsonld index c86b24bb9f..f01c9a784b 100644 --- a/amf-cli/shared/src/test/resources/resolution/link-of-link/link-of-link.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/link-of-link/link-of-link.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/link-of-link/middle-link-in-api/link-of-link-in-api.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/link-of-link/middle-link-in-api/link-of-link-in-api.expanded.jsonld index 5dc86bde8e..089f96e38f 100644 --- a/amf-cli/shared/src/test/resources/resolution/link-of-link/middle-link-in-api/link-of-link-in-api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/link-of-link/middle-link-in-api/link-of-link-in-api.expanded.jsonld @@ -152,7 +152,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ @@ -558,7 +558,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/resolution/link-of-link/middle-link-in-api/link-of-link-in-api.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/link-of-link/middle-link-in-api/link-of-link-in-api.flattened.jsonld index 7e387b232d..7b9e5ce9c2 100644 --- a/amf-cli/shared/src/test/resources/resolution/link-of-link/middle-link-in-api/link-of-link-in-api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/link-of-link/middle-link-in-api/link-of-link-in-api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, @@ -372,7 +372,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "RAML 1.0" } ], diff --git a/amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/avoid-extract-to-declares.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/avoid-extract-to-declares.expanded.jsonld index dd2cb83bc1..ed3d0deaf7 100644 --- a/amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/avoid-extract-to-declares.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/avoid-extract-to-declares.expanded.jsonld @@ -246,7 +246,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/avoid-extract-to-declares.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/avoid-extract-to-declares.flattened.jsonld index 2ebb8cb013..df4d01738a 100644 --- a/amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/avoid-extract-to-declares.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/avoid-extract-to-declares.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs-default.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs-default.expanded.jsonld index fd800c6ee8..2e41f1f670 100644 --- a/amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs-default.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs-default.expanded.jsonld @@ -1625,7 +1625,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs-default.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs-default.flattened.jsonld index f49c9fc278..83ddf12ba5 100644 --- a/amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs-default.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs-default.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs-editing.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs-editing.expanded.jsonld index 7edd182eb1..e873c07f2e 100644 --- a/amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs-editing.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs-editing.expanded.jsonld @@ -766,7 +766,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ @@ -910,7 +910,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ @@ -1187,7 +1187,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ @@ -1446,7 +1446,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs-editing.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs-editing.flattened.jsonld index 0240f6c84c..fb54c79048 100644 --- a/amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs-editing.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs-editing.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, @@ -1034,7 +1034,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "RAML 1.0" }, { @@ -1078,7 +1078,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "RAML 1.0" }, { @@ -1086,7 +1086,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/resolution/media-type/media-type-override-oas-target.json.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/media-type/media-type-override-oas-target.json.expanded.jsonld index 1766845931..a83a10e1a0 100644 --- a/amf-cli/shared/src/test/resources/resolution/media-type/media-type-override-oas-target.json.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/media-type/media-type-override-oas-target.json.expanded.jsonld @@ -828,7 +828,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/media-type/media-type-override-oas-target.json.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/media-type/media-type-override-oas-target.json.flattened.jsonld index 2f97714fa0..4d1ffeb016 100644 --- a/amf-cli/shared/src/test/resources/resolution/media-type/media-type-override-oas-target.json.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/media-type/media-type-override-oas-target.json.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/media-type/media-type-override.json.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/media-type/media-type-override.json.expanded.jsonld index a040492bf2..814e13acfb 100644 --- a/amf-cli/shared/src/test/resources/resolution/media-type/media-type-override.json.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/media-type/media-type-override.json.expanded.jsonld @@ -818,7 +818,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/media-type/media-type-override.json.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/media-type/media-type-override.json.flattened.jsonld index fab8d53794..b6ebf2784b 100644 --- a/amf-cli/shared/src/test/resources/resolution/media-type/media-type-override.json.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/media-type/media-type-override.json.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/media-type/media-type-override.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/media-type/media-type-override.raml.expanded.jsonld index 034c794793..c56d1bfd39 100644 --- a/amf-cli/shared/src/test/resources/resolution/media-type/media-type-override.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/media-type/media-type-override.raml.expanded.jsonld @@ -847,7 +847,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/media-type/media-type-override.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/media-type/media-type-override.raml.flattened.jsonld index ceaaa55855..38eab039fc 100644 --- a/amf-cli/shared/src/test/resources/resolution/media-type/media-type-override.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/media-type/media-type-override.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/media-type/media-type.json.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/media-type/media-type.json.expanded.jsonld index e8f2d71d84..cb24d0eaa0 100644 --- a/amf-cli/shared/src/test/resources/resolution/media-type/media-type.json.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/media-type/media-type.json.expanded.jsonld @@ -818,7 +818,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/media-type/media-type.json.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/media-type/media-type.json.flattened.jsonld index 1824a5de1f..b6a709317f 100644 --- a/amf-cli/shared/src/test/resources/resolution/media-type/media-type.json.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/media-type/media-type.json.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/media-type/media-type.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/media-type/media-type.raml.expanded.jsonld index 9830b54fe6..fd73373b34 100644 --- a/amf-cli/shared/src/test/resources/resolution/media-type/media-type.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/media-type/media-type.raml.expanded.jsonld @@ -847,7 +847,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/media-type/media-type.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/media-type/media-type.raml.flattened.jsonld index a5ef978586..53890ca8f7 100644 --- a/amf-cli/shared/src/test/resources/resolution/media-type/media-type.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/media-type/media-type.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/media-type/media-types.json.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/media-type/media-types.json.expanded.jsonld index cad2ed5290..77c1662e6f 100644 --- a/amf-cli/shared/src/test/resources/resolution/media-type/media-types.json.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/media-type/media-types.json.expanded.jsonld @@ -1373,7 +1373,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/media-type/media-types.json.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/media-type/media-types.json.flattened.jsonld index 4ebc1f46c0..f9232e5df2 100644 --- a/amf-cli/shared/src/test/resources/resolution/media-type/media-types.json.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/media-type/media-types.json.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/media-type/media-types.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/media-type/media-types.raml.expanded.jsonld index 83175718aa..496b27c0a0 100644 --- a/amf-cli/shared/src/test/resources/resolution/media-type/media-types.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/media-type/media-types.raml.expanded.jsonld @@ -1376,7 +1376,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/media-type/media-types.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/media-type/media-types.raml.flattened.jsonld index dafa9350eb..4d65deee58 100644 --- a/amf-cli/shared/src/test/resources/resolution/media-type/media-types.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/media-type/media-types.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/media-type/security-scheme-use-global-mediatype.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/media-type/security-scheme-use-global-mediatype.raml.expanded.jsonld index 168651239d..93b473c789 100644 --- a/amf-cli/shared/src/test/resources/resolution/media-type/security-scheme-use-global-mediatype.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/media-type/security-scheme-use-global-mediatype.raml.expanded.jsonld @@ -807,7 +807,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/media-type/security-scheme-use-global-mediatype.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/media-type/security-scheme-use-global-mediatype.raml.flattened.jsonld index ed49320841..22642e47ed 100644 --- a/amf-cli/shared/src/test/resources/resolution/media-type/security-scheme-use-global-mediatype.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/media-type/security-scheme-use-global-mediatype.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/merge-inherits-json-schema-fragments/api.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/merge-inherits-json-schema-fragments/api.expanded.jsonld index d2f243b412..36d549a8a9 100644 --- a/amf-cli/shared/src/test/resources/resolution/merge-inherits-json-schema-fragments/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/merge-inherits-json-schema-fragments/api.expanded.jsonld @@ -1000,7 +1000,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/merge-inherits-json-schema-fragments/api.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/merge-inherits-json-schema-fragments/api.flattened.jsonld index 67412f40bb..8ca4ca81d7 100644 --- a/amf-cli/shared/src/test/resources/resolution/merge-inherits-json-schema-fragments/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/merge-inherits-json-schema-fragments/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/merge-inherits/api.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/merge-inherits/api.expanded.jsonld index e3aad2ed74..7c80b94cb1 100644 --- a/amf-cli/shared/src/test/resources/resolution/merge-inherits/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/merge-inherits/api.expanded.jsonld @@ -1243,7 +1243,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/merge-inherits/api.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/merge-inherits/api.flattened.jsonld index 85ab0f92a2..8e1af78bef 100644 --- a/amf-cli/shared/src/test/resources/resolution/merge-inherits/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/merge-inherits/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/merge-recursive-inherits/api.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/merge-recursive-inherits/api.expanded.jsonld index 563c594cd3..eccae53aef 100644 --- a/amf-cli/shared/src/test/resources/resolution/merge-recursive-inherits/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/merge-recursive-inherits/api.expanded.jsonld @@ -745,7 +745,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/merge-recursive-inherits/api.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/merge-recursive-inherits/api.flattened.jsonld index 61a4e9df7a..f6479f9cf5 100644 --- a/amf-cli/shared/src/test/resources/resolution/merge-recursive-inherits/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/merge-recursive-inherits/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/merge-recursive-json-schemas-raml08/api.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/merge-recursive-json-schemas-raml08/api.expanded.jsonld index 1eef8b002e..341c164e8e 100644 --- a/amf-cli/shared/src/test/resources/resolution/merge-recursive-json-schemas-raml08/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/merge-recursive-json-schemas-raml08/api.expanded.jsonld @@ -1079,7 +1079,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/merge-recursive-json-schemas-raml08/api.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/merge-recursive-json-schemas-raml08/api.flattened.jsonld index 8e751c95b5..e25b13dc0c 100644 --- a/amf-cli/shared/src/test/resources/resolution/merge-recursive-json-schemas-raml08/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/merge-recursive-json-schemas-raml08/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 0.8" }, diff --git a/amf-cli/shared/src/test/resources/resolution/merge-recursive-json-schemas-raml10/api.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/merge-recursive-json-schemas-raml10/api.expanded.jsonld index 7a37914376..a6f2d1a7c4 100644 --- a/amf-cli/shared/src/test/resources/resolution/merge-recursive-json-schemas-raml10/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/merge-recursive-json-schemas-raml10/api.expanded.jsonld @@ -1097,7 +1097,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/merge-recursive-json-schemas-raml10/api.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/merge-recursive-json-schemas-raml10/api.flattened.jsonld index ca3bbcf305..03e15cc69a 100644 --- a/amf-cli/shared/src/test/resources/resolution/merge-recursive-json-schemas-raml10/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/merge-recursive-json-schemas-raml10/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/merge/message-different-binding/golden.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/merge/message-different-binding/golden.expanded.jsonld index 14d680de9c..1792d00858 100644 --- a/amf-cli/shared/src/test/resources/resolution/merge/message-different-binding/golden.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/merge/message-different-binding/golden.expanded.jsonld @@ -115,7 +115,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ] } diff --git a/amf-cli/shared/src/test/resources/resolution/merge/message-different-binding/golden.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/merge/message-different-binding/golden.flattened.jsonld index 4b23099f7b..ce8d20d217 100644 --- a/amf-cli/shared/src/test/resources/resolution/merge/message-different-binding/golden.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/merge/message-different-binding/golden.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2" + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0" }, { "@id": "testId/resp/message", diff --git a/amf-cli/shared/src/test/resources/resolution/merge/message-different-examples/golden.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/merge/message-different-examples/golden.expanded.jsonld index b13d3be28f..04f4ef1876 100644 --- a/amf-cli/shared/src/test/resources/resolution/merge/message-different-examples/golden.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/merge/message-different-examples/golden.expanded.jsonld @@ -148,7 +148,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ] } diff --git a/amf-cli/shared/src/test/resources/resolution/merge/message-different-examples/golden.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/merge/message-different-examples/golden.flattened.jsonld index bf854faae9..79cd8d810e 100644 --- a/amf-cli/shared/src/test/resources/resolution/merge/message-different-examples/golden.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/merge/message-different-examples/golden.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2" + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0" }, { "@id": "testId/resp/message", diff --git a/amf-cli/shared/src/test/resources/resolution/merge/message-documentation/golden.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/merge/message-documentation/golden.expanded.jsonld index 4ed290d134..fb231100f3 100644 --- a/amf-cli/shared/src/test/resources/resolution/merge/message-documentation/golden.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/merge/message-documentation/golden.expanded.jsonld @@ -55,7 +55,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ] } diff --git a/amf-cli/shared/src/test/resources/resolution/merge/message-documentation/golden.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/merge/message-documentation/golden.flattened.jsonld index 21163f22a5..5167209e96 100644 --- a/amf-cli/shared/src/test/resources/resolution/merge/message-documentation/golden.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/merge/message-documentation/golden.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2" + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0" }, { "@id": "testId/resp/message", diff --git a/amf-cli/shared/src/test/resources/resolution/merge/message-same-binding/golden.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/merge/message-same-binding/golden.expanded.jsonld index 6021195b0f..3e5cf2c8a8 100644 --- a/amf-cli/shared/src/test/resources/resolution/merge/message-same-binding/golden.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/merge/message-same-binding/golden.expanded.jsonld @@ -118,7 +118,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ] } diff --git a/amf-cli/shared/src/test/resources/resolution/merge/message-same-binding/golden.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/merge/message-same-binding/golden.flattened.jsonld index a497ef3d9f..1c1d6fa5e4 100644 --- a/amf-cli/shared/src/test/resources/resolution/merge/message-same-binding/golden.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/merge/message-same-binding/golden.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2" + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0" }, { "@id": "testId/resp/message", diff --git a/amf-cli/shared/src/test/resources/resolution/merge/message-same-example-names/golden.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/merge/message-same-example-names/golden.expanded.jsonld index b13d3be28f..04f4ef1876 100644 --- a/amf-cli/shared/src/test/resources/resolution/merge/message-same-example-names/golden.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/merge/message-same-example-names/golden.expanded.jsonld @@ -148,7 +148,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ] } diff --git a/amf-cli/shared/src/test/resources/resolution/merge/message-same-example-names/golden.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/merge/message-same-example-names/golden.flattened.jsonld index bf854faae9..79cd8d810e 100644 --- a/amf-cli/shared/src/test/resources/resolution/merge/message-same-example-names/golden.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/merge/message-same-example-names/golden.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2" + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0" }, { "@id": "testId/resp/message", diff --git a/amf-cli/shared/src/test/resources/resolution/merge/message-simple/golden.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/merge/message-simple/golden.expanded.jsonld index 5061926fe4..49da337aa8 100644 --- a/amf-cli/shared/src/test/resources/resolution/merge/message-simple/golden.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/merge/message-simple/golden.expanded.jsonld @@ -98,7 +98,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ] } diff --git a/amf-cli/shared/src/test/resources/resolution/merge/message-simple/golden.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/merge/message-simple/golden.flattened.jsonld index 76864dcaf2..3e22841f64 100644 --- a/amf-cli/shared/src/test/resources/resolution/merge/message-simple/golden.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/merge/message-simple/golden.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2" + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0" }, { "@id": "testId/resp/message", diff --git a/amf-cli/shared/src/test/resources/resolution/merge/message-tags/golden.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/merge/message-tags/golden.expanded.jsonld index 7aaff2f310..52841c9bec 100644 --- a/amf-cli/shared/src/test/resources/resolution/merge/message-tags/golden.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/merge/message-tags/golden.expanded.jsonld @@ -55,7 +55,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ] } diff --git a/amf-cli/shared/src/test/resources/resolution/merge/message-tags/golden.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/merge/message-tags/golden.flattened.jsonld index f00778a677..126d4d55c4 100644 --- a/amf-cli/shared/src/test/resources/resolution/merge/message-tags/golden.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/merge/message-tags/golden.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2" + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0" }, { "@id": "testId/resp/message", diff --git a/amf-cli/shared/src/test/resources/resolution/merge/operation-binding-nested-schema/golden.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/merge/operation-binding-nested-schema/golden.expanded.jsonld index cefaf2076d..a0f0ca29c2 100644 --- a/amf-cli/shared/src/test/resources/resolution/merge/operation-binding-nested-schema/golden.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/merge/operation-binding-nested-schema/golden.expanded.jsonld @@ -144,7 +144,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ] } diff --git a/amf-cli/shared/src/test/resources/resolution/merge/operation-binding-nested-schema/golden.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/merge/operation-binding-nested-schema/golden.flattened.jsonld index 872f69fe86..deae615256 100644 --- a/amf-cli/shared/src/test/resources/resolution/merge/operation-binding-nested-schema/golden.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/merge/operation-binding-nested-schema/golden.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2" + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0" }, { "@id": "testId/subscribe/traitOperationId", diff --git a/amf-cli/shared/src/test/resources/resolution/merge/operation-different-binding/golden.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/merge/operation-different-binding/golden.expanded.jsonld index 78b4a7bd02..6ab49fc9d7 100644 --- a/amf-cli/shared/src/test/resources/resolution/merge/operation-different-binding/golden.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/merge/operation-different-binding/golden.expanded.jsonld @@ -207,7 +207,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ] } diff --git a/amf-cli/shared/src/test/resources/resolution/merge/operation-different-binding/golden.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/merge/operation-different-binding/golden.flattened.jsonld index eeb4c7760c..2e6812bc5e 100644 --- a/amf-cli/shared/src/test/resources/resolution/merge/operation-different-binding/golden.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/merge/operation-different-binding/golden.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2" + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0" }, { "@id": "testId/subscribe/traitOperationId", diff --git a/amf-cli/shared/src/test/resources/resolution/merge/operation-documentation/golden.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/merge/operation-documentation/golden.expanded.jsonld index 5d68f7792f..fcd8a5f31f 100644 --- a/amf-cli/shared/src/test/resources/resolution/merge/operation-documentation/golden.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/merge/operation-documentation/golden.expanded.jsonld @@ -59,7 +59,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ] } diff --git a/amf-cli/shared/src/test/resources/resolution/merge/operation-documentation/golden.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/merge/operation-documentation/golden.flattened.jsonld index 24754b7c54..03f8d56eca 100644 --- a/amf-cli/shared/src/test/resources/resolution/merge/operation-documentation/golden.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/merge/operation-documentation/golden.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2" + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0" }, { "@id": "testId/subscribe/traitOperationId", diff --git a/amf-cli/shared/src/test/resources/resolution/merge/operation-same-binding/golden.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/merge/operation-same-binding/golden.expanded.jsonld index cefaf2076d..a0f0ca29c2 100644 --- a/amf-cli/shared/src/test/resources/resolution/merge/operation-same-binding/golden.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/merge/operation-same-binding/golden.expanded.jsonld @@ -144,7 +144,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ] } diff --git a/amf-cli/shared/src/test/resources/resolution/merge/operation-same-binding/golden.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/merge/operation-same-binding/golden.flattened.jsonld index 872f69fe86..deae615256 100644 --- a/amf-cli/shared/src/test/resources/resolution/merge/operation-same-binding/golden.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/merge/operation-same-binding/golden.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2" + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0" }, { "@id": "testId/subscribe/traitOperationId", diff --git a/amf-cli/shared/src/test/resources/resolution/merge/operation-simple/golden.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/merge/operation-simple/golden.expanded.jsonld index 84e1232878..d69c7c37ce 100644 --- a/amf-cli/shared/src/test/resources/resolution/merge/operation-simple/golden.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/merge/operation-simple/golden.expanded.jsonld @@ -50,7 +50,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ] } diff --git a/amf-cli/shared/src/test/resources/resolution/merge/operation-simple/golden.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/merge/operation-simple/golden.flattened.jsonld index 3e7fea27b8..ef9f53602c 100644 --- a/amf-cli/shared/src/test/resources/resolution/merge/operation-simple/golden.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/merge/operation-simple/golden.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2" + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0" }, { "@id": "testId/subscribe/traitOperationId", diff --git a/amf-cli/shared/src/test/resources/resolution/merge/operation-tags/golden.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/merge/operation-tags/golden.expanded.jsonld index 8c46a9aa48..56acec6f69 100644 --- a/amf-cli/shared/src/test/resources/resolution/merge/operation-tags/golden.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/merge/operation-tags/golden.expanded.jsonld @@ -59,7 +59,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ] } diff --git a/amf-cli/shared/src/test/resources/resolution/merge/operation-tags/golden.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/merge/operation-tags/golden.flattened.jsonld index 3fa02131a1..8bdec522f1 100644 --- a/amf-cli/shared/src/test/resources/resolution/merge/operation-tags/golden.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/merge/operation-tags/golden.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2" + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0" }, { "@id": "testId/subscribe/traitOperationId", diff --git a/amf-cli/shared/src/test/resources/resolution/multiple-ref-to-external-schema/result.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/multiple-ref-to-external-schema/result.expanded.jsonld index 5dcce24284..a132f4c44b 100644 --- a/amf-cli/shared/src/test/resources/resolution/multiple-ref-to-external-schema/result.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/multiple-ref-to-external-schema/result.expanded.jsonld @@ -843,7 +843,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/multiple-ref-to-external-schema/result.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/multiple-ref-to-external-schema/result.flattened.jsonld index cb133e3e30..521ed002a0 100644 --- a/amf-cli/shared/src/test/resources/resolution/multiple-ref-to-external-schema/result.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/multiple-ref-to-external-schema/result.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "OAS 2.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/nested-parameters.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/nested-parameters.raml.expanded.jsonld index a0d4ec6f4c..1fbf67b07f 100644 --- a/amf-cli/shared/src/test/resources/resolution/nested-parameters.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/nested-parameters.raml.expanded.jsonld @@ -1849,7 +1849,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/nested-parameters.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/nested-parameters.raml.flattened.jsonld index 01a70a60f7..55bea54b1e 100644 --- a/amf-cli/shared/src/test/resources/resolution/nested-parameters.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/nested-parameters.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/oas-declared-link-of-scalar.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/oas-declared-link-of-scalar.expanded.jsonld index 3fef9dd893..d4b6c19681 100644 --- a/amf-cli/shared/src/test/resources/resolution/oas-declared-link-of-scalar.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/oas-declared-link-of-scalar.expanded.jsonld @@ -56,7 +56,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/oas-declared-link-of-scalar.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/oas-declared-link-of-scalar.flattened.jsonld index f6bdd193ef..ea54f93589 100644 --- a/amf-cli/shared/src/test/resources/resolution/oas-declared-link-of-scalar.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/oas-declared-link-of-scalar.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "OAS 3.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/oas-internal-json-schema-link/api.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/oas-internal-json-schema-link/api.expanded.jsonld index d1cba862d8..888c977c49 100644 --- a/amf-cli/shared/src/test/resources/resolution/oas-internal-json-schema-link/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/oas-internal-json-schema-link/api.expanded.jsonld @@ -332,7 +332,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/oas-internal-json-schema-link/api.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/oas-internal-json-schema-link/api.flattened.jsonld index 4ad2fb4639..edc76c95ae 100644 --- a/amf-cli/shared/src/test/resources/resolution/oas-internal-json-schema-link/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/oas-internal-json-schema-link/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "OAS 2.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/oas-link-of-link/all-objects-case.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/oas-link-of-link/all-objects-case.expanded.jsonld index ae2d01fa88..b9303c8841 100644 --- a/amf-cli/shared/src/test/resources/resolution/oas-link-of-link/all-objects-case.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/oas-link-of-link/all-objects-case.expanded.jsonld @@ -321,7 +321,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/oas-link-of-link/all-objects-case.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/oas-link-of-link/all-objects-case.flattened.jsonld index aaa70583ee..ccfaaf9163 100644 --- a/amf-cli/shared/src/test/resources/resolution/oas-link-of-link/all-objects-case.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/oas-link-of-link/all-objects-case.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/oas-link-of-link/array-in-the-middle.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/oas-link-of-link/array-in-the-middle.expanded.jsonld index 0c3258fb99..5126a6fec3 100644 --- a/amf-cli/shared/src/test/resources/resolution/oas-link-of-link/array-in-the-middle.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/oas-link-of-link/array-in-the-middle.expanded.jsonld @@ -321,7 +321,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/oas-link-of-link/array-in-the-middle.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/oas-link-of-link/array-in-the-middle.flattened.jsonld index d9d07f3e77..d88e874777 100644 --- a/amf-cli/shared/src/test/resources/resolution/oas-link-of-link/array-in-the-middle.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/oas-link-of-link/array-in-the-middle.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/oas-link-of-link/array-with-child-recursion.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/oas-link-of-link/array-with-child-recursion.expanded.jsonld index 313abc331e..e5a8a59218 100644 --- a/amf-cli/shared/src/test/resources/resolution/oas-link-of-link/array-with-child-recursion.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/oas-link-of-link/array-with-child-recursion.expanded.jsonld @@ -321,7 +321,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/oas-link-of-link/array-with-child-recursion.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/oas-link-of-link/array-with-child-recursion.flattened.jsonld index dfe35b2e9f..57a6e5cd3c 100644 --- a/amf-cli/shared/src/test/resources/resolution/oas-link-of-link/array-with-child-recursion.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/oas-link-of-link/array-with-child-recursion.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/oas-recursion.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/oas-recursion.expanded.jsonld index 3c5030cee3..0480a2e7f5 100644 --- a/amf-cli/shared/src/test/resources/resolution/oas-recursion.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/oas-recursion.expanded.jsonld @@ -50,7 +50,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/oas-recursion.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/oas-recursion.flattened.jsonld index 5f10dbe736..3515f52a8b 100644 --- a/amf-cli/shared/src/test/resources/resolution/oas-recursion.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/oas-recursion.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "OAS 2.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/oas3-cookie-propagation/oas3-cookie-parameter-propagation.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/oas3-cookie-propagation/oas3-cookie-parameter-propagation.expanded.jsonld index d3309c0a73..14a52b2720 100644 --- a/amf-cli/shared/src/test/resources/resolution/oas3-cookie-propagation/oas3-cookie-parameter-propagation.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/oas3-cookie-propagation/oas3-cookie-parameter-propagation.expanded.jsonld @@ -417,7 +417,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/oas3-cookie-propagation/oas3-cookie-parameter-propagation.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/oas3-cookie-propagation/oas3-cookie-parameter-propagation.flattened.jsonld index 7d949e968b..b6d17f9e66 100644 --- a/amf-cli/shared/src/test/resources/resolution/oas3-cookie-propagation/oas3-cookie-parameter-propagation.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/oas3-cookie-propagation/oas3-cookie-parameter-propagation.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "OAS 3.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/oas3-inlined-shapes.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/oas3-inlined-shapes.expanded.jsonld index fc16c5fa8c..bd662b9468 100644 --- a/amf-cli/shared/src/test/resources/resolution/oas3-inlined-shapes.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/oas3-inlined-shapes.expanded.jsonld @@ -360,7 +360,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/oas3-inlined-shapes.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/oas3-inlined-shapes.flattened.jsonld index 0d08ef341c..c0b075d838 100644 --- a/amf-cli/shared/src/test/resources/resolution/oas3-inlined-shapes.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/oas3-inlined-shapes.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "OAS 3.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/oas30-discriminator-invalid-mapping/api.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/oas30-discriminator-invalid-mapping/api.expanded.jsonld index 9ec0942d37..593906738f 100644 --- a/amf-cli/shared/src/test/resources/resolution/oas30-discriminator-invalid-mapping/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/oas30-discriminator-invalid-mapping/api.expanded.jsonld @@ -50,7 +50,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/oas30-discriminator-invalid-mapping/api.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/oas30-discriminator-invalid-mapping/api.flattened.jsonld index b619073006..0b2605dff8 100644 --- a/amf-cli/shared/src/test/resources/resolution/oas30-discriminator-invalid-mapping/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/oas30-discriminator-invalid-mapping/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "OAS 3.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/oas30-discriminator/api.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/oas30-discriminator/api.expanded.jsonld index a4bd2bca54..51c576be45 100644 --- a/amf-cli/shared/src/test/resources/resolution/oas30-discriminator/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/oas30-discriminator/api.expanded.jsonld @@ -166,7 +166,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/oas30-discriminator/api.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/oas30-discriminator/api.flattened.jsonld index eb828c96b6..7fc06350d2 100644 --- a/amf-cli/shared/src/test/resources/resolution/oas30-discriminator/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/oas30-discriminator/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "OAS 3.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/operation-path-parameters/result.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/operation-path-parameters/result.expanded.jsonld index b0cc9803b4..7588af65ae 100644 --- a/amf-cli/shared/src/test/resources/resolution/operation-path-parameters/result.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/operation-path-parameters/result.expanded.jsonld @@ -597,7 +597,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/operation-path-parameters/result.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/operation-path-parameters/result.flattened.jsonld index 3ca8de9e0c..14956cec7a 100644 --- a/amf-cli/shared/src/test/resources/resolution/operation-path-parameters/result.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/operation-path-parameters/result.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/overrided-baseUriParams.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/overrided-baseUriParams.expanded.jsonld index 4da71d6a74..b4fb113771 100644 --- a/amf-cli/shared/src/test/resources/resolution/overrided-baseUriParams.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/overrided-baseUriParams.expanded.jsonld @@ -1057,7 +1057,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/overrided-baseUriParams.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/overrided-baseUriParams.flattened.jsonld index c92316a9f0..5d892daa5e 100644 --- a/amf-cli/shared/src/test/resources/resolution/overrided-baseUriParams.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/overrided-baseUriParams.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 0.8" }, diff --git a/amf-cli/shared/src/test/resources/resolution/parameter-without-type/parameter-without-type.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/parameter-without-type/parameter-without-type.expanded.jsonld index 010e254fe4..9f1fa35a99 100644 --- a/amf-cli/shared/src/test/resources/resolution/parameter-without-type/parameter-without-type.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/parameter-without-type/parameter-without-type.expanded.jsonld @@ -197,7 +197,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/parameter-without-type/parameter-without-type.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/parameter-without-type/parameter-without-type.flattened.jsonld index fa8e22ed10..070c382c9f 100644 --- a/amf-cli/shared/src/test/resources/resolution/parameter-without-type/parameter-without-type.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/parameter-without-type/parameter-without-type.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "OAS 2.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/parameters.json.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/parameters.json.expanded.jsonld index 6ceea73933..c594649cae 100644 --- a/amf-cli/shared/src/test/resources/resolution/parameters.json.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/parameters.json.expanded.jsonld @@ -935,7 +935,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/parameters.json.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/parameters.json.flattened.jsonld index f2b38659a5..a3ab11f288 100644 --- a/amf-cli/shared/src/test/resources/resolution/parameters.json.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/parameters.json.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/parameters.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/parameters.raml.expanded.jsonld index d8f2c4d81c..e8bf7e770b 100644 --- a/amf-cli/shared/src/test/resources/resolution/parameters.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/parameters.raml.expanded.jsonld @@ -692,7 +692,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/parameters.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/parameters.raml.flattened.jsonld index 3600badba4..45184a3be0 100644 --- a/amf-cli/shared/src/test/resources/resolution/parameters.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/parameters.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/payloads-examples-resolution.resolved.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/payloads-examples-resolution.resolved.expanded.jsonld index 57115242fc..cedecb4b92 100644 --- a/amf-cli/shared/src/test/resources/resolution/payloads-examples-resolution.resolved.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/payloads-examples-resolution.resolved.expanded.jsonld @@ -224,7 +224,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/payloads-examples-resolution.resolved.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/payloads-examples-resolution.resolved.flattened.jsonld index 8e58b9d7ce..a58d8132cc 100644 --- a/amf-cli/shared/src/test/resources/resolution/payloads-examples-resolution.resolved.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/payloads-examples-resolution.resolved.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/queryString/query-string.json.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/queryString/query-string.json.expanded.jsonld index a8b1470874..570d5f3349 100644 --- a/amf-cli/shared/src/test/resources/resolution/queryString/query-string.json.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/queryString/query-string.json.expanded.jsonld @@ -1374,7 +1374,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/queryString/query-string.json.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/queryString/query-string.json.flattened.jsonld index c03959cc4f..75bfb9dc20 100644 --- a/amf-cli/shared/src/test/resources/resolution/queryString/query-string.json.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/queryString/query-string.json.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/queryString/query-string.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/queryString/query-string.raml.expanded.jsonld index cb12651ac4..3a23b0b80d 100644 --- a/amf-cli/shared/src/test/resources/resolution/queryString/query-string.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/queryString/query-string.raml.expanded.jsonld @@ -1524,7 +1524,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/queryString/query-string.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/queryString/query-string.raml.flattened.jsonld index c231a78215..874479997c 100644 --- a/amf-cli/shared/src/test/resources/resolution/queryString/query-string.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/queryString/query-string.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/queryString/security-with-query-string.json.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/queryString/security-with-query-string.json.expanded.jsonld index 0821fd0bd1..b0fd7a69bc 100644 --- a/amf-cli/shared/src/test/resources/resolution/queryString/security-with-query-string.json.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/queryString/security-with-query-string.json.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/queryString/security-with-query-string.json.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/queryString/security-with-query-string.json.flattened.jsonld index dda723a98a..5b3ddbe538 100644 --- a/amf-cli/shared/src/test/resources/resolution/queryString/security-with-query-string.json.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/queryString/security-with-query-string.json.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/queryString/security-with-query-string.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/queryString/security-with-query-string.raml.expanded.jsonld index dec384f8f2..dc733f74ee 100644 --- a/amf-cli/shared/src/test/resources/resolution/queryString/security-with-query-string.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/queryString/security-with-query-string.raml.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/queryString/security-with-query-string.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/queryString/security-with-query-string.raml.flattened.jsonld index 218bb93668..9e51a4c752 100644 --- a/amf-cli/shared/src/test/resources/resolution/queryString/security-with-query-string.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/queryString/security-with-query-string.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/raml-multiple-fragments/output.source-info.jsonld b/amf-cli/shared/src/test/resources/resolution/raml-multiple-fragments/output.source-info.jsonld index 0425320ae3..d7884bc6fe 100644 --- a/amf-cli/shared/src/test/resources/resolution/raml-multiple-fragments/output.source-info.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/raml-multiple-fragments/output.source-info.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, @@ -364,7 +364,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "RAML 1.0" }, { @@ -430,7 +430,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "RAML 1.0" }, { @@ -465,7 +465,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/resolution/raml-query-and-header-params/api.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/raml-query-and-header-params/api.expanded.jsonld index 86fe620e19..da191a6fd4 100644 --- a/amf-cli/shared/src/test/resources/resolution/raml-query-and-header-params/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/raml-query-and-header-params/api.expanded.jsonld @@ -383,7 +383,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/raml-query-and-header-params/api.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/raml-query-and-header-params/api.flattened.jsonld index f933a07c8b..72a4d4f595 100644 --- a/amf-cli/shared/src/test/resources/resolution/raml-query-and-header-params/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/raml-query-and-header-params/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/recursive-additional-properties/recursive-additional-properties-2.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/recursive-additional-properties/recursive-additional-properties-2.expanded.jsonld index 05be822e05..cd3f6e0d80 100644 --- a/amf-cli/shared/src/test/resources/resolution/recursive-additional-properties/recursive-additional-properties-2.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/recursive-additional-properties/recursive-additional-properties-2.expanded.jsonld @@ -50,7 +50,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/recursive-additional-properties/recursive-additional-properties-2.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/recursive-additional-properties/recursive-additional-properties-2.flattened.jsonld index 16f1bada62..a0a5aa0d1d 100644 --- a/amf-cli/shared/src/test/resources/resolution/recursive-additional-properties/recursive-additional-properties-2.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/recursive-additional-properties/recursive-additional-properties-2.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "OAS 2.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/recursive-additional-properties/recursive-additional-properties.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/recursive-additional-properties/recursive-additional-properties.expanded.jsonld index 0adb3b5ca7..f9aca84141 100644 --- a/amf-cli/shared/src/test/resources/resolution/recursive-additional-properties/recursive-additional-properties.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/recursive-additional-properties/recursive-additional-properties.expanded.jsonld @@ -240,7 +240,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/recursive-additional-properties/recursive-additional-properties.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/recursive-additional-properties/recursive-additional-properties.flattened.jsonld index d74613f460..6568cd091b 100644 --- a/amf-cli/shared/src/test/resources/resolution/recursive-additional-properties/recursive-additional-properties.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/recursive-additional-properties/recursive-additional-properties.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "OAS 2.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/recursive-extension-provenance/api.resolved.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/recursive-extension-provenance/api.resolved.expanded.jsonld index 0b1aaf6514..64aa5c9c83 100644 --- a/amf-cli/shared/src/test/resources/resolution/recursive-extension-provenance/api.resolved.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/recursive-extension-provenance/api.resolved.expanded.jsonld @@ -331,7 +331,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/recursive-extension-provenance/api.resolved.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/recursive-extension-provenance/api.resolved.flattened.jsonld index d437dc03fe..04880e4ee5 100644 --- a/amf-cli/shared/src/test/resources/resolution/recursive-extension-provenance/api.resolved.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/recursive-extension-provenance/api.resolved.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/recursive-tuple/api.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/recursive-tuple/api.expanded.jsonld index d42f7f3403..4ea4e5a091 100644 --- a/amf-cli/shared/src/test/resources/resolution/recursive-tuple/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/recursive-tuple/api.expanded.jsonld @@ -1136,7 +1136,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/recursive-tuple/api.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/recursive-tuple/api.flattened.jsonld index 3f1afe4d68..0503e6c9e8 100644 --- a/amf-cli/shared/src/test/resources/resolution/recursive-tuple/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/recursive-tuple/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 0.8" }, diff --git a/amf-cli/shared/src/test/resources/resolution/request-link-parameters/api.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/request-link-parameters/api.expanded.jsonld index 78d07c3bf3..7509dd43b2 100644 --- a/amf-cli/shared/src/test/resources/resolution/request-link-parameters/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/request-link-parameters/api.expanded.jsonld @@ -621,7 +621,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/request-link-parameters/api.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/request-link-parameters/api.flattened.jsonld index 103521357e..faa6890670 100644 --- a/amf-cli/shared/src/test/resources/resolution/request-link-parameters/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/request-link-parameters/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "OAS 3.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/security-requirements/security-requirements.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/security-requirements/security-requirements.expanded.jsonld index 2c0955fd1e..2be82f382b 100644 --- a/amf-cli/shared/src/test/resources/resolution/security-requirements/security-requirements.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/security-requirements/security-requirements.expanded.jsonld @@ -942,7 +942,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ @@ -1478,7 +1478,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ @@ -1782,7 +1782,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/resolution/security-requirements/security-requirements.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/security-requirements/security-requirements.flattened.jsonld index 2cf85c1c49..74a1f09514 100644 --- a/amf-cli/shared/src/test/resources/resolution/security-requirements/security-requirements.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/security-requirements/security-requirements.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, @@ -851,7 +851,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "RAML 1.0" }, { @@ -897,7 +897,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "RAML 1.0" } ], diff --git a/amf-cli/shared/src/test/resources/resolution/security/security.json.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/security/security.json.expanded.jsonld index d9835abca5..015d89aa0f 100644 --- a/amf-cli/shared/src/test/resources/resolution/security/security.json.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/security/security.json.expanded.jsonld @@ -2935,7 +2935,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/security/security.json.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/security/security.json.flattened.jsonld index b6c54172fe..95850cdb86 100644 --- a/amf-cli/shared/src/test/resources/resolution/security/security.json.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/security/security.json.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/security/security.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/security/security.raml.expanded.jsonld index 196beae166..61b04541c2 100644 --- a/amf-cli/shared/src/test/resources/resolution/security/security.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/security/security.raml.expanded.jsonld @@ -3114,7 +3114,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/security/security.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/security/security.raml.flattened.jsonld index 5627271384..e6fa97fd00 100644 --- a/amf-cli/shared/src/test/resources/resolution/security/security.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/security/security.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/shape-normalization/cyclic-inheritance/api.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/shape-normalization/cyclic-inheritance/api.expanded.jsonld index 501a0dcdab..d7af503049 100644 --- a/amf-cli/shared/src/test/resources/resolution/shape-normalization/cyclic-inheritance/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/shape-normalization/cyclic-inheritance/api.expanded.jsonld @@ -55,7 +55,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/shape-normalization/cyclic-inheritance/api.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/shape-normalization/cyclic-inheritance/api.flattened.jsonld index 78c5830599..419d3fea2f 100644 --- a/amf-cli/shared/src/test/resources/resolution/shape-normalization/cyclic-inheritance/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/shape-normalization/cyclic-inheritance/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/shape-normalization/cyclic-union-members/api.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/shape-normalization/cyclic-union-members/api.expanded.jsonld index b994139a7a..005df18cab 100644 --- a/amf-cli/shared/src/test/resources/resolution/shape-normalization/cyclic-union-members/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/shape-normalization/cyclic-union-members/api.expanded.jsonld @@ -55,7 +55,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/shape-normalization/cyclic-union-members/api.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/shape-normalization/cyclic-union-members/api.flattened.jsonld index 47a89f352e..ac459fd9c3 100644 --- a/amf-cli/shared/src/test/resources/resolution/shape-normalization/cyclic-union-members/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/shape-normalization/cyclic-union-members/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/shared-oas-30-examples/api.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/shared-oas-30-examples/api.expanded.jsonld index ff7e3e021e..6b01dd6604 100644 --- a/amf-cli/shared/src/test/resources/resolution/shared-oas-30-examples/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/shared-oas-30-examples/api.expanded.jsonld @@ -1379,7 +1379,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/shared-oas-30-examples/api.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/shared-oas-30-examples/api.flattened.jsonld index 44bf9eeffb..f1065feaa3 100644 --- a/amf-cli/shared/src/test/resources/resolution/shared-oas-30-examples/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/shared-oas-30-examples/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "OAS 3.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/shared-request-body-reference/oas30/api.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/shared-request-body-reference/oas30/api.expanded.jsonld index b3c9115346..010ab3547f 100644 --- a/amf-cli/shared/src/test/resources/resolution/shared-request-body-reference/oas30/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/shared-request-body-reference/oas30/api.expanded.jsonld @@ -359,7 +359,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/shared-request-body-reference/oas30/api.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/shared-request-body-reference/oas30/api.flattened.jsonld index ae77214bac..9a05e9d942 100644 --- a/amf-cli/shared/src/test/resources/resolution/shared-request-body-reference/oas30/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/shared-request-body-reference/oas30/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "OAS 3.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/shared-response-reference/oas20/api.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/shared-response-reference/oas20/api.expanded.jsonld index 3e1b06b5ee..e3895617fc 100644 --- a/amf-cli/shared/src/test/resources/resolution/shared-response-reference/oas20/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/shared-response-reference/oas20/api.expanded.jsonld @@ -315,7 +315,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/shared-response-reference/oas20/api.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/shared-response-reference/oas20/api.flattened.jsonld index 5e0798f80e..d53a9b3a0c 100644 --- a/amf-cli/shared/src/test/resources/resolution/shared-response-reference/oas20/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/shared-response-reference/oas20/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "OAS 2.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/shared-response-reference/oas30/api.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/shared-response-reference/oas30/api.expanded.jsonld index eb41f84dda..f8360cacb2 100644 --- a/amf-cli/shared/src/test/resources/resolution/shared-response-reference/oas30/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/shared-response-reference/oas30/api.expanded.jsonld @@ -297,7 +297,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/shared-response-reference/oas30/api.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/shared-response-reference/oas30/api.flattened.jsonld index c751c64cae..b2d6a8b6a0 100644 --- a/amf-cli/shared/src/test/resources/resolution/shared-response-reference/oas30/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/shared-response-reference/oas30/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "OAS 3.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/trait-with-link.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/trait-with-link.expanded.jsonld index b1b6faa5cb..8efcbd6078 100644 --- a/amf-cli/shared/src/test/resources/resolution/trait-with-link.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/trait-with-link.expanded.jsonld @@ -851,7 +851,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/trait-with-link.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/trait-with-link.flattened.jsonld index 3384dffdc5..4a64443b96 100644 --- a/amf-cli/shared/src/test/resources/resolution/trait-with-link.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/trait-with-link.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/union-of-arrays/api.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/union-of-arrays/api.expanded.jsonld index 64051eb2df..e1d3f590d3 100644 --- a/amf-cli/shared/src/test/resources/resolution/union-of-arrays/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/union-of-arrays/api.expanded.jsonld @@ -144,7 +144,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/union-of-arrays/api.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/union-of-arrays/api.flattened.jsonld index f2005af34f..81f97b339b 100644 --- a/amf-cli/shared/src/test/resources/resolution/union-of-arrays/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/union-of-arrays/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/union-of-declarations/api.raml.resolved.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/union-of-declarations/api.raml.resolved.expanded.jsonld index 2d99010340..cb2c7c7b4b 100644 --- a/amf-cli/shared/src/test/resources/resolution/union-of-declarations/api.raml.resolved.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/union-of-declarations/api.raml.resolved.expanded.jsonld @@ -346,7 +346,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/union-of-declarations/api.raml.resolved.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/union-of-declarations/api.raml.resolved.flattened.jsonld index c5d4493f1c..38bd05aa49 100644 --- a/amf-cli/shared/src/test/resources/resolution/union-of-declarations/api.raml.resolved.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/union-of-declarations/api.raml.resolved.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/unresolved-shape.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/unresolved-shape.raml.expanded.jsonld index e7addb0ac8..88e6dbb1f9 100644 --- a/amf-cli/shared/src/test/resources/resolution/unresolved-shape.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/unresolved-shape.raml.expanded.jsonld @@ -36,7 +36,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/resolution/unresolved-shape.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/resolution/unresolved-shape.raml.flattened.jsonld index 946a6da5fc..95fcae8d3b 100644 --- a/amf-cli/shared/src/test/resources/resolution/unresolved-shape.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/unresolved-shape.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/uri-params/api-operation.jsonld b/amf-cli/shared/src/test/resources/resolution/uri-params/api-operation.jsonld index 46d5fffeec..e8c92cc7e9 100644 --- a/amf-cli/shared/src/test/resources/resolution/uri-params/api-operation.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/uri-params/api-operation.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/resolution/uri-params/api.jsonld b/amf-cli/shared/src/test/resources/resolution/uri-params/api.jsonld index 8f29e11e7f..a29f8e2afe 100644 --- a/amf-cli/shared/src/test/resources/resolution/uri-params/api.jsonld +++ b/amf-cli/shared/src/test/resources/resolution/uri-params/api.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/semantic/aws/apis/any-method.jsonld b/amf-cli/shared/src/test/resources/semantic/aws/apis/any-method.jsonld index 3f9d0bd2f4..36808cadbc 100644 --- a/amf-cli/shared/src/test/resources/semantic/aws/apis/any-method.jsonld +++ b/amf-cli/shared/src/test/resources/semantic/aws/apis/any-method.jsonld @@ -5,7 +5,7 @@ "@type": [ "raml-doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "raml-doc:transformed": true, "raml-doc:sourceSpec": "AWS OAS 3.0" }, diff --git a/amf-cli/shared/src/test/resources/semantic/aws/apis/api-key-source.jsonld b/amf-cli/shared/src/test/resources/semantic/aws/apis/api-key-source.jsonld index 414cdda38a..cad17b4d95 100644 --- a/amf-cli/shared/src/test/resources/semantic/aws/apis/api-key-source.jsonld +++ b/amf-cli/shared/src/test/resources/semantic/aws/apis/api-key-source.jsonld @@ -5,7 +5,7 @@ "@type": [ "raml-doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "raml-doc:transformed": true, "raml-doc:sourceSpec": "AWS OAS 3.0" }, diff --git a/amf-cli/shared/src/test/resources/semantic/aws/apis/auth-type.jsonld b/amf-cli/shared/src/test/resources/semantic/aws/apis/auth-type.jsonld index da2a2347a9..f19d16bdb0 100644 --- a/amf-cli/shared/src/test/resources/semantic/aws/apis/auth-type.jsonld +++ b/amf-cli/shared/src/test/resources/semantic/aws/apis/auth-type.jsonld @@ -5,7 +5,7 @@ "@type": [ "raml-doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "raml-doc:transformed": true, "raml-doc:sourceSpec": "AWS OAS 3.0" }, diff --git a/amf-cli/shared/src/test/resources/semantic/aws/apis/auth.jsonld b/amf-cli/shared/src/test/resources/semantic/aws/apis/auth.jsonld index bdd44557e9..4455774664 100644 --- a/amf-cli/shared/src/test/resources/semantic/aws/apis/auth.jsonld +++ b/amf-cli/shared/src/test/resources/semantic/aws/apis/auth.jsonld @@ -5,7 +5,7 @@ "@type": [ "raml-doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "raml-doc:transformed": true, "raml-doc:sourceSpec": "AWS OAS 3.0" }, diff --git a/amf-cli/shared/src/test/resources/semantic/aws/apis/authorizer.jsonld b/amf-cli/shared/src/test/resources/semantic/aws/apis/authorizer.jsonld index 4c1ae47e27..9118d880b5 100644 --- a/amf-cli/shared/src/test/resources/semantic/aws/apis/authorizer.jsonld +++ b/amf-cli/shared/src/test/resources/semantic/aws/apis/authorizer.jsonld @@ -5,7 +5,7 @@ "@type": [ "raml-doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "raml-doc:transformed": true, "raml-doc:sourceSpec": "AWS OAS 3.0" }, diff --git a/amf-cli/shared/src/test/resources/semantic/aws/apis/binary-media-types.jsonld b/amf-cli/shared/src/test/resources/semantic/aws/apis/binary-media-types.jsonld index dc3bfce4fc..2282500de3 100644 --- a/amf-cli/shared/src/test/resources/semantic/aws/apis/binary-media-types.jsonld +++ b/amf-cli/shared/src/test/resources/semantic/aws/apis/binary-media-types.jsonld @@ -5,7 +5,7 @@ "@type": [ "raml-doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "raml-doc:transformed": true, "raml-doc:sourceSpec": "AWS OAS 3.0" }, diff --git a/amf-cli/shared/src/test/resources/semantic/aws/apis/cors.jsonld b/amf-cli/shared/src/test/resources/semantic/aws/apis/cors.jsonld index 24697eefba..11ac5b53b8 100644 --- a/amf-cli/shared/src/test/resources/semantic/aws/apis/cors.jsonld +++ b/amf-cli/shared/src/test/resources/semantic/aws/apis/cors.jsonld @@ -5,7 +5,7 @@ "@type": [ "raml-doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "raml-doc:transformed": true, "raml-doc:sourceSpec": "AWS OAS 3.0" }, diff --git a/amf-cli/shared/src/test/resources/semantic/aws/apis/documentation.jsonld b/amf-cli/shared/src/test/resources/semantic/aws/apis/documentation.jsonld index b57fb8ebf8..3fcbacbd3f 100644 --- a/amf-cli/shared/src/test/resources/semantic/aws/apis/documentation.jsonld +++ b/amf-cli/shared/src/test/resources/semantic/aws/apis/documentation.jsonld @@ -5,7 +5,7 @@ "@type": [ "raml-doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "raml-doc:transformed": true, "raml-doc:sourceSpec": "AWS OAS 3.0" }, diff --git a/amf-cli/shared/src/test/resources/semantic/aws/apis/endpoint-configuration.jsonld b/amf-cli/shared/src/test/resources/semantic/aws/apis/endpoint-configuration.jsonld index af04119a27..e5a7b8aea6 100644 --- a/amf-cli/shared/src/test/resources/semantic/aws/apis/endpoint-configuration.jsonld +++ b/amf-cli/shared/src/test/resources/semantic/aws/apis/endpoint-configuration.jsonld @@ -5,7 +5,7 @@ "@type": [ "raml-doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "raml-doc:transformed": true, "raml-doc:sourceSpec": "AWS OAS 3.0" }, diff --git a/amf-cli/shared/src/test/resources/semantic/aws/apis/gateway-responses.jsonld b/amf-cli/shared/src/test/resources/semantic/aws/apis/gateway-responses.jsonld index db21f4a8f4..49f0d67e37 100644 --- a/amf-cli/shared/src/test/resources/semantic/aws/apis/gateway-responses.jsonld +++ b/amf-cli/shared/src/test/resources/semantic/aws/apis/gateway-responses.jsonld @@ -5,7 +5,7 @@ "@type": [ "raml-doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "raml-doc:transformed": true, "raml-doc:sourceSpec": "AWS OAS 3.0" }, diff --git a/amf-cli/shared/src/test/resources/semantic/aws/apis/importexport-version.jsonld b/amf-cli/shared/src/test/resources/semantic/aws/apis/importexport-version.jsonld index cf8cd01989..0a53c77800 100644 --- a/amf-cli/shared/src/test/resources/semantic/aws/apis/importexport-version.jsonld +++ b/amf-cli/shared/src/test/resources/semantic/aws/apis/importexport-version.jsonld @@ -5,7 +5,7 @@ "@type": [ "raml-doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "raml-doc:transformed": true, "raml-doc:sourceSpec": "AWS OAS 3.0" }, diff --git a/amf-cli/shared/src/test/resources/semantic/aws/apis/integration-any-method.jsonld b/amf-cli/shared/src/test/resources/semantic/aws/apis/integration-any-method.jsonld index 89521f4c0f..10d05d0e76 100644 --- a/amf-cli/shared/src/test/resources/semantic/aws/apis/integration-any-method.jsonld +++ b/amf-cli/shared/src/test/resources/semantic/aws/apis/integration-any-method.jsonld @@ -5,7 +5,7 @@ "@type": [ "raml-doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "raml-doc:transformed": true, "raml-doc:sourceSpec": "AWS OAS 3.0" }, diff --git a/amf-cli/shared/src/test/resources/semantic/aws/apis/integration-declaration.jsonld b/amf-cli/shared/src/test/resources/semantic/aws/apis/integration-declaration.jsonld index 9f9b05139e..5084a7933e 100644 --- a/amf-cli/shared/src/test/resources/semantic/aws/apis/integration-declaration.jsonld +++ b/amf-cli/shared/src/test/resources/semantic/aws/apis/integration-declaration.jsonld @@ -5,7 +5,7 @@ "@type": [ "raml-doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "raml-doc:transformed": true, "raml-doc:sourceSpec": "AWS OAS 3.0" }, diff --git a/amf-cli/shared/src/test/resources/semantic/aws/apis/integration-inline.jsonld b/amf-cli/shared/src/test/resources/semantic/aws/apis/integration-inline.jsonld index ebafbb1017..904d5d33ae 100644 --- a/amf-cli/shared/src/test/resources/semantic/aws/apis/integration-inline.jsonld +++ b/amf-cli/shared/src/test/resources/semantic/aws/apis/integration-inline.jsonld @@ -5,7 +5,7 @@ "@type": [ "raml-doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "raml-doc:transformed": true, "raml-doc:sourceSpec": "AWS OAS 3.0" }, diff --git a/amf-cli/shared/src/test/resources/semantic/aws/apis/minimum-compression-size.jsonld b/amf-cli/shared/src/test/resources/semantic/aws/apis/minimum-compression-size.jsonld index f00f7d362c..f7a0d637eb 100644 --- a/amf-cli/shared/src/test/resources/semantic/aws/apis/minimum-compression-size.jsonld +++ b/amf-cli/shared/src/test/resources/semantic/aws/apis/minimum-compression-size.jsonld @@ -5,7 +5,7 @@ "@type": [ "raml-doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "raml-doc:transformed": true, "raml-doc:sourceSpec": "AWS OAS 3.0" }, diff --git a/amf-cli/shared/src/test/resources/semantic/aws/apis/policy.jsonld b/amf-cli/shared/src/test/resources/semantic/aws/apis/policy.jsonld index 06fc1b2c22..494d5e43b7 100644 --- a/amf-cli/shared/src/test/resources/semantic/aws/apis/policy.jsonld +++ b/amf-cli/shared/src/test/resources/semantic/aws/apis/policy.jsonld @@ -5,7 +5,7 @@ "@type": [ "raml-doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "raml-doc:transformed": true, "raml-doc:sourceSpec": "AWS OAS 3.0" }, diff --git a/amf-cli/shared/src/test/resources/semantic/aws/apis/request-validators.jsonld b/amf-cli/shared/src/test/resources/semantic/aws/apis/request-validators.jsonld index 5f916d97a1..53927ac92b 100644 --- a/amf-cli/shared/src/test/resources/semantic/aws/apis/request-validators.jsonld +++ b/amf-cli/shared/src/test/resources/semantic/aws/apis/request-validators.jsonld @@ -5,7 +5,7 @@ "@type": [ "raml-doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "raml-doc:transformed": true, "raml-doc:sourceSpec": "AWS OAS 3.0" }, diff --git a/amf-cli/shared/src/test/resources/semantic/aws/apis/tag.jsonld b/amf-cli/shared/src/test/resources/semantic/aws/apis/tag.jsonld index 2326a00733..feda683ddd 100644 --- a/amf-cli/shared/src/test/resources/semantic/aws/apis/tag.jsonld +++ b/amf-cli/shared/src/test/resources/semantic/aws/apis/tag.jsonld @@ -5,7 +5,7 @@ "@type": [ "raml-doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "raml-doc:transformed": true, "raml-doc:sourceSpec": "AWS OAS 3.0" }, diff --git a/amf-cli/shared/src/test/resources/semantic/instance-nested-object.raml.jsonld b/amf-cli/shared/src/test/resources/semantic/instance-nested-object.raml.jsonld index e58df035ef..eed5546b0a 100644 --- a/amf-cli/shared/src/test/resources/semantic/instance-nested-object.raml.jsonld +++ b/amf-cli/shared/src/test/resources/semantic/instance-nested-object.raml.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/semantic/instance-scalar.async.jsonld b/amf-cli/shared/src/test/resources/semantic/instance-scalar.async.jsonld index a6f4c75e64..52ece75ebd 100644 --- a/amf-cli/shared/src/test/resources/semantic/instance-scalar.async.jsonld +++ b/amf-cli/shared/src/test/resources/semantic/instance-scalar.async.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "ASYNC 2.0" }, diff --git a/amf-cli/shared/src/test/resources/semantic/instance-scalar.oas20.jsonld b/amf-cli/shared/src/test/resources/semantic/instance-scalar.oas20.jsonld index 9fa9b173ba..ce2beb78c8 100644 --- a/amf-cli/shared/src/test/resources/semantic/instance-scalar.oas20.jsonld +++ b/amf-cli/shared/src/test/resources/semantic/instance-scalar.oas20.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "OAS 2.0" }, diff --git a/amf-cli/shared/src/test/resources/semantic/instance-scalar.oas30.jsonld b/amf-cli/shared/src/test/resources/semantic/instance-scalar.oas30.jsonld index 60ed57dbb1..ed40e6b307 100644 --- a/amf-cli/shared/src/test/resources/semantic/instance-scalar.oas30.jsonld +++ b/amf-cli/shared/src/test/resources/semantic/instance-scalar.oas30.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "OAS 3.0" }, diff --git a/amf-cli/shared/src/test/resources/semantic/instance-scalar.parsed.async.jsonld b/amf-cli/shared/src/test/resources/semantic/instance-scalar.parsed.async.jsonld index bbb5ebbc3e..68b4fbb0eb 100644 --- a/amf-cli/shared/src/test/resources/semantic/instance-scalar.parsed.async.jsonld +++ b/amf-cli/shared/src/test/resources/semantic/instance-scalar.parsed.async.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "ASYNC 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/semantic/instance-scalar.parsed.oas20.jsonld b/amf-cli/shared/src/test/resources/semantic/instance-scalar.parsed.oas20.jsonld index 32cc7710b0..f7246d0908 100644 --- a/amf-cli/shared/src/test/resources/semantic/instance-scalar.parsed.oas20.jsonld +++ b/amf-cli/shared/src/test/resources/semantic/instance-scalar.parsed.oas20.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "OAS 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/semantic/instance-scalar.parsed.oas30.jsonld b/amf-cli/shared/src/test/resources/semantic/instance-scalar.parsed.oas30.jsonld index 22eb777cf6..860f9309f9 100644 --- a/amf-cli/shared/src/test/resources/semantic/instance-scalar.parsed.oas30.jsonld +++ b/amf-cli/shared/src/test/resources/semantic/instance-scalar.parsed.oas30.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "OAS 3.0" }, { diff --git a/amf-cli/shared/src/test/resources/semantic/instance-scalar.parsed.raml.jsonld b/amf-cli/shared/src/test/resources/semantic/instance-scalar.parsed.raml.jsonld index 2d68efa3fb..c779273374 100644 --- a/amf-cli/shared/src/test/resources/semantic/instance-scalar.parsed.raml.jsonld +++ b/amf-cli/shared/src/test/resources/semantic/instance-scalar.parsed.raml.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/semantic/instance-scalar.raml.jsonld b/amf-cli/shared/src/test/resources/semantic/instance-scalar.raml.jsonld index e107c0c0e3..57f4446c0e 100644 --- a/amf-cli/shared/src/test/resources/semantic/instance-scalar.raml.jsonld +++ b/amf-cli/shared/src/test/resources/semantic/instance-scalar.raml.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/semantic/instance.async.jsonld b/amf-cli/shared/src/test/resources/semantic/instance.async.jsonld index 157ef50ed2..ec9bf5cdef 100644 --- a/amf-cli/shared/src/test/resources/semantic/instance.async.jsonld +++ b/amf-cli/shared/src/test/resources/semantic/instance.async.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "ASYNC 2.0" }, diff --git a/amf-cli/shared/src/test/resources/semantic/instance.oas20.jsonld b/amf-cli/shared/src/test/resources/semantic/instance.oas20.jsonld index 819f34619b..12875cbeb5 100644 --- a/amf-cli/shared/src/test/resources/semantic/instance.oas20.jsonld +++ b/amf-cli/shared/src/test/resources/semantic/instance.oas20.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "OAS 2.0" }, diff --git a/amf-cli/shared/src/test/resources/semantic/instance.oas30.jsonld b/amf-cli/shared/src/test/resources/semantic/instance.oas30.jsonld index 4aa3b707c6..c78cb8fb30 100644 --- a/amf-cli/shared/src/test/resources/semantic/instance.oas30.jsonld +++ b/amf-cli/shared/src/test/resources/semantic/instance.oas30.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "OAS 3.0" }, diff --git a/amf-cli/shared/src/test/resources/semantic/instance.parsed.async.jsonld b/amf-cli/shared/src/test/resources/semantic/instance.parsed.async.jsonld index efe124366f..8f7c19c2e4 100644 --- a/amf-cli/shared/src/test/resources/semantic/instance.parsed.async.jsonld +++ b/amf-cli/shared/src/test/resources/semantic/instance.parsed.async.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "ASYNC 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/semantic/instance.parsed.oas20.jsonld b/amf-cli/shared/src/test/resources/semantic/instance.parsed.oas20.jsonld index e5e6f69720..dfb64601eb 100644 --- a/amf-cli/shared/src/test/resources/semantic/instance.parsed.oas20.jsonld +++ b/amf-cli/shared/src/test/resources/semantic/instance.parsed.oas20.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "OAS 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/semantic/instance.parsed.oas30.jsonld b/amf-cli/shared/src/test/resources/semantic/instance.parsed.oas30.jsonld index 90ad04c342..6683ebe3b2 100644 --- a/amf-cli/shared/src/test/resources/semantic/instance.parsed.oas30.jsonld +++ b/amf-cli/shared/src/test/resources/semantic/instance.parsed.oas30.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "OAS 3.0" }, { diff --git a/amf-cli/shared/src/test/resources/semantic/instance.parsed.raml.jsonld b/amf-cli/shared/src/test/resources/semantic/instance.parsed.raml.jsonld index 2df42bc5f9..b8185239a8 100644 --- a/amf-cli/shared/src/test/resources/semantic/instance.parsed.raml.jsonld +++ b/amf-cli/shared/src/test/resources/semantic/instance.parsed.raml.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/semantic/instance.raml.jsonld b/amf-cli/shared/src/test/resources/semantic/instance.raml.jsonld index 2844cadd61..fde36690f8 100644 --- a/amf-cli/shared/src/test/resources/semantic/instance.raml.jsonld +++ b/amf-cli/shared/src/test/resources/semantic/instance.raml.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/upanddown/additional-properties.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/additional-properties.expanded.jsonld index 6c48fcd1b4..2c013f394e 100644 --- a/amf-cli/shared/src/test/resources/upanddown/additional-properties.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/additional-properties.expanded.jsonld @@ -104,7 +104,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/additional-properties.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/additional-properties.flattened.jsonld index 0111f9f179..3f4fbd0f2f 100644 --- a/amf-cli/shared/src/test/resources/upanddown/additional-properties.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/additional-properties.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/annotations.json.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/annotations.json.expanded.jsonld index 42c43bde8c..d5b64bcffc 100644 --- a/amf-cli/shared/src/test/resources/upanddown/annotations.json.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/annotations.json.expanded.jsonld @@ -538,7 +538,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/annotations.json.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/annotations.json.flattened.jsonld index fdd4a1ce30..8d0b4c4bfd 100644 --- a/amf-cli/shared/src/test/resources/upanddown/annotations.json.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/annotations.json.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/basic.json.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/basic.json.expanded.jsonld index 6fc13ce3ee..3afbb09892 100644 --- a/amf-cli/shared/src/test/resources/upanddown/basic.json.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/basic.json.expanded.jsonld @@ -279,7 +279,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/basic.json.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/basic.json.flattened.jsonld index 2b38f4518e..9a443f74a7 100644 --- a/amf-cli/shared/src/test/resources/upanddown/basic.json.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/basic.json.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/collection-format.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/collection-format.expanded.jsonld index 640621aec5..de53df3b96 100644 --- a/amf-cli/shared/src/test/resources/upanddown/collection-format.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/collection-format.expanded.jsonld @@ -878,7 +878,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/collection-format.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/collection-format.flattened.jsonld index 1075c80e9d..4c96b64baa 100644 --- a/amf-cli/shared/src/test/resources/upanddown/collection-format.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/collection-format.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/complete.json.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/complete.json.expanded.jsonld index a73965eb77..64f738e269 100644 --- a/amf-cli/shared/src/test/resources/upanddown/complete.json.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/complete.json.expanded.jsonld @@ -560,7 +560,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/complete.json.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/complete.json.flattened.jsonld index fc986db024..8d7163299f 100644 --- a/amf-cli/shared/src/test/resources/upanddown/complete.json.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/complete.json.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/async20/asyncApi-2.1-all.yaml b/amf-cli/shared/src/test/resources/upanddown/cycle/async20/asyncApi-2.1-all.yaml new file mode 100644 index 0000000000..4a0a45ad07 --- /dev/null +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/async20/asyncApi-2.1-all.yaml @@ -0,0 +1,92 @@ +asyncapi: 2.1.0 +info: + title: Market Data API + version: 1.0.0 + description: This API provides real-time market data updates. +servers: + theName: + url: some.com + protocol: ibmmq + bindings: + ibmmq: + groupId: test + ccdtQueueManagerName: test + cipherSpec: test + multiEndpointServer: true + heartBeatInterval: 123 +channels: + user/sarasa: + subscribe: + summary: Subscribe to market updates + message: + name: errorMessage + summary: Message with market data information. + description: | + test + payload: + type: object + properties: + prop1: + type: string + examples: + - + name: error + summary: example + headers: + exampleHeader: InlineHeader + payload: + userId: user345 + status: offline + some-channel: + bindings: + ibmmq: + destinationType: test + queue: + objectName: test + isPartitioned: true + exclusive: false + topic: + string: test + objectName: test + durablePermitted: true + lastMsgRetained: false + maxMsgLength: 123 + bindingVersion: test + description: some channel + publish: + bindings: + ibmmq: {} + message: + bindings: + ibmmq: + type: test + description: test + expiry: 123 + bindingVersion: test + headers: test1, test2, test3 + payload: + type: string +components: + messages: + marketData: + name: messageName + summary: Message with market data information. + description: | + test + payload: + $ref: "#/components/schemas/market" + examples: + - + name: updatemessage + summary: explain + payload: + userId: user123 + status: online + headers: + exampleHeader: HeaderValue + schemas: + market: + type: object + properties: + type: + type: string diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/async20/asyncApi-2.2-all.yaml b/amf-cli/shared/src/test/resources/upanddown/cycle/async20/asyncApi-2.2-all.yaml new file mode 100644 index 0000000000..53c90c6871 --- /dev/null +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/async20/asyncApi-2.2-all.yaml @@ -0,0 +1,113 @@ +asyncapi: 2.2.0 +info: + title: Market Data API + version: 1.0.0 + description: This API provides real-time market data updates. +servers: + theName: + url: some.com + protocol: ibmmq + bindings: + ibmmq: + groupId: test + ccdtQueueManagerName: test + cipherSpec: test + multiEndpointServer: true + heartBeatInterval: 123 +channels: + user/sarasa: + subscribe: + summary: Subscribe to market updates + message: + name: errorMessage + summary: Message with market data information. + description: | + test + payload: + type: object + properties: + prop1: + type: string + examples: + - + name: error + summary: example + headers: + exampleHeader: InlineHeader + payload: + userId: user345 + status: offline + some-channel: + bindings: + ibmmq: + destinationType: test + queue: + objectName: test + isPartitioned: true + exclusive: false + topic: + string: test + objectName: test + durablePermitted: true + lastMsgRetained: false + maxMsgLength: 123 + bindingVersion: test + description: some channel + publish: + bindings: + ibmmq: {} + message: + bindings: + ibmmq: + type: test + description: test + expiry: 123 + bindingVersion: test + headers: test1, test2, test3 + payload: + type: string + another-channel: + bindings: + anypointmq: + destination: test + destinationType: test + bindingVersion: 0.1.0 + description: some channel + publish: + bindings: + anypointmq: {} + message: + bindings: + anypointmq: + headers: + type: object + properties: + messageId: + type: string + bindingVersion: 0.1.0 + payload: + type: string +components: + messages: + marketData: + name: messageName + summary: Message with market data information. + description: | + test + payload: + $ref: "#/components/schemas/market" + examples: + - + name: updatemessage + summary: explain + payload: + userId: user123 + status: online + headers: + exampleHeader: HeaderValue + schemas: + market: + type: object + properties: + type: + type: string diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/async20/bindings/gps-message-binding.yaml b/amf-cli/shared/src/test/resources/upanddown/cycle/async20/bindings/gps-message-binding.yaml new file mode 100644 index 0000000000..6267f39e2b --- /dev/null +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/async20/bindings/gps-message-binding.yaml @@ -0,0 +1,35 @@ +asyncapi: 2.5.0 +info: + title: Simple API with GooglePubSub Message Binding + version: 1.0.0 +servers: {} +channels: + topic-proto-schema: + bindings: + googlepubsub: + labels: + label1: label1 + label2: label2 + topic: projects/your-project/topics/topic-proto-schema + messageRetentionDuration: 86400s + messageStoragePolicy: + allowedPersistenceRegions: + - us-central1 + - us-west + schemaSettings: + encoding: binary + name: projects/your-project/schemas/messageAvro + firstRevisionId: 1.0.0 + lastRevisionId: 2.0.0 +components: + messages: + messageAvro: + bindings: + googlepubsub: + attributes: + exampleAttribute: exampleValue + orderingKey: userEventOrder + bindingVersion: 0.1.0 + schema: + name: projects/your-project/schemas/message-avro + type: avro diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/async20/bindings/pulsar-binding-only-required.yaml b/amf-cli/shared/src/test/resources/upanddown/cycle/async20/bindings/pulsar-binding-only-required.yaml new file mode 100644 index 0000000000..ec9e258cd4 --- /dev/null +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/async20/bindings/pulsar-binding-only-required.yaml @@ -0,0 +1,17 @@ +asyncapi: 2.6.0 +info: + title: test pulsar binding + version: 1.0.0 +servers: + theName: + url: some.com + protocol: pulsar + bindings: + pulsar: {} +channels: + some-channel: + bindings: + pulsar: + namespace: test + persistence: test + description: some channel diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/async20/bindings/pulsar-binding.yaml b/amf-cli/shared/src/test/resources/upanddown/cycle/async20/bindings/pulsar-binding.yaml new file mode 100644 index 0000000000..5ec5310e22 --- /dev/null +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/async20/bindings/pulsar-binding.yaml @@ -0,0 +1,30 @@ +asyncapi: 2.6.0 +info: + title: test pulsar binding + version: 1.0.0 +servers: + theName: + url: some.com + protocol: pulsar + bindings: + pulsar: + tenant: test + bindingVersion: 0.1.0 +channels: + some-channel: + bindings: + pulsar: + namespace: test + persistence: test + compaction: 123 + geo-replication: + - test + - strings + - list + retention: + time: 123 + size: 321 + ttl: 12 + deduplication: false + bindingVersion: test + description: some channel diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/async20/bindings/solace-binding.yaml b/amf-cli/shared/src/test/resources/upanddown/cycle/async20/bindings/solace-binding.yaml new file mode 100644 index 0000000000..bf6fe4ac41 --- /dev/null +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/async20/bindings/solace-binding.yaml @@ -0,0 +1,33 @@ +asyncapi: 2.3.0 +info: + title: test solace binding + version: 1.0.0 +servers: + theName: + url: some.com + protocol: solace + bindings: + solace: + msgVpn: test + bindingVersion: 1.2.3 +channels: + some-channel: + publish: + bindings: + solace: + bindingVersion: 0.3.0 + destinations: + - + destinationType: queue + queue: + name: CreatedHREvents + accessType: test + maxMsgSpoolSize: test + maxTtl: test + topicSubscriptions: + - person/*/created + - + destinationType: topic + topic: + topicSubscriptions: + - person/*/updated diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/async20/channel-servers.yaml b/amf-cli/shared/src/test/resources/upanddown/cycle/async20/channel-servers.yaml index 3bf8ed68b1..75ccc87220 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/async20/channel-servers.yaml +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/async20/channel-servers.yaml @@ -2,13 +2,11 @@ asyncapi: 2.2.0 info: title: API version: "1.0" - channels: users/signup: servers: - development - staging - servers: development: url: development.gigantic-server.com diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/async20/messageId.yaml b/amf-cli/shared/src/test/resources/upanddown/cycle/async20/messageId.yaml index f129e32d18..45e5d4c15b 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/async20/messageId.yaml +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/async20/messageId.yaml @@ -10,4 +10,3 @@ components: messages: SomeMessage: messageId: SomeMessage - diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/async20/operation-security-explicit.yaml b/amf-cli/shared/src/test/resources/upanddown/cycle/async20/operation-security-explicit.yaml new file mode 100644 index 0000000000..996650ac8c --- /dev/null +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/async20/operation-security-explicit.yaml @@ -0,0 +1,34 @@ +asyncapi: 2.4.0 +info: + title: API + version: "1.0" +components: + securitySchemes: + oauth2: + type: oauth2 + description: oauth2 security scheme + flows: + implicit: + authorizationUrl: https://a.ml/ + refreshUrl: https://a.ml/ + scopes: + write:pets: modify pets in your account + read:pets: read your pets +servers: + production: + url: mykafkacluster.org:8092 + protocol: kafka-secure + security: + - + oauth2: + - write:pets + - read:pets +channels: + some/events: + servers: + - production + subscribe: + security: + - + oauth2: + - read:pets diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/async20/operation-security-implicit.yaml b/amf-cli/shared/src/test/resources/upanddown/cycle/async20/operation-security-implicit.yaml new file mode 100644 index 0000000000..cb9a904e4b --- /dev/null +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/async20/operation-security-implicit.yaml @@ -0,0 +1,31 @@ +asyncapi: 2.4.0 +info: + title: API + version: "1.0" +components: + securitySchemes: + oauth2: + type: oauth2 + description: oauth2 security scheme + flows: + implicit: + authorizationUrl: https://a.ml/ + refreshUrl: https://a.ml/ + scopes: + write:pets: modify pets in your account + read:pets: read your pets +servers: + production: + url: mykafkacluster.org:8092 + protocol: kafka-secure + security: + - + oauth2: + - write:pets + - read:pets +channels: + some/events: + servers: + - production + subscribe: + security: [] diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/async20/server-variable.yaml b/amf-cli/shared/src/test/resources/upanddown/cycle/async20/server-variable.yaml new file mode 100644 index 0000000000..25823a8503 --- /dev/null +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/async20/server-variable.yaml @@ -0,0 +1,37 @@ +asyncapi: 2.4.0 +info: + title: Sample API with Server Variables + version: 1.0.0 +channels: {} +servers: + production: + url: https://{environment}.example.com/{version} + description: Production server with inline server variables. + protocol: https + variables: + environment: + default: api + description: API environment + version: + default: v1 + description: API version + development: + url: https://{environment}.example.com/{version} + description: Development server using referenced server variables. + protocol: https + variables: + environment: + $ref: "#/components/serverVariables/environment" + version: + $ref: "#/components/serverVariables/version" +components: + servers: + prod: + url: https://pep.com + serverVariables: + environment: + default: dev-api + description: Development API environment + version: + default: v2 + description: Development API version diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/default-arguments/default-arguments.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/default-arguments/default-arguments.jsonld index 583a677cb2..cdbc49125c 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/default-arguments/default-arguments.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/default-arguments/default-arguments.jsonld @@ -532,7 +532,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/default-arguments/invalid-default-arguments.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/default-arguments/invalid-default-arguments.jsonld index 338c727d72..5665f44d1c 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/default-arguments/invalid-default-arguments.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/default-arguments/invalid-default-arguments.jsonld @@ -532,7 +532,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/descriptions/block.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/descriptions/block.jsonld index df729eb582..ede2f1555d 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/descriptions/block.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/descriptions/block.jsonld @@ -812,7 +812,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/descriptions/simple.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/descriptions/simple.jsonld index cbdbec6a4b..c5dba62716 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/descriptions/simple.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/descriptions/simple.jsonld @@ -812,7 +812,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/directive-with-directives/api.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/directive-with-directives/api.jsonld index 9a29914bf7..4339b6879a 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/directive-with-directives/api.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/directive-with-directives/api.jsonld @@ -59,7 +59,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/directives/arguments.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/directives/arguments.jsonld index 8ac39c0351..2e8e845016 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/directives/arguments.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/directives/arguments.jsonld @@ -246,7 +246,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/directives/default.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/directives/default.jsonld index 24ba77b21b..a8afdc304f 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/directives/default.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/directives/default.jsonld @@ -203,7 +203,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/directives/multiple.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/directives/multiple.jsonld index 3e736faeda..f7b62c60e3 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/directives/multiple.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/directives/multiple.jsonld @@ -228,7 +228,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/directives/simple.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/directives/simple.jsonld index 313449b638..09fd67c6ab 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/directives/simple.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/directives/simple.jsonld @@ -196,7 +196,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/fragment-reserved-name/api.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/fragment-reserved-name/api.jsonld index 187dc2652a..dc014bd585 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/fragment-reserved-name/api.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/fragment-reserved-name/api.jsonld @@ -287,7 +287,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/keyword-enum-values/api.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/keyword-enum-values/api.jsonld index b3c8c2eb84..58e5307a68 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/keyword-enum-values/api.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/keyword-enum-values/api.jsonld @@ -165,7 +165,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/keyword-names/api.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/keyword-names/api.jsonld index a713f85ef7..00f0381d87 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/keyword-names/api.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/keyword-names/api.jsonld @@ -165,7 +165,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/non-root-optional-array/api.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/non-root-optional-array/api.jsonld index 9e3cfadc04..0e55a5353f 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/non-root-optional-array/api.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/non-root-optional-array/api.jsonld @@ -410,7 +410,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/invalid/arguments-array.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/invalid/arguments-array.jsonld index 4ed4e78eef..add0838622 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/invalid/arguments-array.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/invalid/arguments-array.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/invalid/arguments.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/invalid/arguments.jsonld index f42690f535..9a0eff6d7d 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/invalid/arguments.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/invalid/arguments.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/invalid/directives.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/invalid/directives.jsonld index 5bf21f100f..66b1117c54 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/invalid/directives.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/invalid/directives.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/invalid/input-objects-array.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/invalid/input-objects-array.jsonld index 3dbb8b0884..62733e93cc 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/invalid/input-objects-array.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/invalid/input-objects-array.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/invalid/input-objects.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/invalid/input-objects.jsonld index 9633a263cc..66179c8bc1 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/invalid/input-objects.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/invalid/input-objects.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/invalid/mix-input-output-objects.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/invalid/mix-input-output-objects.jsonld index 7f9eea30f3..58c6d36e52 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/invalid/mix-input-output-objects.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/invalid/mix-input-output-objects.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/invalid/self.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/invalid/self.jsonld index 8e51342f6b..820bc9af7f 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/invalid/self.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/invalid/self.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/valid/inheritance.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/valid/inheritance.jsonld index ad41587478..582c33c560 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/valid/inheritance.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/valid/inheritance.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/valid/interfaces-array.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/valid/interfaces-array.jsonld index 85eb3442cf..68c2abcd5e 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/valid/interfaces-array.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/valid/interfaces-array.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/valid/interfaces.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/valid/interfaces.jsonld index 445ba65aeb..af8433b175 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/valid/interfaces.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/valid/interfaces.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/valid/mix-interface-objects.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/valid/mix-interface-objects.jsonld index fa7b477d74..146131dea3 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/valid/mix-interface-objects.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/valid/mix-interface-objects.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/valid/objects-array.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/valid/objects-array.jsonld index 5f495be630..40a54990ab 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/valid/objects-array.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/valid/objects-array.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/valid/objects.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/valid/objects.jsonld index 197d0a4729..59a9b1827c 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/valid/objects.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/valid/objects.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/valid/self.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/valid/self.jsonld index e9d838edcb..52376b356c 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/valid/self.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/valid/self.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/valid/union.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/valid/union.jsonld index 87590a372c..9397d2cd15 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/valid/union.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursion/valid/union.jsonld @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursive-inheritance/simple.resolved.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursive-inheritance/simple.resolved.jsonld index 7ddc9e26c0..6265616fc5 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursive-inheritance/simple.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/recursive-inheritance/simple.resolved.jsonld @@ -438,7 +438,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/root-type/non-root-type.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/root-type/non-root-type.jsonld index 0dc4a1dfdc..1b41a154af 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/root-type/non-root-type.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/root-type/non-root-type.jsonld @@ -160,7 +160,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/root-type/root-type.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/root-type/root-type.jsonld index a5516eb788..62b2784325 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/root-type/root-type.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/root-type/root-type.jsonld @@ -245,7 +245,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/simple/api.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/simple/api.jsonld index 8ba0291bf3..3fb39b003c 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/simple/api.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/simple/api.jsonld @@ -693,7 +693,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/swapi/api.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/swapi/api.jsonld index 4b447bc3e0..98cb9f97d4 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/swapi/api.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/graphql/swapi/api.jsonld @@ -3300,7 +3300,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/oas-component/simple.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/oas-component/simple.jsonld index c3f1e7d8d1..512ceef739 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/oas-component/simple.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/oas-component/simple.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], -"http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", +"http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 3.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/oas20/json/pathitem-fragment/api.json.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/oas20/json/pathitem-fragment/api.json.expanded.jsonld index 97d4a39f09..d131530ee5 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/oas20/json/pathitem-fragment/api.json.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/oas20/json/pathitem-fragment/api.json.expanded.jsonld @@ -402,7 +402,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/oas20/json/pathitem-fragment/api.json.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/oas20/json/pathitem-fragment/api.json.flattened.jsonld index 840de98283..e43e5a1a54 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/oas20/json/pathitem-fragment/api.json.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/oas20/json/pathitem-fragment/api.json.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/oas20/json/type-definitions-with-refs.source-info.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/oas20/json/type-definitions-with-refs.source-info.jsonld index 54ddcb5270..b832048bd0 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/oas20/json/type-definitions-with-refs.source-info.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/oas20/json/type-definitions-with-refs.source-info.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "OAS 2.0" }, diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/invalid-param-ref/api.yaml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/invalid-param-ref/api.yaml.expanded.jsonld index b3501f3495..facef7f4f0 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/invalid-param-ref/api.yaml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/invalid-param-ref/api.yaml.expanded.jsonld @@ -329,7 +329,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/invalid-param-ref/api.yaml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/invalid-param-ref/api.yaml.flattened.jsonld index 31feae4d2e..6013de9f86 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/invalid-param-ref/api.yaml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/invalid-param-ref/api.yaml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/multiple-form-data/api.yaml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/multiple-form-data/api.yaml.expanded.jsonld index 4ab560a7b8..12573733d4 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/multiple-form-data/api.yaml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/multiple-form-data/api.yaml.expanded.jsonld @@ -733,7 +733,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/multiple-form-data/api.yaml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/multiple-form-data/api.yaml.flattened.jsonld index b8cb7d3d3f..805885f745 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/multiple-form-data/api.yaml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/multiple-form-data/api.yaml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/param-in-body-link/api.yaml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/param-in-body-link/api.yaml.expanded.jsonld index d12b92b087..ad809ef6a8 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/param-in-body-link/api.yaml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/param-in-body-link/api.yaml.expanded.jsonld @@ -329,7 +329,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/param-in-body-link/api.yaml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/param-in-body-link/api.yaml.flattened.jsonld index 2172d2f3e2..9d6b4ee49c 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/param-in-body-link/api.yaml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/param-in-body-link/api.yaml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/americanflightapi/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/americanflightapi/api.raml.expanded.jsonld index 774cb1b707..cd7bf80d55 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/americanflightapi/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/americanflightapi/api.raml.expanded.jsonld @@ -7917,7 +7917,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/americanflightapi/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/americanflightapi/api.raml.flattened.jsonld index d9f885713c..ddc083dafb 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/americanflightapi/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/americanflightapi/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 0.8" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/base-uri-params-implicit/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/base-uri-params-implicit/api.raml.expanded.jsonld index 2116c3c4ca..51fb3993d7 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/base-uri-params-implicit/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/base-uri-params-implicit/api.raml.expanded.jsonld @@ -776,7 +776,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/base-uri-params-implicit/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/base-uri-params-implicit/api.raml.flattened.jsonld index d034482564..04e774f6cf 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/base-uri-params-implicit/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/base-uri-params-implicit/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 0.8" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/default_value/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/default_value/api.raml.expanded.jsonld index fce023a93a..cebfa54ebf 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/default_value/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/default_value/api.raml.expanded.jsonld @@ -1047,7 +1047,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/default_value/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/default_value/api.raml.flattened.jsonld index 95526eca91..cd6bb49cc8 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/default_value/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/default_value/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 0.8" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/define-uri-parameters/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/define-uri-parameters/api.raml.expanded.jsonld index d91b17b913..03fbdf7e4c 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/define-uri-parameters/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/define-uri-parameters/api.raml.expanded.jsonld @@ -568,7 +568,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/define-uri-parameters/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/define-uri-parameters/api.raml.flattened.jsonld index 0dd21dab4a..479f02c151 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/define-uri-parameters/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/define-uri-parameters/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 0.8" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/empty_payload/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/empty_payload/api.raml.expanded.jsonld index 2348ae514c..be28ae2dfa 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/empty_payload/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/empty_payload/api.raml.expanded.jsonld @@ -278,7 +278,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/empty_payload/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/empty_payload/api.raml.flattened.jsonld index 6b88addc2b..bb557fb7af 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/empty_payload/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/empty_payload/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 0.8" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/file-array/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/file-array/api.raml.expanded.jsonld index 0415730223..49df9f386a 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/file-array/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/file-array/api.raml.expanded.jsonld @@ -481,7 +481,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/file-array/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/file-array/api.raml.flattened.jsonld index a783b424fc..900dc591cf 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/file-array/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/file-array/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 0.8" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/json_schema_array/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/json_schema_array/api.raml.expanded.jsonld index 21f622c2ed..1e0a9f26a1 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/json_schema_array/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/json_schema_array/api.raml.expanded.jsonld @@ -155,7 +155,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/json_schema_array/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/json_schema_array/api.raml.flattened.jsonld index e1da466686..172a063064 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/json_schema_array/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/json_schema_array/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 0.8" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/missing_payload/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/missing_payload/api.raml.expanded.jsonld index 241a7163ab..0ec86a412f 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/missing_payload/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/missing_payload/api.raml.expanded.jsonld @@ -299,7 +299,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/missing_payload/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/missing_payload/api.raml.flattened.jsonld index c8a135763c..01a2de9833 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/missing_payload/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/missing_payload/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 0.8" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/schema-position/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/schema-position/api.raml.expanded.jsonld index df7e057335..f73a1ab598 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/schema-position/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/schema-position/api.raml.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/schema-position/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/schema-position/api.raml.flattened.jsonld index 1b3dea2dab..7ce8dc59c0 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/schema-position/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml08/schema-position/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 0.8" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/all-type-types/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/all-type-types/api.raml.expanded.jsonld index b939df8c20..e582895646 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/all-type-types/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/all-type-types/api.raml.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/all-type-types/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/all-type-types/api.raml.flattened.jsonld index aca5fae2da..41c63734c2 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/all-type-types/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/all-type-types/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-full/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-full/api.raml.expanded.jsonld index 2cd5b33870..7b6b9426bb 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-full/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-full/api.raml.expanded.jsonld @@ -3095,7 +3095,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-full/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-full/api.raml.flattened.jsonld index 464022392b..66d2f885c4 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-full/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-full/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-scalars/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-scalars/api.raml.expanded.jsonld index 23318bca17..4b0738cc0c 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-scalars/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-scalars/api.raml.expanded.jsonld @@ -2136,7 +2136,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-scalars/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-scalars/api.raml.flattened.jsonld index 2fe35586ec..132804de78 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-scalars/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-scalars/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-type-expressions/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-type-expressions/api.raml.expanded.jsonld index a0954258e8..75388fbf97 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-type-expressions/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-type-expressions/api.raml.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-type-expressions/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-type-expressions/api.raml.flattened.jsonld index 5fcc7335e6..0110ca90d4 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-type-expressions/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-type-expressions/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations/api.raml.expanded.jsonld index 8790277908..65432fdb02 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations/api.raml.expanded.jsonld @@ -506,7 +506,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations/api.raml.flattened.jsonld index 7f34aa6e87..4d013e431c 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/api-with-multi-line-schema/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/api-with-multi-line-schema/api.raml.expanded.jsonld index 94defd7512..f91bc7e94d 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/api-with-multi-line-schema/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/api-with-multi-line-schema/api.raml.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/api-with-multi-line-schema/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/api-with-multi-line-schema/api.raml.flattened.jsonld index 7d2537495c..ff45457c4d 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/api-with-multi-line-schema/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/api-with-multi-line-schema/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/array-example/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/array-example/api.raml.expanded.jsonld index 284c112dc2..0e5fb96c80 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/array-example/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/array-example/api.raml.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/array-example/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/array-example/api.raml.flattened.jsonld index cc3f23ae30..f767b1cee2 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/array-example/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/array-example/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/banking-api/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/banking-api/api.raml.expanded.jsonld index 71f4559e9f..f7e517a26a 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/banking-api/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/banking-api/api.raml.expanded.jsonld @@ -2156,7 +2156,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/banking-api/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/banking-api/api.raml.flattened.jsonld index 16d1aa0d9b..2e378fffab 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/banking-api/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/banking-api/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/basic/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/basic/api.raml.expanded.jsonld index a9c7418ceb..a21b1f9af9 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/basic/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/basic/api.raml.expanded.jsonld @@ -276,7 +276,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/basic/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/basic/api.raml.flattened.jsonld index 722c3ac02d..102b015cf6 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/basic/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/basic/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/basic_with_xsd/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/basic_with_xsd/api.raml.expanded.jsonld index 07ab832c3c..5e86d0272a 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/basic_with_xsd/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/basic_with_xsd/api.raml.expanded.jsonld @@ -600,7 +600,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/basic_with_xsd/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/basic_with_xsd/api.raml.flattened.jsonld index 50cf643e4c..2857f3e171 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/basic_with_xsd/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/basic_with_xsd/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/bells with spaces/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/bells with spaces/api.raml.expanded.jsonld index 587d0b8b6d..1079f5bd99 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/bells with spaces/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/bells with spaces/api.raml.expanded.jsonld @@ -780,7 +780,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/bells with spaces/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/bells with spaces/api.raml.flattened.jsonld index 808137582f..a3b555df03 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/bells with spaces/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/bells with spaces/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/boolean-value-in-example/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/boolean-value-in-example/api.raml.expanded.jsonld index 601fd1009f..6ff0116c02 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/boolean-value-in-example/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/boolean-value-in-example/api.raml.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/boolean-value-in-example/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/boolean-value-in-example/api.raml.flattened.jsonld index d81bc681fa..990715305e 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/boolean-value-in-example/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/boolean-value-in-example/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/boolean_in_key/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/boolean_in_key/api.raml.expanded.jsonld index 51eefb04a8..05f873e753 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/boolean_in_key/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/boolean_in_key/api.raml.expanded.jsonld @@ -924,7 +924,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/boolean_in_key/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/boolean_in_key/api.raml.flattened.jsonld index ccc7098836..c0ac8d6466 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/boolean_in_key/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/boolean_in_key/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/chars[]infilespaths/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/chars[]infilespaths/api.raml.expanded.jsonld index 4d53bc6081..35d220f590 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/chars[]infilespaths/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/chars[]infilespaths/api.raml.expanded.jsonld @@ -529,7 +529,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/chars[]infilespaths/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/chars[]infilespaths/api.raml.flattened.jsonld index 4315dfac0e..1231116d99 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/chars[]infilespaths/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/chars[]infilespaths/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-crossed-props/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-crossed-props/api.raml.expanded.jsonld index 2d8602cd77..959d88a9e6 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-crossed-props/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-crossed-props/api.raml.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-crossed-props/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-crossed-props/api.raml.flattened.jsonld index 9a878444e1..bcc44829cf 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-crossed-props/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-crossed-props/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-full-valid/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-full-valid/api.raml.expanded.jsonld index 4f17864c91..82c42e3978 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-full-valid/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-full-valid/api.raml.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-full-valid/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-full-valid/api.raml.flattened.jsonld index 8066e87ffd..924bad0a67 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-full-valid/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-full-valid/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-inheritance/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-inheritance/api.raml.expanded.jsonld index 0b8b2661ba..85cf433976 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-inheritance/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-inheritance/api.raml.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-inheritance/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-inheritance/api.raml.flattened.jsonld index ea28dd976f..0424ef1691 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-inheritance/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-inheritance/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/complete-with-operations/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/complete-with-operations/api.raml.expanded.jsonld index 93925ae266..0d17230e2e 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/complete-with-operations/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/complete-with-operations/api.raml.expanded.jsonld @@ -1633,7 +1633,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/complete-with-operations/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/complete-with-operations/api.raml.flattened.jsonld index aa304e8b63..548405a153 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/complete-with-operations/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/complete-with-operations/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/complete/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/complete/api.raml.expanded.jsonld index 3e8de75fd5..33d8ea67db 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/complete/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/complete/api.raml.expanded.jsonld @@ -527,7 +527,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/complete/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/complete/api.raml.flattened.jsonld index 8250fd077d..d950720258 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/complete/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/complete/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/data-type-fragment/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/data-type-fragment/api.raml.expanded.jsonld index e1548b596a..f8d89439d1 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/data-type-fragment/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/data-type-fragment/api.raml.expanded.jsonld @@ -54,7 +54,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -321,7 +321,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/data-type-fragment/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/data-type-fragment/api.raml.flattened.jsonld index d174b06cd0..41c2224b09 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/data-type-fragment/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/data-type-fragment/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -133,7 +133,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/declarations-small/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/declarations-small/api.raml.expanded.jsonld index f2b313fa63..07358db3cc 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/declarations-small/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/declarations-small/api.raml.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/declarations-small/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/declarations-small/api.raml.flattened.jsonld index 29e42bdd2f..a8185eeba0 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/declarations-small/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/declarations-small/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/declared-security-schemes/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/declared-security-schemes/api.raml.expanded.jsonld index f299020126..83ea716070 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/declared-security-schemes/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/declared-security-schemes/api.raml.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/declared-security-schemes/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/declared-security-schemes/api.raml.flattened.jsonld index ba465fc451..47372c8732 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/declared-security-schemes/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/declared-security-schemes/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/default-types/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/default-types/api.raml.expanded.jsonld index 665e5ecf08..ca716be366 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/default-types/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/default-types/api.raml.expanded.jsonld @@ -1546,7 +1546,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/default-types/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/default-types/api.raml.flattened.jsonld index f83f2ac6a9..b8dbcdb193 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/default-types/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/default-types/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-external-fragment/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-external-fragment/api.raml.expanded.jsonld index 48af290b2f..e7df148fb7 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-external-fragment/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-external-fragment/api.raml.expanded.jsonld @@ -482,7 +482,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-external-fragment/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-external-fragment/api.raml.flattened.jsonld index 8e5a4868f3..521e480769 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-external-fragment/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-external-fragment/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-library/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-library/api.raml.expanded.jsonld index ffbdba45bc..ce5b1e82c3 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-library/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-library/api.raml.expanded.jsonld @@ -18,7 +18,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-library/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-library/api.raml.flattened.jsonld index 8e900567f4..5338698250 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-library/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-library/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-resesponse-securityscheme/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-resesponse-securityscheme/api.raml.expanded.jsonld index 48e183a0b4..3b021622d0 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-resesponse-securityscheme/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-resesponse-securityscheme/api.raml.expanded.jsonld @@ -543,7 +543,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-resesponse-securityscheme/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-resesponse-securityscheme/api.raml.flattened.jsonld index 617f964f28..b9d7460046 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-resesponse-securityscheme/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-resesponse-securityscheme/api.raml.flattened.jsonld @@ -33,7 +33,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty_union/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty_union/api.raml.expanded.jsonld index 6c62d0ea45..7f43356df9 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty_union/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty_union/api.raml.expanded.jsonld @@ -481,7 +481,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty_union/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty_union/api.raml.flattened.jsonld index dfb8b93d1a..bc496a9bc4 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty_union/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty_union/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/endpoints/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/endpoints/api.raml.expanded.jsonld index 594762d68f..11cd2dba27 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/endpoints/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/endpoints/api.raml.expanded.jsonld @@ -823,7 +823,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/endpoints/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/endpoints/api.raml.flattened.jsonld index aeedcd4043..bdcaaf452e 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/endpoints/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/endpoints/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/enum-inheritance/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/enum-inheritance/api.raml.expanded.jsonld index 10a3f13405..bf45c93b66 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/enum-inheritance/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/enum-inheritance/api.raml.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/enum-inheritance/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/enum-inheritance/api.raml.flattened.jsonld index 8ea08fce94..ff2d95f375 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/enum-inheritance/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/enum-inheritance/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/enums/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/enums/api.raml.expanded.jsonld index 71474f9776..abba582929 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/enums/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/enums/api.raml.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/enums/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/enums/api.raml.flattened.jsonld index a462a707bb..9e446fbcaa 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/enums/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/enums/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/example-key-map-without-value/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/example-key-map-without-value/api.raml.expanded.jsonld index ce729b651c..aef6929839 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/example-key-map-without-value/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/example-key-map-without-value/api.raml.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/example-key-map-without-value/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/example-key-map-without-value/api.raml.flattened.jsonld index 8aa64fbe34..bf7620bfa7 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/example-key-map-without-value/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/example-key-map-without-value/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/examples/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/examples/api.raml.expanded.jsonld index 9dff7dd34b..e88761bb7c 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/examples/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/examples/api.raml.expanded.jsonld @@ -3181,7 +3181,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/examples/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/examples/api.raml.flattened.jsonld index 3088b6726b..abb93eb7e6 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/examples/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/examples/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/explicit-&-implicit-type-object/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/explicit-&-implicit-type-object/api.raml.expanded.jsonld index 30b7d6b5b1..ea25c55de0 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/explicit-&-implicit-type-object/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/explicit-&-implicit-type-object/api.raml.expanded.jsonld @@ -959,7 +959,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/explicit-&-implicit-type-object/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/explicit-&-implicit-type-object/api.raml.flattened.jsonld index 5e7d83c835..8097a3bde0 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/explicit-&-implicit-type-object/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/explicit-&-implicit-type-object/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/extensions/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/extensions/api.raml.expanded.jsonld index fd7b48f9e4..c6bf624c04 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/extensions/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/extensions/api.raml.expanded.jsonld @@ -133,7 +133,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -2352,7 +2352,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/extensions/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/extensions/api.raml.flattened.jsonld index 006d4fa523..51ddd979be 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/extensions/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/extensions/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -206,7 +206,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/externals/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/externals/api.raml.expanded.jsonld index 6e907f4377..9c09e2feff 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/externals/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/externals/api.raml.expanded.jsonld @@ -1315,7 +1315,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/externals/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/externals/api.raml.flattened.jsonld index 5fd0a7e79c..59916a7047 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/externals/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/externals/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file-detection/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file-detection/api.raml.expanded.jsonld index 3b85e24c48..7ac0269d4e 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file-detection/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file-detection/api.raml.expanded.jsonld @@ -348,7 +348,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file-detection/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file-detection/api.raml.flattened.jsonld index d949f7adb4..289a132624 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file-detection/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file-detection/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file_type_expression/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file_type_expression/api.raml.expanded.jsonld index 6955c96344..9e791178e4 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file_type_expression/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file_type_expression/api.raml.expanded.jsonld @@ -697,7 +697,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file_type_expression/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file_type_expression/api.raml.flattened.jsonld index ed3cca0ef8..ddea18e4e6 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file_type_expression/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file_type_expression/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file_types/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file_types/api.raml.expanded.jsonld index fc18cb6a48..4483bb2680 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file_types/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file_types/api.raml.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file_types/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file_types/api.raml.flattened.jsonld index 6c39ec3f1b..bcb6e646b3 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file_types/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file_types/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-inherits-reference/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-inherits-reference/api.raml.expanded.jsonld index cb5dc94d6f..f506617975 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-inherits-reference/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-inherits-reference/api.raml.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-inherits-reference/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-inherits-reference/api.raml.flattened.jsonld index 991e046f24..18c14682e8 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-inherits-reference/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-inherits-reference/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-references-types/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-references-types/api.raml.expanded.jsonld index ba1e367ab5..6bc4816711 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-references-types/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-references-types/api.raml.expanded.jsonld @@ -646,7 +646,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-references-types/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-references-types/api.raml.flattened.jsonld index 39d195e766..60a0001d0c 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-references-types/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-references-types/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-shape-custom-properties/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-shape-custom-properties/api.raml.expanded.jsonld index cec2ef5dfb..11a7e4964a 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-shape-custom-properties/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-shape-custom-properties/api.raml.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-shape-custom-properties/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-shape-custom-properties/api.raml.flattened.jsonld index d37d911495..807a58fd25 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-shape-custom-properties/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-shape-custom-properties/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/fragment_usage/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/fragment_usage/api.raml.expanded.jsonld index 5e58ffc73d..42248519ea 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/fragment_usage/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/fragment_usage/api.raml.expanded.jsonld @@ -1473,7 +1473,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/fragment_usage/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/fragment_usage/api.raml.flattened.jsonld index f445ceb6a9..5a54bdd4a1 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/fragment_usage/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/fragment_usage/api.raml.flattened.jsonld @@ -32,7 +32,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/full-example/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/full-example/api.raml.expanded.jsonld index ba9ad4b187..032ef75151 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/full-example/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/full-example/api.raml.expanded.jsonld @@ -3069,7 +3069,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/full-example/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/full-example/api.raml.flattened.jsonld index d3817df8eb..0b65cca5a2 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/full-example/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/full-example/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/implicitly-defined-object/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/implicitly-defined-object/api.raml.expanded.jsonld index 3e4bb55156..de33e5faf6 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/implicitly-defined-object/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/implicitly-defined-object/api.raml.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/implicitly-defined-object/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/implicitly-defined-object/api.raml.flattened.jsonld index 9419cd4951..6e0fa30dcc 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/implicitly-defined-object/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/implicitly-defined-object/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/include-repeated/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/include-repeated/api.raml.expanded.jsonld index a1335d8f94..f50b95fb6f 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/include-repeated/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/include-repeated/api.raml.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/include-repeated/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/include-repeated/api.raml.flattened.jsonld index 0b9a2dd2f6..d26442fd82 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/include-repeated/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/include-repeated/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml.expanded.jsonld index 6d880d73e7..43936888ea 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml.expanded.jsonld @@ -3710,7 +3710,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -4860,7 +4860,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -4933,7 +4933,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -5006,7 +5006,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml.flattened.jsonld index cfd3fb7d06..e471444b7f 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -2964,7 +2964,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -2992,7 +2992,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -3020,7 +3020,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/int_uri_param/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/int_uri_param/api.raml.expanded.jsonld index e18fd4d811..3d38f02b06 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/int_uri_param/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/int_uri_param/api.raml.expanded.jsonld @@ -1210,7 +1210,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/int_uri_param/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/int_uri_param/api.raml.flattened.jsonld index 449ca5b0d3..2a6e8eeb3b 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/int_uri_param/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/int_uri_param/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/jukebox-api/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/jukebox-api/api.raml.expanded.jsonld index 9905aca741..640aec97f4 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/jukebox-api/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/jukebox-api/api.raml.expanded.jsonld @@ -1078,7 +1078,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/jukebox-api/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/jukebox-api/api.raml.flattened.jsonld index 28205a07f3..3334834f4c 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/jukebox-api/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/jukebox-api/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/konst1/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/konst1/api.raml.expanded.jsonld index 86352b2a0f..7e36162e50 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/konst1/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/konst1/api.raml.expanded.jsonld @@ -836,7 +836,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/konst1/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/konst1/api.raml.flattened.jsonld index 1646de70ca..e768df6774 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/konst1/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/konst1/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/lib-alias-reference/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/lib-alias-reference/api.raml.expanded.jsonld index fd0894cea3..04bcfbb7a5 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/lib-alias-reference/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/lib-alias-reference/api.raml.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -394,7 +394,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/lib-alias-reference/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/lib-alias-reference/api.raml.flattened.jsonld index ebb4ab6554..bc1fa73618 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/lib-alias-reference/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/lib-alias-reference/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -160,7 +160,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries-3-alias/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries-3-alias/api.raml.expanded.jsonld index ad83d6f05c..d74b4f2cc2 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries-3-alias/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries-3-alias/api.raml.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -394,7 +394,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries-3-alias/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries-3-alias/api.raml.flattened.jsonld index 68e511adae..40b6572e7f 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries-3-alias/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries-3-alias/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -210,7 +210,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries/api.raml.expanded.jsonld index 5ba901856d..1c213c30c9 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries/api.raml.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -555,7 +555,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries/api.raml.flattened.jsonld index 7dc6e8d6b8..f50fd136bf 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -136,7 +136,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/library-annotations/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/library-annotations/api.raml.expanded.jsonld index dfad30874c..3c6f7c8891 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/library-annotations/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/library-annotations/api.raml.expanded.jsonld @@ -18,7 +18,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/library-annotations/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/library-annotations/api.raml.flattened.jsonld index fa5caf1cd1..ed1efb86ce 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/library-annotations/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/library-annotations/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/matrix-id/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/matrix-id/api.raml.expanded.jsonld index bc9e623e9c..361c84fe2f 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/matrix-id/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/matrix-id/api.raml.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/matrix-id/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/matrix-id/api.raml.flattened.jsonld index 7d0505c0f6..afd6f7111f 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/matrix-id/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/matrix-id/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/matrix/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/matrix/api.raml.expanded.jsonld index 7feceb468a..1dd5cc1588 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/matrix/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/matrix/api.raml.expanded.jsonld @@ -191,7 +191,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/matrix/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/matrix/api.raml.flattened.jsonld index 7ef0707956..a209af8117 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/matrix/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/matrix/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/missing_example/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/missing_example/api.raml.expanded.jsonld index b8a9e520eb..6acb2118eb 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/missing_example/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/missing_example/api.raml.expanded.jsonld @@ -1121,7 +1121,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/missing_example/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/missing_example/api.raml.flattened.jsonld index c42fd53987..b18054adfe 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/missing_example/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/missing_example/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-inheritance-2/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-inheritance-2/api.raml.expanded.jsonld index e735db89f4..d54f7aabb2 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-inheritance-2/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-inheritance-2/api.raml.expanded.jsonld @@ -218,7 +218,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-inheritance-2/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-inheritance-2/api.raml.flattened.jsonld index 86e04e284b..ea71d35e54 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-inheritance-2/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-inheritance-2/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-inheritance/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-inheritance/api.raml.expanded.jsonld index dfe1e1fe67..29e67dbd37 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-inheritance/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-inheritance/api.raml.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-inheritance/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-inheritance/api.raml.flattened.jsonld index 96f620ac27..0d6788389a 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-inheritance/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-inheritance/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-media-types/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-media-types/api.raml.expanded.jsonld index 23e8602cb9..bda23c6c45 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-media-types/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-media-types/api.raml.expanded.jsonld @@ -1151,7 +1151,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-media-types/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-media-types/api.raml.flattened.jsonld index 1fdddda55d..3d7af3cf3b 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-media-types/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-media-types/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/named-example/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/named-example/api.raml.expanded.jsonld index f3149060b0..b9373902f3 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/named-example/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/named-example/api.raml.expanded.jsonld @@ -54,7 +54,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -104,7 +104,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/named-example/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/named-example/api.raml.flattened.jsonld index 6451c05d95..565a245866 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/named-example/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/named-example/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -128,7 +128,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/null-secured-by/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/null-secured-by/api.raml.expanded.jsonld index 62609169a3..b90c5941e5 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/null-secured-by/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/null-secured-by/api.raml.expanded.jsonld @@ -272,7 +272,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/null-secured-by/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/null-secured-by/api.raml.flattened.jsonld index e095580746..f4bf9bffda 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/null-secured-by/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/null-secured-by/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/number_title/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/number_title/api.raml.expanded.jsonld index fda39d8d76..3bf8fff5ba 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/number_title/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/number_title/api.raml.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/number_title/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/number_title/api.raml.flattened.jsonld index 255783ff89..189d3e86a3 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/number_title/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/number_title/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/numeric-facets/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/numeric-facets/api.raml.expanded.jsonld index 793d166c20..b9468db47e 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/numeric-facets/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/numeric-facets/api.raml.expanded.jsonld @@ -572,7 +572,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/numeric-facets/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/numeric-facets/api.raml.flattened.jsonld index 3f9aa1a589..1271c1dbf7 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/numeric-facets/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/numeric-facets/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/oauth_security_scheme/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/oauth_security_scheme/api.raml.expanded.jsonld index 7ddd604e3a..bc25691669 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/oauth_security_scheme/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/oauth_security_scheme/api.raml.expanded.jsonld @@ -90,7 +90,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/oauth_security_scheme/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/oauth_security_scheme/api.raml.flattened.jsonld index 7ebe60b465..5d140d9c92 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/oauth_security_scheme/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/oauth_security_scheme/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/operation-response/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/operation-response/api.raml.expanded.jsonld index c1e4442b37..56559c83fe 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/operation-response/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/operation-response/api.raml.expanded.jsonld @@ -771,7 +771,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/operation-response/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/operation-response/api.raml.flattened.jsonld index 7b749705a2..5daf766561 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/operation-response/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/operation-response/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/overlay/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/overlay/api.raml.expanded.jsonld index b75d24ca3e..effd3c6f00 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/overlay/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/overlay/api.raml.expanded.jsonld @@ -133,7 +133,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -2352,7 +2352,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/overlay/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/overlay/api.raml.flattened.jsonld index 49e7d58339..910899f3c1 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/overlay/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/overlay/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -206,7 +206,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/parameters/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/parameters/api.raml.expanded.jsonld index 73b156c091..374830453e 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/parameters/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/parameters/api.raml.expanded.jsonld @@ -231,7 +231,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/parameters/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/parameters/api.raml.flattened.jsonld index 141a0decaa..c2e4196e90 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/parameters/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/parameters/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/payloads/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/payloads/api.raml.expanded.jsonld index 18dd27b46a..45147f31d4 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/payloads/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/payloads/api.raml.expanded.jsonld @@ -999,7 +999,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/payloads/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/payloads/api.raml.flattened.jsonld index f7f6bce3c6..18e7ab5307 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/payloads/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/payloads/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/query-string/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/query-string/api.raml.expanded.jsonld index 0c7e51dcf4..c933e1bc15 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/query-string/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/query-string/api.raml.expanded.jsonld @@ -485,7 +485,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/query-string/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/query-string/api.raml.flattened.jsonld index f581567599..90ad0ad68e 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/query-string/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/query-string/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/raml-security/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/raml-security/api.raml.expanded.jsonld index ff1a3b34fd..f28da8a0bc 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/raml-security/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/raml-security/api.raml.expanded.jsonld @@ -631,7 +631,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/raml-security/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/raml-security/api.raml.flattened.jsonld index 6cdd99a376..668c53e413 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/raml-security/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/raml-security/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/referenced-example/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/referenced-example/api.raml.expanded.jsonld index 60f24132ea..74068aeeb7 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/referenced-example/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/referenced-example/api.raml.expanded.jsonld @@ -980,7 +980,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -1030,7 +1030,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/referenced-example/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/referenced-example/api.raml.flattened.jsonld index f308e41ff1..807edb05ce 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/referenced-example/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/referenced-example/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -814,7 +814,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-complex-variables/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-complex-variables/api.raml.expanded.jsonld index a2764766af..acd23d66c5 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-complex-variables/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-complex-variables/api.raml.expanded.jsonld @@ -1191,7 +1191,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-complex-variables/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-complex-variables/api.raml.flattened.jsonld index 931968847f..1f59f373a4 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-complex-variables/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-complex-variables/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-fragment/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-fragment/api.raml.expanded.jsonld index 2ff95e754a..908f69bf75 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-fragment/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-fragment/api.raml.expanded.jsonld @@ -54,7 +54,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -650,7 +650,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-fragment/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-fragment/api.raml.flattened.jsonld index 1bb9679cf0..5814de894c 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-fragment/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-fragment/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -130,7 +130,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-multi-transformation/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-multi-transformation/api.raml.expanded.jsonld index 9f7989f8dd..783f345b4c 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-multi-transformation/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-multi-transformation/api.raml.expanded.jsonld @@ -686,7 +686,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-multi-transformation/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-multi-transformation/api.raml.flattened.jsonld index 895d43621f..ba5c22ea92 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-multi-transformation/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-multi-transformation/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/sapi-customer/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/sapi-customer/api.raml.expanded.jsonld index 43387108b4..c15b20c3b8 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/sapi-customer/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/sapi-customer/api.raml.expanded.jsonld @@ -5505,7 +5505,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -5555,7 +5555,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -5628,7 +5628,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/sapi-customer/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/sapi-customer/api.raml.flattened.jsonld index dbade56604..4ff4f43a21 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/sapi-customer/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/sapi-customer/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -4281,7 +4281,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -4309,7 +4309,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/secured-by/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/secured-by/api.raml.expanded.jsonld index a291f4b52b..59c4065864 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/secured-by/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/secured-by/api.raml.expanded.jsonld @@ -2296,7 +2296,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -3034,7 +3034,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/secured-by/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/secured-by/api.raml.flattened.jsonld index 59d742c16c..b689e1d814 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/secured-by/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/secured-by/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -1680,7 +1680,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/security-with-query-string/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/security-with-query-string/api.raml.expanded.jsonld index 9890f35a16..fc427b2e21 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/security-with-query-string/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/security-with-query-string/api.raml.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/security-with-query-string/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/security-with-query-string/api.raml.flattened.jsonld index dc73b6c34b..a15a548263 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/security-with-query-string/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/security-with-query-string/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/security/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/security/api.raml.expanded.jsonld index 990d08f6b9..ccbecd81d4 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/security/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/security/api.raml.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/security/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/security/api.raml.flattened.jsonld index 015360092c..1338e6f46b 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/security/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/security/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_example_type/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_example_type/api.raml.expanded.jsonld index 092cf48519..49ccfbecf5 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_example_type/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_example_type/api.raml.expanded.jsonld @@ -537,7 +537,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -1029,7 +1029,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_example_type/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_example_type/api.raml.flattened.jsonld index 7fb48435aa..1057343b95 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_example_type/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_example_type/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -511,7 +511,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_xml_schema/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_xml_schema/api.raml.expanded.jsonld index b16e768d01..5cd79a3d4b 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_xml_schema/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_xml_schema/api.raml.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_xml_schema/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_xml_schema/api.raml.flattened.jsonld index 09720fae43..2ad835beab 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_xml_schema/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_xml_schema/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/single-array-value/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/single-array-value/api.raml.expanded.jsonld index 6cc2202f79..9471f8db10 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/single-array-value/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/single-array-value/api.raml.expanded.jsonld @@ -2388,7 +2388,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/single-array-value/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/single-array-value/api.raml.flattened.jsonld index 20cf1a57bd..d9805ce6ba 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/single-array-value/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/single-array-value/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/spec_examples_example/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/spec_examples_example/api.raml.expanded.jsonld index 442b61f1c3..340d98e071 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/spec_examples_example/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/spec_examples_example/api.raml.expanded.jsonld @@ -2100,7 +2100,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/spec_examples_example/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/spec_examples_example/api.raml.flattened.jsonld index 11e2cee4f2..336fe4b1a1 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/spec_examples_example/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/spec_examples_example/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/trait-fragment/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/trait-fragment/api.raml.expanded.jsonld index 8b783c4a80..8a485cbc6b 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/trait-fragment/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/trait-fragment/api.raml.expanded.jsonld @@ -54,7 +54,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -423,7 +423,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/trait-fragment/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/trait-fragment/api.raml.flattened.jsonld index 95db59a600..12887dad11 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/trait-fragment/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/trait-fragment/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -128,7 +128,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/trait-string-quoted-node/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/trait-string-quoted-node/api.raml.expanded.jsonld index 2ab913b454..784df4c313 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/trait-string-quoted-node/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/trait-string-quoted-node/api.raml.expanded.jsonld @@ -739,7 +739,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/trait-string-quoted-node/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/trait-string-quoted-node/api.raml.flattened.jsonld index 3fa4d8c5cd..cd890c6d3f 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/trait-string-quoted-node/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/trait-string-quoted-node/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/traits-resource-types/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/traits-resource-types/api.raml.expanded.jsonld index 87f7e83887..4d90739501 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/traits-resource-types/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/traits-resource-types/api.raml.expanded.jsonld @@ -2327,7 +2327,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/traits-resource-types/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/traits-resource-types/api.raml.flattened.jsonld index ee5e5272eb..7ad0a8befa 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/traits-resource-types/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/traits-resource-types/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-chain-with-examples/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-chain-with-examples/api.raml.expanded.jsonld index 3b18070769..f23708fb58 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-chain-with-examples/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-chain-with-examples/api.raml.expanded.jsonld @@ -90,7 +90,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-chain-with-examples/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-chain-with-examples/api.raml.flattened.jsonld index c6628fc958..755040993d 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-chain-with-examples/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-chain-with-examples/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-closed-true/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-closed-true/api.raml.expanded.jsonld index de710af8de..d5ab077bd9 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-closed-true/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-closed-true/api.raml.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-closed-true/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-closed-true/api.raml.flattened.jsonld index f84654b5c8..47fadf528a 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-closed-true/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-closed-true/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-declared-with-square-bracket/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-declared-with-square-bracket/api.raml.expanded.jsonld index 18f19d3b5c..2f7263c0de 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-declared-with-square-bracket/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-declared-with-square-bracket/api.raml.expanded.jsonld @@ -574,7 +574,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-declared-with-square-bracket/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-declared-with-square-bracket/api.raml.flattened.jsonld index beb5f96cd3..f8885d2f1f 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-declared-with-square-bracket/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-declared-with-square-bracket/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-facets/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-facets/api.raml.expanded.jsonld index aa13540de3..05d039ecfa 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-facets/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-facets/api.raml.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-facets/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-facets/api.raml.flattened.jsonld index 79f3f4405c..5f14e8b6d3 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-facets/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-facets/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type_nil_shortcut/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type_nil_shortcut/api.raml.expanded.jsonld index d392e50de6..ae01b55391 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type_nil_shortcut/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type_nil_shortcut/api.raml.expanded.jsonld @@ -137,7 +137,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type_nil_shortcut/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type_nil_shortcut/api.raml.flattened.jsonld index 9b1bbaf92d..aa38bf5420 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type_nil_shortcut/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type_nil_shortcut/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types-dependency/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types-dependency/api.raml.expanded.jsonld index d64dd92819..e4361ae0da 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types-dependency/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types-dependency/api.raml.expanded.jsonld @@ -3151,7 +3151,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types-dependency/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types-dependency/api.raml.flattened.jsonld index 97c1abccc3..ab45a35913 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types-dependency/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types-dependency/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types-facet/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types-facet/api.raml.expanded.jsonld index a80cea9a9d..05cc44cf2f 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types-facet/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types-facet/api.raml.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types-facet/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types-facet/api.raml.flattened.jsonld index ca65537924..6fa98cd412 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types-facet/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types-facet/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types/api.raml.expanded.jsonld index 10d53594d7..4853497e56 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types/api.raml.expanded.jsonld @@ -3304,7 +3304,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types/api.raml.flattened.jsonld index c290fe1f42..7de98efca9 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types_problems2/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types_problems2/api.raml.expanded.jsonld index b76d1818ce..7c8a91c8ec 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types_problems2/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types_problems2/api.raml.expanded.jsonld @@ -993,7 +993,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types_problems2/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types_problems2/api.raml.flattened.jsonld index 28f8212a67..451a01ea39 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types_problems2/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types_problems2/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/unresolved-shape/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/unresolved-shape/api.raml.expanded.jsonld index 4729c102be..6e924ae5b6 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/unresolved-shape/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/unresolved-shape/api.raml.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/unresolved-shape/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/unresolved-shape/api.raml.flattened.jsonld index fdbc1e0b70..02d5aaff6b 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/unresolved-shape/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/unresolved-shape/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/users_accounts/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/users_accounts/api.raml.expanded.jsonld index 97df50bb43..a32497aaf7 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/users_accounts/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/users_accounts/api.raml.expanded.jsonld @@ -1429,7 +1429,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/users_accounts/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/users_accounts/api.raml.flattened.jsonld index b6436a4574..27df8fb6fc 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/users_accounts/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/users_accounts/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml.expanded.jsonld index 09451dbed6..9494efed88 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml.expanded.jsonld @@ -1388,7 +1388,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -1492,7 +1492,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -1670,7 +1670,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -1912,7 +1912,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -2673,7 +2673,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml.flattened.jsonld index a356bff52d..fc3e19c719 100644 --- a/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -1358,7 +1358,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -1394,7 +1394,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -1429,7 +1429,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -1479,7 +1479,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/declared-responses.json.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/declared-responses.json.expanded.jsonld index 85a47a898f..ff289946da 100644 --- a/amf-cli/shared/src/test/resources/upanddown/declared-responses.json.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/declared-responses.json.expanded.jsonld @@ -363,7 +363,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/declared-responses.json.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/declared-responses.json.flattened.jsonld index a9c2cd2778..3dec70fef9 100644 --- a/amf-cli/shared/src/test/resources/upanddown/declared-responses.json.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/declared-responses.json.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/endpoints.json.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/endpoints.json.expanded.jsonld index 2f83ea120d..04feedca5a 100644 --- a/amf-cli/shared/src/test/resources/upanddown/endpoints.json.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/endpoints.json.expanded.jsonld @@ -773,7 +773,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/endpoints.json.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/endpoints.json.flattened.jsonld index f72622e081..e0485db26a 100644 --- a/amf-cli/shared/src/test/resources/upanddown/endpoints.json.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/endpoints.json.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/enums/enums.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/enums/enums.raml.expanded.jsonld index 9a9d3551f0..55655b366d 100644 --- a/amf-cli/shared/src/test/resources/upanddown/enums/enums.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/enums/enums.raml.expanded.jsonld @@ -104,7 +104,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/enums/enums.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/enums/enums.raml.flattened.jsonld index 80963d4ccc..ecb8f44393 100644 --- a/amf-cli/shared/src/test/resources/upanddown/enums/enums.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/enums/enums.raml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/examples.json.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/examples.json.expanded.jsonld index 10b580ed26..16d33430bf 100644 --- a/amf-cli/shared/src/test/resources/upanddown/examples.json.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/examples.json.expanded.jsonld @@ -3558,7 +3558,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/examples.json.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/examples.json.flattened.jsonld index 7e87f2f69e..0466efdf98 100644 --- a/amf-cli/shared/src/test/resources/upanddown/examples.json.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/examples.json.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/externals.json.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/externals.json.expanded.jsonld index 9efb9ef81e..769920ebe3 100644 --- a/amf-cli/shared/src/test/resources/upanddown/externals.json.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/externals.json.expanded.jsonld @@ -1507,7 +1507,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/externals.json.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/externals.json.flattened.jsonld index ca97a88db8..9359422141 100644 --- a/amf-cli/shared/src/test/resources/upanddown/externals.json.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/externals.json.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/file-type.json b/amf-cli/shared/src/test/resources/upanddown/file-type.json index 70d0e0ecd0..ea207edf8b 100644 --- a/amf-cli/shared/src/test/resources/upanddown/file-type.json +++ b/amf-cli/shared/src/test/resources/upanddown/file-type.json @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/form-data-params.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/form-data-params.expanded.jsonld index 20a2c2532f..997d5ec050 100644 --- a/amf-cli/shared/src/test/resources/upanddown/form-data-params.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/form-data-params.expanded.jsonld @@ -570,7 +570,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/form-data-params.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/form-data-params.flattened.jsonld index 045a917c19..0fbd109d00 100644 --- a/amf-cli/shared/src/test/resources/upanddown/form-data-params.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/form-data-params.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/formDataParameters.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/formDataParameters.expanded.jsonld index 0616bf0907..9aa5b49106 100644 --- a/amf-cli/shared/src/test/resources/upanddown/formDataParameters.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/formDataParameters.expanded.jsonld @@ -505,7 +505,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/formDataParameters.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/formDataParameters.flattened.jsonld index b49e05127f..f3ed5410a5 100644 --- a/amf-cli/shared/src/test/resources/upanddown/formDataParameters.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/formDataParameters.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/formdata-parameters-multiple.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/formdata-parameters-multiple.expanded.jsonld index e6b6a04e9e..748ca2b345 100644 --- a/amf-cli/shared/src/test/resources/upanddown/formdata-parameters-multiple.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/formdata-parameters-multiple.expanded.jsonld @@ -952,7 +952,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/formdata-parameters-multiple.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/formdata-parameters-multiple.flattened.jsonld index ca081cf543..b6172aa119 100644 --- a/amf-cli/shared/src/test/resources/upanddown/formdata-parameters-multiple.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/formdata-parameters-multiple.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/full-example.json.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/full-example.json.expanded.jsonld index 22ea602fa8..92c9c44159 100644 --- a/amf-cli/shared/src/test/resources/upanddown/full-example.json.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/full-example.json.expanded.jsonld @@ -3316,7 +3316,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/full-example.json.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/full-example.json.flattened.jsonld index d897b6c020..b81c0aa697 100644 --- a/amf-cli/shared/src/test/resources/upanddown/full-example.json.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/full-example.json.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/grpc/google/any.proto.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/grpc/google/any.proto.expanded.jsonld index 584fc3a0e8..f8ba5d329d 100644 --- a/amf-cli/shared/src/test/resources/upanddown/grpc/google/any.proto.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/grpc/google/any.proto.expanded.jsonld @@ -338,7 +338,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/grpc/google/any.proto.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/grpc/google/any.proto.flattened.jsonld index 1d1dce54d8..1ea6a30143 100644 --- a/amf-cli/shared/src/test/resources/upanddown/grpc/google/any.proto.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/grpc/google/any.proto.flattened.jsonld @@ -54,7 +54,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "Grpc" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/grpc/google/api.proto.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/grpc/google/api.proto.expanded.jsonld index 8d74c634b8..c09d89e504 100644 --- a/amf-cli/shared/src/test/resources/upanddown/grpc/google/api.proto.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/grpc/google/api.proto.expanded.jsonld @@ -338,7 +338,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -833,7 +833,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -7167,7 +7167,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -7662,7 +7662,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -7692,7 +7692,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/grpc/google/api.proto.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/grpc/google/api.proto.flattened.jsonld index bcac0e78e5..671af07cfb 100644 --- a/amf-cli/shared/src/test/resources/upanddown/grpc/google/api.proto.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/grpc/google/api.proto.flattened.jsonld @@ -54,7 +54,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "Grpc" }, { @@ -564,7 +564,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "Grpc" }, { @@ -892,7 +892,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "Grpc" }, { @@ -2216,7 +2216,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "Grpc" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/grpc/google/duration.proto.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/grpc/google/duration.proto.expanded.jsonld index 7c3585ba90..efa47d2e98 100644 --- a/amf-cli/shared/src/test/resources/upanddown/grpc/google/duration.proto.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/grpc/google/duration.proto.expanded.jsonld @@ -387,7 +387,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/grpc/google/duration.proto.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/grpc/google/duration.proto.flattened.jsonld index a194f19228..ee18b3b42e 100644 --- a/amf-cli/shared/src/test/resources/upanddown/grpc/google/duration.proto.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/grpc/google/duration.proto.flattened.jsonld @@ -60,7 +60,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "Grpc" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/grpc/google/empty.proto.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/grpc/google/empty.proto.expanded.jsonld index 7684b078cf..2ee044a561 100644 --- a/amf-cli/shared/src/test/resources/upanddown/grpc/google/empty.proto.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/grpc/google/empty.proto.expanded.jsonld @@ -387,7 +387,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/grpc/google/empty.proto.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/grpc/google/empty.proto.flattened.jsonld index 5fc9b0fe3f..b3a75122af 100644 --- a/amf-cli/shared/src/test/resources/upanddown/grpc/google/empty.proto.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/grpc/google/empty.proto.flattened.jsonld @@ -60,7 +60,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "Grpc" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/grpc/google/field_mask.proto.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/grpc/google/field_mask.proto.expanded.jsonld index ebf95c0eda..fe43e45b23 100644 --- a/amf-cli/shared/src/test/resources/upanddown/grpc/google/field_mask.proto.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/grpc/google/field_mask.proto.expanded.jsonld @@ -387,7 +387,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/grpc/google/field_mask.proto.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/grpc/google/field_mask.proto.flattened.jsonld index 7950a2daf1..c7b63d08b3 100644 --- a/amf-cli/shared/src/test/resources/upanddown/grpc/google/field_mask.proto.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/grpc/google/field_mask.proto.flattened.jsonld @@ -60,7 +60,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "Grpc" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/grpc/google/source_context.proto.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/grpc/google/source_context.proto.expanded.jsonld index c83a84b0b1..95096c6425 100644 --- a/amf-cli/shared/src/test/resources/upanddown/grpc/google/source_context.proto.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/grpc/google/source_context.proto.expanded.jsonld @@ -338,7 +338,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/grpc/google/source_context.proto.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/grpc/google/source_context.proto.flattened.jsonld index da28ef92d1..76f4ec8282 100644 --- a/amf-cli/shared/src/test/resources/upanddown/grpc/google/source_context.proto.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/grpc/google/source_context.proto.flattened.jsonld @@ -54,7 +54,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "Grpc" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/grpc/google/struct.proto.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/grpc/google/struct.proto.expanded.jsonld index 45c55be739..f9c8cf8030 100644 --- a/amf-cli/shared/src/test/resources/upanddown/grpc/google/struct.proto.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/grpc/google/struct.proto.expanded.jsonld @@ -387,7 +387,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/grpc/google/struct.proto.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/grpc/google/struct.proto.flattened.jsonld index afb16e8d40..0f78aad060 100644 --- a/amf-cli/shared/src/test/resources/upanddown/grpc/google/struct.proto.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/grpc/google/struct.proto.flattened.jsonld @@ -60,7 +60,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "Grpc" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/grpc/google/timestamp.proto.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/grpc/google/timestamp.proto.expanded.jsonld index c26fc047c8..65cc261473 100644 --- a/amf-cli/shared/src/test/resources/upanddown/grpc/google/timestamp.proto.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/grpc/google/timestamp.proto.expanded.jsonld @@ -387,7 +387,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/grpc/google/timestamp.proto.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/grpc/google/timestamp.proto.flattened.jsonld index f3e18b52c1..a4a13fceb0 100644 --- a/amf-cli/shared/src/test/resources/upanddown/grpc/google/timestamp.proto.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/grpc/google/timestamp.proto.flattened.jsonld @@ -60,7 +60,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "Grpc" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/grpc/google/type.proto.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/grpc/google/type.proto.expanded.jsonld index 7dbcce0f75..487ecd5a6f 100644 --- a/amf-cli/shared/src/test/resources/upanddown/grpc/google/type.proto.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/grpc/google/type.proto.expanded.jsonld @@ -387,7 +387,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -964,7 +964,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -1459,7 +1459,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/grpc/google/type.proto.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/grpc/google/type.proto.flattened.jsonld index 509745dd59..3f0fadb3f3 100644 --- a/amf-cli/shared/src/test/resources/upanddown/grpc/google/type.proto.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/grpc/google/type.proto.flattened.jsonld @@ -60,7 +60,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "Grpc" }, { @@ -733,7 +733,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "Grpc" }, { @@ -812,7 +812,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "Grpc" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/grpc/google/wrappers.proto.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/grpc/google/wrappers.proto.expanded.jsonld index 8bcd15eec8..7cdcae11dd 100644 --- a/amf-cli/shared/src/test/resources/upanddown/grpc/google/wrappers.proto.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/grpc/google/wrappers.proto.expanded.jsonld @@ -387,7 +387,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/grpc/google/wrappers.proto.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/grpc/google/wrappers.proto.flattened.jsonld index d12d81c039..b5a37f4b48 100644 --- a/amf-cli/shared/src/test/resources/upanddown/grpc/google/wrappers.proto.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/grpc/google/wrappers.proto.flattened.jsonld @@ -60,7 +60,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "Grpc" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/grpc/simple.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/grpc/simple.expanded.jsonld index f4ea332370..0486eafdf5 100644 --- a/amf-cli/shared/src/test/resources/upanddown/grpc/simple.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/grpc/simple.expanded.jsonld @@ -1230,7 +1230,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -1464,7 +1464,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/grpc/simple.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/grpc/simple.flattened.jsonld index 74e7e08307..5585664711 100644 --- a/amf-cli/shared/src/test/resources/upanddown/grpc/simple.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/grpc/simple.flattened.jsonld @@ -46,7 +46,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "Grpc" }, { @@ -1320,7 +1320,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "Grpc" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/oas-fragment-ref/api.resolved.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/oas-fragment-ref/api.resolved.expanded.jsonld index 867bd02b8d..886aa0693c 100644 --- a/amf-cli/shared/src/test/resources/upanddown/oas-fragment-ref/api.resolved.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/oas-fragment-ref/api.resolved.expanded.jsonld @@ -388,7 +388,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/oas-fragment-ref/api.resolved.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/oas-fragment-ref/api.resolved.flattened.jsonld index 92ad06be34..4ae3fdff6a 100644 --- a/amf-cli/shared/src/test/resources/upanddown/oas-fragment-ref/api.resolved.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/oas-fragment-ref/api.resolved.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, diff --git a/amf-cli/shared/src/test/resources/upanddown/oas3/parameter-payload-resolution/parameter-payload-examples.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/oas3/parameter-payload-resolution/parameter-payload-examples.expanded.jsonld index 2ba1e834c1..ec3b66a900 100644 --- a/amf-cli/shared/src/test/resources/upanddown/oas3/parameter-payload-resolution/parameter-payload-examples.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/oas3/parameter-payload-resolution/parameter-payload-examples.expanded.jsonld @@ -250,7 +250,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/oas3/parameter-payload-resolution/parameter-payload-examples.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/oas3/parameter-payload-resolution/parameter-payload-examples.flattened.jsonld index 832b5069a9..bad263f8b2 100644 --- a/amf-cli/shared/src/test/resources/upanddown/oas3/parameter-payload-resolution/parameter-payload-examples.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/oas3/parameter-payload-resolution/parameter-payload-examples.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "OAS 3.0" }, diff --git a/amf-cli/shared/src/test/resources/upanddown/oas3/summary-description-in-path/description-applied-to-operations-resolution.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/oas3/summary-description-in-path/description-applied-to-operations-resolution.expanded.jsonld index bb276ea9f7..e911c86eab 100644 --- a/amf-cli/shared/src/test/resources/upanddown/oas3/summary-description-in-path/description-applied-to-operations-resolution.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/oas3/summary-description-in-path/description-applied-to-operations-resolution.expanded.jsonld @@ -1236,7 +1236,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/oas3/summary-description-in-path/description-applied-to-operations-resolution.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/oas3/summary-description-in-path/description-applied-to-operations-resolution.flattened.jsonld index dfcbc1bb2c..e0e377e30c 100644 --- a/amf-cli/shared/src/test/resources/upanddown/oas3/summary-description-in-path/description-applied-to-operations-resolution.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/oas3/summary-description-in-path/description-applied-to-operations-resolution.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "OAS 3.0" }, diff --git a/amf-cli/shared/src/test/resources/upanddown/oas_foward_definitions.resolved.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/oas_foward_definitions.resolved.expanded.jsonld index 5aee7a319d..19ae48f556 100644 --- a/amf-cli/shared/src/test/resources/upanddown/oas_foward_definitions.resolved.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/oas_foward_definitions.resolved.expanded.jsonld @@ -190,7 +190,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/oas_foward_definitions.resolved.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/oas_foward_definitions.resolved.flattened.jsonld index 082b497290..dc87d103d4 100644 --- a/amf-cli/shared/src/test/resources/upanddown/oas_foward_definitions.resolved.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/oas_foward_definitions.resolved.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, diff --git a/amf-cli/shared/src/test/resources/upanddown/oas_response_declaration.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/oas_response_declaration.expanded.jsonld index 39a237ab2f..f6dbd0596b 100644 --- a/amf-cli/shared/src/test/resources/upanddown/oas_response_declaration.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/oas_response_declaration.expanded.jsonld @@ -291,7 +291,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/oas_response_declaration.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/oas_response_declaration.flattened.jsonld index 556dfbf296..dda8ccf703 100644 --- a/amf-cli/shared/src/test/resources/upanddown/oas_response_declaration.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/oas_response_declaration.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/oas_response_declaration.resolved.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/oas_response_declaration.resolved.expanded.jsonld index d01c6cb63f..e08edee5b2 100644 --- a/amf-cli/shared/src/test/resources/upanddown/oas_response_declaration.resolved.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/oas_response_declaration.resolved.expanded.jsonld @@ -424,7 +424,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/oas_response_declaration.resolved.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/oas_response_declaration.resolved.flattened.jsonld index f93ea4f2e0..ab564a8be2 100644 --- a/amf-cli/shared/src/test/resources/upanddown/oas_response_declaration.resolved.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/oas_response_declaration.resolved.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, diff --git a/amf-cli/shared/src/test/resources/upanddown/orphan_extensions.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/orphan_extensions.expanded.jsonld index 0469a35618..0fcd280570 100644 --- a/amf-cli/shared/src/test/resources/upanddown/orphan_extensions.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/orphan_extensions.expanded.jsonld @@ -621,7 +621,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/orphan_extensions.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/orphan_extensions.flattened.jsonld index 8ba9bf9547..b1ee0d6f62 100644 --- a/amf-cli/shared/src/test/resources/upanddown/orphan_extensions.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/orphan_extensions.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/parameters.json.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/parameters.json.expanded.jsonld index 884b61de99..b1e5c7b1fc 100644 --- a/amf-cli/shared/src/test/resources/upanddown/parameters.json.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/parameters.json.expanded.jsonld @@ -234,7 +234,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/parameters.json.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/parameters.json.flattened.jsonld index 6bb6c59586..713a390b25 100644 --- a/amf-cli/shared/src/test/resources/upanddown/parameters.json.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/parameters.json.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/petstore/petstore.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/petstore/petstore.expanded.jsonld index c781849a9d..2490a5ea0c 100644 --- a/amf-cli/shared/src/test/resources/upanddown/petstore/petstore.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/petstore/petstore.expanded.jsonld @@ -627,7 +627,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/petstore/petstore.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/petstore/petstore.flattened.jsonld index c623e3240b..ff7b194c69 100644 --- a/amf-cli/shared/src/test/resources/upanddown/petstore/petstore.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/petstore/petstore.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/query-string.json.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/query-string.json.expanded.jsonld index c9a33f56eb..765b76f0c3 100644 --- a/amf-cli/shared/src/test/resources/upanddown/query-string.json.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/query-string.json.expanded.jsonld @@ -530,7 +530,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/query-string.json.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/query-string.json.flattened.jsonld index 7ddf7bd4fa..19c97f51b6 100644 --- a/amf-cli/shared/src/test/resources/upanddown/query-string.json.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/query-string.json.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/raml08/schemas-lexical-info.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/raml08/schemas-lexical-info.expanded.jsonld index eafc9112ec..a06f346651 100644 --- a/amf-cli/shared/src/test/resources/upanddown/raml08/schemas-lexical-info.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/raml08/schemas-lexical-info.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/raml08/schemas-lexical-info.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/raml08/schemas-lexical-info.flattened.jsonld index 58679163c8..8eb401a00b 100644 --- a/amf-cli/shared/src/test/resources/upanddown/raml08/schemas-lexical-info.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/raml08/schemas-lexical-info.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 0.8" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/raml10/annotations/api.jsonld b/amf-cli/shared/src/test/resources/upanddown/raml10/annotations/api.jsonld index 94cfaca47f..1fb95c41b2 100644 --- a/amf-cli/shared/src/test/resources/upanddown/raml10/annotations/api.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/raml10/annotations/api.jsonld @@ -376,7 +376,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/raml10/array-override/api.jsonld b/amf-cli/shared/src/test/resources/upanddown/raml10/array-override/api.jsonld index 3942c10105..8b73eacea5 100644 --- a/amf-cli/shared/src/test/resources/upanddown/raml10/array-override/api.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/raml10/array-override/api.jsonld @@ -58,7 +58,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/raml10/duplicate-id-in-param-types/api.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/raml10/duplicate-id-in-param-types/api.expanded.jsonld index 7eaae4ee49..df7c8e0ac9 100644 --- a/amf-cli/shared/src/test/resources/upanddown/raml10/duplicate-id-in-param-types/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/raml10/duplicate-id-in-param-types/api.expanded.jsonld @@ -1428,7 +1428,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/raml10/duplicate-id-in-param-types/api.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/raml10/duplicate-id-in-param-types/api.flattened.jsonld index 66da1c8e2a..ac77999ddc 100644 --- a/amf-cli/shared/src/test/resources/upanddown/raml10/duplicate-id-in-param-types/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/raml10/duplicate-id-in-param-types/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions-in-resource-types/api.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions-in-resource-types/api.expanded.jsonld index 43cd0b7f44..f0255445e1 100644 --- a/amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions-in-resource-types/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions-in-resource-types/api.expanded.jsonld @@ -496,7 +496,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions-in-resource-types/api.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions-in-resource-types/api.flattened.jsonld index e1e73cd120..0ece6c4558 100644 --- a/amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions-in-resource-types/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions-in-resource-types/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions-in-traits/api.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions-in-traits/api.expanded.jsonld index 2496b36bac..70c7ab860b 100644 --- a/amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions-in-traits/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions-in-traits/api.expanded.jsonld @@ -472,7 +472,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions-in-traits/api.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions-in-traits/api.flattened.jsonld index 69c4b52b33..4c9ef010ce 100644 --- a/amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions-in-traits/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions-in-traits/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.expanded.jsonld index d77b607645..8d6d2ae6b3 100644 --- a/amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.expanded.jsonld @@ -192,7 +192,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.flattened.jsonld index 215f06bc1c..eebb230395 100644 --- a/amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/raml10/nillable-type-in-parameter/api.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/raml10/nillable-type-in-parameter/api.expanded.jsonld index 7291840ccd..1e61fdbec6 100644 --- a/amf-cli/shared/src/test/resources/upanddown/raml10/nillable-type-in-parameter/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/raml10/nillable-type-in-parameter/api.expanded.jsonld @@ -2405,7 +2405,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/raml10/nillable-type-in-parameter/api.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/raml10/nillable-type-in-parameter/api.flattened.jsonld index 79b575b1a1..73a25396b8 100644 --- a/amf-cli/shared/src/test/resources/upanddown/raml10/nillable-type-in-parameter/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/raml10/nillable-type-in-parameter/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/raml10/raml-default-schema-version.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/raml10/raml-default-schema-version.expanded.jsonld index ffaa18f2fd..9cbd312f2d 100644 --- a/amf-cli/shared/src/test/resources/upanddown/raml10/raml-default-schema-version.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/raml10/raml-default-schema-version.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/raml10/raml-default-schema-version.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/raml10/raml-default-schema-version.flattened.jsonld index 472ea21acc..49f716973b 100644 --- a/amf-cli/shared/src/test/resources/upanddown/raml10/raml-default-schema-version.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/raml10/raml-default-schema-version.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/raml10/raml-reference-draft-7.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/raml10/raml-reference-draft-7.expanded.jsonld index e21c1ec597..26b37ccc72 100644 --- a/amf-cli/shared/src/test/resources/upanddown/raml10/raml-reference-draft-7.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/raml10/raml-reference-draft-7.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/raml10/raml-reference-draft-7.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/raml10/raml-reference-draft-7.flattened.jsonld index 5edc68e1fc..e1b2c43117 100644 --- a/amf-cli/shared/src/test/resources/upanddown/raml10/raml-reference-draft-7.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/raml10/raml-reference-draft-7.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/raml10/type-with-json-schema-in-type-facet.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/raml10/type-with-json-schema-in-type-facet.expanded.jsonld index b0a8008e18..79a2d55964 100644 --- a/amf-cli/shared/src/test/resources/upanddown/raml10/type-with-json-schema-in-type-facet.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/raml10/type-with-json-schema-in-type-facet.expanded.jsonld @@ -72,7 +72,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/raml10/type-with-json-schema-in-type-facet.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/raml10/type-with-json-schema-in-type-facet.flattened.jsonld index e4dc0122a3..5b1955971e 100644 --- a/amf-cli/shared/src/test/resources/upanddown/raml10/type-with-json-schema-in-type-facet.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/raml10/type-with-json-schema-in-type-facet.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/raml10/union-combinatorial/api.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/raml10/union-combinatorial/api.expanded.jsonld index bfb5d7d96b..ae561cf1e7 100644 --- a/amf-cli/shared/src/test/resources/upanddown/raml10/union-combinatorial/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/raml10/union-combinatorial/api.expanded.jsonld @@ -58,7 +58,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/raml10/union-combinatorial/api.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/raml10/union-combinatorial/api.flattened.jsonld index 10fdf511d4..60efa934ad 100644 --- a/amf-cli/shared/src/test/resources/upanddown/raml10/union-combinatorial/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/raml10/union-combinatorial/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/upanddown/raml10/unions/triple-unions.resolved.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/raml10/unions/triple-unions.resolved.expanded.jsonld index f15bc0a9f6..7dc8c12b03 100644 --- a/amf-cli/shared/src/test/resources/upanddown/raml10/unions/triple-unions.resolved.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/raml10/unions/triple-unions.resolved.expanded.jsonld @@ -42,7 +42,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/raml10/unions/triple-unions.resolved.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/raml10/unions/triple-unions.resolved.flattened.jsonld index 9c14f6f024..41b2eeb812 100644 --- a/amf-cli/shared/src/test/resources/upanddown/raml10/unions/triple-unions.resolved.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/raml10/unions/triple-unions.resolved.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/upanddown/security-with-query-string.json.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/security-with-query-string.json.expanded.jsonld index 2602f1f7cb..38cde7ce07 100644 --- a/amf-cli/shared/src/test/resources/upanddown/security-with-query-string.json.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/security-with-query-string.json.expanded.jsonld @@ -104,7 +104,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/security-with-query-string.json.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/security-with-query-string.json.flattened.jsonld index 2af64ed66b..cb152fc71f 100644 --- a/amf-cli/shared/src/test/resources/upanddown/security-with-query-string.json.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/security-with-query-string.json.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/security.json.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/security.json.expanded.jsonld index 166fcc3a53..e0abbd3ea9 100644 --- a/amf-cli/shared/src/test/resources/upanddown/security.json.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/security.json.expanded.jsonld @@ -104,7 +104,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/security.json.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/security.json.flattened.jsonld index f035d1b1be..95a4250581 100644 --- a/amf-cli/shared/src/test/resources/upanddown/security.json.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/security.json.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/shapes-with-items.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/shapes-with-items.expanded.jsonld index fd99f21912..5610908041 100644 --- a/amf-cli/shared/src/test/resources/upanddown/shapes-with-items.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/shapes-with-items.expanded.jsonld @@ -774,7 +774,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/shapes-with-items.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/shapes-with-items.flattened.jsonld index 52c6dd0327..68384abe72 100644 --- a/amf-cli/shared/src/test/resources/upanddown/shapes-with-items.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/shapes-with-items.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/simple_example_type.resolved.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/simple_example_type.resolved.expanded.jsonld index 6ee24e3fc6..6c09b42a3f 100644 --- a/amf-cli/shared/src/test/resources/upanddown/simple_example_type.resolved.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/simple_example_type.resolved.expanded.jsonld @@ -191,7 +191,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ @@ -411,7 +411,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/simple_example_type.resolved.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/simple_example_type.resolved.flattened.jsonld index d2abfe3897..94c8c77c25 100644 --- a/amf-cli/shared/src/test/resources/upanddown/simple_example_type.resolved.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/simple_example_type.resolved.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, @@ -385,7 +385,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "RAML 1.0" } ], diff --git a/amf-cli/shared/src/test/resources/upanddown/tags.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/tags.expanded.jsonld index 4ae1b1ca79..f6cb8fd957 100644 --- a/amf-cli/shared/src/test/resources/upanddown/tags.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/tags.expanded.jsonld @@ -537,7 +537,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/tags.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/tags.flattened.jsonld index 37fb701c39..e58a9a87e2 100644 --- a/amf-cli/shared/src/test/resources/upanddown/tags.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/tags.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/traits-resource-types.json.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/traits-resource-types.json.expanded.jsonld index 60b571634e..d97c9d38ea 100644 --- a/amf-cli/shared/src/test/resources/upanddown/traits-resource-types.json.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/traits-resource-types.json.expanded.jsonld @@ -2318,7 +2318,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/traits-resource-types.json.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/traits-resource-types.json.flattened.jsonld index b63e031542..7302f479b7 100644 --- a/amf-cli/shared/src/test/resources/upanddown/traits-resource-types.json.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/traits-resource-types.json.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/type-facets.json.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/type-facets.json.expanded.jsonld index 247fe3387b..7a698c78d1 100644 --- a/amf-cli/shared/src/test/resources/upanddown/type-facets.json.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/type-facets.json.expanded.jsonld @@ -104,7 +104,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/type-facets.json.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/type-facets.json.flattened.jsonld index 76267e6518..0c7f45edd5 100644 --- a/amf-cli/shared/src/test/resources/upanddown/type-facets.json.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/type-facets.json.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/types-dependency.json.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/types-dependency.json.expanded.jsonld index 5dcea1cd5a..69ff4362ba 100644 --- a/amf-cli/shared/src/test/resources/upanddown/types-dependency.json.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/types-dependency.json.expanded.jsonld @@ -2915,7 +2915,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/types-dependency.json.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/types-dependency.json.flattened.jsonld index 65a3744308..8e400a9ee2 100644 --- a/amf-cli/shared/src/test/resources/upanddown/types-dependency.json.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/types-dependency.json.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/types-facet.json.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/types-facet.json.expanded.jsonld index 9d3de5b0af..14fb15a821 100644 --- a/amf-cli/shared/src/test/resources/upanddown/types-facet.json.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/types-facet.json.expanded.jsonld @@ -104,7 +104,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/types-facet.json.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/types-facet.json.flattened.jsonld index 3f8227c2e9..b075ce25e3 100644 --- a/amf-cli/shared/src/test/resources/upanddown/types-facet.json.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/types-facet.json.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/upanddown/union_arrays.resolved.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/union_arrays.resolved.expanded.jsonld index 2c49f3e4f4..ef2759ac36 100644 --- a/amf-cli/shared/src/test/resources/upanddown/union_arrays.resolved.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/union_arrays.resolved.expanded.jsonld @@ -42,7 +42,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/union_arrays.resolved.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/union_arrays.resolved.flattened.jsonld index 529698139f..6e56adc2c8 100644 --- a/amf-cli/shared/src/test/resources/upanddown/union_arrays.resolved.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/union_arrays.resolved.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/upanddown/with_references_resolved.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/with_references_resolved.expanded.jsonld index 16b3bc0855..b3190b2de2 100644 --- a/amf-cli/shared/src/test/resources/upanddown/with_references_resolved.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/with_references_resolved.expanded.jsonld @@ -1610,7 +1610,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/upanddown/with_references_resolved.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/with_references_resolved.flattened.jsonld index 72206b4c5d..ee0ccb70f7 100644 --- a/amf-cli/shared/src/test/resources/upanddown/with_references_resolved.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/with_references_resolved.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/validations/api-with-xml-examples/api.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/api-with-xml-examples/api.expanded.jsonld index 6ef6044677..95f5ed4758 100644 --- a/amf-cli/shared/src/test/resources/validations/api-with-xml-examples/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/api-with-xml-examples/api.expanded.jsonld @@ -762,7 +762,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/validations/api-with-xml-examples/api.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/api-with-xml-examples/api.flattened.jsonld index 10d33a5500..59f8c84639 100644 --- a/amf-cli/shared/src/test/resources/validations/api-with-xml-examples/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/api-with-xml-examples/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 0.8" }, diff --git a/amf-cli/shared/src/test/resources/validations/async20/amqp-channel-binding.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/async20/amqp-channel-binding.expanded.jsonld index a7c5a5a6e1..3515a793ec 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/amqp-channel-binding.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/amqp-channel-binding.expanded.jsonld @@ -557,7 +557,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/validations/async20/amqp-channel-binding.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/async20/amqp-channel-binding.flattened.jsonld index 06f90b10d3..c9a8fad93e 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/amqp-channel-binding.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/amqp-channel-binding.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/validations/async20/amqp-message-binding.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/async20/amqp-message-binding.expanded.jsonld index f9fe509d0a..d3278c0782 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/amqp-message-binding.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/amqp-message-binding.expanded.jsonld @@ -401,7 +401,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/validations/async20/amqp-message-binding.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/async20/amqp-message-binding.flattened.jsonld index 396aeef6b7..4bc50c51c3 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/amqp-message-binding.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/amqp-message-binding.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/validations/async20/amqp-operation-binding.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/async20/amqp-operation-binding.expanded.jsonld index 4dc6e33f3c..a9fe716957 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/amqp-operation-binding.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/amqp-operation-binding.expanded.jsonld @@ -663,7 +663,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/validations/async20/amqp-operation-binding.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/async20/amqp-operation-binding.flattened.jsonld index 1390926cc3..87d7cc535c 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/amqp-operation-binding.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/amqp-operation-binding.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/validations/async20/channel-parameters.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/async20/channel-parameters.expanded.jsonld index 18e607eaa8..841967f36e 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/channel-parameters.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/channel-parameters.expanded.jsonld @@ -612,7 +612,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/validations/async20/channel-parameters.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/async20/channel-parameters.flattened.jsonld index 32fd22369a..20bd6961b6 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/channel-parameters.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/channel-parameters.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/validations/async20/components/async-components.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/async20/components/async-components.expanded.jsonld index 63239c1a53..d669122c38 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/components/async-components.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/components/async-components.expanded.jsonld @@ -1293,7 +1293,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/validations/async20/components/async-components.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/async20/components/async-components.flattened.jsonld index 512edeb1f0..a9ce4876de 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/components/async-components.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/components/async-components.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/validations/async20/components/external-operation-traits.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/async20/components/external-operation-traits.expanded.jsonld index f78ffdd709..ec92f53cf7 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/components/external-operation-traits.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/components/external-operation-traits.expanded.jsonld @@ -316,7 +316,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/validations/async20/components/external-operation-traits.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/async20/components/external-operation-traits.flattened.jsonld index 2dca6b322b..11bed6cfe0 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/components/external-operation-traits.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/components/external-operation-traits.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/validations/async20/components/message-traits.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/async20/components/message-traits.expanded.jsonld index 60ce35476c..03f1addf76 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/components/message-traits.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/components/message-traits.expanded.jsonld @@ -463,7 +463,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/validations/async20/components/message-traits.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/async20/components/message-traits.flattened.jsonld index 49bb62434e..4ba79097ab 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/components/message-traits.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/components/message-traits.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/validations/async20/components/operation-traits.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/async20/components/operation-traits.expanded.jsonld index b9f8baabe3..0fa4308ad3 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/components/operation-traits.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/components/operation-traits.expanded.jsonld @@ -280,7 +280,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/validations/async20/components/operation-traits.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/async20/components/operation-traits.flattened.jsonld index 832b44b1a5..61f0fed256 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/components/operation-traits.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/components/operation-traits.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/validations/async20/draft-7-schemas.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/async20/draft-7-schemas.expanded.jsonld index 3aa459b064..3fce524914 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/draft-7-schemas.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/draft-7-schemas.expanded.jsonld @@ -6375,7 +6375,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/validations/async20/draft-7-schemas.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/async20/draft-7-schemas.flattened.jsonld index 4aab3bb736..7ff92f47b0 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/draft-7-schemas.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/draft-7-schemas.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/validations/async20/draft-7/references.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/async20/draft-7/references.expanded.jsonld index cd9d91bd86..84e6872cf2 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/draft-7/references.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/draft-7/references.expanded.jsonld @@ -90,7 +90,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/validations/async20/draft-7/references.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/async20/draft-7/references.flattened.jsonld index 5b71606195..c6c7334692 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/draft-7/references.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/draft-7/references.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/validations/async20/empty-binding-and-annotations.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/async20/empty-binding-and-annotations.expanded.jsonld index 845cd236a4..1259a01e73 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/empty-binding-and-annotations.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/empty-binding-and-annotations.expanded.jsonld @@ -3080,7 +3080,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/validations/async20/empty-binding-and-annotations.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/async20/empty-binding-and-annotations.flattened.jsonld index d213e5901c..0d2935990e 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/empty-binding-and-annotations.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/empty-binding-and-annotations.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/validations/async20/http-message-binding.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/async20/http-message-binding.expanded.jsonld index 7abecc3caa..80aa9541f0 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/http-message-binding.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/http-message-binding.expanded.jsonld @@ -605,7 +605,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/validations/async20/http-message-binding.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/async20/http-message-binding.flattened.jsonld index 0d0fb6a795..1b29f3cc89 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/http-message-binding.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/http-message-binding.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/validations/async20/http-operation-binding.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/async20/http-operation-binding.expanded.jsonld index 29850b6599..d8a6232b46 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/http-operation-binding.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/http-operation-binding.expanded.jsonld @@ -592,7 +592,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/validations/async20/http-operation-binding.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/async20/http-operation-binding.flattened.jsonld index 9c6ecb5ea5..7719109f56 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/http-operation-binding.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/http-operation-binding.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/validations/async20/kafka-message-binding.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/async20/kafka-message-binding.expanded.jsonld index 8e084cf401..8e2a40b6e1 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/kafka-message-binding.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/kafka-message-binding.expanded.jsonld @@ -471,7 +471,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/validations/async20/kafka-message-binding.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/async20/kafka-message-binding.flattened.jsonld index 1f589e70b9..057385e562 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/kafka-message-binding.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/kafka-message-binding.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/validations/async20/kafka-operation-binding.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/async20/kafka-operation-binding.expanded.jsonld index 9c2fc3e3a3..c0258bab7a 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/kafka-operation-binding.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/kafka-operation-binding.expanded.jsonld @@ -605,7 +605,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/validations/async20/kafka-operation-binding.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/async20/kafka-operation-binding.flattened.jsonld index 048a30d6a1..c1c9817c30 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/kafka-operation-binding.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/kafka-operation-binding.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/validations/async20/message-obj.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/async20/message-obj.expanded.jsonld index b0bbb1b8fa..9966f3e2b3 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/message-obj.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/message-obj.expanded.jsonld @@ -2147,7 +2147,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/validations/async20/message-obj.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/async20/message-obj.flattened.jsonld index 87a3460e9d..81d8cf6e9c 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/message-obj.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/message-obj.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/validations/async20/mqtt-message-binding.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/async20/mqtt-message-binding.expanded.jsonld index 364be8930a..a7578f7377 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/mqtt-message-binding.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/mqtt-message-binding.expanded.jsonld @@ -365,7 +365,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/validations/async20/mqtt-message-binding.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/async20/mqtt-message-binding.flattened.jsonld index 318b8af918..00a0c86dfb 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/mqtt-message-binding.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/mqtt-message-binding.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/validations/async20/mqtt-operation-binding.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/async20/mqtt-operation-binding.expanded.jsonld index aca370d977..cbc48790f2 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/mqtt-operation-binding.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/mqtt-operation-binding.expanded.jsonld @@ -356,7 +356,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/validations/async20/mqtt-operation-binding.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/async20/mqtt-operation-binding.flattened.jsonld index aecf100c41..04d487ccd2 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/mqtt-operation-binding.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/mqtt-operation-binding.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/validations/async20/mqtt-server-binding.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/async20/mqtt-server-binding.expanded.jsonld index 741211cac1..970f8cf1da 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/mqtt-server-binding.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/mqtt-server-binding.expanded.jsonld @@ -488,7 +488,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/validations/async20/mqtt-server-binding.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/async20/mqtt-server-binding.flattened.jsonld index 9c417b2029..09cb974928 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/mqtt-server-binding.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/mqtt-server-binding.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/validations/async20/publish-subscribe.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/async20/publish-subscribe.expanded.jsonld index 8e1789d8ab..a0501b8e9a 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/publish-subscribe.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/publish-subscribe.expanded.jsonld @@ -823,7 +823,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/validations/async20/publish-subscribe.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/async20/publish-subscribe.flattened.jsonld index b052682c41..a5f1430bc1 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/publish-subscribe.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/publish-subscribe.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/chained-include.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/chained-include.expanded.jsonld index 5ba3b96f8d..a904ce2d4c 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/chained-include.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/chained-include.expanded.jsonld @@ -225,7 +225,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ @@ -452,7 +452,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ @@ -482,7 +482,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/chained-include.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/chained-include.flattened.jsonld index 201eede08c..3b0e3d1f3b 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/chained-include.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/chained-include.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "ASYNC 2.0" }, @@ -400,7 +400,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "RAML 1.0" }, { @@ -408,7 +408,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "RAML 1.0" } ], diff --git a/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/include-root-payload.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/include-root-payload.expanded.jsonld index 06ba9c5f7b..7122336cc9 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/include-root-payload.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/include-root-payload.expanded.jsonld @@ -156,7 +156,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ @@ -246,7 +246,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/include-root-payload.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/include-root-payload.flattened.jsonld index 31caa014e1..7532cef3ae 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/include-root-payload.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/include-root-payload.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "ASYNC 2.0" }, @@ -255,7 +255,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "RAML 1.0" } ], diff --git a/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/ref-data-type-fragment-invalid.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/ref-data-type-fragment-invalid.expanded.jsonld index 684684f4e3..ab88cc78b6 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/ref-data-type-fragment-invalid.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/ref-data-type-fragment-invalid.expanded.jsonld @@ -150,7 +150,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ @@ -202,7 +202,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/ref-data-type-fragment-invalid.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/ref-data-type-fragment-invalid.flattened.jsonld index c91a57b453..422119ffb7 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/ref-data-type-fragment-invalid.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/ref-data-type-fragment-invalid.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "ASYNC 2.0" }, @@ -211,7 +211,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "RAML 1.0" } ], diff --git a/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/ref-data-type-fragment.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/ref-data-type-fragment.expanded.jsonld index bdb9183c14..16f4d61fb9 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/ref-data-type-fragment.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/ref-data-type-fragment.expanded.jsonld @@ -156,7 +156,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ @@ -246,7 +246,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/ref-data-type-fragment.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/ref-data-type-fragment.flattened.jsonld index adb885b7e3..1b6d1f656b 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/ref-data-type-fragment.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/ref-data-type-fragment.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "ASYNC 2.0" }, @@ -221,7 +221,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "RAML 1.0" } ], diff --git a/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/ref-external-yaml.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/ref-external-yaml.expanded.jsonld index a6e65aefc1..29ea9d74eb 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/ref-external-yaml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/ref-external-yaml.expanded.jsonld @@ -189,7 +189,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/ref-external-yaml.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/ref-external-yaml.flattened.jsonld index be13f4616b..26a258ab75 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/ref-external-yaml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/ref-external-yaml.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "ASYNC 2.0" }, diff --git a/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/ref-type-in-library.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/ref-type-in-library.expanded.jsonld index 7ae4130f61..cacca22cb7 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/ref-type-in-library.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/ref-type-in-library.expanded.jsonld @@ -156,7 +156,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ @@ -397,7 +397,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/ref-type-in-library.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/ref-type-in-library.flattened.jsonld index 0f890b87fb..b81ede4a46 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/ref-type-in-library.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/raml-data-type-references/ref-type-in-library.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "ASYNC 2.0" }, @@ -305,7 +305,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "RAML 1.0" } ], diff --git a/amf-cli/shared/src/test/resources/validations/async20/rpc-server.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/async20/rpc-server.expanded.jsonld index 3deec530d4..d3be6c355f 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/rpc-server.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/rpc-server.expanded.jsonld @@ -2714,7 +2714,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/validations/async20/rpc-server.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/async20/rpc-server.flattened.jsonld index b8ca0a3ce9..23f9e29ec3 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/rpc-server.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/rpc-server.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/validations/async20/security-schemes.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/async20/security-schemes.expanded.jsonld index 42a128599c..b95fa5cb5f 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/security-schemes.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/security-schemes.expanded.jsonld @@ -2755,7 +2755,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/validations/async20/security-schemes.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/async20/security-schemes.flattened.jsonld index 853bdb6b18..b5cf05074e 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/security-schemes.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/security-schemes.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/validations/async20/validations/anypoint-binding-validations.yaml b/amf-cli/shared/src/test/resources/validations/async20/validations/anypoint-binding-validations.yaml new file mode 100644 index 0000000000..2e0c8d2eaa --- /dev/null +++ b/amf-cli/shared/src/test/resources/validations/async20/validations/anypoint-binding-validations.yaml @@ -0,0 +1,31 @@ +asyncapi: 2.2.0 +info: + title: test anypoint binding + version: 1.0.0 +channels: + some-channel: + bindings: + anypointmq: + destination: user-signup-exchg + destinationType: wrong destinationType # MUST be either exchange or queue or fifo-queue + bindingVersion: '0.1.0' + publish: + message: + bindings: + anypointmq: + headers: + type: string # MUST be an object + bindingVersion: '0.1.0' + payload: + type: string + + other-channel: + publish: + message: + bindings: + anypointmq: + headers: + type: object # MUST have a 'properties' field + bindingVersion: '0.1.0' + payload: + type: string diff --git a/amf-cli/shared/src/test/resources/validations/async20/validations/binding-wrong-key.yaml b/amf-cli/shared/src/test/resources/validations/async20/validations/binding-wrong-key.yaml new file mode 100644 index 0000000000..ed0a9c9ae8 --- /dev/null +++ b/amf-cli/shared/src/test/resources/validations/async20/validations/binding-wrong-key.yaml @@ -0,0 +1,42 @@ +asyncapi: 2.5.0 +info: + title: Simple API with GooglePubSub Message Binding + version: 1.0.0 +servers: {} +channels: + topic-proto-schema: + bindings: + googlepubsub: + labels: + label1: label1 + label2: label2 + topic: projects/your-project/topics/topic-proto-schema + messageRetentionDuration: 86400s + messageStoragePolicy: + allowedPersistenceRegions: + - us-central1 + - us-west + wrongKey1: wrongKey1 + schemaSettings: + encoding: binary + name: projects/your-project/schemas/messageAvro + firstRevisionId: 1.0.0 + lastRevisionId: 2.0.0 + WrongKey2: WrongKey2 + WrongKey3: WrongKey3 +components: + messages: + messageAvro: + bindings: + googlepubsub: + attributes: + exampleAttribute: exampleValue + orderingKey: userEventOrder + bindingVersion: 0.1.0 + WrongKey4: WrongKey4 + schema: + name: projects/your-project/schemas/message-avro + type: avro + WrongKey5: WrongKey5 + + diff --git a/amf-cli/shared/src/test/resources/validations/async20/validations/external-reference/external-ref-message-trait.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/async20/validations/external-reference/external-ref-message-trait.expanded.jsonld index 184ce11e7c..94ba5b6ae2 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/validations/external-reference/external-ref-message-trait.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/validations/external-reference/external-ref-message-trait.expanded.jsonld @@ -233,7 +233,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/validations/async20/validations/external-reference/external-ref-message-trait.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/async20/validations/external-reference/external-ref-message-trait.flattened.jsonld index d636eace52..d177d5a741 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/validations/external-reference/external-ref-message-trait.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/validations/external-reference/external-ref-message-trait.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "ASYNC 2.0" }, diff --git a/amf-cli/shared/src/test/resources/validations/async20/validations/external-reference/external-ref-operation-trait.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/async20/validations/external-reference/external-ref-operation-trait.expanded.jsonld index ebd6a97e33..8433d06515 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/validations/external-reference/external-ref-operation-trait.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/validations/external-reference/external-ref-operation-trait.expanded.jsonld @@ -233,7 +233,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/validations/async20/validations/external-reference/external-ref-operation-trait.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/async20/validations/external-reference/external-ref-operation-trait.flattened.jsonld index a8a2868e4f..c6424ed368 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/validations/external-reference/external-ref-operation-trait.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/validations/external-reference/external-ref-operation-trait.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "ASYNC 2.0" }, diff --git a/amf-cli/shared/src/test/resources/validations/async20/validations/ibmmq-binding-parsing-validations.yaml b/amf-cli/shared/src/test/resources/validations/async20/validations/ibmmq-binding-parsing-validations.yaml new file mode 100644 index 0000000000..cbb130b573 --- /dev/null +++ b/amf-cli/shared/src/test/resources/validations/async20/validations/ibmmq-binding-parsing-validations.yaml @@ -0,0 +1,11 @@ +asyncapi: 2.1.0 +info: + title: test binding + version: 1.0.0 +channels: + some-channel: + bindings: + ibmmq: + destinationType: queue + # 10. objectName is REQUIRED inside queue + queue: { } diff --git a/amf-cli/shared/src/test/resources/validations/async20/validations/ibmmq-binding-validations-valid.yaml b/amf-cli/shared/src/test/resources/validations/async20/validations/ibmmq-binding-validations-valid.yaml new file mode 100644 index 0000000000..5c294229df --- /dev/null +++ b/amf-cli/shared/src/test/resources/validations/async20/validations/ibmmq-binding-validations-valid.yaml @@ -0,0 +1,34 @@ +asyncapi: 2.1.0 +info: + title: test binding + version: 1.0.0 +servers: + theName: + url: some.com + protocol: ibmmq + bindings: + ibmmq: + heartBeatInterval: 123 # 1. MUST be 0-999999 +channels: + some-channel: + bindings: + # 2. queue and topic fields MUST NOT coexist within an ibmmq channel binding + ibmmq: + destinationType: topic # 3. MUST be either topic or queue + topic: + string: normal value # 5. MUST NOT exceed 10240 characters in length + objectName: normal value # 6. MUST NOT exceed 48 characters in length + maxMsgLength: 123 # 7. MUST be 0-104,857,600 bytes (100 MB) + publish: + message: + bindings: + ibmmq: + type: string # 8. MUST be either string, jms or binary + expiry: 1 # 9. MUST be 0 or greater + + other-channel: + publish: + message: + bindings: + ibmmq: + type: jms diff --git a/amf-cli/shared/src/test/resources/validations/async20/validations/ibmmq-binding-validations.yaml b/amf-cli/shared/src/test/resources/validations/async20/validations/ibmmq-binding-validations.yaml new file mode 100644 index 0000000000..481e9e2f93 --- /dev/null +++ b/amf-cli/shared/src/test/resources/validations/async20/validations/ibmmq-binding-validations.yaml @@ -0,0 +1,38 @@ +asyncapi: 2.1.0 +info: + title: test binding + version: 1.0.0 +servers: + theName: + url: some.com + protocol: ibmmq + bindings: + ibmmq: + heartBeatInterval: 999999999 # 1. MUST be 0-999999 +channels: + some-channel: + bindings: + # 2. queue and topic fields MUST NOT coexist within an ibmmq channel binding + ibmmq: + destinationType: wrong destination # 3. MUST be either topic or queue + queue: + objectName: this is a very long object name that exceeds 48 chars # 4. MUST NOT exceed 48 characters in length + topic: + string: # 5. MUST NOT exceed 10240 characters in length + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Mauris quis urna at enim ultrices finibus id id diam. Etiam nibh ex, luctus ac varius at, scelerisque in libero. Quisque porttitor enim a nulla tempus cursus. Quisque aliquam in dolor vitae suscipit. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Donec dapibus nec ligula sit amet placerat. Donec consectetur, felis et facilisis dictum, mauris leo vestibulum metus, nec posuere odio justo eget arcu. Nullam mattis ultricies iaculis. Pellentesque id nisi tortor. Cras et rhoncus tortor. In sed nisi at massa ultrices fringilla ac et turpis. Fusce ornare ultrices arcu nec lobortis. Phasellus id dolor neque. Aenean erat arcu, maximus sed sagittis sit amet, efficitur at sem. Praesent ligula nisl, ultrices id dui sed, porttitor imperdiet dolor. In ullamcorper pulvinar metus, nec auctor eros eleifend et.Sed efficitur tincidunt leo eu ullamcorper. Duis porttitor nec diam et placerat. Quisque egestas nibh non lectus finibus suscipit. Ut efficitur ullamcorper tincidunt. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Duis bibendum elit eget justo egestas, ac rutrum justo suscipit. Nullam lacinia lorem mi, vel interdum eros molestie non. Vestibulum euismod rutrum ante, at gravida nulla venenatis nec. Sed hendrerit interdum fermentum. In ut massa diam. Pellentesque pretium vel eros sit amet porttitor. Sed malesuada, mi eu consequat finibus, massa risus dapibus felis, quis commodo dui lectus vel nisi. Nullam at purus a neque consequat fringilla. Donec at augue lorem. Proin ut augue enim.Donec maximus ex ut urna interdum, vitae sollicitudin massa sollicitudin. Fusce porttitor mauris augue, nec dictum lorem ornare et. Vestibulum in erat a est sodales pellentesque non in ante. Nunc consectetur lobortis ex sit amet porttitor. Etiam sed dignissim augue. Sed ac sem nibh. In feugiat, nunc quis finibus interdum, nunc dui auctor felis, eu molestie leo velit sit amet elit. Morbi a vehicula neque. Phasellus vel ex semper, pellentesque est et, ullamcorper neque. Pellentesque vitae hendrerit odio. Sed nibh risus, porttitor et felis ac, eleifend rhoncus quam. Aenean malesuada euismod imperdiet. Donec neque lacus, rhoncus vel augue ut, euismod ornare metus. Curabitur tortor purus, consequat ut tortor at, vulputate tempus leo. Proin sit amet erat est.Suspendisse vehicula ultricies ornare. Sed pharetra eu tellus et dapibus. Curabitur iaculis magna vel nisl fringilla bibendum. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Curabitur facilisis orci quis sollicitudin venenatis. Aliquam vel venenatis nibh. Vivamus a hendrerit velit. Suspendisse semper nec diam eu feugiat. Nulla at sem sollicitudin, gravida dolor at, pulvinar tellus. Ut tempor, lectus ut tincidunt ullamcorper, dui urna tempor mi, ut accumsan odio lectus sed libero.Praesent aliquet vel sem et fermentum. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Integer leo est, iaculis nec iaculis id, tempus id mi. Etiam sit amet viverra neque. Nullam vestibulum augue eleifend, dapibus arcu ut, congue nisi. Sed nisl nisl, blandit faucibus eleifend ut, fermentum quis dui. Mauris sed sem ornare, aliquet elit et, dignissim libero. Mauris vitae mi velit. Maecenas quis est at ligula condimentum tincidunt eget sed lorem. Cras sit amet felis vehicula felis varius aliquam. Ut vehicula nisi lobortis eros euismod bibendum. Maecenas euismod quis nisi sagittis consequat.Cras euismod blandit diam et tincidunt. Donec accumsan porta felis, at auctor erat malesuada vitae. Aliquam vel nulla porttitor, pretium eros at, ornare enim. Cras ultrices turpis quis mollis consectetur. Pellentesque pretium nunc eget sodales iaculis. Praesent aliquam venenatis mi eget facilisis. Vestibulum id blandit massa. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Aenean urna tellus, gravida posuere bibendum in, suscipit at sapien. In hac habitasse platea dictumst. In iaculis sodales vehicula. Suspendisse laoreet laoreet ante at sagittis.Proin congue fermentum ante eu interdum. Sed aliquet imperdiet eros vel facilisis. Donec neque enim, elementum eu porta eget, tristique id arcu. Nam faucibus nisi non tortor sollicitudin sollicitudin. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi massa quam, consectetur pulvinar accumsan nec, interdum sit amet mi. Suspendisse luctus ac magna in auctor. Donec et turpis ultrices, finibus turpis non, pulvinar purus. Vivamus volutpat nibh ex. Nunc quis velit nisl. Donec at orci ac risus luctus efficitur. Ut congue rutrum cursus. Pellentesque ultricies sagittis arcu quis volutpat. Pellentesque vel magna neque. Nulla varius dui in mi euismod, ac semper risus bibendum. Aenean at mauris posuere, aliquet sem vitae, sodales eros. Quisque ultrices sagittis enim tristique malesuada. Suspendisse libero turpis, sodales eget ornare at, mattis non felis. Sed ut enim nec tortor sodales finibus nec sed orci. Mauris ac justo vitae leo sollicitudin ultrices non gravida ante. Pellentesque pharetra orci eget dapibus scelerisque. Proin non nisi fermentum, tristique lacus ac, pellentesque lacus.Donec ac leo ultrices, mollis elit vitae, sollicitudin augue. Donec hendrerit sapien id purus cursus facilisis. Donec volutpat consequat posuere. Vivamus pellentesque ex faucibus, dignissim urna ac, consequat felis. Donec nec lobortis dolor, et mollis erat. Cras vitae aliquam justo. Curabitur ullamcorper, risus eget auctor lacinia, justo magna laoreet ante, vitae posuere ligula risus quis ex. Nunc tortor massa, tincidunt sed volutpat at, consectetur et ante. Aenean elementum magna vel est blandit, condimentum ornare erat tempor. Vivamus lacinia metus lobortis suscipit sodales. Aliquam nec eros at nunc vulputate sodales. In molestie gravida lectus, non tempus sem bibendum non. Ut vehicula velit quis porta varius. Cras pellentesque ex consectetur felis tincidunt, nec ultrices sapien bibendum. Suspendisse maximus a elit a fringilla. Nulla non felis in erat commodo tincidunt tincidunt a tellus. In augue sapien, efficitur vitae blandit sit amet, ultrices sit amet ex. Proin faucibus, augue nec viverra iaculis, ligula lorem mollis nisl, quis interdum massa sem sed turpis. Proin bibendum, orci ac sollicitudin gravida, nisl metus porttitor arcu, at ornare sem urna sed ipsum. Mauris pellentesque consequat lorem, eu interdum dolor congue sed. Sed rutrum euismod metus, ut volutpat libero dictum in. Ut ut est pulvinar, tristique massa eu, varius risus. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam non risus nulla. Proin tristique, ligula nec dignissim lobortis, eros erat finibus ex, eu interdum dui magna et tellus.Nulla ultricies ante nunc, sed bibendum ipsum rhoncus elementum. Quisque a auctor est, sit amet condimentum felis. Sed semper nunc quis laoreet scelerisque. Integer at mi ut sem hendrerit cursus. Quisque vitae sem sit amet mi pretium posuere. Nam tortor erat, ornare sit amet lorem dignissim, ultrices bibendum nibh. Praesent hendrerit id sem sed imperdiet. Sed consectetur rhoncus neque finibus hendrerit. Aliquam porta diam quis finibus ultrices. Duis tristique dolor ut placerat sodales. Proin purus nibh, convallis in consequat quis, sagittis at velit.Sed sit amet gravida elit, in elementum dolor. In orci urna, tincidunt a ante eu, porta condimentum nisi. Duis varius nisl a tempus aliquet. Interdum et malesuada fames ac ante ipsum primis in faucibus. Sed vestibulum, lorem in dapibus viverra, tortor nibh porta ligula, sit amet ullamcorper arcu nunc vel est. Curabitur quis metus pharetra, accumsan diam non, malesuada nibh. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur arcu metus, rhoncus id aliquet a, rutrum ac lorem. Phasellus aliquam purus ac magna tincidunt faucibus. Sed mollis velit sed neque aliquam, et auctor nisl condimentum. Proin et diam condimentum, volutpat orci eu, blandit nisl. Curabitur nunc nunc, porttitor et nunc in, volutpat accumsan enim. Etiam eu sapien efficitur, elementum erat dapibus, imperdiet elit. Nunc ultricies sodales leo non facilisis.Sed rhoncus turpis eu pellentesque dignissim. Etiam augue augue, porttitor quis sapien non, iaculis venenatis neque. Sed vel neque varius, facilisis mi vel, euismod elit. Nunc congue arcu ut mauris aliquet condimentum. Vestibulum sit amet cursus turpis. Integer tincidunt venenatis pellentesque. Nunc ullamcorper magna nisl, vitae elementum felis gravida nec. Nunc id eleifend massa. Nulla id finibus odio. Cras ut interdum mi.Vestibulum ac lacus felis. Vestibulum nibh ex, condimentum et interdum ac, vestibulum gravida quam. Aenean molestie sodales urna, ut tempus risus pulvinar nec. Cras quis volutpat sapien. Phasellus quis risus ex. Nam nisl metus, egestas non rutrum a, tempus vel quam. Etiam interdum sed leo at mollis. Sed luctus lectus nulla, quis ultricies mi dictum ac. Nunc porta odio sed leo interdum, a consectetur magna ultricies. Sed accumsan felis erat, vel finibus risus pharetra sit amet.Donec lectus turpis, lobortis eget iaculis sit amet, tempus eget ante. Vestibulum at elementum orci. Phasellus ac nisl eu nisl commodo vulputate ornare ut leo. Mauris massa mi, volutpat non nibh in, accumsan auctor.Sed rhoncus turpis eu pellentesque dignissim. Etiam augue augue, porttitor quis sapien non, iaculis venenatis neque. Sed vel neque varius, facilisis mi vel, euismod elit. Nunc congue arcu ut mauris aliquet condimentum. Vestibulum sit amet cursus turpis. Integer tincidunt venenatis pellentesque. Nunc ullamcorper magna nisl, vitae elementum felis gravida nec. Nunc id eleifend massa. Nulla id finibus odio. Cras ut interdum mi.Vestibulum ac lacus felis. Vestibulum nibh ex, condimentum et interdum ac, vestibulum gravida quam. Aenean molestie sodales urna, ut tempus risus pulvinar nec. Cras quis volutpat sapien. Phasellus quis risus ex. Nam nisl metus, egestas non rutrum a, tempus vel quam. Etiam interdum sed leo at mollis. Sed luctus lectus nulla, quis ultricies mi dictum ac. Nunc porta odio sed leo interdum, a consectetur magna ultricies. Sed accumsan felis erat, vel finibus risus pharetra sit amet. + objectName: this is a very long object name that exceeds 48 chars # 6. MUST NOT exceed 48 characters in length + maxMsgLength: 104857601 # 7. MUST be 0-104,857,600 bytes (100 MB) + publish: + message: + bindings: + ibmmq: + type: test # 8. MUST be either string, jms or binary + expiry: -1 # 9. MUST be 0 or greater + + other-channel: + publish: + message: + bindings: + ibmmq: + type: jms + headers: test1, test2 # 10. MUST NOT be specified if type = string or jms diff --git a/amf-cli/shared/src/test/resources/validations/async20/validations/operation-security-explicit.yaml b/amf-cli/shared/src/test/resources/validations/async20/validations/operation-security-explicit.yaml new file mode 100644 index 0000000000..d4b12263a7 --- /dev/null +++ b/amf-cli/shared/src/test/resources/validations/async20/validations/operation-security-explicit.yaml @@ -0,0 +1,33 @@ +asyncapi: 2.4.0 +info: + title: API + version: "1.0" +components: + securitySchemes: + oauth2: + type: oauth2 + description: oauth2 security scheme + flows: + implicit: + authorizationUrl: https://a.ml/ + refreshUrl: https://a.ml/ + scopes: + write:pets: modify pets in your account + read:pets: read your pets +servers: + production: + url: "mykafkacluster.org:8092" + protocol: kafka-secure + security: + - oauth2: + - write:pets + - read:pets +channels: + some/events: + servers: + - production + subscribe: + # Note that an operation level security must still satisfy security requirements specified at the server level. + security: + - oauth2: + - read:pets diff --git a/amf-cli/shared/src/test/resources/validations/async20/validations/operation-security-implicit.yaml b/amf-cli/shared/src/test/resources/validations/async20/validations/operation-security-implicit.yaml new file mode 100644 index 0000000000..ea3a28ba85 --- /dev/null +++ b/amf-cli/shared/src/test/resources/validations/async20/validations/operation-security-implicit.yaml @@ -0,0 +1,28 @@ +asyncapi: 2.4.0 +info: + title: API + version: "1.0" +components: + securitySchemes: + oauth2: + type: oauth2 + description: oauth2 security scheme + flows: + implicit: + authorizationUrl: https://a.ml/ + refreshUrl: https://a.ml/ + scopes: + write:pets: modify pets in your account + read:pets: read your pets +servers: + production: + url: "mykafkacluster.org:8092" + protocol: kafka-secure + security: + - oauth2: + - write:pets + - read:pets +channels: + some/events: + subscribe: + security: [ ] diff --git a/amf-cli/shared/src/test/resources/validations/async20/validations/operation-security.yaml b/amf-cli/shared/src/test/resources/validations/async20/validations/operation-security.yaml new file mode 100644 index 0000000000..c7158a79db --- /dev/null +++ b/amf-cli/shared/src/test/resources/validations/async20/validations/operation-security.yaml @@ -0,0 +1,34 @@ +asyncapi: 2.4.0 +info: + title: API + version: "1.0" +components: + securitySchemes: + oauth2: + type: oauth2 + description: oauth2 security scheme + flows: + implicit: + authorizationUrl: https://a.ml/ + refreshUrl: https://a.ml/ + scopes: + write:pets: modify pets in your account + read:pets: read your pets +servers: + production: + url: "mykafkacluster.org:8092" + protocol: kafka-secure + security: + - oauth2: + - write:pets + - read:pets +channels: + some/events: + servers: + - production + subscribe: + # Note that an operation level security must still satisfy security requirements specified at the server level. + security: + - oauth2: + - read:pets + - this should throw not found error \ No newline at end of file diff --git a/amf-cli/shared/src/test/resources/validations/async20/validations/pulsar-binding-extra-key.yaml b/amf-cli/shared/src/test/resources/validations/async20/validations/pulsar-binding-extra-key.yaml new file mode 100644 index 0000000000..32d0bbab33 --- /dev/null +++ b/amf-cli/shared/src/test/resources/validations/async20/validations/pulsar-binding-extra-key.yaml @@ -0,0 +1,33 @@ +asyncapi: 2.6.0 +info: + title: test pulsar binding + version: 1.0.0 +servers: + theName: + url: some.com + protocol: pulsar + bindings: + pulsar: + tenant: test + bindingVersion: 0.1.0 + thisKeyIsNotAllowed: should throw validation error +channels: + some-channel: + bindings: + pulsar: + namespace: test + persistence: test + compaction: 123 + geo-replication: + - test + - strings + - list + retention: + time: 123 + size: 321 + thisKeyIsNotAllowed: should throw validation error + ttl: 12 + deduplication: false + bindingVersion: test + thisKeyIsNotAllowed: should throw validation error + description: some channel diff --git a/amf-cli/shared/src/test/resources/validations/async20/validations/pulsar-binding-missing-key.yaml b/amf-cli/shared/src/test/resources/validations/async20/validations/pulsar-binding-missing-key.yaml new file mode 100644 index 0000000000..412875c8e3 --- /dev/null +++ b/amf-cli/shared/src/test/resources/validations/async20/validations/pulsar-binding-missing-key.yaml @@ -0,0 +1,15 @@ +asyncapi: 2.6.0 +info: + title: test mercure binding + version: 1.0.0 +servers: + theName: + url: some.com + protocol: mercure + bindings: + pulsar: {} +channels: + some-channel: + bindings: + pulsar: {} + description: some channel diff --git a/amf-cli/shared/src/test/resources/validations/async20/validations/server-variable.yaml b/amf-cli/shared/src/test/resources/validations/async20/validations/server-variable.yaml new file mode 100644 index 0000000000..af64a3d597 --- /dev/null +++ b/amf-cli/shared/src/test/resources/validations/async20/validations/server-variable.yaml @@ -0,0 +1,34 @@ +asyncapi: 2.4.0 +info: + title: Sample API with Server Variables + version: 1.0.0 +channels: {} +servers: + production: + url: https://{environment}.example.com/{version} + description: Production server with inline server variables. + protocol: https + variables: + environment: + default: api + description: API environment + version: + default: v1 + description: API version + development: + url: https://{environment}.example.com/{version} + description: Development server using referenced server variables. + protocol: https + variables: + environment: + $ref: "#/components/serverVariables/environment" + version: + $ref: "#/components/serverVariables/version" +components: + serverVariables: + environment: + default: dev-api + description: Development API environment + version: + default: v2 + description: Development API version diff --git a/amf-cli/shared/src/test/resources/validations/async20/validations/solace-binding-extra-key.yaml b/amf-cli/shared/src/test/resources/validations/async20/validations/solace-binding-extra-key.yaml new file mode 100644 index 0000000000..1766a6329d --- /dev/null +++ b/amf-cli/shared/src/test/resources/validations/async20/validations/solace-binding-extra-key.yaml @@ -0,0 +1,32 @@ +asyncapi: 2.3.0 +info: + title: test solace binding + version: 1.0.0 +servers: + theName: + url: some.com + protocol: solace + bindings: + solace: + msgVpn: test + bindingVersion: 1.2.3 + thisKeyIsNotAllowed: should throw validation error +channels: + some-channel: + publish: + bindings: + solace: + bindingVersion: 0.3.0 + destinations: + - destinationType: queue + queue: + name: CreatedHREvents + thisKeyIsNotAllowed: should throw validation error + topicSubscriptions: + - person/*/created + - destinationType: topic + topic: + thisKeyIsNotAllowed: should throw validation error + topicSubscriptions: + - person/*/updated + thisKeyIsNotAllowed: should throw validation error \ No newline at end of file diff --git a/amf-cli/shared/src/test/resources/validations/async20/validations/solace-binding-validations.yaml b/amf-cli/shared/src/test/resources/validations/async20/validations/solace-binding-validations.yaml new file mode 100644 index 0000000000..d30d832ba4 --- /dev/null +++ b/amf-cli/shared/src/test/resources/validations/async20/validations/solace-binding-validations.yaml @@ -0,0 +1,30 @@ +asyncapi: 2.3.0 +info: + title: test solace binding + version: 1.0.0 +servers: + theName: + url: some.com + protocol: solace + bindings: + solace: + msgVpn: test + bindingVersion: 1.2.3 +channels: + some-channel: + publish: + bindings: + solace: + bindingVersion: 0.3.0 + destinations: + - destinationType: wrong destinationType # 'queue' or 'topic' + deliveryMode: wrong deliveryMode # 'direct' or 'persistent' + queue: + name: CreatedHREvents + accessType: wrong accessType # 'exclusive' or 'nonexclusive' + topicSubscriptions: + - person/*/created + - destinationType: topic + topic: + topicSubscriptions: + - person/*/updated \ No newline at end of file diff --git a/amf-cli/shared/src/test/resources/validations/async20/ws-channel-binding.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/async20/ws-channel-binding.expanded.jsonld index 1f30c3ac27..29843a18e7 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/ws-channel-binding.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/ws-channel-binding.expanded.jsonld @@ -761,7 +761,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/validations/async20/ws-channel-binding.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/async20/ws-channel-binding.flattened.jsonld index 9e5bf99028..4d513675df 100644 --- a/amf-cli/shared/src/test/resources/validations/async20/ws-channel-binding.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/async20/ws-channel-binding.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/validations/auto-generated-schema-name/auto-generated-schema-name-oas.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/auto-generated-schema-name/auto-generated-schema-name-oas.expanded.jsonld index abc3aa54c5..3c42f60fc0 100644 --- a/amf-cli/shared/src/test/resources/validations/auto-generated-schema-name/auto-generated-schema-name-oas.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/auto-generated-schema-name/auto-generated-schema-name-oas.expanded.jsonld @@ -437,7 +437,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/validations/auto-generated-schema-name/auto-generated-schema-name-oas.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/auto-generated-schema-name/auto-generated-schema-name-oas.flattened.jsonld index 695e22d96c..defbb773c9 100644 --- a/amf-cli/shared/src/test/resources/validations/auto-generated-schema-name/auto-generated-schema-name-oas.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/auto-generated-schema-name/auto-generated-schema-name-oas.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "OAS 2.0" }, diff --git a/amf-cli/shared/src/test/resources/validations/auto-generated-schema-name/auto-generated-schema-name-with-default.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/auto-generated-schema-name/auto-generated-schema-name-with-default.expanded.jsonld index 6e71f535b0..535e825ff1 100644 --- a/amf-cli/shared/src/test/resources/validations/auto-generated-schema-name/auto-generated-schema-name-with-default.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/auto-generated-schema-name/auto-generated-schema-name-with-default.expanded.jsonld @@ -431,7 +431,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/validations/auto-generated-schema-name/auto-generated-schema-name-with-default.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/auto-generated-schema-name/auto-generated-schema-name-with-default.flattened.jsonld index 3cd9cb3860..08f92fcf26 100644 --- a/amf-cli/shared/src/test/resources/validations/auto-generated-schema-name/auto-generated-schema-name-with-default.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/auto-generated-schema-name/auto-generated-schema-name-with-default.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/validations/auto-generated-schema-name/auto-generated-schema-name.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/auto-generated-schema-name/auto-generated-schema-name.expanded.jsonld index 2c9748ecc0..ec366a6d6f 100644 --- a/amf-cli/shared/src/test/resources/validations/auto-generated-schema-name/auto-generated-schema-name.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/auto-generated-schema-name/auto-generated-schema-name.expanded.jsonld @@ -1401,7 +1401,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ @@ -1552,7 +1552,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ @@ -1700,7 +1700,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ @@ -1848,7 +1848,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/validations/auto-generated-schema-name/auto-generated-schema-name.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/auto-generated-schema-name/auto-generated-schema-name.flattened.jsonld index 82eb126883..cafca09987 100644 --- a/amf-cli/shared/src/test/resources/validations/auto-generated-schema-name/auto-generated-schema-name.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/auto-generated-schema-name/auto-generated-schema-name.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, @@ -1822,7 +1822,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "RAML 1.0" }, { @@ -1830,7 +1830,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "RAML 1.0" }, { @@ -1838,7 +1838,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "RAML 1.0" } ], diff --git a/amf-cli/shared/src/test/resources/validations/body-link-name/body-link-name.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/body-link-name/body-link-name.expanded.jsonld index 8564977fb9..05936ac77d 100644 --- a/amf-cli/shared/src/test/resources/validations/body-link-name/body-link-name.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/body-link-name/body-link-name.expanded.jsonld @@ -258,7 +258,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/validations/body-link-name/body-link-name.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/body-link-name/body-link-name.flattened.jsonld index debf273daa..35b0e41cf6 100644 --- a/amf-cli/shared/src/test/resources/validations/body-link-name/body-link-name.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/body-link-name/body-link-name.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/validations/dup-name-example-tracking/dup-name-example-tracking.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/dup-name-example-tracking/dup-name-example-tracking.expanded.jsonld index 8716e8bdff..98e0c000cd 100644 --- a/amf-cli/shared/src/test/resources/validations/dup-name-example-tracking/dup-name-example-tracking.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/dup-name-example-tracking/dup-name-example-tracking.expanded.jsonld @@ -258,7 +258,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/validations/dup-name-example-tracking/dup-name-example-tracking.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/dup-name-example-tracking/dup-name-example-tracking.flattened.jsonld index 6b07c1afc7..1e30515180 100644 --- a/amf-cli/shared/src/test/resources/validations/dup-name-example-tracking/dup-name-example-tracking.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/dup-name-example-tracking/dup-name-example-tracking.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/validations/examples/dialect-fragment/api.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/examples/dialect-fragment/api.expanded.jsonld index 0866e0268e..dc6a358170 100644 --- a/amf-cli/shared/src/test/resources/validations/examples/dialect-fragment/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/examples/dialect-fragment/api.expanded.jsonld @@ -1884,7 +1884,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/validations/examples/dialect-fragment/api.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/examples/dialect-fragment/api.flattened.jsonld index 957cadad14..b887f0708b 100644 --- a/amf-cli/shared/src/test/resources/validations/examples/dialect-fragment/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/examples/dialect-fragment/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/validations/examples/inline-named-examples/api.resolved.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/examples/inline-named-examples/api.resolved.expanded.jsonld index 2c6e71e6dc..f4bba1449e 100644 --- a/amf-cli/shared/src/test/resources/validations/examples/inline-named-examples/api.resolved.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/examples/inline-named-examples/api.resolved.expanded.jsonld @@ -1224,7 +1224,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ @@ -1687,7 +1687,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ @@ -1742,7 +1742,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ @@ -1797,7 +1797,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/validations/examples/inline-named-examples/api.resolved.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/examples/inline-named-examples/api.resolved.flattened.jsonld index 9cfb5cf1b0..f1657b129a 100644 --- a/amf-cli/shared/src/test/resources/validations/examples/inline-named-examples/api.resolved.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/examples/inline-named-examples/api.resolved.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, @@ -1655,7 +1655,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "RAML 1.0" }, { @@ -1672,7 +1672,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "RAML 1.0" }, { @@ -1689,7 +1689,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "RAML 1.0" } ], diff --git a/amf-cli/shared/src/test/resources/validations/examples/vocabulary-fragment/api.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/examples/vocabulary-fragment/api.expanded.jsonld index 763b45301b..a2b32c9049 100644 --- a/amf-cli/shared/src/test/resources/validations/examples/vocabulary-fragment/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/examples/vocabulary-fragment/api.expanded.jsonld @@ -5459,7 +5459,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/validations/examples/vocabulary-fragment/api.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/examples/vocabulary-fragment/api.flattened.jsonld index e3550fcb52..01abc5cfee 100644 --- a/amf-cli/shared/src/test/resources/validations/examples/vocabulary-fragment/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/examples/vocabulary-fragment/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/validations/healthcare_reduced_v1.raml.resolved.jsonld b/amf-cli/shared/src/test/resources/validations/healthcare_reduced_v1.raml.resolved.jsonld index 0bd7b16932..2d46841892 100644 --- a/amf-cli/shared/src/test/resources/validations/healthcare_reduced_v1.raml.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/validations/healthcare_reduced_v1.raml.resolved.jsonld @@ -308,7 +308,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/validations/healthcare_reduced_v2.raml.resolved.jsonld b/amf-cli/shared/src/test/resources/validations/healthcare_reduced_v2.raml.resolved.jsonld index 88cce3be3f..4410575c87 100644 --- a/amf-cli/shared/src/test/resources/validations/healthcare_reduced_v2.raml.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/validations/healthcare_reduced_v2.raml.resolved.jsonld @@ -290,7 +290,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/validations/inheritance-provenance/from-declaration/api.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/inheritance-provenance/from-declaration/api.expanded.jsonld index 360c776be1..2664cc3642 100644 --- a/amf-cli/shared/src/test/resources/validations/inheritance-provenance/from-declaration/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/inheritance-provenance/from-declaration/api.expanded.jsonld @@ -290,7 +290,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/validations/inheritance-provenance/from-declaration/api.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/inheritance-provenance/from-declaration/api.flattened.jsonld index e21dceff17..a80385a066 100644 --- a/amf-cli/shared/src/test/resources/validations/inheritance-provenance/from-declaration/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/inheritance-provenance/from-declaration/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/validations/inheritance-provenance/with-library/api.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/inheritance-provenance/with-library/api.expanded.jsonld index 9b644bf293..11fec38ab5 100644 --- a/amf-cli/shared/src/test/resources/validations/inheritance-provenance/with-library/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/inheritance-provenance/with-library/api.expanded.jsonld @@ -42,7 +42,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ @@ -194,7 +194,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/validations/inheritance-provenance/with-library/api.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/inheritance-provenance/with-library/api.flattened.jsonld index abebe56979..3bbc594569 100644 --- a/amf-cli/shared/src/test/resources/validations/inheritance-provenance/with-library/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/inheritance-provenance/with-library/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, @@ -157,7 +157,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/validations/inheritance-provenance/with-recursive-inheritance/api.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/inheritance-provenance/with-recursive-inheritance/api.expanded.jsonld index a4daffa3ef..6b93e5ef5f 100644 --- a/amf-cli/shared/src/test/resources/validations/inheritance-provenance/with-recursive-inheritance/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/inheritance-provenance/with-recursive-inheritance/api.expanded.jsonld @@ -42,7 +42,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/validations/inheritance-provenance/with-recursive-inheritance/api.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/inheritance-provenance/with-recursive-inheritance/api.flattened.jsonld index 0955618dee..b1400558e6 100644 --- a/amf-cli/shared/src/test/resources/validations/inheritance-provenance/with-recursive-inheritance/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/inheritance-provenance/with-recursive-inheritance/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/validations/inheritance-provenance/with-regular-inheritance/api.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/inheritance-provenance/with-regular-inheritance/api.expanded.jsonld index 3bf7745f28..0971b27cf9 100644 --- a/amf-cli/shared/src/test/resources/validations/inheritance-provenance/with-regular-inheritance/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/inheritance-provenance/with-regular-inheritance/api.expanded.jsonld @@ -42,7 +42,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/validations/inheritance-provenance/with-regular-inheritance/api.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/inheritance-provenance/with-regular-inheritance/api.flattened.jsonld index 62b32b5eff..471833824c 100644 --- a/amf-cli/shared/src/test/resources/validations/inheritance-provenance/with-regular-inheritance/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/inheritance-provenance/with-regular-inheritance/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/validations/japanese/cycle/oas30api.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/japanese/cycle/oas30api.expanded.jsonld index 117b51dfeb..1d9d44f0d3 100644 --- a/amf-cli/shared/src/test/resources/validations/japanese/cycle/oas30api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/japanese/cycle/oas30api.expanded.jsonld @@ -1165,7 +1165,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/validations/japanese/cycle/oas30api.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/japanese/cycle/oas30api.flattened.jsonld index 3f4e616408..a2ed1d19c7 100644 --- a/amf-cli/shared/src/test/resources/validations/japanese/cycle/oas30api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/japanese/cycle/oas30api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 3.0" }, { diff --git a/amf-cli/shared/src/test/resources/validations/japanese/cycle/oasapi.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/japanese/cycle/oasapi.expanded.jsonld index 89e7806404..44871da47f 100644 --- a/amf-cli/shared/src/test/resources/validations/japanese/cycle/oasapi.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/japanese/cycle/oasapi.expanded.jsonld @@ -1414,7 +1414,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/validations/japanese/cycle/oasapi.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/japanese/cycle/oasapi.flattened.jsonld index 8f78584138..b5a0f8b130 100644 --- a/amf-cli/shared/src/test/resources/validations/japanese/cycle/oasapi.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/japanese/cycle/oasapi.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/validations/japanese/cycle/ramlapi.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/japanese/cycle/ramlapi.expanded.jsonld index 5cb669d574..0a816b04df 100644 --- a/amf-cli/shared/src/test/resources/validations/japanese/cycle/ramlapi.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/japanese/cycle/ramlapi.expanded.jsonld @@ -1991,7 +1991,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/validations/japanese/cycle/ramlapi.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/japanese/cycle/ramlapi.flattened.jsonld index 592f2f6c78..1f0de36a1c 100644 --- a/amf-cli/shared/src/test/resources/validations/japanese/cycle/ramlapi.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/japanese/cycle/ramlapi.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { diff --git a/amf-cli/shared/src/test/resources/validations/japanese/resolve/oas30api.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/japanese/resolve/oas30api.expanded.jsonld index 1267c8865b..eed2b238b8 100644 --- a/amf-cli/shared/src/test/resources/validations/japanese/resolve/oas30api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/japanese/resolve/oas30api.expanded.jsonld @@ -861,7 +861,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/validations/japanese/resolve/oas30api.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/japanese/resolve/oas30api.flattened.jsonld index 7bc48ead5f..bef9c2c990 100644 --- a/amf-cli/shared/src/test/resources/validations/japanese/resolve/oas30api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/japanese/resolve/oas30api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "OAS 3.0" }, diff --git a/amf-cli/shared/src/test/resources/validations/japanese/resolve/oasapi.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/japanese/resolve/oasapi.expanded.jsonld index 2dd3a1ea30..f4657c4b35 100644 --- a/amf-cli/shared/src/test/resources/validations/japanese/resolve/oasapi.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/japanese/resolve/oasapi.expanded.jsonld @@ -1077,7 +1077,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/validations/japanese/resolve/oasapi.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/japanese/resolve/oasapi.flattened.jsonld index eab294bfbd..d7acd56ccf 100644 --- a/amf-cli/shared/src/test/resources/validations/japanese/resolve/oasapi.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/japanese/resolve/oasapi.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, diff --git a/amf-cli/shared/src/test/resources/validations/japanese/resolve/ramlapi.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/japanese/resolve/ramlapi.expanded.jsonld index 99f76fb85d..c9cd5bdb81 100644 --- a/amf-cli/shared/src/test/resources/validations/japanese/resolve/ramlapi.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/japanese/resolve/ramlapi.expanded.jsonld @@ -1949,7 +1949,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/validations/japanese/resolve/ramlapi.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/japanese/resolve/ramlapi.flattened.jsonld index 890c0f77ae..322872aaf2 100644 --- a/amf-cli/shared/src/test/resources/validations/japanese/resolve/ramlapi.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/japanese/resolve/ramlapi.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#transformed": true, "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/validations/json-schema-nested-refs/result.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/json-schema-nested-refs/result.expanded.jsonld index 3b7bb4fe70..bd7adde9f1 100644 --- a/amf-cli/shared/src/test/resources/validations/json-schema-nested-refs/result.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/json-schema-nested-refs/result.expanded.jsonld @@ -93,7 +93,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/validations/json-schema-nested-refs/result.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/json-schema-nested-refs/result.flattened.jsonld index 8592e7efcb..ccd63c17a2 100644 --- a/amf-cli/shared/src/test/resources/validations/json-schema-nested-refs/result.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/json-schema-nested-refs/result.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/validations/jsonld-compact-uris/no-raw-source-maps-compact-uris.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/jsonld-compact-uris/no-raw-source-maps-compact-uris.expanded.jsonld index 57115242fc..cedecb4b92 100644 --- a/amf-cli/shared/src/test/resources/validations/jsonld-compact-uris/no-raw-source-maps-compact-uris.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/jsonld-compact-uris/no-raw-source-maps-compact-uris.expanded.jsonld @@ -224,7 +224,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/validations/jsonld-compact-uris/no-raw-source-maps-compact-uris.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/jsonld-compact-uris/no-raw-source-maps-compact-uris.flattened.jsonld index 8e58b9d7ce..a58d8132cc 100644 --- a/amf-cli/shared/src/test/resources/validations/jsonld-compact-uris/no-raw-source-maps-compact-uris.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/jsonld-compact-uris/no-raw-source-maps-compact-uris.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/validations/jsonld-compact-uris/parsed-result.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/jsonld-compact-uris/parsed-result.expanded.jsonld index c5e1dd5986..fa040767a7 100644 --- a/amf-cli/shared/src/test/resources/validations/jsonld-compact-uris/parsed-result.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/jsonld-compact-uris/parsed-result.expanded.jsonld @@ -174,7 +174,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/validations/jsonld-compact-uris/parsed-result.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/jsonld-compact-uris/parsed-result.flattened.jsonld index 4fa05c1348..43676c4b3b 100644 --- a/amf-cli/shared/src/test/resources/validations/jsonld-compact-uris/parsed-result.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/jsonld-compact-uris/parsed-result.flattened.jsonld @@ -20,7 +20,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/validations/links/api.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/links/api.expanded.jsonld index 09f5c9092f..d224f70871 100644 --- a/amf-cli/shared/src/test/resources/validations/links/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/links/api.expanded.jsonld @@ -158,7 +158,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ @@ -353,7 +353,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/validations/links/api.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/links/api.flattened.jsonld index e6dc338995..5c597036b4 100644 --- a/amf-cli/shared/src/test/resources/validations/links/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/links/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, @@ -334,7 +334,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "RAML 1.0" } ], diff --git a/amf-cli/shared/src/test/resources/validations/nil-type.raml.resolved.jsonld b/amf-cli/shared/src/test/resources/validations/nil-type.raml.resolved.jsonld index 9f17ac45ba..7dd69f15be 100644 --- a/amf-cli/shared/src/test/resources/validations/nil-type.raml.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/validations/nil-type.raml.resolved.jsonld @@ -268,7 +268,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/validations/oas-security/api-with-security-requirements.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/oas-security/api-with-security-requirements.expanded.jsonld index 8d03ae3ca1..7f852b7fe7 100644 --- a/amf-cli/shared/src/test/resources/validations/oas-security/api-with-security-requirements.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/oas-security/api-with-security-requirements.expanded.jsonld @@ -1269,7 +1269,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/validations/oas-security/api-with-security-requirements.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/oas-security/api-with-security-requirements.flattened.jsonld index 1cc9664c30..71051db172 100644 --- a/amf-cli/shared/src/test/resources/validations/oas-security/api-with-security-requirements.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/oas-security/api-with-security-requirements.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/validations/oas2/cycled/invalid-endpoint-path-still-parses.json.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/oas2/cycled/invalid-endpoint-path-still-parses.json.expanded.jsonld index bc7c0903b6..a991153593 100644 --- a/amf-cli/shared/src/test/resources/validations/oas2/cycled/invalid-endpoint-path-still-parses.json.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/oas2/cycled/invalid-endpoint-path-still-parses.json.expanded.jsonld @@ -192,7 +192,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/validations/oas2/cycled/invalid-endpoint-path-still-parses.json.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/oas2/cycled/invalid-endpoint-path-still-parses.json.flattened.jsonld index 01ebef3042..fde136914b 100644 --- a/amf-cli/shared/src/test/resources/validations/oas2/cycled/invalid-endpoint-path-still-parses.json.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/oas2/cycled/invalid-endpoint-path-still-parses.json.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { diff --git a/amf-cli/shared/src/test/resources/validations/oas3/spec-extensions/extension-in-components.jsonld b/amf-cli/shared/src/test/resources/validations/oas3/spec-extensions/extension-in-components.jsonld index c81199dbd2..4ab6c7e4b4 100644 --- a/amf-cli/shared/src/test/resources/validations/oas3/spec-extensions/extension-in-components.jsonld +++ b/amf-cli/shared/src/test/resources/validations/oas3/spec-extensions/extension-in-components.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 3.0" }, { diff --git a/amf-cli/shared/src/test/resources/validations/oas3/spec-extensions/extension-in-flow.jsonld b/amf-cli/shared/src/test/resources/validations/oas3/spec-extensions/extension-in-flow.jsonld index 5065ab1579..ef1707246c 100644 --- a/amf-cli/shared/src/test/resources/validations/oas3/spec-extensions/extension-in-flow.jsonld +++ b/amf-cli/shared/src/test/resources/validations/oas3/spec-extensions/extension-in-flow.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 3.0" }, { diff --git a/amf-cli/shared/src/test/resources/validations/oas3/spec-extensions/extension-in-flows.jsonld b/amf-cli/shared/src/test/resources/validations/oas3/spec-extensions/extension-in-flows.jsonld index 10727991c5..05534a9474 100644 --- a/amf-cli/shared/src/test/resources/validations/oas3/spec-extensions/extension-in-flows.jsonld +++ b/amf-cli/shared/src/test/resources/validations/oas3/spec-extensions/extension-in-flows.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 3.0" }, { diff --git a/amf-cli/shared/src/test/resources/validations/oas3/spec-extensions/extension-in-info.jsonld b/amf-cli/shared/src/test/resources/validations/oas3/spec-extensions/extension-in-info.jsonld index bd1b6ab99e..0bf1dedf11 100644 --- a/amf-cli/shared/src/test/resources/validations/oas3/spec-extensions/extension-in-info.jsonld +++ b/amf-cli/shared/src/test/resources/validations/oas3/spec-extensions/extension-in-info.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 3.0" }, { diff --git a/amf-cli/shared/src/test/resources/validations/oas3/spec-extensions/extension-in-server.jsonld b/amf-cli/shared/src/test/resources/validations/oas3/spec-extensions/extension-in-server.jsonld index ea7d95bb36..16a7ef6523 100644 --- a/amf-cli/shared/src/test/resources/validations/oas3/spec-extensions/extension-in-server.jsonld +++ b/amf-cli/shared/src/test/resources/validations/oas3/spec-extensions/extension-in-server.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 3.0" }, { @@ -154,12 +154,12 @@ ], "smaps": { "synthesized-field": { - "http://www.w3.org/ns/shacl#defaultValueStr": "true", "http://www.w3.org/ns/shacl#datatype": "true" }, "lexical": { - "http://www.w3.org/ns/shacl#defaultValue": "[(22,17)-(22,21)]", - "file://amf-cli/shared/src/test/resources/validations/oas3/spec-extensions/extension-in-server.yaml#/web-api/server/https%3A%2F%2Fdevelopment.gigantic-server.com%2Fv1/variable/parameter/path/variable/scalar/variable": "[(22,0)-(25,0)]" + "http://www.w3.org/ns/shacl#defaultValueStr": "[(22,8)-(23,0)]", + "file://amf-cli/shared/src/test/resources/validations/oas3/spec-extensions/extension-in-server.yaml#/web-api/server/https%3A%2F%2Fdevelopment.gigantic-server.com%2Fv1/variable/parameter/path/variable/scalar/variable": "[(22,0)-(25,0)]", + "http://www.w3.org/ns/shacl#defaultValue": "[(22,8)-(23,0)]" } } }, diff --git a/amf-cli/shared/src/test/resources/validations/oas3/spec-extensions/extension-in-xml-object.jsonld b/amf-cli/shared/src/test/resources/validations/oas3/spec-extensions/extension-in-xml-object.jsonld index 7a167536ce..13795a1e05 100644 --- a/amf-cli/shared/src/test/resources/validations/oas3/spec-extensions/extension-in-xml-object.jsonld +++ b/amf-cli/shared/src/test/resources/validations/oas3/spec-extensions/extension-in-xml-object.jsonld @@ -5,7 +5,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.9.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 3.0" }, { diff --git a/amf-cli/shared/src/test/resources/validations/optional-scalar-value/optional-scalar-value.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/optional-scalar-value/optional-scalar-value.expanded.jsonld index 36d7cce404..b8d2c4795b 100644 --- a/amf-cli/shared/src/test/resources/validations/optional-scalar-value/optional-scalar-value.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/optional-scalar-value/optional-scalar-value.expanded.jsonld @@ -115,7 +115,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/validations/optional-scalar-value/optional-scalar-value.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/optional-scalar-value/optional-scalar-value.flattened.jsonld index 10d9c66725..3fc1e9838a 100644 --- a/amf-cli/shared/src/test/resources/validations/optional-scalar-value/optional-scalar-value.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/optional-scalar-value/optional-scalar-value.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/validations/raml/any-cant-override/case1/api.jsonld b/amf-cli/shared/src/test/resources/validations/raml/any-cant-override/case1/api.jsonld index d5c123ebd3..080f2fb676 100644 --- a/amf-cli/shared/src/test/resources/validations/raml/any-cant-override/case1/api.jsonld +++ b/amf-cli/shared/src/test/resources/validations/raml/any-cant-override/case1/api.jsonld @@ -48,7 +48,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ @@ -454,7 +454,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ @@ -484,7 +484,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ @@ -514,7 +514,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/validations/raml/any-cant-override/case2/api.jsonld b/amf-cli/shared/src/test/resources/validations/raml/any-cant-override/case2/api.jsonld index 81001b38a3..354f421d35 100644 --- a/amf-cli/shared/src/test/resources/validations/raml/any-cant-override/case2/api.jsonld +++ b/amf-cli/shared/src/test/resources/validations/raml/any-cant-override/case2/api.jsonld @@ -18,7 +18,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/validations/recursion-inheritance-properties.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/recursion-inheritance-properties.expanded.jsonld index 2b176d154a..c266d22e7e 100644 --- a/amf-cli/shared/src/test/resources/validations/recursion-inheritance-properties.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/recursion-inheritance-properties.expanded.jsonld @@ -338,7 +338,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/validations/recursion-inheritance-properties.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/recursion-inheritance-properties.flattened.jsonld index c1f8e61da2..e60382226d 100644 --- a/amf-cli/shared/src/test/resources/validations/recursion-inheritance-properties.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/recursion-inheritance-properties.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/validations/ref-from-allof-facet/result.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/ref-from-allof-facet/result.expanded.jsonld index f21050ad96..e46ecb215d 100644 --- a/amf-cli/shared/src/test/resources/validations/ref-from-allof-facet/result.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/ref-from-allof-facet/result.expanded.jsonld @@ -56,7 +56,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/validations/ref-from-allof-facet/result.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/ref-from-allof-facet/result.flattened.jsonld index 7be7277278..9b0ff8d146 100644 --- a/amf-cli/shared/src/test/resources/validations/ref-from-allof-facet/result.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/ref-from-allof-facet/result.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "OAS 3.0" }, diff --git a/amf-cli/shared/src/test/resources/validations/reports/async20/anypoint-binding-validations.report b/amf-cli/shared/src/test/resources/validations/reports/async20/anypoint-binding-validations.report new file mode 100644 index 0000000000..182579d532 --- /dev/null +++ b/amf-cli/shared/src/test/resources/validations/reports/async20/anypoint-binding-validations.report @@ -0,0 +1,30 @@ +ModelId: file://amf-cli/shared/src/test/resources/validations/async20/validations/anypoint-binding-validations.yaml +Profile: ASYNC 2.0 +Conforms: false +Number of results: 3 + +Level: Violation + +- Constraint: http://a.ml/vocabularies/amf/parser#AnypointMQChannelBinding-destinationType-in + Message: Invalid 'destinationType' value. The options are: 'exchange', 'queue' or 'fifo-queue'. + Severity: Violation + Target: file://amf-cli/shared/src/test/resources/validations/async20/validations/anypoint-binding-validations.yaml#/async-api/endpoint/some-channel/channel-bindings/bindings/anypointmq-channel + Property: http://a.ml/vocabularies/apiBinding#destinationType + Range: [(10,25)-(10,46)] + Location: file://amf-cli/shared/src/test/resources/validations/async20/validations/anypoint-binding-validations.yaml + +- Constraint: http://a.ml/vocabularies/amf/parser#AnypointMQMessageBinding-headers-anypointMQHeadersValidation + Message: AnypointMQ Message Binding 'headers' field must be an object + Severity: Violation + Target: file://amf-cli/shared/src/test/resources/validations/async20/validations/anypoint-binding-validations.yaml#/async-api/endpoint/some-channel/supportedOperation/publish/expects/request/message-bindings/bindings/anypointmq-message + Property: http://a.ml/vocabularies/apiBinding#headers + Range: [(16,20)-(18,0)] + Location: file://amf-cli/shared/src/test/resources/validations/async20/validations/anypoint-binding-validations.yaml + +- Constraint: http://a.ml/vocabularies/amf/parser#AnypointMQMessageBinding-headers-anypointMQHeadersValidation + Message: AnypointMQ Message Binding 'headers' field must have a 'properties' field + Severity: Violation + Target: file://amf-cli/shared/src/test/resources/validations/async20/validations/anypoint-binding-validations.yaml#/async-api/endpoint/other-channel/supportedOperation/publish/expects/request/message-bindings/bindings/anypointmq-message + Property: http://a.ml/vocabularies/apiBinding#headers + Range: [(26,10)-(30,0)] + Location: file://amf-cli/shared/src/test/resources/validations/async20/validations/anypoint-binding-validations.yaml diff --git a/amf-cli/shared/src/test/resources/validations/reports/async20/binding-wrong-key.report b/amf-cli/shared/src/test/resources/validations/reports/async20/binding-wrong-key.report new file mode 100644 index 0000000000..8073995edb --- /dev/null +++ b/amf-cli/shared/src/test/resources/validations/reports/async20/binding-wrong-key.report @@ -0,0 +1,46 @@ +ModelId: file://amf-cli/shared/src/test/resources/validations/async20/validations/binding-wrong-key.yaml +Profile: +Conforms: false +Number of results: 5 + +Level: Violation + +- Constraint: http://a.ml/vocabularies/amf/parser#closed-shape + Message: Property 'wrongKey1' not supported in a ASYNC 2.5 GooglePubSubMessageStoragePolicy node + Severity: Violation + Target: file://amf-cli/shared/src/test/resources/validations/async20/validations/binding-wrong-key.yaml#/async-api/endpoint/topic-proto-schema/channel-bindings/bindings/googlepubsub-operation/googlepubsub-messageStoragePolicy + Property: + Range: [(19,10)-(20,0)] + Location: file://amf-cli/shared/src/test/resources/validations/async20/validations/binding-wrong-key.yaml + +- Constraint: http://a.ml/vocabularies/amf/parser#closed-shape + Message: Property 'WrongKey2' not supported in a ASYNC 2.5 GooglePubSubSchemaSettings node + Severity: Violation + Target: file://amf-cli/shared/src/test/resources/validations/async20/validations/binding-wrong-key.yaml#/async-api/endpoint/topic-proto-schema/channel-bindings/bindings/googlepubsub-operation/googlepubsub-schemaSettings + Property: + Range: [(25,10)-(26,0)] + Location: file://amf-cli/shared/src/test/resources/validations/async20/validations/binding-wrong-key.yaml + +- Constraint: http://a.ml/vocabularies/amf/parser#closed-shape + Message: Property 'WrongKey3' not supported in a ASYNC 2.5 GooglePubSubChannelBinding node + Severity: Violation + Target: file://amf-cli/shared/src/test/resources/validations/async20/validations/binding-wrong-key.yaml#/async-api/endpoint/topic-proto-schema/channel-bindings/bindings/googlepubsub-operation + Property: + Range: [(26,8)-(27,0)] + Location: file://amf-cli/shared/src/test/resources/validations/async20/validations/binding-wrong-key.yaml + +- Constraint: http://a.ml/vocabularies/amf/parser#closed-shape + Message: Property 'WrongKey4' not supported in a ASYNC 2.5 GooglePubSubMessageBinding node + Severity: Violation + Target: file://amf-cli/shared/src/test/resources/validations/async20/validations/binding-wrong-key.yaml#/declares/msg/messageAvro/message-bindings/bindings/googlepubsub-message + Property: + Range: [(36,10)-(37,0)] + Location: file://amf-cli/shared/src/test/resources/validations/async20/validations/binding-wrong-key.yaml + +- Constraint: http://a.ml/vocabularies/amf/parser#closed-shape + Message: Property 'WrongKey5' not supported in a ASYNC 2.5 GooglePubSubMessageSchema node + Severity: Violation + Target: file://amf-cli/shared/src/test/resources/validations/async20/validations/binding-wrong-key.yaml#/declares/msg/messageAvro/message-bindings/bindings/googlepubsub-message/googlepubsub-schemaDefinition + Property: + Range: [(40,12)-(43,0)] + Location: file://amf-cli/shared/src/test/resources/validations/async20/validations/binding-wrong-key.yaml diff --git a/amf-cli/shared/src/test/resources/validations/reports/async20/channel-servers.report b/amf-cli/shared/src/test/resources/validations/reports/async20/channel-servers.report index bc0701640e..61a60084ec 100644 --- a/amf-cli/shared/src/test/resources/validations/reports/async20/channel-servers.report +++ b/amf-cli/shared/src/test/resources/validations/reports/async20/channel-servers.report @@ -1,4 +1,14 @@ ModelId: file://amf-cli/shared/src/test/resources/validations/async20/validations/channel-servers.yaml -Profile: -Conforms: true -Number of results: 0 +Profile: ASYNC 2.0 +Conforms: false +Number of results: 1 + +Level: Violation + +- Constraint: http://a.ml/vocabularies/amf/resolution#undeclared-channel-server + Message: Server 'notDefinedServer' in channel 'users/signup' is not defined in the servers root object + Severity: Violation + Target: file://amf-cli/shared/src/test/resources/validations/async20/validations/channel-servers.yaml#/async-api/endpoint/users%2Fsignup/servers/null_3 + Property: + Range: + Location: diff --git a/amf-cli/shared/src/test/resources/validations/reports/async20/duplicate-messageId-inline.report b/amf-cli/shared/src/test/resources/validations/reports/async20/duplicate-messageId-inline.report index dd126d4902..ee2d613192 100644 --- a/amf-cli/shared/src/test/resources/validations/reports/async20/duplicate-messageId-inline.report +++ b/amf-cli/shared/src/test/resources/validations/reports/async20/duplicate-messageId-inline.report @@ -1,5 +1,5 @@ ModelId: file://amf-cli/shared/src/test/resources/validations/async20/validations/duplicate-messageId-inline.yaml -Profile: +Profile: Conforms: false Number of results: 1 @@ -9,6 +9,6 @@ Level: Violation Message: Duplicated message id 'duplicateMessageId' Severity: Violation Target: file://amf-cli/shared/src/test/resources/validations/async20/validations/duplicate-messageId-inline.yaml#/async-api/endpoint/channel1/supportedOperation/subscribe/returns/resp/default-response - Property: + Property: Range: [(14,19)-(14,37)] Location: file://amf-cli/shared/src/test/resources/validations/async20/validations/duplicate-messageId-inline.yaml diff --git a/amf-cli/shared/src/test/resources/validations/reports/async20/ibmmq-binding-parsing-validations.report b/amf-cli/shared/src/test/resources/validations/reports/async20/ibmmq-binding-parsing-validations.report new file mode 100644 index 0000000000..d75c5b639c --- /dev/null +++ b/amf-cli/shared/src/test/resources/validations/reports/async20/ibmmq-binding-parsing-validations.report @@ -0,0 +1,14 @@ +ModelId: file://amf-cli/shared/src/test/resources/validations/async20/validations/ibmmq-binding-parsing-validations.yaml +Profile: +Conforms: false +Number of results: 1 + +Level: Violation + +- Constraint: http://a.ml/vocabularies/amf/parser#required-field + Message: field 'objectName' is required in a IBMMQ Channel Queue + Severity: Violation + Target: file://amf-cli/shared/src/test/resources/validations/async20/validations/ibmmq-binding-parsing-validations.yaml#/async-api/endpoint/some-channel/channel-bindings/bindings/ibmmq-channel + Property: + Range: + Location: file://amf-cli/shared/src/test/resources/validations/async20/validations/ibmmq-binding-parsing-validations.yaml diff --git a/amf-cli/shared/src/test/resources/validations/reports/async20/ibmmq-binding-validations-valid.report b/amf-cli/shared/src/test/resources/validations/reports/async20/ibmmq-binding-validations-valid.report new file mode 100644 index 0000000000..f556c7847d --- /dev/null +++ b/amf-cli/shared/src/test/resources/validations/reports/async20/ibmmq-binding-validations-valid.report @@ -0,0 +1,4 @@ +ModelId: file://amf-cli/shared/src/test/resources/validations/async20/validations/ibmmq-binding-validations-valid.yaml +Profile: ASYNC 2.0 +Conforms: true +Number of results: 0 diff --git a/amf-cli/shared/src/test/resources/validations/reports/async20/ibmmq-binding-validations.report b/amf-cli/shared/src/test/resources/validations/reports/async20/ibmmq-binding-validations.report new file mode 100644 index 0000000000..46fd9acc5f --- /dev/null +++ b/amf-cli/shared/src/test/resources/validations/reports/async20/ibmmq-binding-validations.report @@ -0,0 +1,86 @@ +ModelId: file://amf-cli/shared/src/test/resources/validations/async20/validations/ibmmq-binding-validations.yaml +Profile: ASYNC 2.0 +Conforms: false +Number of results: 10 + +Level: Violation + +- Constraint: http://a.ml/vocabularies/amf/parser#IBMMQServerBinding-heartBeatInterval-pattern + Message: IBMMQ Server Binding 'heartBeatInterval' field must be a number between 0-999999 + Severity: Violation + Target: file://amf-cli/shared/src/test/resources/validations/async20/validations/ibmmq-binding-validations.yaml#/async-api/server/some.com/server-bindings/bindings/ibmmq-server + Property: http://a.ml/vocabularies/apiBinding#heartBeatInterval + Range: [(11,27)-(11,36)] + Location: file://amf-cli/shared/src/test/resources/validations/async20/validations/ibmmq-binding-validations.yaml + +- Constraint: http://a.ml/vocabularies/amf/parser#IBMMQChannelBinding-maxMsgLength-IBMMQMaxMsgLengthValidation + Message: IBMMQ channel Binding 'maxMsgLength' field must be a number between 0-104857600 (100MB) + Severity: Violation + Target: file://amf-cli/shared/src/test/resources/validations/async20/validations/ibmmq-binding-validations.yaml#/async-api/endpoint/some-channel/channel-bindings/bindings/ibmmq-channel + Property: http://a.ml/vocabularies/apiBinding#maxMsgLength + Range: [(16,6)-(25,0)] + Location: file://amf-cli/shared/src/test/resources/validations/async20/validations/ibmmq-binding-validations.yaml + +- Constraint: http://a.ml/vocabularies/amf/parser#IBMMQChannelBinding-queue-IBMMQDestinationValidation + Message: 'queue' and 'topic' fields MUST NOT coexist within an IBMMQ channel binding + Severity: Violation + Target: file://amf-cli/shared/src/test/resources/validations/async20/validations/ibmmq-binding-validations.yaml#/async-api/endpoint/some-channel/channel-bindings/bindings/ibmmq-channel + Property: http://a.ml/vocabularies/apiBinding#queue + Range: [(16,6)-(25,0)] + Location: file://amf-cli/shared/src/test/resources/validations/async20/validations/ibmmq-binding-validations.yaml + +- Constraint: http://a.ml/vocabularies/amf/parser#IBMMQChannelBinding-destinationType-in + Message: IBMMQ Channel Binding 'destinationType' field must be either 'topic' or 'queue' + Severity: Violation + Target: file://amf-cli/shared/src/test/resources/validations/async20/validations/ibmmq-binding-validations.yaml#/async-api/endpoint/some-channel/channel-bindings/bindings/ibmmq-channel + Property: http://a.ml/vocabularies/apiBinding#destinationType + Range: [(17,25)-(17,42)] + Location: file://amf-cli/shared/src/test/resources/validations/async20/validations/ibmmq-binding-validations.yaml + +- Constraint: http://a.ml/vocabularies/amf/parser#IBMMQChannelQueue-objectName-maxLength + Message: IBMMQ queue 'objectName' field MUST NOT exceed 48 characters in length + Severity: Violation + Target: file://amf-cli/shared/src/test/resources/validations/async20/validations/ibmmq-binding-validations.yaml#/async-api/endpoint/some-channel/channel-bindings/bindings/ibmmq-channel/ibmmq-queue + Property: http://a.ml/vocabularies/apiBinding#objectName + Range: [(19,22)-(19,75)] + Location: file://amf-cli/shared/src/test/resources/validations/async20/validations/ibmmq-binding-validations.yaml + +- Constraint: http://a.ml/vocabularies/amf/parser#IBMMQChannelTopic-string-maxLength + Message: IBMMQ topic 'string' field MUST NOT exceed 10240 characters in length + Severity: Violation + Target: file://amf-cli/shared/src/test/resources/validations/async20/validations/ibmmq-binding-validations.yaml#/async-api/endpoint/some-channel/channel-bindings/bindings/ibmmq-channel/ibmmq-topic + Property: http://a.ml/vocabularies/apiBinding#string + Range: [(22,12)-(22,10279)] + Location: file://amf-cli/shared/src/test/resources/validations/async20/validations/ibmmq-binding-validations.yaml + +- Constraint: http://a.ml/vocabularies/amf/parser#IBMMQChannelTopic-objectName-maxLength + Message: IBMMQ topic 'objectName' field MUST NOT exceed 48 characters in length + Severity: Violation + Target: file://amf-cli/shared/src/test/resources/validations/async20/validations/ibmmq-binding-validations.yaml#/async-api/endpoint/some-channel/channel-bindings/bindings/ibmmq-channel/ibmmq-topic + Property: http://a.ml/vocabularies/apiBinding#objectName + Range: [(23,22)-(23,75)] + Location: file://amf-cli/shared/src/test/resources/validations/async20/validations/ibmmq-binding-validations.yaml + +- Constraint: http://a.ml/vocabularies/amf/parser#IBMMQMessageBinding-messageType-in + Message: IBMMQ message Binding 'type' field must be either 'string', 'jms' or 'binary' + Severity: Violation + Target: file://amf-cli/shared/src/test/resources/validations/async20/validations/ibmmq-binding-validations.yaml#/async-api/endpoint/some-channel/supportedOperation/publish/expects/request/message-bindings/bindings/ibmmq-message + Property: http://a.ml/vocabularies/apiBinding#messageType + Range: [(29,18)-(29,22)] + Location: file://amf-cli/shared/src/test/resources/validations/async20/validations/ibmmq-binding-validations.yaml + +- Constraint: http://a.ml/vocabularies/amf/parser#IBMMQMessageBinding-expiry-minInclusive + Message: IBMMQ message Binding 'expiry' field must be 0 or greater + Severity: Violation + Target: file://amf-cli/shared/src/test/resources/validations/async20/validations/ibmmq-binding-validations.yaml#/async-api/endpoint/some-channel/supportedOperation/publish/expects/request/message-bindings/bindings/ibmmq-message + Property: http://a.ml/vocabularies/apiBinding#expiry + Range: [(30,20)-(30,22)] + Location: file://amf-cli/shared/src/test/resources/validations/async20/validations/ibmmq-binding-validations.yaml + +- Constraint: http://a.ml/vocabularies/amf/parser#IBMMQMessageBinding-headers-IBMMQHeadersValidation + Message: IBMMQ message Binding 'headers' MUST NOT be specified if 'type' field is 'string' or 'jms' + Severity: Violation + Target: file://amf-cli/shared/src/test/resources/validations/async20/validations/ibmmq-binding-validations.yaml#/async-api/endpoint/other-channel/supportedOperation/publish/expects/request/message-bindings/bindings/ibmmq-message + Property: http://a.ml/vocabularies/apiBinding#headers + Range: [(36,10)-(39,0)] + Location: file://amf-cli/shared/src/test/resources/validations/async20/validations/ibmmq-binding-validations.yaml diff --git a/amf-cli/shared/src/test/resources/validations/reports/async20/messageId-invalid.report b/amf-cli/shared/src/test/resources/validations/reports/async20/messageId-invalid.report index a170b44b86..d103e3363e 100644 --- a/amf-cli/shared/src/test/resources/validations/reports/async20/messageId-invalid.report +++ b/amf-cli/shared/src/test/resources/validations/reports/async20/messageId-invalid.report @@ -1,5 +1,5 @@ ModelId: file://amf-cli/shared/src/test/resources/validations/async20/validations/messageId-invalid.yaml -Profile: +Profile: Conforms: false Number of results: 1 @@ -9,6 +9,6 @@ Level: Violation Message: Property 'messageId' not supported in a ASYNC 2.2 message node Severity: Violation Target: file://amf-cli/shared/src/test/resources/validations/async20/validations/messageId-invalid.yaml#/declares/msg/SomeMessage - Property: + Property: Range: [(12,6)-(13,0)] Location: file://amf-cli/shared/src/test/resources/validations/async20/validations/messageId-invalid.yaml diff --git a/amf-cli/shared/src/test/resources/validations/reports/async20/messageIds-duplicated.report b/amf-cli/shared/src/test/resources/validations/reports/async20/messageIds-duplicated.report index 5325f8234c..5f10f66fa0 100644 --- a/amf-cli/shared/src/test/resources/validations/reports/async20/messageIds-duplicated.report +++ b/amf-cli/shared/src/test/resources/validations/reports/async20/messageIds-duplicated.report @@ -1,5 +1,5 @@ ModelId: file://amf-cli/shared/src/test/resources/validations/async20/validations/messageIds-duplicated.yaml -Profile: +Profile: Conforms: false Number of results: 1 @@ -9,6 +9,6 @@ Level: Violation Message: Duplicated message id 'SomeMessage' Severity: Violation Target: file://amf-cli/shared/src/test/resources/validations/async20/validations/messageIds-duplicated.yaml#/declares/msg/AnotherMessage - Property: + Property: Range: [(14,17)-(14,28)] Location: file://amf-cli/shared/src/test/resources/validations/async20/validations/messageIds-duplicated.yaml diff --git a/amf-cli/shared/src/test/resources/validations/reports/async20/messageIds-not-duplicated.report b/amf-cli/shared/src/test/resources/validations/reports/async20/messageIds-not-duplicated.report index f53d274238..45b912a2a8 100644 --- a/amf-cli/shared/src/test/resources/validations/reports/async20/messageIds-not-duplicated.report +++ b/amf-cli/shared/src/test/resources/validations/reports/async20/messageIds-not-duplicated.report @@ -1,4 +1,4 @@ ModelId: file://amf-cli/shared/src/test/resources/validations/async20/validations/messageIds-not-duplicated.yaml -Profile: +Profile: ASYNC 2.0 Conforms: true Number of results: 0 diff --git a/amf-cli/shared/src/test/resources/validations/reports/async20/operation-security.report b/amf-cli/shared/src/test/resources/validations/reports/async20/operation-security.report new file mode 100644 index 0000000000..0dd313e107 --- /dev/null +++ b/amf-cli/shared/src/test/resources/validations/reports/async20/operation-security.report @@ -0,0 +1,14 @@ +ModelId: file://amf-cli/shared/src/test/resources/validations/async20/validations/operation-security.yaml +Profile: +Conforms: false +Number of results: 1 + +Level: Violation + +- Constraint: http://a.ml/vocabularies/amf/parser#unknown-scope + Message: Scope 'this should throw not found error' not found in settings of declared secured by oauth2. + Severity: Violation + Target: file://amf-cli/shared/src/test/resources/validations/async20/validations/operation-security.yaml#/async-api/endpoint/some%2Fevents/supportedOperation/subscribe/security/requirement_1/schemes/oauth2/settings/oauth2/flows/default-flow/scope/this%20should%20throw%20not%20found%20error + Property: ValueType(Namespace(http://a.ml/vocabularies/security#),scope) + Range: [(34,14)-(34,47)] + Location: file://amf-cli/shared/src/test/resources/validations/async20/validations/operation-security.yaml diff --git a/amf-cli/shared/src/test/resources/validations/reports/async20/pulsar-binding-extra-key.report b/amf-cli/shared/src/test/resources/validations/reports/async20/pulsar-binding-extra-key.report new file mode 100644 index 0000000000..81b9a745ee --- /dev/null +++ b/amf-cli/shared/src/test/resources/validations/reports/async20/pulsar-binding-extra-key.report @@ -0,0 +1,30 @@ +ModelId: file://amf-cli/shared/src/test/resources/validations/async20/validations/pulsar-binding-extra-key.yaml +Profile: +Conforms: false +Number of results: 3 + +Level: Violation + +- Constraint: http://a.ml/vocabularies/amf/parser#closed-shape + Message: Property 'thisKeyIsNotAllowed' not supported in a ASYNC 2.6 PulsarServerBinding node + Severity: Violation + Target: file://amf-cli/shared/src/test/resources/validations/async20/validations/pulsar-binding-extra-key.yaml#/async-api/server/some.com/server-bindings/bindings/pulsar-server + Property: + Range: [(13,8)-(14,0)] + Location: file://amf-cli/shared/src/test/resources/validations/async20/validations/pulsar-binding-extra-key.yaml + +- Constraint: http://a.ml/vocabularies/amf/parser#closed-shape + Message: Property 'thisKeyIsNotAllowed' not supported in a ASYNC 2.6 PulsarChannelRetention node + Severity: Violation + Target: file://amf-cli/shared/src/test/resources/validations/async20/validations/pulsar-binding-extra-key.yaml#/async-api/endpoint/some-channel/channel-bindings/bindings/pulsar-operation/pulsar-retention + Property: + Range: [(28,10)-(29,0)] + Location: file://amf-cli/shared/src/test/resources/validations/async20/validations/pulsar-binding-extra-key.yaml + +- Constraint: http://a.ml/vocabularies/amf/parser#closed-shape + Message: Property 'thisKeyIsNotAllowed' not supported in a ASYNC 2.6 PulsarChannelBinding node + Severity: Violation + Target: file://amf-cli/shared/src/test/resources/validations/async20/validations/pulsar-binding-extra-key.yaml#/async-api/endpoint/some-channel/channel-bindings/bindings/pulsar-operation + Property: + Range: [(32,8)-(33,0)] + Location: file://amf-cli/shared/src/test/resources/validations/async20/validations/pulsar-binding-extra-key.yaml diff --git a/amf-cli/shared/src/test/resources/validations/reports/async20/pulsar-binding-missing-key.report b/amf-cli/shared/src/test/resources/validations/reports/async20/pulsar-binding-missing-key.report new file mode 100644 index 0000000000..0e9485d638 --- /dev/null +++ b/amf-cli/shared/src/test/resources/validations/reports/async20/pulsar-binding-missing-key.report @@ -0,0 +1,22 @@ +ModelId: file://amf-cli/shared/src/test/resources/validations/async20/validations/pulsar-binding-missing-key.yaml +Profile: +Conforms: false +Number of results: 2 + +Level: Violation + +- Constraint: http://a.ml/vocabularies/amf/parser#required-field + Message: field 'namespace' is required in a Pulsar Channel Binding + Severity: Violation + Target: file://amf-cli/shared/src/test/resources/validations/async20/validations/pulsar-binding-missing-key.yaml#/async-api/endpoint/some-channel/channel-bindings/bindings/pulsar-operation + Property: + Range: + Location: file://amf-cli/shared/src/test/resources/validations/async20/validations/pulsar-binding-missing-key.yaml + +- Constraint: http://a.ml/vocabularies/amf/parser#required-field + Message: field 'persistence' is required in a Pulsar Channel Binding + Severity: Violation + Target: file://amf-cli/shared/src/test/resources/validations/async20/validations/pulsar-binding-missing-key.yaml#/async-api/endpoint/some-channel/channel-bindings/bindings/pulsar-operation + Property: + Range: + Location: file://amf-cli/shared/src/test/resources/validations/async20/validations/pulsar-binding-missing-key.yaml diff --git a/amf-cli/shared/src/test/resources/validations/reports/async20/server-tags.report b/amf-cli/shared/src/test/resources/validations/reports/async20/server-tags.report index ba09ba7502..cae0d61a4c 100644 --- a/amf-cli/shared/src/test/resources/validations/reports/async20/server-tags.report +++ b/amf-cli/shared/src/test/resources/validations/reports/async20/server-tags.report @@ -1,4 +1,4 @@ ModelId: file://amf-cli/shared/src/test/resources/validations/async20/validations/server-tags.yaml -Profile: +Profile: ASYNC 2.0 Conforms: true Number of results: 0 diff --git a/amf-cli/shared/src/test/resources/validations/reports/async20/server-variable.report b/amf-cli/shared/src/test/resources/validations/reports/async20/server-variable.report new file mode 100644 index 0000000000..2235b8e6a5 --- /dev/null +++ b/amf-cli/shared/src/test/resources/validations/reports/async20/server-variable.report @@ -0,0 +1,4 @@ +ModelId: file://amf-cli/shared/src/test/resources/validations/async20/validations/server-variable.yaml +Profile: ASYNC 2.0 +Conforms: true +Number of results: 0 diff --git a/amf-cli/shared/src/test/resources/validations/reports/async20/solace-binding-extra-key.report b/amf-cli/shared/src/test/resources/validations/reports/async20/solace-binding-extra-key.report new file mode 100644 index 0000000000..0e36f6a039 --- /dev/null +++ b/amf-cli/shared/src/test/resources/validations/reports/async20/solace-binding-extra-key.report @@ -0,0 +1,38 @@ +ModelId: file://amf-cli/shared/src/test/resources/validations/async20/validations/solace-binding-extra-key.yaml +Profile: +Conforms: false +Number of results: 4 + +Level: Violation + +- Constraint: http://a.ml/vocabularies/amf/parser#closed-shape + Message: Property 'thisKeyIsNotAllowed' not supported in a ASYNC 2.3 SolaceServerBinding node + Severity: Violation + Target: file://amf-cli/shared/src/test/resources/validations/async20/validations/solace-binding-extra-key.yaml#/async-api/server/some.com/server-bindings/bindings/solace-server + Property: + Range: [(13,8)-(14,0)] + Location: file://amf-cli/shared/src/test/resources/validations/async20/validations/solace-binding-extra-key.yaml + +- Constraint: http://a.ml/vocabularies/amf/parser#closed-shape + Message: Property 'thisKeyIsNotAllowed' not supported in a ASYNC 2.3 SolaceOperationQueue node + Severity: Violation + Target: file://amf-cli/shared/src/test/resources/validations/async20/validations/solace-binding-extra-key.yaml#/async-api/endpoint/some-channel/supportedOperation/publish/operation-bindings/bindings/solace-operation/destinations/solace-destination/solace-queue + Property: + Range: [(24,16)-(25,0)] + Location: file://amf-cli/shared/src/test/resources/validations/async20/validations/solace-binding-extra-key.yaml + +- Constraint: http://a.ml/vocabularies/amf/parser#closed-shape + Message: Property 'thisKeyIsNotAllowed' not supported in a ASYNC 2.3 SolaceOperationTopic node + Severity: Violation + Target: file://amf-cli/shared/src/test/resources/validations/async20/validations/solace-binding-extra-key.yaml#/async-api/endpoint/some-channel/supportedOperation/publish/operation-bindings/bindings/solace-operation/destinations/solace-destination_1/solace-topic + Property: + Range: [(29,16)-(30,0)] + Location: file://amf-cli/shared/src/test/resources/validations/async20/validations/solace-binding-extra-key.yaml + +- Constraint: http://a.ml/vocabularies/amf/parser#closed-shape + Message: Property 'thisKeyIsNotAllowed' not supported in a ASYNC 2.3 SolaceOperationBinding node + Severity: Violation + Target: file://amf-cli/shared/src/test/resources/validations/async20/validations/solace-binding-extra-key.yaml#/async-api/endpoint/some-channel/supportedOperation/publish/operation-bindings/bindings/solace-operation + Property: + Range: [(32,10)-(32,60)] + Location: file://amf-cli/shared/src/test/resources/validations/async20/validations/solace-binding-extra-key.yaml diff --git a/amf-cli/shared/src/test/resources/validations/reports/async20/solace-binding-validations.report b/amf-cli/shared/src/test/resources/validations/reports/async20/solace-binding-validations.report new file mode 100644 index 0000000000..27ce744991 --- /dev/null +++ b/amf-cli/shared/src/test/resources/validations/reports/async20/solace-binding-validations.report @@ -0,0 +1,30 @@ +ModelId: file://amf-cli/shared/src/test/resources/validations/async20/validations/solace-binding-validations.yaml +Profile: ASYNC 2.0 +Conforms: false +Number of results: 3 + +Level: Violation + +- Constraint: http://a.ml/vocabularies/amf/parser#SolaceOperationDestination-destinationType-in + Message: Invalid 'destinationType' value. The options are: 'queue' or 'topic'. + Severity: Violation + Target: file://amf-cli/shared/src/test/resources/validations/async20/validations/solace-binding-validations.yaml#/async-api/endpoint/some-channel/supportedOperation/publish/operation-bindings/bindings/solace-operation/destinations/solace-destination + Property: http://a.ml/vocabularies/apiBinding#destinationType + Range: [(20,31)-(20,52)] + Location: file://amf-cli/shared/src/test/resources/validations/async20/validations/solace-binding-validations.yaml + +- Constraint: http://a.ml/vocabularies/amf/parser#SolaceOperationDestination-deliveryMode-in + Message: Invalid 'deliveryMode' value. The options are: 'direct' or 'persistent'. + Severity: Violation + Target: file://amf-cli/shared/src/test/resources/validations/async20/validations/solace-binding-validations.yaml#/async-api/endpoint/some-channel/supportedOperation/publish/operation-bindings/bindings/solace-operation/destinations/solace-destination + Property: http://a.ml/vocabularies/apiBinding#deliveryMode + Range: [(21,28)-(21,46)] + Location: file://amf-cli/shared/src/test/resources/validations/async20/validations/solace-binding-validations.yaml + +- Constraint: http://a.ml/vocabularies/amf/parser#SolaceOperationQueue-accessType-in + Message: Invalid 'accessType' value. The options are: 'exclusive' or 'nonexclusive'. + Severity: Violation + Target: file://amf-cli/shared/src/test/resources/validations/async20/validations/solace-binding-validations.yaml#/async-api/endpoint/some-channel/supportedOperation/publish/operation-bindings/bindings/solace-operation/destinations/solace-destination/solace-queue + Property: http://a.ml/vocabularies/apiBinding#accessType + Range: [(24,28)-(24,44)] + Location: file://amf-cli/shared/src/test/resources/validations/async20/validations/solace-binding-validations.yaml diff --git a/amf-cli/shared/src/test/resources/validations/resolved-link-annotation/api.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/resolved-link-annotation/api.expanded.jsonld index 499c105bc8..d401513851 100644 --- a/amf-cli/shared/src/test/resources/validations/resolved-link-annotation/api.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/resolved-link-annotation/api.expanded.jsonld @@ -238,7 +238,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/validations/resolved-link-annotation/api.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/resolved-link-annotation/api.flattened.jsonld index 15563cad3e..884013a39a 100644 --- a/amf-cli/shared/src/test/resources/validations/resolved-link-annotation/api.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/resolved-link-annotation/api.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/validations/root-mediatype-propagation/root-mediatype-propagation.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/root-mediatype-propagation/root-mediatype-propagation.expanded.jsonld index 1a97127d1e..4c70c4d877 100644 --- a/amf-cli/shared/src/test/resources/validations/root-mediatype-propagation/root-mediatype-propagation.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/root-mediatype-propagation/root-mediatype-propagation.expanded.jsonld @@ -201,7 +201,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/validations/root-mediatype-propagation/root-mediatype-propagation.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/root-mediatype-propagation/root-mediatype-propagation.flattened.jsonld index 30b07910ec..8b663cc277 100644 --- a/amf-cli/shared/src/test/resources/validations/root-mediatype-propagation/root-mediatype-propagation.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/root-mediatype-propagation/root-mediatype-propagation.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/validations/rt-parameters.raml.resolved.jsonld b/amf-cli/shared/src/test/resources/validations/rt-parameters.raml.resolved.jsonld index 843dc95678..91d71498f7 100644 --- a/amf-cli/shared/src/test/resources/validations/rt-parameters.raml.resolved.jsonld +++ b/amf-cli/shared/src/test/resources/validations/rt-parameters.raml.resolved.jsonld @@ -399,7 +399,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/validations/simple-recursion.jsonld b/amf-cli/shared/src/test/resources/validations/simple-recursion.jsonld index db09171747..96aa56a2a3 100644 --- a/amf-cli/shared/src/test/resources/validations/simple-recursion.jsonld +++ b/amf-cli/shared/src/test/resources/validations/simple-recursion.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/validations/tracked-from-resource-type/tracked-from-resource-type.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/tracked-from-resource-type/tracked-from-resource-type.expanded.jsonld index dc1ee7087b..40a709c66d 100644 --- a/amf-cli/shared/src/test/resources/validations/tracked-from-resource-type/tracked-from-resource-type.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/tracked-from-resource-type/tracked-from-resource-type.expanded.jsonld @@ -653,7 +653,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ @@ -708,7 +708,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/validations/tracked-from-resource-type/tracked-from-resource-type.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/tracked-from-resource-type/tracked-from-resource-type.flattened.jsonld index c0bbf96258..8e88b5b31a 100644 --- a/amf-cli/shared/src/test/resources/validations/tracked-from-resource-type/tracked-from-resource-type.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/tracked-from-resource-type/tracked-from-resource-type.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, @@ -744,7 +744,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "RAML 1.0" } ], diff --git a/amf-cli/shared/src/test/resources/validations/tracked-oas-examples/tracked-oas-examples.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/tracked-oas-examples/tracked-oas-examples.expanded.jsonld index 0727099a86..30f175d3f8 100644 --- a/amf-cli/shared/src/test/resources/validations/tracked-oas-examples/tracked-oas-examples.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/tracked-oas-examples/tracked-oas-examples.expanded.jsonld @@ -782,7 +782,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/validations/tracked-oas-examples/tracked-oas-examples.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/tracked-oas-examples/tracked-oas-examples.flattened.jsonld index 577b07ffa1..7f4912fe42 100644 --- a/amf-cli/shared/src/test/resources/validations/tracked-oas-examples/tracked-oas-examples.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/tracked-oas-examples/tracked-oas-examples.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "OAS 2.0" }, diff --git a/amf-cli/shared/src/test/resources/validations/tracked-oas-param-body/tracked-oas-param-body.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/tracked-oas-param-body/tracked-oas-param-body.expanded.jsonld index 2aa2debd11..d4e73c0d74 100644 --- a/amf-cli/shared/src/test/resources/validations/tracked-oas-param-body/tracked-oas-param-body.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/tracked-oas-param-body/tracked-oas-param-body.expanded.jsonld @@ -779,7 +779,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/validations/tracked-oas-param-body/tracked-oas-param-body.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/tracked-oas-param-body/tracked-oas-param-body.flattened.jsonld index 46afe1d7cc..4def6f8c08 100644 --- a/amf-cli/shared/src/test/resources/validations/tracked-oas-param-body/tracked-oas-param-body.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/tracked-oas-param-body/tracked-oas-param-body.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "OAS 2.0" }, diff --git a/amf-cli/shared/src/test/resources/validations/tracked-to-linked/tracked-to-linked.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/tracked-to-linked/tracked-to-linked.expanded.jsonld index 2f0ed1e595..baade21525 100644 --- a/amf-cli/shared/src/test/resources/validations/tracked-to-linked/tracked-to-linked.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/tracked-to-linked/tracked-to-linked.expanded.jsonld @@ -666,7 +666,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ @@ -861,7 +861,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ @@ -916,7 +916,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ @@ -971,7 +971,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:sourceSpec": [ diff --git a/amf-cli/shared/src/test/resources/validations/tracked-to-linked/tracked-to-linked.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/tracked-to-linked/tracked-to-linked.flattened.jsonld index 67b46ad0c3..589eda97ea 100644 --- a/amf-cli/shared/src/test/resources/validations/tracked-to-linked/tracked-to-linked.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/tracked-to-linked/tracked-to-linked.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, @@ -900,7 +900,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "RAML 1.0" }, { @@ -917,7 +917,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "RAML 1.0" }, { @@ -934,7 +934,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:sourceSpec": "RAML 1.0" } ], diff --git a/amf-cli/shared/src/test/resources/validations/union-type-array.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/union-type-array.expanded.jsonld index 855e0e4bb0..830fc24308 100644 --- a/amf-cli/shared/src/test/resources/validations/union-type-array.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/union-type-array.expanded.jsonld @@ -42,7 +42,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/validations/union-type-array.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/union-type-array.flattened.jsonld index d3807254a0..f48b18af3b 100644 --- a/amf-cli/shared/src/test/resources/validations/union-type-array.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/union-type-array.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/validations/union-type-containg-array/union-type-containg-array.expanded.jsonld b/amf-cli/shared/src/test/resources/validations/union-type-containg-array/union-type-containg-array.expanded.jsonld index da6d4bb763..d9e2212df2 100644 --- a/amf-cli/shared/src/test/resources/validations/union-type-containg-array/union-type-containg-array.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/validations/union-type-containg-array/union-type-containg-array.expanded.jsonld @@ -42,7 +42,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.8.2" + "@value": "3.9.0" } ], "doc:transformed": [ diff --git a/amf-cli/shared/src/test/resources/validations/union-type-containg-array/union-type-containg-array.flattened.jsonld b/amf-cli/shared/src/test/resources/validations/union-type-containg-array/union-type-containg-array.flattened.jsonld index e7be8ce685..a39f6834ad 100644 --- a/amf-cli/shared/src/test/resources/validations/union-type-containg-array/union-type-containg-array.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/validations/union-type-containg-array/union-type-containg-array.flattened.jsonld @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.8.2", + "apiContract:modelVersion": "3.9.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/scala/amf/emit/Async20CycleTest.scala b/amf-cli/shared/src/test/scala/amf/emit/Async20CycleTest.scala index 63a1e3e34b..2bd5532e8c 100644 --- a/amf-cli/shared/src/test/scala/amf/emit/Async20CycleTest.scala +++ b/amf-cli/shared/src/test/scala/amf/emit/Async20CycleTest.scala @@ -138,9 +138,13 @@ class Async20CycleTest extends FunSuiteCycleTests { "bindings/mercure-binding.yaml", "bindings/mercure-binding.yaml" ), - FixtureData("message example","sumary-name-example-message.yaml","sumary-name-example-message.yaml"), - FixtureData("message example in 2.0.0","sumary-name-example-message-2-0.yaml","sumary-name-example-message-2-0-compare.yaml"), - FixtureData("messageId in 2.4","messageId.yaml","messageId.yaml"), + FixtureData("message example", "sumary-name-example-message.yaml", "sumary-name-example-message.yaml"), + FixtureData( + "message example in 2.0.0", + "sumary-name-example-message-2-0.yaml", + "sumary-name-example-message-2-0-compare.yaml" + ), + FixtureData("messageId in 2.4", "messageId.yaml", "messageId.yaml"), FixtureData( "ibmmq binding", "bindings/ibmmq-binding.yaml", @@ -149,10 +153,51 @@ class Async20CycleTest extends FunSuiteCycleTests { FixtureData("Async specific channel servers", "channel-servers.yaml", "channel-servers.yaml"), FixtureData("Async servers tags", "server-tags.yaml", "server-tags.yaml"), FixtureData("Async 2.3 components", "components/components-2.3.yaml", "components/components-2.3.yaml"), - FixtureData( + FixtureData( "anypointMQ binding", "bindings/anypoint-binding.yaml", "bindings/anypoint-binding.yaml" + ), + FixtureData("Async serverVariable", "server-variable.yaml", "server-variable.yaml"), + FixtureData( + "solace binding", + "bindings/solace-binding.yaml", + "bindings/solace-binding.yaml" + ), + FixtureData( + "pulsar binding", + "bindings/pulsar-binding.yaml", + "bindings/pulsar-binding.yaml" + ), + FixtureData( + "pulsar binding only required keys", + "bindings/pulsar-binding-only-required.yaml", + "bindings/pulsar-binding-only-required.yaml" + ), + FixtureData( + "GooglePubSub message-binding and channel-binding", + "bindings/gps-message-binding.yaml", + "bindings/gps-message-binding.yaml" + ), + FixtureData( + "async 2.4+ explicit security field in operation bindings", + "operation-security-explicit.yaml", + "operation-security-explicit.yaml" + ), + FixtureData( + "async 2.4+ implicit security field in operation bindings", + "operation-security-implicit.yaml", + "operation-security-implicit.yaml" + ), + FixtureData( + "Async 2.1 all", + "asyncApi-2.1-all.yaml", + "asyncApi-2.1-all.yaml" + ), + FixtureData( + "Async 2.2 all", + "asyncApi-2.2-all.yaml", + "asyncApi-2.2-all.yaml" ) // TODO: figure out why this test is commented out diff --git a/amf-cli/shared/src/test/scala/amf/io/BuildCycleTests.scala b/amf-cli/shared/src/test/scala/amf/io/BuildCycleTests.scala index c0c4aea747..d87bd1244e 100644 --- a/amf-cli/shared/src/test/scala/amf/io/BuildCycleTests.scala +++ b/amf-cli/shared/src/test/scala/amf/io/BuildCycleTests.scala @@ -1,7 +1,6 @@ package amf.io import amf.apicontract.client.scala.{AMFConfiguration, APIConfiguration} -import amf.apicontract.internal.spec.async.NotFinishedAsync20ParsePlugin import amf.core.client.scala.AMFGraphConfiguration import amf.core.client.scala.config.RenderOptions import amf.core.client.scala.errorhandling.{AMFErrorHandler, IgnoringErrorHandler} @@ -148,7 +147,7 @@ trait BuildCycleTestCommon extends FileAssertionTest { def renderOptions(): RenderOptions = RenderOptions().withoutFlattenedJsonLd protected def buildConfig(options: Option[RenderOptions], eh: Option[AMFErrorHandler]): AMFConfiguration = { - val amfConfig: AMFConfiguration = APIConfiguration.API().withPlugin(NotFinishedAsync20ParsePlugin) + val amfConfig: AMFConfiguration = APIConfiguration.API() val renderedConfig: AMFConfiguration = options.fold(amfConfig.withRenderOptions(renderOptions()))(r => { amfConfig.withRenderOptions(r) }) diff --git a/amf-cli/shared/src/test/scala/amf/resolution/Async20ResolutionTest.scala b/amf-cli/shared/src/test/scala/amf/resolution/Async20ResolutionTest.scala index 78ade6a51a..ad43c527b8 100644 --- a/amf-cli/shared/src/test/scala/amf/resolution/Async20ResolutionTest.scala +++ b/amf-cli/shared/src/test/scala/amf/resolution/Async20ResolutionTest.scala @@ -253,6 +253,26 @@ class Async20ResolutionTest extends ResolutionTest { ) } + // W-12689962 + test("async should not emit operation security if not specified") { + cycle( + "operation-security-implicit.yaml", + "operation-security-implicit.yaml", + Async20YamlHint, + target = Async20YamlHint + ) + } + + // W-12689962 + test("async should emit operation security keyword") { + cycle( + "operation-security-explicit.yaml", + "operation-security-explicit.yaml", + Async20YamlHint, + target = Async20YamlHint + ) + } + override def transform(unit: BaseUnit, config: CycleConfig, amfConfig: AMFConfiguration): BaseUnit = { super.transform(unit, config, AsyncAPIConfiguration.Async20()) } diff --git a/amf-cli/shared/src/test/scala/amf/resolution/merge/JsonMergePatchTest.scala b/amf-cli/shared/src/test/scala/amf/resolution/merge/JsonMergePatchTest.scala index ccc0b7f582..4d0f9b0376 100644 --- a/amf-cli/shared/src/test/scala/amf/resolution/merge/JsonMergePatchTest.scala +++ b/amf-cli/shared/src/test/scala/amf/resolution/merge/JsonMergePatchTest.scala @@ -5,7 +5,7 @@ import amf.apicontract.client.scala.model.document.APIContractProcessingData import amf.apicontract.client.scala.model.domain.{Message, Operation} import amf.apicontract.internal.spec.async.Subscribe import amf.apicontract.internal.spec.async.parser.context.{Async2WebApiContext, AsyncWebApiContext} -import amf.apicontract.internal.spec.async.parser.domain.{Async20MessageParser, AsyncOperationParser} +import amf.apicontract.internal.spec.async.parser.domain.{Async20MessageParser, Async20OperationParser} import amf.apicontract.internal.spec.async.transformation.AsyncJsonMergePatch import amf.apicontract.internal.spec.common.transformation.stage.{AsyncKeyCriteria, JsonMergePatch} import amf.core.client.scala.adoption.IdAdopter @@ -175,7 +175,7 @@ class JsonMergePatchTest extends MultiJsonldAsyncFunSuite with Matchers with Fil document .as[YMap] .key("subscribe") - .map(entry => AsyncOperationParser(entry, (o: Operation) => o.withId(id))(getBogusParserCtx).parse()) + .map(entry => Async20OperationParser(entry, (o: Operation) => o.withId(id))(getBogusParserCtx).parse()) .get } } diff --git a/amf-cli/shared/src/test/scala/amf/testing/ConfigProvider.scala b/amf-cli/shared/src/test/scala/amf/testing/ConfigProvider.scala index a7d0e480b5..c41f47ae46 100644 --- a/amf-cli/shared/src/test/scala/amf/testing/ConfigProvider.scala +++ b/amf-cli/shared/src/test/scala/amf/testing/ConfigProvider.scala @@ -1,7 +1,6 @@ package amf.testing import amf.apicontract.client.scala._ -import amf.apicontract.internal.spec.async.NotFinishedAsync20ParsePlugin import amf.core.internal.remote._ import amf.graphql.client.scala.GraphQLConfiguration import amf.graphqlfederation.client.scala.GraphQLFederationConfiguration @@ -14,7 +13,13 @@ object ConfigProvider { case Raml10 => RAMLConfiguration.RAML10() case Oas20 => OASConfiguration.OAS20() case Oas30 => OASConfiguration.OAS30() - case AsyncApi20 => AsyncAPIConfiguration.Async20().withPlugin(NotFinishedAsync20ParsePlugin) + case AsyncApi20 => AsyncAPIConfiguration.Async20() + case AsyncApi21 => AsyncAPIConfiguration.Async20() + case AsyncApi22 => AsyncAPIConfiguration.Async20() + case AsyncApi23 => AsyncAPIConfiguration.Async20() + case AsyncApi24 => AsyncAPIConfiguration.Async20() + case AsyncApi25 => AsyncAPIConfiguration.Async20() + case AsyncApi26 => AsyncAPIConfiguration.Async20() case Grpc => GRPCConfiguration.GRPC() case GraphQL => GraphQLConfiguration.GraphQL() case GraphQLFederation => GraphQLFederationConfiguration.GraphQLFederation() diff --git a/amf-cli/shared/src/test/scala/amf/validation/AMFModelAssertionTest.scala b/amf-cli/shared/src/test/scala/amf/validation/AMFModelAssertionTest.scala index 0b50e932e6..fe82692d70 100644 --- a/amf-cli/shared/src/test/scala/amf/validation/AMFModelAssertionTest.scala +++ b/amf-cli/shared/src/test/scala/amf/validation/AMFModelAssertionTest.scala @@ -2,8 +2,8 @@ package amf.validation import amf.apicontract.client.scala._ import amf.apicontract.client.scala.model.domain.api.WebApi +import amf.apicontract.client.scala.model.domain.security.OAuth2Settings import amf.apicontract.internal.metamodel.domain.{EndPointModel, OperationModel} -import amf.apicontract.internal.spec.async.NotFinishedAsync20ParsePlugin import amf.core.client.common.transform.PipelineId import amf.core.client.scala.config.RenderOptions import amf.core.client.scala.model.document.{BaseUnit, Document} @@ -40,9 +40,8 @@ class AMFModelAssertionTest extends AsyncFunSuite with Matchers { val raml08Client: AMFBaseUnitClient = raml08Config.baseUnitClient() val oasConfig: AMFConfiguration = OASConfiguration.OAS30().withRenderOptions(ro) val oasClient: AMFBaseUnitClient = oasConfig.baseUnitClient() - val asyncConfig: AMFConfiguration = - AsyncAPIConfiguration.Async20().withPlugin(NotFinishedAsync20ParsePlugin).withRenderOptions(ro) - val asyncClient: AMFBaseUnitClient = asyncConfig.baseUnitClient() + val asyncConfig: AMFConfiguration = AsyncAPIConfiguration.Async20().withRenderOptions(ro) + val asyncClient: AMFBaseUnitClient = asyncConfig.baseUnitClient() def modelAssertion( path: String, @@ -599,7 +598,7 @@ class AMFModelAssertionTest extends AsyncFunSuite with Matchers { } // W-12689955 - test("async add channel servers transformation") { + test("async 2.2+ add channel servers transformation") { val api = s"$basePath/async20/validations/channel-servers.yaml" asyncClient.parse(api) flatMap { parseResult => val transformResult = asyncClient.transform(parseResult.baseUnit) @@ -628,4 +627,42 @@ class AMFModelAssertionTest extends AsyncFunSuite with Matchers { serversInRender.length shouldBe 1 } } + + // W-12689962 + test("async2.4+ explicit operation security facet") { + val api = s"$basePath/async20/validations/operation-security-explicit.yaml" + asyncClient.parse(api) flatMap { parseResult => + val transformResult = asyncClient.transform(parseResult.baseUnit) + val transformBU = transformResult.baseUnit + val endpoint = getFirstEndpoint(transformBU, isWebApi = false) + + val serverSecurity = endpoint.servers.head.security.head.schemes.head + val operationSecurity = endpoint.operations.head.security.head.schemes.head + + val serverSecurityScopes = serverSecurity.settings.asInstanceOf[OAuth2Settings].flows.head.scopes + val operationSecurityScopes = operationSecurity.settings.asInstanceOf[OAuth2Settings].flows.head.scopes + + serverSecurityScopes.size shouldBe 2 + operationSecurityScopes.size shouldBe 1 + } + } + + // W-12689962 + test("async2.4+ resolve implicit operation security facet") { + val api = s"$basePath/async20/validations/operation-security-implicit.yaml" + asyncClient.parse(api) flatMap { parseResult => + val transformResult = asyncClient.transform(parseResult.baseUnit) + val transformBU = transformResult.baseUnit + val endpoint = getFirstEndpoint(transformBU, isWebApi = false) + + val serverSecurity = endpoint.servers.head.security.head.schemes.head + val operationSecurity = endpoint.operations.head.security.head.schemes.head + + val serverSecurityScopes = serverSecurity.settings.asInstanceOf[OAuth2Settings].flows.head.scopes + val operationSecurityScopes = operationSecurity.settings.asInstanceOf[OAuth2Settings].flows.head.scopes + + serverSecurityScopes.size shouldBe 2 + operationSecurityScopes.size shouldBe 2 + } + } } diff --git a/amf-cli/shared/src/test/scala/amf/validation/Async20UniquePlatformUnitValidationsTest.scala b/amf-cli/shared/src/test/scala/amf/validation/Async20UniquePlatformUnitValidationsTest.scala index b21803a17a..78118cf851 100644 --- a/amf-cli/shared/src/test/scala/amf/validation/Async20UniquePlatformUnitValidationsTest.scala +++ b/amf-cli/shared/src/test/scala/amf/validation/Async20UniquePlatformUnitValidationsTest.scala @@ -337,7 +337,6 @@ class Async20UniquePlatformUnitValidationsTest extends UniquePlatformReportGenTe validate("ibmmq-binding-extra-key.yaml", Some("ibmmq-binding-extra-key.report")) } - test("MessageIds NOT duplicated") { validate("messageIds-not-duplicated.yaml", Some("messageIds-not-duplicated.report")) } @@ -358,6 +357,10 @@ class Async20UniquePlatformUnitValidationsTest extends UniquePlatformReportGenTe validate("channel-servers.yaml", Some("channel-servers.report")) } + test("Async 2.4+ operation security property with undefined security scheme") { + validate("operation-security.yaml", Some("operation-security.report")) + } + test("Async 2.2+ AnypointMQ Closed Shape validation") { validate("anypoint-binding-extra-key.yaml", Some("anypoint-binding-extra-key.report")) } @@ -365,5 +368,43 @@ class Async20UniquePlatformUnitValidationsTest extends UniquePlatformReportGenTe test("Async 2.5 tags in servers") { validate("server-tags.yaml", Some("server-tags.report")) } + test("Async 2.5 bindings in channel and message") { + validate("binding-wrong-key.yaml", Some("binding-wrong-key.report")) + } + + test("Async 2.4 Server Variables") { + validate("server-variable.yaml", Some("server-variable.report")) + } + test("Async 2.3+ Solace Closed Shape validation") { + validate("solace-binding-extra-key.yaml", Some("solace-binding-extra-key.report")) + } + + test("Async 2.6+ Pulsar Closed Shape validation") { + validate("pulsar-binding-extra-key.yaml", Some("pulsar-binding-extra-key.report")) + } + + test("Async 2.6+ Pulsar missing fields validation") { + validate("pulsar-binding-missing-key.yaml", Some("pulsar-binding-missing-key.report")) + } + + test("Async 2.3+ Solace validations") { + validate("solace-binding-validations.yaml", Some("solace-binding-validations.report")) + } + + test("Async 2.2+ AnypointMQ validations") { + validate("anypoint-binding-validations.yaml", Some("anypoint-binding-validations.report")) + } + + test("Async 2.1+ IBMMQ parsing validations") { + validate("ibmmq-binding-parsing-validations.yaml", Some("ibmmq-binding-parsing-validations.report")) + } + + test("Async 2.1+ IBMMQ validations") { + validate("ibmmq-binding-validations.yaml", Some("ibmmq-binding-validations.report")) + } + + test("Async 2.1+ IBMMQ validations all valid") { + validate("ibmmq-binding-validations-valid.yaml", Some("ibmmq-binding-validations-valid.report")) + } } diff --git a/amf-cli/shared/src/test/scala/amf/validation/UniquePlatformReportGenTest.scala b/amf-cli/shared/src/test/scala/amf/validation/UniquePlatformReportGenTest.scala index 4b7a9441a6..d6e3ab2f50 100644 --- a/amf-cli/shared/src/test/scala/amf/validation/UniquePlatformReportGenTest.scala +++ b/amf-cli/shared/src/test/scala/amf/validation/UniquePlatformReportGenTest.scala @@ -1,7 +1,6 @@ package amf.validation -import amf.apicontract.client.scala.{AMFConfiguration, APIConfiguration, WebAPIConfiguration} -import amf.apicontract.internal.spec.async.NotFinishedAsync20ParsePlugin +import amf.apicontract.client.scala.{AMFConfiguration, APIConfiguration} import amf.apicontract.internal.transformation.ValidationTransformationPipeline import amf.core.client.common.validation._ import amf.core.client.scala.errorhandling.DefaultErrorHandler @@ -46,7 +45,7 @@ sealed trait AMFValidationReportGenTest extends AsyncFunSuite with FileAssertion configOverride: Option[AMFConfiguration] = None, hideValidationResultsIfParseNotConforms: Boolean = true ): Future[Assertion] = { - val initialConfig = configOverride.getOrElse(APIConfiguration.API().withPlugin(NotFinishedAsync20ParsePlugin)) + val initialConfig = configOverride.getOrElse(APIConfiguration.API()) for { parseResult <- parse(directory + api, initialConfig) report <- configOverride @@ -93,7 +92,6 @@ trait ResolutionForUniquePlatformReportTest extends UniquePlatformReportGenTest val errorHandler = DefaultErrorHandler() val config = APIConfiguration .API() - .withPlugin(NotFinishedAsync20ParsePlugin) .withErrorHandlerProvider(() => errorHandler) for { model <- config.baseUnitClient().parse(basePath + api).map(_.baseUnit) diff --git a/amf-shapes/shared/src/main/scala/amf/shapes/internal/spec/jsonschema/ref/AstIndex.scala b/amf-shapes/shared/src/main/scala/amf/shapes/internal/spec/jsonschema/ref/AstIndex.scala index 7239db1514..7fc7dcd0a3 100644 --- a/amf-shapes/shared/src/main/scala/amf/shapes/internal/spec/jsonschema/ref/AstIndex.scala +++ b/amf-shapes/shared/src/main/scala/amf/shapes/internal/spec/jsonschema/ref/AstIndex.scala @@ -14,11 +14,14 @@ case class AstIndex(private val map: mutable.Map[String, YMapEntryLike], resolve } } - private def callResolvers(reference: String): Option[YMapEntryLike] = - resolvers.iterator.map(_.resolve(reference, map.toMap)).collectFirst { case Some(entry) => - map.put(reference, entry) - entry - } + private def callResolvers(reference: String): Option[YMapEntryLike] = { + resolvers.iterator + .map { resolver => resolver.resolve(reference, map) } + .collectFirst { case Some(entry) => + map.put(reference, entry) + entry + } + } private def clean(reference: String): String = { if (reference.startsWith("#/")) reference.drop(1) diff --git a/amf-shapes/shared/src/main/scala/amf/shapes/internal/spec/jsonschema/ref/ReferenceResolver.scala b/amf-shapes/shared/src/main/scala/amf/shapes/internal/spec/jsonschema/ref/ReferenceResolver.scala index 4d3cb952d8..949c81f90c 100644 --- a/amf-shapes/shared/src/main/scala/amf/shapes/internal/spec/jsonschema/ref/ReferenceResolver.scala +++ b/amf-shapes/shared/src/main/scala/amf/shapes/internal/spec/jsonschema/ref/ReferenceResolver.scala @@ -6,15 +6,16 @@ import org.yaml.model.{YMap, YNode, YSequence, YType} import java.net.URI import scala.annotation.tailrec +import scala.collection.mutable import scala.util.Try trait ReferenceResolver { - def resolve(reference: String, index: Map[String, YMapEntryLike]): Option[YMapEntryLike] + def resolve(reference: String, index: mutable.Map[String, YMapEntryLike]): Option[YMapEntryLike] } object FragmentTraversingResolver extends ReferenceResolver { - override def resolve(reference: String, index: Map[String, YMapEntryLike]): Option[YMapEntryLike] = + override def resolve(reference: String, index: mutable.Map[String, YMapEntryLike]): Option[YMapEntryLike] = Try(new URI(reference)).toOption.flatMap { uri => val fragment = uri.getRawFragment val baseUri = reference.stripSuffix(s"#$fragment") diff --git a/amf-shapes/shared/src/main/scala/amf/shapes/internal/validation/definitions/ShapeParserSideValidations.scala b/amf-shapes/shared/src/main/scala/amf/shapes/internal/validation/definitions/ShapeParserSideValidations.scala index 9c4673e8e5..bc6ea60511 100644 --- a/amf-shapes/shared/src/main/scala/amf/shapes/internal/validation/definitions/ShapeParserSideValidations.scala +++ b/amf-shapes/shared/src/main/scala/amf/shapes/internal/validation/definitions/ShapeParserSideValidations.scala @@ -403,6 +403,11 @@ object ShapeParserSideValidations extends Validations { "Empty type expression array" ) + val RequiredField = validation( + "required-field", + "Field is required in this schema" + ) + override val levels: Map[String, Map[ProfileName, String]] = Map( InvalidShapeFormat.id -> all(WARNING), JsonSchemaInheritanceWarning.id -> all(WARNING), @@ -460,6 +465,7 @@ object ShapeParserSideValidations extends Validations { InvalidJsonSchemaReference, MultipleDefinitionKey, IncorrectDefinitionKey, - EmptyTypeExpressionArray + EmptyTypeExpressionArray, + RequiredField ) } diff --git a/documentation/model.md b/documentation/model.md index 95393a13f5..e2c29d0b56 100644 --- a/documentation/model.md +++ b/documentation/model.md @@ -74,6 +74,11 @@ AMF Model Documentation * [FederationMetadata](#federationmetadata) * [FileShape](#fileshape) * [Fragment](#fragment) +* [GooglePubSubChannelBinding](#googlepubsubchannelbinding) +* [GooglePubSubMessageBinding](#googlepubsubmessagebinding) +* [GooglePubSubMessageStoragePolicy](#googlepubsubmessagestoragepolicy) +* [GooglePubSubSchemaDefinition](#googlepubsubschemadefinition) +* [GooglePubSubSchemaSettings](#googlepubsubschemasettings) * [HttpApiKeySettings](#httpapikeysettings) * [HttpMessageBinding](#httpmessagebinding) * [HttpOperationBinding](#httpoperationbinding) @@ -135,6 +140,9 @@ AMF Model Documentation * [PropertyShape](#propertyshape) * [PropertyShapePath](#propertyshapepath) * [PublicNodeMapping](#publicnodemapping) +* [PulsarChannelBinding](#pulsarchannelbinding) +* [PulsarChannelRetention](#pulsarchannelretention) +* [PulsarServerBinding](#pulsarserverbinding) * [RecursiveShape](#recursiveshape) * [Request](#request) * [ResourceType](#resourcetype) @@ -162,6 +170,11 @@ AMF Model Documentation * [ShapePayload](#shapepayload) * [ShapeRequest](#shaperequest) * [ShapeResponse](#shaperesponse) +* [SolaceOperationBinding](#solaceoperationbinding) +* [SolaceOperationDestination](#solaceoperationdestination) +* [SolaceOperationQueue](#solaceoperationqueue) +* [SolaceOperationTopic](#solaceoperationtopic) +* [SolaceServerBinding](#solaceserverbinding) * [SourceMap](#sourcemap) * [Tag](#tag) * [TemplatedLink](#templatedlink) @@ -1478,6 +1491,77 @@ Types: | processingData | [BaseUnitProcessingData](#baseunitprocessingdata) | - | Field with utility data to be used in Base Unit processing | `http://a.ml/vocabularies/document#processingData` | | sourceInformation | [BaseUnitSourceInformation](#baseunitsourceinformation) | - | Contains information of the source from which the base unit was generated | `http://a.ml/vocabularies/document#sourceInformation` | +## GooglePubSubChannelBinding + +Types: +* `http://a.ml/vocabularies/apiBinding#GooglePubSubChannelBinding` +* `http://a.ml/vocabularies/apiBinding#ChannelBinding` +* `http://a.ml/vocabularies/document#DomainElement` + + | Name | Value | Sorted | Documentation | Namespace | + | ------ | ------ | ------ | ------ | ------ | + | labels | [ObjectNode](#objectnode) | - | An object of key-value pairs | `http://a.ml/vocabularies/apiBinding#labels` | + | messageRetentionDuration | string | - | Indicates the minimum duration to retain a message after it is published to the topic | `http://a.ml/vocabularies/apiBinding#messageRetentionDuration` | + | messageStoragePolicy | [GooglePubSubMessageStoragePolicy](#googlepubsubmessagestoragepolicy) | - | Policy constraining the set of Google Cloud Platform regions where messages published to the topic may be stored | `http://a.ml/vocabularies/apiBinding#messageStoragePolicy` | + | schemaSettings | [GooglePubSubSchemaSettings](#googlepubsubschemasettings) | - | Settings for validating messages published against a schema | `http://a.ml/vocabularies/apiBinding#schemaSettings` | + | topic | string | - | The Google Cloud Pub/Sub Topic name | `http://a.ml/vocabularies/apiBinding#topic` | + | bindingVersion | string | - | The version of this binding | `http://a.ml/vocabularies/apiBinding#bindingVersion` | + | type | string | - | Binding for a corresponding known type | `http://a.ml/vocabularies/apiBinding#type` | + | extends | [[DomainElement](#domainelement)] | false | Entity that is going to be extended overlaying or adding additional information The type of the relationship provide the semantics about thow the referenced and referencer elements must be combined when generating the domain model from the document model. | `http://a.ml/vocabularies/document#extends` | + +## GooglePubSubMessageBinding + +Types: +* `http://a.ml/vocabularies/apiBinding#GooglePubSubMessageBinding` +* `http://a.ml/vocabularies/apiBinding#MessageBinding` +* `http://a.ml/vocabularies/document#DomainElement` + + | Name | Value | Sorted | Documentation | Namespace | + | ------ | ------ | ------ | ------ | ------ | + | attribute | [ObjectNode](#objectnode) | - | Attributes for this message | `http://a.ml/vocabularies/apiBinding#attribute` | + | orderingKey | string | - | If non-empty, identifies related messages for which publish order should be respected | `http://a.ml/vocabularies/apiBinding#orderingKey` | + | schemaDefinition | [GooglePubSubSchemaDefinition](#googlepubsubschemadefinition) | - | Define Schema | `http://a.ml/vocabularies/apiBinding#schemaDefinition` | + | bindingVersion | string | - | The version of this binding | `http://a.ml/vocabularies/apiBinding#bindingVersion` | + | type | string | - | Binding for a corresponding known type | `http://a.ml/vocabularies/apiBinding#type` | + | extends | [[DomainElement](#domainelement)] | false | Entity that is going to be extended overlaying or adding additional information The type of the relationship provide the semantics about thow the referenced and referencer elements must be combined when generating the domain model from the document model. | `http://a.ml/vocabularies/document#extends` | + +## GooglePubSubMessageStoragePolicy + +Types: +* `http://a.ml/vocabularies/apiBinding#GooglePubSubMessageStoragePolicy` +* `http://a.ml/vocabularies/document#DomainElement` + + | Name | Value | Sorted | Documentation | Namespace | + | ------ | ------ | ------ | ------ | ------ | + | allowedPersistenceRegions | [string] | false | A list of IDs of GCP regions where messages that are published to the topic may be persisted in storage | `http://a.ml/vocabularies/apiBinding#allowedPersistenceRegions` | + | extends | [[DomainElement](#domainelement)] | false | Entity that is going to be extended overlaying or adding additional information The type of the relationship provide the semantics about thow the referenced and referencer elements must be combined when generating the domain model from the document model. | `http://a.ml/vocabularies/document#extends` | + +## GooglePubSubSchemaDefinition + +Types: +* `http://a.ml/vocabularies/apiBinding#GooglePubSubSchemaDefinition` +* `http://a.ml/vocabularies/document#DomainElement` + + | Name | Value | Sorted | Documentation | Namespace | + | ------ | ------ | ------ | ------ | ------ | + | name | string | - | The name of the schema | `http://a.ml/vocabularies/apiBinding#name` | + | type | string | - | The type of the schema | `http://a.ml/vocabularies/apiBinding#type` | + | extends | [[DomainElement](#domainelement)] | false | Entity that is going to be extended overlaying or adding additional information The type of the relationship provide the semantics about thow the referenced and referencer elements must be combined when generating the domain model from the document model. | `http://a.ml/vocabularies/document#extends` | + +## GooglePubSubSchemaSettings + +Types: +* `http://a.ml/vocabularies/apiBinding#GooglePubSubSchemaSettings` +* `http://a.ml/vocabularies/document#DomainElement` + + | Name | Value | Sorted | Documentation | Namespace | + | ------ | ------ | ------ | ------ | ------ | + | encoding | string | - | The encoding of the message | `http://a.ml/vocabularies/apiBinding#encoding` | + | firstRevisionId | string | - | The minimum (inclusive) revision allowed for validating messages | `http://a.ml/vocabularies/apiBinding#firstRevisionId` | + | lastRevisionId | string | - | The maximum (inclusive) revision allowed for validating messages | `http://a.ml/vocabularies/apiBinding#lastRevisionId` | + | name | string | - | Name of the schema that messages published should be validated against | `http://a.ml/vocabularies/apiBinding#name` | + | extends | [[DomainElement](#domainelement)] | false | Entity that is going to be extended overlaying or adding additional information The type of the relationship provide the semantics about thow the referenced and referencer elements must be combined when generating the domain model from the document model. | `http://a.ml/vocabularies/document#extends` | + ## HttpApiKeySettings Settings for an Http API Key security scheme Types: @@ -2601,6 +2685,52 @@ Types: | mappedNode | url | - | Node in the dialect definition associated to this mapping | `http://a.ml/vocabularies/meta#mappedNode` | | extends | [[DomainElement](#domainelement)] | false | Entity that is going to be extended overlaying or adding additional information The type of the relationship provide the semantics about thow the referenced and referencer elements must be combined when generating the domain model from the document model. | `http://a.ml/vocabularies/document#extends` | +## PulsarChannelBinding + +Types: +* `http://a.ml/vocabularies/apiBinding#PulsarChannelBinding` +* `http://a.ml/vocabularies/apiBinding#ChannelBinding` +* `http://a.ml/vocabularies/document#DomainElement` + + | Name | Value | Sorted | Documentation | Namespace | + | ------ | ------ | ------ | ------ | ------ | + | namespace | string | - | The namespace the channel is associated with. | `http://a.ml/vocabularies/apiBinding#namespace` | + | persistence | string | - | Persistence of the topic in Pulsar. It MUST be either persistent or non-persistent. | `http://a.ml/vocabularies/apiBinding#persistence` | + | compaction | int | - | Topic compaction threshold given in Megabytes. | `http://a.ml/vocabularies/apiBinding#compaction` | + | geo-replication | [string] | false | A list of clusters the topic is replicated to. | `http://a.ml/vocabularies/apiBinding#geo-replication` | + | retention | [PulsarChannelRetention](#pulsarchannelretention) | - | Topic retention policy. | `http://a.ml/vocabularies/apiBinding#retention` | + | ttl | int | - | Message time-to-live in seconds. | `http://a.ml/vocabularies/apiBinding#ttl` | + | deduplication | boolean | - | Message deduplication. When true, it ensures that each message produced on Pulsar topics is persisted to disk only once. | `http://a.ml/vocabularies/apiBinding#deduplication` | + | bindingVersion | string | - | The version of this binding | `http://a.ml/vocabularies/apiBinding#bindingVersion` | + | type | string | - | Binding for a corresponding known type | `http://a.ml/vocabularies/apiBinding#type` | + | extends | [[DomainElement](#domainelement)] | false | Entity that is going to be extended overlaying or adding additional information The type of the relationship provide the semantics about thow the referenced and referencer elements must be combined when generating the domain model from the document model. | `http://a.ml/vocabularies/document#extends` | + +## PulsarChannelRetention + +Types: +* `http://a.ml/vocabularies/apiBinding#PulsarChannelRetention` +* `http://a.ml/vocabularies/document#DomainElement` + + | Name | Value | Sorted | Documentation | Namespace | + | ------ | ------ | ------ | ------ | ------ | + | time | int | - | Time given in Minutes. Defaults to 0 | `http://a.ml/vocabularies/apiBinding#time` | + | size | int | - | Size given in MegaBytes. Defaults to 0 | `http://a.ml/vocabularies/apiBinding#size` | + | extends | [[DomainElement](#domainelement)] | false | Entity that is going to be extended overlaying or adding additional information The type of the relationship provide the semantics about thow the referenced and referencer elements must be combined when generating the domain model from the document model. | `http://a.ml/vocabularies/document#extends` | + +## PulsarServerBinding + +Types: +* `http://a.ml/vocabularies/apiBinding#PulsarServerBinding` +* `http://a.ml/vocabularies/apiBinding#ServerBinding` +* `http://a.ml/vocabularies/document#DomainElement` + + | Name | Value | Sorted | Documentation | Namespace | + | ------ | ------ | ------ | ------ | ------ | + | tenant | string | - | The pulsar tenant. If omitted, "public" MUST be assumed. | `http://a.ml/vocabularies/apiBinding#tenant` | + | bindingVersion | string | - | The version of this binding | `http://a.ml/vocabularies/apiBinding#bindingVersion` | + | type | string | - | Binding for a corresponding known type | `http://a.ml/vocabularies/apiBinding#type` | + | extends | [[DomainElement](#domainelement)] | false | Entity that is going to be extended overlaying or adding additional information The type of the relationship provide the semantics about thow the referenced and referencer elements must be combined when generating the domain model from the document model. | `http://a.ml/vocabularies/document#extends` | + ## RecursiveShape Recursion on a Shape structure, used when expanding a shape and finding the canonical representation of that shape. Types: @@ -3167,6 +3297,73 @@ Types: | name | string | - | Name of the shape | `http://a.ml/vocabularies/core#name` | | payload | [ShapePayload](#shapepayload) | - | Payload for a Request/Response | `http://a.ml/vocabularies/shapes#payload` | +## SolaceOperationBinding + +Types: +* `http://a.ml/vocabularies/apiBinding#SolaceOperationBinding` +* `http://a.ml/vocabularies/apiBinding#OperationBinding` +* `http://a.ml/vocabularies/document#DomainElement` + + | Name | Value | Sorted | Documentation | Namespace | + | ------ | ------ | ------ | ------ | ------ | + | destinations | [[SolaceOperationDestination](#solaceoperationdestination)] | false | | `http://a.ml/vocabularies/apiBinding#destinations` | + | bindingVersion | string | - | The version of this binding | `http://a.ml/vocabularies/apiBinding#bindingVersion` | + | type | string | - | Binding for a corresponding known type | `http://a.ml/vocabularies/apiBinding#type` | + | extends | [[DomainElement](#domainelement)] | false | Entity that is going to be extended overlaying or adding additional information The type of the relationship provide the semantics about thow the referenced and referencer elements must be combined when generating the domain model from the document model. | `http://a.ml/vocabularies/document#extends` | + +## SolaceOperationDestination + +Types: +* `http://a.ml/vocabularies/apiBinding#SolaceOperationDestination` +* `http://a.ml/vocabularies/document#DomainElement` + + | Name | Value | Sorted | Documentation | Namespace | + | ------ | ------ | ------ | ------ | ------ | + | destinationType | string | - | 'queue' or 'topic'. If the type is queue, then the subscriber can bind to the queue, which in turn will subscribe to the topic as represented by the channel name or to the provided topicSubscriptions. | `http://a.ml/vocabularies/apiBinding#destinationType` | + | deliveryMode | string | - | 'direct' or 'persistent'. This determines the quality of service for publishing messages. Default is 'persistent'. | `http://a.ml/vocabularies/apiBinding#deliveryMode` | + | queue | [SolaceOperationQueue](#solaceoperationqueue) | - | Defines the properties of a queue. | `http://a.ml/vocabularies/apiBinding#queue` | + | topic | [SolaceOperationTopic](#solaceoperationtopic) | - | Defines the properties of a topic. | `http://a.ml/vocabularies/apiBinding#topic` | + | extends | [[DomainElement](#domainelement)] | false | Entity that is going to be extended overlaying or adding additional information The type of the relationship provide the semantics about thow the referenced and referencer elements must be combined when generating the domain model from the document model. | `http://a.ml/vocabularies/document#extends` | + +## SolaceOperationQueue + +Types: +* `http://a.ml/vocabularies/apiBinding#SolaceOperationQueue` +* `http://a.ml/vocabularies/document#DomainElement` + + | Name | Value | Sorted | Documentation | Namespace | + | ------ | ------ | ------ | ------ | ------ | + | topicSubscriptions | [string] | false | A list of topics that the queue subscribes to, only applicable when destinationType is 'queue'. If none is given, the queue subscribes to the topic as represented by the channel name. | `http://a.ml/vocabularies/apiBinding#topicSubscriptions` | + | accessType | string | - | 'exclusive' or 'nonexclusive'. Only applicable when destinationType is 'queue'. | `http://a.ml/vocabularies/apiBinding#accessType` | + | maxMsgSpoolSize | string | - | The maximum amount of message spool that the given queue may use. Only applicable when destinationType is 'queue'. | `http://a.ml/vocabularies/apiBinding#maxMsgSpoolSize` | + | maxTtl | string | - | The maximum TTL to apply to messages to be spooled. Only applicable when destinationType is 'queue'. | `http://a.ml/vocabularies/apiBinding#maxTtl` | + | extends | [[DomainElement](#domainelement)] | false | Entity that is going to be extended overlaying or adding additional information The type of the relationship provide the semantics about thow the referenced and referencer elements must be combined when generating the domain model from the document model. | `http://a.ml/vocabularies/document#extends` | + +## SolaceOperationTopic + +Types: +* `http://a.ml/vocabularies/apiBinding#SolaceOperationTopic` +* `http://a.ml/vocabularies/document#DomainElement` + + | Name | Value | Sorted | Documentation | Namespace | + | ------ | ------ | ------ | ------ | ------ | + | topicSubscriptions | [string] | false | A list of topics that the client subscribes to, only applicable when destinationType is 'topic'. If none is given, the client subscribes to the topic as represented by the channel name. | `http://a.ml/vocabularies/apiBinding#topicSubscriptions` | + | extends | [[DomainElement](#domainelement)] | false | Entity that is going to be extended overlaying or adding additional information The type of the relationship provide the semantics about thow the referenced and referencer elements must be combined when generating the domain model from the document model. | `http://a.ml/vocabularies/document#extends` | + +## SolaceServerBinding + +Types: +* `http://a.ml/vocabularies/apiBinding#SolaceServerBinding` +* `http://a.ml/vocabularies/apiBinding#ServerBinding` +* `http://a.ml/vocabularies/document#DomainElement` + + | Name | Value | Sorted | Documentation | Namespace | + | ------ | ------ | ------ | ------ | ------ | + | msgVpn | string | - | The Virtual Private Network name on the Solace broker. | `http://a.ml/vocabularies/apiBinding#msgVpn` | + | bindingVersion | string | - | The version of this binding | `http://a.ml/vocabularies/apiBinding#bindingVersion` | + | type | string | - | Binding for a corresponding known type | `http://a.ml/vocabularies/apiBinding#type` | + | extends | [[DomainElement](#domainelement)] | false | Entity that is going to be extended overlaying or adding additional information The type of the relationship provide the semantics about thow the referenced and referencer elements must be combined when generating the domain model from the document model. | `http://a.ml/vocabularies/document#extends` | + ## SourceMap SourceMaps include tags with syntax specific information obtained when parsing a particular specification syntax like RAML or OpenAPI. It can be used to re-generate the document from the RDF model with a similar syntax