From fa2e10f7ed3d00571b77183092c0219f675b3f91 Mon Sep 17 00:00:00 2001 From: Agustin Bettati Date: Mon, 27 Sep 2021 16:53:00 -0300 Subject: [PATCH 01/46] Publish 5.0.0-RC.0 adopting aml version 6.0.0-RC.0 --- Jenkinsfile | 2 +- amf-apicontract.versions | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index cb95e2100b..f57d9b7207 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -62,7 +62,7 @@ pipeline { anyOf { branch 'master' branch 'develop' - branch 'remod-breaking' + branch 'release/*' } } steps { diff --git a/amf-apicontract.versions b/amf-apicontract.versions index 63a8a9d97f..78be45f502 100644 --- a/amf-apicontract.versions +++ b/amf-apicontract.versions @@ -1,3 +1,3 @@ -amf.apicontract=5.0.0-SUPER-SECRET-SNAPSHOT -amf.aml=6.0.0-SUPER-SECRET-SNAPSHOT +amf.apicontract=5.0.0-RC.0 +amf.aml=6.0.0-RC.0 amf.model=3.2.0 From 5b992016271389a87714854f1d1dbbea584ac5ff Mon Sep 17 00:00:00 2001 From: Agustin Bettati Date: Mon, 4 Oct 2021 11:58:40 -0300 Subject: [PATCH 02/46] adjust jenkins file to run sonar in release branch --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index f57d9b7207..957d18e544 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -38,6 +38,7 @@ pipeline { anyOf { branch 'master' branch 'develop' + branch 'release/*' } } steps { From 3379ee6603d3e6f4af6220753f2c9e5d379bd1b7 Mon Sep 17 00:00:00 2001 From: Agustin Bettati Date: Tue, 28 Sep 2021 09:59:15 -0300 Subject: [PATCH 03/46] exclude BaseApiModel from entities as no instance can be created --- .../internal/entities/APIEntities.scala | 1 - .../tools/RegisteredMetaModelTest.scala | 22 +++++++++++-------- 2 files changed, 13 insertions(+), 10 deletions(-) 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 c5ebd38213..34ba400407 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 @@ -83,7 +83,6 @@ private[amf] object APIEntities extends Entities { Amqp091OperationBindingModel, OpenIdConnectSettingsModel, HttpSettingsModel, - BaseApiModel, HttpApiKeySettingsModel ) } diff --git a/amf-cli/jvm/src/test/scala/amf/cli/internal/tools/RegisteredMetaModelTest.scala b/amf-cli/jvm/src/test/scala/amf/cli/internal/tools/RegisteredMetaModelTest.scala index 707101169e..7609f46c5c 100644 --- a/amf-cli/jvm/src/test/scala/amf/cli/internal/tools/RegisteredMetaModelTest.scala +++ b/amf-cli/jvm/src/test/scala/amf/cli/internal/tools/RegisteredMetaModelTest.scala @@ -2,6 +2,7 @@ package amf.cli.internal.tools import amf.aml.internal.entities.AMLEntities import amf.apicontract.internal.entities.{APIEntities, FragmentEntities} +import amf.apicontract.internal.metamodel.domain.api.BaseApiModel import amf.core.internal.entities.Entities import amf.core.internal.metamodel.{ModelDefaultBuilder, Obj} import amf.core.internal.unsafe.PlatformSecrets @@ -12,7 +13,7 @@ import org.scalatest.{Assertion, FunSuite, Matchers} class RegisteredMetaModelTest extends FunSuite with Matchers with PlatformSecrets { test("APIEntities contains all ApiContract domain entities") { - check(new Reflections("amf.apicontract.internal.metamodel.domain"), APIEntities) + check(new Reflections("amf.apicontract.internal.metamodel.domain"), APIEntities, blocked = List(BaseApiModel)) } test("FragmentEntities contains all ApiContract document entities") { @@ -27,17 +28,20 @@ class RegisteredMetaModelTest extends FunSuite with Matchers with PlatformSecret check(new Reflections("amf.shapes.internal"), ShapeEntities) } - private def check(reflection: Reflections, entities: Entities): Assertion = { + private def check(reflection: Reflections, entities: Entities, blocked: Seq[ModelDefaultBuilder] = Nil): Assertion = { val models = getMetaModels(reflection) - val registeredModels = models - .collect { - case other if other.isInstanceOf[ModelDefaultBuilder] => other.asInstanceOf[ModelDefaultBuilder] - } + val actualBuilders = models.collect { case b: ModelDefaultBuilder => b } + val missingEntities = actualBuilders .filter { model => - !entities.contains(model) + !blocked.contains(model) && !entities.contains(model) // must be registered and not present in entities } - withClue(s"There are ${registeredModels.size} models not registered: $registeredModels") { - registeredModels shouldBe empty + val registeredButBlocked = blocked.filter { entities.contains } + + withClue(s"There are ${missingEntities.size} models not registered: $missingEntities") { + missingEntities shouldBe empty + } + withClue(s"There are ${registeredButBlocked.size} models that should not be registered: $registeredButBlocked") { + registeredButBlocked shouldBe empty } } From 1661516fe1d0d50aa049b4724a819320e689eabf Mon Sep 17 00:00:00 2001 From: Tomas Fernandez Date: Tue, 28 Sep 2021 19:58:10 -0300 Subject: [PATCH 04/46] APIMF-3417: loaded core entities in AMFConfiguration separately --- .../amf/apicontract/client/scala/AMFConfiguration.scala | 5 +++-- .../scala/amf/shapes/client/scala/ShapesConfiguration.scala | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) 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 0479faf741..3baa28edc1 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 @@ -20,6 +20,7 @@ import amf.apicontract.internal.transformation.compatibility.{ import amf.apicontract.internal.validation.model.ApiValidationProfiles._ import amf.apicontract.internal.validation.payload.PayloadValidationPlugin import amf.apicontract.internal.validation.shacl.{ShaclModelValidationPlugin, ViolationModelValidationPlugin} +import amf.core.client.scala.AMFGraphConfiguration import amf.core.client.scala.config._ import amf.core.client.scala.errorhandling.ErrorHandlerProvider import amf.core.client.scala.execution.ExecutionEnvironment @@ -52,12 +53,12 @@ trait APIConfigurationBuilder { private[amf] def common(): AMFConfiguration = { val configuration = AMLConfiguration.predefined() ApiRegister.register() // TODO ARM remove when APIMF-3000 is done + val coreEntities = AMFGraphConfiguration.predefined().getRegistry.entitiesRegistry.domainEntities val result = new AMFConfiguration( configuration.resolvers, configuration.errorHandlerProvider, - // TODO - ARM: move shapes entities and annotations to shape module (?) configuration.registry - .withEntities(APIEntities.entities ++ FragmentEntities.entities ++ ShapeEntities.entities) + .withEntities(APIEntities.entities ++ FragmentEntities.entities ++ ShapeEntities.entities ++ coreEntities) .withAnnotations( APISerializableAnnotations.annotations ++ WebAPISerializableAnnotations.annotations ++ ShapeSerializableAnnotations.annotations), configuration.listeners, diff --git a/amf-shapes/shared/src/main/scala/amf/shapes/client/scala/ShapesConfiguration.scala b/amf-shapes/shared/src/main/scala/amf/shapes/client/scala/ShapesConfiguration.scala index 5e2b12286e..15bc344181 100644 --- a/amf-shapes/shared/src/main/scala/amf/shapes/client/scala/ShapesConfiguration.scala +++ b/amf-shapes/shared/src/main/scala/amf/shapes/client/scala/ShapesConfiguration.scala @@ -6,6 +6,7 @@ import amf.aml.client.scala.model.domain.SemanticExtension import amf.aml.client.scala.{AMLBaseUnitClient, AMLConfiguration, AMLConfigurationState, AMLElementClient} import amf.aml.internal.annotations.serializable.AMLSerializableAnnotations import amf.aml.internal.entities.AMLEntities +import amf.core.client.scala.AMFGraphConfiguration import amf.core.client.scala.config._ import amf.core.client.scala.errorhandling.{DefaultErrorHandlerProvider, ErrorHandlerProvider} import amf.core.client.scala.execution.ExecutionEnvironment @@ -186,7 +187,7 @@ object ShapesConfiguration { ShapesRegister.register() // TODO ARM remove when APIMF-3000 is done // TODO ARM: validate plugin and payload plugin of api? val predefinedAMLConfig = AMLConfiguration.predefined() - + val coreEntities = AMFGraphConfiguration.predefined().getRegistry.entitiesRegistry.domainEntities new ShapesConfiguration( predefinedAMLConfig.resolvers, predefinedAMLConfig.errorHandlerProvider, @@ -195,7 +196,7 @@ object ShapesConfiguration { .withAnnotations(AMLSerializableAnnotations.annotations), predefinedAMLConfig.listeners, predefinedAMLConfig.options - ).withEntities(ShapeEntities.entities) + ).withEntities(ShapeEntities.entities ++ coreEntities) .withAnnotations(ShapeSerializableAnnotations.annotations) .withPlugin(JsonSchemaShapePayloadValidationPlugin) } From 1341a987796aaac5b9c994e2ffc7dc2e58c9f48c Mon Sep 17 00:00:00 2001 From: Tomas Fernandez Date: Wed, 29 Sep 2021 13:40:27 -0300 Subject: [PATCH 05/46] APIMF-3350: removed uncompilable method in ScalarShape --- .../amf/shapes/client/platform/model/domain/ScalarShape.scala | 1 - 1 file changed, 1 deletion(-) diff --git a/amf-shapes/shared/src/main/scala/amf/shapes/client/platform/model/domain/ScalarShape.scala b/amf-shapes/shared/src/main/scala/amf/shapes/client/platform/model/domain/ScalarShape.scala index b7c79aea14..73f9bff036 100644 --- a/amf-shapes/shared/src/main/scala/amf/shapes/client/platform/model/domain/ScalarShape.scala +++ b/amf-shapes/shared/src/main/scala/amf/shapes/client/platform/model/domain/ScalarShape.scala @@ -26,7 +26,6 @@ case class ScalarShape(override private[amf] val _internal: InternalScalarShape) def encoding: StrField = _internal.encoding def mediaType: StrField = _internal.mediaType def schema: Shape = _internal.schema - def serializationOrder: Shape = _internal.serializationOrder def withDataType(dataType: String): this.type = { _internal.withDataType(dataType) From f954bc1c8acf240e9c970e0e72d542b75fc79c42 Mon Sep 17 00:00:00 2001 From: Tomas Fernandez Date: Wed, 29 Sep 2021 14:25:09 -0300 Subject: [PATCH 06/46] APIMF-3350: processing data is converted to platform wrap to keep the type the same in scala -> platform conversion --- .../internal/convert/ApiBaseConverter.scala | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) 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 e320acfb79..c3be902a6e 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 @@ -1,7 +1,7 @@ package amf.apicontract.internal.convert import amf.apicontract.client.platform -import amf.apicontract.client.platform.model.domain +import amf.apicontract.client.platform.model.{document, domain} import amf.apicontract.client.scala.model.document.APIContractProcessingData import amf.apicontract.client.scala.model.domain.{ Callback, @@ -564,12 +564,10 @@ trait AMFDocumentResultConverter { } } -trait APIContractProcessingDataConverter { +trait APIContractProcessingDataConverter extends PlatformSecrets { implicit object APIContractProcessingDataMatcher - extends BidirectionalMatcher[APIContractProcessingData, platform.model.document.APIContractProcessingData] { - override def asClient(from: APIContractProcessingData): platform.model.document.APIContractProcessingData = - new platform.model.document.APIContractProcessingData(from) - override def asInternal(from: platform.model.document.APIContractProcessingData): APIContractProcessingData = - from._internal + extends BidirectionalMatcher[APIContractProcessingData, document.APIContractProcessingData] { + override def asClient(from: APIContractProcessingData): document.APIContractProcessingData = platform.wrap(from) + override def asInternal(from: document.APIContractProcessingData): APIContractProcessingData = from._internal } } From cb29aee8bef7adaeb58c3fa8d00af67b84009cff Mon Sep 17 00:00:00 2001 From: Agustin Bettati Date: Wed, 29 Sep 2021 15:19:23 -0300 Subject: [PATCH 07/46] adopt processing data from rdf parsed model --- .../test/resources/rdf/modular-recursion-with-types.nt | 10 +++++----- .../shared/src/test/resources/rdf/modular-recursion.nt | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/amf-cli/shared/src/test/resources/rdf/modular-recursion-with-types.nt b/amf-cli/shared/src/test/resources/rdf/modular-recursion-with-types.nt index 1b0402d6e5..44548a478d 100644 --- a/amf-cli/shared/src/test/resources/rdf/modular-recursion-with-types.nt +++ b/amf-cli/shared/src/test/resources/rdf/modular-recursion-with-types.nt @@ -1,12 +1,12 @@ - "false"^^ . - . + "false"^^ . + . "Modular Recursion API" . . . . . . - . + . . . "true"^^ . @@ -56,7 +56,7 @@ . . . - . + . . "false"^^ . "2.1.0" . @@ -103,7 +103,7 @@ . . . - . + . "false"^^ . "2.1.0" . . diff --git a/amf-cli/shared/src/test/resources/rdf/modular-recursion.nt b/amf-cli/shared/src/test/resources/rdf/modular-recursion.nt index 41fed1f289..2bcacbf085 100644 --- a/amf-cli/shared/src/test/resources/rdf/modular-recursion.nt +++ b/amf-cli/shared/src/test/resources/rdf/modular-recursion.nt @@ -1,12 +1,12 @@ - "false"^^ . - . + "false"^^ . + . "Modular Recursion API" . . . . . . - . + . . . "true"^^ . @@ -15,13 +15,13 @@ . . . - . + . . "false"^^ . "2.1.0" . . . - . + . . "false"^^ . "2.1.0" . From ec249c0b29b24ebec007c164bc98b01fd4bea7f4 Mon Sep 17 00:00:00 2001 From: Tomas Fernandez Date: Fri, 1 Oct 2021 12:21:40 -0300 Subject: [PATCH 08/46] Fix: fixed validator cache caching to cache by shape id --- .../payload/CandidateValidator.scala | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/validation/payload/CandidateValidator.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/validation/payload/CandidateValidator.scala index e9d83e67b3..80e313e7c2 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/validation/payload/CandidateValidator.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/validation/payload/CandidateValidator.scala @@ -2,10 +2,10 @@ package amf.apicontract.internal.validation.payload import amf.core.client.common.validation.ProfileName import amf.core.client.scala.validation.AMFValidationReport +import amf.core.client.scala.validation.payload.AMFShapePayloadValidator import amf.core.internal.validation.{ValidationCandidate, ValidationConfiguration} -import org.mulesoft.common.core.CachedFunction -import org.mulesoft.common.functional.MonadInstances.identityMonad +import scala.collection.mutable import scala.concurrent.{ExecutionContext, Future} object CandidateValidator { @@ -14,13 +14,17 @@ object CandidateValidator { implicit executionContext: ExecutionContext): Future[AMFValidationReport] = { val client = config.amfConfig.elementClient() - - val pluginLookupFunc = (candidate: ValidationCandidate) => client.payloadValidatorFor(candidate.shape, candidate.payload) - - val validatorLookup = CachedFunction.from(pluginLookupFunc) + val cache = mutable.Map[String, AMFShapePayloadValidator]() val futures: Seq[Future[AMFValidationReport]] = candidates.map { candidate => - val validator = validatorLookup.runCached(candidate) + val validator = cache.getOrElse( + candidate.shape.id, { + val foundValidator = client.payloadValidatorFor(candidate.shape, candidate.payload) + // TODO: Lousy side effect + cache.put(candidate.shape.id, foundValidator) + foundValidator + } + ) validator.validate(candidate.payload) } From 1d1a902bd466390b723b8d0e09b81960ff7feaec Mon Sep 17 00:00:00 2001 From: Tomas Fernandez Date: Mon, 4 Oct 2021 09:14:17 -0300 Subject: [PATCH 09/46] APIMF-3443: (Revert) - Fixed compatibility from raml 10 to oas30 with global params --- .../stage/MediaTypeResolutionStage.scala | 4 ++-- .../compatibility/raml10/global-params.raml | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 amf-cli/shared/src/test/resources/compatibility/raml10/global-params.raml diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/common/transformation/stage/MediaTypeResolutionStage.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/common/transformation/stage/MediaTypeResolutionStage.scala index 5a310ad4b2..7c1dfa2b25 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/common/transformation/stage/MediaTypeResolutionStage.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/common/transformation/stage/MediaTypeResolutionStage.scala @@ -73,7 +73,7 @@ class MediaTypeResolutionStage(profile: ProfileName, // Use accepts field. accepts match { case Some(a) => - if (!isValidation && profile.isOas()) operation.set(OperationModel.Accepts, a) + if (!isValidation && profile == Oas20Profile) operation.set(OperationModel.Accepts, a) request.setArray(RequestModel.Payloads, payloads(request.payloads, a, request.id)) case None => } @@ -134,7 +134,7 @@ class MediaTypeResolutionStage(profile: ProfileName, /** Add tracked annotation only to examples that tracked the old payload with no media type. */ private def replaceTrackedAnnotation(payload: Payload, newPayloadId: AmfObject): Shape = - // originally was defined as replace but renamed method to actual behaviour + // originally was defined as replace but renamed method to actual behaviour ExampleTracking.trackIfExists(payload.schema, newPayloadId, payload.id) def overrideWith(root: Option[Seq[String]], overrider: Option[Seq[String]]): Option[Seq[String]] = diff --git a/amf-cli/shared/src/test/resources/compatibility/raml10/global-params.raml b/amf-cli/shared/src/test/resources/compatibility/raml10/global-params.raml new file mode 100644 index 0000000000..be71fed217 --- /dev/null +++ b/amf-cli/shared/src/test/resources/compatibility/raml10/global-params.raml @@ -0,0 +1,14 @@ +#%RAML 1.0 + +title: API Manager +baseUri: https://anypoint.mulesoft.com/apimanager/api/{version} +version: v1 +mediaType: application/json + +/organizations/{organizationId}: + description: Organizations are the container entity for all API Manager-related resources. + post: + responses: + 201: + body: + application/json: From fc9461e57fa3d094a30ddb1b7de3998f7dd80c50 Mon Sep 17 00:00:00 2001 From: Tomas Fernandez Date: Wed, 29 Sep 2021 16:58:51 -0300 Subject: [PATCH 10/46] Fix: removed source spec annotation and lifted SourceSpec model field to amf-core --- .../platform/model/domain/api/Api.scala | 2 - .../document/APIContractProcessingData.scala | 7 +- .../client/scala/model/domain/api/Api.scala | 6 +- .../APIContractProcessingDataModel.scala | 12 +- .../document/AsyncApi20DocumentEmitter.scala | 5 +- .../document/AsyncApiDocumentParser.scala | 45 ++++-- .../emitter/document/OasDocumentEmitter.scala | 5 +- .../emitter/document/OasModuleEmitter.scala | 4 +- .../parser/document/OasDocumentParser.scala | 51 +++--- .../parser/document/OasFragmentParser.scala | 13 +- .../oas/parser/document/OasModuleParser.scala | 7 +- .../document/RamlDocumentEmitter.scala | 6 +- .../emitter/document/RamlModuleEmitter.scala | 4 +- .../parser/document/RamlDocumentParser.scala | 40 +++-- .../parser/document/RamlFragmentParser.scala | 22 ++- .../parser/document/RamlModuleParser.scala | 3 - .../draft-2019-09/jsonld/content.jsonld | 3 +- .../jsonld/duration-uuid-format.json | 3 +- .../schema-required-dependencies.jsonld | 3 +- .../draft-2019-09/jsonld/with-id.jsonld | 3 +- .../jsonschema/draft-7/jsonld/content.jsonld | 3 +- .../jsonld/required-dependencies.jsonld | 3 +- .../jsonld/schema-dependencies-ref.jsonld | 3 +- .../draft-7/jsonld/schema-dependencies.jsonld | 3 +- .../jsonschema/draft-7/jsonld/with-id.jsonld | 3 +- .../base-type-array.expanded.jsonld | 17 +- .../base-type-array.flattened.jsonld | 12 +- .../matrix-type-array.expanded.jsonld | 17 +- .../matrix-type-array.flattened.jsonld | 12 +- ...xpression-with-inheritance.expanded.jsonld | 17 +- ...pression-with-inheritance.flattened.jsonld | 12 +- .../union-type-array.expanded.jsonld | 17 +- .../union-type-array.flattened.jsonld | 12 +- .../child-declaration-links.expanded.jsonld | 17 +- .../child-declaration-links.flattened.jsonld | 12 +- .../union-right-declaration.expanded.jsonld | 17 +- .../union-right-declaration.flattened.jsonld | 12 +- .../parser/union-with-lib/api.expanded.jsonld | 34 +--- .../union-with-lib/api.flattened.jsonld | 24 +-- .../golden.expanded.jsonld | 17 +- .../golden.flattened.jsonld | 12 +- .../production/event-api/api.expanded.jsonld | 5 +- .../production/event-api/api.flattened.jsonld | 5 +- .../example-in-union.raml.expanded.jsonld | 17 +- .../example-in-union.raml.flattened.jsonld | 12 +- ...nv1.2swagger.raml.resolved.expanded.jsonld | 17 +- ...v1.2swagger.raml.resolved.flattened.jsonld | 12 +- .../add-facet.raml.expanded.jsonld | 17 +- .../add-facet.raml.flattened.jsonld | 12 +- .../test-ramlfragment.raml.expanded.jsonld | 32 +--- .../test-ramlfragment.raml.flattened.jsonld | 22 +-- .../knowledge-graph-reduced/api.jsonld | 5 +- .../api.resolved.expanded.jsonld | 10 +- .../api.resolved.flattened.jsonld | 10 +- .../production/lib-types/lib.expanded.jsonld | 5 +- .../production/lib-types/lib.flattened.jsonld | 5 +- ...blob_service.raml.resolved.expanded.jsonld | 17 +- ...lob_service.raml.resolved.flattened.jsonld | 12 +- .../api.resolved.expanded.jsonld | 17 +- .../api.resolved.flattened.jsonld | 12 +- .../oas-example.json.expanded.jsonld | 17 +- .../oas-example.json.flattened.jsonld | 12 +- .../oas-multiple-example.json.expanded.jsonld | 17 +- ...oas-multiple-example.json.flattened.jsonld | 12 +- ...-multiple-example.resolved.expanded.jsonld | 5 +- ...multiple-example.resolved.flattened.jsonld | 5 +- .../oas20/xml-payload.json.expanded.jsonld | 17 +- .../oas20/xml-payload.json.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../lock-unlock/api.raml.expanded.jsonld | 17 +- .../lock-unlock/api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 115 +------------ .../api.raml.flattened.jsonld | 107 ++---------- .../banking-api/api.raml.expanded.jsonld | 153 ++---------------- .../banking-api/api.raml.flattened.jsonld | 96 +---------- .../raml10/demo-api/api.raml.expanded.jsonld | 17 +- .../raml10/demo-api/api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../jsonschema/api.raml.expanded.jsonld | 17 +- .../jsonschema/api.raml.flattened.jsonld | 12 +- .../locations-api/api.raml.expanded.jsonld | 76 +-------- .../locations-api/api.raml.flattened.jsonld | 61 +------ .../xsdexample/api.raml.expanded.jsonld | 17 +- .../xsdexample/api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../raml10/xsdschema/api.raml.expanded.jsonld | 17 +- .../xsdschema/api.raml.flattened.jsonld | 12 +- .../recursive-union.raml.expanded.jsonld | 17 +- .../recursive-union.raml.flattened.jsonld | 12 +- .../recursive3.editing.expanded.jsonld | 5 +- .../recursive3.editing.flattened.jsonld | 5 +- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../api.resolved.raml.expanded.jsonld | 17 +- .../api.resolved.raml.flattened.jsonld | 12 +- ...nal-prop-and-defined-after.expanded.jsonld | 5 +- ...al-prop-and-defined-after.flattened.jsonld | 5 +- ...al-prop-and-defined-before.expanded.jsonld | 5 +- ...l-prop-and-defined-before.flattened.jsonld | 5 +- .../production/union-type/api.raml.resolved | 17 +- .../unions-example.raml.expanded.jsonld | 17 +- .../unions-example.raml.flattened.jsonld | 12 +- .../data-type-fragment.json.expanded.jsonld | 40 +---- .../data-type-fragment.json.flattened.jsonld | 32 +--- .../data-type-fragment.raml.expanded.jsonld | 15 -- .../data-type-fragment.raml.flattened.jsonld | 10 -- ...ragment.reference.resolved.expanded.jsonld | 13 +- ...agment.reference.resolved.flattened.jsonld | 13 +- .../references/extensions/extension.json.json | 12 +- .../references/extensions/overlay.json.json | 12 +- .../test/resources/references/lib/lib.json | 4 +- .../references/lib/lib.json.expanded.jsonld | 43 ++--- .../references/lib/lib.json.flattened.jsonld | 38 ++--- .../references/lib/lib.raml.expanded.jsonld | 17 +- .../references/lib/lib.raml.flattened.jsonld | 12 +- .../references/libraries.json.expanded.jsonld | 60 ++----- .../libraries.json.flattened.jsonld | 50 ++---- .../references/libraries.raml.expanded.jsonld | 48 +++--- .../libraries.raml.flattened.jsonld | 46 +++--- .../oas/oas-references/oas-2-root.jsonld | 17 +- .../oas/oas-references/oas-3-root.jsonld | 17 +- .../render/recursion.expanded.jsonld | 17 +- .../render/recursion.flattened.jsonld | 12 +- .../resources/render/types.expanded.jsonld | 17 +- .../resources/render/types.flattened.jsonld | 12 +- .../resources/render/union.expanded.jsonld | 17 +- .../resources/render/union.flattened.jsonld | 12 +- .../api.expanded.jsonld | 17 +- .../api.flattened.jsonld | 12 +- .../content-type-override.expanded.jsonld | 5 +- .../content-type-override.flattened.jsonld | 5 +- ...essage-example-propagation.expanded.jsonld | 5 +- ...ssage-example-propagation.flattened.jsonld | 5 +- .../message-references.expanded.jsonld | 5 +- .../message-references.flattened.jsonld | 5 +- ...-trait-merging-and-removed.expanded.jsonld | 5 +- ...trait-merging-and-removed.flattened.jsonld | 5 +- .../message-trait-merging.expanded.jsonld | 5 +- .../message-trait-merging.flattened.jsonld | 5 +- .../named-parameter-with-ref.expanded.jsonld | 5 +- .../named-parameter-with-ref.flattened.jsonld | 5 +- ...-trait-merging-and-removed.expanded.jsonld | 5 +- ...trait-merging-and-removed.flattened.jsonld | 5 +- .../operation-trait-merging.expanded.jsonld | 5 +- .../operation-trait-merging.flattened.jsonld | 5 +- .../type-forward-referencing.expanded.jsonld | 5 +- .../type-forward-referencing.flattened.jsonld | 5 +- .../binary-fragment/api.expanded.jsonld | 5 +- .../binary-fragment/api.flattened.jsonld | 5 +- .../api.resolved.expanded.jsonld | 10 +- .../api.resolved.flattened.jsonld | 10 +- .../api.resolved.expanded.jsonld | 16 +- .../api.resolved.flattened.jsonld | 16 +- .../api.expanded.jsonld | 5 +- .../api.flattened.jsonld | 5 +- .../examples-defined-in-rt.expanded.jsonld | 5 +- .../examples-defined-in-rt.flattened.jsonld | 5 +- ...xamples-shortener.resolved.expanded.jsonld | 5 +- ...amples-shortener.resolved.flattened.jsonld | 5 +- ...-with-multiple-media-types.expanded.jsonld | 17 +- ...with-multiple-media-types.flattened.jsonld | 12 +- .../response-examples.json.expanded.jsonld | 17 +- .../response-examples.json.flattened.jsonld | 12 +- .../response-examples.raml.expanded.jsonld | 17 +- .../response-examples.raml.flattened.jsonld | 12 +- ...with-quoted-value.resolved.expanded.jsonld | 17 +- ...ith-quoted-value.resolved.flattened.jsonld | 12 +- ...traits-resource-types.raml.expanded.jsonld | 17 +- ...raits-resource-types.raml.flattened.jsonld | 12 +- .../extends/data.editing.expanded.jsonld | 5 +- .../extends/data.editing.flattened.jsonld | 5 +- .../merging/api.expanded.jsonld | 2 +- .../merging/api.flattened.jsonld | 2 +- .../resource-type/api.expanded.jsonld | 2 +- .../resource-type/api.flattened.jsonld | 2 +- .../trait/api.expanded.jsonld | 2 +- .../trait/api.flattened.jsonld | 2 +- .../optional-method.raml.expanded.jsonld | 17 +- .../optional-method.raml.flattened.jsonld | 12 +- .../extends/parameters.raml.expanded.jsonld | 17 +- .../extends/parameters.raml.flattened.jsonld | 12 +- .../simple-merge.editing.expanded.jsonld | 5 +- .../simple-merge.editing.flattened.jsonld | 5 +- .../extends/simple-merge.raml.expanded.jsonld | 17 +- .../simple-merge.raml.flattened.jsonld | 12 +- .../to-jsonld-and-back/api.expanded.jsonld | 5 +- .../to-jsonld-and-back/api.flattened.jsonld | 5 +- .../traits/input.resolved.expanded.jsonld | 5 +- .../traits/input.resolved.flattened.jsonld | 5 +- .../extension/traits/output.expanded.jsonld | 17 +- .../extension/traits/output.flattened.jsonld | 12 +- .../jsonexample.raml.expanded.jsonld | 17 +- .../jsonexample.raml.flattened.jsonld | 12 +- .../jsonschema.raml.expanded.jsonld | 17 +- .../jsonschema.raml.flattened.jsonld | 12 +- .../api.resolved.expanded.jsonld | 5 +- .../api.resolved.flattened.jsonld | 5 +- .../xmlexample.raml.expanded.jsonld | 17 +- .../xmlexample.raml.flattened.jsonld | 12 +- .../xmlschema.raml.expanded.jsonld | 17 +- .../xmlschema.raml.flattened.jsonld | 12 +- .../jsonld-example/api.expanded.jsonld | 5 +- .../jsonld-example/api.flattened.jsonld | 5 +- .../link-of-link-in-api.expanded.jsonld | 10 +- .../link-of-link-in-api.flattened.jsonld | 10 +- .../link-of-link-of-link.expanded.jsonld | 5 +- .../link-of-link-of-link.flattened.jsonld | 5 +- .../link-of-link/link-of-link.expanded.jsonld | 5 +- .../link-of-link.flattened.jsonld | 5 +- .../link-of-link-in-api.expanded.jsonld | 10 +- .../link-of-link-in-api.flattened.jsonld | 10 +- .../avoid-extract-to-declares.expanded.jsonld | 5 +- ...avoid-extract-to-declares.flattened.jsonld | 5 +- ...-declares-and-refs-default.expanded.jsonld | 38 +---- ...declares-and-refs-default.flattened.jsonld | 30 +--- ...-declares-and-refs-editing.expanded.jsonld | 24 +-- ...declares-and-refs-editing.flattened.jsonld | 24 +-- ...e-override-oas-target.json.expanded.jsonld | 17 +- ...-override-oas-target.json.flattened.jsonld | 12 +- .../media-type-override.json.expanded.jsonld | 17 +- .../media-type-override.json.flattened.jsonld | 12 +- .../media-type-override.raml.expanded.jsonld | 17 +- .../media-type-override.raml.flattened.jsonld | 12 +- .../media-type.json.expanded.jsonld | 17 +- .../media-type.json.flattened.jsonld | 12 +- .../media-type.raml.expanded.jsonld | 17 +- .../media-type.raml.flattened.jsonld | 12 +- .../media-types.json.expanded.jsonld | 17 +- .../media-types.json.flattened.jsonld | 12 +- .../media-types.raml.expanded.jsonld | 17 +- .../media-types.raml.flattened.jsonld | 12 +- .../api.expanded.jsonld | 5 +- .../api.flattened.jsonld | 5 +- .../merge-inherits/api.expanded.jsonld | 5 +- .../merge-inherits/api.flattened.jsonld | 5 +- .../api.expanded.jsonld | 5 +- .../api.flattened.jsonld | 5 +- .../api.expanded.jsonld | 5 +- .../api.flattened.jsonld | 5 +- .../api.expanded.jsonld | 5 +- .../api.flattened.jsonld | 5 +- .../result.expanded.jsonld | 5 +- .../result.flattened.jsonld | 5 +- .../nested-parameters.raml.expanded.jsonld | 17 +- .../nested-parameters.raml.flattened.jsonld | 12 +- ...as-declared-link-of-scalar.expanded.jsonld | 5 +- ...s-declared-link-of-scalar.flattened.jsonld | 5 +- .../api.expanded.jsonld | 5 +- .../api.flattened.jsonld | 5 +- .../all-objects-case.expanded.jsonld | 17 +- .../all-objects-case.flattened.jsonld | 12 +- .../array-in-the-middle.expanded.jsonld | 17 +- .../array-in-the-middle.flattened.jsonld | 12 +- ...array-with-child-recursion.expanded.jsonld | 17 +- ...rray-with-child-recursion.flattened.jsonld | 12 +- .../resolution/oas-recursion.expanded.jsonld | 5 +- .../resolution/oas-recursion.flattened.jsonld | 5 +- .../oas3-inlined-shapes.expanded.jsonld | 5 +- .../oas3-inlined-shapes.flattened.jsonld | 5 +- .../api.expanded.jsonld | 5 +- .../api.flattened.jsonld | 5 +- .../oas30-discriminator/api.expanded.jsonld | 5 +- .../oas30-discriminator/api.flattened.jsonld | 5 +- .../result.expanded.jsonld | 5 +- .../result.flattened.jsonld | 5 +- .../overrided-baseUriParams.expanded.jsonld | 17 +- .../overrided-baseUriParams.flattened.jsonld | 12 +- .../parameter-without-type.expanded.jsonld | 5 +- .../parameter-without-type.flattened.jsonld | 5 +- .../parameters.json.expanded.jsonld | 17 +- .../parameters.json.flattened.jsonld | 12 +- .../parameters.raml.expanded.jsonld | 17 +- .../parameters.raml.flattened.jsonld | 12 +- ...amples-resolution.resolved.expanded.jsonld | 5 +- ...mples-resolution.resolved.flattened.jsonld | 5 +- .../query-string.json.expanded.jsonld | 17 +- .../query-string.json.flattened.jsonld | 12 +- .../query-string.raml.expanded.jsonld | 17 +- .../query-string.raml.flattened.jsonld | 12 +- ...ity-with-query-string.json.expanded.jsonld | 17 +- ...ty-with-query-string.json.flattened.jsonld | 12 +- ...ity-with-query-string.raml.expanded.jsonld | 17 +- ...ty-with-query-string.raml.flattened.jsonld | 12 +- .../api.expanded.jsonld | 5 +- .../api.flattened.jsonld | 5 +- ...ve-additional-properties-2.expanded.jsonld | 5 +- ...e-additional-properties-2.flattened.jsonld | 5 +- ...sive-additional-properties.expanded.jsonld | 5 +- ...ive-additional-properties.flattened.jsonld | 5 +- .../api.resolved.expanded.jsonld | 5 +- .../api.resolved.flattened.jsonld | 5 +- .../recursive-tuple/api.expanded.jsonld | 5 +- .../recursive-tuple/api.flattened.jsonld | 5 +- .../api.expanded.jsonld | 5 +- .../api.flattened.jsonld | 5 +- .../security-requirements.expanded.jsonld | 27 +--- .../security-requirements.flattened.jsonld | 21 +-- .../security/security.json.expanded.jsonld | 17 +- .../security/security.json.flattened.jsonld | 12 +- .../security/security.raml.expanded.jsonld | 17 +- .../security/security.raml.flattened.jsonld | 12 +- .../api.expanded.jsonld | 5 +- .../api.flattened.jsonld | 5 +- .../oas30/api.expanded.jsonld | 5 +- .../oas30/api.flattened.jsonld | 5 +- .../oas20/api.expanded.jsonld | 5 +- .../oas20/api.flattened.jsonld | 5 +- .../oas30/api.expanded.jsonld | 5 +- .../oas30/api.flattened.jsonld | 5 +- .../trait-with-link.expanded.jsonld | 5 +- .../trait-with-link.flattened.jsonld | 5 +- .../union-of-arrays/api.expanded.jsonld | 5 +- .../union-of-arrays/api.flattened.jsonld | 5 +- .../api.raml.resolved.expanded.jsonld | 5 +- .../api.raml.resolved.flattened.jsonld | 5 +- .../unresolved-shape.raml.expanded.jsonld | 5 +- .../unresolved-shape.raml.flattened.jsonld | 5 +- .../additional-properties.expanded.jsonld | 17 +- .../additional-properties.flattened.jsonld | 12 +- .../annotations.json.expanded.jsonld | 17 +- .../annotations.json.flattened.jsonld | 12 +- .../annotations.raml.expanded.jsonld | 15 -- .../annotations.raml.flattened.jsonld | 10 -- .../anonymous-and-named-examples.jsonld | 32 ++-- .../upanddown/basic.json.expanded.jsonld | 17 +- .../upanddown/basic.json.flattened.jsonld | 12 +- .../collection-format.expanded.jsonld | 17 +- .../collection-format.flattened.jsonld | 12 +- .../upanddown/complete.json.expanded.jsonld | 17 +- .../upanddown/complete.json.flattened.jsonld | 12 +- .../api.json.expanded.jsonld | 17 +- .../api.json.flattened.jsonld | 12 +- .../api.yaml.expanded.jsonld | 17 +- .../api.yaml.flattened.jsonld | 12 +- .../api.yaml.expanded.jsonld | 17 +- .../api.yaml.flattened.jsonld | 12 +- .../api.yaml.expanded.jsonld | 17 +- .../api.yaml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../default_value/api.raml.expanded.jsonld | 17 +- .../default_value/api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../empty_payload/api.raml.expanded.jsonld | 17 +- .../empty_payload/api.raml.flattened.jsonld | 12 +- .../file-array/api.raml.expanded.jsonld | 17 +- .../file-array/api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../missing_payload/api.raml.expanded.jsonld | 17 +- .../missing_payload/api.raml.flattened.jsonld | 12 +- .../schema-position/api.raml.expanded.jsonld | 17 +- .../schema-position/api.raml.flattened.jsonld | 12 +- .../all-type-types/api.raml.expanded.jsonld | 17 +- .../all-type-types/api.raml.flattened.jsonld | 12 +- .../annotations-full/api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../annotations/api.raml.expanded.jsonld | 17 +- .../annotations/api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../array-example/api.raml.expanded.jsonld | 17 +- .../array-example/api.raml.flattened.jsonld | 12 +- .../banking-api/api.raml.expanded.jsonld | 17 +- .../banking-api/api.raml.flattened.jsonld | 12 +- .../raml10/basic/api.raml.expanded.jsonld | 17 +- .../raml10/basic/api.raml.flattened.jsonld | 12 +- .../basic_with_xsd/api.raml.expanded.jsonld | 17 +- .../basic_with_xsd/api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../boolean_in_key/api.raml.expanded.jsonld | 17 +- .../boolean_in_key/api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../raml10/complete/api.raml.expanded.jsonld | 17 +- .../raml10/complete/api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 34 +--- .../api.raml.flattened.jsonld | 24 +-- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../default-types/api.raml.expanded.jsonld | 17 +- .../default-types/api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../empty-library/api.raml.expanded.jsonld | 17 +- .../empty-library/api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../empty_union/api.raml.expanded.jsonld | 17 +- .../empty_union/api.raml.flattened.jsonld | 12 +- .../raml10/endpoints/api.raml.expanded.jsonld | 17 +- .../endpoints/api.raml.flattened.jsonld | 12 +- .../enum-inheritance/api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../raml10/enums/api.raml.expanded.jsonld | 17 +- .../raml10/enums/api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../raml10/examples/api.raml.expanded.jsonld | 17 +- .../raml10/examples/api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../extensions/api.raml.expanded.jsonld | 34 +--- .../extensions/api.raml.flattened.jsonld | 24 +-- .../raml10/externals/api.raml.expanded.jsonld | 17 +- .../externals/api.raml.flattened.jsonld | 12 +- .../file-detection/api.raml.expanded.jsonld | 17 +- .../file-detection/api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../file_types/api.raml.expanded.jsonld | 17 +- .../file_types/api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../fragment_usage/api.raml.expanded.jsonld | 17 +- .../fragment_usage/api.raml.flattened.jsonld | 12 +- .../full-example/api.raml.expanded.jsonld | 17 +- .../full-example/api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../include-repeated/api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 90 +---------- .../api.raml.flattened.jsonld | 82 ++-------- .../int_uri_param/api.raml.expanded.jsonld | 17 +- .../int_uri_param/api.raml.flattened.jsonld | 12 +- .../jukebox-api/api.raml.expanded.jsonld | 17 +- .../jukebox-api/api.raml.flattened.jsonld | 12 +- .../raml10/konst1/api.raml.expanded.jsonld | 17 +- .../raml10/konst1/api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 34 +--- .../api.raml.flattened.jsonld | 24 +-- .../api.raml.expanded.jsonld | 34 +--- .../api.raml.flattened.jsonld | 24 +-- .../raml10/libraries/api.raml.expanded.jsonld | 34 +--- .../libraries/api.raml.flattened.jsonld | 24 +-- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../raml10/matrix-id/api.raml.expanded.jsonld | 17 +- .../matrix-id/api.raml.flattened.jsonld | 12 +- .../raml10/matrix/api.raml.expanded.jsonld | 17 +- .../raml10/matrix/api.raml.flattened.jsonld | 12 +- .../missing_example/api.raml.expanded.jsonld | 17 +- .../missing_example/api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../named-example/api.raml.expanded.jsonld | 42 +---- .../named-example/api.raml.flattened.jsonld | 37 +---- .../null-secured-by/api.raml.expanded.jsonld | 17 +- .../null-secured-by/api.raml.flattened.jsonld | 12 +- .../number_title/api.raml.expanded.jsonld | 17 +- .../number_title/api.raml.flattened.jsonld | 12 +- .../numeric-facets/api.raml.expanded.jsonld | 17 +- .../numeric-facets/api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../raml10/overlay/api.raml.expanded.jsonld | 34 +--- .../raml10/overlay/api.raml.flattened.jsonld | 24 +-- .../parameters/api.raml.expanded.jsonld | 17 +- .../parameters/api.raml.flattened.jsonld | 12 +- .../raml10/payloads/api.raml.expanded.jsonld | 17 +- .../raml10/payloads/api.raml.flattened.jsonld | 12 +- .../query-string/api.raml.expanded.jsonld | 17 +- .../query-string/api.raml.flattened.jsonld | 12 +- .../raml-security/api.raml.expanded.jsonld | 17 +- .../raml-security/api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 42 +---- .../api.raml.flattened.jsonld | 37 +---- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 34 +--- .../api.raml.flattened.jsonld | 24 +-- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../sapi-customer/api.raml.expanded.jsonld | 67 +------- .../sapi-customer/api.raml.flattened.jsonld | 62 +------ .../secured-by/api.raml.expanded.jsonld | 34 +--- .../secured-by/api.raml.flattened.jsonld | 24 +-- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../raml10/security/api.raml.expanded.jsonld | 17 +- .../raml10/security/api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 40 +---- .../api.raml.flattened.jsonld | 32 +--- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../trait-fragment/api.raml.expanded.jsonld | 34 +--- .../trait-fragment/api.raml.flattened.jsonld | 24 +-- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../type-closed-true/api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../type-facets/api.raml.expanded.jsonld | 17 +- .../type-facets/api.raml.flattened.jsonld | 12 +- .../api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../types-dependency/api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../types-facet/api.raml.expanded.jsonld | 17 +- .../types-facet/api.raml.flattened.jsonld | 12 +- .../raml10/types/api.raml.expanded.jsonld | 17 +- .../raml10/types/api.raml.flattened.jsonld | 12 +- .../types_problems2/api.raml.expanded.jsonld | 17 +- .../types_problems2/api.raml.flattened.jsonld | 12 +- .../unresolved-shape/api.raml.expanded.jsonld | 17 +- .../api.raml.flattened.jsonld | 12 +- .../users_accounts/api.raml.expanded.jsonld | 17 +- .../users_accounts/api.raml.flattened.jsonld | 12 +- .../with_references/api.raml.expanded.jsonld | 91 +---------- .../with_references/api.raml.flattened.jsonld | 68 ++------ .../declared-responses.json.expanded.jsonld | 17 +- .../declared-responses.json.flattened.jsonld | 12 +- .../upanddown/endpoints.json.expanded.jsonld | 17 +- .../upanddown/endpoints.json.flattened.jsonld | 12 +- .../enums/enums.raml.expanded.jsonld | 17 +- .../enums/enums.raml.flattened.jsonld | 12 +- .../upanddown/examples.json.expanded.jsonld | 17 +- .../upanddown/examples.json.flattened.jsonld | 12 +- .../upanddown/externals.json.expanded.jsonld | 17 +- .../upanddown/externals.json.flattened.jsonld | 12 +- .../test/resources/upanddown/file-type.json | 17 +- .../form-data-params.expanded.jsonld | 17 +- .../form-data-params.flattened.jsonld | 12 +- .../formDataParameters.expanded.jsonld | 17 +- .../formDataParameters.flattened.jsonld | 12 +- ...rmdata-parameters-multiple.expanded.jsonld | 17 +- ...mdata-parameters-multiple.flattened.jsonld | 12 +- .../full-example.json.expanded.jsonld | 17 +- .../full-example.json.flattened.jsonld | 12 +- .../grpc/google/any.proto.expanded.jsonld | 2 +- .../grpc/google/any.proto.flattened.jsonld | 2 +- .../grpc/google/api.proto.expanded.jsonld | 10 +- .../grpc/google/api.proto.flattened.jsonld | 8 +- .../google/duration.proto.expanded.jsonld | 2 +- .../google/duration.proto.flattened.jsonld | 2 +- .../grpc/google/empty.proto.expanded.jsonld | 2 +- .../grpc/google/empty.proto.flattened.jsonld | 2 +- .../google/field_mask.proto.expanded.jsonld | 2 +- .../google/field_mask.proto.flattened.jsonld | 2 +- .../source_context.proto.expanded.jsonld | 2 +- .../source_context.proto.flattened.jsonld | 2 +- .../grpc/google/struct.proto.expanded.jsonld | 2 +- .../grpc/google/struct.proto.flattened.jsonld | 2 +- .../google/timestamp.proto.expanded.jsonld | 2 +- .../google/timestamp.proto.flattened.jsonld | 2 +- .../grpc/google/type.proto.expanded.jsonld | 6 +- .../grpc/google/type.proto.flattened.jsonld | 6 +- .../google/wrappers.proto.expanded.jsonld | 2 +- .../google/wrappers.proto.flattened.jsonld | 2 +- .../upanddown/grpc/simple.expanded.jsonld | 4 +- .../upanddown/grpc/simple.flattened.jsonld | 4 +- .../api.resolved.expanded.jsonld | 17 +- .../api.resolved.flattened.jsonld | 12 +- ...parameter-payload-examples.expanded.jsonld | 5 +- ...arameter-payload-examples.flattened.jsonld | 5 +- ...d-to-operations-resolution.expanded.jsonld | 17 +- ...-to-operations-resolution.flattened.jsonld | 12 +- ...oward_definitions.resolved.expanded.jsonld | 17 +- ...ward_definitions.resolved.flattened.jsonld | 12 +- .../oas_response_declaration.expanded.jsonld | 17 +- .../oas_response_declaration.flattened.jsonld | 12 +- ...ponse_declaration.resolved.expanded.jsonld | 17 +- ...onse_declaration.resolved.flattened.jsonld | 12 +- .../orphan_extensions.expanded.jsonld | 17 +- .../orphan_extensions.flattened.jsonld | 12 +- .../upanddown/parameters.json.expanded.jsonld | 17 +- .../parameters.json.flattened.jsonld | 12 +- .../petstore/petstore.expanded.jsonld | 17 +- .../petstore/petstore.flattened.jsonld | 12 +- .../query-string.json.expanded.jsonld | 17 +- .../query-string.json.flattened.jsonld | 12 +- .../schemas-lexical-info.expanded.jsonld | 17 +- .../schemas-lexical-info.flattened.jsonld | 12 +- .../api.expanded.jsonld | 17 +- .../api.flattened.jsonld | 12 +- .../api.expanded.jsonld | 17 +- .../api.flattened.jsonld | 12 +- ...aml-default-schema-version.expanded.jsonld | 17 +- ...ml-default-schema-version.flattened.jsonld | 12 +- .../raml-reference-draft-7.expanded.jsonld | 17 +- .../raml-reference-draft-7.flattened.jsonld | 12 +- ...-json-schema-in-type-facet.expanded.jsonld | 17 +- ...json-schema-in-type-facet.flattened.jsonld | 12 +- ...ity-with-query-string.json.expanded.jsonld | 17 +- ...ty-with-query-string.json.flattened.jsonld | 12 +- .../upanddown/security.json.expanded.jsonld | 17 +- .../upanddown/security.json.flattened.jsonld | 12 +- .../shapes-with-items.expanded.jsonld | 17 +- .../shapes-with-items.flattened.jsonld | 12 +- ...mple_example_type.resolved.expanded.jsonld | 21 +-- ...ple_example_type.resolved.flattened.jsonld | 21 +-- .../resources/upanddown/tags.expanded.jsonld | 17 +- .../resources/upanddown/tags.flattened.jsonld | 12 +- ...traits-resource-types.json.expanded.jsonld | 17 +- ...raits-resource-types.json.flattened.jsonld | 12 +- .../type-facets.json.expanded.jsonld | 17 +- .../type-facets.json.flattened.jsonld | 12 +- .../types-dependency.json.expanded.jsonld | 17 +- .../types-dependency.json.flattened.jsonld | 12 +- .../types-facet.json.expanded.jsonld | 17 +- .../types-facet.json.flattened.jsonld | 12 +- .../upanddown/types.raml.expanded.jsonld | 15 -- .../upanddown/types.raml.flattened.jsonld | 10 -- .../union_arrays.resolved.expanded.jsonld | 5 +- .../union_arrays.resolved.flattened.jsonld | 5 +- .../with_references_resolved.expanded.jsonld | 68 +------- .../with_references_resolved.flattened.jsonld | 40 +---- .../api-with-xml-examples/api.expanded.jsonld | 17 +- .../api.flattened.jsonld | 12 +- .../amqp-channel-binding.expanded.jsonld | 17 +- .../amqp-channel-binding.flattened.jsonld | 12 +- .../amqp-message-binding.expanded.jsonld | 17 +- .../amqp-message-binding.flattened.jsonld | 12 +- .../amqp-operation-binding.expanded.jsonld | 17 +- .../amqp-operation-binding.flattened.jsonld | 12 +- .../channel-parameters.expanded.jsonld | 17 +- .../channel-parameters.flattened.jsonld | 12 +- .../async-components.expanded.jsonld | 17 +- .../async-components.flattened.jsonld | 12 +- .../external-operation-traits.expanded.jsonld | 17 +- ...external-operation-traits.flattened.jsonld | 12 +- .../components/message-traits.expanded.jsonld | 17 +- .../message-traits.flattened.jsonld | 12 +- .../operation-traits.expanded.jsonld | 17 +- .../operation-traits.flattened.jsonld | 12 +- .../async20/draft-7-schemas.expanded.jsonld | 17 +- .../async20/draft-7-schemas.flattened.jsonld | 12 +- .../draft-7/references.expanded.jsonld | 17 +- .../draft-7/references.flattened.jsonld | 12 +- ...ty-binding-and-annotations.expanded.jsonld | 17 +- ...y-binding-and-annotations.flattened.jsonld | 12 +- .../http-message-binding.expanded.jsonld | 17 +- .../http-message-binding.flattened.jsonld | 12 +- .../http-operation-binding.expanded.jsonld | 17 +- .../http-operation-binding.flattened.jsonld | 12 +- .../kafka-message-binding.expanded.jsonld | 17 +- .../kafka-message-binding.flattened.jsonld | 12 +- .../kafka-operation-binding.expanded.jsonld | 17 +- .../kafka-operation-binding.flattened.jsonld | 12 +- .../async20/message-obj.expanded.jsonld | 17 +- .../async20/message-obj.flattened.jsonld | 12 +- .../mqtt-message-binding.expanded.jsonld | 17 +- .../mqtt-message-binding.flattened.jsonld | 12 +- .../mqtt-operation-binding.expanded.jsonld | 17 +- .../mqtt-operation-binding.flattened.jsonld | 12 +- .../mqtt-server-binding.expanded.jsonld | 17 +- .../mqtt-server-binding.flattened.jsonld | 12 +- .../async20/publish-subscribe.expanded.jsonld | 17 +- .../publish-subscribe.flattened.jsonld | 12 +- .../chained-include.expanded.jsonld | 16 +- .../chained-include.flattened.jsonld | 16 +- .../include-root-payload.expanded.jsonld | 7 +- .../include-root-payload.flattened.jsonld | 7 +- ...data-type-fragment-invalid.expanded.jsonld | 7 +- ...ata-type-fragment-invalid.flattened.jsonld | 7 +- .../ref-data-type-fragment.expanded.jsonld | 7 +- .../ref-data-type-fragment.flattened.jsonld | 7 +- .../ref-external-yaml.expanded.jsonld | 5 +- .../ref-external-yaml.flattened.jsonld | 5 +- .../ref-type-in-library.expanded.jsonld | 10 +- .../ref-type-in-library.flattened.jsonld | 10 +- .../async20/rpc-server.expanded.jsonld | 17 +- .../async20/rpc-server.flattened.jsonld | 12 +- .../async20/security-schemes.expanded.jsonld | 17 +- .../async20/security-schemes.flattened.jsonld | 12 +- ...external-ref-message-trait.expanded.jsonld | 5 +- ...xternal-ref-message-trait.flattened.jsonld | 5 +- ...ternal-ref-operation-trait.expanded.jsonld | 5 +- ...ernal-ref-operation-trait.flattened.jsonld | 5 +- .../ws-channel-binding.expanded.jsonld | 17 +- .../ws-channel-binding.flattened.jsonld | 12 +- ...-generated-schema-name-oas.expanded.jsonld | 5 +- ...generated-schema-name-oas.flattened.jsonld | 5 +- ...d-schema-name-with-default.expanded.jsonld | 5 +- ...-schema-name-with-default.flattened.jsonld | 5 +- ...auto-generated-schema-name.expanded.jsonld | 46 ++---- ...uto-generated-schema-name.flattened.jsonld | 46 ++---- .../body-link-name.expanded.jsonld | 5 +- .../body-link-name.flattened.jsonld | 5 +- .../dup-name-example-tracking.expanded.jsonld | 5 +- ...dup-name-example-tracking.flattened.jsonld | 5 +- .../dialect-fragment/api.expanded.jsonld | 17 +- .../dialect-fragment/api.flattened.jsonld | 12 +- .../api.resolved.expanded.jsonld | 39 ++--- .../api.resolved.flattened.jsonld | 39 ++--- .../vocabulary-fragment/api.expanded.jsonld | 17 +- .../vocabulary-fragment/api.flattened.jsonld | 12 +- .../healthcare_reduced_v1.raml.resolved | 17 +- .../healthcare_reduced_v2.raml.resolved | 17 +- .../from-declaration/api.expanded.jsonld | 5 +- .../from-declaration/api.flattened.jsonld | 5 +- .../with-library/api.expanded.jsonld | 10 +- .../with-library/api.flattened.jsonld | 10 +- .../api.expanded.jsonld | 5 +- .../api.flattened.jsonld | 5 +- .../api.expanded.jsonld | 5 +- .../api.flattened.jsonld | 5 +- .../japanese/cycle/oas30api.expanded.jsonld | 17 +- .../japanese/cycle/oas30api.flattened.jsonld | 12 +- .../japanese/cycle/oasapi.expanded.jsonld | 17 +- .../japanese/cycle/oasapi.flattened.jsonld | 12 +- .../japanese/cycle/ramlapi.expanded.jsonld | 17 +- .../japanese/cycle/ramlapi.flattened.jsonld | 12 +- .../japanese/resolve/oas30api.expanded.jsonld | 17 +- .../resolve/oas30api.flattened.jsonld | 12 +- .../japanese/resolve/oasapi.expanded.jsonld | 17 +- .../japanese/resolve/oasapi.flattened.jsonld | 12 +- .../japanese/resolve/ramlapi.expanded.jsonld | 17 +- .../japanese/resolve/ramlapi.flattened.jsonld | 12 +- .../result.expanded.jsonld | 5 +- .../result.flattened.jsonld | 5 +- ...w-source-maps-compact-uris.expanded.jsonld | 5 +- ...-source-maps-compact-uris.flattened.jsonld | 5 +- .../parsed-result.expanded.jsonld | 2 +- .../parsed-result.flattened.jsonld | 2 +- .../validations/links/api.expanded.jsonld | 21 +-- .../validations/links/api.flattened.jsonld | 21 +-- .../validations/nil-type.raml.resolved | 17 +- ...with-security-requirements.expanded.jsonld | 17 +- ...ith-security-requirements.flattened.jsonld | 12 +- ...int-path-still-parses.json.expanded.jsonld | 17 +- ...nt-path-still-parses.json.flattened.jsonld | 12 +- .../optional-scalar-value.expanded.jsonld | 5 +- .../optional-scalar-value.flattened.jsonld | 5 +- ...ion-inheritance-properties.expanded.jsonld | 5 +- ...on-inheritance-properties.flattened.jsonld | 5 +- .../result.expanded.jsonld | 5 +- .../result.flattened.jsonld | 5 +- .../api.expanded.jsonld | 5 +- .../api.flattened.jsonld | 5 +- ...root-mediatype-propagation.expanded.jsonld | 5 +- ...oot-mediatype-propagation.flattened.jsonld | 5 +- .../validations/rt-parameters.raml.resolved | 17 +- ...tracked-from-resource-type.expanded.jsonld | 14 +- ...racked-from-resource-type.flattened.jsonld | 14 +- .../tracked-oas-examples.expanded.jsonld | 5 +- .../tracked-oas-examples.flattened.jsonld | 5 +- .../tracked-oas-param-body.expanded.jsonld | 5 +- .../tracked-oas-param-body.flattened.jsonld | 5 +- .../tracked-to-linked.expanded.jsonld | 39 ++--- .../tracked-to-linked.flattened.jsonld | 39 ++--- .../union-type-array.expanded.jsonld | 5 +- .../union-type-array.flattened.jsonld | 5 +- .../union-type-containg-array.expanded.jsonld | 5 +- ...union-type-containg-array.flattened.jsonld | 5 +- .../scala/amf/cycle/JsonSchemaSuite.scala | 12 +- .../amf/javaparser/org/raml/ModelTest.scala | 19 +-- .../RamlBodyPayloadValidationTest.scala | 2 +- documentation/model.md | 4 +- 798 files changed, 1317 insertions(+), 10100 deletions(-) diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/model/domain/api/Api.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/model/domain/api/Api.scala index 9d841ce084..aa14ebec7e 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/model/domain/api/Api.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/model/domain/api/Api.scala @@ -67,8 +67,6 @@ abstract class Api[A](override private[amf] val _internal: InternalApi) */ def withDefaultServer(url: String): Server = _internal.withDefaultServer(url) - def sourceSpec: ClientOption[Spec] = _internal.sourceSpec.asClient - } trait ApiFieldSetter[T] { diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/client/scala/model/document/APIContractProcessingData.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/scala/model/document/APIContractProcessingData.scala index 23dc3675e2..c102de1a97 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/client/scala/model/document/APIContractProcessingData.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/scala/model/document/APIContractProcessingData.scala @@ -1,5 +1,6 @@ package amf.apicontract.client.scala.model.document +import amf.aml.internal.metamodel.document.DialectInstanceProcessingDataModel.SourceSpec import amf.apicontract.internal.metamodel.document.APIContractProcessingDataModel import amf.apicontract.internal.metamodel.document.APIContractProcessingDataModel._ import amf.core.client.scala.model.StrField @@ -12,14 +13,8 @@ case class APIContractProcessingData(override val fields: Fields, override val a extends BaseUnitProcessingData(fields, annotations) { def modelVersion: StrField = fields.field(APIContractModelVersion) - def sourceSpec: StrField = fields.field(SourceSpec) - override protected[amf] def sourceSpecProvider: Option[Spec] = sourceSpec.option().map(Spec.apply) - def withSourceSpec(spec: String): this.type = set(SourceSpec, Spec(spec).id) - - def withSourceSpec(spec: Spec): this.type = set(SourceSpec, spec.id) - set(APIContractModelVersion, ApiContractBuildInfo.apiContractModelVersion) override def withTransformed(value: Boolean): APIContractProcessingData.this.type = super.withTransformed(value) diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/client/scala/model/domain/api/Api.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/scala/model/domain/api/Api.scala index fdaefc2095..68dd745850 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/client/scala/model/domain/api/Api.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/scala/model/domain/api/Api.scala @@ -11,7 +11,7 @@ import amf.apicontract.client.scala.model.domain.{ } import amf.core.client.scala.model.StrField import amf.core.client.scala.model.domain.NamedDomainElement -import amf.core.internal.annotations.{SourceSpec, SynthesizedField} +import amf.core.internal.annotations.SynthesizedField import amf.core.internal.metamodel.Field import amf.core.internal.metamodel.domain.ShapeModel.Description import amf.core.internal.parser.domain.{Annotations, Fields} @@ -88,10 +88,6 @@ abstract class Api(fields: Fields, annotations: Annotations) result } - // todo: should source spec be in the base unit? - - def sourceSpec: Option[Spec] = annotations.find(classOf[SourceSpec]).map(a => a.spec) - /** Value , path + field value that is used to compose the id when the object its adopted */ private[amf] override def componentId: String = "/api" diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/metamodel/document/APIContractProcessingDataModel.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/metamodel/document/APIContractProcessingDataModel.scala index cb3bb1f995..a13991215f 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/metamodel/document/APIContractProcessingDataModel.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/metamodel/document/APIContractProcessingDataModel.scala @@ -1,4 +1,5 @@ package amf.apicontract.internal.metamodel.document +import amf.aml.internal.metamodel.document.DialectInstanceProcessingDataModel.SourceSpec import amf.apicontract.client.scala.model.document.APIContractProcessingData import amf.core.client.scala.vocabulary.Namespace.{ApiContract, Document} import amf.core.client.scala.vocabulary.ValueType @@ -13,18 +14,9 @@ object APIContractProcessingDataModel extends BaseUnitProcessingDataModel { ApiContract + "modelVersion", ModelDoc(ModelVocabularies.AmlDoc, "modelVersion", "Version of the API contract model")) - val SourceSpec: Field = - Field( - Str, - ApiContract + "sourceSpec", - ModelDoc(ModelVocabularies.AmlDoc, - "sourceSpec", - "Standard of the original API Specification file (e.g. RAML 1.0, OAS 3.0)") - ) - override def modelInstance: APIContractProcessingData = APIContractProcessingData() - override def fields: List[Field] = List(APIContractModelVersion, Transformed, SourceSpec) + override def fields: List[Field] = List(APIContractModelVersion) ++ BaseUnitProcessingDataModel.fields override val `type`: List[ValueType] = List(Document + "APIContractProcessingData") diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/emitters/document/AsyncApi20DocumentEmitter.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/emitters/document/AsyncApi20DocumentEmitter.scala index ec53a1788a..bc23eb1021 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/emitters/document/AsyncApi20DocumentEmitter.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/emitters/document/AsyncApi20DocumentEmitter.scala @@ -13,7 +13,6 @@ import amf.apicontract.internal.spec.common.emitter import amf.apicontract.internal.spec.common.emitter.{AgnosticShapeEmitterContextAdapter, SecurityRequirementsEmitter} import amf.apicontract.internal.spec.oas.emitter.domain.{InfoEmitter, TagsEmitter} import amf.core.client.scala.model.document.{BaseUnit, Document} -import amf.core.internal.annotations.SourceSpec import amf.core.internal.parser.domain.FieldEntry import amf.core.internal.remote.{AsyncApi20, Spec} import amf.core.internal.render.BaseEmitters.{EmptyMapEmitter, EntryPartEmitter, ValueEmitter, traverse} @@ -32,7 +31,7 @@ class AsyncApi20DocumentEmitter(document: BaseUnit)(implicit val specCtx: AsyncS def emitWebApi(ordering: SpecOrdering): Seq[EntryEmitter] = { val model = retrieveWebApi() - val spec = model.annotations.find(classOf[SourceSpec]).map(_.spec) + val spec = document.sourceSpec val api = WebApiEmitter(model, ordering, spec, Seq()) api.emitters } @@ -52,7 +51,7 @@ class AsyncApi20DocumentEmitter(document: BaseUnit)(implicit val specCtx: AsyncS def emitDocument(): YDocument = { val doc = document.asInstanceOf[Document] - val ordering = SpecOrdering.ordering(AsyncApi20, doc.encodes.annotations) + val ordering = SpecOrdering.ordering(AsyncApi20, doc.sourceSpec) // val references = ReferencesEmitter(document, ordering) val declares = diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/document/AsyncApiDocumentParser.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/document/AsyncApiDocumentParser.scala index 824f1f5ef4..b9cb447779 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/document/AsyncApiDocumentParser.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/async/parser/document/AsyncApiDocumentParser.scala @@ -3,22 +3,40 @@ package amf.apicontract.internal.spec.async.parser.document import amf.aml.internal.parse.common.DeclarationKey import amf.apicontract.client.scala.model.document.APIContractProcessingData import amf.apicontract.client.scala.model.domain.api.AsyncApi -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.{EndPoint, Operation, Parameter} import amf.apicontract.internal.metamodel.domain.api.WebApiModel -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.spec.async.parser.bindings.{AsyncChannelBindingsParser, AsyncMessageBindingsParser, AsyncOperationBindingsParser, AsyncServerBindingsParser} +import amf.apicontract.internal.spec.async.parser.bindings.{ + AsyncChannelBindingsParser, + AsyncMessageBindingsParser, + AsyncOperationBindingsParser, + AsyncServerBindingsParser +} import amf.apicontract.internal.spec.async.parser.context.AsyncWebApiContext import amf.apicontract.internal.spec.async.parser.domain._ import amf.apicontract.internal.spec.common.parser._ import amf.apicontract.internal.spec.oas.parser.document.OasLikeDeclarationsHelper import amf.apicontract.internal.spec.oas.parser.domain.{OasLikeInformationParser, OasLikeTagsParser} -import amf.apicontract.internal.validation.definitions.ParserSideValidations.{InvalidIdentifier, MandatoryChannelsProperty} +import amf.apicontract.internal.validation.definitions.ParserSideValidations.{ + InvalidIdentifier, + MandatoryChannelsProperty +} import amf.core.client.scala.model.document.Document import amf.core.client.scala.model.domain.{AmfArray, AmfObject, AmfScalar, DomainElement} import amf.core.client.scala.parse.document.SyamlParsedDocument -import amf.core.internal.annotations.{DeclaredElement, SourceSpec} +import amf.core.internal.annotations.{DeclaredElement} import amf.core.internal.metamodel.document.DocumentModel import amf.core.internal.metamodel.domain.DomainElementModel import amf.core.internal.parser.domain.{Annotations, ScalarNode} @@ -42,7 +60,7 @@ abstract class AsyncApiDocumentParser(root: Root)(implicit val ctx: AsyncWebApiC val references = AsyncReferencesParser(root.references).parse() parseDeclarations(map, document) - val api = parseApi(map).add(SourceSpec(ctx.spec)) + val api = parseApi(map) document .setWithoutId(DocumentModel.Encodes, api, Annotations.inferred()) @@ -80,10 +98,13 @@ abstract class AsyncApiDocumentParser(root: Root)(implicit val ctx: AsyncWebApiC api.setWithoutId(WebApiModel.Servers, AmfArray(servers, Annotations(entry.value)), Annotations(entry)) } ) - map.key("tags", entry => { - val tags = OasLikeTagsParser(api.id, entry).parse() - api.setWithoutId(WebApiModel.Tags, AmfArray(tags, Annotations(entry.value)), Annotations(entry)) - }) + map.key( + "tags", + entry => { + val tags = OasLikeTagsParser(api.id, entry).parse() + api.setWithoutId(WebApiModel.Tags, AmfArray(tags, Annotations(entry.value)), Annotations(entry)) + } + ) map.key( "defaultContentType", entry => { @@ -187,8 +208,8 @@ abstract class AsyncApiDocumentParser(root: Root)(implicit val ctx: AsyncWebApiC (scheme) => { val name = entry.key.as[String] scheme.setWithoutId(SecuritySchemeModel.Name, - AmfScalar(name, Annotations(entry.key.value)), - Annotations(entry.key)) + AmfScalar(name, Annotations(entry.key.value)), + Annotations(entry.key)) scheme } ) diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/emitter/document/OasDocumentEmitter.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/emitter/document/OasDocumentEmitter.scala index c4b01d3892..84a1074bd8 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/emitter/document/OasDocumentEmitter.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/emitter/document/OasDocumentEmitter.scala @@ -25,7 +25,6 @@ import amf.core.client.common.position.Position import amf.core.client.scala.model.document.{BaseUnit, Document} import amf.core.client.scala.model.domain.AmfScalar import amf.core.client.scala.model.domain.extensions.DomainExtension -import amf.core.internal.annotations.SourceSpec import amf.core.internal.metamodel.document.{BaseUnitModel, ExtensionLikeModel} import amf.core.internal.metamodel.domain.DomainElementModel import amf.core.internal.parser.domain.FieldEntry @@ -177,7 +176,7 @@ abstract class OasDocumentEmitter(document: BaseUnit)(implicit val specCtx: OasS def emitDocument(): YDocument = { val doc = document.asInstanceOf[Document] - val ordering = SpecOrdering.ordering(Oas20, doc.encodes.annotations) + val ordering = SpecOrdering.ordering(Oas20, doc.sourceSpec) val references = ReferencesEmitter(document, ordering) val api = emitWebApi(ordering, document.references) @@ -200,7 +199,7 @@ abstract class OasDocumentEmitter(document: BaseUnit)(implicit val specCtx: OasS def emitWebApi(ordering: SpecOrdering, references: Seq[BaseUnit]): Seq[EntryEmitter] = { val model = retrieveWebApi() - val spec = model.annotations.find(classOf[SourceSpec]).map(_.spec) + val spec = document.sourceSpec val api = WebApiEmitter(model, ordering, spec, references) api.emitters } diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/emitter/document/OasModuleEmitter.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/emitter/document/OasModuleEmitter.scala index 208099bf67..04851ce80d 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/emitter/document/OasModuleEmitter.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/emitter/document/OasModuleEmitter.scala @@ -33,7 +33,7 @@ abstract class OasModuleEmitter(module: Module)(implicit val specCtx: OasSpecEmi def emitModule(): YDocument = { - val ordering = SpecOrdering.ordering(Oas20, module.annotations) + val ordering = SpecOrdering.ordering(Oas20, module.sourceSpec) val references = Seq(ReferencesEmitter(module, ordering)) val declares = OasDeclarationsEmitter(module.declares, ordering, module.references).emitters @@ -66,7 +66,7 @@ class OasFragmentEmitter(fragment: Fragment)(implicit override val specCtx: OasS def emitFragment(): YDocument = { - val ordering: SpecOrdering = SpecOrdering.ordering(Oas20, fragment.annotations) + val ordering: SpecOrdering = SpecOrdering.ordering(Oas20, fragment.sourceSpec) val typeEmitter: OasFragmentTypeEmitter = fragment match { case di: DocumentationItemFragment => DocumentationItemFragmentEmitter(di, ordering) diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/parser/document/OasDocumentParser.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/parser/document/OasDocumentParser.scala index 93c0d807c4..5fd4a20460 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/parser/document/OasDocumentParser.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/parser/document/OasDocumentParser.scala @@ -14,12 +14,18 @@ import amf.apicontract.internal.spec.common.parser._ import amf.apicontract.internal.spec.oas.OasLikeSecuritySchemeTypeMappings import amf.apicontract.internal.spec.oas.parser.context.OasWebApiContext import amf.apicontract.internal.spec.oas.parser.domain.{OasLikeInformationParser, OasLikeTagsParser, OasResponseParser} -import amf.apicontract.internal.validation.definitions.ParserSideValidations.{InvalidAnnotationType, InvalidParameterType, InvalidSecurityRequirementsSeq, InvalidSecuritySchemeType, MandatoryPathsProperty} +import amf.apicontract.internal.validation.definitions.ParserSideValidations.{ + InvalidAnnotationType, + InvalidParameterType, + InvalidSecurityRequirementsSeq, + InvalidSecuritySchemeType, + MandatoryPathsProperty +} import amf.core.client.scala.model.document.{BaseUnit, Document} import amf.core.client.scala.model.domain.extensions.CustomDomainProperty import amf.core.client.scala.model.domain.{AmfArray, AmfObject, AmfScalar} import amf.core.client.scala.parse.document.SyamlParsedDocument -import amf.core.internal.annotations.{DeclaredElement, LexicalInformation, SingleValueArray, SourceSpec} +import amf.core.internal.annotations.{DeclaredElement, LexicalInformation, SingleValueArray} import amf.core.internal.metamodel.Field import amf.core.internal.metamodel.document.{BaseUnitModel, DocumentModel, ExtensionLikeModel} import amf.core.internal.metamodel.domain.extensions.CustomDomainPropertyModel @@ -31,7 +37,12 @@ import amf.core.internal.validation.CoreValidations.DeclarationNotFound import amf.shapes.internal.domain.resolution.ExampleTracking.tracking import amf.shapes.client.scala.model.domain.CreativeWork import amf.shapes.internal.spec.ShapeParserContext -import amf.shapes.internal.spec.common.parser.{AnnotationParser, OasLikeCreativeWorkParser, RamlCreativeWorkParser, YMapEntryLike} +import amf.shapes.internal.spec.common.parser.{ + AnnotationParser, + OasLikeCreativeWorkParser, + RamlCreativeWorkParser, + YMapEntryLike +} import amf.shapes.internal.spec.oas.parser.OasTypeParser import amf.shapes.internal.vocabulary.VocabularyMappings import org.yaml.model.{YMapEntry, YNode, _} @@ -84,7 +95,8 @@ abstract class OasDocumentParser(root: Root, spec: Spec)(implicit val ctx: OasWe def parseDocument(): Document = parseDocument(Document()) private def parseDocument[T <: Document](document: T): T = { - document.withLocation(root.location) + document + .withLocation(root.location) .withProcessingData(APIContractProcessingData().withSourceSpec(spec)) val map = root.parsed.asInstanceOf[SyamlParsedDocument].document.as[YMap] @@ -93,7 +105,7 @@ abstract class OasDocumentParser(root: Root, spec: Spec)(implicit val ctx: OasWe val references = ReferencesParser(document, root.location, "uses".asOasExtension, map, root.references).parse() parseDeclarations(root, map, document) - val api = parseWebApi(map).add(SourceSpec(ctx.spec)) + val api = parseWebApi(map) document.setWithoutId(DocumentModel.Encodes, api, Annotations.inferred()) addDeclarationsToModel(document) @@ -142,8 +154,7 @@ abstract class OasDocumentParser(root: Root, spec: Spec)(implicit val ctx: OasWe val customProperty = AnnotationTypesParser(entry, customProperty => customProperty - .withName(typeName) - ) + .withName(typeName)) ctx.declarations += customProperty.add(DeclaredElement()) }) } @@ -188,8 +199,8 @@ abstract class OasDocumentParser(root: Root, spec: Spec)(implicit val ctx: OasWe (scheme) => { val name = entry.key.as[String] scheme.setWithoutId(SecuritySchemeModel.Name, - AmfScalar(name, Annotations(entry.key.value)), - Annotations(entry.key)) + AmfScalar(name, Annotations(entry.key.value)), + Annotations(entry.key)) scheme } ) @@ -261,10 +272,13 @@ abstract class OasDocumentParser(root: Root, spec: Spec)(implicit val ctx: OasWe ctx.factory.serversParser(map, api).parse() - map.key("tags", entry => { - val tags = OasLikeTagsParser(api.id, entry).parse() - api.setWithoutId(WebApiModel.Tags, AmfArray(tags, Annotations(entry.value)), Annotations(entry)) - }) + map.key( + "tags", + entry => { + val tags = OasLikeTagsParser(api.id, entry).parse() + api.setWithoutId(WebApiModel.Tags, AmfArray(tags, Annotations(entry.value)), Annotations(entry)) + } + ) map.key("security".asOasExtension, entry => { parseSecurity(entry, api) }) // extension needs to go first, so normal security key lexical info will be used if present @@ -291,10 +305,9 @@ abstract class OasDocumentParser(root: Root, spec: Spec)(implicit val ctx: OasWe ) if (documentations.nonEmpty) - api.fields.setWithoutId( - WebApiModel.Documentations, - AmfArray(documentations.map(_._1), Annotations.virtual()), - Annotations.virtual()) + api.fields.setWithoutId(WebApiModel.Documentations, + AmfArray(documentations.map(_._1), Annotations.virtual()), + Annotations.virtual()) map.key("paths") match { case Some(entry) => parseEndpoints(api, entry) @@ -325,7 +338,9 @@ abstract class OasDocumentParser(root: Root, spec: Spec)(implicit val ctx: OasWe Nil } val extension: Seq[SecurityRequirement] = api.security - api.setWithoutId(WebApiModel.Security, AmfArray(requirements ++ extension, Annotations(entry.value)), Annotations(entry)) + api.setWithoutId(WebApiModel.Security, + AmfArray(requirements ++ extension, Annotations(entry.value)), + Annotations(entry)) } private def parseEndpoints(api: WebApi, entry: YMapEntry) = { diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/parser/document/OasFragmentParser.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/parser/document/OasFragmentParser.scala index f07a3ef778..b5bd4a0e08 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/parser/document/OasFragmentParser.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/parser/document/OasFragmentParser.scala @@ -11,11 +11,10 @@ import amf.apicontract.internal.spec.common.parser.{ import amf.apicontract.internal.spec.oas.OasHeader import amf.apicontract.internal.spec.oas.OasHeader._ import amf.apicontract.internal.spec.oas.parser.context.OasWebApiContext -import amf.core.client.scala.model.document.{BaseUnit, EncodesModel, ExternalFragment} +import amf.core.client.scala.model.document.{BaseUnit, ExternalFragment} import amf.core.client.scala.model.domain.extensions.CustomDomainProperty import amf.core.client.scala.model.domain.{ExternalDomainElement, Shape} import amf.core.client.scala.parse.document.SyamlParsedDocument -import amf.core.internal.annotations.SourceSpec import amf.core.internal.parser.Root import amf.core.internal.parser.domain.{Annotations, ScalarNode} import amf.core.internal.remote.Spec @@ -80,11 +79,6 @@ case class OasFragmentParser(root: Root, spec: Spec, fragment: Option[OasHeader] UsageParser(map, fragment).parse() - fragment match { - case encodes: EncodesModel => encodes.encodes.annotations += SourceSpec(ctx.spec) - case _ => fragment.annotations += SourceSpec(ctx.spec) - } - if (references.nonEmpty) fragment.withReferences(references.baseUnitReferences()) fragment } @@ -133,10 +127,7 @@ case class OasFragmentParser(root: Root, spec: Spec, fragment: Option[OasHeader] val annotation = AnnotationTypeDeclarationFragment() val property = - AnnotationTypesParser(map, - "annotation", - map, - (annotation: CustomDomainProperty) => Unit).parse() + AnnotationTypesParser(map, "annotation", map, (annotation: CustomDomainProperty) => Unit).parse() annotation.withEncodes(property) } diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/parser/document/OasModuleParser.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/parser/document/OasModuleParser.scala index 78fb8f9c43..5ecc76903d 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/parser/document/OasModuleParser.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/parser/document/OasModuleParser.scala @@ -5,13 +5,12 @@ import amf.apicontract.internal.spec.common.parser.{ReferencesParser, WebApiShap import amf.apicontract.internal.spec.oas.parser.context.OasWebApiContext import amf.core.client.scala.model.document.Module import amf.core.client.scala.parse.document.SyamlParsedDocument -import amf.core.internal.annotations.SourceSpec import amf.core.internal.metamodel.document.BaseUnitModel -import amf.core.internal.parser.{Root, YNodeLikeOps} import amf.core.internal.parser.domain.Annotations +import amf.core.internal.parser.{Root, YNodeLikeOps} import amf.core.internal.remote.Spec -import org.yaml.model.YMap import amf.core.internal.utils._ +import org.yaml.model.YMap /** * @@ -20,11 +19,9 @@ case class OasModuleParser(root: Root, spec: Spec)(implicit val ctx: OasWebApiCo extends OasSpecParser()(WebApiShapeParserContextAdapter(ctx)) { def parseModule(): Module = { - val sourceVendor = SourceSpec(ctx.spec) val module = Module(Annotations(root.parsed.asInstanceOf[SyamlParsedDocument].document)) .withLocation(root.location) .withProcessingData(APIContractProcessingData().withSourceSpec(spec)) - .add(sourceVendor) module.set(BaseUnitModel.Location, root.location) root.parsed.asInstanceOf[SyamlParsedDocument].document.toOption[YMap].foreach { rootMap => diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/raml/emitter/document/RamlDocumentEmitter.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/raml/emitter/document/RamlDocumentEmitter.scala index 3d443fad42..4d46f987cc 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/raml/emitter/document/RamlDocumentEmitter.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/raml/emitter/document/RamlDocumentEmitter.scala @@ -20,7 +20,7 @@ import amf.core.client.scala.model.document.{BaseUnit, DeclaresModel, Document, import amf.core.client.scala.model.domain.AmfElement import amf.core.client.scala.model.domain.extensions.CustomDomainProperty import amf.core.client.scala.parse.document.EmptyFutureDeclarations -import amf.core.internal.annotations.{Aliases, ExplicitField, ReferencedInfo, SourceAST, SourceSpec} +import amf.core.internal.annotations.{Aliases, ExplicitField, ReferencedInfo, SourceAST} import amf.core.internal.metamodel.document.{BaseUnitModel, ExtensionLikeModel} import amf.core.internal.parser.domain.FieldEntry import amf.core.internal.remote.{Raml10, Spec} @@ -242,13 +242,13 @@ case class RamlDocumentEmitter(document: BaseUnit)(implicit val specCtx: RamlSpe } def apiEmitters(ordering: SpecOrdering): Seq[EntryEmitter] = { val model = retrieveWebApi() - val spec = model.annotations.find(classOf[SourceSpec]).map(_.spec) + val spec = document.sourceSpec WebApiEmitter(model, ordering, spec, document.references).emitters } def emitDocument(): YDocument = { val doc = document.asInstanceOf[Document] - val ordering: SpecOrdering = SpecOrdering.ordering(Raml10, doc.encodes.annotations) + val ordering: SpecOrdering = SpecOrdering.ordering(Raml10, doc.sourceSpec) val content = specCtx.factory.rootLevelEmitters(doc, ordering).emitters ++ apiEmitters(ordering) diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/raml/emitter/document/RamlModuleEmitter.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/raml/emitter/document/RamlModuleEmitter.scala index 65cdc21c87..a768f70ef8 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/raml/emitter/document/RamlModuleEmitter.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/raml/emitter/document/RamlModuleEmitter.scala @@ -28,7 +28,7 @@ case class RamlModuleEmitter(module: Module)(implicit val spec: RamlSpecEmitterC protected implicit val shapeCtx: RamlShapeEmitterContext = RamlShapeEmitterContextAdapter(spec) def emitModule(): YDocument = { - val ordering: SpecOrdering = SpecOrdering.ordering(Raml10, module.annotations) + val ordering: SpecOrdering = SpecOrdering.ordering(Raml10, module.sourceSpec) // TODO ordering?? val emitters = spec.factory @@ -50,7 +50,7 @@ class RamlFragmentEmitter(fragment: Fragment)(implicit val spec: RamlSpecEmitter def emitFragment(): YDocument = { - val ordering: SpecOrdering = SpecOrdering.ordering(Raml10, fragment.encodes.annotations) + val ordering: SpecOrdering = SpecOrdering.ordering(Raml10, fragment.sourceSpec) val typeEmitter: RamlFragmentTypeEmitter = fragment match { case di: DocumentationItemFragment => DocumentationItemFragmentEmitter(di, ordering) diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/raml/parser/document/RamlDocumentParser.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/raml/parser/document/RamlDocumentParser.scala index 2d77cacc7d..8b549807a2 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/raml/parser/document/RamlDocumentParser.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/raml/parser/document/RamlDocumentParser.scala @@ -11,7 +11,12 @@ import amf.apicontract.internal.metamodel.domain.security.SecuritySchemeModel import amf.apicontract.internal.metamodel.domain.templates.{ResourceTypeModel, TraitModel} import amf.apicontract.internal.spec.common.parser.{WebApiShapeParserContextAdapter, _} import amf.apicontract.internal.spec.common.{OasParameter, RamlWebApiDeclarations, WebApiDeclarations} -import amf.apicontract.internal.spec.oas.parser.domain.{LicenseParser, OasResponseParser, OrganizationParser, TagsParser} +import amf.apicontract.internal.spec.oas.parser.domain.{ + LicenseParser, + OasResponseParser, + OrganizationParser, + TagsParser +} import amf.apicontract.internal.spec.raml.parser.context.{ExtensionLikeWebApiContext, RamlWebApiContext} import amf.apicontract.internal.spec.raml.parser.document.RamlAnnotationTargets.targetsFor import amf.apicontract.internal.spec.spec.toOas @@ -35,7 +40,11 @@ import amf.shapes.client.scala.model.domain.CreativeWork import amf.shapes.internal.spec.RamlWebApiContextType import amf.shapes.internal.spec.common.parser.{AnnotationParser, RamlCreativeWorkParser, RamlScalarNode, YMapEntryLike} import amf.shapes.internal.spec.raml.parser.{Raml10TypeParser, RamlTypeEntryParser, RamlTypeSyntax, StringDefaultType} -import amf.shapes.internal.validation.definitions.ShapeParserSideValidations.{ExclusiveSchemasType, InvalidFragmentType, InvalidTypeDefinition} +import amf.shapes.internal.validation.definitions.ShapeParserSideValidations.{ + ExclusiveSchemasType, + InvalidFragmentType, + InvalidTypeDefinition +} import amf.shapes.internal.vocabulary.VocabularyMappings import org.yaml.model._ @@ -117,9 +126,12 @@ case class ExtensionLikeParser(root: Root, spec: Spec)(implicit override val ctx .foreach(e => { root.references .find(_.origin.url == e.value.as[String]) - .foreach{ extend => - document.callAfterAdoption{() => - document.setWithoutId(field, AmfScalar(extend.unit.id, Annotations(e.value)), Annotations(e) += ExtendsReference(extend.origin.url))} + .foreach { extend => + document.callAfterAdoption { () => + document.setWithoutId(field, + AmfScalar(extend.unit.id, Annotations(e.value)), + Annotations(e) += ExtendsReference(extend.origin.url)) + } } }) } @@ -157,7 +169,7 @@ abstract class RamlDocumentParser(root: Root, spec: Spec)(implicit val ctx: Raml val references = ReferencesParser(document, root.location, "uses", map, root.references).parse() parseDeclarations(root, map) - val api = parseWebApi(map).add(SourceSpec(ctx.spec)) + val api = parseWebApi(map) document.setWithoutId(DocumentModel.Encodes, api, Annotations.inferred()) addDeclarationsToModel(document) @@ -264,8 +276,8 @@ trait Raml10BaseSpecParser extends RamlBaseDocumentParser { scheme => { val name = entry.key.as[YScalar].text scheme.setWithoutId(SecuritySchemeModel.Name, - AmfScalar(name, Annotations(entry.key.value)), - Annotations(entry.key)) + AmfScalar(name, Annotations(entry.key.value)), + Annotations(entry.key)) scheme } ) @@ -358,8 +370,8 @@ abstract class RamlBaseDocumentParser(implicit ctx: RamlWebApiContext) extends R entry, customProperty => { customProperty.setWithoutId(CustomDomainPropertyModel.Name, - AmfScalar(typeName, Annotations(entry.key.value)), - Annotations(entry.key)) + AmfScalar(typeName, Annotations(entry.key.value)), + Annotations(entry.key)) } ) ctx.declarations += customProperty.add(DeclaredElement()) @@ -393,7 +405,9 @@ abstract class RamlBaseDocumentParser(implicit ctx: RamlWebApiContext) extends R val parser = Raml10TypeParser( entry, shape => { - shape.setWithoutId(ShapeModel.Name, AmfScalar(typeName, Annotations(entry.key.value)), Annotations(entry.key)) + shape.setWithoutId(ShapeModel.Name, + AmfScalar(typeName, Annotations(entry.key.value)), + Annotations(entry.key)) } )(WebApiShapeParserContextAdapter(ctx)) parser.parse() match { @@ -669,7 +683,9 @@ abstract class RamlSpecParser(implicit ctx: RamlWebApiContext) extends WebApiBas case nodeType => AmfScalar(nodeType.toString, nodeType.annotations) }) - custom.setWithoutId(CustomDomainPropertyModel.Domain, AmfArray(targetUris, targets.annotations), annotations) + custom.setWithoutId(CustomDomainPropertyModel.Domain, + AmfArray(targetUris, targets.annotations), + annotations) } ) diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/raml/parser/document/RamlFragmentParser.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/raml/parser/document/RamlFragmentParser.scala index 4e820bb80d..eaf0af3862 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/raml/parser/document/RamlFragmentParser.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/raml/parser/document/RamlFragmentParser.scala @@ -15,11 +15,10 @@ import amf.core.client.scala.model.document.{ExternalFragment, Fragment} import amf.core.client.scala.model.domain.extensions.CustomDomainProperty import amf.core.client.scala.model.domain.{AmfScalar, ExternalDomainElement, Shape} import amf.core.client.scala.parse.document.SyamlParsedDocument -import amf.core.internal.annotations.SourceSpec import amf.core.internal.metamodel.document.FragmentModel -import amf.core.internal.parser.{Root, YMapOps} import amf.core.internal.parser.domain.Annotations -import amf.core.internal.remote.{Raml10, Spec} +import amf.core.internal.parser.{Root, YMapOps} +import amf.core.internal.remote.Spec import amf.shapes.internal.spec.common.parser.{RamlCreativeWorkParser, YMapEntryLike} import amf.shapes.internal.spec.raml.parser.{Raml10TypeParser, StringDefaultType} import amf.shapes.internal.validation.definitions.ShapeParserSideValidations.InvalidFragmentType @@ -74,7 +73,6 @@ case class RamlFragmentParser(root: Root, spec: Spec, fragmentType: RamlFragment UsageParser(rootMap, fragment).parse() fragment.add(Annotations(root.parsed.asInstanceOf[SyamlParsedDocument].document)) if (aliases.isDefined) fragment.annotations += aliases.get - fragment.encodes.add(SourceSpec(Raml10)) if (references.nonEmpty) fragment.withReferences(references.baseUnitReferences()) fragment } @@ -94,7 +92,8 @@ case class RamlFragmentParser(root: Root, spec: Spec, fragmentType: RamlFragment val item = DocumentationItemFragment() - item.setWithoutId(FragmentModel.Encodes, (RamlCreativeWorkParser(map)(WebApiShapeParserContextAdapter(ctx)).parse())) + item.setWithoutId(FragmentModel.Encodes, + (RamlCreativeWorkParser(map)(WebApiShapeParserContextAdapter(ctx)).parse())) } } @@ -145,10 +144,7 @@ case class RamlFragmentParser(root: Root, spec: Spec, fragmentType: RamlFragment val annotation = AnnotationTypeDeclarationFragment() val property = - AnnotationTypesParser(map, - "annotation", - map, - (annotation: CustomDomainProperty) => Unit).parse() + AnnotationTypesParser(map, "annotation", map, (annotation: CustomDomainProperty) => Unit).parse() annotation.setWithoutId(FragmentModel.Encodes, property) } @@ -158,9 +154,11 @@ case class RamlFragmentParser(root: Root, spec: Spec, fragmentType: RamlFragment def parse(): SecuritySchemeFragment = { val security = SecuritySchemeFragment() - security.setWithoutId(FragmentModel.Encodes, RamlSecuritySchemeParser(map, - (security: amf.apicontract.client.scala.model.domain.security.SecurityScheme) => - security) + security.setWithoutId( + FragmentModel.Encodes, + RamlSecuritySchemeParser( + map, + (security: amf.apicontract.client.scala.model.domain.security.SecurityScheme) => security) .parse()) } } diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/raml/parser/document/RamlModuleParser.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/raml/parser/document/RamlModuleParser.scala index 8041cde332..fe9f89fc76 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/raml/parser/document/RamlModuleParser.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/raml/parser/document/RamlModuleParser.scala @@ -7,7 +7,6 @@ import amf.apicontract.internal.spec.raml.parser.document.RamlAnnotationTargets. import amf.core.client.scala.model.document.Module import amf.core.client.scala.model.domain.AmfArray import amf.core.client.scala.parse.document.SyamlParsedDocument -import amf.core.internal.annotations.SourceSpec import amf.core.internal.metamodel.document.ModuleModel import amf.core.internal.parser.domain.Annotations import amf.core.internal.parser.{Root, YNodeLikeOps} @@ -25,8 +24,6 @@ case class RamlModuleParser(root: Root, spec: Spec)(implicit override val ctx: R def parseModule(): Module = { val module = Module(Annotations(root.parsed.asInstanceOf[SyamlParsedDocument].document)) .withLocation(root.location) - - .add(SourceSpec(ctx.spec)) .withProcessingData(APIContractProcessingData().withSourceSpec(spec)) root.parsed.asInstanceOf[SyamlParsedDocument].document.toOption[YMap].foreach { rootMap => diff --git a/amf-cli/shared/src/test/resources/cycle/jsonschema/draft-2019-09/jsonld/content.jsonld b/amf-cli/shared/src/test/resources/cycle/jsonschema/draft-2019-09/jsonld/content.jsonld index c8f4af8871..9ef86aa750 100644 --- a/amf-cli/shared/src/test/resources/cycle/jsonschema/draft-2019-09/jsonld/content.jsonld +++ b/amf-cli/shared/src/test/resources/cycle/jsonschema/draft-2019-09/jsonld/content.jsonld @@ -5,7 +5,8 @@ "@type": [ "doc:BaseUnitProcessingData" ], - "doc:transformed": false + "doc:transformed": false, + "doc:sourceSpec": "OAS 2.0" }, { "@id": "#/any/schema", diff --git a/amf-cli/shared/src/test/resources/cycle/jsonschema/draft-2019-09/jsonld/duration-uuid-format.json b/amf-cli/shared/src/test/resources/cycle/jsonschema/draft-2019-09/jsonld/duration-uuid-format.json index 5a71e70c66..80d11dd3bb 100644 --- a/amf-cli/shared/src/test/resources/cycle/jsonschema/draft-2019-09/jsonld/duration-uuid-format.json +++ b/amf-cli/shared/src/test/resources/cycle/jsonschema/draft-2019-09/jsonld/duration-uuid-format.json @@ -5,7 +5,8 @@ "@type": [ "doc:BaseUnitProcessingData" ], - "doc:transformed": false + "doc:transformed": false, + "doc:sourceSpec": "OAS 2.0" }, { "@id": "#/any/schema", diff --git a/amf-cli/shared/src/test/resources/cycle/jsonschema/draft-2019-09/jsonld/schema-required-dependencies.jsonld b/amf-cli/shared/src/test/resources/cycle/jsonschema/draft-2019-09/jsonld/schema-required-dependencies.jsonld index 67c5c869ab..95f6b18b86 100644 --- a/amf-cli/shared/src/test/resources/cycle/jsonschema/draft-2019-09/jsonld/schema-required-dependencies.jsonld +++ b/amf-cli/shared/src/test/resources/cycle/jsonschema/draft-2019-09/jsonld/schema-required-dependencies.jsonld @@ -5,7 +5,8 @@ "@type": [ "doc:BaseUnitProcessingData" ], - "doc:transformed": false + "doc:transformed": false, + "doc:sourceSpec": "OAS 2.0" }, { "@id": "#/any/schema", diff --git a/amf-cli/shared/src/test/resources/cycle/jsonschema/draft-2019-09/jsonld/with-id.jsonld b/amf-cli/shared/src/test/resources/cycle/jsonschema/draft-2019-09/jsonld/with-id.jsonld index f02ea75914..588f1f0b30 100644 --- a/amf-cli/shared/src/test/resources/cycle/jsonschema/draft-2019-09/jsonld/with-id.jsonld +++ b/amf-cli/shared/src/test/resources/cycle/jsonschema/draft-2019-09/jsonld/with-id.jsonld @@ -5,7 +5,8 @@ "@type": [ "doc:BaseUnitProcessingData" ], - "doc:transformed": false + "doc:transformed": false, + "doc:sourceSpec": "OAS 2.0" }, { "@id": "#/any/schema", diff --git a/amf-cli/shared/src/test/resources/cycle/jsonschema/draft-7/jsonld/content.jsonld b/amf-cli/shared/src/test/resources/cycle/jsonschema/draft-7/jsonld/content.jsonld index 78fe2efd6d..75e95df3f5 100644 --- a/amf-cli/shared/src/test/resources/cycle/jsonschema/draft-7/jsonld/content.jsonld +++ b/amf-cli/shared/src/test/resources/cycle/jsonschema/draft-7/jsonld/content.jsonld @@ -5,7 +5,8 @@ "@type": [ "doc:BaseUnitProcessingData" ], - "doc:transformed": false + "doc:transformed": false, + "doc:sourceSpec": "OAS 2.0" }, { "@id": "#/scalar/main", diff --git a/amf-cli/shared/src/test/resources/cycle/jsonschema/draft-7/jsonld/required-dependencies.jsonld b/amf-cli/shared/src/test/resources/cycle/jsonschema/draft-7/jsonld/required-dependencies.jsonld index ef224d10aa..6c66e7e7a2 100644 --- a/amf-cli/shared/src/test/resources/cycle/jsonschema/draft-7/jsonld/required-dependencies.jsonld +++ b/amf-cli/shared/src/test/resources/cycle/jsonschema/draft-7/jsonld/required-dependencies.jsonld @@ -5,7 +5,8 @@ "@type": [ "doc:BaseUnitProcessingData" ], - "doc:transformed": false + "doc:transformed": false, + "doc:sourceSpec": "OAS 2.0" }, { "@id": "#/shape/main", diff --git a/amf-cli/shared/src/test/resources/cycle/jsonschema/draft-7/jsonld/schema-dependencies-ref.jsonld b/amf-cli/shared/src/test/resources/cycle/jsonschema/draft-7/jsonld/schema-dependencies-ref.jsonld index 34cfa514c8..05948744be 100644 --- a/amf-cli/shared/src/test/resources/cycle/jsonschema/draft-7/jsonld/schema-dependencies-ref.jsonld +++ b/amf-cli/shared/src/test/resources/cycle/jsonschema/draft-7/jsonld/schema-dependencies-ref.jsonld @@ -5,7 +5,8 @@ "@type": [ "doc:BaseUnitProcessingData" ], - "doc:transformed": false + "doc:transformed": false, + "doc:sourceSpec": "OAS 2.0" }, { "@id": "#/shape/main", diff --git a/amf-cli/shared/src/test/resources/cycle/jsonschema/draft-7/jsonld/schema-dependencies.jsonld b/amf-cli/shared/src/test/resources/cycle/jsonschema/draft-7/jsonld/schema-dependencies.jsonld index bc246e8b7d..c49a8c6394 100644 --- a/amf-cli/shared/src/test/resources/cycle/jsonschema/draft-7/jsonld/schema-dependencies.jsonld +++ b/amf-cli/shared/src/test/resources/cycle/jsonschema/draft-7/jsonld/schema-dependencies.jsonld @@ -5,7 +5,8 @@ "@type": [ "doc:BaseUnitProcessingData" ], - "doc:transformed": false + "doc:transformed": false, + "doc:sourceSpec": "OAS 2.0" }, { "@id": "#/shape/main", diff --git a/amf-cli/shared/src/test/resources/cycle/jsonschema/draft-7/jsonld/with-id.jsonld b/amf-cli/shared/src/test/resources/cycle/jsonschema/draft-7/jsonld/with-id.jsonld index e46ab81376..6a6592eb72 100644 --- a/amf-cli/shared/src/test/resources/cycle/jsonschema/draft-7/jsonld/with-id.jsonld +++ b/amf-cli/shared/src/test/resources/cycle/jsonschema/draft-7/jsonld/with-id.jsonld @@ -5,7 +5,8 @@ "@type": [ "doc:BaseUnitProcessingData" ], - "doc:transformed": false + "doc:transformed": false, + "doc:sourceSpec": "OAS 2.0" }, { "@id": "#/any/schema", 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 f6b90e5190..5ea458cdf8 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/parser/array-type-expressions/base-type-array.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/parser/array-type-expressions/base-type-array.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/parser/array-type-expressions/base-type-array.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 17a55cc86b..b84a9b8d4a 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/parser/array-type-expressions/base-type-array.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/parser/array-type-expressions/base-type-array.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/parser/array-type-expressions/base-type-array.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/parser/array-type-expressions/base-type-array.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/parser/array-type-expressions/base-type-array.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/parser/array-type-expressions/base-type-array.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/parser/array-type-expressions/base-type-array.raml#/web-api", 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 bb89efa389..c8ec1e9aec 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/parser/array-type-expressions/matrix-type-array.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/parser/array-type-expressions/matrix-type-array.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/parser/array-type-expressions/matrix-type-array.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 8c511769e9..924865262f 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/parser/array-type-expressions/matrix-type-array.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/parser/array-type-expressions/matrix-type-array.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/parser/array-type-expressions/matrix-type-array.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/parser/array-type-expressions/matrix-type-array.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/parser/array-type-expressions/matrix-type-array.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/parser/array-type-expressions/matrix-type-array.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/parser/array-type-expressions/matrix-type-array.raml#/web-api", 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 358f23b3e2..4ffa86ce3d 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/parser/array-type-expressions/type-expression-with-inheritance.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/parser/array-type-expressions/type-expression-with-inheritance.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/parser/array-type-expressions/type-expression-with-inheritance.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 c898e25d29..b8363125fb 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/parser/array-type-expressions/type-expression-with-inheritance.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/parser/array-type-expressions/type-expression-with-inheritance.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/parser/array-type-expressions/type-expression-with-inheritance.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/parser/array-type-expressions/type-expression-with-inheritance.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/parser/array-type-expressions/type-expression-with-inheritance.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/parser/array-type-expressions/type-expression-with-inheritance.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/parser/array-type-expressions/type-expression-with-inheritance.raml#/web-api", 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 b120027b91..9eefd783a6 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/parser/array-type-expressions/union-type-array.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/parser/array-type-expressions/union-type-array.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/parser/array-type-expressions/union-type-array.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 2ed2d1ad7a..6d994e462a 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/parser/array-type-expressions/union-type-array.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/parser/array-type-expressions/union-type-array.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/parser/array-type-expressions/union-type-array.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/parser/array-type-expressions/union-type-array.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/parser/array-type-expressions/union-type-array.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/parser/array-type-expressions/union-type-array.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/parser/array-type-expressions/union-type-array.raml#/web-api", 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 9c8a2bc2f1..c5d06b26e6 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/parser/union-expressions/child-declaration-links.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/parser/union-expressions/child-declaration-links.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/parser/union-expressions/child-declaration-links.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 d536ccb76c..d09dbe126a 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/parser/union-expressions/child-declaration-links.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/parser/union-expressions/child-declaration-links.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/parser/union-expressions/child-declaration-links.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/parser/union-expressions/child-declaration-links.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/parser/union-expressions/child-declaration-links.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/parser/union-expressions/child-declaration-links.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/parser/union-expressions/child-declaration-links.raml#/web-api", 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 ceeb7b36ce..f431837578 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/parser/union-expressions/union-right-declaration.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/parser/union-expressions/union-right-declaration.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/parser/union-expressions/union-right-declaration.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 5d0a1c606d..195048bd34 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/parser/union-expressions/union-right-declaration.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/parser/union-expressions/union-right-declaration.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/parser/union-expressions/union-right-declaration.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/parser/union-expressions/union-right-declaration.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/parser/union-expressions/union-right-declaration.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/parser/union-expressions/union-right-declaration.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/parser/union-expressions/union-right-declaration.raml#/web-api", 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 bab9f81800..4aa812cedf 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/parser/union-with-lib/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/parser/union-with-lib/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/parser/union-with-lib/api.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -388,7 +373,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -401,21 +386,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/parser/union-with-lib/api.raml#/references/0/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/parser/union-with-lib/api.raml#/references/0" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/parser/union-with-lib/api.raml#/references/0/source-map/lexical/element_0", 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 01a5cea1cf..9b8ac705d6 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/parser/union-with-lib/api.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/parser/union-with-lib/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/parser/union-with-lib/api.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/parser/union-with-lib/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/parser/union-with-lib/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/parser/union-with-lib/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/parser/union-with-lib/api.raml#/web-api", @@ -198,18 +188,13 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/parser/union-with-lib/api.raml#/references/0/source-map", "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/parser/union-with-lib/api.raml#/references/0/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/parser/union-with-lib/api.raml#/references/0/source-map/lexical/element_0" @@ -373,11 +358,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/parser/union-with-lib/api.raml#/references/0/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/parser/union-with-lib/api.raml#/references/0", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/parser/union-with-lib/api.raml#/references/0/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/parser/union-with-lib/api.raml#/references/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 9a133f8de5..bfae761d10 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 @@ -663,21 +663,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/enum-id-with-applied-trait/api.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/enum-id-with-applied-trait/api.raml/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/enum-id-with-applied-trait/api.raml/web-api#/source-map/lexical/element_1", @@ -731,7 +716,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 648c4da2ad..ac411eed45 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/production/enum-id-with-applied-trait/api.raml/web-api", @@ -52,11 +52,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/enum-id-with-applied-trait/api.raml/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/enum-id-with-applied-trait/api.raml/web-api#/source-map/lexical/element_1" @@ -98,11 +93,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/enum-id-with-applied-trait/api.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/enum-id-with-applied-trait/api.raml/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/production/enum-id-with-applied-trait/api.raml/web-api#/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/enum-id-with-applied-trait/api.raml/web-api", 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 8df798cfa9..8dd690b26b 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 @@ -793,9 +793,6 @@ } ], "smaps": { - "source-vendor": { - "#34": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(4,0)]", "#34": "[(2,0)-(35,22)]" @@ -824,7 +821,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 47969d34e2..6c670a77b6 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#34", @@ -27,9 +27,6 @@ } ], "smaps": { - "source-vendor": { - "#34": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(4,0)]", "#34": "[(2,0)-(35,22)]" 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 ccef5c02b1..879008c37b 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 @@ -837,21 +837,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/example-in-union.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/example-in-union.raml/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/example-in-union.raml/web-api#/source-map/lexical/element_3", @@ -931,7 +916,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 75fc5dfc87..47c41ebe9e 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/production/example-in-union.raml/web-api", @@ -71,11 +71,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/example-in-union.raml/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/example-in-union.raml/web-api#/source-map/lexical/element_3" @@ -139,11 +134,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/example-in-union.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/example-in-union.raml/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/production/example-in-union.raml/web-api#/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#server", 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 c1740ebd0c..fdd2a04335 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 @@ -21284,21 +21284,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/googleapis.compredictionv1.2swagger.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/googleapis.compredictionv1.2swagger.raml/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/googleapis.compredictionv1.2swagger.raml/web-api#/source-map/lexical/element_5", @@ -21404,7 +21389,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 7b3d422e4b..bf01990fe1 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/production/googleapis.compredictionv1.2swagger.raml/web-api", @@ -280,11 +280,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/googleapis.compredictionv1.2swagger.raml/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/googleapis.compredictionv1.2swagger.raml/web-api#/source-map/lexical/element_5" @@ -922,11 +917,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/googleapis.compredictionv1.2swagger.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/googleapis.compredictionv1.2swagger.raml/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/production/googleapis.compredictionv1.2swagger.raml/web-api#/source-map/lexical/element_5", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#scheme", 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 a0e9731ab9..bd95e97bd3 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 @@ -430,21 +430,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/inherits-resolution-declares/add-facet.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/inherits-resolution-declares/add-facet.raml/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/inherits-resolution-declares/add-facet.raml/web-api#/source-map/lexical/element_2", @@ -511,7 +496,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 58e6c945f2..c01c53f8b1 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/production/inherits-resolution-declares/add-facet.raml/web-api", @@ -53,11 +53,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/inherits-resolution-declares/add-facet.raml/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/inherits-resolution-declares/add-facet.raml/web-api#/source-map/lexical/element_2" @@ -102,11 +97,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/inherits-resolution-declares/add-facet.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/inherits-resolution-declares/add-facet.raml/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/production/inherits-resolution-declares/add-facet.raml/web-api#/source-map/lexical/element_2", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#name", 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 016f35a695..87a9a5aac8 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 @@ -394,21 +394,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/inherits-resolution-declares/test-ramlfragment.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/inherits-resolution-declares/test-ramlfragment.raml/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/inherits-resolution-declares/test-ramlfragment.raml/web-api#/source-map/lexical/element_3", @@ -488,7 +473,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -714,21 +699,6 @@ ] } ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/inherits-resolution-declares/test-ramlfragment.raml#/references/0/shape/type/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/inherits-resolution-declares/test-ramlfragment.raml#/references/0/shape/type" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#inline-element": [ { "@id": "file://amf-cli/shared/src/test/resources/production/inherits-resolution-declares/test-ramlfragment.raml#/references/0/shape/type/source-map/inline-element/element_0", 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 14f1b8a486..78ceea67fa 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/production/inherits-resolution-declares/test-ramlfragment.raml/web-api", @@ -92,11 +92,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/inherits-resolution-declares/test-ramlfragment.raml/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/inherits-resolution-declares/test-ramlfragment.raml/web-api#/source-map/lexical/element_3" @@ -192,11 +187,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/inherits-resolution-declares/test-ramlfragment.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/inherits-resolution-declares/test-ramlfragment.raml/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/production/inherits-resolution-declares/test-ramlfragment.raml/web-api#/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#server", @@ -415,11 +405,6 @@ "@id": "file://amf-cli/shared/src/test/resources/production/inherits-resolution-declares/test-ramlfragment.raml#/references/0/shape/type/source-map/synthesized-field/element_0" } ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/inherits-resolution-declares/test-ramlfragment.raml#/references/0/shape/type/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/inherits-resolution-declares/test-ramlfragment.raml#/references/0/shape/type/source-map/lexical/element_0" @@ -489,11 +474,6 @@ "http://a.ml/vocabularies/document-source-maps#element": "http://www.w3.org/ns/shacl#closed", "http://a.ml/vocabularies/document-source-maps#value": "true" }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/inherits-resolution-declares/test-ramlfragment.raml#/references/0/shape/type/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/inherits-resolution-declares/test-ramlfragment.raml#/references/0/shape/type", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/production/inherits-resolution-declares/test-ramlfragment.raml#/references/0/shape/type/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/inherits-resolution-declares/test-ramlfragment.raml#/references/0/shape/type", 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 8d7fac14df..bb7611beec 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 @@ -2455,9 +2455,6 @@ } ], "smaps": { - "source-vendor": { - "#5": "RAML 1.0" - }, "lexical": { "core:version": "[(5,0)-(7,0)]", "core:name": "[(4,0)-(5,0)]", @@ -2488,7 +2485,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 ba32830656..9adbac65de 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 @@ -299,9 +299,6 @@ } ], "smaps": { - "source-vendor": { - "#10": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(4,0)]", "#10": "[(2,0)-(8,14)]" @@ -330,7 +327,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } @@ -502,7 +499,7 @@ "@value": "3.2.0" } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } @@ -510,9 +507,6 @@ } ], "smaps": { - "source-vendor": { - "#1": "RAML 1.0" - }, "lexical": { "#1": "[(1,0)-(6,12)]" } 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 87f0418f61..0f40e823c3 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#10", @@ -24,9 +24,6 @@ } ], "smaps": { - "source-vendor": { - "#10": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(4,0)]", "#10": "[(2,0)-(8,14)]" @@ -312,9 +309,6 @@ "@id": "#8" }, "smaps": { - "source-vendor": { - "#1": "RAML 1.0" - }, "lexical": { "#1": "[(1,0)-(6,12)]" } @@ -326,7 +320,7 @@ "doc:APIContractProcessingData" ], "apiContract:modelVersion": "3.2.0", - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" } ], "@context": { 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 6bfdd23f09..68e156c66d 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 @@ -26,7 +26,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } @@ -34,9 +34,6 @@ } ], "smaps": { - "source-vendor": { - "": "RAML 1.0" - }, "lexical": { "": "[(1,0)-(26,21)]" } 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 ca0712dd13..cdc6e6f195 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "", @@ -37,9 +37,6 @@ "@id": "#15" }, "smaps": { - "source-vendor": { - "": "RAML 1.0" - }, "lexical": { "": "[(1,0)-(26,21)]" } 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 d42311b2cc..d57bd34518 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 @@ -382,21 +382,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/microsoft_azure_blob_service.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/microsoft_azure_blob_service.raml/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/microsoft_azure_blob_service.raml/web-api#/source-map/lexical/element_2", @@ -463,7 +448,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 03281dba14..c7e9687497 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/production/microsoft_azure_blob_service.raml/web-api", @@ -53,11 +53,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/microsoft_azure_blob_service.raml/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/microsoft_azure_blob_service.raml/web-api#/source-map/lexical/element_2" @@ -102,11 +97,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/microsoft_azure_blob_service.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/microsoft_azure_blob_service.raml/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/production/microsoft_azure_blob_service.raml/web-api#/source-map/lexical/element_2", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#name", 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 94de110372..ce05cdd1db 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 @@ -3048,21 +3048,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/oas-complex-example/spec/swagger.json/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/oas-complex-example/spec/swagger.json/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/oas-complex-example/spec/swagger.json/web-api#/source-map/lexical/element_8", @@ -3207,7 +3192,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 d4819d58af..1788a679cd 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/production/oas-complex-example/spec/swagger.json/web-api", @@ -146,11 +146,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/oas-complex-example/spec/swagger.json/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/oas-complex-example/spec/swagger.json/web-api#/source-map/lexical/element_8" @@ -401,11 +396,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/oas-complex-example/spec/swagger.json/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/oas-complex-example/spec/swagger.json/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/production/oas-complex-example/spec/swagger.json/web-api#/source-map/lexical/element_8", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#license", 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 2c49b7d74c..772e34d834 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 @@ -4157,21 +4157,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/oas-example.json/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/oas-example.json/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/oas-example.json/web-api#/source-map/lexical/element_3", @@ -4251,7 +4236,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 72e85b17a6..e7df61414a 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/production/oas-example.json/web-api", @@ -53,11 +53,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/oas-example.json/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/oas-example.json/web-api#/source-map/lexical/element_3" @@ -107,11 +102,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/oas-example.json/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/oas-example.json/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/production/oas-example.json/web-api#/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 eed821670e..dfd5e25216 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 @@ -2194,21 +2194,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/oas-multiple-example.json/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/oas-multiple-example.json/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/oas-multiple-example.json/web-api#/source-map/lexical/element_4", @@ -2301,7 +2286,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 debc2ee330..73a926e5eb 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/production/oas-multiple-example.json/web-api", @@ -138,11 +138,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/oas-multiple-example.json/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/oas-multiple-example.json/web-api#/source-map/lexical/element_4" @@ -331,11 +326,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/oas-multiple-example.json/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/oas-multiple-example.json/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/production/oas-multiple-example.json/web-api#/source-map/lexical/element_4", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 ee05395d9b..dfbaede899 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 @@ -1030,9 +1030,6 @@ } ], "smaps": { - "source-vendor": { - "#34": "OAS 2.0" - }, "lexical": { "apiContract:endpoint": "[(29,2)-(156,3)]", "core:description": "[(5,4)-(5,51)]", @@ -1064,7 +1061,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "OAS 2.0" } 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 eb6b7449c3..ed35cfff88 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "OAS 2.0" + "doc:sourceSpec": "OAS 2.0" }, { "@id": "#34", @@ -38,9 +38,6 @@ } ], "smaps": { - "source-vendor": { - "#34": "OAS 2.0" - }, "lexical": { "apiContract:endpoint": "[(29,2)-(156,3)]", "core:description": "[(5,4)-(5,51)]", 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 7fe76c6b05..94e63cb64e 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 @@ -399,21 +399,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/oas20/xml-payload.json/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/oas20/xml-payload.json/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/oas20/xml-payload.json/web-api#/source-map/lexical/element_3", @@ -493,7 +478,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 dcc60f0331..07970c23a0 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/production/oas20/xml-payload.json/web-api", @@ -53,11 +53,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/oas20/xml-payload.json/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/oas20/xml-payload.json/web-api#/source-map/lexical/element_3" @@ -103,11 +98,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/oas20/xml-payload.json/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/oas20/xml-payload.json/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/production/oas20/xml-payload.json/web-api#/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 347d4b86af..dfb2644700 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 @@ -201,21 +201,6 @@ } ] } - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml08/definitions-loops-crossfiles/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/raml08/definitions-loops-crossfiles/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 0.8" - } - ] - } ] } ] @@ -237,7 +222,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 0.8" } 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 b235b9b641..43a0131852 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 0.8" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 0.8" }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml08/definitions-loops-crossfiles/api.raml#/web-api", @@ -80,11 +80,6 @@ { "@id": "file://amf-cli/shared/src/test/resources/production/raml08/definitions-loops-crossfiles/api.raml#/web-api/source-map/lexical/element_4" } - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml08/definitions-loops-crossfiles/api.raml#/web-api/source-map/source-vendor/element_0" - } ] }, { @@ -143,11 +138,6 @@ "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#server", "http://a.ml/vocabularies/document-source-maps#value": "[(4,0)-(5,0)]" }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml08/definitions-loops-crossfiles/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml08/definitions-loops-crossfiles/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 0.8" - }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml08/definitions-loops-crossfiles/api.raml#/web-api/server/https%3A%2F%2Fdomain.test.com%2F/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#urlTemplate", 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 13752b829d..69ea909158 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 @@ -472,21 +472,6 @@ } ] } - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml08/definitions-loops-crossfiles2/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/raml08/definitions-loops-crossfiles2/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 0.8" - } - ] - } ] } ] @@ -508,7 +493,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 0.8" } 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 0ff673a654..8a069f2f68 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 0.8" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 0.8" }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml08/definitions-loops-crossfiles2/api.raml#/web-api", @@ -103,11 +103,6 @@ { "@id": "file://amf-cli/shared/src/test/resources/production/raml08/definitions-loops-crossfiles2/api.raml#/web-api/source-map/lexical/element_4" } - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml08/definitions-loops-crossfiles2/api.raml#/web-api/source-map/source-vendor/element_0" - } ] }, { @@ -198,11 +193,6 @@ "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#server", "http://a.ml/vocabularies/document-source-maps#value": "[(4,0)-(5,0)]" }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml08/definitions-loops-crossfiles2/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml08/definitions-loops-crossfiles2/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 0.8" - }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml08/definitions-loops-crossfiles2/api.raml#/web-api/server/https%3A%2F%2Fdomain.test.com%2F/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#urlTemplate", 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 737df217c5..49bca57136 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 @@ -201,21 +201,6 @@ } ] } - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml08/definitions-loops/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/raml08/definitions-loops/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 0.8" - } - ] - } ] } ] @@ -237,7 +222,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 0.8" } 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 a9fc66bb06..8f18617f4c 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 0.8" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 0.8" }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml08/definitions-loops/api.raml#/web-api", @@ -80,11 +80,6 @@ { "@id": "file://amf-cli/shared/src/test/resources/production/raml08/definitions-loops/api.raml#/web-api/source-map/lexical/element_4" } - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml08/definitions-loops/api.raml#/web-api/source-map/source-vendor/element_0" - } ] }, { @@ -143,11 +138,6 @@ "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#server", "http://a.ml/vocabularies/document-source-maps#value": "[(4,0)-(5,0)]" }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml08/definitions-loops/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml08/definitions-loops/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 0.8" - }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml08/definitions-loops/api.raml#/web-api/server/https%3A%2F%2Fdomain.test.com%2F/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#urlTemplate", 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 f7e12b6d7c..e287d3dcf6 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 @@ -3387,21 +3387,6 @@ } ] } - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml08/lock-unlock/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/raml08/lock-unlock/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 0.8" - } - ] - } ] } ] @@ -3423,7 +3408,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 0.8" } 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 1e448424c5..2ec9f61fa2 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 0.8" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 0.8" }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml08/lock-unlock/api.raml#/web-api", @@ -136,11 +136,6 @@ { "@id": "file://amf-cli/shared/src/test/resources/production/raml08/lock-unlock/api.raml#/web-api/source-map/lexical/element_4" } - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml08/lock-unlock/api.raml#/web-api/source-map/source-vendor/element_0" - } ] }, { @@ -316,11 +311,6 @@ "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#accepts", "http://a.ml/vocabularies/document-source-maps#value": "[(5,0)-(7,0)]" }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml08/lock-unlock/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml08/lock-unlock/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 0.8" - }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml08/lock-unlock/api.raml#/web-api/endpoint/%2Fstores/supportedOperation/get/expects/request", "@type": [ 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 dbd9b8b9fd..3f22bf3f9a 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 @@ -8243,21 +8243,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/web-api/source-map/lexical/element_4", @@ -8345,7 +8330,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -9895,21 +9880,6 @@ ] } ], - "http://a.ml/vocabularies/document-source-maps#type-property-lexical-info": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/0/shape/type/source-map/type-property-lexical-info/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/0/shape/type" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "[(3,0)-(3,4)]" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/0/shape/type/source-map/lexical/element_1", @@ -9938,9 +9908,9 @@ ] } ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ + "http://a.ml/vocabularies/document-source-maps#type-property-lexical-info": [ { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/0/shape/type/source-map/source-vendor/element_0", + "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/0/shape/type/source-map/type-property-lexical-info/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { "@value": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/0/shape/type" @@ -9948,7 +9918,7 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "RAML 1.0" + "@value": "[(3,0)-(3,4)]" } ] } @@ -9973,7 +9943,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -10027,29 +9997,6 @@ { "@value": "application/yaml" } - ], - "http://a.ml/vocabularies/document-source-maps#sources": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/1/external/source-map", - "@type": [ - "http://a.ml/vocabularies/document-source-maps#SourceMap" - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/1/external/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/1/external" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ] - } ] } ], @@ -10069,7 +10016,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -10123,29 +10070,6 @@ { "@value": "application/yaml" } - ], - "http://a.ml/vocabularies/document-source-maps#sources": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/2/external/source-map", - "@type": [ - "http://a.ml/vocabularies/document-source-maps#SourceMap" - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/2/external/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/2/external" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ] - } ] } ], @@ -10165,7 +10089,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -10219,29 +10143,6 @@ { "@value": "application/yaml" } - ], - "http://a.ml/vocabularies/document-source-maps#sources": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/3/external/source-map", - "@type": [ - "http://a.ml/vocabularies/document-source-maps#SourceMap" - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/3/external/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/3/external" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ] - } ] } ], @@ -10261,7 +10162,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 4fdff8b948..4c2ed1aadd 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/web-api", @@ -111,11 +111,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/web-api/source-map/lexical/element_4" @@ -330,11 +325,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/web-api/source-map/lexical/element_4", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#server", @@ -6453,7 +6443,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/0/source-map", @@ -6473,12 +6463,7 @@ "http://a.ml/vocabularies/document#DomainElement" ], "http://a.ml/vocabularies/document#raw": "#%RAML 1.0 NamedExample\nvalue:\n - \n ID: 1 \n code: ER38sd\n price: 400\n departureDate: 2017/07/26\n origin: CLE\n destination: SFO\n emptySeats: 0\n plane: \n type: Boeing 737\n totalSeats: 150\n - \n ID: 2 \n code: ER45if\n price: 540.99\n departureDate: 2017/07/27\n origin: SFO\n destination: ORD\n emptySeats: 54\n plane: \n type: Boeing 777\n totalSeats: 300\n", - "http://a.ml/vocabularies/core#mediaType": "application/yaml", - "http://a.ml/vocabularies/document-source-maps#sources": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/1/external/source-map" - } - ] + "http://a.ml/vocabularies/core#mediaType": "application/yaml" }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/1/BaseUnitProcessingData", @@ -6486,7 +6471,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/1/source-map", @@ -6506,12 +6491,7 @@ "http://a.ml/vocabularies/document#DomainElement" ], "http://a.ml/vocabularies/document#raw": "#%RAML 1.0 NamedExample\nvalue:\n code: GQ574\n price: 399\n departureDate: 2016/12/20\n origin: ORD\n destination: SFO\n emptySeats: 200\n plane:\n type: Boeing 747\n totalSeats: 400", - "http://a.ml/vocabularies/core#mediaType": "application/yaml", - "http://a.ml/vocabularies/document-source-maps#sources": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/2/external/source-map" - } - ] + "http://a.ml/vocabularies/core#mediaType": "application/yaml" }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/2/BaseUnitProcessingData", @@ -6519,7 +6499,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/2/source-map", @@ -6539,12 +6519,7 @@ "http://a.ml/vocabularies/document#DomainElement" ], "http://a.ml/vocabularies/document#raw": "#%RAML 1.0 NamedExample\nvalue:\n ID: 1\n code: GQ574\n price: 399\n departureDate: 2016/12/20\n origin: ORD\n destination: SFO\n emptySeats: 200\n plane:\n type: Boeing 747\n totalSeats: 400", - "http://a.ml/vocabularies/core#mediaType": "application/yaml", - "http://a.ml/vocabularies/document-source-maps#sources": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/3/external/source-map" - } - ] + "http://a.ml/vocabularies/core#mediaType": "application/yaml" }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/3/BaseUnitProcessingData", @@ -6552,7 +6527,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/3/source-map", @@ -6793,11 +6768,6 @@ "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/0/shape/type/source-map/synthesized-field/element_0" } ], - "http://a.ml/vocabularies/document-source-maps#type-property-lexical-info": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/0/shape/type/source-map/type-property-lexical-info/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/0/shape/type/source-map/lexical/element_1" @@ -6806,9 +6776,9 @@ "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/0/shape/type/source-map/lexical/element_0" } ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ + "http://a.ml/vocabularies/document-source-maps#type-property-lexical-info": [ { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/0/shape/type/source-map/source-vendor/element_0" + "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/0/shape/type/source-map/type-property-lexical-info/element_0" } ] }, @@ -6817,49 +6787,16 @@ "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/0", "http://a.ml/vocabularies/document-source-maps#value": "[(1,0)-(18,0)]" }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/1/external/source-map", - "@type": [ - "http://a.ml/vocabularies/document-source-maps#SourceMap" - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/1/external/source-map/source-vendor/element_0" - } - ] - }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/1/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/1", "http://a.ml/vocabularies/document-source-maps#value": "[(1,0)-(25,0)]" }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/2/external/source-map", - "@type": [ - "http://a.ml/vocabularies/document-source-maps#SourceMap" - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/2/external/source-map/source-vendor/element_0" - } - ] - }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/2/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/2", "http://a.ml/vocabularies/document-source-maps#value": "[(1,0)-(11,19)]" }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/3/external/source-map", - "@type": [ - "http://a.ml/vocabularies/document-source-maps#SourceMap" - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/3/external/source-map/source-vendor/element_0" - } - ] - }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/3/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/3", @@ -7238,11 +7175,6 @@ "http://a.ml/vocabularies/document-source-maps#element": "http://www.w3.org/ns/shacl#closed", "http://a.ml/vocabularies/document-source-maps#value": "true" }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/0/shape/type/source-map/type-property-lexical-info/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/0/shape/type", - "http://a.ml/vocabularies/document-source-maps#value": "[(3,0)-(3,4)]" - }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/0/shape/type/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/0/shape/type", @@ -7254,24 +7186,9 @@ "http://a.ml/vocabularies/document-source-maps#value": "[(4,11)-(18,0)]" }, { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/0/shape/type/source-map/source-vendor/element_0", + "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/0/shape/type/source-map/type-property-lexical-info/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/0/shape/type", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/1/external/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/1/external", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/2/external/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/2/external", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/3/external/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/3/external", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" + "http://a.ml/vocabularies/document-source-maps#value": "[(3,0)-(3,4)]" }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/american-flights-api/api.raml#/references/0/shape/type/property/property/ID/scalar/ID%3F/source-map", 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 f4cf3c666b..431c5c7367 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 @@ -10108,21 +10108,6 @@ } ] } - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } ] } ] @@ -10144,7 +10129,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -35096,7 +35081,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -35109,21 +35094,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/0/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/0" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/0/source-map/lexical/element_1", @@ -36986,21 +36956,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/1/references/0/trait/default-abstract/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/1/references/0/trait/default-abstract" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/1/references/0/trait/default-abstract/source-map/lexical/element_1", @@ -37054,7 +37009,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -37482,21 +37437,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/1/references/1/trait/default-abstract/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/1/references/1/trait/default-abstract" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/1/references/1/trait/default-abstract/source-map/lexical/element_1", @@ -37550,7 +37490,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -39551,21 +39491,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/3/trait/default-abstract/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/3/trait/default-abstract" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/3/trait/default-abstract/source-map/lexical/element_1", @@ -39619,7 +39544,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -40136,21 +40061,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/1/references/3/trait/default-abstract/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/1/references/3/trait/default-abstract" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/1/references/3/trait/default-abstract/source-map/lexical/element_1", @@ -40204,7 +40114,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -40270,7 +40180,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -40325,21 +40235,6 @@ } ] } - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/1/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/1" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } ] } ] @@ -40991,21 +40886,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/2/scheme/fragment/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/2/scheme/fragment" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/2/scheme/fragment/source-map/lexical/element_6", @@ -41119,7 +40999,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -43107,21 +42987,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/3/trait/default-abstract/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/3/trait/default-abstract" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/3/trait/default-abstract/source-map/lexical/element_1", @@ -43175,7 +43040,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 89f0b16a1e..c435f47cdb 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/web-api", @@ -480,11 +480,6 @@ { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/web-api/source-map/lexical/element_5" } - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/web-api/source-map/source-vendor/element_0" - } ] }, { @@ -1548,11 +1543,6 @@ "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#accepts", "http://a.ml/vocabularies/document-source-maps#value": "[(5,0)-(7,0)]" }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/web-api/server/acme-banking.com%2Fapis/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#urlTemplate", @@ -8950,18 +8940,13 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/0/source-map", "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/0/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/0/source-map/lexical/element_1" @@ -9120,7 +9105,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/1/source-map", @@ -9139,11 +9124,6 @@ { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/1/source-map/lexical/element_0" } - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/1/source-map/source-vendor/element_0" - } ] }, { @@ -9187,7 +9167,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/2/source-map", @@ -9222,7 +9202,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/3/source-map", @@ -12794,11 +12774,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/0/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/0", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/0/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/0", @@ -12947,7 +12922,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/1/references/0/source-map", @@ -12985,7 +12960,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/1/references/1/source-map", @@ -13023,7 +12998,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/1/references/3/source-map", @@ -13054,11 +13029,6 @@ "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/document#usage", "http://a.ml/vocabularies/document-source-maps#value": "[(3,0)-(5,0)]" }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/1/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/1", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/2/scheme/fragment/header/parameter/header/Authorization", "@type": [ @@ -13157,11 +13127,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/2/scheme/fragment/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/2/scheme/fragment/source-map/lexical/element_6" @@ -13216,11 +13181,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/3/trait/default-abstract/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/3/trait/default-abstract/source-map/lexical/element_1" @@ -19114,11 +19074,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/1/references/0/trait/default-abstract/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/1/references/0/trait/default-abstract/source-map/lexical/element_1" @@ -19160,11 +19115,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/1/references/1/trait/default-abstract/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/1/references/1/trait/default-abstract/source-map/lexical/element_1" @@ -19206,11 +19156,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/1/references/3/trait/default-abstract/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/1/references/3/trait/default-abstract/source-map/lexical/element_1" @@ -19374,11 +19319,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/2/scheme/fragment/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/2/scheme/fragment", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/2/scheme/fragment/source-map/lexical/element_6", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#response", @@ -19473,11 +19413,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/3/trait/default-abstract/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/3/trait/default-abstract", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/3/trait/default-abstract/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/3/trait/default-abstract", @@ -24022,11 +23957,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/1/references/0/trait/default-abstract/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/1/references/0/trait/default-abstract", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/1/references/0/trait/default-abstract/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/1/references/0/trait/default-abstract", @@ -24073,11 +24003,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/1/references/1/trait/default-abstract/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/1/references/1/trait/default-abstract", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/1/references/1/trait/default-abstract/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/1/references/1/trait/default-abstract", @@ -24124,11 +24049,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/1/references/3/trait/default-abstract/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/1/references/3/trait/default-abstract", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/1/references/3/trait/default-abstract/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/banking-api/api.raml#/references/1/references/3/trait/default-abstract", 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 901e5c1244..0913b5ba63 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 @@ -10987,21 +10987,6 @@ } ] } - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/demo-api/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/raml10/demo-api/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } ] } ] @@ -11023,7 +11008,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 905979b93d..007928da31 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/demo-api/api.raml#/web-api", @@ -1044,11 +1044,6 @@ { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/demo-api/api.raml#/web-api/source-map/lexical/element_5" } - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/demo-api/api.raml#/web-api/source-map/source-vendor/element_0" - } ] }, { @@ -3305,11 +3300,6 @@ "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#accepts", "http://a.ml/vocabularies/document-source-maps#value": "[(6,0)-(9,0)]" }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/demo-api/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/demo-api/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/demo-api/api.raml#/web-api/server/https%3A%2F%2Fapi.mulesoft.com%2F%7Bversion%7D/variable/parameter/path/version/scalar/version", "@type": [ 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 7a6e401f18..e2c7d9831d 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/jsonchema-apiexternalexample/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/raml10/jsonchema-apiexternalexample/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/jsonchema-apiexternalexample/api.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 ced4d3f623..e739b7246c 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/jsonchema-apiexternalexample/api.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/jsonchema-apiexternalexample/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/jsonchema-apiexternalexample/api.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/jsonchema-apiexternalexample/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/jsonchema-apiexternalexample/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/jsonchema-apiexternalexample/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/jsonchema-apiexternalexample/api.raml#/web-api", 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 72b01f181f..04c5524e4f 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/jsonschema-apiwithfragmentref/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/raml10/jsonschema-apiwithfragmentref/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/jsonschema-apiwithfragmentref/api.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 a3c9a3a028..2b9ad9de77 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/jsonschema-apiwithfragmentref/api.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/jsonschema-apiwithfragmentref/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/jsonschema-apiwithfragmentref/api.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/jsonschema-apiwithfragmentref/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/jsonschema-apiwithfragmentref/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/jsonschema-apiwithfragmentref/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/jsonschema-apiwithfragmentref/api.raml#/web-api", 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 c3785abbf5..5b829f56dc 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/jsonschema/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/raml10/jsonschema/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/jsonschema/api.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 4e23594110..9e203bf329 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/jsonschema/api.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/jsonschema/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/jsonschema/api.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/jsonschema/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/jsonschema/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/jsonschema/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/jsonschema/api.raml#/web-api", 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 47471c5c79..da9467e66c 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 @@ -3707,21 +3707,6 @@ } ] } - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } ] } ] @@ -3743,7 +3728,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -6262,7 +6247,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -6275,21 +6260,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml#/references/0/references/0/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml#/references/0/references/0" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml#/references/0/references/0/source-map/lexical/element_1", @@ -6343,7 +6313,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -6371,21 +6341,6 @@ ] } ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml#/references/0/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml#/references/0" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml#/references/0/source-map/lexical/element_1", @@ -6455,29 +6410,6 @@ { "@value": "application/yaml" } - ], - "http://a.ml/vocabularies/document-source-maps#sources": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml#/references/1/external/source-map", - "@type": [ - "http://a.ml/vocabularies/document-source-maps#SourceMap" - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml#/references/1/external/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml#/references/1/external" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ] - } ] } ], @@ -6497,7 +6429,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 45c3f8793e..bc733b3b09 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml#/web-api", @@ -166,11 +166,6 @@ { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml#/web-api/source-map/lexical/element_4" } - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml#/web-api/source-map/source-vendor/element_0" - } ] }, { @@ -361,11 +356,6 @@ "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#server", "http://a.ml/vocabularies/document-source-maps#value": "[(2,0)-(3,0)]" }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml#/web-api/server/https%3A%2F%2Fmocksvc.mulesoft.com%2Fmocks%2Fe5686b9d-885a-4be9-b95f-f3cf607eb467/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#urlTemplate", @@ -3094,7 +3084,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml#/references/0/source-map", @@ -3106,11 +3096,6 @@ "@id": "file://amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml#/references/0/source-map/synthesized-field/element_0" } ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml#/references/0/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml#/references/0/source-map/lexical/element_1" @@ -3132,12 +3117,7 @@ "http://a.ml/vocabularies/document#DomainElement" ], "http://a.ml/vocabularies/document#raw": "#%RAML 1.0 NamedExample\nblah:\n - id: 8624\n addressType: STORE\n country: USA\n state: CA\n city: San Francisco\n street_address: 610 Old Mason Street\n zip: 94129\n - id: 8625\n addressType: STORE\n country: USA\n state: CA\n city: San Francisco\n street_address: 1590 Bryant St\n zip: 94103\n - id: 8626\n addressType: STORE\n country: USA\n state: CA\n city: Berkeley\n street_address: 2727 Milvia St\n zip: 94703", - "http://a.ml/vocabularies/core#mediaType": "application/yaml", - "http://a.ml/vocabularies/document-source-maps#sources": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml#/references/1/external/source-map" - } - ] + "http://a.ml/vocabularies/core#mediaType": "application/yaml" }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml#/references/1/BaseUnitProcessingData", @@ -3145,7 +3125,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml#/references/1/source-map", @@ -3536,18 +3516,13 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml#/references/0/references/0/source-map", "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml#/references/0/references/0/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml#/references/0/references/0/source-map/lexical/element_1" @@ -3562,11 +3537,6 @@ "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/document#references", "http://a.ml/vocabularies/document-source-maps#value": "true" }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml#/references/0/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml#/references/0", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml#/references/0/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml#/references/0", @@ -3582,17 +3552,6 @@ "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml#/references/0", "http://a.ml/vocabularies/document-source-maps#value": "address->file://amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml#/references/0/references/0::file://amf-cli/shared/src/test/resources/production/raml10/locations-api/exchange_modules/a6d4cdc7-ecb0-4315-a6a6-216c71ba0b54/commons-datatypes/1.0.0/locationTypes.raml::../../commons-datatypes/1.0.0/locationTypes.raml" }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml#/references/1/external/source-map", - "@type": [ - "http://a.ml/vocabularies/document-source-maps#SourceMap" - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml#/references/1/external/source-map/source-vendor/element_0" - } - ] - }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml#/references/1/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml#/references/1", @@ -4112,11 +4071,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml#/references/0/references/0/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml#/references/0/references/0", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml#/references/0/references/0/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml#/references/0/references/0", @@ -4127,11 +4081,6 @@ "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/document#usage", "http://a.ml/vocabularies/document-source-maps#value": "[(3,0)-(4,0)]" }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml#/references/1/external/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml#/references/1/external", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/locations-api/api.raml#/references/0/declares/shape/Location/property/property/id/scalar/id/source-map", "@type": [ 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 b28cc8da9a..56c66a855a 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/xsdexample/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/raml10/xsdexample/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/xsdexample/api.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 0be91b17ad..690e551f69 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/xsdexample/api.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/xsdexample/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/xsdexample/api.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/xsdexample/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/xsdexample/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/xsdexample/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/xsdexample/api.raml#/web-api", 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 4f19f12594..8381ca4875 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/xsdschema-withfragmentref/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/raml10/xsdschema-withfragmentref/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/xsdschema-withfragmentref/api.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 cd95d267fd..334bc14c38 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/xsdschema-withfragmentref/api.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/xsdschema-withfragmentref/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/xsdschema-withfragmentref/api.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/xsdschema-withfragmentref/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/xsdschema-withfragmentref/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/xsdschema-withfragmentref/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/xsdschema-withfragmentref/api.raml#/web-api", 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 4090b33bcc..f3712a697f 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/xsdschema/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/raml10/xsdschema/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/xsdschema/api.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 36596268d3..1673242082 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/xsdschema/api.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/xsdschema/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/xsdschema/api.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/raml10/xsdschema/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/xsdschema/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/production/raml10/xsdschema/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/raml10/xsdschema/api.raml#/web-api", 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 fc1c851260..56c78b8539 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 @@ -206,21 +206,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/recursive-union.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/recursive-union.raml/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/recursive-union.raml/web-api#/source-map/lexical/element_1", @@ -274,7 +259,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 4a759659b9..8762027d35 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/production/recursive-union.raml/web-api", @@ -52,11 +52,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/recursive-union.raml/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/recursive-union.raml/web-api#/source-map/lexical/element_1" @@ -98,11 +93,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/recursive-union.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/recursive-union.raml/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/production/recursive-union.raml/web-api#/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/recursive-union.raml/web-api", 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 1122aa6530..549c79d261 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 @@ -27,9 +27,6 @@ } ], "smaps": { - "source-vendor": { - "#15": "RAML 1.0" - }, "lexical": { "core:version": "[(4,0)-(5,0)]", "#15": "[(3,0)-(19,42)]", @@ -59,7 +56,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 32804ad955..51ca532237 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#15", @@ -20,9 +20,6 @@ "core:name": "STEP REST API V2", "core:version": "1.0.0", "smaps": { - "source-vendor": { - "#15": "RAML 1.0" - }, "lexical": { "core:version": "[(4,0)-(5,0)]", "#15": "[(3,0)-(19,42)]", 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 accb685f38..10fd3fc9f7 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 @@ -475,21 +475,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/resolution-dumpjsonld/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/resolution-dumpjsonld/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/resolution-dumpjsonld/api.raml#/web-api/source-map/lexical/element_1", @@ -538,7 +523,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 5697f63c0e..0201f1d038 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/production/resolution-dumpjsonld/api.raml#/web-api", @@ -54,11 +54,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/resolution-dumpjsonld/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/resolution-dumpjsonld/api.raml#/web-api/source-map/lexical/element_1" @@ -118,11 +113,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/resolution-dumpjsonld/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/resolution-dumpjsonld/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/production/resolution-dumpjsonld/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/resolution-dumpjsonld/api.raml#/web-api", 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 85f3081ad4..f0e40b55ca 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 @@ -333,21 +333,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/resolution-dumpjsonld/api.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/resolution-dumpjsonld/api.raml/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/resolution-dumpjsonld/api.raml/web-api#/source-map/lexical/element_1", @@ -401,7 +386,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 d105699373..d4a8a8bfdf 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/production/resolution-dumpjsonld/api.raml/web-api", @@ -55,11 +55,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/resolution-dumpjsonld/api.raml/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/resolution-dumpjsonld/api.raml/web-api#/source-map/lexical/element_1" @@ -119,11 +114,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/resolution-dumpjsonld/api.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/resolution-dumpjsonld/api.raml/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/production/resolution-dumpjsonld/api.raml/web-api#/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/resolution-dumpjsonld/api.raml/web-api", 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 980537d5d2..d6d9439490 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 @@ -122,9 +122,6 @@ } ], "smaps": { - "source-vendor": { - "#17": "RAML 1.0" - }, "lexical": { "core:version": "[(3,0)-(5,0)]", "#17": "[(2,0)-(27,24)]", @@ -154,7 +151,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 97305a9b8f..04ce7ad39a 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#17", @@ -25,9 +25,6 @@ } ], "smaps": { - "source-vendor": { - "#17": "RAML 1.0" - }, "lexical": { "core:version": "[(3,0)-(5,0)]", "#17": "[(2,0)-(27,24)]", 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 b1f222e87f..f664719a2c 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 @@ -122,9 +122,6 @@ } ], "smaps": { - "source-vendor": { - "#14": "RAML 1.0" - }, "lexical": { "core:version": "[(3,0)-(5,0)]", "#14": "[(2,0)-(27,24)]", @@ -154,7 +151,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 f90ad67470..8c2498d94c 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#14", @@ -25,9 +25,6 @@ } ], "smaps": { - "source-vendor": { - "#14": "RAML 1.0" - }, "lexical": { "core:version": "[(3,0)-(5,0)]", "#14": "[(2,0)-(27,24)]", diff --git a/amf-cli/shared/src/test/resources/production/union-type/api.raml.resolved b/amf-cli/shared/src/test/resources/production/union-type/api.raml.resolved index 4f419c9279..abb593f0ef 100644 --- a/amf-cli/shared/src/test/resources/production/union-type/api.raml.resolved +++ b/amf-cli/shared/src/test/resources/production/union-type/api.raml.resolved @@ -242,21 +242,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/union-type/api.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/union-type/api.raml/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/union-type/api.raml/web-api#/source-map/lexical/element_1", @@ -310,7 +295,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 b7e60dfced..45787bb580 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 @@ -4726,21 +4726,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/unions-example.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/production/unions-example.raml/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/unions-example.raml/web-api#/source-map/lexical/element_3", @@ -4820,7 +4805,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 7551bb842a..e488f8ec4f 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/production/unions-example.raml/web-api", @@ -71,11 +71,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/production/unions-example.raml/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/production/unions-example.raml/web-api#/source-map/lexical/element_3" @@ -144,11 +139,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/production/unions-example.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/production/unions-example.raml/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/production/unions-example.raml/web-api#/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#server", 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 9c93e23a43..703ebae169 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 @@ -33,21 +33,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/references/data-type-fragment.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/references/data-type-fragment.json#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/references/data-type-fragment.json#/web-api/source-map/lexical/element_3", @@ -122,7 +107,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } @@ -313,21 +298,6 @@ ] } ], - "http://a.ml/vocabularies/document-source-maps#type-property-lexical-info": [ - { - "@id": "file://amf-cli/shared/src/test/resources/references/data-type-fragment.json#/references/0/shape/type/source-map/type-property-lexical-info/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/references/data-type-fragment.json#/references/0/shape/type" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "[(3,2)-(3,8)]" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/references/data-type-fragment.json#/references/0/shape/type/source-map/lexical/element_1", @@ -356,9 +326,9 @@ ] } ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ + "http://a.ml/vocabularies/document-source-maps#type-property-lexical-info": [ { - "@id": "file://amf-cli/shared/src/test/resources/references/data-type-fragment.json#/references/0/shape/type/source-map/source-vendor/element_0", + "@id": "file://amf-cli/shared/src/test/resources/references/data-type-fragment.json#/references/0/shape/type/source-map/type-property-lexical-info/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { "@value": "file://amf-cli/shared/src/test/resources/references/data-type-fragment.json#/references/0/shape/type" @@ -366,7 +336,7 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "OAS 2.0" + "@value": "[(3,2)-(3,8)]" } ] } @@ -391,7 +361,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 895d15f217..150cda3336 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/references/data-type-fragment.json#/web-api", @@ -30,11 +30,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/references/data-type-fragment.json#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/references/data-type-fragment.json#/web-api/source-map/lexical/element_3" @@ -50,11 +45,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/references/data-type-fragment.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/references/data-type-fragment.json#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/references/data-type-fragment.json#/web-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", @@ -172,7 +162,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/references/data-type-fragment.json#/references/0/source-map", @@ -246,11 +236,6 @@ "@id": "file://amf-cli/shared/src/test/resources/references/data-type-fragment.json#/references/0/shape/type/source-map/synthesized-field/element_0" } ], - "http://a.ml/vocabularies/document-source-maps#type-property-lexical-info": [ - { - "@id": "file://amf-cli/shared/src/test/resources/references/data-type-fragment.json#/references/0/shape/type/source-map/type-property-lexical-info/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/references/data-type-fragment.json#/references/0/shape/type/source-map/lexical/element_1" @@ -259,9 +244,9 @@ "@id": "file://amf-cli/shared/src/test/resources/references/data-type-fragment.json#/references/0/shape/type/source-map/lexical/element_0" } ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ + "http://a.ml/vocabularies/document-source-maps#type-property-lexical-info": [ { - "@id": "file://amf-cli/shared/src/test/resources/references/data-type-fragment.json#/references/0/shape/type/source-map/source-vendor/element_0" + "@id": "file://amf-cli/shared/src/test/resources/references/data-type-fragment.json#/references/0/shape/type/source-map/type-property-lexical-info/element_0" } ] }, @@ -335,11 +320,6 @@ "http://a.ml/vocabularies/document-source-maps#element": "http://www.w3.org/ns/shacl#closed", "http://a.ml/vocabularies/document-source-maps#value": "true" }, - { - "@id": "file://amf-cli/shared/src/test/resources/references/data-type-fragment.json#/references/0/shape/type/source-map/type-property-lexical-info/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/references/data-type-fragment.json#/references/0/shape/type", - "http://a.ml/vocabularies/document-source-maps#value": "[(3,2)-(3,8)]" - }, { "@id": "file://amf-cli/shared/src/test/resources/references/data-type-fragment.json#/references/0/shape/type/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/references/data-type-fragment.json#/references/0/shape/type", @@ -351,9 +331,9 @@ "http://a.ml/vocabularies/document-source-maps#value": "[(7,2)-(11,3)]" }, { - "@id": "file://amf-cli/shared/src/test/resources/references/data-type-fragment.json#/references/0/shape/type/source-map/source-vendor/element_0", + "@id": "file://amf-cli/shared/src/test/resources/references/data-type-fragment.json#/references/0/shape/type/source-map/type-property-lexical-info/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/references/data-type-fragment.json#/references/0/shape/type", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" + "http://a.ml/vocabularies/document-source-maps#value": "[(3,2)-(3,8)]" }, { "@id": "file://amf-cli/shared/src/test/resources/references/data-type-fragment.json#/references/0/shape/type/property/property/name/scalar/name/source-map", diff --git a/amf-cli/shared/src/test/resources/references/data-type-fragment.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/references/data-type-fragment.raml.expanded.jsonld index 910b5bdec7..952aa96fe2 100644 --- a/amf-cli/shared/src/test/resources/references/data-type-fragment.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/references/data-type-fragment.raml.expanded.jsonld @@ -22,21 +22,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/references/data-type-fragment.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/references/data-type-fragment.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/references/data-type-fragment.raml#/web-api/source-map/lexical/element_0", diff --git a/amf-cli/shared/src/test/resources/references/data-type-fragment.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/references/data-type-fragment.raml.flattened.jsonld index 266c6733c8..c32b177dbe 100644 --- a/amf-cli/shared/src/test/resources/references/data-type-fragment.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/references/data-type-fragment.raml.flattened.jsonld @@ -26,22 +26,12 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/references/data-type-fragment.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/references/data-type-fragment.raml#/web-api/source-map/lexical/element_0" } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/references/data-type-fragment.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/references/data-type-fragment.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/references/data-type-fragment.raml#/web-api/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/references/data-type-fragment.raml#/web-api", 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 8f7da859a0..8c73e24bc0 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 @@ -27,9 +27,6 @@ } ], "smaps": { - "source-vendor": { - "#8": "RAML 1.0" - }, "lexical": { "core:version": "[(3,0)-(4,0)]", "#8": "[(2,0)-(6,0)]", @@ -59,7 +56,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } @@ -167,9 +164,6 @@ }, "lexical": { "#2": "[(2,0)-(5,0)]" - }, - "source-vendor": { - "#2": "RAML 1.0" } } } @@ -190,7 +184,7 @@ "@value": "3.2.0" } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } @@ -298,9 +292,6 @@ "resolved-link-target": { "#6": "amf://id#2" }, - "source-vendor": { - "#6": "RAML 1.0" - }, "lexical": { "#6": "[(2,0)-(5,0)]" }, 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 2c099e863d..851e6d6d48 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#8", @@ -20,9 +20,6 @@ "core:name": "API", "core:version": "1.0", "smaps": { - "source-vendor": { - "#8": "RAML 1.0" - }, "lexical": { "core:version": "[(3,0)-(4,0)]", "#8": "[(2,0)-(6,0)]", @@ -99,9 +96,6 @@ "resolved-link-target": { "#6": "amf://id#2" }, - "source-vendor": { - "#6": "RAML 1.0" - }, "lexical": { "#6": "[(2,0)-(5,0)]" }, @@ -135,9 +129,6 @@ }, "lexical": { "#2": "[(2,0)-(5,0)]" - }, - "source-vendor": { - "#2": "RAML 1.0" } } }, @@ -147,7 +138,7 @@ "doc:APIContractProcessingData" ], "apiContract:modelVersion": "3.2.0", - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#3", diff --git a/amf-cli/shared/src/test/resources/references/extensions/extension.json.json b/amf-cli/shared/src/test/resources/references/extensions/extension.json.json index b8d12d717c..88f8bcb48a 100644 --- a/amf-cli/shared/src/test/resources/references/extensions/extension.json.json +++ b/amf-cli/shared/src/test/resources/references/extensions/extension.json.json @@ -1,17 +1,17 @@ { "swagger": "2.0", + "info": { + "title": "API", + "version": "1.0" + }, "paths": { "/books": { "x-amf-description": "La colección de libros de la biblioteca" } }, - "info": { - "title": "API", - "version": "1.0" - }, "x-amf-extends": { "$ref": "file://amf-cli/shared/src/test/resources/upanddown/banking-api.raml" }, - "x-amf-usage": "Spanish localization", - "x-amf-extensionType": "2.0 Extension" + "x-amf-extensionType": "2.0 Extension", + "x-amf-usage": "Spanish localization" } diff --git a/amf-cli/shared/src/test/resources/references/extensions/overlay.json.json b/amf-cli/shared/src/test/resources/references/extensions/overlay.json.json index 9e49b74522..15fd43f459 100644 --- a/amf-cli/shared/src/test/resources/references/extensions/overlay.json.json +++ b/amf-cli/shared/src/test/resources/references/extensions/overlay.json.json @@ -1,17 +1,17 @@ { "swagger": "2.0", + "info": { + "title": "API", + "version": "1.0" + }, "paths": { "/books": { "x-amf-description": "La colección de libros de la biblioteca" } }, - "info": { - "title": "API", - "version": "1.0" - }, "x-amf-extends": { "$ref": "file://amf-cli/shared/src/test/resources/upanddown/banking-api.raml" }, - "x-amf-usage": "Spanish localization", - "x-amf-extensionType": "2.0 Overlay" + "x-amf-extensionType": "2.0 Overlay", + "x-amf-usage": "Spanish localization" } diff --git a/amf-cli/shared/src/test/resources/references/lib/lib.json b/amf-cli/shared/src/test/resources/references/lib/lib.json index 6a884ec62c..d43e545419 100644 --- a/amf-cli/shared/src/test/resources/references/lib/lib.json +++ b/amf-cli/shared/src/test/resources/references/lib/lib.json @@ -1,6 +1,5 @@ { "swagger": "2.0", - "x-amf-usage": "Data types and annotation types", "definitions": { "ObjectType": { "type": "object", @@ -13,5 +12,6 @@ } } } - } + }, + "x-amf-usage": "Data types and annotation types" } 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 580460474c..fa5c7dd3cc 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 @@ -26,7 +26,7 @@ "@value": "3.2.0" } ], -"http://a.ml/vocabularies/apiContract#sourceSpec": [ +"http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } @@ -39,21 +39,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], -"http://a.ml/vocabularies/document-source-maps#source-vendor": [ -{ -"@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/source-map/source-vendor/element_0", -"http://a.ml/vocabularies/document-source-maps#element": [ -{ -"@value": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0" -} -], -"http://a.ml/vocabularies/document-source-maps#value": [ -{ -"@value": "OAS 2.0" -} -] -} -], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/source-map/lexical/element_1", @@ -77,7 +62,7 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { -"@value": "[(3,2)-(3,50)]" +"@value": "[(16,2)-(16,50)]" } ] } @@ -149,7 +134,7 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { -"@value": "[(9,10)-(9,16)]" +"@value": "[(8,10)-(8,16)]" } ] } @@ -164,7 +149,7 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { -"@value": "[(8,8)-(10,9)]" +"@value": "[(7,8)-(9,9)]" } ] }, @@ -177,7 +162,7 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { -"@value": "[(9,10)-(9,26)]" +"@value": "[(8,10)-(8,26)]" } ] } @@ -227,7 +212,7 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { -"@value": "[(8,8)-(10,9)]" +"@value": "[(7,8)-(9,9)]" } ] } @@ -284,7 +269,7 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { -"@value": "[(12,10)-(12,16)]" +"@value": "[(11,10)-(11,16)]" } ] } @@ -299,7 +284,7 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { -"@value": "[(11,8)-(13,9)]" +"@value": "[(10,8)-(12,9)]" } ] }, @@ -312,7 +297,7 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { -"@value": "[(12,10)-(12,26)]" +"@value": "[(11,10)-(11,26)]" } ] } @@ -362,7 +347,7 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { -"@value": "[(11,8)-(13,9)]" +"@value": "[(10,8)-(12,9)]" } ] } @@ -407,7 +392,7 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { -"@value": "[(6,6)-(6,12)]" +"@value": "[(5,6)-(5,12)]" } ] } @@ -422,7 +407,7 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { -"@value": "[(7,6)-(14,7)]" +"@value": "[(6,6)-(13,7)]" } ] }, @@ -435,7 +420,7 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { -"@value": "[(5,4)-(5,16)]" +"@value": "[(4,4)-(4,16)]" } ] }, @@ -448,7 +433,7 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { -"@value": "[(5,4)-(15,5)]" +"@value": "[(4,4)-(14,5)]" } ] } 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 6bbcca9ae6..315716f84b 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", -"http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" +"http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0", @@ -60,11 +60,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], -"http://a.ml/vocabularies/document-source-maps#source-vendor": [ -{ -"@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/source-map/source-vendor/element_0" -} -], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/source-map/lexical/element_1" @@ -155,11 +150,6 @@ ] }, { -"@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/source-map/source-vendor/element_0", -"http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0", -"http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" -}, -{ "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0", "http://a.ml/vocabularies/document-source-maps#value": "[(1,0)-(18,0)]" @@ -167,7 +157,7 @@ { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/document#usage", -"http://a.ml/vocabularies/document-source-maps#value": "[(3,2)-(3,50)]" +"http://a.ml/vocabularies/document-source-maps#value": "[(16,2)-(16,50)]" }, { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType/property/property/objProp1/scalar/objProp1", @@ -251,22 +241,22 @@ { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType/source-map/type-property-lexical-info/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType", -"http://a.ml/vocabularies/document-source-maps#value": "[(6,6)-(6,12)]" +"http://a.ml/vocabularies/document-source-maps#value": "[(5,6)-(5,12)]" }, { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType/source-map/lexical/element_2", "http://a.ml/vocabularies/document-source-maps#element": "http://www.w3.org/ns/shacl#property", -"http://a.ml/vocabularies/document-source-maps#value": "[(7,6)-(14,7)]" +"http://a.ml/vocabularies/document-source-maps#value": "[(6,6)-(13,7)]" }, { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "http://www.w3.org/ns/shacl#name", -"http://a.ml/vocabularies/document-source-maps#value": "[(5,4)-(5,16)]" +"http://a.ml/vocabularies/document-source-maps#value": "[(4,4)-(4,16)]" }, { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType", -"http://a.ml/vocabularies/document-source-maps#value": "[(5,4)-(15,5)]" +"http://a.ml/vocabularies/document-source-maps#value": "[(4,4)-(14,5)]" }, { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType/source-map/declared-element/element_0", @@ -300,7 +290,7 @@ { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType/property/property/objProp1/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType/property/property/objProp1", -"http://a.ml/vocabularies/document-source-maps#value": "[(8,8)-(10,9)]" +"http://a.ml/vocabularies/document-source-maps#value": "[(7,8)-(9,9)]" }, { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType/property/property/objProp2/scalar/objProp2/source-map", @@ -329,37 +319,37 @@ { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType/property/property/objProp2/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType/property/property/objProp2", -"http://a.ml/vocabularies/document-source-maps#value": "[(11,8)-(13,9)]" +"http://a.ml/vocabularies/document-source-maps#value": "[(10,8)-(12,9)]" }, { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType/property/property/objProp1/scalar/objProp1/source-map/type-property-lexical-info/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType/property/property/objProp1/scalar/objProp1", -"http://a.ml/vocabularies/document-source-maps#value": "[(9,10)-(9,16)]" +"http://a.ml/vocabularies/document-source-maps#value": "[(8,10)-(8,16)]" }, { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType/property/property/objProp1/scalar/objProp1/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType/property/property/objProp1/scalar/objProp1", -"http://a.ml/vocabularies/document-source-maps#value": "[(8,8)-(10,9)]" +"http://a.ml/vocabularies/document-source-maps#value": "[(7,8)-(9,9)]" }, { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType/property/property/objProp1/scalar/objProp1/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "http://www.w3.org/ns/shacl#datatype", -"http://a.ml/vocabularies/document-source-maps#value": "[(9,10)-(9,26)]" +"http://a.ml/vocabularies/document-source-maps#value": "[(8,10)-(8,26)]" }, { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType/property/property/objProp2/scalar/objProp2/source-map/type-property-lexical-info/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType/property/property/objProp2/scalar/objProp2", -"http://a.ml/vocabularies/document-source-maps#value": "[(12,10)-(12,16)]" +"http://a.ml/vocabularies/document-source-maps#value": "[(11,10)-(11,16)]" }, { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType/property/property/objProp2/scalar/objProp2/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType/property/property/objProp2/scalar/objProp2", -"http://a.ml/vocabularies/document-source-maps#value": "[(11,8)-(13,9)]" +"http://a.ml/vocabularies/document-source-maps#value": "[(10,8)-(12,9)]" }, { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType/property/property/objProp2/scalar/objProp2/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "http://www.w3.org/ns/shacl#datatype", -"http://a.ml/vocabularies/document-source-maps#value": "[(12,10)-(12,26)]" +"http://a.ml/vocabularies/document-source-maps#value": "[(11,10)-(11,26)]" } ] } 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 9873bc2fa0..4b24b5679d 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 @@ -26,7 +26,7 @@ "@value": "3.2.0" } ], -"http://a.ml/vocabularies/apiContract#sourceSpec": [ +"http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -39,21 +39,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], -"http://a.ml/vocabularies/document-source-maps#source-vendor": [ -{ -"@id": "file://amf-cli/shared/src/test/resources/references/libraries.raml#/references/0/source-map/source-vendor/element_0", -"http://a.ml/vocabularies/document-source-maps#element": [ -{ -"@value": "file://amf-cli/shared/src/test/resources/references/libraries.raml#/references/0" -} -], -"http://a.ml/vocabularies/document-source-maps#value": [ -{ -"@value": "RAML 1.0" -} -] -} -], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.raml#/references/0/source-map/lexical/element_1", 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 9bebfd38c0..9e81fa7b80 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", -"http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" +"http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.raml#/references/0", @@ -60,11 +60,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], -"http://a.ml/vocabularies/document-source-maps#source-vendor": [ -{ -"@id": "file://amf-cli/shared/src/test/resources/references/libraries.raml#/references/0/source-map/source-vendor/element_0" -} -], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.raml#/references/0/source-map/lexical/element_1" @@ -150,11 +145,6 @@ ] }, { -"@id": "file://amf-cli/shared/src/test/resources/references/libraries.raml#/references/0/source-map/source-vendor/element_0", -"http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/references/libraries.raml#/references/0", -"http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" -}, -{ "@id": "file://amf-cli/shared/src/test/resources/references/libraries.raml#/references/0/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/references/libraries.raml#/references/0", "http://a.ml/vocabularies/document-source-maps#value": "[(1,0)-(10,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 51f1ef6d45..37ca75e58a 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 @@ -33,21 +33,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/references/libraries.json#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/web-api/source-map/lexical/element_3", @@ -122,7 +107,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } @@ -224,7 +209,7 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "[(9,10)-(9,16)]" + "@value": "[(8,10)-(8,16)]" } ] } @@ -239,7 +224,7 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "[(8,8)-(10,9)]" + "@value": "[(7,8)-(9,9)]" } ] }, @@ -252,7 +237,7 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "[(9,10)-(9,26)]" + "@value": "[(8,10)-(8,26)]" } ] } @@ -302,7 +287,7 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "[(8,8)-(10,9)]" + "@value": "[(7,8)-(9,9)]" } ] } @@ -359,7 +344,7 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "[(12,10)-(12,16)]" + "@value": "[(11,10)-(11,16)]" } ] } @@ -374,7 +359,7 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "[(11,8)-(13,9)]" + "@value": "[(10,8)-(12,9)]" } ] }, @@ -387,7 +372,7 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "[(12,10)-(12,26)]" + "@value": "[(11,10)-(11,26)]" } ] } @@ -437,7 +422,7 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "[(11,8)-(13,9)]" + "@value": "[(10,8)-(12,9)]" } ] } @@ -482,7 +467,7 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "[(6,6)-(6,12)]" + "@value": "[(5,6)-(5,12)]" } ] } @@ -497,7 +482,7 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "[(7,6)-(14,7)]" + "@value": "[(6,6)-(13,7)]" } ] }, @@ -510,7 +495,7 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "[(5,4)-(5,16)]" + "@value": "[(4,4)-(4,16)]" } ] }, @@ -523,7 +508,7 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "[(5,4)-(15,5)]" + "@value": "[(4,4)-(14,5)]" } ] } @@ -568,7 +553,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } @@ -581,21 +566,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/source-map/lexical/element_1", @@ -619,7 +589,7 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "[(3,2)-(3,50)]" + "@value": "[(16,2)-(16,50)]" } ] } 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 1c7d7e30c4..b050f5bf46 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/web-api", @@ -30,11 +30,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/web-api/source-map/lexical/element_3" @@ -50,11 +45,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/references/libraries.json#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/web-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", @@ -165,18 +155,13 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/source-map", "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/source-map/lexical/element_1" @@ -271,11 +256,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0", @@ -284,7 +264,7 @@ { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/document#usage", - "http://a.ml/vocabularies/document-source-maps#value": "[(3,2)-(3,50)]" + "http://a.ml/vocabularies/document-source-maps#value": "[(16,2)-(16,50)]" }, { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType/property/property/objProp1/scalar/objProp1", @@ -368,22 +348,22 @@ { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType/source-map/type-property-lexical-info/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType", - "http://a.ml/vocabularies/document-source-maps#value": "[(6,6)-(6,12)]" + "http://a.ml/vocabularies/document-source-maps#value": "[(5,6)-(5,12)]" }, { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType/source-map/lexical/element_2", "http://a.ml/vocabularies/document-source-maps#element": "http://www.w3.org/ns/shacl#property", - "http://a.ml/vocabularies/document-source-maps#value": "[(7,6)-(14,7)]" + "http://a.ml/vocabularies/document-source-maps#value": "[(6,6)-(13,7)]" }, { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "http://www.w3.org/ns/shacl#name", - "http://a.ml/vocabularies/document-source-maps#value": "[(5,4)-(5,16)]" + "http://a.ml/vocabularies/document-source-maps#value": "[(4,4)-(4,16)]" }, { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType", - "http://a.ml/vocabularies/document-source-maps#value": "[(5,4)-(15,5)]" + "http://a.ml/vocabularies/document-source-maps#value": "[(4,4)-(14,5)]" }, { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType/source-map/declared-element/element_0", @@ -417,7 +397,7 @@ { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType/property/property/objProp1/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType/property/property/objProp1", - "http://a.ml/vocabularies/document-source-maps#value": "[(8,8)-(10,9)]" + "http://a.ml/vocabularies/document-source-maps#value": "[(7,8)-(9,9)]" }, { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType/property/property/objProp2/scalar/objProp2/source-map", @@ -446,37 +426,37 @@ { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType/property/property/objProp2/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType/property/property/objProp2", - "http://a.ml/vocabularies/document-source-maps#value": "[(11,8)-(13,9)]" + "http://a.ml/vocabularies/document-source-maps#value": "[(10,8)-(12,9)]" }, { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType/property/property/objProp1/scalar/objProp1/source-map/type-property-lexical-info/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType/property/property/objProp1/scalar/objProp1", - "http://a.ml/vocabularies/document-source-maps#value": "[(9,10)-(9,16)]" + "http://a.ml/vocabularies/document-source-maps#value": "[(8,10)-(8,16)]" }, { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType/property/property/objProp1/scalar/objProp1/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType/property/property/objProp1/scalar/objProp1", - "http://a.ml/vocabularies/document-source-maps#value": "[(8,8)-(10,9)]" + "http://a.ml/vocabularies/document-source-maps#value": "[(7,8)-(9,9)]" }, { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType/property/property/objProp1/scalar/objProp1/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "http://www.w3.org/ns/shacl#datatype", - "http://a.ml/vocabularies/document-source-maps#value": "[(9,10)-(9,26)]" + "http://a.ml/vocabularies/document-source-maps#value": "[(8,10)-(8,26)]" }, { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType/property/property/objProp2/scalar/objProp2/source-map/type-property-lexical-info/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType/property/property/objProp2/scalar/objProp2", - "http://a.ml/vocabularies/document-source-maps#value": "[(12,10)-(12,16)]" + "http://a.ml/vocabularies/document-source-maps#value": "[(11,10)-(11,16)]" }, { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType/property/property/objProp2/scalar/objProp2/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType/property/property/objProp2/scalar/objProp2", - "http://a.ml/vocabularies/document-source-maps#value": "[(11,8)-(13,9)]" + "http://a.ml/vocabularies/document-source-maps#value": "[(10,8)-(12,9)]" }, { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.json#/references/0/declares/shape/ObjectType/property/property/objProp2/scalar/objProp2/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "http://www.w3.org/ns/shacl#datatype", - "http://a.ml/vocabularies/document-source-maps#value": "[(12,10)-(12,26)]" + "http://a.ml/vocabularies/document-source-maps#value": "[(11,10)-(11,26)]" } ] } diff --git a/amf-cli/shared/src/test/resources/references/libraries.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/references/libraries.raml.expanded.jsonld index a594b637dc..cba9ba44b7 100644 --- a/amf-cli/shared/src/test/resources/references/libraries.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/references/libraries.raml.expanded.jsonld @@ -26,20 +26,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/references/libraries.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "http://a.ml/vocabularies/document-source-maps#element": [ @@ -399,20 +385,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/references/lib/lib.raml" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "http://a.ml/vocabularies/document-source-maps#element": [ @@ -440,6 +412,16 @@ } ] } + ], + "http://a.ml/vocabularies/document#processingData": [ + { + "@id": "file://amf-cli/shared/src/test/resources/references/lib/lib.raml#/BaseUnitProcessingData", + "@type": [ + "http://a.ml/vocabularies/document#APIContractProcessingData" + ], + "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" + } ] } ], @@ -464,6 +446,16 @@ } ] } + ], + "http://a.ml/vocabularies/document#processingData": [ + { + "@id": "file://amf-cli/shared/src/test/resources/references/libraries.raml#/BaseUnitProcessingData", + "@type": [ + "http://a.ml/vocabularies/document#APIContractProcessingData" + ], + "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" + } ] } ] diff --git a/amf-cli/shared/src/test/resources/references/libraries.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/references/libraries.raml.flattened.jsonld index 53d0c17971..95dbe180f6 100644 --- a/amf-cli/shared/src/test/resources/references/libraries.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/references/libraries.raml.flattened.jsonld @@ -12,18 +12,24 @@ { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.raml#/web-api/source-map" } - ] + ], + "http://a.ml/vocabularies/document#processingData": { + "@id": "file://amf-cli/shared/src/test/resources/references/libraries.raml#/BaseUnitProcessingData" + } + }, + { + "@id": "file://amf-cli/shared/src/test/resources/references/libraries.raml#/BaseUnitProcessingData", + "@type": [ + "http://a.ml/vocabularies/document#APIContractProcessingData" + ], + "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.raml#/web-api/source-map", "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/references/libraries.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.raml#/web-api/source-map/lexical/element_1" @@ -33,11 +39,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/references/libraries.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/references/libraries.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/references/libraries.raml#/web-api", @@ -90,7 +91,18 @@ { "@id": "file://amf-cli/shared/src/test/resources/references/lib/lib.raml#/source-map" } - ] + ], + "http://a.ml/vocabularies/document#processingData": { + "@id": "file://amf-cli/shared/src/test/resources/references/lib/lib.raml#/BaseUnitProcessingData" + } + }, + { + "@id": "file://amf-cli/shared/src/test/resources/references/lib/lib.raml#/BaseUnitProcessingData", + "@type": [ + "http://a.ml/vocabularies/document#APIContractProcessingData" + ], + "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/references/libraries.raml#/source-map", @@ -133,11 +145,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/references/lib/lib.raml#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/references/lib/lib.raml#/source-map/lexical/element_1" @@ -222,11 +229,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/references/lib/lib.raml#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/references/lib/lib.raml", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/references/lib/lib.raml#/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/references/lib/lib.raml", 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 1f903a451b..48f8b9c319 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 @@ -33,21 +33,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/references/oas/oas-references/oas-2-root.yaml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/references/oas/oas-references/oas-2-root.yaml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/references/oas/oas-references/oas-2-root.yaml#/web-api/source-map/lexical/element_3", @@ -122,7 +107,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 31b50867e5..18aaf65dec 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 @@ -33,21 +33,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/references/oas/oas-references/oas-3-root.yaml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/references/oas/oas-references/oas-3-root.yaml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 3.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/references/oas/oas-references/oas-3-root.yaml#/web-api/source-map/lexical/element_3", @@ -122,7 +107,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 3.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 5647860f26..a661e80766 100644 --- a/amf-cli/shared/src/test/resources/render/recursion.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/render/recursion.expanded.jsonld @@ -206,21 +206,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "amf://id#14/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "amf://id#14" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "amf://id#14/source-map/lexical/element_1", @@ -274,7 +259,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 b18584b834..fcfc7457d1 100644 --- a/amf-cli/shared/src/test/resources/render/recursion.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/render/recursion.flattened.jsonld @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "amf://id#14", @@ -52,11 +52,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "amf://id#14/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "amf://id#14/source-map/lexical/element_1" @@ -98,11 +93,6 @@ } ] }, - { - "@id": "amf://id#14/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "amf://id#14", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "amf://id#14/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "amf://id#14", 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 ba7dd7977d..de97837d7c 100644 --- a/amf-cli/shared/src/test/resources/render/types.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/render/types.expanded.jsonld @@ -206,21 +206,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "amf://id#13/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "amf://id#13" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "amf://id#13/source-map/lexical/element_1", @@ -274,7 +259,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 e2fd0d7e02..6cf0e72f6b 100644 --- a/amf-cli/shared/src/test/resources/render/types.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/render/types.flattened.jsonld @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "amf://id#13", @@ -52,11 +52,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "amf://id#13/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "amf://id#13/source-map/lexical/element_1" @@ -98,11 +93,6 @@ } ] }, - { - "@id": "amf://id#13/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "amf://id#13", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "amf://id#13/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "amf://id#13", 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 057f41b436..46eaa82f8f 100644 --- a/amf-cli/shared/src/test/resources/render/union.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/render/union.expanded.jsonld @@ -206,21 +206,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "amf://id#23/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "amf://id#23" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "amf://id#23/source-map/lexical/element_1", @@ -274,7 +259,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 8d42a43c53..7bb1e0ba29 100644 --- a/amf-cli/shared/src/test/resources/render/union.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/render/union.flattened.jsonld @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "amf://id#23", @@ -52,11 +52,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "amf://id#23/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "amf://id#23/source-map/lexical/element_1" @@ -98,11 +93,6 @@ } ] }, - { - "@id": "amf://id#23/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "amf://id#23", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "amf://id#23/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "amf://id#23", 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 143bd00fa0..f324273aab 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 @@ -334,21 +334,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/08/included-schema-and-example/api.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/resolution/08/included-schema-and-example/api.raml/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 0.8" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/08/included-schema-and-example/api.raml/web-api#/source-map/lexical/element_1", @@ -402,7 +387,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 0.8" } 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 076674e2d0..4acd913331 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 0.8" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 0.8" }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/08/included-schema-and-example/api.raml/web-api", @@ -52,11 +52,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/08/included-schema-and-example/api.raml/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/08/included-schema-and-example/api.raml/web-api#/source-map/lexical/element_1" @@ -98,11 +93,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/08/included-schema-and-example/api.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/08/included-schema-and-example/api.raml/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 0.8" - }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/08/included-schema-and-example/api.raml/web-api#/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/08/included-schema-and-example/api.raml/web-api", 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 34950e9cc6..5a9e4eaa42 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 @@ -685,9 +685,6 @@ } ], "smaps": { - "source-vendor": { - "#2": "ASYNC 2.0" - }, "lexical": { "apiContract:endpoint": "[(6,0)-(38,26)]", "apiContract:contentType": "[(5,0)-(6,0)]", @@ -720,7 +717,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "ASYNC 2.0" } 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 ef35fa4b2e..32bda21ba4 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "ASYNC 2.0" + "doc:sourceSpec": "ASYNC 2.0" }, { "@id": "#2", @@ -34,9 +34,6 @@ } ], "smaps": { - "source-vendor": { - "#2": "ASYNC 2.0" - }, "lexical": { "apiContract:endpoint": "[(6,0)-(38,26)]", "apiContract:contentType": "[(5,0)-(6,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 018c417114..8310a0a03a 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 @@ -850,9 +850,6 @@ } ], "smaps": { - "source-vendor": { - "#2": "ASYNC 2.0" - }, "lexical": { "apiContract:endpoint": "[(5,0)-(31,0)]", "core:name": "[(3,2)-(4,0)]", @@ -883,7 +880,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "ASYNC 2.0" } 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 ac8a627faa..b87bcaf63a 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "ASYNC 2.0" + "doc:sourceSpec": "ASYNC 2.0" }, { "@id": "#2", @@ -25,9 +25,6 @@ } ], "smaps": { - "source-vendor": { - "#2": "ASYNC 2.0" - }, "lexical": { "apiContract:endpoint": "[(5,0)-(31,0)]", "core:name": "[(3,2)-(4,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 5a18a830f1..a5da3b0c66 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 @@ -503,9 +503,6 @@ } ], "smaps": { - "source-vendor": { - "#8": "ASYNC 2.0" - }, "lexical": { "apiContract:endpoint": "[(22,0)-(31,49)]", "core:name": "[(3,2)-(4,0)]", @@ -536,7 +533,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "ASYNC 2.0" } 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 e9b663e605..8bb2a8a4bb 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "ASYNC 2.0" + "doc:sourceSpec": "ASYNC 2.0" }, { "@id": "#8", @@ -28,9 +28,6 @@ } ], "smaps": { - "source-vendor": { - "#8": "ASYNC 2.0" - }, "lexical": { "apiContract:endpoint": "[(22,0)-(31,49)]", "core:name": "[(3,2)-(4,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 64f49627c3..75c54fb0f4 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 @@ -117,9 +117,6 @@ } ], "smaps": { - "source-vendor": { - "#/async-api": "ASYNC 2.0" - }, "lexical": { "apiContract:endpoint": "[(5,0)-(15,0)]", "core:name": "[(3,2)-(4,0)]", @@ -150,7 +147,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "ASYNC 2.0" } 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 3b7addba20..3b6fbb373a 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "ASYNC 2.0" + "doc:sourceSpec": "ASYNC 2.0" }, { "@id": "#/async-api", @@ -25,9 +25,6 @@ } ], "smaps": { - "source-vendor": { - "#/async-api": "ASYNC 2.0" - }, "lexical": { "apiContract:endpoint": "[(5,0)-(15,0)]", "core:name": "[(3,2)-(4,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 8b66b03faa..ec4d3daa65 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 @@ -214,9 +214,6 @@ } ], "smaps": { - "source-vendor": { - "#6": "ASYNC 2.0" - }, "lexical": { "apiContract:endpoint": "[(5,0)-(15,0)]", "core:name": "[(3,2)-(4,0)]", @@ -247,7 +244,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "ASYNC 2.0" } 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 b85180160b..712243feac 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "ASYNC 2.0" + "doc:sourceSpec": "ASYNC 2.0" }, { "@id": "#6", @@ -25,9 +25,6 @@ } ], "smaps": { - "source-vendor": { - "#6": "ASYNC 2.0" - }, "lexical": { "apiContract:endpoint": "[(5,0)-(15,0)]", "core:name": "[(3,2)-(4,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 2926893f40..fa74caa750 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 @@ -119,9 +119,6 @@ } ], "smaps": { - "source-vendor": { - "#4": "ASYNC 2.0" - }, "lexical": { "apiContract:endpoint": "[(15,0)-(19,46)]", "core:name": "[(3,2)-(4,0)]", @@ -152,7 +149,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "ASYNC 2.0" } 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 f1e0f45747..2b458e425e 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "ASYNC 2.0" + "doc:sourceSpec": "ASYNC 2.0" }, { "@id": "#4", @@ -25,9 +25,6 @@ } ], "smaps": { - "source-vendor": { - "#4": "ASYNC 2.0" - }, "lexical": { "apiContract:endpoint": "[(15,0)-(19,46)]", "core:name": "[(3,2)-(4,0)]", 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 68441d58a5..301f87bf73 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 @@ -82,9 +82,6 @@ } ], "smaps": { - "source-vendor": { - "#/async-api": "ASYNC 2.0" - }, "lexical": { "apiContract:endpoint": "[(5,0)-(14,0)]", "core:name": "[(3,2)-(4,0)]", @@ -115,7 +112,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "ASYNC 2.0" } 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 2704d82bbc..1013a7f937 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "ASYNC 2.0" + "doc:sourceSpec": "ASYNC 2.0" }, { "@id": "#/async-api", @@ -25,9 +25,6 @@ } ], "smaps": { - "source-vendor": { - "#/async-api": "ASYNC 2.0" - }, "lexical": { "apiContract:endpoint": "[(5,0)-(14,0)]", "core:name": "[(3,2)-(4,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 1cf332e5ad..e9de6aa26e 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 @@ -183,9 +183,6 @@ } ], "smaps": { - "source-vendor": { - "#6": "ASYNC 2.0" - }, "lexical": { "apiContract:endpoint": "[(5,0)-(14,0)]", "core:name": "[(3,2)-(4,0)]", @@ -216,7 +213,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "ASYNC 2.0" } 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 694b37cb79..697f179c97 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "ASYNC 2.0" + "doc:sourceSpec": "ASYNC 2.0" }, { "@id": "#6", @@ -25,9 +25,6 @@ } ], "smaps": { - "source-vendor": { - "#6": "ASYNC 2.0" - }, "lexical": { "apiContract:endpoint": "[(5,0)-(14,0)]", "core:name": "[(3,2)-(4,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 bf5306bbe1..872ed7ce41 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 @@ -28,9 +28,6 @@ ], "apiContract:endpoint": [], "smaps": { - "source-vendor": { - "#4": "ASYNC 2.0" - }, "lexical": { "apiContract:endpoint": "[(5,0)-(6,0)]", "core:name": "[(3,2)-(4,0)]", @@ -61,7 +58,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "ASYNC 2.0" } 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 19dcf66189..d081215a38 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "ASYNC 2.0" + "doc:sourceSpec": "ASYNC 2.0" }, { "@id": "#4", @@ -21,9 +21,6 @@ "core:version": "1.0.0", "apiContract:endpoint": [], "smaps": { - "source-vendor": { - "#4": "ASYNC 2.0" - }, "lexical": { "apiContract:endpoint": "[(5,0)-(6,0)]", "core:name": "[(3,2)-(4,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 5aa3519805..d273cbe048 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 @@ -353,9 +353,6 @@ } ], "smaps": { - "source-vendor": { - "#5": "RAML 1.0" - }, "lexical": { "core:name": "[(3,0)-(4,0)]", "#5": "[(3,0)-(16,56)]" @@ -384,7 +381,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 2e1deef5fe..52d9beee52 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#5", @@ -30,9 +30,6 @@ } ], "smaps": { - "source-vendor": { - "#5": "RAML 1.0" - }, "lexical": { "core:name": "[(3,0)-(4,0)]", "#5": "[(3,0)-(16,56)]" 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 eabcae26ee..b4038b76f4 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 @@ -22,9 +22,6 @@ } ], "smaps": { - "source-vendor": { - "#8": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#8": "[(2,0)-(6,18)]" @@ -53,7 +50,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } @@ -186,7 +183,7 @@ "@value": "3.2.0" } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } @@ -194,9 +191,6 @@ } ], "smaps": { - "source-vendor": { - "#1": "RAML 1.0" - }, "lexical": { "#1": "[(1,0)-(5,15)]" } 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 47f09c21e1..65ed2cb1b5 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#8", @@ -19,9 +19,6 @@ ], "core:name": "test", "smaps": { - "source-vendor": { - "#8": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#8": "[(2,0)-(6,18)]" @@ -75,9 +72,6 @@ "@id": "#5" }, "smaps": { - "source-vendor": { - "#1": "RAML 1.0" - }, "lexical": { "#1": "[(1,0)-(5,15)]" } @@ -152,7 +146,7 @@ "doc:APIContractProcessingData" ], "apiContract:modelVersion": "3.2.0", - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#3", 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 c98d0ba079..6d1f35e87f 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 @@ -22,9 +22,6 @@ } ], "smaps": { - "source-vendor": { - "#9": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#9": "[(2,0)-(5,27)]" @@ -53,7 +50,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } @@ -158,9 +155,6 @@ }, "lexical": { "#2": "[(2,0)-(3,11)]" - }, - "source-vendor": { - "#2": "RAML 1.0" } } } @@ -181,7 +175,7 @@ "@value": "3.2.0" } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } @@ -286,9 +280,6 @@ "resolved-link-target": { "#6": "amf://id#2" }, - "source-vendor": { - "#6": "RAML 1.0" - }, "lexical": { "#6": "[(2,0)-(3,11)]" }, @@ -390,9 +381,6 @@ "resolved-link-target": { "#7": "amf://id#2" }, - "source-vendor": { - "#7": "RAML 1.0" - }, "lexical": { "#7": "[(2,0)-(3,11)]" }, 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 7013d9a7c0..8e0f1d43bf 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#9", @@ -19,9 +19,6 @@ ], "core:name": "test", "smaps": { - "source-vendor": { - "#9": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#9": "[(2,0)-(5,27)]" @@ -100,9 +97,6 @@ "resolved-link-target": { "#6": "amf://id#2" }, - "source-vendor": { - "#6": "RAML 1.0" - }, "lexical": { "#6": "[(2,0)-(3,11)]" }, @@ -137,9 +131,6 @@ "resolved-link-target": { "#7": "amf://id#2" }, - "source-vendor": { - "#7": "RAML 1.0" - }, "lexical": { "#7": "[(2,0)-(3,11)]" }, @@ -173,9 +164,6 @@ }, "lexical": { "#2": "[(2,0)-(3,11)]" - }, - "source-vendor": { - "#2": "RAML 1.0" } } }, @@ -185,7 +173,7 @@ "doc:APIContractProcessingData" ], "apiContract:modelVersion": "3.2.0", - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#3", 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 11288808b0..4cb7e990c3 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 @@ -22,9 +22,6 @@ } ], "smaps": { - "source-vendor": { - "#7": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#7": "[(2,0)-(8,41)]" @@ -53,7 +50,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 11288808b0..4cb7e990c3 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 @@ -22,9 +22,6 @@ } ], "smaps": { - "source-vendor": { - "#7": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#7": "[(2,0)-(8,41)]" @@ -53,7 +50,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 c6b11bac3d..56ec28e376 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 @@ -448,9 +448,6 @@ } ], "smaps": { - "source-vendor": { - "#23": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(4,0)]", "#23": "[(2,0)-(28,27)]" @@ -479,7 +476,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 d8703aa846..2cc4690618 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#23", @@ -24,9 +24,6 @@ } ], "smaps": { - "source-vendor": { - "#23": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(4,0)]", "#23": "[(2,0)-(28,27)]" 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 4c97892532..b2b71e4df9 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 @@ -22,9 +22,6 @@ } ], "smaps": { - "source-vendor": { - "#8": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#8": "[(2,0)-(8,13)]" @@ -53,7 +50,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 c22ddfd072..d8f57f10f0 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#8", @@ -19,9 +19,6 @@ ], "core:name": "test", "smaps": { - "source-vendor": { - "#8": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#8": "[(2,0)-(8,13)]" 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 0ca5b985a9..9f019cb681 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 @@ -409,21 +409,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/examples/response-declarations-with-multiple-media-types.yaml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/resolution/examples/response-declarations-with-multiple-media-types.yaml/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/examples/response-declarations-with-multiple-media-types.yaml/web-api#/source-map/lexical/element_3", @@ -503,7 +488,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 90dd243030..f8d8047857 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/examples/response-declarations-with-multiple-media-types.yaml/web-api", @@ -53,11 +53,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/examples/response-declarations-with-multiple-media-types.yaml/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/examples/response-declarations-with-multiple-media-types.yaml/web-api#/source-map/lexical/element_3" @@ -105,11 +100,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/examples/response-declarations-with-multiple-media-types.yaml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/examples/response-declarations-with-multiple-media-types.yaml/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/examples/response-declarations-with-multiple-media-types.yaml/web-api#/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 4184b29bab..3bb5c57885 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 @@ -5160,21 +5160,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/examples/response-examples.json/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/resolution/examples/response-examples.json/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/examples/response-examples.json/web-api#/source-map/lexical/element_2", @@ -5241,7 +5226,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 b7364797cc..1e64cc8e53 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/examples/response-examples.json/web-api", @@ -55,11 +55,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/examples/response-examples.json/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/examples/response-examples.json/web-api#/source-map/lexical/element_2" @@ -120,11 +115,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/examples/response-examples.json/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/examples/response-examples.json/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/examples/response-examples.json/web-api#/source-map/lexical/element_2", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#name", 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 8662f03e84..51196d1b88 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 @@ -820,21 +820,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/examples/response-examples.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/resolution/examples/response-examples.raml/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/examples/response-examples.raml/web-api#/source-map/lexical/element_1", @@ -888,7 +873,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 47741397e7..9f367daa76 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/examples/response-examples.raml/web-api", @@ -55,11 +55,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/examples/response-examples.raml/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/examples/response-examples.raml/web-api#/source-map/lexical/element_1" @@ -120,11 +115,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/examples/response-examples.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/examples/response-examples.raml/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/examples/response-examples.raml/web-api#/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/examples/response-examples.raml/web-api", 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 9d2e92bff7..8512780578 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 @@ -510,21 +510,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/extends/08/trait-with-quoted-value.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/resolution/extends/08/trait-with-quoted-value.raml/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 0.8" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/extends/08/trait-with-quoted-value.raml/web-api#/source-map/lexical/element_1", @@ -578,7 +563,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 0.8" } 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 199f5031f8..2abc1e84c1 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 0.8" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 0.8" }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/extends/08/trait-with-quoted-value.raml/web-api", @@ -52,11 +52,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/extends/08/trait-with-quoted-value.raml/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/extends/08/trait-with-quoted-value.raml/web-api#/source-map/lexical/element_1" @@ -98,11 +93,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/extends/08/trait-with-quoted-value.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/extends/08/trait-with-quoted-value.raml/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 0.8" - }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/extends/08/trait-with-quoted-value.raml/web-api#/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/extends/08/trait-with-quoted-value.raml/web-api", 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 54c2e26226..ab6eea3605 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 @@ -3973,21 +3973,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/extends/complex-traits-resource-types.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/resolution/extends/complex-traits-resource-types.raml/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/extends/complex-traits-resource-types.raml/web-api#/source-map/lexical/element_1", @@ -4041,7 +4026,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 071cad4114..47a54e5a4d 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/extends/complex-traits-resource-types.raml/web-api", @@ -61,11 +61,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/extends/complex-traits-resource-types.raml/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/extends/complex-traits-resource-types.raml/web-api#/source-map/lexical/element_1" @@ -165,11 +160,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/extends/complex-traits-resource-types.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/extends/complex-traits-resource-types.raml/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/extends/complex-traits-resource-types.raml/web-api#/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/extends/complex-traits-resource-types.raml/web-api", 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 04a746b795..c2f2628e15 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 @@ -583,9 +583,6 @@ } ], "smaps": { - "source-vendor": { - "#20": "RAML 1.0" - }, "lexical": { "core:version": "[(3,0)-(4,0)]", "core:name": "[(2,0)-(3,0)]", @@ -616,7 +613,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 14c75736d9..6a7dde74af 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#20", @@ -33,9 +33,6 @@ } ], "smaps": { - "source-vendor": { - "#20": "RAML 1.0" - }, "lexical": { "core:version": "[(3,0)-(4,0)]", "core:name": "[(2,0)-(3,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 cfbf2f0fd7..5d54e6d06a 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 @@ -220,7 +220,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 934e4e9c07..e5216f7ecf 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/extends/extends-with-references-to-declares/merging/api.raml/web-api", 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 baacec8c16..98ebb2f069 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 @@ -307,7 +307,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 7481c9da56..b89b281d73 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/extends/extends-with-references-to-declares/resource-type/api.raml/web-api", 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 4705b4bdbd..dfdd70b821 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 @@ -279,7 +279,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 aa919e9adc..9c65bf4846 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/extends/extends-with-references-to-declares/trait/api.raml/web-api", 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 c36df97504..c77bcc6546 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 @@ -425,21 +425,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/extends/optional-method.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/resolution/extends/optional-method.raml/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/extends/optional-method.raml/web-api#/source-map/lexical/element_1", @@ -493,7 +478,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 7e80fefd08..ac2b2444ab 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/extends/optional-method.raml/web-api", @@ -76,11 +76,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/extends/optional-method.raml/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/extends/optional-method.raml/web-api#/source-map/lexical/element_1" @@ -163,11 +158,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/extends/optional-method.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/extends/optional-method.raml/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/extends/optional-method.raml/web-api#/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/extends/optional-method.raml/web-api", 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 54d42ade1b..8df1adb958 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 @@ -850,21 +850,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/extends/parameters.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/resolution/extends/parameters.raml/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/extends/parameters.raml/web-api#/source-map/lexical/element_2", @@ -931,7 +916,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 5ff63dd6c9..ce833870b8 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/extends/parameters.raml/web-api", @@ -53,11 +53,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/extends/parameters.raml/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/extends/parameters.raml/web-api#/source-map/lexical/element_2" @@ -102,11 +97,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/extends/parameters.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/extends/parameters.raml/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/extends/parameters.raml/web-api#/source-map/lexical/element_2", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#name", 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 c4d4e9e318..75bca6098d 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 @@ -410,9 +410,6 @@ } ], "smaps": { - "source-vendor": { - "#9": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#9": "[(2,0)-(16,27)]" @@ -441,7 +438,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 4552854a73..6fc8698296 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#9", @@ -24,9 +24,6 @@ } ], "smaps": { - "source-vendor": { - "#9": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#9": "[(2,0)-(16,27)]" 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 58586a3771..44111e5a85 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 @@ -450,21 +450,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/extends/simple-merge.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/resolution/extends/simple-merge.raml/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/extends/simple-merge.raml/web-api#/source-map/lexical/element_1", @@ -518,7 +503,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 971e1d5847..4a011037c4 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/extends/simple-merge.raml/web-api", @@ -52,11 +52,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/extends/simple-merge.raml/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/extends/simple-merge.raml/web-api#/source-map/lexical/element_1" @@ -104,11 +99,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/extends/simple-merge.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/extends/simple-merge.raml/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/extends/simple-merge.raml/web-api#/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/extends/simple-merge.raml/web-api", 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 1bb6810eab..5b7aa9af4c 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 @@ -27,9 +27,6 @@ } ], "smaps": { - "source-vendor": { - "#2": "RAML 1.0" - }, "lexical": { "#2": "[(2,0)-(3,12)]" } @@ -57,7 +54,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 8e034cf0da..b7370aae6a 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#2", @@ -20,9 +20,6 @@ "core:name": "Go Ravens Extension", "core:version": "v1", "smaps": { - "source-vendor": { - "#2": "RAML 1.0" - }, "lexical": { "#2": "[(2,0)-(3,12)]" } 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 3e876267a4..742f64157a 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 @@ -289,9 +289,6 @@ } ], "smaps": { - "source-vendor": { - "#11": "RAML 1.0" - }, "lexical": { "#11": "[(2,0)-(10,6)]" } @@ -319,7 +316,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 cea88cbf45..9ea476218c 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#11", @@ -25,9 +25,6 @@ } ], "smaps": { - "source-vendor": { - "#11": "RAML 1.0" - }, "lexical": { "#11": "[(2,0)-(10,6)]" } 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 bb9f749291..0c0268fb53 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 @@ -111,21 +111,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/extension/traits/input.raml#/references/0/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/resolution/extension/traits/input.raml#/references/0/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/extension/traits/input.raml#/references/0/web-api/source-map/lexical/element_0", @@ -166,7 +151,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 161fb6df69..c15b79c2aa 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/extension/traits/input.raml#/references/0/web-api", @@ -53,11 +53,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/extension/traits/input.raml#/references/0/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/extension/traits/input.raml#/references/0/web-api/source-map/lexical/element_0" @@ -89,11 +84,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/extension/traits/input.raml#/references/0/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/extension/traits/input.raml#/references/0/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/extension/traits/input.raml#/references/0/web-api/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/extension/traits/input.raml#/references/0/web-api", 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 adadceb7c2..b0fa325f52 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 @@ -897,21 +897,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/externalfragment/jsonexample.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/resolution/externalfragment/jsonexample.raml/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/externalfragment/jsonexample.raml/web-api#/source-map/lexical/element_1", @@ -965,7 +950,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 2101168d7a..462de0733a 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/externalfragment/jsonexample.raml/web-api", @@ -52,11 +52,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/externalfragment/jsonexample.raml/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/externalfragment/jsonexample.raml/web-api#/source-map/lexical/element_1" @@ -98,11 +93,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/externalfragment/jsonexample.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/externalfragment/jsonexample.raml/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/externalfragment/jsonexample.raml/web-api#/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/externalfragment/jsonexample.raml/web-api", 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 7670e11499..1fbfffc4bc 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 @@ -422,21 +422,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/externalfragment/jsonschema.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/resolution/externalfragment/jsonschema.raml/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/externalfragment/jsonschema.raml/web-api#/source-map/lexical/element_1", @@ -490,7 +475,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 741f77311a..0d2cb5ba6c 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/externalfragment/jsonschema.raml/web-api", @@ -52,11 +52,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/externalfragment/jsonschema.raml/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/externalfragment/jsonschema.raml/web-api#/source-map/lexical/element_1" @@ -98,11 +93,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/externalfragment/jsonschema.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/externalfragment/jsonschema.raml/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/externalfragment/jsonschema.raml/web-api#/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/externalfragment/jsonschema.raml/web-api", 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 73775b8615..ae8d32cdef 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 @@ -214,9 +214,6 @@ } ], "smaps": { - "source-vendor": { - "#16": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#16": "[(2,0)-(18,23)]" @@ -245,7 +242,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 52b9268a4b..773af104b0 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#16", @@ -24,9 +24,6 @@ } ], "smaps": { - "source-vendor": { - "#16": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#16": "[(2,0)-(18,23)]" 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 41720d9fdb..e1bf12956c 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 @@ -341,21 +341,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/externalfragment/xmlexample.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/resolution/externalfragment/xmlexample.raml/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/externalfragment/xmlexample.raml/web-api#/source-map/lexical/element_1", @@ -409,7 +394,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 088b30f5d1..c7e5ac5a0a 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/externalfragment/xmlexample.raml/web-api", @@ -52,11 +52,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/externalfragment/xmlexample.raml/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/externalfragment/xmlexample.raml/web-api#/source-map/lexical/element_1" @@ -98,11 +93,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/externalfragment/xmlexample.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/externalfragment/xmlexample.raml/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/externalfragment/xmlexample.raml/web-api#/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/externalfragment/xmlexample.raml/web-api", 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 39ccc3c220..daa4f43691 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 @@ -267,21 +267,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/externalfragment/xmlschema.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/resolution/externalfragment/xmlschema.raml/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/externalfragment/xmlschema.raml/web-api#/source-map/lexical/element_1", @@ -335,7 +320,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 962df3f2e2..e3d3c0394a 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/externalfragment/xmlschema.raml/web-api", @@ -52,11 +52,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/externalfragment/xmlschema.raml/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/externalfragment/xmlschema.raml/web-api#/source-map/lexical/element_1" @@ -98,11 +93,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/externalfragment/xmlschema.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/externalfragment/xmlschema.raml/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/externalfragment/xmlschema.raml/web-api#/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/externalfragment/xmlschema.raml/web-api", 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 70dec02b10..d7dadb68c8 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 @@ -276,9 +276,6 @@ } ], "smaps": { - "source-vendor": { - "#5": "RAML 1.0" - }, "lexical": { "core:version": "[(4,0)-(5,0)]", "core:name": "[(3,0)-(4,0)]", @@ -309,7 +306,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 2d69ab59ab..9935631cdb 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#5", @@ -30,9 +30,6 @@ } ], "smaps": { - "source-vendor": { - "#5": "RAML 1.0" - }, "lexical": { "core:version": "[(4,0)-(5,0)]", "core:name": "[(3,0)-(4,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 4f73a72bdd..33d11e8890 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 @@ -129,9 +129,6 @@ } ], "smaps": { - "source-vendor": { - "#11": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(4,0)]", "#11": "[(2,0)-(13,30)]" @@ -160,7 +157,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } @@ -452,7 +449,7 @@ "@value": "3.2.0" } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } @@ -460,9 +457,6 @@ } ], "smaps": { - "source-vendor": { - "#1": "RAML 1.0" - }, "lexical": { "#1": "[(1,0)-(14,20)]" } 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 1f57828e96..7649069a08 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#11", @@ -24,9 +24,6 @@ } ], "smaps": { - "source-vendor": { - "#11": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(4,0)]", "#11": "[(2,0)-(13,30)]" @@ -250,9 +247,6 @@ "@id": "#9" }, "smaps": { - "source-vendor": { - "#1": "RAML 1.0" - }, "lexical": { "#1": "[(1,0)-(14,20)]" } @@ -331,7 +325,7 @@ "doc:APIContractProcessingData" ], "apiContract:modelVersion": "3.2.0", - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" } ], "@context": { 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 fd4af7e43f..431929885d 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 @@ -26,7 +26,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } @@ -34,9 +34,6 @@ } ], "smaps": { - "source-vendor": { - "": "RAML 1.0" - }, "lexical": { "": "[(1,0)-(16,20)]" } 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 0da2a2b186..9887169c52 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "", @@ -34,9 +34,6 @@ "@id": "#9" }, "smaps": { - "source-vendor": { - "": "RAML 1.0" - }, "lexical": { "": "[(1,0)-(16,20)]" } 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 e66e50f509..9b01b89568 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 @@ -26,7 +26,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } @@ -34,9 +34,6 @@ } ], "smaps": { - "source-vendor": { - "": "RAML 1.0" - }, "lexical": { "": "[(1,0)-(14,20)]" } 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 4ea5e96abc..8fd754492e 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "", @@ -31,9 +31,6 @@ "@id": "#8" }, "smaps": { - "source-vendor": { - "": "RAML 1.0" - }, "lexical": { "": "[(1,0)-(14,20)]" } 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 fd0ee75ea0..9f13256729 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 @@ -129,9 +129,6 @@ } ], "smaps": { - "source-vendor": { - "#12": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(4,0)]", "#12": "[(2,0)-(13,30)]" @@ -160,7 +157,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } @@ -562,7 +559,7 @@ "@value": "3.2.0" } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } @@ -570,9 +567,6 @@ } ], "smaps": { - "source-vendor": { - "#1": "RAML 1.0" - }, "lexical": { "#1": "[(1,0)-(16,20)]" } 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 c3071e6b1a..25d12f3b3e 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#12", @@ -24,9 +24,6 @@ } ], "smaps": { - "source-vendor": { - "#12": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(4,0)]", "#12": "[(2,0)-(13,30)]" @@ -253,9 +250,6 @@ "@id": "#10" }, "smaps": { - "source-vendor": { - "#1": "RAML 1.0" - }, "lexical": { "#1": "[(1,0)-(16,20)]" } @@ -374,7 +368,7 @@ "doc:APIContractProcessingData" ], "apiContract:modelVersion": "3.2.0", - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" } ], "@context": { 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 7321b7eb87..11106a1679 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 @@ -228,9 +228,6 @@ } ], "smaps": { - "source-vendor": { - "#9": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(4,0)]", "#9": "[(2,0)-(20,42)]" @@ -259,7 +256,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 f9d68c25be..1f201d123b 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#9", @@ -24,9 +24,6 @@ } ], "smaps": { - "source-vendor": { - "#9": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(4,0)]", "#9": "[(2,0)-(20,42)]" 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 630a39bd51..4c1018abdc 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 @@ -1568,21 +1568,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs.raml/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs.raml/web-api#/source-map/lexical/element_1", @@ -1636,7 +1621,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -2143,21 +2128,6 @@ ] } ], - "http://a.ml/vocabularies/document-source-maps#type-property-lexical-info": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs.raml#/references/2/shape/type/source-map/type-property-lexical-info/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs.raml#/references/2/shape/type" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "[(2,0)-(2,4)]" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs.raml#/references/2/shape/type/source-map/lexical/element_0", @@ -2173,9 +2143,9 @@ ] } ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ + "http://a.ml/vocabularies/document-source-maps#type-property-lexical-info": [ { - "@id": "file://amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs.raml#/references/2/shape/type/source-map/source-vendor/element_0", + "@id": "file://amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs.raml#/references/2/shape/type/source-map/type-property-lexical-info/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { "@value": "file://amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs.raml#/references/2/shape/type" @@ -2183,7 +2153,7 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "RAML 1.0" + "@value": "[(2,0)-(2,4)]" } ] } 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 a2924397fc..5e1f0e4498 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs.raml/web-api", @@ -115,11 +115,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs.raml/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs.raml/web-api#/source-map/lexical/element_1" @@ -277,11 +272,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs.raml/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs.raml/web-api#/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs.raml/web-api", @@ -953,9 +943,9 @@ "@id": "file://amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs.raml#/references/2/shape/type/source-map/synthesized-field/element_0" } ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ + "http://a.ml/vocabularies/document-source-maps#type-property-lexical-info": [ { - "@id": "file://amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs.raml#/references/2/shape/type/source-map/source-vendor/element_0" + "@id": "file://amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs.raml#/references/2/shape/type/source-map/type-property-lexical-info/element_0" } ], "http://a.ml/vocabularies/document-source-maps#lexical": [ @@ -963,11 +953,6 @@ "@id": "file://amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs.raml#/references/2/shape/type/source-map/lexical/element_0" } ], - "http://a.ml/vocabularies/document-source-maps#type-property-lexical-info": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs.raml#/references/2/shape/type/source-map/type-property-lexical-info/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#auto-generated-name": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs.raml#/references/2/shape/type/source-map/auto-generated-name/element_0" @@ -1313,20 +1298,15 @@ "http://a.ml/vocabularies/document-source-maps#value": "true" }, { - "@id": "file://amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs.raml#/references/2/shape/type/source-map/source-vendor/element_0", + "@id": "file://amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs.raml#/references/2/shape/type/source-map/type-property-lexical-info/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs.raml#/references/2/shape/type", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" + "http://a.ml/vocabularies/document-source-maps#value": "[(2,0)-(2,4)]" }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs.raml#/references/2/shape/type/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs.raml#/references/2/shape/type", "http://a.ml/vocabularies/document-source-maps#value": "[(2,0)-(6,10)]" }, - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs.raml#/references/2/shape/type/source-map/type-property-lexical-info/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs.raml#/references/2/shape/type", - "http://a.ml/vocabularies/document-source-maps#value": "[(2,0)-(2,4)]" - }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs.raml#/references/2/shape/type/source-map/auto-generated-name/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/links-to-declares-and-references/link-to-declares-and-refs.raml#/references/2/shape/type", 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 1acbd3f74a..47d4d733f5 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 @@ -734,9 +734,6 @@ } ], "smaps": { - "source-vendor": { - "#34": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(4,0)]", "#34": "[(2,0)-(44,43)]" @@ -765,7 +762,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } @@ -904,7 +901,7 @@ "@value": "3.2.0" } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } @@ -912,9 +909,6 @@ } ], "smaps": { - "source-vendor": { - "#1": "RAML 1.0" - }, "lexical": { "#1": "[(1,0)-(5,15)]" } @@ -1151,9 +1145,6 @@ } ], "smaps": { - "source-vendor": { - "#8": "RAML 1.0" - }, "lexical": { "security:settings": "[(3,0)-(8,0)]", "apiContract:parameter": "[(9,2)-(12,0)]", @@ -1181,7 +1172,7 @@ "@value": "3.2.0" } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } @@ -1409,15 +1400,12 @@ "resolved-link": { "#17": "amf://id#24" }, - "source-vendor": { - "#17": "RAML 1.0" + "type-property-lexical-info": { + "#17": "[(2,0)-(2,4)]" }, "lexical": { "#17": "[(2,0)-(6,10)]" }, - "type-property-lexical-info": { - "#17": "[(2,0)-(2,4)]" - }, "auto-generated-name": { "#17": "" }, @@ -1443,7 +1431,7 @@ "@value": "3.2.0" } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 0ae47ab956..47e08b12d4 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#34", @@ -33,9 +33,6 @@ } ], "smaps": { - "source-vendor": { - "#34": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(4,0)]", "#34": "[(2,0)-(44,43)]" @@ -424,15 +421,12 @@ "resolved-link": { "#17": "amf://id#24" }, - "source-vendor": { - "#17": "RAML 1.0" + "type-property-lexical-info": { + "#17": "[(2,0)-(2,4)]" }, "lexical": { "#17": "[(2,0)-(6,10)]" }, - "type-property-lexical-info": { - "#17": "[(2,0)-(2,4)]" - }, "auto-generated-name": { "#17": "" }, @@ -960,9 +954,6 @@ "@id": "#6" }, "smaps": { - "source-vendor": { - "#1": "RAML 1.0" - }, "lexical": { "#1": "[(1,0)-(5,15)]" } @@ -1029,7 +1020,7 @@ "doc:APIContractProcessingData" ], "apiContract:modelVersion": "3.2.0", - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#8", @@ -1057,9 +1048,6 @@ "@id": "#14" }, "smaps": { - "source-vendor": { - "#8": "RAML 1.0" - }, "lexical": { "security:settings": "[(3,0)-(8,0)]", "apiContract:parameter": "[(9,2)-(12,0)]", @@ -1076,7 +1064,7 @@ "doc:APIContractProcessingData" ], "apiContract:modelVersion": "3.2.0", - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#25", @@ -1084,7 +1072,7 @@ "doc:APIContractProcessingData" ], "apiContract:modelVersion": "3.2.0", - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#28", 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 e862769a36..5e6fe7ad0c 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 @@ -742,21 +742,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type-override.json/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type-override.json/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type-override.json/web-api#/source-map/lexical/element_2", @@ -823,7 +808,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 82e9ce24c9..b745543f35 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type-override.json/web-api", @@ -52,11 +52,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type-override.json/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type-override.json/web-api#/source-map/lexical/element_2" @@ -109,11 +104,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type-override.json/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type-override.json/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type-override.json/web-api#/source-map/lexical/element_2", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#name", 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 521cabf765..ad2d16d3c0 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 @@ -732,21 +732,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type-override.json/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type-override.json/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type-override.json/web-api#/source-map/lexical/element_2", @@ -813,7 +798,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 d3e418ef59..0aab9fbff5 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type-override.json/web-api", @@ -52,11 +52,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type-override.json/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type-override.json/web-api#/source-map/lexical/element_2" @@ -103,11 +98,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type-override.json/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type-override.json/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type-override.json/web-api#/source-map/lexical/element_2", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#name", 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 60627fb946..d541262f2a 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 @@ -774,21 +774,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type-override.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type-override.raml/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type-override.raml/web-api#/source-map/lexical/element_1", @@ -842,7 +827,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 634361c0ee..0ff13de91c 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type-override.raml/web-api", @@ -68,11 +68,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type-override.raml/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type-override.raml/web-api#/source-map/lexical/element_1" @@ -138,11 +133,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type-override.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type-override.raml/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type-override.raml/web-api#/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type-override.raml/web-api", 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 19e0bd7b75..4748ab5b81 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 @@ -732,21 +732,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type.json/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type.json/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type.json/web-api#/source-map/lexical/element_2", @@ -813,7 +798,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 885e7e5c40..550d3c260e 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type.json/web-api", @@ -52,11 +52,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type.json/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type.json/web-api#/source-map/lexical/element_2" @@ -103,11 +98,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type.json/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type.json/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type.json/web-api#/source-map/lexical/element_2", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#name", 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 bc3991f071..2141d090e1 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 @@ -774,21 +774,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type.raml/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type.raml/web-api#/source-map/lexical/element_1", @@ -842,7 +827,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 9ee88e31a0..185c5cfcbc 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type.raml/web-api", @@ -68,11 +68,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type.raml/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type.raml/web-api#/source-map/lexical/element_1" @@ -138,11 +133,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type.raml/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type.raml/web-api#/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-type.raml/web-api", 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 0b9c34628d..476d9f0432 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 @@ -1262,21 +1262,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-types.json/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-types.json/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-types.json/web-api#/source-map/lexical/element_2", @@ -1343,7 +1328,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 ab05af00c0..a6cb430c67 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-types.json/web-api", @@ -52,11 +52,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-types.json/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-types.json/web-api#/source-map/lexical/element_2" @@ -103,11 +98,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-types.json/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-types.json/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-types.json/web-api#/source-map/lexical/element_2", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#name", 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 6114d469b6..b37f07cfc7 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 @@ -1301,21 +1301,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-types.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-types.raml/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-types.raml/web-api#/source-map/lexical/element_1", @@ -1369,7 +1354,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 e906980ca0..b9cb12cb46 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-types.raml/web-api", @@ -68,11 +68,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-types.raml/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-types.raml/web-api#/source-map/lexical/element_1" @@ -138,11 +133,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-types.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-types.raml/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-types.raml/web-api#/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/media-type/media-types.raml/web-api", 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 f159b4ad10..477a6b82fc 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 @@ -973,9 +973,6 @@ } ], "smaps": { - "source-vendor": { - "#22": "RAML 1.0" - }, "lexical": { "core:version": "[(3,0)-(5,0)]", "#22": "[(2,0)-(40,0)]", @@ -1005,7 +1002,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 251660d5e5..8949e22eac 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#22", @@ -28,9 +28,6 @@ } ], "smaps": { - "source-vendor": { - "#22": "RAML 1.0" - }, "lexical": { "core:version": "[(3,0)-(5,0)]", "#22": "[(2,0)-(40,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 b5679472c3..d6dc9f0748 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 @@ -1216,9 +1216,6 @@ } ], "smaps": { - "source-vendor": { - "#32": "RAML 1.0" - }, "lexical": { "core:version": "[(3,0)-(5,0)]", "#32": "[(2,0)-(51,0)]", @@ -1248,7 +1245,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 45675c9e65..a6d40bb951 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#32", @@ -28,9 +28,6 @@ } ], "smaps": { - "source-vendor": { - "#32": "RAML 1.0" - }, "lexical": { "core:version": "[(3,0)-(5,0)]", "#32": "[(2,0)-(51,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 df6c67cb15..8db7dc1b13 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 @@ -718,9 +718,6 @@ } ], "smaps": { - "source-vendor": { - "#26": "RAML 1.0" - }, "lexical": { "core:version": "[(3,0)-(5,0)]", "#26": "[(2,0)-(47,0)]", @@ -750,7 +747,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 b18b3ff90a..d555d1d254 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#26", @@ -28,9 +28,6 @@ } ], "smaps": { - "source-vendor": { - "#26": "RAML 1.0" - }, "lexical": { "core:version": "[(3,0)-(5,0)]", "#26": "[(2,0)-(47,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 e987d338d2..0e3e294335 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 @@ -1052,9 +1052,6 @@ } ], "smaps": { - "source-vendor": { - "#22": "RAML 0.8" - }, "lexical": { "core:version": "[(3,0)-(5,0)]", "#22": "[(2,0)-(40,0)]", @@ -1084,7 +1081,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 0.8" } 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 640a86c3dc..3715129b0c 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 0.8" + "doc:sourceSpec": "RAML 0.8" }, { "@id": "#22", @@ -28,9 +28,6 @@ } ], "smaps": { - "source-vendor": { - "#22": "RAML 0.8" - }, "lexical": { "core:version": "[(3,0)-(5,0)]", "#22": "[(2,0)-(40,0)]", 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 5fe31bad82..d2a4f030db 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 @@ -1070,9 +1070,6 @@ } ], "smaps": { - "source-vendor": { - "#22": "RAML 1.0" - }, "lexical": { "core:version": "[(3,0)-(5,0)]", "#22": "[(2,0)-(40,0)]", @@ -1102,7 +1099,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 0ee360cbd5..cbd879d676 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#22", @@ -28,9 +28,6 @@ } ], "smaps": { - "source-vendor": { - "#22": "RAML 1.0" - }, "lexical": { "core:version": "[(3,0)-(5,0)]", "#22": "[(2,0)-(40,0)]", 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 dc6945d897..baf78e12d7 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 @@ -800,9 +800,6 @@ } ], "smaps": { - "source-vendor": { - "#5": "OAS 2.0" - }, "lexical": { "apiContract:endpoint": "[(10,2)-(43,3)]", "apiContract:scheme": "[(7,2)-(9,3)]", @@ -834,7 +831,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "OAS 2.0" } 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 78c615fe50..d3102c8951 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "OAS 2.0" + "doc:sourceSpec": "OAS 2.0" }, { "@id": "#5", @@ -31,9 +31,6 @@ } ], "smaps": { - "source-vendor": { - "#5": "OAS 2.0" - }, "lexical": { "apiContract:endpoint": "[(10,2)-(43,3)]", "apiContract:scheme": "[(7,2)-(9,3)]", 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 687d18a757..74726eca4d 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 @@ -1711,21 +1711,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/nested-parameters.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/resolution/nested-parameters.raml/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/nested-parameters.raml/web-api#/source-map/lexical/element_1", @@ -1779,7 +1764,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 fa1858ab13..3e69543058 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/nested-parameters.raml/web-api", @@ -136,11 +136,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/nested-parameters.raml/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/nested-parameters.raml/web-api#/source-map/lexical/element_1" @@ -320,11 +315,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/nested-parameters.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/nested-parameters.raml/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/nested-parameters.raml/web-api#/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/nested-parameters.raml/web-api", 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 247e0826c0..134b52c783 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 @@ -33,9 +33,6 @@ ], "apiContract:endpoint": [], "smaps": { - "source-vendor": { - "#4": "OAS 3.0" - }, "lexical": { "apiContract:endpoint": "[(8,2)-(9,3)]", "core:description": "[(6,4)-(6,61)]", @@ -67,7 +64,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "OAS 3.0" } 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 b7ae839630..70e44ed632 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "OAS 3.0" + "doc:sourceSpec": "OAS 3.0" }, { "@id": "#4", @@ -22,9 +22,6 @@ "core:version": "1.0.0", "apiContract:endpoint": [], "smaps": { - "source-vendor": { - "#4": "OAS 3.0" - }, "lexical": { "apiContract:endpoint": "[(8,2)-(9,3)]", "core:description": "[(6,4)-(6,61)]", 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 56f1d26d82..14d26a9ae2 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 @@ -303,9 +303,6 @@ } ], "smaps": { - "source-vendor": { - "#5": "OAS 2.0" - }, "lexical": { "apiContract:endpoint": "[(5,0)-(11,54)]", "core:name": "[(3,2)-(4,0)]", @@ -336,7 +333,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "OAS 2.0" } 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 183e3bcd3d..ee789aa6ab 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "OAS 2.0" + "doc:sourceSpec": "OAS 2.0" }, { "@id": "#5", @@ -25,9 +25,6 @@ } ], "smaps": { - "source-vendor": { - "#5": "OAS 2.0" - }, "lexical": { "apiContract:endpoint": "[(5,0)-(11,54)]", "core:name": "[(3,2)-(4,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 fb9fea17e4..674022f14d 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 @@ -224,21 +224,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/oas-link-of-link/all-objects-case.yaml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/resolution/oas-link-of-link/all-objects-case.yaml/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/oas-link-of-link/all-objects-case.yaml/web-api#/source-map/lexical/element_3", @@ -318,7 +303,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 f6b8640691..9fa86e9a30 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/oas-link-of-link/all-objects-case.yaml/web-api", @@ -53,11 +53,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/oas-link-of-link/all-objects-case.yaml/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/oas-link-of-link/all-objects-case.yaml/web-api#/source-map/lexical/element_3" @@ -102,11 +97,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/oas-link-of-link/all-objects-case.yaml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/oas-link-of-link/all-objects-case.yaml/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/oas-link-of-link/all-objects-case.yaml/web-api#/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 3ac026689e..60deb0c42f 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 @@ -224,21 +224,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/oas-link-of-link/array-in-the-middle.yaml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/resolution/oas-link-of-link/array-in-the-middle.yaml/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/oas-link-of-link/array-in-the-middle.yaml/web-api#/source-map/lexical/element_3", @@ -318,7 +303,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 7412af4757..610f2d21d6 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/oas-link-of-link/array-in-the-middle.yaml/web-api", @@ -53,11 +53,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/oas-link-of-link/array-in-the-middle.yaml/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/oas-link-of-link/array-in-the-middle.yaml/web-api#/source-map/lexical/element_3" @@ -102,11 +97,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/oas-link-of-link/array-in-the-middle.yaml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/oas-link-of-link/array-in-the-middle.yaml/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/oas-link-of-link/array-in-the-middle.yaml/web-api#/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 6f477f0a26..73700e54ac 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 @@ -224,21 +224,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/oas-link-of-link/array-with-child-recursion.yaml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/resolution/oas-link-of-link/array-with-child-recursion.yaml/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/oas-link-of-link/array-with-child-recursion.yaml/web-api#/source-map/lexical/element_3", @@ -318,7 +303,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 506b65b29a..6cd980fcf4 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/oas-link-of-link/array-with-child-recursion.yaml/web-api", @@ -53,11 +53,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/oas-link-of-link/array-with-child-recursion.yaml/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/oas-link-of-link/array-with-child-recursion.yaml/web-api#/source-map/lexical/element_3" @@ -102,11 +97,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/oas-link-of-link/array-with-child-recursion.yaml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/oas-link-of-link/array-with-child-recursion.yaml/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/oas-link-of-link/array-with-child-recursion.yaml/web-api#/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 0c51fcb9a2..4bbc2172c6 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 @@ -28,9 +28,6 @@ ], "apiContract:endpoint": [], "smaps": { - "source-vendor": { - "#8": "OAS 2.0" - }, "lexical": { "apiContract:endpoint": "[(7,2)-(7,13)]", "core:name": "[(4,4)-(4,19)]", @@ -61,7 +58,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "OAS 2.0" } 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 7722c099e1..f482ad0a9e 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "OAS 2.0" + "doc:sourceSpec": "OAS 2.0" }, { "@id": "#8", @@ -21,9 +21,6 @@ "core:version": "1.1", "apiContract:endpoint": [], "smaps": { - "source-vendor": { - "#8": "OAS 2.0" - }, "lexical": { "apiContract:endpoint": "[(7,2)-(7,13)]", "core:name": "[(4,4)-(4,19)]", 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 d043282dfc..18ff4086d9 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 @@ -332,9 +332,6 @@ } ], "smaps": { - "source-vendor": { - "#4": "OAS 3.0" - }, "lexical": { "apiContract:endpoint": "[(19,0)-(34,32)]", "core:termsOfService": "[(10,2)-(12,0)]", @@ -368,7 +365,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "OAS 3.0" } 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 7a77fd2b27..003750614f 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "OAS 3.0" + "doc:sourceSpec": "OAS 3.0" }, { "@id": "#4", @@ -30,9 +30,6 @@ } ], "smaps": { - "source-vendor": { - "#4": "OAS 3.0" - }, "lexical": { "apiContract:endpoint": "[(19,0)-(34,32)]", "core:termsOfService": "[(10,2)-(12,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 68a0dbb7d2..69910d2b02 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 @@ -28,9 +28,6 @@ ], "apiContract:endpoint": [], "smaps": { - "source-vendor": { - "#15": "OAS 3.0" - }, "lexical": { "apiContract:endpoint": "[(5,0)-(7,0)]", "core:name": "[(3,2)-(4,0)]", @@ -61,7 +58,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "OAS 3.0" } 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 9ae13d092a..91f4636c18 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "OAS 3.0" + "doc:sourceSpec": "OAS 3.0" }, { "@id": "#15", @@ -21,9 +21,6 @@ "core:version": "1.0.0", "apiContract:endpoint": [], "smaps": { - "source-vendor": { - "#15": "OAS 3.0" - }, "lexical": { "apiContract:endpoint": "[(5,0)-(7,0)]", "core:name": "[(3,2)-(4,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 6cf6de569d..1274e3826b 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 @@ -141,9 +141,6 @@ } ], "smaps": { - "source-vendor": { - "#18": "OAS 3.0" - }, "lexical": { "apiContract:endpoint": "[(5,0)-(16,0)]", "core:name": "[(3,2)-(4,0)]", @@ -174,7 +171,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "OAS 3.0" } 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 e0ee9fb707..79d7d5f29a 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "OAS 3.0" + "doc:sourceSpec": "OAS 3.0" }, { "@id": "#18", @@ -25,9 +25,6 @@ } ], "smaps": { - "source-vendor": { - "#18": "OAS 3.0" - }, "lexical": { "apiContract:endpoint": "[(5,0)-(16,0)]", "core:name": "[(3,2)-(4,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 cf01a4f182..4337da52fc 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 @@ -553,9 +553,6 @@ } ], "smaps": { - "source-vendor": { - "#2": "RAML 1.0" - }, "lexical": { "core:version": "[(6,0)-(7,0)]", "apiContract:contentType": "[(4,0)-(6,0)]", @@ -589,7 +586,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 937d3380fc..9253347556 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#2", @@ -38,9 +38,6 @@ } ], "smaps": { - "source-vendor": { - "#2": "RAML 1.0" - }, "lexical": { "core:version": "[(6,0)-(7,0)]", "apiContract:contentType": "[(4,0)-(6,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 144d037908..19649e0c44 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 @@ -947,21 +947,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/overrided-baseUriParams.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/resolution/overrided-baseUriParams.raml/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 0.8" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/overrided-baseUriParams.raml/web-api#/source-map/lexical/element_3", @@ -1041,7 +1026,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 0.8" } 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 f5f9785842..690a10f8ac 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 0.8" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 0.8" }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/overrided-baseUriParams.raml/web-api", @@ -77,11 +77,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/overrided-baseUriParams.raml/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/overrided-baseUriParams.raml/web-api#/source-map/lexical/element_3" @@ -176,11 +171,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/overrided-baseUriParams.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/overrided-baseUriParams.raml/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 0.8" - }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/overrided-baseUriParams.raml/web-api#/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#server", 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 37705d7451..98c1d24c2f 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 @@ -172,9 +172,6 @@ } ], "smaps": { - "source-vendor": { - "#4": "OAS 2.0" - }, "lexical": { "apiContract:endpoint": "[(7,2)-(17,3)]", "#4": "[(1,0)-(24,1)]", @@ -204,7 +201,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "OAS 2.0" } 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 734e3a40b1..cbebe25344 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "OAS 2.0" + "doc:sourceSpec": "OAS 2.0" }, { "@id": "#4", @@ -29,9 +29,6 @@ } ], "smaps": { - "source-vendor": { - "#4": "OAS 2.0" - }, "lexical": { "apiContract:endpoint": "[(7,2)-(17,3)]", "#4": "[(1,0)-(24,1)]", 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 9828a9376d..16329a2731 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 @@ -843,21 +843,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/parameters.json/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/resolution/parameters.json/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/parameters.json/web-api#/source-map/lexical/element_3", @@ -937,7 +922,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 001d560270..0e6264f807 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/parameters.json/web-api", @@ -53,11 +53,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/parameters.json/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/parameters.json/web-api#/source-map/lexical/element_3" @@ -107,11 +102,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/parameters.json/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/parameters.json/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/parameters.json/web-api#/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 7f26695d77..dcc824ad88 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 @@ -593,21 +593,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/parameters.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/resolution/parameters.raml/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/parameters.raml/web-api#/source-map/lexical/element_3", @@ -687,7 +672,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 a064ecf176..924837ef37 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/parameters.raml/web-api", @@ -71,11 +71,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/parameters.raml/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/parameters.raml/web-api#/source-map/lexical/element_3" @@ -139,11 +134,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/parameters.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/parameters.raml/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/parameters.raml/web-api#/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#server", 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 743257b816..e2343a1f4d 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 @@ -190,9 +190,6 @@ } ], "smaps": { - "source-vendor": { - "#23": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#23": "[(2,0)-(28,19)]" @@ -221,7 +218,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 8925d42e75..293c88c335 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#23", @@ -24,9 +24,6 @@ } ], "smaps": { - "source-vendor": { - "#23": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#23": "[(2,0)-(28,19)]" 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 61cb646ef1..f740241609 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 @@ -1284,21 +1284,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/queryString/query-string.json/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/resolution/queryString/query-string.json/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/queryString/query-string.json/web-api#/source-map/lexical/element_2", @@ -1365,7 +1350,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 f9a0c0548f..909d69f7c0 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/queryString/query-string.json/web-api", @@ -52,11 +52,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/queryString/query-string.json/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/queryString/query-string.json/web-api#/source-map/lexical/element_2" @@ -98,11 +93,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/queryString/query-string.json/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/queryString/query-string.json/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/queryString/query-string.json/web-api#/source-map/lexical/element_2", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#name", 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 49e92d2975..616f1bc806 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 @@ -1447,21 +1447,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/queryString/query-string.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/resolution/queryString/query-string.raml/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/queryString/query-string.raml/web-api#/source-map/lexical/element_1", @@ -1515,7 +1500,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 0689b2b50f..0b79485e4e 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/queryString/query-string.raml/web-api", @@ -52,11 +52,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/queryString/query-string.raml/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/queryString/query-string.raml/web-api#/source-map/lexical/element_1" @@ -98,11 +93,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/queryString/query-string.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/queryString/query-string.raml/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/queryString/query-string.raml/web-api#/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/queryString/query-string.raml/web-api", 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 ad996ed4aa..6c9aeb7b67 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/queryString/security-with-query-string.json/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/resolution/queryString/security-with-query-string.json/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/queryString/security-with-query-string.json/web-api#/source-map/lexical/element_1", @@ -95,7 +80,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 686835c114..5588ef93c0 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/queryString/security-with-query-string.json/web-api", @@ -29,11 +29,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/queryString/security-with-query-string.json/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/queryString/security-with-query-string.json/web-api#/source-map/lexical/element_1" @@ -43,11 +38,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/queryString/security-with-query-string.json/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/queryString/security-with-query-string.json/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/queryString/security-with-query-string.json/web-api#/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/queryString/security-with-query-string.json/web-api", 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 4a69a7e9cd..404aa39c39 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/queryString/security-with-query-string.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/resolution/queryString/security-with-query-string.raml/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/queryString/security-with-query-string.raml/web-api#/source-map/lexical/element_1", @@ -95,7 +80,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 e767dad70d..198f5cb682 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/queryString/security-with-query-string.raml/web-api", @@ -29,11 +29,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/queryString/security-with-query-string.raml/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/queryString/security-with-query-string.raml/web-api#/source-map/lexical/element_1" @@ -43,11 +38,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/queryString/security-with-query-string.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/queryString/security-with-query-string.raml/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/queryString/security-with-query-string.raml/web-api#/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/queryString/security-with-query-string.raml/web-api", 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 6cebb19a93..e1589898fd 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 @@ -351,9 +351,6 @@ } ], "smaps": { - "source-vendor": { - "#2": "RAML 1.0" - }, "lexical": { "core:version": "[(3,0)-(5,0)]", "core:name": "[(2,0)-(3,0)]", @@ -384,7 +381,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 6f174d49d8..acae9b0fbf 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#2", @@ -33,9 +33,6 @@ } ], "smaps": { - "source-vendor": { - "#2": "RAML 1.0" - }, "lexical": { "core:version": "[(3,0)-(5,0)]", "core:name": "[(2,0)-(3,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 437c62eccf..537dfd88cd 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 @@ -28,9 +28,6 @@ ], "apiContract:endpoint": [], "smaps": { - "source-vendor": { - "#11": "OAS 2.0" - }, "lexical": { "apiContract:endpoint": "[(5,0)-(6,0)]", "core:name": "[(4,2)-(5,0)]", @@ -61,7 +58,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "OAS 2.0" } 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 d3fffe752a..c2d49e8810 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "OAS 2.0" + "doc:sourceSpec": "OAS 2.0" }, { "@id": "#11", @@ -21,9 +21,6 @@ "core:version": "v1", "apiContract:endpoint": [], "smaps": { - "source-vendor": { - "#11": "OAS 2.0" - }, "lexical": { "apiContract:endpoint": "[(5,0)-(6,0)]", "core:name": "[(4,2)-(5,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 e2dcaebe05..ba2977aed2 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 @@ -201,9 +201,6 @@ } ], "smaps": { - "source-vendor": { - "#11": "OAS 2.0" - }, "lexical": { "apiContract:tag": "[(9,0)-(11,0)]", "apiContract:scheme": "[(2,0)-(4,0)]", @@ -234,7 +231,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "OAS 2.0" } 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 3ba9f1464e..5db74785f1 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "OAS 2.0" + "doc:sourceSpec": "OAS 2.0" }, { "@id": "#11", @@ -41,9 +41,6 @@ } ], "smaps": { - "source-vendor": { - "#11": "OAS 2.0" - }, "lexical": { "apiContract:tag": "[(9,0)-(11,0)]", "apiContract:scheme": "[(2,0)-(4,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 c369d8a7dd..476e456f4a 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 @@ -305,9 +305,6 @@ } ], "smaps": { - "source-vendor": { - "#27": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#27": "[(2,0)-(28,24)]" @@ -336,7 +333,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 6fbf4c6f16..510e8bc085 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#27", @@ -24,9 +24,6 @@ } ], "smaps": { - "source-vendor": { - "#27": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#27": "[(2,0)-(28,24)]" 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 0e37df882b..70204ef9ea 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 @@ -1116,9 +1116,6 @@ } ], "smaps": { - "source-vendor": { - "#8": "RAML 0.8" - }, "lexical": { "core:name": "[(2,0)-(4,0)]", "#8": "[(2,0)-(11,45)]" @@ -1147,7 +1144,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 0.8" } 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 2e80cb5344..83fc855197 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 0.8" + "doc:sourceSpec": "RAML 0.8" }, { "@id": "#8", @@ -24,9 +24,6 @@ } ], "smaps": { - "source-vendor": { - "#8": "RAML 0.8" - }, "lexical": { "core:name": "[(2,0)-(4,0)]", "#8": "[(2,0)-(11,45)]" 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 b274d6c6ae..b5560a79db 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 @@ -589,9 +589,6 @@ } ], "smaps": { - "source-vendor": { - "#15": "OAS 3.0" - }, "lexical": { "apiContract:endpoint": "[(42,0)-(59,0)]", "core:name": "[(4,2)-(6,0)]", @@ -622,7 +619,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "OAS 3.0" } 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 ae0ae35425..9aa014c55b 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "OAS 3.0" + "doc:sourceSpec": "OAS 3.0" }, { "@id": "#15", @@ -25,9 +25,6 @@ } ], "smaps": { - "source-vendor": { - "#15": "OAS 3.0" - }, "lexical": { "apiContract:endpoint": "[(42,0)-(59,0)]", "core:name": "[(4,2)-(6,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 61b6f5f91a..d1a85202b5 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 @@ -566,9 +566,6 @@ "apiContract:header": "[(11,2)-(17,0)]", "apiContract:response": "[(17,2)-(26,0)]" }, - "source-vendor": { - "#29": "RAML 1.0" - }, "resolved-link-target": { "#29": "amf://id#2" } @@ -879,9 +876,6 @@ "apiContract:header": "[(18,2)-(25,0)]", "apiContract:response": "[(25,2)-(28,0)]" }, - "source-vendor": { - "#30": "RAML 1.0" - }, "resolved-link-target": { "#30": "amf://id#21" } @@ -918,9 +912,6 @@ } ], "smaps": { - "source-vendor": { - "#32": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#32": "[(2,0)-(8,6)]" @@ -949,7 +940,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } @@ -1445,9 +1436,6 @@ } ], "smaps": { - "source-vendor": { - "#2": "RAML 1.0" - }, "lexical": { "security:settings": "[(26,0)-(31,0)]", "apiContract:parameter": "[(6,2)-(11,0)]", @@ -1477,7 +1465,7 @@ "@value": "3.2.0" } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } @@ -1750,9 +1738,6 @@ } ], "smaps": { - "source-vendor": { - "#21": "RAML 1.0" - }, "lexical": { "security:settings": "[(5,0)-(10,0)]", "apiContract:parameter": "[(11,2)-(18,0)]", @@ -1781,7 +1766,7 @@ "@value": "3.2.0" } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } @@ -2297,9 +2282,6 @@ "apiContract:header": "[(11,2)-(17,0)]", "apiContract:response": "[(17,2)-(26,0)]" }, - "source-vendor": { - "#29": "RAML 1.0" - }, "resolved-link-target": { "#29": "amf://id#2" } @@ -2577,9 +2559,6 @@ "apiContract:header": "[(18,2)-(25,0)]", "apiContract:response": "[(25,2)-(28,0)]" }, - "source-vendor": { - "#30": "RAML 1.0" - }, "resolved-link-target": { "#30": "amf://id#21" } 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 119489fe00..29d5be2a9f 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#32", @@ -24,9 +24,6 @@ } ], "smaps": { - "source-vendor": { - "#32": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#32": "[(2,0)-(8,6)]" @@ -187,9 +184,6 @@ "apiContract:header": "[(11,2)-(17,0)]", "apiContract:response": "[(17,2)-(26,0)]" }, - "source-vendor": { - "#29": "RAML 1.0" - }, "resolved-link-target": { "#29": "amf://id#2" } @@ -238,9 +232,6 @@ "apiContract:header": "[(18,2)-(25,0)]", "apiContract:response": "[(25,2)-(28,0)]" }, - "source-vendor": { - "#30": "RAML 1.0" - }, "resolved-link-target": { "#30": "amf://id#21" } @@ -833,9 +824,6 @@ "@id": "#15" }, "smaps": { - "source-vendor": { - "#2": "RAML 1.0" - }, "lexical": { "security:settings": "[(26,0)-(31,0)]", "apiContract:parameter": "[(6,2)-(11,0)]", @@ -854,7 +842,7 @@ "doc:APIContractProcessingData" ], "apiContract:modelVersion": "3.2.0", - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#21", @@ -883,9 +871,6 @@ "@id": "#27" }, "smaps": { - "source-vendor": { - "#21": "RAML 1.0" - }, "lexical": { "security:settings": "[(5,0)-(10,0)]", "apiContract:parameter": "[(11,2)-(18,0)]", @@ -903,7 +888,7 @@ "doc:APIContractProcessingData" ], "apiContract:modelVersion": "3.2.0", - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" } ], "@context": { 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 62da324b5c..19c09f65d4 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 @@ -2804,21 +2804,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/security/security.json/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/resolution/security/security.json/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/security/security.json/web-api#/source-map/lexical/element_1", @@ -2872,7 +2857,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 95347239c6..fb6fb1d411 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/security/security.json/web-api", @@ -72,11 +72,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/security/security.json/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/security/security.json/web-api#/source-map/lexical/element_1" @@ -147,11 +142,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/security/security.json/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/security/security.json/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/security/security.json/web-api#/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/security/security.json/web-api", 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 9d64eb9bee..ea48ed4334 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 @@ -3025,21 +3025,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/security/security.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/resolution/security/security.raml/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/security/security.raml/web-api#/source-map/lexical/element_1", @@ -3093,7 +3078,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 9ab4fb53fa..96c7e9ad86 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/security/security.raml/web-api", @@ -73,11 +73,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/security/security.raml/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/resolution/security/security.raml/web-api#/source-map/lexical/element_1" @@ -162,11 +157,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/resolution/security/security.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/security/security.raml/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/resolution/security/security.raml/web-api#/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/resolution/security/security.raml/web-api", 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 89edcc241f..24426c1bd4 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 @@ -1339,9 +1339,6 @@ } ], "smaps": { - "source-vendor": { - "#30": "OAS 3.0" - }, "lexical": { "apiContract:endpoint": "[(5,0)-(47,0)]", "core:name": "[(4,2)-(5,0)]", @@ -1372,7 +1369,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "OAS 3.0" } 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 4fbaf9782d..cbc4e2dd1c 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "OAS 3.0" + "doc:sourceSpec": "OAS 3.0" }, { "@id": "#30", @@ -28,9 +28,6 @@ } ], "smaps": { - "source-vendor": { - "#30": "OAS 3.0" - }, "lexical": { "apiContract:endpoint": "[(5,0)-(47,0)]", "core:name": "[(4,2)-(5,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 208b71f80f..4616f077fa 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 @@ -325,9 +325,6 @@ } ], "smaps": { - "source-vendor": { - "#16": "OAS 3.0" - }, "lexical": { "apiContract:endpoint": "[(5,0)-(21,0)]", "core:name": "[(4,2)-(5,0)]", @@ -358,7 +355,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "OAS 3.0" } 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 f78e40ec7a..2b71391fc6 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "OAS 3.0" + "doc:sourceSpec": "OAS 3.0" }, { "@id": "#16", @@ -28,9 +28,6 @@ } ], "smaps": { - "source-vendor": { - "#16": "OAS 3.0" - }, "lexical": { "apiContract:endpoint": "[(5,0)-(21,0)]", "core:name": "[(4,2)-(5,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 22b11efb6d..568df083d4 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 @@ -270,9 +270,6 @@ } ], "smaps": { - "source-vendor": { - "#16": "OAS 2.0" - }, "lexical": { "apiContract:endpoint": "[(7,0)-(18,0)]", "apiContract:contentType": "[(5,0)-(7,0)]", @@ -304,7 +301,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "OAS 2.0" } 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 47c3f00d7d..3856d1eb1f 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "OAS 2.0" + "doc:sourceSpec": "OAS 2.0" }, { "@id": "#16", @@ -31,9 +31,6 @@ } ], "smaps": { - "source-vendor": { - "#16": "OAS 2.0" - }, "lexical": { "apiContract:endpoint": "[(7,0)-(18,0)]", "apiContract:contentType": "[(5,0)-(7,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 4b691ccd76..3ba6431957 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 @@ -269,9 +269,6 @@ } ], "smaps": { - "source-vendor": { - "#14": "OAS 3.0" - }, "lexical": { "apiContract:endpoint": "[(5,0)-(16,0)]", "core:name": "[(4,2)-(5,0)]", @@ -302,7 +299,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "OAS 3.0" } 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 91ce6f37c4..25c270234e 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "OAS 3.0" + "doc:sourceSpec": "OAS 3.0" }, { "@id": "#14", @@ -28,9 +28,6 @@ } ], "smaps": { - "source-vendor": { - "#14": "OAS 3.0" - }, "lexical": { "apiContract:endpoint": "[(5,0)-(16,0)]", "core:name": "[(4,2)-(5,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 3743c5a000..ed0b3883a3 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 @@ -825,9 +825,6 @@ } ], "smaps": { - "source-vendor": { - "#30": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#30": "[(2,0)-(48,32)]" @@ -856,7 +853,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 5242b3fe78..31f6eedac7 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#30", @@ -27,9 +27,6 @@ } ], "smaps": { - "source-vendor": { - "#30": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#30": "[(2,0)-(48,32)]" 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 0c65b492e1..4fbe061f40 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 @@ -117,9 +117,6 @@ } ], "smaps": { - "source-vendor": { - "#15": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#15": "[(2,0)-(16,0)]" @@ -148,7 +145,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 7c590df36c..be4355b288 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#15", @@ -24,9 +24,6 @@ } ], "smaps": { - "source-vendor": { - "#15": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#15": "[(2,0)-(16,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 1ab00f54ac..d4a4b3c942 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 @@ -302,9 +302,6 @@ } ], "smaps": { - "source-vendor": { - "#22": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#22": "[(2,0)-(33,8)]" @@ -333,7 +330,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 3919a9f1ae..0d0c047efe 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#22", @@ -27,9 +27,6 @@ } ], "smaps": { - "source-vendor": { - "#22": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#22": "[(2,0)-(33,8)]" 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 d5b32fa3fc..c1d37ccdfe 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 @@ -17,9 +17,6 @@ "doc:DomainElement" ], "smaps": { - "source-vendor": { - "#7": "RAML 1.0" - }, "lexical": { "#7": "[(2,0)-(6,18)]" } @@ -47,7 +44,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 ecdc09b158..e7d7f0b6ee 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#7", @@ -18,9 +18,6 @@ "doc:DomainElement" ], "smaps": { - "source-vendor": { - "#7": "RAML 1.0" - }, "lexical": { "#7": "[(2,0)-(6,18)]" } 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 03b817270d..35cc9df010 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 @@ -33,21 +33,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/additional-properties.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/additional-properties.json#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/additional-properties.json#/web-api/source-map/lexical/element_3", @@ -122,7 +107,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 6befc540a4..cf4fcf156a 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/additional-properties.json#/web-api", @@ -30,11 +30,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/additional-properties.json#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/additional-properties.json#/web-api/source-map/lexical/element_3" @@ -50,11 +45,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/additional-properties.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/additional-properties.json#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/additional-properties.json#/web-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 316802f147..f213efed32 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 @@ -467,21 +467,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/annotations.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/annotations.json#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/annotations.json#/web-api/source-map/lexical/element_3", @@ -556,7 +541,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 9c0cbd32cf..a8c6b5b072 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/annotations.json#/web-api", @@ -86,11 +86,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/annotations.json#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/annotations.json#/web-api/source-map/lexical/element_3" @@ -190,11 +185,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/annotations.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/annotations.json#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/annotations.json#/web-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", diff --git a/amf-cli/shared/src/test/resources/upanddown/annotations.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/annotations.raml.expanded.jsonld index 9b7f6b0bec..f0a16d6514 100644 --- a/amf-cli/shared/src/test/resources/upanddown/annotations.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/annotations.raml.expanded.jsonld @@ -308,21 +308,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/annotations.raml.expanded.jsonld/#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/annotations.raml.expanded.jsonld/#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/annotations.raml.expanded.jsonld/#/web-api/source-map/lexical/element_1", diff --git a/amf-cli/shared/src/test/resources/upanddown/annotations.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/annotations.raml.flattened.jsonld index 203ae9953b..9f8026bd01 100644 --- a/amf-cli/shared/src/test/resources/upanddown/annotations.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/annotations.raml.flattened.jsonld @@ -83,11 +83,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/annotations.raml.flattened.jsonld/#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/annotations.raml.flattened.jsonld/#/web-api/source-map/lexical/element_1" @@ -162,11 +157,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/annotations.raml.flattened.jsonld/#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/annotations.raml.flattened.jsonld/#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/annotations.raml.flattened.jsonld/#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/annotations.raml.flattened.jsonld/#/web-api", diff --git a/amf-cli/shared/src/test/resources/upanddown/anonymous-and-named-examples.jsonld b/amf-cli/shared/src/test/resources/upanddown/anonymous-and-named-examples.jsonld index ee0a9fcd6e..ad40a65073 100644 --- a/amf-cli/shared/src/test/resources/upanddown/anonymous-and-named-examples.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/anonymous-and-named-examples.jsonld @@ -7,6 +7,24 @@ "http://a.ml/vocabularies/document#Module", "http://a.ml/vocabularies/document#Unit" ], + "http://a.ml/vocabularies/document#processingData": [ + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/anonymous-and-named-examples.raml#/BaseUnitProcessingData", + "@type": [ + "http://a.ml/vocabularies/document#APIContractProcessingData" + ], + "http://a.ml/vocabularies/apiContract#modelVersion": [ + { + "@value": "3.2.0" + } + ], + "http://a.ml/vocabularies/document#sourceSpec": [ + { + "@value": "RAML 1.0" + } + ] + } + ], "http://a.ml/vocabularies/document#encodes": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/anonymous-and-named-examples.raml#/web-api", @@ -26,20 +44,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/anonymous-and-named-examples.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "http://a.ml/vocabularies/document-source-maps#element": [ 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 dd0aec0f7e..316d481733 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 @@ -128,21 +128,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/basic.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/basic.json#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/basic.json#/web-api/source-map/lexical/element_8", @@ -282,7 +267,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 1740682d2c..95cdf93778 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/basic.json#/web-api", @@ -60,11 +60,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/basic.json#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/basic.json#/web-api/source-map/lexical/element_8" @@ -116,11 +111,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/basic.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/basic.json#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/basic.json#/web-api/source-map/lexical/element_8", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#termsOfService", 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 8f159cf33d..d96c4c6b50 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 @@ -775,21 +775,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/collection-format.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/collection-format.json#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/collection-format.json#/web-api/source-map/lexical/element_4", @@ -877,7 +862,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 7e4af92ed6..450db192e1 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/collection-format.json#/web-api", @@ -53,11 +53,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/collection-format.json#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/collection-format.json#/web-api/source-map/lexical/element_4" @@ -107,11 +102,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/collection-format.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/collection-format.json#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/collection-format.json#/web-api/source-map/lexical/element_4", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 da226ae399..13c3461dff 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 @@ -368,21 +368,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/complete.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/complete.json#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/complete.json#/web-api/source-map/lexical/element_10", @@ -548,7 +533,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 86b6f78d63..621a1f8d6c 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/complete.json#/web-api", @@ -127,11 +127,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/complete.json#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/complete.json#/web-api/source-map/lexical/element_10" @@ -246,11 +241,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/complete.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/complete.json#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/complete.json#/web-api/source-map/lexical/element_10", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#license", 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 0bb9112144..a1073fbde3 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 @@ -313,21 +313,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/oas20/json/pathitem-fragment/api.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/oas20/json/pathitem-fragment/api.json#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/oas20/json/pathitem-fragment/api.json#/web-api/source-map/lexical/element_3", @@ -402,7 +387,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 5e6195ba29..16edde28e1 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/oas20/json/pathitem-fragment/api.json#/web-api", @@ -52,11 +52,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/oas20/json/pathitem-fragment/api.json#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/oas20/json/pathitem-fragment/api.json#/web-api/source-map/lexical/element_3" @@ -104,11 +99,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/oas20/json/pathitem-fragment/api.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/oas20/json/pathitem-fragment/api.json#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/oas20/json/pathitem-fragment/api.json#/web-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 8956d3223a..9df4c11586 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 @@ -240,21 +240,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/invalid-param-ref/api.yaml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/invalid-param-ref/api.yaml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/invalid-param-ref/api.yaml#/web-api/source-map/lexical/element_3", @@ -329,7 +314,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 875aae1b7b..54daedaf9f 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/invalid-param-ref/api.yaml#/web-api", @@ -52,11 +52,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/invalid-param-ref/api.yaml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/invalid-param-ref/api.yaml#/web-api/source-map/lexical/element_3" @@ -101,11 +96,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/invalid-param-ref/api.yaml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/invalid-param-ref/api.yaml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/invalid-param-ref/api.yaml#/web-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 8bc1b3ede1..885d6a2bbd 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 @@ -589,21 +589,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/multiple-form-data/api.yaml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/multiple-form-data/api.yaml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/multiple-form-data/api.yaml#/web-api/source-map/lexical/element_6", @@ -717,7 +702,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 24ddb012a6..d682f03d1e 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/multiple-form-data/api.yaml#/web-api", @@ -79,11 +79,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/multiple-form-data/api.yaml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/multiple-form-data/api.yaml#/web-api/source-map/lexical/element_6" @@ -158,11 +153,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/multiple-form-data/api.yaml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/multiple-form-data/api.yaml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/multiple-form-data/api.yaml#/web-api/source-map/lexical/element_6", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 c683a8d63e..d72500fd6f 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 @@ -240,21 +240,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/param-in-body-link/api.yaml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/param-in-body-link/api.yaml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/param-in-body-link/api.yaml#/web-api/source-map/lexical/element_3", @@ -329,7 +314,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 50e46c3892..273afa2400 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/param-in-body-link/api.yaml#/web-api", @@ -57,11 +57,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/param-in-body-link/api.yaml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/param-in-body-link/api.yaml#/web-api/source-map/lexical/element_3" @@ -106,11 +101,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/param-in-body-link/api.yaml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/param-in-body-link/api.yaml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/oas20/yaml/param-in-body-link/api.yaml#/web-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#contentType", 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 29ac8fccc4..77388ccd22 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 @@ -7747,21 +7747,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/americanflightapi/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/americanflightapi/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 0.8" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/americanflightapi/api.raml#/web-api/source-map/lexical/element_3", @@ -7836,7 +7821,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 0.8" } 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 833c52e263..4e42a13148 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 0.8" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 0.8" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/americanflightapi/api.raml#/web-api", @@ -105,11 +105,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/americanflightapi/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/americanflightapi/api.raml#/web-api/source-map/lexical/element_3" @@ -298,11 +293,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/americanflightapi/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/americanflightapi/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 0.8" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/americanflightapi/api.raml#/web-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#server", 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 8a61d478d5..cac081ef72 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 @@ -668,21 +668,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/base-uri-params-implicit/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/base-uri-params-implicit/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 0.8" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/base-uri-params-implicit/api.raml#/web-api/source-map/lexical/element_3", @@ -757,7 +742,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 0.8" } 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 a845d0a19a..6d90f82890 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 0.8" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 0.8" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/base-uri-params-implicit/api.raml#/web-api", @@ -78,11 +78,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/base-uri-params-implicit/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/base-uri-params-implicit/api.raml#/web-api/source-map/lexical/element_3" @@ -187,11 +182,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/base-uri-params-implicit/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/base-uri-params-implicit/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 0.8" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/base-uri-params-implicit/api.raml#/web-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#server", 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 e1e8f476bf..4259bdcc2c 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 @@ -956,21 +956,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/default_value/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/default_value/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 0.8" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/default_value/api.raml#/web-api/source-map/lexical/element_3", @@ -1045,7 +1030,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 0.8" } 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 33522e695d..bc5f152a17 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 0.8" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 0.8" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/default_value/api.raml#/web-api", @@ -71,11 +71,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/default_value/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/default_value/api.raml#/web-api/source-map/lexical/element_3" @@ -147,11 +142,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/default_value/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/default_value/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 0.8" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/default_value/api.raml#/web-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#server", 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 d165bedb37..79ad5c3fc4 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 @@ -496,21 +496,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/define-uri-parameters/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/define-uri-parameters/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 0.8" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/define-uri-parameters/api.raml#/web-api/source-map/lexical/element_3", @@ -585,7 +570,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 0.8" } 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 5f8fba432f..7708a6aea3 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 0.8" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 0.8" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/define-uri-parameters/api.raml#/web-api", @@ -105,11 +105,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/define-uri-parameters/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/define-uri-parameters/api.raml#/web-api/source-map/lexical/element_3" @@ -219,11 +214,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/define-uri-parameters/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/define-uri-parameters/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 0.8" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/define-uri-parameters/api.raml#/web-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#server", 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 6f2901c1ac..5650652d1a 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 @@ -215,21 +215,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/empty_payload/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/empty_payload/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 0.8" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/empty_payload/api.raml#/web-api/source-map/lexical/element_1", @@ -278,7 +263,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 0.8" } 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 a4d0bd26ff..c572952eb6 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 0.8" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 0.8" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/empty_payload/api.raml#/web-api", @@ -51,11 +51,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/empty_payload/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/empty_payload/api.raml#/web-api/source-map/lexical/element_1" @@ -97,11 +92,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/empty_payload/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/empty_payload/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 0.8" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/empty_payload/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/empty_payload/api.raml#/web-api", 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 cdd7b08bd6..5b5f134420 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 @@ -392,21 +392,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/file-array/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/file-array/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 0.8" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/file-array/api.raml#/web-api/source-map/lexical/element_3", @@ -481,7 +466,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 0.8" } 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 fc3e236168..03aa23ad8b 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 0.8" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 0.8" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/file-array/api.raml#/web-api", @@ -70,11 +70,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/file-array/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/file-array/api.raml#/web-api/source-map/lexical/element_3" @@ -138,11 +133,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/file-array/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/file-array/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 0.8" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/file-array/api.raml#/web-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#server", 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 86988dec06..4c37e1d0bf 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 @@ -84,21 +84,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/json_schema_array/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/json_schema_array/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 0.8" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/json_schema_array/api.raml#/web-api/source-map/lexical/element_3", @@ -173,7 +158,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 0.8" } 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 d84efd73ed..1e023639f2 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 0.8" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 0.8" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/json_schema_array/api.raml#/web-api", @@ -47,11 +47,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/json_schema_array/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/json_schema_array/api.raml#/web-api/source-map/lexical/element_3" @@ -83,11 +78,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/json_schema_array/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/json_schema_array/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 0.8" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/json_schema_array/api.raml#/web-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#server", 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 c85497a528..d9671c369f 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 @@ -251,21 +251,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/missing_payload/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/missing_payload/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 0.8" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/missing_payload/api.raml#/web-api/source-map/lexical/element_1", @@ -314,7 +299,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 0.8" } 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 064890f2a7..5e7486df56 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 0.8" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 0.8" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/missing_payload/api.raml#/web-api", @@ -51,11 +51,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/missing_payload/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/missing_payload/api.raml#/web-api/source-map/lexical/element_1" @@ -97,11 +92,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/missing_payload/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/missing_payload/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 0.8" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/missing_payload/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/missing_payload/api.raml#/web-api", 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 fe84d5d860..9644bd89b3 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/schema-position/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/schema-position/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 0.8" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/schema-position/api.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 0.8" } 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 42b235aa2d..906234070a 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 0.8" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 0.8" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/schema-position/api.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/schema-position/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/schema-position/api.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/schema-position/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/schema-position/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 0.8" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/schema-position/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml08/schema-position/api.raml#/web-api", 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 81412e1b3f..0c423d7be2 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/all-type-types/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/all-type-types/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/all-type-types/api.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 1ac1b2d5cc..3987ccf906 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/all-type-types/api.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/all-type-types/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/all-type-types/api.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/all-type-types/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/all-type-types/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/all-type-types/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/all-type-types/api.raml#/web-api", 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 f4df71f87f..a9d2fcb561 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 @@ -3000,21 +3000,6 @@ } ] } - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-full/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-full/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } ] } ] @@ -3036,7 +3021,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 cbc4857a5e..611703aa81 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-full/api.raml#/web-api", @@ -240,11 +240,6 @@ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-full/api.raml#/web-api/source-map/lexical/element_4" } - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-full/api.raml#/web-api/source-map/source-vendor/element_0" - } ] }, { @@ -642,11 +637,6 @@ "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#server", "http://a.ml/vocabularies/document-source-maps#value": "[(6,0)-(7,0)]" }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-full/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-full/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-full/api.raml#/web-api/server/myfalsehost.com%2Fapis/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#urlTemplate", 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 08f3269d84..fdee9888c5 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 @@ -2114,21 +2114,6 @@ } ] } - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-scalars/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-scalars/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } ] } ] @@ -2150,7 +2135,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 1f86e91571..d4d4bf195d 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-scalars/api.raml#/web-api", @@ -279,11 +279,6 @@ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-scalars/api.raml#/web-api/source-map/lexical/element_5" } - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-scalars/api.raml#/web-api/source-map/source-vendor/element_0" - } ] }, { @@ -674,11 +669,6 @@ "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#accepts", "http://a.ml/vocabularies/document-source-maps#value": "[(17,0)-(18,0)]" }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-scalars/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-scalars/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-scalars/api.raml#/web-api/server/falsedomain.com%2Fapis/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#urlTemplate", 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 f3c19ab797..7b9d273925 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-type-expressions/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-type-expressions/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-type-expressions/api.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 d4232fd187..8e91d25a96 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-type-expressions/api.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-type-expressions/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-type-expressions/api.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-type-expressions/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-type-expressions/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-type-expressions/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations-type-expressions/api.raml#/web-api", 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 ad96df57ce..55b4870307 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 @@ -461,21 +461,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations/api.raml#/web-api/source-map/lexical/element_1", @@ -524,7 +509,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 de884ea846..bbac873147 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations/api.raml#/web-api", @@ -84,11 +84,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations/api.raml#/web-api/source-map/lexical/element_1" @@ -182,11 +177,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/annotations/api.raml#/web-api", 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 7d4208336c..85d2ef4f04 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/api-with-multi-line-schema/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/api-with-multi-line-schema/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/api-with-multi-line-schema/api.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 0d9bda2260..d8398807d1 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/api-with-multi-line-schema/api.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/api-with-multi-line-schema/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/api-with-multi-line-schema/api.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/api-with-multi-line-schema/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/api-with-multi-line-schema/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/api-with-multi-line-schema/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/api-with-multi-line-schema/api.raml#/web-api", 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 febf76507c..c0af67ed6a 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/array-example/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/array-example/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/array-example/api.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 e707f3860f..360cc5d21b 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/array-example/api.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/array-example/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/array-example/api.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/array-example/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/array-example/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/array-example/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/array-example/api.raml#/web-api", 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 33afbda1dc..060998a9bf 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 @@ -2061,21 +2061,6 @@ } ] } - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/banking-api/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/banking-api/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } ] } ] @@ -2097,7 +2082,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 3a331cb93f..6bdfe1d18e 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/banking-api/api.raml#/web-api", @@ -203,11 +203,6 @@ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/banking-api/api.raml#/web-api/source-map/lexical/element_4" } - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/banking-api/api.raml#/web-api/source-map/source-vendor/element_0" - } ] }, { @@ -525,11 +520,6 @@ "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#server", "http://a.ml/vocabularies/document-source-maps#value": "[(5,0)-(6,0)]" }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/banking-api/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/banking-api/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/banking-api/api.raml#/web-api/server/falsedomain.com%2Fapis/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#urlTemplate", 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 4cd805899d..778c2b00f0 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 @@ -258,21 +258,6 @@ } ] } - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/basic/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/basic/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } ] } ] @@ -294,7 +279,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 3a4852e7da..7f58f9e905 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/basic/api.raml#/web-api", @@ -95,11 +95,6 @@ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/basic/api.raml#/web-api/source-map/lexical/element_7" } - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/basic/api.raml#/web-api/source-map/source-vendor/element_0" - } ] }, { @@ -173,11 +168,6 @@ "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#contentType", "http://a.ml/vocabularies/document-source-maps#value": "[(4,0)-(5,0)]" }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/basic/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/basic/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/basic/api.raml#/web-api/server/api.example.com%2Fpath/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#urlTemplate", 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 17616dccbe..57c6c80241 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 @@ -551,21 +551,6 @@ } ] } - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/basic_with_xsd/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/basic_with_xsd/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } ] } ] @@ -587,7 +572,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 f1e50e828a..7f08dac630 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/basic_with_xsd/api.raml#/web-api", @@ -107,11 +107,6 @@ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/basic_with_xsd/api.raml#/web-api/source-map/lexical/element_5" } - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/basic_with_xsd/api.raml#/web-api/source-map/source-vendor/element_0" - } ] }, { @@ -207,11 +202,6 @@ "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#server", "http://a.ml/vocabularies/document-source-maps#value": "[(6,0)-(8,0)]" }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/basic_with_xsd/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/basic_with_xsd/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/basic_with_xsd/api.raml#/web-api/server/api.example.com%2Fpath/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#urlTemplate", 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 06297cc80d..0520bf2a09 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 @@ -688,21 +688,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/bells%20with%20spaces/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/bells%20with%20spaces/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/bells%20with%20spaces/api.raml#/web-api/source-map/lexical/element_3", @@ -777,7 +762,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 56dd16276b..1c801f9963 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/bells%20with%20spaces/api.raml#/web-api", @@ -73,11 +73,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/bells%20with%20spaces/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/bells%20with%20spaces/api.raml#/web-api/source-map/lexical/element_3" @@ -159,11 +154,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/bells%20with%20spaces/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/bells%20with%20spaces/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/bells%20with%20spaces/api.raml#/web-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#server", 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 8320c83b05..4e8e926bcb 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/boolean-value-in-example/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/boolean-value-in-example/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/boolean-value-in-example/api.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 a3236d86c8..c3af1e4cd3 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/boolean-value-in-example/api.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/boolean-value-in-example/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/boolean-value-in-example/api.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/boolean-value-in-example/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/boolean-value-in-example/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/boolean-value-in-example/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/boolean-value-in-example/api.raml#/web-api", 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 9cee8ca194..b0cf44c557 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 @@ -844,21 +844,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/boolean_in_key/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/boolean_in_key/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/boolean_in_key/api.raml#/web-api/source-map/lexical/element_2", @@ -920,7 +905,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 49462533e4..726e4999fa 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/boolean_in_key/api.raml#/web-api", @@ -52,11 +52,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/boolean_in_key/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/boolean_in_key/api.raml#/web-api/source-map/lexical/element_2" @@ -101,11 +96,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/boolean_in_key/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/boolean_in_key/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/boolean_in_key/api.raml#/web-api/source-map/lexical/element_2", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#name", 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 8a9a0e407f..fa7d5555c9 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 @@ -468,21 +468,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/chars%5B%5Dinfilespaths/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/chars%5B%5Dinfilespaths/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/chars%5B%5Dinfilespaths/api.raml#/web-api/source-map/lexical/element_2", @@ -544,7 +529,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 b610f1d4d8..3beecd0239 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/chars%5B%5Dinfilespaths/api.raml#/web-api", @@ -52,11 +52,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/chars%5B%5Dinfilespaths/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/chars%5B%5Dinfilespaths/api.raml#/web-api/source-map/lexical/element_2" @@ -101,11 +96,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/chars%5B%5Dinfilespaths/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/chars%5B%5Dinfilespaths/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/chars%5B%5Dinfilespaths/api.raml#/web-api/source-map/lexical/element_2", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#name", 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 5260a01223..a02bf96492 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-crossed-props/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-crossed-props/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-crossed-props/api.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 7ec0195971..5c892f2793 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-crossed-props/api.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-crossed-props/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-crossed-props/api.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-crossed-props/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-crossed-props/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-crossed-props/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-crossed-props/api.raml#/web-api", 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 e06e1645e7..bb90b7b082 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-full-valid/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-full-valid/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-full-valid/api.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 a38e1e4333..807bf6221f 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-full-valid/api.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-full-valid/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-full-valid/api.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-full-valid/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-full-valid/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-full-valid/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-full-valid/api.raml#/web-api", 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 2394411e85..82f9fadb9c 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-inheritance/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-inheritance/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-inheritance/api.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 f78e344706..7e254e6333 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-inheritance/api.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-inheritance/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-inheritance/api.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-inheritance/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-inheritance/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-inheritance/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/closures-inheritance/api.raml#/web-api", 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 55ab0faeaf..a19924ce03 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 @@ -1454,21 +1454,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/complete-with-operations/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/complete-with-operations/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/complete-with-operations/api.raml#/web-api/source-map/lexical/element_11", @@ -1647,7 +1632,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 2213c913b5..399984175b 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/complete-with-operations/api.raml#/web-api", @@ -214,11 +214,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/complete-with-operations/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/complete-with-operations/api.raml#/web-api/source-map/lexical/element_11" @@ -507,11 +502,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/complete-with-operations/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/complete-with-operations/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/complete-with-operations/api.raml#/web-api/source-map/lexical/element_11", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#license", 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 af4ba29a2f..423bdcbc05 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 @@ -352,21 +352,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/complete/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/complete/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/complete/api.raml#/web-api/source-map/lexical/element_11", @@ -545,7 +530,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 c31fb9cc35..17e1ca5c51 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/complete/api.raml#/web-api", @@ -126,11 +126,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/complete/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/complete/api.raml#/web-api/source-map/lexical/element_11" @@ -243,11 +238,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/complete/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/complete/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/complete/api.raml#/web-api/source-map/lexical/element_11", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#license", 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 44b57d3cb3..38781ba3ec 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 @@ -22,21 +22,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/data-type-fragment/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/data-type-fragment/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/data-type-fragment/api.raml#/web-api/source-map/lexical/element_0", @@ -72,7 +57,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -318,21 +303,6 @@ } ] } - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/data-type-fragment/api.raml#/references/0/shape/type/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/data-type-fragment/api.raml#/references/0/shape/type" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } ] } ] @@ -354,7 +324,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 8f111278b1..9b136418cb 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/data-type-fragment/api.raml#/web-api", @@ -27,22 +27,12 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/data-type-fragment/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/data-type-fragment/api.raml#/web-api/source-map/lexical/element_0" } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/data-type-fragment/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/data-type-fragment/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/data-type-fragment/api.raml#/web-api/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/data-type-fragment/api.raml#/web-api", @@ -144,7 +134,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/data-type-fragment/api.raml#/references/0/source-map", @@ -224,11 +214,6 @@ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/data-type-fragment/api.raml#/references/0/shape/type/source-map/lexical/element_0" } - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/data-type-fragment/api.raml#/references/0/shape/type/source-map/source-vendor/element_0" - } ] }, { @@ -314,11 +299,6 @@ "http://a.ml/vocabularies/document-source-maps#element": "http://www.w3.org/ns/shacl#property", "http://a.ml/vocabularies/document-source-maps#value": "[(2,11)-(5,0)]" }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/data-type-fragment/api.raml#/references/0/shape/type/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/data-type-fragment/api.raml#/references/0/shape/type", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/data-type-fragment/api.raml#/references/0/shape/type/property/property/name/scalar/name/source-map", "@type": [ 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 08ebcc910f..6394ebb809 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/declarations-small/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/declarations-small/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/declarations-small/api.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 5cfde45b6e..b0456cded6 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/declarations-small/api.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/declarations-small/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/declarations-small/api.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/declarations-small/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/declarations-small/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/declarations-small/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/declarations-small/api.raml#/web-api", 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 c55822cd11..d65885ba83 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/declared-security-schemes/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/declared-security-schemes/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/declared-security-schemes/api.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 78f3926238..3188b7ed1d 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/declared-security-schemes/api.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/declared-security-schemes/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/declared-security-schemes/api.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/declared-security-schemes/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/declared-security-schemes/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/declared-security-schemes/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/declared-security-schemes/api.raml#/web-api", 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 d99714119a..5009de4dc6 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 @@ -1443,21 +1443,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/default-types/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/default-types/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/default-types/api.raml#/web-api/source-map/lexical/element_1", @@ -1506,7 +1491,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 7c7f953a7b..3c5437896c 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/default-types/api.raml#/web-api", @@ -77,11 +77,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/default-types/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/default-types/api.raml#/web-api/source-map/lexical/element_1" @@ -179,11 +174,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/default-types/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/default-types/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/default-types/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/default-types/api.raml#/web-api", 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 7df3a3dbbf..9c012b6da6 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 @@ -419,21 +419,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-external-fragment/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-external-fragment/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-external-fragment/api.raml#/web-api/source-map/lexical/element_1", @@ -482,7 +467,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 6b76ec8a26..707138e2be 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-external-fragment/api.raml#/web-api", @@ -51,11 +51,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-external-fragment/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-external-fragment/api.raml#/web-api/source-map/lexical/element_1" @@ -97,11 +92,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-external-fragment/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-external-fragment/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-external-fragment/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-external-fragment/api.raml#/web-api", 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 019b072baf..3021a2cdae 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 @@ -21,7 +21,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -34,21 +34,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-library/api.raml#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-library/api.raml" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-library/api.raml#/source-map/lexical/element_0", 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 afb621fe03..c330798f85 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-library/api.raml", @@ -29,22 +29,12 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-library/api.raml#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-library/api.raml#/source-map/lexical/element_0" } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-library/api.raml#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-library/api.raml", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-library/api.raml#/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-library/api.raml", 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 3f44dc00ce..074e57a165 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 @@ -431,21 +431,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-resesponse-securityscheme/api.raml#/scheme/fragment/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-resesponse-securityscheme/api.raml#/scheme/fragment" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-resesponse-securityscheme/api.raml#/scheme/fragment/source-map/lexical/element_6", @@ -559,7 +544,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 d28c1b1ab0..af0479cc68 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 @@ -34,7 +34,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-resesponse-securityscheme/api.raml#/scheme/fragment/header/parameter/header/h1", @@ -102,11 +102,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-resesponse-securityscheme/api.raml#/scheme/fragment/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-resesponse-securityscheme/api.raml#/scheme/fragment/source-map/lexical/element_6" @@ -239,11 +234,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-resesponse-securityscheme/api.raml#/scheme/fragment/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-resesponse-securityscheme/api.raml#/scheme/fragment", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty-resesponse-securityscheme/api.raml#/scheme/fragment/source-map/lexical/element_6", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#response", 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 ed7b9be69b..7b2683ae44 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 @@ -405,21 +405,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty_union/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty_union/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty_union/api.raml#/web-api/source-map/lexical/element_2", @@ -481,7 +466,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 18603a4359..6e81e05e39 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty_union/api.raml#/web-api", @@ -52,11 +52,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty_union/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty_union/api.raml#/web-api/source-map/lexical/element_2" @@ -101,11 +96,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty_union/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty_union/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/empty_union/api.raml#/web-api/source-map/lexical/element_2", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#name", 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 5d5e0a3943..84b328abc6 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 @@ -648,21 +648,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/endpoints/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/endpoints/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/endpoints/api.raml#/web-api/source-map/lexical/element_11", @@ -841,7 +826,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 075809093b..1e0dbcc042 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/endpoints/api.raml#/web-api", @@ -196,11 +196,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/endpoints/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/endpoints/api.raml#/web-api/source-map/lexical/element_11" @@ -391,11 +386,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/endpoints/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/endpoints/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/endpoints/api.raml#/web-api/source-map/lexical/element_11", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#license", 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 9f1bbf92e3..f1b6c93332 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/enum-inheritance/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/enum-inheritance/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/enum-inheritance/api.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 fe38969e10..81417381c0 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/enum-inheritance/api.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/enum-inheritance/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/enum-inheritance/api.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/enum-inheritance/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/enum-inheritance/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/enum-inheritance/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/enum-inheritance/api.raml#/web-api", 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 2d0e7009a1..3914c06cb5 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/enums/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/enums/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/enums/api.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 13a42f0e27..0ae6ba6bb3 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/enums/api.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/enums/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/enums/api.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/enums/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/enums/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/enums/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/enums/api.raml#/web-api", 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 81a946abab..29f627b385 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/example-key-map-without-value/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/example-key-map-without-value/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/example-key-map-without-value/api.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 6ff516a307..c9d48976df 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/example-key-map-without-value/api.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/example-key-map-without-value/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/example-key-map-without-value/api.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/example-key-map-without-value/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/example-key-map-without-value/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/example-key-map-without-value/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/example-key-map-without-value/api.raml#/web-api", 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 43f65efe03..e96c27d472 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 @@ -3114,21 +3114,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/examples/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/examples/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/examples/api.raml#/web-api/source-map/lexical/element_1", @@ -3177,7 +3162,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 1f9de02cfb..81a893052b 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/examples/api.raml#/web-api", @@ -54,11 +54,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/examples/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/examples/api.raml#/web-api/source-map/lexical/element_1" @@ -119,11 +114,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/examples/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/examples/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/examples/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/examples/api.raml#/web-api", 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 fa987aac04..be2c2f9316 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 @@ -895,21 +895,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/explicit-&-implicit-type-object/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/explicit-&-implicit-type-object/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/explicit-&-implicit-type-object/api.raml#/web-api/source-map/lexical/element_1", @@ -958,7 +943,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 e8f8cdd293..b2b1858109 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/explicit-&-implicit-type-object/api.raml#/web-api", @@ -53,11 +53,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/explicit-&-implicit-type-object/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/explicit-&-implicit-type-object/api.raml#/web-api/source-map/lexical/element_1" @@ -106,11 +101,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/explicit-&-implicit-type-object/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/explicit-&-implicit-type-object/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/explicit-&-implicit-type-object/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/explicit-&-implicit-type-object/api.raml#/web-api", 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 a3493e6589..310f08bcea 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 @@ -96,21 +96,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/extensions/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/extensions/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/extensions/api.raml#/web-api/source-map/lexical/element_0", @@ -151,7 +136,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -2272,21 +2257,6 @@ } ] } - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/extensions/api.raml#/references/0/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/extensions/api.raml#/references/0/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } ] } ] @@ -2308,7 +2278,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 d525b1396f..de2b0c2748 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/extensions/api.raml#/web-api", @@ -46,11 +46,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/extensions/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/extensions/api.raml#/web-api/source-map/lexical/element_0" @@ -74,11 +69,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/extensions/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/extensions/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/extensions/api.raml#/web-api/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/extensions/api.raml#/web-api", @@ -217,7 +207,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/extensions/api.raml#/source-map/extends-reference/element_0", @@ -385,11 +375,6 @@ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/extensions/api.raml#/references/0/web-api/source-map/lexical/element_4" } - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/extensions/api.raml#/references/0/web-api/source-map/source-vendor/element_0" - } ] }, { @@ -707,11 +692,6 @@ "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#server", "http://a.ml/vocabularies/document-source-maps#value": "[(5,0)-(6,0)]" }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/extensions/api.raml#/references/0/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/extensions/api.raml#/references/0/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/extensions/api.raml#/references/0/web-api/server/falsedomain.com%2Fapis/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#urlTemplate", 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 06746e8ebe..90253c0f3a 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 @@ -1259,21 +1259,6 @@ } ] } - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/externals/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/externals/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } ] } ] @@ -1295,7 +1280,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 077759a063..f4989d80c2 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/externals/api.raml#/web-api", @@ -99,11 +99,6 @@ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/externals/api.raml#/web-api/source-map/lexical/element_2" } - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/externals/api.raml#/web-api/source-map/source-vendor/element_0" - } ] }, { @@ -200,11 +195,6 @@ "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/externals/api.raml#/web-api", "http://a.ml/vocabularies/document-source-maps#value": "[(2,0)-(17,91)]" }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/externals/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/externals/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/externals/api.raml#/web-api/endpoint/%2Fgroups/supportedOperation/post/expects/request", "@type": [ 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 294727a84b..b039c41cf8 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 @@ -285,21 +285,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file-detection/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file-detection/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file-detection/api.raml#/web-api/source-map/lexical/element_1", @@ -348,7 +333,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 9ee171f4e1..e5e1d737f1 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file-detection/api.raml#/web-api", @@ -51,11 +51,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file-detection/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file-detection/api.raml#/web-api/source-map/lexical/element_1" @@ -97,11 +92,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file-detection/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file-detection/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file-detection/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file-detection/api.raml#/web-api", 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 5644360615..e9a9b2ecce 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 @@ -593,21 +593,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file_type_expression/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file_type_expression/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file_type_expression/api.raml#/web-api/source-map/lexical/element_4", @@ -695,7 +680,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 82fb437f51..e7019d6db5 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file_type_expression/api.raml#/web-api", @@ -73,11 +73,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file_type_expression/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file_type_expression/api.raml#/web-api/source-map/lexical/element_4" @@ -150,11 +145,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file_type_expression/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file_type_expression/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file_type_expression/api.raml#/web-api/source-map/lexical/element_4", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#scheme", 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 8cab593435..cc6ccff64a 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file_types/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file_types/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file_types/api.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 1d9804da9a..36ef7fb6b8 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file_types/api.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file_types/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file_types/api.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file_types/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file_types/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file_types/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/file_types/api.raml#/web-api", 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 482249b1c5..a6fca1e23f 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-inherits-reference/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-inherits-reference/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-inherits-reference/api.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 5077e10274..d4c63269fd 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-inherits-reference/api.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-inherits-reference/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-inherits-reference/api.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-inherits-reference/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-inherits-reference/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-inherits-reference/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-inherits-reference/api.raml#/web-api", 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 00e15cac72..cb558e0e19 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 @@ -608,21 +608,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-references-types/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-references-types/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-references-types/api.raml#/web-api/source-map/lexical/element_0", @@ -658,7 +643,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 0cf1671059..280a3397fa 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-references-types/api.raml#/web-api", @@ -71,11 +71,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-references-types/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-references-types/api.raml#/web-api/source-map/lexical/element_0" @@ -146,11 +141,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-references-types/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-references-types/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-references-types/api.raml#/web-api/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-references-types/api.raml#/web-api", 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 42e39621cd..0588767195 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-shape-custom-properties/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-shape-custom-properties/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-shape-custom-properties/api.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 abc118c79a..8262e0d5db 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-shape-custom-properties/api.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-shape-custom-properties/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-shape-custom-properties/api.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-shape-custom-properties/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-shape-custom-properties/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-shape-custom-properties/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/forward-shape-custom-properties/api.raml#/web-api", 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 d0a8d95e8c..d9d577d6b6 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 @@ -1450,21 +1450,6 @@ } ] } - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/fragment_usage/api.raml#/shape/type/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/fragment_usage/api.raml#/shape/type" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } ] } ] @@ -1491,7 +1476,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 ca42f1ea9e..9277d0e0b6 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 @@ -33,7 +33,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/fragment_usage/api.raml#/shape/type/property/property/name", @@ -96,11 +96,6 @@ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/fragment_usage/api.raml#/shape/type/source-map/lexical/element_1" } - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/fragment_usage/api.raml#/shape/type/source-map/source-vendor/element_0" - } ] }, { @@ -206,11 +201,6 @@ "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/fragment_usage/api.raml#/shape/type", "http://a.ml/vocabularies/document-source-maps#value": "[(3,0)-(21,16)]" }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/fragment_usage/api.raml#/shape/type/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/fragment_usage/api.raml#/shape/type", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/fragment_usage/api.raml#/shape/type/property/property/name/scalar/name/source-map", "@type": [ 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 1d61e13377..2f7006b6c2 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 @@ -2862,21 +2862,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/full-example/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/full-example/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/full-example/api.raml#/web-api/source-map/lexical/element_11", @@ -3055,7 +3040,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 f87aebd4e1..495b03f125 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/full-example/api.raml#/web-api", @@ -206,11 +206,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/full-example/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/full-example/api.raml#/web-api/source-map/lexical/element_11" @@ -492,11 +487,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/full-example/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/full-example/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/full-example/api.raml#/web-api/source-map/lexical/element_11", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#license", 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 f1f669abca..01b65b5e2b 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/implicitly-defined-object/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/implicitly-defined-object/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/implicitly-defined-object/api.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 a464d530c2..ef38e791d6 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/implicitly-defined-object/api.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/implicitly-defined-object/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/implicitly-defined-object/api.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/implicitly-defined-object/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/implicitly-defined-object/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/implicitly-defined-object/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/implicitly-defined-object/api.raml#/web-api", 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 7b426f272c..93711ea451 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/include-repeated/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/include-repeated/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/include-repeated/api.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 2ea89f7d58..44d2ea15cf 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/include-repeated/api.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/include-repeated/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/include-repeated/api.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/include-repeated/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/include-repeated/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/include-repeated/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/include-repeated/api.raml#/web-api", 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 e678795727..8b77e3542b 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 @@ -3640,21 +3640,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/web-api/source-map/lexical/element_1", @@ -3703,7 +3688,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -4790,21 +4775,6 @@ ] } ], - "http://a.ml/vocabularies/document-source-maps#type-property-lexical-info": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/0/shape/type/source-map/type-property-lexical-info/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/0/shape/type" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "[(2,0)-(2,4)]" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/0/shape/type/source-map/lexical/element_1", @@ -4833,9 +4803,9 @@ ] } ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ + "http://a.ml/vocabularies/document-source-maps#type-property-lexical-info": [ { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/0/shape/type/source-map/source-vendor/element_0", + "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/0/shape/type/source-map/type-property-lexical-info/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/0/shape/type" @@ -4843,7 +4813,7 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "RAML 1.0" + "@value": "[(2,0)-(2,4)]" } ] } @@ -4868,7 +4838,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -4922,29 +4892,6 @@ { "@value": "application/yaml" } - ], - "http://a.ml/vocabularies/document-source-maps#sources": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/1/external/source-map", - "@type": [ - "http://a.ml/vocabularies/document-source-maps#SourceMap" - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/1/external/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/1/external" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ] - } ] } ], @@ -4964,7 +4911,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -5018,29 +4965,6 @@ { "@value": "application/yaml" } - ], - "http://a.ml/vocabularies/document-source-maps#sources": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/2/external/source-map", - "@type": [ - "http://a.ml/vocabularies/document-source-maps#SourceMap" - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/2/external/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/2/external" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ] - } ] } ], @@ -5060,7 +4984,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 cc68f8aa36..cbe216a930 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/web-api", @@ -80,11 +80,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/web-api/source-map/lexical/element_1" @@ -206,11 +201,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/web-api", @@ -2955,7 +2945,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/0/source-map", @@ -2975,12 +2965,7 @@ "http://a.ml/vocabularies/document#DomainElement" ], "http://a.ml/vocabularies/document#raw": "#%RAML 1.0 NamedExample\nvalue:\n -\n \n category: \n id: 39691\n name: Religious and Spiritual\n created_at: 2013-01-02T22:21:34Z\n \n -\n category: \n id: 61111 \n name: Service\n created_at: 2016-02-01T16:37:02Z\n ", - "http://a.ml/vocabularies/core#mediaType": "application/yaml", - "http://a.ml/vocabularies/document-source-maps#sources": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/1/external/source-map" - } - ] + "http://a.ml/vocabularies/core#mediaType": "application/yaml" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/1/BaseUnitProcessingData", @@ -2988,7 +2973,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/1/source-map", @@ -3008,12 +2993,7 @@ "http://a.ml/vocabularies/document#DomainElement" ], "http://a.ml/vocabularies/document#raw": "#%RAML 1.0 NamedExample\nvalue:\n alternate_id: 1\n category: \n id: 39691\n name: Religious and Spiritual\n created_at: 2013-01-02T22:21:34Z\n \n", - "http://a.ml/vocabularies/core#mediaType": "application/yaml", - "http://a.ml/vocabularies/document-source-maps#sources": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/2/external/source-map" - } - ] + "http://a.ml/vocabularies/core#mediaType": "application/yaml" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/2/BaseUnitProcessingData", @@ -3021,7 +3001,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/2/source-map", @@ -3142,11 +3122,6 @@ "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/0/shape/type/source-map/synthesized-field/element_0" } ], - "http://a.ml/vocabularies/document-source-maps#type-property-lexical-info": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/0/shape/type/source-map/type-property-lexical-info/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/0/shape/type/source-map/lexical/element_1" @@ -3155,9 +3130,9 @@ "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/0/shape/type/source-map/lexical/element_0" } ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ + "http://a.ml/vocabularies/document-source-maps#type-property-lexical-info": [ { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/0/shape/type/source-map/source-vendor/element_0" + "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/0/shape/type/source-map/type-property-lexical-info/element_0" } ] }, @@ -3166,33 +3141,11 @@ "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/0", "http://a.ml/vocabularies/document-source-maps#value": "[(1,0)-(20,0)]" }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/1/external/source-map", - "@type": [ - "http://a.ml/vocabularies/document-source-maps#SourceMap" - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/1/external/source-map/source-vendor/element_0" - } - ] - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/1/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/1", "http://a.ml/vocabularies/document-source-maps#value": "[(1,0)-(15,3)]" }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/2/external/source-map", - "@type": [ - "http://a.ml/vocabularies/document-source-maps#SourceMap" - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/2/external/source-map/source-vendor/element_0" - } - ] - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/2/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/2", @@ -3359,11 +3312,6 @@ "http://a.ml/vocabularies/document-source-maps#element": "http://www.w3.org/ns/shacl#closed", "http://a.ml/vocabularies/document-source-maps#value": "true" }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/0/shape/type/source-map/type-property-lexical-info/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/0/shape/type", - "http://a.ml/vocabularies/document-source-maps#value": "[(2,0)-(2,4)]" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/0/shape/type/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/0/shape/type", @@ -3375,19 +3323,9 @@ "http://a.ml/vocabularies/document-source-maps#value": "[(3,11)-(20,0)]" }, { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/0/shape/type/source-map/source-vendor/element_0", + "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/0/shape/type/source-map/type-property-lexical-info/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/0/shape/type", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/1/external/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/1/external", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/2/external/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/2/external", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" + "http://a.ml/vocabularies/document-source-maps#value": "[(2,0)-(2,4)]" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/inline-named-examples/api.raml#/references/0/shape/type/property/property/alternate_id/union/alternate_id%3F/inherits/union/default-union", 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 7ec6eb353f..270cf5af98 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 @@ -1085,21 +1085,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/int_uri_param/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/int_uri_param/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/int_uri_param/api.raml#/web-api/source-map/lexical/element_2", @@ -1161,7 +1146,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 0fd6b57174..7b1170d239 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/int_uri_param/api.raml#/web-api", @@ -135,11 +135,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/int_uri_param/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/int_uri_param/api.raml#/web-api/source-map/lexical/element_2" @@ -334,11 +329,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/int_uri_param/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/int_uri_param/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/int_uri_param/api.raml#/web-api/source-map/lexical/element_2", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#name", 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 23209e23de..4f4da08e5a 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 @@ -1006,21 +1006,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/jukebox-api/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/jukebox-api/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/jukebox-api/api.raml#/web-api/source-map/lexical/element_3", @@ -1095,7 +1080,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 97e3217479..5eddb99bed 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/jukebox-api/api.raml#/web-api", @@ -75,11 +75,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/jukebox-api/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/jukebox-api/api.raml#/web-api/source-map/lexical/element_3" @@ -160,11 +155,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/jukebox-api/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/jukebox-api/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/jukebox-api/api.raml#/web-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#server", 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 097a919400..1625046d67 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 @@ -773,21 +773,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/konst1/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/konst1/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/konst1/api.raml#/web-api/source-map/lexical/element_1", @@ -836,7 +821,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 04ea38b186..57ddf03d26 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/konst1/api.raml#/web-api", @@ -59,11 +59,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/konst1/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/konst1/api.raml#/web-api/source-map/lexical/element_1" @@ -134,11 +129,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/konst1/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/konst1/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/konst1/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/konst1/api.raml#/web-api", 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 759e76d119..47739c4508 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/lib-alias-reference/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/lib-alias-reference/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/lib-alias-reference/api.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -412,7 +397,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -425,21 +410,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/lib-alias-reference/api.raml#/references/0/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/lib-alias-reference/api.raml#/references/0" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/lib-alias-reference/api.raml#/references/0/source-map/lexical/element_1", 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 9653c48de8..434bf23aaa 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/lib-alias-reference/api.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/lib-alias-reference/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/lib-alias-reference/api.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/lib-alias-reference/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/lib-alias-reference/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/lib-alias-reference/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/lib-alias-reference/api.raml#/web-api", @@ -171,18 +161,13 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/lib-alias-reference/api.raml#/references/0/source-map", "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/lib-alias-reference/api.raml#/references/0/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/lib-alias-reference/api.raml#/references/0/source-map/lexical/element_1" @@ -269,11 +254,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/lib-alias-reference/api.raml#/references/0/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/lib-alias-reference/api.raml#/references/0", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/lib-alias-reference/api.raml#/references/0/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/lib-alias-reference/api.raml#/references/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 7a053ffdf8..28af2debec 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries-3-alias/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries-3-alias/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries-3-alias/api.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -412,7 +397,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -425,21 +410,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries-3-alias/api.raml#/references/0/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries-3-alias/api.raml#/references/0" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries-3-alias/api.raml#/references/0/source-map/lexical/element_1", 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 90ff00f9f8..90ea05ac30 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries-3-alias/api.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries-3-alias/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries-3-alias/api.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries-3-alias/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries-3-alias/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries-3-alias/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries-3-alias/api.raml#/web-api", @@ -221,18 +211,13 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries-3-alias/api.raml#/references/0/source-map", "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries-3-alias/api.raml#/references/0/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries-3-alias/api.raml#/references/0/source-map/lexical/element_1" @@ -361,11 +346,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries-3-alias/api.raml#/references/0/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries-3-alias/api.raml#/references/0", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries-3-alias/api.raml#/references/0/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries-3-alias/api.raml#/references/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 d51de7c5e4..b578f2f706 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries/api.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -573,7 +558,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -586,21 +571,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries/api.raml#/references/0/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries/api.raml#/references/0" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries/api.raml#/references/0/source-map/lexical/element_1", 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 624d0fe25e..98cce2ac95 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries/api.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries/api.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries/api.raml#/web-api", @@ -147,18 +137,13 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries/api.raml#/references/0/source-map", "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries/api.raml#/references/0/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries/api.raml#/references/0/source-map/lexical/element_1" @@ -248,11 +233,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries/api.raml#/references/0/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries/api.raml#/references/0", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries/api.raml#/references/0/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/libraries/api.raml#/references/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 3096da98d5..deb64b07ec 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 @@ -21,7 +21,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -118,21 +118,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/library-annotations/api.raml#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/library-annotations/api.raml" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/library-annotations/api.raml#/source-map/lexical/element_0", 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 c7f9f085f0..b59ae8f07b 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/library-annotations/api.raml#/customDomainProperties/extension", @@ -293,11 +293,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/library-annotations/api.raml#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/library-annotations/api.raml#/source-map/lexical/element_0" @@ -360,11 +355,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/library-annotations/api.raml#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/library-annotations/api.raml", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/library-annotations/api.raml#/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/library-annotations/api.raml", 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 a258b41266..f39b733437 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/matrix-id/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/matrix-id/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/matrix-id/api.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 4146d564f1..becca3b156 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/matrix-id/api.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/matrix-id/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/matrix-id/api.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/matrix-id/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/matrix-id/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/matrix-id/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/matrix-id/api.raml#/web-api", 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 5c1a6ddcaa..94cdb30d9b 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 @@ -94,21 +94,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/matrix/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/matrix/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/matrix/api.raml#/web-api/source-map/lexical/element_5", @@ -209,7 +194,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 426700d066..7e4cc476a4 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/matrix/api.raml#/web-api", @@ -51,11 +51,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/matrix/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/matrix/api.raml#/web-api/source-map/lexical/element_5" @@ -93,11 +88,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/matrix/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/matrix/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/matrix/api.raml#/web-api/source-map/lexical/element_5", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#scheme", 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 5e23291707..d710b96353 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 @@ -1085,21 +1085,6 @@ } ] } - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/missing_example/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/missing_example/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } ] } ] @@ -1121,7 +1106,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 4d07c97337..2c2957d629 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/missing_example/api.raml#/web-api", @@ -78,11 +78,6 @@ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/missing_example/api.raml#/web-api/source-map/lexical/element_2" } - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/missing_example/api.raml#/web-api/source-map/source-vendor/element_0" - } ] }, { @@ -147,11 +142,6 @@ "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/missing_example/api.raml#/web-api", "http://a.ml/vocabularies/document-source-maps#value": "[(2,0)-(26,9)]" }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/missing_example/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/missing_example/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/missing_example/api.raml#/web-api/endpoint/%2Fok0/supportedOperation/post/expects/request", "@type": [ 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 0e956990e3..08bb468436 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 @@ -108,21 +108,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-inheritance-2/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-inheritance-2/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-inheritance-2/api.raml#/web-api/source-map/lexical/element_6", @@ -236,7 +221,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 f041dd2806..39e08413d7 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-inheritance-2/api.raml#/web-api", @@ -59,11 +59,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-inheritance-2/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-inheritance-2/api.raml#/web-api/source-map/lexical/element_6" @@ -104,11 +99,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-inheritance-2/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-inheritance-2/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-inheritance-2/api.raml#/web-api/source-map/lexical/element_6", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#scheme", 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 256c85706f..84292ed979 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-inheritance/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-inheritance/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-inheritance/api.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 78453f3387..557dd6f8e7 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-inheritance/api.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-inheritance/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-inheritance/api.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-inheritance/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-inheritance/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-inheritance/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-inheritance/api.raml#/web-api", 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 0a7f30a7fa..33eba57aa8 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 @@ -1112,21 +1112,6 @@ } ] } - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-media-types/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-media-types/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } ] } ] @@ -1148,7 +1133,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 9d4188a243..a50bcd6f2d 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-media-types/api.raml#/web-api", @@ -127,11 +127,6 @@ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-media-types/api.raml#/web-api/source-map/lexical/element_5" } - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-media-types/api.raml#/web-api/source-map/source-vendor/element_0" - } ] }, { @@ -256,11 +251,6 @@ "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#accepts", "http://a.ml/vocabularies/document-source-maps#value": "[(4,0)-(5,0)]" }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-media-types/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-media-types/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/multiple-media-types/api.raml#/web-api/server/http%3A%2F%2Flocalhost%3A8081%2Fapi/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#urlTemplate", 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 f2fcdb40f4..2cda642f24 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 @@ -22,21 +22,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/named-example/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/named-example/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/named-example/api.raml#/web-api/source-map/lexical/element_0", @@ -72,7 +57,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -103,29 +88,6 @@ { "@value": "application/yaml" } - ], - "http://a.ml/vocabularies/document-source-maps#sources": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/named-example/api.raml#/references/0/external/source-map", - "@type": [ - "http://a.ml/vocabularies/document-source-maps#SourceMap" - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/named-example/api.raml#/references/0/external/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/named-example/api.raml#/references/0/external" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ] - } ] } ], @@ -145,7 +107,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 c3be42f939..456c8070d1 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/named-example/api.raml#/web-api", @@ -27,22 +27,12 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/named-example/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/named-example/api.raml#/web-api/source-map/lexical/element_0" } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/named-example/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/named-example/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/named-example/api.raml#/web-api/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/named-example/api.raml#/web-api", @@ -131,12 +121,7 @@ "http://a.ml/vocabularies/document#DomainElement" ], "http://a.ml/vocabularies/document#raw": "#%RAML 1.0 NamedExample\npersonExample:\n name: Bob\n lastname: Marley", - "http://a.ml/vocabularies/core#mediaType": "application/yaml", - "http://a.ml/vocabularies/document-source-maps#sources": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/named-example/api.raml#/references/0/external/source-map" - } - ] + "http://a.ml/vocabularies/core#mediaType": "application/yaml" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/named-example/api.raml#/references/0/BaseUnitProcessingData", @@ -144,7 +129,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/named-example/api.raml#/references/0/source-map", @@ -253,17 +238,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/named-example/api.raml#/references/0/external/source-map", - "@type": [ - "http://a.ml/vocabularies/document-source-maps#SourceMap" - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/named-example/api.raml#/references/0/external/source-map/source-vendor/element_0" - } - ] - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/named-example/api.raml#/references/0/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/named-example/api.raml#/references/0", @@ -424,11 +398,6 @@ "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/named-example/api.raml#/declares/shape/person", "http://a.ml/vocabularies/document-source-maps#value": "" }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/named-example/api.raml#/references/0/external/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/named-example/api.raml#/references/0/external", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/named-example/api.raml#/declares/shape/person/property/property/name/scalar/name/source-map", "@type": [ 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 7c53e92075..04ea9c7460 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 @@ -226,21 +226,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/null-secured-by/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/null-secured-by/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/null-secured-by/api.raml#/web-api/source-map/lexical/element_1", @@ -289,7 +274,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 26f12049ba..6198cbc378 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/null-secured-by/api.raml#/web-api", @@ -51,11 +51,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/null-secured-by/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/null-secured-by/api.raml#/web-api/source-map/lexical/element_1" @@ -97,11 +92,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/null-secured-by/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/null-secured-by/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/null-secured-by/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/null-secured-by/api.raml#/web-api", 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 4997905aeb..c5660de0d8 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/number_title/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/number_title/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/number_title/api.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 891e51f4bb..ddd3b92605 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/number_title/api.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/number_title/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/number_title/api.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/number_title/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/number_title/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/number_title/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/number_title/api.raml#/web-api", 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 523da19ccf..e9dc4920a8 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 @@ -444,21 +444,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/numeric-facets/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/numeric-facets/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/numeric-facets/api.raml#/web-api/source-map/lexical/element_6", @@ -572,7 +557,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 978637aa04..694f3e3356 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/numeric-facets/api.raml#/web-api", @@ -63,11 +63,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/numeric-facets/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/numeric-facets/api.raml#/web-api/source-map/lexical/element_6" @@ -124,11 +119,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/numeric-facets/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/numeric-facets/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/numeric-facets/api.raml#/web-api/source-map/lexical/element_6", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#scheme", 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 2795fca6e1..f0bbd29138 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 @@ -32,21 +32,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/oauth_security_scheme/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/oauth_security_scheme/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/oauth_security_scheme/api.raml#/web-api/source-map/lexical/element_2", @@ -108,7 +93,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 989759fc74..952c0954ba 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/oauth_security_scheme/api.raml#/web-api", @@ -29,11 +29,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/oauth_security_scheme/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/oauth_security_scheme/api.raml#/web-api/source-map/lexical/element_2" @@ -46,11 +41,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/oauth_security_scheme/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/oauth_security_scheme/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/oauth_security_scheme/api.raml#/web-api/source-map/lexical/element_2", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#name", 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 672c9bb5f7..484d711830 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 @@ -631,21 +631,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/operation-response/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/operation-response/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/operation-response/api.raml#/web-api/source-map/lexical/element_8", @@ -785,7 +770,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 d8ec542591..1771d5fc0f 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/operation-response/api.raml#/web-api", @@ -101,11 +101,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/operation-response/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/operation-response/api.raml#/web-api/source-map/lexical/element_8" @@ -211,11 +206,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/operation-response/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/operation-response/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/operation-response/api.raml#/web-api/source-map/lexical/element_8", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 89efad0236..a3b2308103 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 @@ -96,21 +96,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/overlay/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/overlay/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/overlay/api.raml#/web-api/source-map/lexical/element_0", @@ -151,7 +136,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -2272,21 +2257,6 @@ } ] } - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/overlay/api.raml#/references/0/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/overlay/api.raml#/references/0/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } ] } ] @@ -2308,7 +2278,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 bc8351bc7f..1f916632b2 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/overlay/api.raml#/web-api", @@ -46,11 +46,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/overlay/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/overlay/api.raml#/web-api/source-map/lexical/element_0" @@ -74,11 +69,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/overlay/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/overlay/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/overlay/api.raml#/web-api/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/overlay/api.raml#/web-api", @@ -217,7 +207,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/overlay/api.raml#/source-map/extends-reference/element_0", @@ -385,11 +375,6 @@ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/overlay/api.raml#/references/0/web-api/source-map/lexical/element_4" } - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/overlay/api.raml#/references/0/web-api/source-map/source-vendor/element_0" - } ] }, { @@ -707,11 +692,6 @@ "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#server", "http://a.ml/vocabularies/document-source-maps#value": "[(5,0)-(6,0)]" }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/overlay/api.raml#/references/0/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/overlay/api.raml#/references/0/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/overlay/api.raml#/references/0/web-api/server/falsedomain.com%2Fapis/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#urlTemplate", 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 042c0bfb61..a5491efb67 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 @@ -172,21 +172,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/parameters/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/parameters/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/parameters/api.raml#/web-api/source-map/lexical/element_2", @@ -248,7 +233,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 e2069b7766..915a5148dd 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/parameters/api.raml#/web-api", @@ -52,11 +52,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/parameters/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/parameters/api.raml#/web-api/source-map/lexical/element_2" @@ -108,11 +103,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/parameters/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/parameters/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/parameters/api.raml#/web-api/source-map/lexical/element_2", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#name", 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 6d751602ea..ebab49be29 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 @@ -918,21 +918,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/payloads/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/payloads/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/payloads/api.raml#/web-api/source-map/lexical/element_2", @@ -994,7 +979,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 2847d132d2..7f3ca3898b 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/payloads/api.raml#/web-api", @@ -87,11 +87,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/payloads/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/payloads/api.raml#/web-api/source-map/lexical/element_2" @@ -186,11 +181,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/payloads/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/payloads/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/payloads/api.raml#/web-api/source-map/lexical/element_2", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#name", 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 0129a75139..5a650b6389 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 @@ -423,21 +423,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/query-string/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/query-string/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/query-string/api.raml#/web-api/source-map/lexical/element_1", @@ -486,7 +471,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 3de9aa49aa..b710379d56 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/query-string/api.raml#/web-api", @@ -51,11 +51,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/query-string/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/query-string/api.raml#/web-api/source-map/lexical/element_1" @@ -97,11 +92,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/query-string/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/query-string/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/query-string/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/query-string/api.raml#/web-api", 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 2e761fcddf..1f52cd7dd7 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 @@ -585,21 +585,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/raml-security/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/raml-security/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/raml-security/api.raml#/web-api/source-map/lexical/element_1", @@ -648,7 +633,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 7f67cd360d..42407a241d 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/raml-security/api.raml#/web-api", @@ -51,11 +51,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/raml-security/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/raml-security/api.raml#/web-api/source-map/lexical/element_1" @@ -97,11 +92,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/raml-security/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/raml-security/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/raml-security/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/raml-security/api.raml#/web-api", 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 204668a857..e08f73b9c1 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 @@ -917,21 +917,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/referenced-example/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/referenced-example/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/referenced-example/api.raml#/web-api/source-map/lexical/element_1", @@ -980,7 +965,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -1011,29 +996,6 @@ { "@value": "application/yaml" } - ], - "http://a.ml/vocabularies/document-source-maps#sources": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/referenced-example/api.raml#/references/0/external/source-map", - "@type": [ - "http://a.ml/vocabularies/document-source-maps#SourceMap" - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/referenced-example/api.raml#/references/0/external/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/referenced-example/api.raml#/references/0/external" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ] - } ] } ], @@ -1053,7 +1015,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 9e1bd10f95..f0c26a554c 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/referenced-example/api.raml#/web-api", @@ -51,11 +51,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/referenced-example/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/referenced-example/api.raml#/web-api/source-map/lexical/element_1" @@ -97,11 +92,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/referenced-example/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/referenced-example/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/referenced-example/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/referenced-example/api.raml#/web-api", @@ -804,12 +794,7 @@ "http://a.ml/vocabularies/document#DomainElement" ], "http://a.ml/vocabularies/document#raw": "#%RAML 1.0 NamedExample\na: my value\nb: 299", - "http://a.ml/vocabularies/core#mediaType": "application/yaml", - "http://a.ml/vocabularies/document-source-maps#sources": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/referenced-example/api.raml#/references/0/external/source-map" - } - ] + "http://a.ml/vocabularies/core#mediaType": "application/yaml" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/referenced-example/api.raml#/references/0/BaseUnitProcessingData", @@ -817,7 +802,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/referenced-example/api.raml#/references/0/source-map", @@ -830,26 +815,10 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/referenced-example/api.raml#/references/0/external/source-map", - "@type": [ - "http://a.ml/vocabularies/document-source-maps#SourceMap" - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/referenced-example/api.raml#/references/0/external/source-map/source-vendor/element_0" - } - ] - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/referenced-example/api.raml#/references/0/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/referenced-example/api.raml#/references/0", "http://a.ml/vocabularies/document-source-maps#value": "[(1,0)-(3,6)]" - }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/referenced-example/api.raml#/references/0/external/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/referenced-example/api.raml#/references/0/external", - "http://a.ml/vocabularies/document-source-maps#value": "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 bdff15f5d5..cd42496713 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 @@ -1128,21 +1128,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-complex-variables/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-complex-variables/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-complex-variables/api.raml#/web-api/source-map/lexical/element_1", @@ -1191,7 +1176,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 adf0ca3544..555f07ba28 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-complex-variables/api.raml#/web-api", @@ -56,11 +56,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-complex-variables/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-complex-variables/api.raml#/web-api/source-map/lexical/element_1" @@ -124,11 +119,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-complex-variables/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-complex-variables/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-complex-variables/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-complex-variables/api.raml#/web-api", 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 d5dbec9f0f..89d8ce6f7c 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 @@ -22,21 +22,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-fragment/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-fragment/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-fragment/api.raml#/web-api/source-map/lexical/element_0", @@ -72,7 +57,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -607,21 +592,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-fragment/api.raml#/references/0/resourceType/default-abstract/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-fragment/api.raml#/references/0/resourceType/default-abstract" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-fragment/api.raml#/references/0/resourceType/default-abstract/source-map/lexical/element_2", @@ -683,7 +653,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 79e37ed2be..d50b642b21 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-fragment/api.raml#/web-api", @@ -27,22 +27,12 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-fragment/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-fragment/api.raml#/web-api/source-map/lexical/element_0" } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-fragment/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-fragment/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-fragment/api.raml#/web-api/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-fragment/api.raml#/web-api", @@ -141,7 +131,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-fragment/api.raml#/references/0/source-map", @@ -205,11 +195,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-fragment/api.raml#/references/0/resourceType/default-abstract/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-fragment/api.raml#/references/0/resourceType/default-abstract/source-map/lexical/element_2" @@ -288,11 +273,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-fragment/api.raml#/references/0/resourceType/default-abstract/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-fragment/api.raml#/references/0/resourceType/default-abstract", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-fragment/api.raml#/references/0/resourceType/default-abstract/source-map/lexical/element_2", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/document#dataNode", 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 eb965f46cb..9334950296 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 @@ -623,21 +623,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-multi-transformation/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-multi-transformation/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-multi-transformation/api.raml#/web-api/source-map/lexical/element_1", @@ -686,7 +671,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 1c58af3ed4..252d90985b 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-multi-transformation/api.raml#/web-api", @@ -56,11 +56,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-multi-transformation/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-multi-transformation/api.raml#/web-api/source-map/lexical/element_1" @@ -119,11 +114,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-multi-transformation/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-multi-transformation/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-multi-transformation/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/resource-type-multi-transformation/api.raml#/web-api", 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 5e3f1fdb83..83ad6e010c 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 @@ -5439,21 +5439,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/sapi-customer/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/sapi-customer/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/sapi-customer/api.raml#/web-api/source-map/lexical/element_1", @@ -5502,7 +5487,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -5533,29 +5518,6 @@ { "@value": "application/yaml" } - ], - "http://a.ml/vocabularies/document-source-maps#sources": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/sapi-customer/api.raml#/references/0/external/source-map", - "@type": [ - "http://a.ml/vocabularies/document-source-maps#SourceMap" - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/sapi-customer/api.raml#/references/0/external/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/sapi-customer/api.raml#/references/0/external" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ] - } ] } ], @@ -5575,7 +5537,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -5629,29 +5591,6 @@ { "@value": "application/yaml" } - ], - "http://a.ml/vocabularies/document-source-maps#sources": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/sapi-customer/api.raml#/references/1/external/source-map", - "@type": [ - "http://a.ml/vocabularies/document-source-maps#SourceMap" - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/sapi-customer/api.raml#/references/1/external/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/sapi-customer/api.raml#/references/1/external" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ] - } ] } ], @@ -5671,7 +5610,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 2d9c28a363..878ddace3e 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/sapi-customer/api.raml#/web-api", @@ -54,11 +54,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/sapi-customer/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/sapi-customer/api.raml#/web-api/source-map/lexical/element_1" @@ -118,11 +113,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/sapi-customer/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/sapi-customer/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/sapi-customer/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/sapi-customer/api.raml#/web-api", @@ -4268,12 +4258,7 @@ "http://a.ml/vocabularies/document#DomainElement" ], "http://a.ml/vocabularies/document#raw": "#%RAML 1.0 NamedExample\n- id: \"1\"\n name: Michelle Ruiz\n email: mruiz0@qq.com\n phone: 1-(951)768-8479\n billingAddress:\n line:\n - Eastlawn 42\n city: Riverside\n state: California\n postalCode: alberto gomez\n country: USA\n shippingAddress:\n line:\n - South\n - \"07\"\n city: Houston\n state: Texas\n postalCode: \"77045\"\n country: USA\n- id: \"2\"\n name: Jeremy Adams\n email: jadams1@instagram.com\n phone: 1-(216)797-9178\n billingAddress:\n line:\n - Eastwood 442\n city: Cleveland\n state: Ohio\n postalCode: \"44191\"\n country: USA\n shippingAddress:\n line:\n - Menomonie 5\n city: South Bend\n state: Indiana\n postalCode: \"46614\"\n country: USA\n", - "http://a.ml/vocabularies/core#mediaType": "application/yaml", - "http://a.ml/vocabularies/document-source-maps#sources": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/sapi-customer/api.raml#/references/0/external/source-map" - } - ] + "http://a.ml/vocabularies/core#mediaType": "application/yaml" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/sapi-customer/api.raml#/references/0/BaseUnitProcessingData", @@ -4281,7 +4266,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/sapi-customer/api.raml#/references/0/source-map", @@ -4301,12 +4286,7 @@ "http://a.ml/vocabularies/document#DomainElement" ], "http://a.ml/vocabularies/document#raw": "#%RAML 1.0 NamedExample\nname: Michelle Ruiz\nemail: mruiz0@qq.com\nphone: 1-(951)768-8479\nbillingAddress:\n line:\n - Eastlawn 42\n city: Riverside\n state: California\n postalCode: \"92513\"\n country: USA\nshippingAddress:\n line:\n - South\n - \"07\"\n city: Houston\n state: Texas\n postalCode: \"77045\"\n country: USA\n", - "http://a.ml/vocabularies/core#mediaType": "application/yaml", - "http://a.ml/vocabularies/document-source-maps#sources": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/sapi-customer/api.raml#/references/1/external/source-map" - } - ] + "http://a.ml/vocabularies/core#mediaType": "application/yaml" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/sapi-customer/api.raml#/references/1/BaseUnitProcessingData", @@ -4314,7 +4294,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/sapi-customer/api.raml#/references/1/source-map", @@ -4450,33 +4430,11 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/sapi-customer/api.raml#/references/0/external/source-map", - "@type": [ - "http://a.ml/vocabularies/document-source-maps#SourceMap" - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/sapi-customer/api.raml#/references/0/external/source-map/source-vendor/element_0" - } - ] - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/sapi-customer/api.raml#/references/0/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/sapi-customer/api.raml#/references/0", "http://a.ml/vocabularies/document-source-maps#value": "[(1,0)-(39,0)]" }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/sapi-customer/api.raml#/references/1/external/source-map", - "@type": [ - "http://a.ml/vocabularies/document-source-maps#SourceMap" - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/sapi-customer/api.raml#/references/1/external/source-map/source-vendor/element_0" - } - ] - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/sapi-customer/api.raml#/references/1/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/sapi-customer/api.raml#/references/1", @@ -4679,16 +4637,6 @@ "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/sapi-customer/api.raml#/declares/shape/objectName", "http://a.ml/vocabularies/document-source-maps#value": "" }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/sapi-customer/api.raml#/references/0/external/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/sapi-customer/api.raml#/references/0/external", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/sapi-customer/api.raml#/references/1/external/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/sapi-customer/api.raml#/references/1/external", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/sapi-customer/api.raml#/declares/shape/objectName/property/property/id/scalar/id%3F/source-map", "@type": [ 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 e8b6f06616..695291cca7 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 @@ -2199,21 +2199,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/secured-by/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/secured-by/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/secured-by/api.raml#/web-api/source-map/lexical/element_2", @@ -2275,7 +2260,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -2910,21 +2895,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/secured-by/api.raml#/references/0/scheme/fragment/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/secured-by/api.raml#/references/0/scheme/fragment" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/secured-by/api.raml#/references/0/scheme/fragment/source-map/lexical/element_5", @@ -3025,7 +2995,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 7454f1b1df..17efaddde0 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/secured-by/api.raml#/web-api", @@ -99,11 +99,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/secured-by/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/secured-by/api.raml#/web-api/source-map/lexical/element_2" @@ -232,11 +227,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/secured-by/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/secured-by/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/secured-by/api.raml#/web-api/source-map/lexical/element_2", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#name", @@ -1662,7 +1652,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/secured-by/api.raml#/references/0/source-map", @@ -1758,11 +1748,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/secured-by/api.raml#/references/0/scheme/fragment/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/secured-by/api.raml#/references/0/scheme/fragment/source-map/lexical/element_5" @@ -1927,11 +1912,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/secured-by/api.raml#/references/0/scheme/fragment/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/secured-by/api.raml#/references/0/scheme/fragment", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/secured-by/api.raml#/references/0/scheme/fragment/source-map/lexical/element_5", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#response", 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 395b0db630..754537352d 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/security-with-query-string/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/security-with-query-string/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/security-with-query-string/api.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 926cf2448e..fd2909d295 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/security-with-query-string/api.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/security-with-query-string/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/security-with-query-string/api.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/security-with-query-string/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/security-with-query-string/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/security-with-query-string/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/security-with-query-string/api.raml#/web-api", 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 79346604a3..29dcb6a39c 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/security/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/security/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/security/api.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 4c968819a1..7b1512cb25 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/security/api.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/security/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/security/api.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/security/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/security/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/security/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/security/api.raml#/web-api", 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 27ca33b4a1..1d9eec5d76 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 @@ -435,21 +435,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_example_type/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_example_type/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_example_type/api.raml#/web-api/source-map/lexical/element_4", @@ -537,7 +522,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -953,21 +938,6 @@ ] } ], - "http://a.ml/vocabularies/document-source-maps#type-property-lexical-info": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_example_type/api.raml#/references/0/shape/type/source-map/type-property-lexical-info/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_example_type/api.raml#/references/0/shape/type" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "[(2,0)-(2,4)]" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_example_type/api.raml#/references/0/shape/type/source-map/lexical/element_2", @@ -1009,9 +979,9 @@ ] } ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ + "http://a.ml/vocabularies/document-source-maps#type-property-lexical-info": [ { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_example_type/api.raml#/references/0/shape/type/source-map/source-vendor/element_0", + "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_example_type/api.raml#/references/0/shape/type/source-map/type-property-lexical-info/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_example_type/api.raml#/references/0/shape/type" @@ -1019,7 +989,7 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "RAML 1.0" + "@value": "[(2,0)-(2,4)]" } ] } @@ -1044,7 +1014,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 4875bb871a..448c34dc65 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_example_type/api.raml#/web-api", @@ -74,11 +74,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_example_type/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_example_type/api.raml#/web-api/source-map/lexical/element_4" @@ -149,11 +144,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_example_type/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_example_type/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_example_type/api.raml#/web-api/source-map/lexical/element_4", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#server", @@ -509,7 +499,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_example_type/api.raml#/references/0/source-map", @@ -599,11 +589,6 @@ "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_example_type/api.raml#/references/0/shape/type/source-map/synthesized-field/element_0" } ], - "http://a.ml/vocabularies/document-source-maps#type-property-lexical-info": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_example_type/api.raml#/references/0/shape/type/source-map/type-property-lexical-info/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_example_type/api.raml#/references/0/shape/type/source-map/lexical/element_2" @@ -615,9 +600,9 @@ "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_example_type/api.raml#/references/0/shape/type/source-map/lexical/element_1" } ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ + "http://a.ml/vocabularies/document-source-maps#type-property-lexical-info": [ { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_example_type/api.raml#/references/0/shape/type/source-map/source-vendor/element_0" + "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_example_type/api.raml#/references/0/shape/type/source-map/type-property-lexical-info/element_0" } ] }, @@ -730,11 +715,6 @@ "http://a.ml/vocabularies/document-source-maps#element": "http://www.w3.org/ns/shacl#closed", "http://a.ml/vocabularies/document-source-maps#value": "true" }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_example_type/api.raml#/references/0/shape/type/source-map/type-property-lexical-info/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_example_type/api.raml#/references/0/shape/type", - "http://a.ml/vocabularies/document-source-maps#value": "[(2,0)-(2,4)]" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_example_type/api.raml#/references/0/shape/type/source-map/lexical/element_2", "http://a.ml/vocabularies/document-source-maps#element": "http://www.w3.org/ns/shacl#property", @@ -751,9 +731,9 @@ "http://a.ml/vocabularies/document-source-maps#value": "[(2,0)-(6,10)]" }, { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_example_type/api.raml#/references/0/shape/type/source-map/source-vendor/element_0", + "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_example_type/api.raml#/references/0/shape/type/source-map/type-property-lexical-info/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_example_type/api.raml#/references/0/shape/type", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" + "http://a.ml/vocabularies/document-source-maps#value": "[(2,0)-(2,4)]" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_example_type/api.raml#/references/0/shape/type/property/property/a/scalar/a/source-map", 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 2f8f013891..37588333b5 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_xml_schema/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_xml_schema/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_xml_schema/api.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 11ab52f12a..ad51a2f423 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_xml_schema/api.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_xml_schema/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_xml_schema/api.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_xml_schema/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_xml_schema/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_xml_schema/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/simple_xml_schema/api.raml#/web-api", 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 004b65d0cd..a2ff18ca7b 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 @@ -2302,21 +2302,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/single-array-value/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/single-array-value/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/single-array-value/api.raml#/web-api/source-map/lexical/element_4", @@ -2404,7 +2389,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 aea63458c7..df4eea80a6 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/single-array-value/api.raml#/web-api", @@ -89,11 +89,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/single-array-value/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/single-array-value/api.raml#/web-api/source-map/lexical/element_4" @@ -245,11 +240,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/single-array-value/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/single-array-value/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/single-array-value/api.raml#/web-api/source-map/lexical/element_4", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#server", 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 8792648f64..99764398b1 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 @@ -2033,21 +2033,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/spec_examples_example/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/spec_examples_example/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/spec_examples_example/api.raml#/web-api/source-map/lexical/element_1", @@ -2096,7 +2081,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 21db446e2d..50bd1c640c 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/spec_examples_example/api.raml#/web-api", @@ -54,11 +54,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/spec_examples_example/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/spec_examples_example/api.raml#/web-api/source-map/lexical/element_1" @@ -119,11 +114,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/spec_examples_example/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/spec_examples_example/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/spec_examples_example/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/spec_examples_example/api.raml#/web-api", 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 981933c7de..086412aaa3 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 @@ -22,21 +22,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/trait-fragment/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/trait-fragment/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/trait-fragment/api.raml#/web-api/source-map/lexical/element_0", @@ -72,7 +57,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -380,21 +365,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/trait-fragment/api.raml#/references/0/trait/default-abstract/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/trait-fragment/api.raml#/references/0/trait/default-abstract" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/trait-fragment/api.raml#/references/0/trait/default-abstract/source-map/lexical/element_2", @@ -456,7 +426,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 e8f8485798..e313123d38 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/trait-fragment/api.raml#/web-api", @@ -27,22 +27,12 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/trait-fragment/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/trait-fragment/api.raml#/web-api/source-map/lexical/element_0" } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/trait-fragment/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/trait-fragment/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/trait-fragment/api.raml#/web-api/source-map/lexical/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/trait-fragment/api.raml#/web-api", @@ -139,7 +129,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/trait-fragment/api.raml#/references/0/source-map", @@ -203,11 +193,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/trait-fragment/api.raml#/references/0/trait/default-abstract/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/trait-fragment/api.raml#/references/0/trait/default-abstract/source-map/lexical/element_2" @@ -286,11 +271,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/trait-fragment/api.raml#/references/0/trait/default-abstract/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/trait-fragment/api.raml#/references/0/trait/default-abstract", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/trait-fragment/api.raml#/references/0/trait/default-abstract/source-map/lexical/element_2", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/document#dataNode", 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 9c230da8dd..3c4d6e8455 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 @@ -680,21 +680,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/trait-string-quoted-node/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/trait-string-quoted-node/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/trait-string-quoted-node/api.raml#/web-api/source-map/lexical/element_2", @@ -756,7 +741,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 4f2eed07d1..d52b191ec1 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/trait-string-quoted-node/api.raml#/web-api", @@ -52,11 +52,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/trait-string-quoted-node/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/trait-string-quoted-node/api.raml#/web-api/source-map/lexical/element_2" @@ -101,11 +96,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/trait-string-quoted-node/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/trait-string-quoted-node/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/trait-string-quoted-node/api.raml#/web-api/source-map/lexical/element_2", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#name", 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 aaf31f0bed..06a5f4be00 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 @@ -2268,21 +2268,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/traits-resource-types/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/traits-resource-types/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/traits-resource-types/api.raml#/web-api/source-map/lexical/element_2", @@ -2344,7 +2329,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 53134f8e14..ea112a8302 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/traits-resource-types/api.raml#/web-api", @@ -60,11 +60,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/traits-resource-types/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/traits-resource-types/api.raml#/web-api/source-map/lexical/element_2" @@ -154,11 +149,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/traits-resource-types/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/traits-resource-types/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/traits-resource-types/api.raml#/web-api/source-map/lexical/element_2", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#name", 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 5999484272..5373f177b4 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 @@ -32,21 +32,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-chain-with-examples/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-chain-with-examples/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-chain-with-examples/api.raml#/web-api/source-map/lexical/element_2", @@ -108,7 +93,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 524d38ebdd..fef48bc929 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-chain-with-examples/api.raml#/web-api", @@ -29,11 +29,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-chain-with-examples/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-chain-with-examples/api.raml#/web-api/source-map/lexical/element_2" @@ -46,11 +41,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-chain-with-examples/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-chain-with-examples/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-chain-with-examples/api.raml#/web-api/source-map/lexical/element_2", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#name", 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 e928c98c26..a45fa97df7 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-closed-true/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-closed-true/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-closed-true/api.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 83f5721009..6d11caa7d2 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-closed-true/api.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-closed-true/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-closed-true/api.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-closed-true/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-closed-true/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-closed-true/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-closed-true/api.raml#/web-api", 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 5308ad3c65..2fcd14400e 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 @@ -500,21 +500,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-declared-with-square-bracket/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-declared-with-square-bracket/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-declared-with-square-bracket/api.raml#/web-api/source-map/lexical/element_3", @@ -589,7 +574,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 ab5edfd130..7acb164914 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-declared-with-square-bracket/api.raml#/web-api", @@ -70,11 +70,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-declared-with-square-bracket/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-declared-with-square-bracket/api.raml#/web-api/source-map/lexical/element_3" @@ -145,11 +140,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-declared-with-square-bracket/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-declared-with-square-bracket/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-declared-with-square-bracket/api.raml#/web-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#description", 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 167fcd469c..a5351825d5 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-facets/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-facets/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-facets/api.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 f3500728d8..f283be5ae6 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-facets/api.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-facets/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-facets/api.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-facets/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-facets/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-facets/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type-facets/api.raml#/web-api", 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 78873f9f0d..26b298a3f4 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 @@ -79,21 +79,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type_nil_shortcut/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type_nil_shortcut/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type_nil_shortcut/api.raml#/web-api/source-map/lexical/element_2", @@ -155,7 +140,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 4f91c3edd5..33a5b895f7 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type_nil_shortcut/api.raml#/web-api", @@ -46,11 +46,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type_nil_shortcut/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type_nil_shortcut/api.raml#/web-api/source-map/lexical/element_2" @@ -79,11 +74,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type_nil_shortcut/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type_nil_shortcut/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/type_nil_shortcut/api.raml#/web-api/source-map/lexical/element_2", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#name", 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 3a2c7b3db3..e0c12eefef 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 @@ -2996,21 +2996,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types-dependency/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types-dependency/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types-dependency/api.raml#/web-api/source-map/lexical/element_8", @@ -3150,7 +3135,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 2e5226b227..6a1de7cb9e 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types-dependency/api.raml#/web-api", @@ -84,11 +84,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types-dependency/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types-dependency/api.raml#/web-api/source-map/lexical/element_8" @@ -174,11 +169,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types-dependency/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types-dependency/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types-dependency/api.raml#/web-api/source-map/lexical/element_8", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 2b5f09ba54..825a9c0a22 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types-facet/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types-facet/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types-facet/api.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 154f7e3e9d..8487bfd9b6 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types-facet/api.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types-facet/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types-facet/api.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types-facet/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types-facet/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types-facet/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types-facet/api.raml#/web-api", 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 7a079edab9..3590657459 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 @@ -3140,21 +3140,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types/api.raml#/web-api/source-map/lexical/element_8", @@ -3294,7 +3279,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 8ddd50bced..8bd072928e 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types/api.raml#/web-api", @@ -84,11 +84,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types/api.raml#/web-api/source-map/lexical/element_8" @@ -182,11 +177,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types/api.raml#/web-api/source-map/lexical/element_8", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 8aa3011b63..9f90ebfd40 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 @@ -866,21 +866,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types_problems2/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types_problems2/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types_problems2/api.raml#/web-api/source-map/lexical/element_2", @@ -942,7 +927,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 8122e86676..5ab02d552c 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types_problems2/api.raml#/web-api", @@ -93,11 +93,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types_problems2/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types_problems2/api.raml#/web-api/source-map/lexical/element_2" @@ -214,11 +209,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types_problems2/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types_problems2/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/types_problems2/api.raml#/web-api/source-map/lexical/element_2", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#name", 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 65d2a59521..844db8a327 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/unresolved-shape/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/unresolved-shape/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/unresolved-shape/api.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 259f186b7b..0f177fb7fe 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/unresolved-shape/api.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/unresolved-shape/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/unresolved-shape/api.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/unresolved-shape/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/unresolved-shape/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/unresolved-shape/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/unresolved-shape/api.raml#/web-api", 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 e27bcca05f..01e1690156 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 @@ -1270,21 +1270,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/users_accounts/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/users_accounts/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/users_accounts/api.raml#/web-api/source-map/lexical/element_3", @@ -1359,7 +1344,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 d3c36e5ac9..47aeb222e8 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/users_accounts/api.raml#/web-api", @@ -124,11 +124,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/users_accounts/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/users_accounts/api.raml#/web-api/source-map/lexical/element_3" @@ -304,11 +299,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/users_accounts/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/users_accounts/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/users_accounts/api.raml#/web-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#server", 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 99d9eb1ca3..d9650b5f94 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 @@ -1327,21 +1327,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/web-api/source-map/lexical/element_2", @@ -1403,7 +1388,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -1444,9 +1429,9 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ + "http://a.ml/vocabularies/document-source-maps#type-property-lexical-info": [ { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/0/scalar/type/source-map/source-vendor/element_0", + "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/0/scalar/type/source-map/type-property-lexical-info/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/0/scalar/type" @@ -1454,7 +1439,7 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "RAML 1.0" + "@value": "[(3,0)-(3,4)]" } ] } @@ -1486,21 +1471,6 @@ } ] } - ], - "http://a.ml/vocabularies/document-source-maps#type-property-lexical-info": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/0/scalar/type/source-map/type-property-lexical-info/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/0/scalar/type" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "[(3,0)-(3,4)]" - } - ] - } ] } ] @@ -1522,7 +1492,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -1652,21 +1622,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/1/annotation/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/1/annotation" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/1/annotation/source-map/lexical/element_1", @@ -1715,7 +1670,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -1909,21 +1864,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/2/resourceType/default-abstract/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/2/resourceType/default-abstract" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/2/resourceType/default-abstract/source-map/lexical/element_1", @@ -1972,7 +1912,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -2630,21 +2570,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/3/scheme/fragment/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/3/scheme/fragment" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/3/scheme/fragment/source-map/lexical/element_5", @@ -2745,7 +2670,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 064ad9db2b..a56a41d6f1 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/web-api", @@ -94,11 +94,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/web-api/source-map/lexical/element_2" @@ -224,11 +219,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/web-api/source-map/lexical/element_2", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#name", @@ -1366,7 +1356,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/0/source-map", @@ -1402,7 +1392,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/1/source-map", @@ -1437,7 +1427,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/2/source-map", @@ -1487,7 +1477,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/3/source-map", @@ -1693,9 +1683,9 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ + "http://a.ml/vocabularies/document-source-maps#type-property-lexical-info": [ { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/0/scalar/type/source-map/source-vendor/element_0" + "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/0/scalar/type/source-map/type-property-lexical-info/element_0" } ], "http://a.ml/vocabularies/document-source-maps#lexical": [ @@ -1705,11 +1695,6 @@ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/0/scalar/type/source-map/lexical/element_0" } - ], - "http://a.ml/vocabularies/document-source-maps#type-property-lexical-info": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/0/scalar/type/source-map/type-property-lexical-info/element_0" - } ] }, { @@ -1743,11 +1728,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/1/annotation/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/1/annotation/source-map/lexical/element_1" @@ -1784,11 +1764,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/2/resourceType/default-abstract/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/2/resourceType/default-abstract/source-map/lexical/element_1" @@ -1886,11 +1861,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/3/scheme/fragment/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/3/scheme/fragment/source-map/lexical/element_5" @@ -2106,9 +2076,9 @@ "http://a.ml/vocabularies/document-source-maps#value": "" }, { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/0/scalar/type/source-map/source-vendor/element_0", + "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/0/scalar/type/source-map/type-property-lexical-info/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/0/scalar/type", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" + "http://a.ml/vocabularies/document-source-maps#value": "[(3,0)-(3,4)]" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/0/scalar/type/source-map/lexical/element_1", @@ -2120,11 +2090,6 @@ "http://a.ml/vocabularies/document-source-maps#element": "http://www.w3.org/ns/shacl#datatype", "http://a.ml/vocabularies/document-source-maps#value": "[(3,0)-(3,12)]" }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/0/scalar/type/source-map/type-property-lexical-info/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/0/scalar/type", - "http://a.ml/vocabularies/document-source-maps#value": "[(3,0)-(3,4)]" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/1/annotation/scalar/schema/source-map", "@type": [ @@ -2144,11 +2109,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/1/annotation/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/1/annotation", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/1/annotation/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/1/annotation", @@ -2198,11 +2158,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/2/resourceType/default-abstract/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/2/resourceType/default-abstract", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/2/resourceType/default-abstract/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/2/resourceType/default-abstract", @@ -2351,11 +2306,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/3/scheme/fragment/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/3/scheme/fragment", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/cycle/raml10/with_references/api.raml#/references/3/scheme/fragment/source-map/lexical/element_5", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#response", 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 839500950b..16ab33c226 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 @@ -277,21 +277,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/declared-responses.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/declared-responses.json#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/declared-responses.json#/web-api/source-map/lexical/element_4", @@ -379,7 +364,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 d87933a928..ab303713fc 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/declared-responses.json#/web-api", @@ -55,11 +55,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/declared-responses.json#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/declared-responses.json#/web-api/source-map/lexical/element_4" @@ -115,11 +110,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/declared-responses.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/declared-responses.json#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/declared-responses.json#/web-api/source-map/lexical/element_4", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 98a4363a7a..7666d77eb8 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 @@ -581,21 +581,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/endpoints.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/endpoints.json#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/endpoints.json#/web-api/source-map/lexical/element_10", @@ -761,7 +746,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 798f83a6d4..63564bcbd1 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/endpoints.json#/web-api", @@ -196,11 +196,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/endpoints.json#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/endpoints.json#/web-api/source-map/lexical/element_10" @@ -371,11 +366,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/endpoints.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/endpoints.json#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/endpoints.json#/web-api/source-map/lexical/element_10", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#license", 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 514fa59003..660d430244 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 @@ -33,21 +33,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/enums/enums.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/enums/enums.json#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/enums/enums.json#/web-api/source-map/lexical/element_3", @@ -122,7 +107,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 44fceb9170..fa2a4d74fd 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/enums/enums.json#/web-api", @@ -30,11 +30,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/enums/enums.json#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/enums/enums.json#/web-api/source-map/lexical/element_3" @@ -50,11 +45,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/enums/enums.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/enums/enums.json#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/enums/enums.json#/web-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 c3a7461717..734e89e751 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 @@ -3450,21 +3450,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/examples.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/examples.json#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/examples.json#/web-api/source-map/lexical/element_3", @@ -3539,7 +3524,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 4da78f60b6..fe06ed1508 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/examples.json#/web-api", @@ -55,11 +55,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/examples.json#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/examples.json#/web-api/source-map/lexical/element_3" @@ -124,11 +119,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/examples.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/examples.json#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/examples.json#/web-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 b4abde46cc..a2c672852f 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 @@ -1372,21 +1372,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/externals.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/externals.json#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/externals.json#/web-api/source-map/lexical/element_5", @@ -1487,7 +1472,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 23b78ea2fe..9960075188 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/externals.json#/web-api", @@ -79,11 +79,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/externals.json#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/externals.json#/web-api/source-map/lexical/element_5" @@ -165,11 +160,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/externals.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/externals.json#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/externals.json#/web-api/source-map/lexical/element_5", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 29dfe47776..342cb89119 100644 --- a/amf-cli/shared/src/test/resources/upanddown/file-type.json +++ b/amf-cli/shared/src/test/resources/upanddown/file-type.json @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/file-type.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/file-type.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/file-type.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 75e7f1bc2d..0c08f53464 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 @@ -481,21 +481,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/form-data-params.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/form-data-params.json#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/form-data-params.json#/web-api/source-map/lexical/element_3", @@ -570,7 +555,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 f5a4dcb553..efb71aec2e 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/form-data-params.json#/web-api", @@ -52,11 +52,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/form-data-params.json#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/form-data-params.json#/web-api/source-map/lexical/element_3" @@ -105,11 +100,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/form-data-params.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/form-data-params.json#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/form-data-params.json#/web-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 d2fc290011..ac6f937c93 100644 --- a/amf-cli/shared/src/test/resources/upanddown/formDataParameters.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/formDataParameters.expanded.jsonld @@ -415,21 +415,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/formDataParameters.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/formDataParameters.json#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/formDataParameters.json#/web-api/source-map/lexical/element_3", @@ -504,7 +489,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 fefc655a86..f23312cfe5 100644 --- a/amf-cli/shared/src/test/resources/upanddown/formDataParameters.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/formDataParameters.flattened.jsonld @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/formDataParameters.json#/web-api", @@ -52,11 +52,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/formDataParameters.json#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/formDataParameters.json#/web-api/source-map/lexical/element_3" @@ -102,11 +97,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/formDataParameters.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/formDataParameters.json#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/formDataParameters.json#/web-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 7305a43b2d..8670bbc9e7 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 @@ -794,21 +794,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/formdata-parameters-multiple.yaml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/formdata-parameters-multiple.yaml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/formdata-parameters-multiple.yaml#/web-api/source-map/lexical/element_7", @@ -935,7 +920,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 3cb060728b..a407a051e6 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/formdata-parameters-multiple.yaml#/web-api", @@ -95,11 +95,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/formdata-parameters-multiple.yaml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/formdata-parameters-multiple.yaml#/web-api/source-map/lexical/element_7" @@ -203,11 +198,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/formdata-parameters-multiple.yaml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/formdata-parameters-multiple.yaml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/formdata-parameters-multiple.yaml#/web-api/source-map/lexical/element_7", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#license", 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 9bd22afc9f..f0b3718532 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 @@ -3077,21 +3077,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/full-example.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/full-example.json#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/full-example.json#/web-api/source-map/lexical/element_10", @@ -3257,7 +3242,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 363abb2a7e..889b2a7aac 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/full-example.json#/web-api", @@ -183,11 +183,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/full-example.json#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/full-example.json#/web-api/source-map/lexical/element_10" @@ -445,11 +440,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/full-example.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/full-example.json#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/full-example.json#/web-api/source-map/lexical/element_10", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#license", 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 404a49c441..baea99e889 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 @@ -341,7 +341,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "Grpc" } 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 5f88dccae1..f09f3df5ba 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 @@ -55,7 +55,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "Grpc" + "http://a.ml/vocabularies/document#sourceSpec": "Grpc" }, { "http://a.ml/vocabularies/core#extensionName": "csharp_namespace", 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 99ea9bfc10..3db4093359 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 @@ -341,7 +341,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "Grpc" } @@ -836,7 +836,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "Grpc" } @@ -7170,7 +7170,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "Grpc" } @@ -7665,7 +7665,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "Grpc" } @@ -7695,7 +7695,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "Grpc" } 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 cfd2728f26..27b0c9eadc 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 @@ -55,7 +55,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "Grpc" + "http://a.ml/vocabularies/document#sourceSpec": "Grpc" }, { "http://a.ml/vocabularies/core#extensionName": "csharp_namespace", @@ -565,7 +565,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "Grpc" + "http://a.ml/vocabularies/document#sourceSpec": "Grpc" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/grpc/google/type.proto/web-api", @@ -893,7 +893,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "Grpc" + "http://a.ml/vocabularies/document#sourceSpec": "Grpc" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/grpc/google/api.proto/web-api/types#/shape/.google.protobuf.Api/property/name", @@ -2217,7 +2217,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "Grpc" + "http://a.ml/vocabularies/document#sourceSpec": "Grpc" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/grpc/google/api.proto/web-api/types#/shape/.google.protobuf.Api/property/name/scalar/default-scalar", 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 3c2b3a0236..9ac4d60962 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 @@ -390,7 +390,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "Grpc" } 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 27362a0926..45f77daa29 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 @@ -61,7 +61,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "Grpc" + "http://a.ml/vocabularies/document#sourceSpec": "Grpc" }, { "http://a.ml/vocabularies/core#extensionName": "cc_enable_arenas", 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 45f2e1f8cf..3f197e6e92 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 @@ -390,7 +390,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "Grpc" } 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 aefc0546c3..7fded14dde 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 @@ -61,7 +61,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "Grpc" + "http://a.ml/vocabularies/document#sourceSpec": "Grpc" }, { "http://a.ml/vocabularies/core#extensionName": "cc_enable_arenas", 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 f6ff0a6106..2bb9f48bb5 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 @@ -390,7 +390,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "Grpc" } 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 715a813d8c..e61bd46d4d 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 @@ -61,7 +61,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "Grpc" + "http://a.ml/vocabularies/document#sourceSpec": "Grpc" }, { "http://a.ml/vocabularies/core#extensionName": "cc_enable_arenas", 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 9c6756dfbc..fe1218835f 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 @@ -341,7 +341,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "Grpc" } 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 066480dbc7..4cd892af6c 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 @@ -55,7 +55,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "Grpc" + "http://a.ml/vocabularies/document#sourceSpec": "Grpc" }, { "http://a.ml/vocabularies/core#extensionName": "csharp_namespace", 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 09f53ae27e..a445452c3d 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 @@ -390,7 +390,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "Grpc" } 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 8da0b7c6cb..7a2a46c583 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 @@ -61,7 +61,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "Grpc" + "http://a.ml/vocabularies/document#sourceSpec": "Grpc" }, { "http://a.ml/vocabularies/core#extensionName": "cc_enable_arenas", 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 64740a4ab9..7e0ef23c57 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 @@ -390,7 +390,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "Grpc" } 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 6b570366f8..1127debcb7 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 @@ -61,7 +61,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "Grpc" + "http://a.ml/vocabularies/document#sourceSpec": "Grpc" }, { "http://a.ml/vocabularies/core#extensionName": "cc_enable_arenas", 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 8ad0ccb1be..e7d49599d9 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 @@ -390,7 +390,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "Grpc" } @@ -967,7 +967,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "Grpc" } @@ -1462,7 +1462,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "Grpc" } 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 a93b41e4db..e2fc63f8b9 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 @@ -61,7 +61,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "Grpc" + "http://a.ml/vocabularies/document#sourceSpec": "Grpc" }, { "http://a.ml/vocabularies/core#extensionName": "cc_enable_arenas", @@ -734,7 +734,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "Grpc" + "http://a.ml/vocabularies/document#sourceSpec": "Grpc" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/grpc/google/source_context.proto/web-api", @@ -813,7 +813,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "Grpc" + "http://a.ml/vocabularies/document#sourceSpec": "Grpc" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/grpc/google/type.proto/web-api/types#/shape/.google.protobuf.Option/property/name", 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 cf8b395e0d..1346911f0a 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 @@ -390,7 +390,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "Grpc" } 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 aec1146012..9ab6930f2b 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 @@ -61,7 +61,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "Grpc" + "http://a.ml/vocabularies/document#sourceSpec": "Grpc" }, { "http://a.ml/vocabularies/core#extensionName": "cc_enable_arenas", 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 0146a228f7..3978da41c3 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 @@ -1213,7 +1213,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "Grpc" } @@ -1447,7 +1447,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "Grpc" } 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 bc146ae9f1..b07cb486df 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 @@ -47,7 +47,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "Grpc" + "http://a.ml/vocabularies/document#sourceSpec": "Grpc" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/grpc/simple.proto/web-api/Greeter", @@ -1301,7 +1301,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "Grpc" + "http://a.ml/vocabularies/document#sourceSpec": "Grpc" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/grpc/simple.proto/web-api/types/scalar/.helloworld.Corpus/list", 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 9b43878cee..72f2cdf096 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 @@ -276,21 +276,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/oas-fragment-ref/master/master.json/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/oas-fragment-ref/master/master.json/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/oas-fragment-ref/master/master.json/web-api#/source-map/lexical/element_3", @@ -370,7 +355,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 c843450fba..7d432daf4b 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/oas-fragment-ref/master/master.json/web-api", @@ -71,11 +71,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/oas-fragment-ref/master/master.json/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/oas-fragment-ref/master/master.json/web-api#/source-map/lexical/element_3" @@ -136,11 +131,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/oas-fragment-ref/master/master.json/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/oas-fragment-ref/master/master.json/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/oas-fragment-ref/master/master.json/web-api#/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 5c1396babe..a7c5a60926 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 @@ -225,9 +225,6 @@ } ], "smaps": { - "source-vendor": { - "#8": "OAS 3.0" - }, "lexical": { "apiContract:endpoint": "[(27,2)-(45,3)]", "core:name": "[(4,4)-(4,30)]", @@ -258,7 +255,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "OAS 3.0" } 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 7472f763ff..ecf196d38f 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "OAS 3.0" + "doc:sourceSpec": "OAS 3.0" }, { "@id": "#8", @@ -25,9 +25,6 @@ } ], "smaps": { - "source-vendor": { - "#8": "OAS 3.0" - }, "lexical": { "apiContract:endpoint": "[(27,2)-(45,3)]", "core:name": "[(4,4)-(4,30)]", 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 2b780ffe15..decd763bb9 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 @@ -1156,21 +1156,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/oas3/summary-description-in-path/description-applied-to-operations.json/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/oas3/summary-description-in-path/description-applied-to-operations.json/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 3.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/oas3/summary-description-in-path/description-applied-to-operations.json/web-api#/source-map/lexical/element_3", @@ -1250,7 +1235,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 3.0" } 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 4efbf06847..812f152fa8 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 3.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 3.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/oas3/summary-description-in-path/description-applied-to-operations.json/web-api", @@ -113,11 +113,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/oas3/summary-description-in-path/description-applied-to-operations.json/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/oas3/summary-description-in-path/description-applied-to-operations.json/web-api#/source-map/lexical/element_3" @@ -243,11 +238,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/oas3/summary-description-in-path/description-applied-to-operations.json/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/oas3/summary-description-in-path/description-applied-to-operations.json/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 3.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/oas3/summary-description-in-path/description-applied-to-operations.json/web-api#/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 3702bb1020..a54167c308 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 @@ -104,21 +104,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/oas_foward_definitions.json/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/oas_foward_definitions.json/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/oas_foward_definitions.json/web-api#/source-map/lexical/element_3", @@ -198,7 +183,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 40613b9199..d1234e003f 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/oas_foward_definitions.json/web-api", @@ -51,11 +51,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/oas_foward_definitions.json/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/oas_foward_definitions.json/web-api#/source-map/lexical/element_3" @@ -92,11 +87,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/oas_foward_definitions.json/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/oas_foward_definitions.json/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/oas_foward_definitions.json/web-api#/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#scheme", 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 6d82501f06..f8553ac976 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 @@ -205,21 +205,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/oas_response_declaration.yaml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/oas_response_declaration.yaml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/oas_response_declaration.yaml#/web-api/source-map/lexical/element_4", @@ -307,7 +292,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 2d511898e9..5297fb1ad1 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/oas_response_declaration.yaml#/web-api", @@ -53,11 +53,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/oas_response_declaration.yaml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/oas_response_declaration.yaml#/web-api/source-map/lexical/element_4" @@ -105,11 +100,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/oas_response_declaration.yaml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/oas_response_declaration.yaml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/oas_response_declaration.yaml#/web-api/source-map/lexical/element_4", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 54f97a9cde..7dd3bd9193 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 @@ -323,21 +323,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/oas_response_declaration.yaml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/oas_response_declaration.yaml/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/oas_response_declaration.yaml/web-api#/source-map/lexical/element_4", @@ -430,7 +415,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 32899b18ac..dc6c7ed303 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/oas_response_declaration.yaml/web-api", @@ -54,11 +54,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/oas_response_declaration.yaml/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/oas_response_declaration.yaml/web-api#/source-map/lexical/element_4" @@ -106,11 +101,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/oas_response_declaration.yaml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/oas_response_declaration.yaml/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/oas_response_declaration.yaml/web-api#/source-map/lexical/element_4", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 99467e2fc9..7a7f157952 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 @@ -494,21 +494,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/orphan_extensions.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/orphan_extensions.json#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/orphan_extensions.json#/web-api/source-map/lexical/element_6", @@ -622,7 +607,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 11af03ef20..2115af0eec 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/orphan_extensions.json#/web-api", @@ -110,11 +110,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/orphan_extensions.json#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/orphan_extensions.json#/web-api/source-map/lexical/element_6" @@ -224,11 +219,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/orphan_extensions.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/orphan_extensions.json#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/orphan_extensions.json#/web-api/source-map/lexical/element_6", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 2d2e5589a6..09565a9b9a 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 @@ -162,21 +162,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/parameters.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/parameters.json#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/parameters.json#/web-api/source-map/lexical/element_3", @@ -251,7 +236,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 ddfa3184a9..9f03122955 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/parameters.json#/web-api", @@ -52,11 +52,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/parameters.json#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/parameters.json#/web-api/source-map/lexical/element_3" @@ -106,11 +101,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/parameters.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/parameters.json#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/parameters.json#/web-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 ae2cbd4747..e5ed40f524 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 @@ -523,21 +523,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/petstore/petstore.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/petstore/petstore.json#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/petstore/petstore.json#/web-api/source-map/lexical/element_3", @@ -612,7 +597,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 4eaa8cfc9c..26ae1d82e6 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/petstore/petstore.json#/web-api", @@ -70,11 +70,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/petstore/petstore.json#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/petstore/petstore.json#/web-api/source-map/lexical/element_3" @@ -142,11 +137,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/petstore/petstore.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/petstore/petstore.json#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/petstore/petstore.json#/web-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 d2dc295e6b..c27e0e5300 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 @@ -442,21 +442,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/query-string.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/query-string.json#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/query-string.json#/web-api/source-map/lexical/element_3", @@ -531,7 +516,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 6b01dbe4fb..c9f548f7cd 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/query-string.json#/web-api", @@ -52,11 +52,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/query-string.json#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/query-string.json#/web-api/source-map/lexical/element_3" @@ -102,11 +97,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/query-string.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/query-string.json#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/query-string.json#/web-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 a41871b3f5..0d9771f67b 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml08/schemas-lexical-info.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/raml08/schemas-lexical-info.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 0.8" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml08/schemas-lexical-info.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 0.8" } 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 20c98b49bc..dc5ea20a4a 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 0.8" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 0.8" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml08/schemas-lexical-info.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml08/schemas-lexical-info.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml08/schemas-lexical-info.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml08/schemas-lexical-info.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/raml08/schemas-lexical-info.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 0.8" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml08/schemas-lexical-info.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/raml08/schemas-lexical-info.raml#/web-api", 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 770976dd09..516d3db655 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 @@ -1361,21 +1361,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/duplicate-id-in-param-types/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/raml10/duplicate-id-in-param-types/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/duplicate-id-in-param-types/api.raml#/web-api/source-map/lexical/element_1", @@ -1424,7 +1409,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 c814d897f0..c7a60b940b 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/duplicate-id-in-param-types/api.raml#/web-api", @@ -56,11 +56,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/duplicate-id-in-param-types/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/duplicate-id-in-param-types/api.raml#/web-api/source-map/lexical/element_1" @@ -130,11 +125,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/duplicate-id-in-param-types/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/raml10/duplicate-id-in-param-types/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/duplicate-id-in-param-types/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/raml10/duplicate-id-in-param-types/api.raml#/web-api", 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 6155e3c7fd..6265108c24 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 @@ -2199,21 +2199,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/nillable-type-in-parameter/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/raml10/nillable-type-in-parameter/api.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/nillable-type-in-parameter/api.raml#/web-api/source-map/lexical/element_1", @@ -2262,7 +2247,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 abf0876957..d42b7c0a00 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/nillable-type-in-parameter/api.raml#/web-api", @@ -101,11 +101,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/nillable-type-in-parameter/api.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/nillable-type-in-parameter/api.raml#/web-api/source-map/lexical/element_1" @@ -265,11 +260,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/nillable-type-in-parameter/api.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/raml10/nillable-type-in-parameter/api.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/nillable-type-in-parameter/api.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/raml10/nillable-type-in-parameter/api.raml#/web-api", 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 d653499569..2d9cd55418 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/raml-default-schema-version.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/raml10/raml-default-schema-version.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/raml-default-schema-version.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 3bd62d0c3d..15ab33cf83 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/raml-default-schema-version.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/raml-default-schema-version.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/raml-default-schema-version.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/raml-default-schema-version.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/raml10/raml-default-schema-version.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/raml-default-schema-version.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/raml10/raml-default-schema-version.raml#/web-api", 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 dfe3fbe07a..f6b13f49a7 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/raml-reference-draft-7.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/raml10/raml-reference-draft-7.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/raml-reference-draft-7.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 ae5b2da70d..66e1c39ac1 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/raml-reference-draft-7.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/raml-reference-draft-7.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/raml-reference-draft-7.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/raml-reference-draft-7.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/raml10/raml-reference-draft-7.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/raml-reference-draft-7.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/raml10/raml-reference-draft-7.raml#/web-api", 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 028942a59b..edd35f2f2a 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 @@ -27,21 +27,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/type-with-json-schema-in-type-facet.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/raml10/type-with-json-schema-in-type-facet.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/type-with-json-schema-in-type-facet.raml#/web-api/source-map/lexical/element_1", @@ -90,7 +75,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 a844bdd0fc..acc8f6e423 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/type-with-json-schema-in-type-facet.raml#/web-api", @@ -28,11 +28,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/type-with-json-schema-in-type-facet.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/type-with-json-schema-in-type-facet.raml#/web-api/source-map/lexical/element_1" @@ -42,11 +37,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/type-with-json-schema-in-type-facet.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/raml10/type-with-json-schema-in-type-facet.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/type-with-json-schema-in-type-facet.raml#/web-api/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/raml10/type-with-json-schema-in-type-facet.raml#/web-api", 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 4c35e5c784..11375cad32 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 @@ -33,21 +33,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/security-with-query-string.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/security-with-query-string.json#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/security-with-query-string.json#/web-api/source-map/lexical/element_3", @@ -122,7 +107,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 b851a35ead..b0f942665f 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/security-with-query-string.json#/web-api", @@ -30,11 +30,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/security-with-query-string.json#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/security-with-query-string.json#/web-api/source-map/lexical/element_3" @@ -50,11 +45,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/security-with-query-string.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/security-with-query-string.json#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/security-with-query-string.json#/web-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 7e1e19b270..184f91e830 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 @@ -33,21 +33,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/security.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/security.json#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/security.json#/web-api/source-map/lexical/element_3", @@ -122,7 +107,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 952d57f9b6..01fcbd2668 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/security.json#/web-api", @@ -30,11 +30,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/security.json#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/security.json#/web-api/source-map/lexical/element_3" @@ -50,11 +45,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/security.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/security.json#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/security.json#/web-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 76004a0124..de23162cf6 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 @@ -578,21 +578,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/shapes-with-items.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/shapes-with-items.json#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/shapes-with-items.json#/web-api/source-map/lexical/element_10", @@ -758,7 +743,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 c20043256b..b1e107980b 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/shapes-with-items.json#/web-api", @@ -125,11 +125,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/shapes-with-items.json#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/shapes-with-items.json#/web-api/source-map/lexical/element_10" @@ -251,11 +246,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/shapes-with-items.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/shapes-with-items.json#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/shapes-with-items.json#/web-api/source-map/lexical/element_10", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#license", 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 c662380421..491775714a 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 @@ -161,9 +161,6 @@ } ], "smaps": { - "source-vendor": { - "#11": "RAML 1.0" - }, "lexical": { "apiContract:scheme": "[(4,0)-(5,0)]", "core:description": "[(3,0)-(4,0)]", @@ -195,7 +192,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } @@ -384,15 +381,12 @@ "synthesized-field": { "shacl:closed": "true" }, - "type-property-lexical-info": { - "#2": "[(2,0)-(2,4)]" - }, "lexical": { "apiContract:examples": "[(5,0)-(6,10)]", "#2": "[(2,0)-(6,10)]" }, - "source-vendor": { - "#2": "RAML 1.0" + "type-property-lexical-info": { + "#2": "[(2,0)-(2,4)]" } } } @@ -413,7 +407,7 @@ "@value": "3.2.0" } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } @@ -604,16 +598,13 @@ "resolved-link-target": { "#9": "amf://id#2" }, - "source-vendor": { - "#9": "RAML 1.0" + "type-property-lexical-info": { + "#9": "[(2,0)-(2,4)]" }, "lexical": { "apiContract:examples": "[(5,0)-(6,10)]", "#9": "[(2,0)-(6,10)]" }, - "type-property-lexical-info": { - "#9": "[(2,0)-(2,4)]" - }, "resolved-link": { "#9": "amf://id#9" }, 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 f04e846867..b574c39070 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#11", @@ -33,9 +33,6 @@ } ], "smaps": { - "source-vendor": { - "#11": "RAML 1.0" - }, "lexical": { "apiContract:scheme": "[(4,0)-(5,0)]", "core:description": "[(3,0)-(4,0)]", @@ -164,16 +161,13 @@ "resolved-link-target": { "#9": "amf://id#2" }, - "source-vendor": { - "#9": "RAML 1.0" + "type-property-lexical-info": { + "#9": "[(2,0)-(2,4)]" }, "lexical": { "apiContract:examples": "[(5,0)-(6,10)]", "#9": "[(2,0)-(6,10)]" }, - "type-property-lexical-info": { - "#9": "[(2,0)-(2,4)]" - }, "resolved-link": { "#9": "amf://id#9" }, @@ -370,15 +364,12 @@ "synthesized-field": { "shacl:closed": "true" }, - "type-property-lexical-info": { - "#2": "[(2,0)-(2,4)]" - }, "lexical": { "apiContract:examples": "[(5,0)-(6,10)]", "#2": "[(2,0)-(6,10)]" }, - "source-vendor": { - "#2": "RAML 1.0" + "type-property-lexical-info": { + "#2": "[(2,0)-(2,4)]" } } }, @@ -388,7 +379,7 @@ "doc:APIContractProcessingData" ], "apiContract:modelVersion": "3.2.0", - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" } ], "@context": { 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 95c94eba73..ecd3decafc 100644 --- a/amf-cli/shared/src/test/resources/upanddown/tags.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/tags.expanded.jsonld @@ -439,21 +439,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/tags.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/tags.json#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/tags.json#/web-api/source-map/lexical/element_5", @@ -554,7 +539,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 31aa98da7d..f5da00170b 100644 --- a/amf-cli/shared/src/test/resources/upanddown/tags.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/tags.flattened.jsonld @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/tags.json#/web-api", @@ -95,11 +95,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/tags.json#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/tags.json#/web-api/source-map/lexical/element_5" @@ -225,11 +220,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/tags.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/tags.json#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/tags.json#/web-api/source-map/lexical/element_5", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#endpoint", 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 fb084fc18a..e8c4ef5955 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 @@ -2246,21 +2246,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/traits-resource-types.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/traits-resource-types.json#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/traits-resource-types.json#/web-api/source-map/lexical/element_3", @@ -2335,7 +2320,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 a3610fca72..548731a7a8 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/traits-resource-types.json#/web-api", @@ -60,11 +60,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/traits-resource-types.json#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/traits-resource-types.json#/web-api/source-map/lexical/element_3" @@ -158,11 +153,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/traits-resource-types.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/traits-resource-types.json#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/traits-resource-types.json#/web-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 3e19a5d26a..9af23b1611 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 @@ -33,21 +33,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/type-facets.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/type-facets.json#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/type-facets.json#/web-api/source-map/lexical/element_3", @@ -122,7 +107,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 3c25c4898b..0b4598da10 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/type-facets.json#/web-api", @@ -30,11 +30,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/type-facets.json#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/type-facets.json#/web-api/source-map/lexical/element_3" @@ -50,11 +45,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/type-facets.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/type-facets.json#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/type-facets.json#/web-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 48b912ce52..b4120f33aa 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 @@ -2745,21 +2745,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/types-dependency.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/types-dependency.json#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/types-dependency.json#/web-api/source-map/lexical/element_8", @@ -2899,7 +2884,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 3417b77287..9c926a22db 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/types-dependency.json#/web-api", @@ -84,11 +84,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/types-dependency.json#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/types-dependency.json#/web-api/source-map/lexical/element_8" @@ -178,11 +173,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/types-dependency.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/types-dependency.json#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/types-dependency.json#/web-api/source-map/lexical/element_8", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#termsOfService", 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 aff8faaa64..2ca6b031ef 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 @@ -33,21 +33,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/types-facet.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/types-facet.json#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/types-facet.json#/web-api/source-map/lexical/element_3", @@ -122,7 +107,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 fb82937441..84d5a947e3 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/types-facet.json#/web-api", @@ -30,11 +30,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/types-facet.json#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/types-facet.json#/web-api/source-map/lexical/element_3" @@ -50,11 +45,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/types-facet.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/types-facet.json#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/types-facet.json#/web-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", diff --git a/amf-cli/shared/src/test/resources/upanddown/types.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/upanddown/types.raml.expanded.jsonld index e6f72a4461..81bd96c0c3 100644 --- a/amf-cli/shared/src/test/resources/upanddown/types.raml.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/types.raml.expanded.jsonld @@ -1128,21 +1128,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/types.raml.expanded.jsonld/#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/types.raml.expanded.jsonld/#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/types.raml.expanded.jsonld/#/web-api/source-map/lexical/element_4", diff --git a/amf-cli/shared/src/test/resources/upanddown/types.raml.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/types.raml.flattened.jsonld index 792b3ef104..a8b3e984cd 100644 --- a/amf-cli/shared/src/test/resources/upanddown/types.raml.flattened.jsonld +++ b/amf-cli/shared/src/test/resources/upanddown/types.raml.flattened.jsonld @@ -82,11 +82,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/types.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/types.raml#/web-api/source-map/lexical/element_4" @@ -160,11 +155,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/types.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/types.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/types.raml#/web-api/source-map/lexical/element_4", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 267978a040..6bc0cf19a4 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 @@ -22,9 +22,6 @@ } ], "smaps": { - "source-vendor": { - "#16": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#16": "[(2,0)-(13,39)]" @@ -53,7 +50,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 399affc6e2..bd34730e51 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#16", @@ -19,9 +19,6 @@ ], "core:name": "test", "smaps": { - "source-vendor": { - "#16": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#16": "[(2,0)-(13,39)]" 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 44c2ec2363..a3c1655641 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 @@ -1137,21 +1137,6 @@ } ] } - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/with_references.raml#/declares/scheme/oauth20/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/with_references.raml#/declares/scheme/oauth20" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } ] } ] @@ -1561,21 +1546,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/with_references.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/with_references.raml/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/with_references.raml/web-api#/source-map/lexical/element_2", @@ -1642,7 +1612,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } @@ -2353,21 +2323,6 @@ } ] } - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/with_references.raml#/declares/scheme/oauth20/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/with_references.raml#/declares/scheme/oauth20" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } ] } ] @@ -2498,21 +2453,6 @@ ] } ], - "http://a.ml/vocabularies/document-source-maps#type-property-lexical-info": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/with_references.raml#/declares/scalar/B/source-map/type-property-lexical-info/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/with_references.raml#/declares/scalar/B" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "[(3,0)-(3,4)]" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/with_references.raml#/declares/scalar/B/source-map/lexical/element_1", @@ -2541,9 +2481,9 @@ ] } ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ + "http://a.ml/vocabularies/document-source-maps#type-property-lexical-info": [ { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/with_references.raml#/declares/scalar/B/source-map/source-vendor/element_0", + "@id": "file://amf-cli/shared/src/test/resources/upanddown/with_references.raml#/declares/scalar/B/source-map/type-property-lexical-info/element_0", "http://a.ml/vocabularies/document-source-maps#element": [ { "@value": "file://amf-cli/shared/src/test/resources/upanddown/with_references.raml#/declares/scalar/B" @@ -2551,7 +2491,7 @@ ], "http://a.ml/vocabularies/document-source-maps#value": [ { - "@value": "RAML 1.0" + "@value": "[(3,0)-(3,4)]" } ] } 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 272e351ab5..454dfc418d 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/with_references.raml/web-api", @@ -87,11 +87,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/with_references.raml/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/with_references.raml/web-api#/source-map/lexical/element_2" @@ -183,11 +178,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/with_references.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/with_references.raml/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/with_references.raml/web-api#/source-map/lexical/element_2", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#name", @@ -736,11 +726,6 @@ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/with_references.raml#/declares/scheme/oauth20/source-map/lexical/element_4" } - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/with_references.raml#/declares/scheme/oauth20/source-map/source-vendor/element_0" - } ] }, { @@ -1022,11 +1007,6 @@ "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#header", "http://a.ml/vocabularies/document-source-maps#value": "[(13,2)-(17,0)]" }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/with_references.raml#/declares/scheme/oauth20/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/with_references.raml#/declares/scheme/oauth20", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/with_references.raml#/declares/scalar/A/source-map", "@type": [ @@ -1081,11 +1061,6 @@ "@id": "file://amf-cli/shared/src/test/resources/upanddown/with_references.raml#/declares/scalar/B/source-map/declared-element/element_0" } ], - "http://a.ml/vocabularies/document-source-maps#type-property-lexical-info": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/with_references.raml#/declares/scalar/B/source-map/type-property-lexical-info/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/upanddown/with_references.raml#/declares/scalar/B/source-map/lexical/element_1" @@ -1094,9 +1069,9 @@ "@id": "file://amf-cli/shared/src/test/resources/upanddown/with_references.raml#/declares/scalar/B/source-map/lexical/element_0" } ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ + "http://a.ml/vocabularies/document-source-maps#type-property-lexical-info": [ { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/with_references.raml#/declares/scalar/B/source-map/source-vendor/element_0" + "@id": "file://amf-cli/shared/src/test/resources/upanddown/with_references.raml#/declares/scalar/B/source-map/type-property-lexical-info/element_0" } ] }, @@ -1282,11 +1257,6 @@ "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/with_references.raml#/declares/scalar/B", "http://a.ml/vocabularies/document-source-maps#value": "" }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/with_references.raml#/declares/scalar/B/source-map/type-property-lexical-info/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/with_references.raml#/declares/scalar/B", - "http://a.ml/vocabularies/document-source-maps#value": "[(3,0)-(3,4)]" - }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/with_references.raml#/declares/scalar/B/source-map/lexical/element_1", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/with_references.raml#/declares/scalar/B", @@ -1298,9 +1268,9 @@ "http://a.ml/vocabularies/document-source-maps#value": "[(3,0)-(3,12)]" }, { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/with_references.raml#/declares/scalar/B/source-map/source-vendor/element_0", + "@id": "file://amf-cli/shared/src/test/resources/upanddown/with_references.raml#/declares/scalar/B/source-map/type-property-lexical-info/element_0", "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/upanddown/with_references.raml#/declares/scalar/B", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" + "http://a.ml/vocabularies/document-source-maps#value": "[(3,0)-(3,4)]" }, { "@id": "file://amf-cli/shared/src/test/resources/upanddown/with_references.raml#/references/3/scheme/fragment/header/parameter/header/Authorization/scalar/schema/source-map/type-property-lexical-info/element_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 c5d389b618..04764d97ef 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 @@ -711,21 +711,6 @@ "@type": [ "sourcemaps:SourceMap" ], - "sourcemaps:source-vendor": [ - { - "@id": "/web-api#/source-map/source-vendor/element_0", - "sourcemaps:element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/validations/api-with-xml-examples/api.raml/web-api" - } - ], - "sourcemaps:value": [ - { - "@value": "RAML 0.8" - } - ] - } - ], "sourcemaps:lexical": [ { "@id": "/web-api#/source-map/lexical/element_1", @@ -779,7 +764,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 0.8" } 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 f3042bfbfc..9f4473ded1 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 0.8" + "doc:sourceSpec": "RAML 0.8" }, { "@id": "/web-api", @@ -55,11 +55,6 @@ "@type": [ "sourcemaps:SourceMap" ], - "sourcemaps:source-vendor": [ - { - "@id": "/web-api#/source-map/source-vendor/element_0" - } - ], "sourcemaps:lexical": [ { "@id": "/web-api#/source-map/lexical/element_1" @@ -119,11 +114,6 @@ } ] }, - { - "@id": "/web-api#/source-map/source-vendor/element_0", - "sourcemaps:element": "file://amf-cli/shared/src/test/resources/validations/api-with-xml-examples/api.raml/web-api", - "sourcemaps:value": "RAML 0.8" - }, { "@id": "/web-api#/source-map/lexical/element_1", "sourcemaps:element": "file://amf-cli/shared/src/test/resources/validations/api-with-xml-examples/api.raml/web-api", 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 f9b8bdad09..b581b13263 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 @@ -486,21 +486,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/amqp-channel-binding.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/validations/async20/amqp-channel-binding.yaml#/async-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "ASYNC 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/amqp-channel-binding.yaml#/async-api/source-map/lexical/element_3", @@ -575,7 +560,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "ASYNC 2.0" } 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 5aacdedce0..bd6022e2ab 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "ASYNC 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/amqp-channel-binding.yaml#/async-api", @@ -50,11 +50,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/amqp-channel-binding.yaml#/async-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/amqp-channel-binding.yaml#/async-api/source-map/lexical/element_3" @@ -101,11 +96,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/amqp-channel-binding.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/validations/async20/amqp-channel-binding.yaml#/async-api", - "http://a.ml/vocabularies/document-source-maps#value": "ASYNC 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/amqp-channel-binding.yaml#/async-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 a5c9e32e9a..c4151f7660 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 @@ -328,21 +328,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/amqp-message-binding.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/validations/async20/amqp-message-binding.yaml#/async-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "ASYNC 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/amqp-message-binding.yaml#/async-api/source-map/lexical/element_3", @@ -417,7 +402,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "ASYNC 2.0" } 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 8db828c909..5a7845e346 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "ASYNC 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/amqp-message-binding.yaml#/async-api", @@ -52,11 +52,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/amqp-message-binding.yaml#/async-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/amqp-message-binding.yaml#/async-api/source-map/lexical/element_3" @@ -104,11 +99,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/amqp-message-binding.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/validations/async20/amqp-message-binding.yaml#/async-api", - "http://a.ml/vocabularies/document-source-maps#value": "ASYNC 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/amqp-message-binding.yaml#/async-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 1c7714473c..234c219ef2 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 @@ -590,21 +590,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/amqp-operation-binding.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/validations/async20/amqp-operation-binding.yaml#/async-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "ASYNC 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/amqp-operation-binding.yaml#/async-api/source-map/lexical/element_3", @@ -679,7 +664,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "ASYNC 2.0" } 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 7b7ff6f065..e0947fe6d0 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "ASYNC 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/amqp-operation-binding.yaml#/async-api", @@ -55,11 +55,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/amqp-operation-binding.yaml#/async-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/amqp-operation-binding.yaml#/async-api/source-map/lexical/element_3" @@ -121,11 +116,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/amqp-operation-binding.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/validations/async20/amqp-operation-binding.yaml#/async-api", - "http://a.ml/vocabularies/document-source-maps#value": "ASYNC 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/amqp-operation-binding.yaml#/async-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 92be858322..4f53abd33a 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 @@ -496,21 +496,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/channel-parameters.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/validations/async20/channel-parameters.yaml#/async-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "ASYNC 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/channel-parameters.yaml#/async-api/source-map/lexical/element_5", @@ -611,7 +596,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "ASYNC 2.0" } 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 627de5f3b0..9077a69e72 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "ASYNC 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/channel-parameters.yaml#/async-api", @@ -64,11 +64,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/channel-parameters.yaml#/async-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/channel-parameters.yaml#/async-api/source-map/lexical/element_5" @@ -146,11 +141,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/channel-parameters.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/validations/async20/channel-parameters.yaml#/async-api", - "http://a.ml/vocabularies/document-source-maps#value": "ASYNC 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/channel-parameters.yaml#/async-api/source-map/lexical/element_5", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 adc6fde732..4d91a7aaa6 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 @@ -1203,21 +1203,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/components/async-components.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/validations/async20/components/async-components.yaml#/async-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "ASYNC 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/components/async-components.yaml#/async-api/source-map/lexical/element_4", @@ -1305,7 +1290,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "ASYNC 2.0" } 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 ec7ce2daca..c15ce68cba 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "ASYNC 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/components/async-components.yaml#/async-api", @@ -91,11 +91,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/components/async-components.yaml#/async-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/components/async-components.yaml#/async-api/source-map/lexical/element_4" @@ -274,11 +269,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/components/async-components.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/validations/async20/components/async-components.yaml#/async-api", - "http://a.ml/vocabularies/document-source-maps#value": "ASYNC 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/components/async-components.yaml#/async-api/source-map/lexical/element_4", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 f19774459e..ccb2935ca7 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 @@ -243,21 +243,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/components/external-operation-traits.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/validations/async20/components/external-operation-traits.yaml#/async-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "ASYNC 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/components/external-operation-traits.yaml#/async-api/source-map/lexical/element_3", @@ -332,7 +317,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "ASYNC 2.0" } 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 aaac47b9eb..b2cd75228f 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "ASYNC 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/components/external-operation-traits.yaml#/async-api", @@ -52,11 +52,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/components/external-operation-traits.yaml#/async-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/components/external-operation-traits.yaml#/async-api/source-map/lexical/element_3" @@ -105,11 +100,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/components/external-operation-traits.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/validations/async20/components/external-operation-traits.yaml#/async-api", - "http://a.ml/vocabularies/document-source-maps#value": "ASYNC 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/components/external-operation-traits.yaml#/async-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 333bcbbc94..fa8ca4aa10 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 @@ -374,21 +374,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/components/message-traits.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/validations/async20/components/message-traits.yaml#/async-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "ASYNC 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/components/message-traits.yaml#/async-api/source-map/lexical/element_3", @@ -463,7 +448,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "ASYNC 2.0" } 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 380f286bda..b9f311b5a2 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "ASYNC 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/components/message-traits.yaml#/async-api", @@ -52,11 +52,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/components/message-traits.yaml#/async-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/components/message-traits.yaml#/async-api/source-map/lexical/element_3" @@ -105,11 +100,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/components/message-traits.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/validations/async20/components/message-traits.yaml#/async-api", - "http://a.ml/vocabularies/document-source-maps#value": "ASYNC 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/components/message-traits.yaml#/async-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 c9d3cbec22..ef31b8f739 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 @@ -207,21 +207,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/components/operation-traits.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/validations/async20/components/operation-traits.yaml#/async-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "ASYNC 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/components/operation-traits.yaml#/async-api/source-map/lexical/element_3", @@ -296,7 +281,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "ASYNC 2.0" } 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 14cec188c5..443b3966d6 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "ASYNC 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/components/operation-traits.yaml#/async-api", @@ -52,11 +52,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/components/operation-traits.yaml#/async-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/components/operation-traits.yaml#/async-api/source-map/lexical/element_3" @@ -105,11 +100,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/components/operation-traits.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/validations/async20/components/operation-traits.yaml#/async-api", - "http://a.ml/vocabularies/document-source-maps#value": "ASYNC 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/components/operation-traits.yaml#/async-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 852a4ee84c..e2b0f549b5 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 @@ -6182,21 +6182,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/draft-7-schemas.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/validations/async20/draft-7-schemas.yaml#/async-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "ASYNC 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/draft-7-schemas.yaml#/async-api/source-map/lexical/element_3", @@ -6271,7 +6256,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "ASYNC 2.0" } 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 54ee2ab79b..3e152487db 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "ASYNC 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/draft-7-schemas.yaml#/async-api", @@ -220,11 +220,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/draft-7-schemas.yaml#/async-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/draft-7-schemas.yaml#/async-api/source-map/lexical/element_3" @@ -528,11 +523,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/draft-7-schemas.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/validations/async20/draft-7-schemas.yaml#/async-api", - "http://a.ml/vocabularies/document-source-maps#value": "ASYNC 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/draft-7-schemas.yaml#/async-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 b26cbceef2..bd9643fd87 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 @@ -32,21 +32,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/draft-7/references.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/validations/async20/draft-7/references.yaml#/async-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "ASYNC 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/draft-7/references.yaml#/async-api/source-map/lexical/element_2", @@ -108,7 +93,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "ASYNC 2.0" } 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 9ad918be6d..9f76a7f394 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "ASYNC 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/draft-7/references.yaml#/async-api", @@ -29,11 +29,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/draft-7/references.yaml#/async-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/draft-7/references.yaml#/async-api/source-map/lexical/element_2" @@ -46,11 +41,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/draft-7/references.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/validations/async20/draft-7/references.yaml#/async-api", - "http://a.ml/vocabularies/document-source-maps#value": "ASYNC 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/draft-7/references.yaml#/async-api/source-map/lexical/element_2", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#name", 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 867a118666..ce0500d867 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 @@ -2978,21 +2978,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/empty-binding-and-annotations.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/validations/async20/empty-binding-and-annotations.yaml#/async-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "ASYNC 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/empty-binding-and-annotations.yaml#/async-api/source-map/lexical/element_4", @@ -3080,7 +3065,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "ASYNC 2.0" } 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 4d60881f21..c7d7e0e4a3 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "ASYNC 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/empty-binding-and-annotations.yaml#/async-api", @@ -95,11 +95,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/empty-binding-and-annotations.yaml#/async-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/empty-binding-and-annotations.yaml#/async-api/source-map/lexical/element_4" @@ -326,11 +321,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/empty-binding-and-annotations.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/validations/async20/empty-binding-and-annotations.yaml#/async-api", - "http://a.ml/vocabularies/document-source-maps#value": "ASYNC 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/empty-binding-and-annotations.yaml#/async-api/source-map/lexical/element_4", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 1f2fe6b9ca..5ac98de54a 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 @@ -532,21 +532,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/http-message-binding.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/validations/async20/http-message-binding.yaml#/async-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "ASYNC 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/http-message-binding.yaml#/async-api/source-map/lexical/element_3", @@ -621,7 +606,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "ASYNC 2.0" } 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 89f57f36cf..eeeeee6d09 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "ASYNC 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/http-message-binding.yaml#/async-api", @@ -52,11 +52,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/http-message-binding.yaml#/async-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/http-message-binding.yaml#/async-api/source-map/lexical/element_3" @@ -104,11 +99,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/http-message-binding.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/validations/async20/http-message-binding.yaml#/async-api", - "http://a.ml/vocabularies/document-source-maps#value": "ASYNC 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/http-message-binding.yaml#/async-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 77ca6660ef..bac440f9b9 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 @@ -520,21 +520,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/http-operation-binding.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/validations/async20/http-operation-binding.yaml#/async-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "ASYNC 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/http-operation-binding.yaml#/async-api/source-map/lexical/element_3", @@ -609,7 +594,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "ASYNC 2.0" } 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 b51ed94352..2f9be6017d 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "ASYNC 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/http-operation-binding.yaml#/async-api", @@ -52,11 +52,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/http-operation-binding.yaml#/async-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/http-operation-binding.yaml#/async-api/source-map/lexical/element_3" @@ -102,11 +97,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/http-operation-binding.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/validations/async20/http-operation-binding.yaml#/async-api", - "http://a.ml/vocabularies/document-source-maps#value": "ASYNC 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/http-operation-binding.yaml#/async-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 ee4074ddf4..da900f73e4 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 @@ -398,21 +398,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/kafka-message-binding.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/validations/async20/kafka-message-binding.yaml#/async-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "ASYNC 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/kafka-message-binding.yaml#/async-api/source-map/lexical/element_3", @@ -487,7 +472,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "ASYNC 2.0" } 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 f523bb8f94..ae463c9e41 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "ASYNC 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/kafka-message-binding.yaml#/async-api", @@ -52,11 +52,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/kafka-message-binding.yaml#/async-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/kafka-message-binding.yaml#/async-api/source-map/lexical/element_3" @@ -104,11 +99,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/kafka-message-binding.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/validations/async20/kafka-message-binding.yaml#/async-api", - "http://a.ml/vocabularies/document-source-maps#value": "ASYNC 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/kafka-message-binding.yaml#/async-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 7be8a3b29c..7966fed833 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 @@ -533,21 +533,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/kafka-operation-binding.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/validations/async20/kafka-operation-binding.yaml#/async-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "ASYNC 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/kafka-operation-binding.yaml#/async-api/source-map/lexical/element_3", @@ -622,7 +607,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "ASYNC 2.0" } 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 2ffb41f980..b4ab767a8f 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "ASYNC 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/kafka-operation-binding.yaml#/async-api", @@ -52,11 +52,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/kafka-operation-binding.yaml#/async-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/kafka-operation-binding.yaml#/async-api/source-map/lexical/element_3" @@ -102,11 +97,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/kafka-operation-binding.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/validations/async20/kafka-operation-binding.yaml#/async-api", - "http://a.ml/vocabularies/document-source-maps#value": "ASYNC 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/kafka-operation-binding.yaml#/async-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 fc1c9b6746..abe9f56c03 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 @@ -2032,21 +2032,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/message-obj.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/validations/async20/message-obj.yaml#/async-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "ASYNC 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/message-obj.yaml#/async-api/source-map/lexical/element_5", @@ -2147,7 +2132,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "ASYNC 2.0" } 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 e314ce0de5..5529647c17 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "ASYNC 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/message-obj.yaml#/async-api", @@ -74,11 +74,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/message-obj.yaml#/async-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/message-obj.yaml#/async-api/source-map/lexical/element_5" @@ -149,11 +144,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/message-obj.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/validations/async20/message-obj.yaml#/async-api", - "http://a.ml/vocabularies/document-source-maps#value": "ASYNC 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/message-obj.yaml#/async-api/source-map/lexical/element_5", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#license", 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 786bcf76be..6ac011a8ea 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 @@ -292,21 +292,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/mqtt-message-binding.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/validations/async20/mqtt-message-binding.yaml#/async-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "ASYNC 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/mqtt-message-binding.yaml#/async-api/source-map/lexical/element_3", @@ -381,7 +366,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "ASYNC 2.0" } 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 4280fb99b5..ead2aa01fb 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "ASYNC 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/mqtt-message-binding.yaml#/async-api", @@ -52,11 +52,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/mqtt-message-binding.yaml#/async-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/mqtt-message-binding.yaml#/async-api/source-map/lexical/element_3" @@ -104,11 +99,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/mqtt-message-binding.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/validations/async20/mqtt-message-binding.yaml#/async-api", - "http://a.ml/vocabularies/document-source-maps#value": "ASYNC 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/mqtt-message-binding.yaml#/async-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 c6a042268b..bb88b026c0 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 @@ -284,21 +284,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/mqtt-operation-binding.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/validations/async20/mqtt-operation-binding.yaml#/async-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "ASYNC 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/mqtt-operation-binding.yaml#/async-api/source-map/lexical/element_3", @@ -373,7 +358,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "ASYNC 2.0" } 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 0389b44f7a..c8ea4e7c71 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "ASYNC 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/mqtt-operation-binding.yaml#/async-api", @@ -52,11 +52,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/mqtt-operation-binding.yaml#/async-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/mqtt-operation-binding.yaml#/async-api/source-map/lexical/element_3" @@ -102,11 +97,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/mqtt-operation-binding.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/validations/async20/mqtt-operation-binding.yaml#/async-api", - "http://a.ml/vocabularies/document-source-maps#value": "ASYNC 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/mqtt-operation-binding.yaml#/async-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 9ef79b8117..d0c1ae4520 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 @@ -404,21 +404,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/mqtt-server-binding.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/validations/async20/mqtt-server-binding.yaml#/async-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "ASYNC 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/mqtt-server-binding.yaml#/async-api/source-map/lexical/element_4", @@ -506,7 +491,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "ASYNC 2.0" } 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 0cc6ee17ec..77ae6955f4 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "ASYNC 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/mqtt-server-binding.yaml#/async-api", @@ -53,11 +53,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/mqtt-server-binding.yaml#/async-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/mqtt-server-binding.yaml#/async-api/source-map/lexical/element_4" @@ -113,11 +108,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/mqtt-server-binding.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/validations/async20/mqtt-server-binding.yaml#/async-api", - "http://a.ml/vocabularies/document-source-maps#value": "ASYNC 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/mqtt-server-binding.yaml#/async-api/source-map/lexical/element_4", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 4e05a30db5..c7547732eb 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 @@ -716,21 +716,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/publish-subscribe.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/validations/async20/publish-subscribe.yaml#/async-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "ASYNC 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/publish-subscribe.yaml#/async-api/source-map/lexical/element_3", @@ -805,7 +790,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "ASYNC 2.0" } 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 495e7884a9..ed2f48b4e4 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "ASYNC 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/publish-subscribe.yaml#/async-api", @@ -56,11 +56,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/publish-subscribe.yaml#/async-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/publish-subscribe.yaml#/async-api/source-map/lexical/element_3" @@ -141,11 +136,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/publish-subscribe.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/validations/async20/publish-subscribe.yaml#/async-api", - "http://a.ml/vocabularies/document-source-maps#value": "ASYNC 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/publish-subscribe.yaml#/async-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 ea74758e98..6d37eb3dda 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 @@ -193,9 +193,6 @@ } ], "smaps": { - "source-vendor": { - "#13": "ASYNC 2.0" - }, "lexical": { "apiContract:endpoint": "[(10,0)-(19,0)]", "core:name": "[(3,2)-(4,0)]", @@ -226,7 +223,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "ASYNC 2.0" } @@ -364,14 +361,11 @@ "resolved-link": { "#7": "amf://id#9" }, - "type-property-lexical-info": { - "#7": "[(3,0)-(3,4)]" - }, "lexical": { "#7": "[(3,0)-(6,0)]" }, - "source-vendor": { - "#7": "RAML 1.0" + "type-property-lexical-info": { + "#7": "[(3,0)-(3,4)]" }, "resolved-link-target": { "#7": "amf://id#7" @@ -463,7 +457,7 @@ "@value": "3.2.0" } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } @@ -493,7 +487,7 @@ "@value": "3.2.0" } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 7cf9299eaf..adb4a06333 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "ASYNC 2.0" + "doc:sourceSpec": "ASYNC 2.0" }, { "@id": "#13", @@ -25,9 +25,6 @@ } ], "smaps": { - "source-vendor": { - "#13": "ASYNC 2.0" - }, "lexical": { "apiContract:endpoint": "[(10,0)-(19,0)]", "core:name": "[(3,2)-(4,0)]", @@ -190,14 +187,11 @@ "resolved-link": { "#7": "amf://id#9" }, - "type-property-lexical-info": { - "#7": "[(3,0)-(3,4)]" - }, "lexical": { "#7": "[(3,0)-(6,0)]" }, - "source-vendor": { - "#7": "RAML 1.0" + "type-property-lexical-info": { + "#7": "[(3,0)-(3,4)]" }, "resolved-link-target": { "#7": "amf://id#7" @@ -399,7 +393,7 @@ "doc:APIContractProcessingData" ], "apiContract:modelVersion": "3.2.0", - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#6", @@ -407,7 +401,7 @@ "doc:APIContractProcessingData" ], "apiContract:modelVersion": "3.2.0", - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" } ], "@context": { 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 8103bea9a3..6609fafa7c 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 @@ -124,9 +124,6 @@ } ], "smaps": { - "source-vendor": { - "#8": "ASYNC 2.0" - }, "lexical": { "apiContract:endpoint": "[(10,0)-(16,0)]", "core:name": "[(3,2)-(4,0)]", @@ -157,7 +154,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "ASYNC 2.0" } @@ -248,7 +245,7 @@ "@value": "3.2.0" } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 e6ee34eb12..0cac3e93aa 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "ASYNC 2.0" + "doc:sourceSpec": "ASYNC 2.0" }, { "@id": "#8", @@ -25,9 +25,6 @@ } ], "smaps": { - "source-vendor": { - "#8": "ASYNC 2.0" - }, "lexical": { "apiContract:endpoint": "[(10,0)-(16,0)]", "core:name": "[(3,2)-(4,0)]", @@ -251,7 +248,7 @@ "doc:APIContractProcessingData" ], "apiContract:modelVersion": "3.2.0", - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" } ], "@context": { 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 872926809b..8190baf66c 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 @@ -118,9 +118,6 @@ } ], "smaps": { - "source-vendor": { - "#6": "ASYNC 2.0" - }, "lexical": { "apiContract:endpoint": "[(11,0)-(18,0)]", "core:name": "[(3,2)-(4,0)]", @@ -151,7 +148,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "ASYNC 2.0" } @@ -198,7 +195,7 @@ "@value": "3.2.0" } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 1b0bbf0922..a5fa0b6392 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "ASYNC 2.0" + "doc:sourceSpec": "ASYNC 2.0" }, { "@id": "#6", @@ -25,9 +25,6 @@ } ], "smaps": { - "source-vendor": { - "#6": "ASYNC 2.0" - }, "lexical": { "apiContract:endpoint": "[(11,0)-(18,0)]", "core:name": "[(3,2)-(4,0)]", @@ -205,7 +202,7 @@ "doc:APIContractProcessingData" ], "apiContract:modelVersion": "3.2.0", - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" } ], "@context": { 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 e05f825d4b..dfb3901d30 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 @@ -124,9 +124,6 @@ } ], "smaps": { - "source-vendor": { - "#7": "ASYNC 2.0" - }, "lexical": { "apiContract:endpoint": "[(5,0)-(12,0)]", "core:name": "[(3,2)-(4,0)]", @@ -157,7 +154,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "ASYNC 2.0" } @@ -248,7 +245,7 @@ "@value": "3.2.0" } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 59fba0e160..e07c6dc826 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "ASYNC 2.0" + "doc:sourceSpec": "ASYNC 2.0" }, { "@id": "#7", @@ -25,9 +25,6 @@ } ], "smaps": { - "source-vendor": { - "#7": "ASYNC 2.0" - }, "lexical": { "apiContract:endpoint": "[(5,0)-(12,0)]", "core:name": "[(3,2)-(4,0)]", @@ -217,7 +214,7 @@ "doc:APIContractProcessingData" ], "apiContract:modelVersion": "3.2.0", - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" } ], "@context": { 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 4634d1ea74..260f553348 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 @@ -163,9 +163,6 @@ } ], "smaps": { - "source-vendor": { - "#5": "ASYNC 2.0" - }, "lexical": { "apiContract:endpoint": "[(5,0)-(12,0)]", "core:name": "[(3,2)-(4,0)]", @@ -196,7 +193,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "ASYNC 2.0" } 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 8b4d09b1d4..3ac2160686 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "ASYNC 2.0" + "doc:sourceSpec": "ASYNC 2.0" }, { "@id": "#5", @@ -25,9 +25,6 @@ } ], "smaps": { - "source-vendor": { - "#5": "ASYNC 2.0" - }, "lexical": { "apiContract:endpoint": "[(5,0)-(12,0)]", "core:name": "[(3,2)-(4,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 c468b714ba..e357ebe715 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 @@ -124,9 +124,6 @@ } ], "smaps": { - "source-vendor": { - "#13": "ASYNC 2.0" - }, "lexical": { "apiContract:endpoint": "[(5,0)-(12,0)]", "core:name": "[(3,2)-(4,0)]", @@ -157,7 +154,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "ASYNC 2.0" } @@ -367,7 +364,7 @@ "@value": "3.2.0" } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } @@ -375,9 +372,6 @@ } ], "smaps": { - "source-vendor": { - "#1": "RAML 1.0" - }, "lexical": { "#1": "[(1,0)-(9,0)]" } 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 a67eae35fc..4def6a2d66 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "ASYNC 2.0" + "doc:sourceSpec": "ASYNC 2.0" }, { "@id": "#13", @@ -25,9 +25,6 @@ } ], "smaps": { - "source-vendor": { - "#13": "ASYNC 2.0" - }, "lexical": { "apiContract:endpoint": "[(5,0)-(12,0)]", "core:name": "[(3,2)-(4,0)]", @@ -250,9 +247,6 @@ "@id": "#11" }, "smaps": { - "source-vendor": { - "#1": "RAML 1.0" - }, "lexical": { "#1": "[(1,0)-(9,0)]" } @@ -304,7 +298,7 @@ "doc:APIContractProcessingData" ], "apiContract:modelVersion": "3.2.0", - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" } ], "@context": { 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 0e22dc91cf..a8adfc3123 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 @@ -2541,21 +2541,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/rpc-server.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/validations/async20/rpc-server.yaml#/async-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "ASYNC 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/rpc-server.yaml#/async-api/source-map/lexical/element_8", @@ -2695,7 +2680,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "ASYNC 2.0" } 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 6afdcf3154..726660091d 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "ASYNC 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/rpc-server.yaml#/async-api", @@ -112,11 +112,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/rpc-server.yaml#/async-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/rpc-server.yaml#/async-api/source-map/lexical/element_8" @@ -293,11 +288,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/rpc-server.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/validations/async20/rpc-server.yaml#/async-api", - "http://a.ml/vocabularies/document-source-maps#value": "ASYNC 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/rpc-server.yaml#/async-api/source-map/lexical/element_8", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 4ee5db46a0..fbd2dcd622 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 @@ -2656,21 +2656,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/security-schemes.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/validations/async20/security-schemes.yaml#/async-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "ASYNC 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/security-schemes.yaml#/async-api/source-map/lexical/element_4", @@ -2758,7 +2743,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "ASYNC 2.0" } 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 552d91ca91..2e34be9975 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "ASYNC 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/security-schemes.yaml#/async-api", @@ -73,11 +73,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/security-schemes.yaml#/async-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/security-schemes.yaml#/async-api/source-map/lexical/element_4" @@ -238,11 +233,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/security-schemes.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/validations/async20/security-schemes.yaml#/async-api", - "http://a.ml/vocabularies/document-source-maps#value": "ASYNC 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/security-schemes.yaml#/async-api/source-map/lexical/element_4", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 a8cffe89b5..c5f62f941c 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 @@ -201,9 +201,6 @@ } ], "smaps": { - "source-vendor": { - "#12": "ASYNC 2.0" - }, "lexical": { "apiContract:endpoint": "[(7,0)-(18,0)]", "core:name": "[(4,2)-(5,0)]", @@ -234,7 +231,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "ASYNC 2.0" } 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 09b3c132e6..4f7ba114a8 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "ASYNC 2.0" + "doc:sourceSpec": "ASYNC 2.0" }, { "@id": "#12", @@ -25,9 +25,6 @@ } ], "smaps": { - "source-vendor": { - "#12": "ASYNC 2.0" - }, "lexical": { "apiContract:endpoint": "[(7,0)-(18,0)]", "core:name": "[(4,2)-(5,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 30d61a759f..a50fb6ecd0 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 @@ -201,9 +201,6 @@ } ], "smaps": { - "source-vendor": { - "#6": "ASYNC 2.0" - }, "lexical": { "apiContract:endpoint": "[(7,0)-(18,0)]", "core:name": "[(4,2)-(5,0)]", @@ -234,7 +231,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "ASYNC 2.0" } 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 a2aef92999..4498792895 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "ASYNC 2.0" + "doc:sourceSpec": "ASYNC 2.0" }, { "@id": "#6", @@ -25,9 +25,6 @@ } ], "smaps": { - "source-vendor": { - "#6": "ASYNC 2.0" - }, "lexical": { "apiContract:endpoint": "[(7,0)-(18,0)]", "core:name": "[(4,2)-(5,0)]", 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 8d6910cb6a..a6a02cff7d 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 @@ -690,21 +690,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/ws-channel-binding.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/validations/async20/ws-channel-binding.yaml#/async-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "ASYNC 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/ws-channel-binding.yaml#/async-api/source-map/lexical/element_3", @@ -779,7 +764,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "ASYNC 2.0" } 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 52d5ff9280..beb3e43af2 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "ASYNC 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/ws-channel-binding.yaml#/async-api", @@ -50,11 +50,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/ws-channel-binding.yaml#/async-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/ws-channel-binding.yaml#/async-api/source-map/lexical/element_3" @@ -101,11 +96,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/validations/async20/ws-channel-binding.yaml#/async-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/validations/async20/ws-channel-binding.yaml#/async-api", - "http://a.ml/vocabularies/document-source-maps#value": "ASYNC 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/validations/async20/ws-channel-binding.yaml#/async-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 905031cae9..3f8d381e78 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 @@ -378,9 +378,6 @@ } ], "smaps": { - "source-vendor": { - "#13": "OAS 2.0" - }, "lexical": { "apiContract:endpoint": "[(6,0)-(30,0)]", "core:name": "[(4,2)-(6,0)]", @@ -411,7 +408,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "OAS 2.0" } 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 ff72fc8dc6..921cacfe7c 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "OAS 2.0" + "doc:sourceSpec": "OAS 2.0" }, { "@id": "#13", @@ -25,9 +25,6 @@ } ], "smaps": { - "source-vendor": { - "#13": "OAS 2.0" - }, "lexical": { "apiContract:endpoint": "[(6,0)-(30,0)]", "core:name": "[(4,2)-(6,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 604c85baf0..6603fcbaa0 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 @@ -399,9 +399,6 @@ "core:name": "[(2,0)-(4,0)]", "#9": "[(2,0)-(23,23)]", "apiContract:accepts": "[(4,0)-(6,0)]" - }, - "source-vendor": { - "#9": "RAML 1.0" } } } @@ -427,7 +424,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 321012a7a9..f8c9863dd6 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#9", @@ -39,9 +39,6 @@ "core:name": "[(2,0)-(4,0)]", "#9": "[(2,0)-(23,23)]", "apiContract:accepts": "[(4,0)-(6,0)]" - }, - "source-vendor": { - "#9": "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 edc085fdec..cd02d26902 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 @@ -1315,9 +1315,6 @@ } ], "smaps": { - "source-vendor": { - "#37": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(4,0)]", "#37": "[(2,0)-(92,0)]" @@ -1346,7 +1343,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } @@ -1460,16 +1457,13 @@ "resolved-link": { "#2": "amf://id#6" }, - "source-vendor": { - "#2": "RAML 1.0" + "type-property-lexical-info": { + "#2": "[(3,0)-(3,4)]" }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#2": "[(2,0)-(5,32)]" }, - "type-property-lexical-info": { - "#2": "[(3,0)-(3,4)]" - }, "resolved-link-target": { "#2": "amf://id#2" } @@ -1492,7 +1486,7 @@ "@value": "3.2.0" } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } @@ -1611,16 +1605,13 @@ "resolved-link": { "#9": "amf://id#13" }, - "source-vendor": { - "#9": "RAML 1.0" + "type-property-lexical-info": { + "#9": "[(3,0)-(3,4)]" }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#9": "[(2,0)-(5,30)]" }, - "type-property-lexical-info": { - "#9": "[(3,0)-(3,4)]" - }, "resolved-link-target": { "#9": "amf://id#9" } @@ -1643,7 +1634,7 @@ "@value": "3.2.0" } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } @@ -1759,16 +1750,13 @@ "resolved-link": { "#16": "amf://id#19" }, - "source-vendor": { - "#16": "RAML 1.0" + "type-property-lexical-info": { + "#16": "[(3,0)-(3,4)]" }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#16": "[(2,0)-(5,29)]" }, - "type-property-lexical-info": { - "#16": "[(3,0)-(3,4)]" - }, "auto-generated-name": { "#16": "" }, @@ -1794,7 +1782,7 @@ "@value": "3.2.0" } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } @@ -2288,16 +2276,13 @@ "resolved-link-target": { "#34": "amf://id#2" }, - "source-vendor": { - "#34": "RAML 1.0" + "type-property-lexical-info": { + "#34": "[(3,0)-(3,4)]" }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#34": "[(2,0)-(5,32)]" }, - "type-property-lexical-info": { - "#34": "[(3,0)-(3,4)]" - }, "resolved-link": { "#34": "amf://id#34" }, @@ -2401,16 +2386,13 @@ "resolved-link-target": { "#35": "amf://id#2" }, - "source-vendor": { - "#35": "RAML 1.0" + "type-property-lexical-info": { + "#35": "[(3,0)-(3,4)]" }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#35": "[(2,0)-(5,32)]" }, - "type-property-lexical-info": { - "#35": "[(3,0)-(3,4)]" - }, "resolved-link": { "#35": "amf://id#35" }, 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 c677ef3d23..f0b19b48cc 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#37", @@ -45,9 +45,6 @@ } ], "smaps": { - "source-vendor": { - "#37": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(4,0)]", "#37": "[(2,0)-(92,0)]" @@ -926,16 +923,13 @@ "resolved-link": { "#9": "amf://id#13" }, - "source-vendor": { - "#9": "RAML 1.0" + "type-property-lexical-info": { + "#9": "[(3,0)-(3,4)]" }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#9": "[(2,0)-(5,30)]" }, - "type-property-lexical-info": { - "#9": "[(3,0)-(3,4)]" - }, "resolved-link-target": { "#9": "amf://id#9" } @@ -965,16 +959,13 @@ "resolved-link": { "#16": "amf://id#19" }, - "source-vendor": { - "#16": "RAML 1.0" + "type-property-lexical-info": { + "#16": "[(3,0)-(3,4)]" }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#16": "[(2,0)-(5,29)]" }, - "type-property-lexical-info": { - "#16": "[(3,0)-(3,4)]" - }, "auto-generated-name": { "#16": "" }, @@ -1172,16 +1163,13 @@ "resolved-link-target": { "#35": "amf://id#2" }, - "source-vendor": { - "#35": "RAML 1.0" + "type-property-lexical-info": { + "#35": "[(3,0)-(3,4)]" }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#35": "[(2,0)-(5,32)]" }, - "type-property-lexical-info": { - "#35": "[(3,0)-(3,4)]" - }, "resolved-link": { "#35": "amf://id#35" }, @@ -1214,16 +1202,13 @@ "resolved-link-target": { "#34": "amf://id#2" }, - "source-vendor": { - "#34": "RAML 1.0" + "type-property-lexical-info": { + "#34": "[(3,0)-(3,4)]" }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#34": "[(2,0)-(5,32)]" }, - "type-property-lexical-info": { - "#34": "[(3,0)-(3,4)]" - }, "resolved-link": { "#34": "amf://id#34" }, @@ -1783,16 +1768,13 @@ "resolved-link": { "#2": "amf://id#6" }, - "source-vendor": { - "#2": "RAML 1.0" + "type-property-lexical-info": { + "#2": "[(3,0)-(3,4)]" }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#2": "[(2,0)-(5,32)]" }, - "type-property-lexical-info": { - "#2": "[(3,0)-(3,4)]" - }, "resolved-link-target": { "#2": "amf://id#2" } @@ -1804,7 +1786,7 @@ "doc:APIContractProcessingData" ], "apiContract:modelVersion": "3.2.0", - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#14", @@ -1812,7 +1794,7 @@ "doc:APIContractProcessingData" ], "apiContract:modelVersion": "3.2.0", - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#20", @@ -1820,7 +1802,7 @@ "doc:APIContractProcessingData" ], "apiContract:modelVersion": "3.2.0", - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" } ], "@context": { 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 fdf5313d55..b74832a2a0 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 @@ -219,9 +219,6 @@ "core:name": "[(2,0)-(4,0)]", "#9": "[(2,0)-(19,30)]", "apiContract:accepts": "[(4,0)-(6,0)]" - }, - "source-vendor": { - "#9": "RAML 1.0" } } } @@ -247,7 +244,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 e77afed0b0..6b39ec6ace 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#9", @@ -42,9 +42,6 @@ "core:name": "[(2,0)-(4,0)]", "#9": "[(2,0)-(19,30)]", "apiContract:accepts": "[(4,0)-(6,0)]" - }, - "source-vendor": { - "#9": "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 c44e63b44a..64f7135410 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 @@ -219,9 +219,6 @@ "core:name": "[(2,0)-(4,0)]", "#21": "[(2,0)-(31,13)]", "apiContract:accepts": "[(4,0)-(6,0)]" - }, - "source-vendor": { - "#21": "RAML 1.0" } } } @@ -247,7 +244,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 8013c06153..d94b4e278c 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#21", @@ -42,9 +42,6 @@ "core:name": "[(2,0)-(4,0)]", "#21": "[(2,0)-(31,13)]", "apiContract:accepts": "[(4,0)-(6,0)]" - }, - "source-vendor": { - "#21": "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 81884ae140..7b37bd4e44 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 @@ -1823,21 +1823,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/examples/dialect-fragment/api.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/validations/examples/dialect-fragment/api.raml/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/examples/dialect-fragment/api.raml/web-api#/source-map/lexical/element_2", @@ -1904,7 +1889,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 c644b75126..af505380e6 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/validations/examples/dialect-fragment/api.raml/web-api", @@ -53,11 +53,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/examples/dialect-fragment/api.raml/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/examples/dialect-fragment/api.raml/web-api#/source-map/lexical/element_2" @@ -103,11 +98,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/validations/examples/dialect-fragment/api.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/validations/examples/dialect-fragment/api.raml/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/validations/examples/dialect-fragment/api.raml/web-api#/source-map/lexical/element_2", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#name", 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 fc7bc8529c..5f6a99eb0f 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 @@ -1189,9 +1189,6 @@ } ], "smaps": { - "source-vendor": { - "#33": "RAML 1.0" - }, "lexical": { "core:name": "[(3,0)-(6,0)]", "#33": "[(3,0)-(37,3)]" @@ -1220,7 +1217,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } @@ -1653,14 +1650,11 @@ "synthesized-field": { "shacl:closed": "true" }, - "type-property-lexical-info": { - "#2": "[(2,0)-(2,4)]" - }, "lexical": { "#2": "[(2,0)-(20,0)]" }, - "source-vendor": { - "#2": "RAML 1.0" + "type-property-lexical-info": { + "#2": "[(2,0)-(2,4)]" } } } @@ -1681,7 +1675,7 @@ "@value": "3.2.0" } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } @@ -1717,12 +1711,7 @@ { "@value": "application/yaml" } - ], - "smaps": { - "source-vendor": { - "#18": "RAML 1.0" - } - } + ] } ], "doc:root": [ @@ -1741,7 +1730,7 @@ "@value": "3.2.0" } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } @@ -1777,12 +1766,7 @@ { "@value": "application/yaml" } - ], - "smaps": { - "source-vendor": { - "#21": "RAML 1.0" - } - } + ] } ], "doc:root": [ @@ -1801,7 +1785,7 @@ "@value": "3.2.0" } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } @@ -2462,15 +2446,12 @@ "resolved-link-target": { "#23": "amf://id#2" }, - "source-vendor": { - "#23": "RAML 1.0" + "type-property-lexical-info": { + "#23": "[(2,0)-(2,4)]" }, "lexical": { "#23": "[(2,0)-(20,0)]" }, - "type-property-lexical-info": { - "#23": "[(2,0)-(2,4)]" - }, "resolved-link": { "#23": "amf://id#23" }, 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 53104ecd81..0df6b1b6f0 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#33", @@ -27,9 +27,6 @@ } ], "smaps": { - "source-vendor": { - "#33": "RAML 1.0" - }, "lexical": { "core:name": "[(3,0)-(6,0)]", "#33": "[(3,0)-(37,3)]" @@ -414,15 +411,12 @@ "resolved-link-target": { "#23": "amf://id#2" }, - "source-vendor": { - "#23": "RAML 1.0" + "type-property-lexical-info": { + "#23": "[(2,0)-(2,4)]" }, "lexical": { "#23": "[(2,0)-(20,0)]" }, - "type-property-lexical-info": { - "#23": "[(2,0)-(2,4)]" - }, "resolved-link": { "#23": "amf://id#23" }, @@ -1636,14 +1630,11 @@ "synthesized-field": { "shacl:closed": "true" }, - "type-property-lexical-info": { - "#2": "[(2,0)-(2,4)]" - }, "lexical": { "#2": "[(2,0)-(20,0)]" }, - "source-vendor": { - "#2": "RAML 1.0" + "type-property-lexical-info": { + "#2": "[(2,0)-(2,4)]" } } }, @@ -1653,7 +1644,7 @@ "doc:APIContractProcessingData" ], "apiContract:modelVersion": "3.2.0", - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#18", @@ -1662,12 +1653,7 @@ "doc:DomainElement" ], "doc:raw": "#%RAML 1.0 NamedExample\nvalue:\n -\n \n category: \n id: 39691\n name: Religious and Spiritual\n created_at: 2013-01-02T22:21:34Z\n \n -\n category: \n id: 61111 \n name: Service\n created_at: 2016-02-01T16:37:02Z\n ", - "core:mediaType": "application/yaml", - "smaps": { - "source-vendor": { - "#18": "RAML 1.0" - } - } + "core:mediaType": "application/yaml" }, { "@id": "#19", @@ -1675,7 +1661,7 @@ "doc:APIContractProcessingData" ], "apiContract:modelVersion": "3.2.0", - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#21", @@ -1684,12 +1670,7 @@ "doc:DomainElement" ], "doc:raw": "#%RAML 1.0 NamedExample\nvalue:\n alternate_id: 1\n category: \n id: 39691\n name: Religious and Spiritual\n created_at: 2013-01-02T22:21:34Z\n \n", - "core:mediaType": "application/yaml", - "smaps": { - "source-vendor": { - "#21": "RAML 1.0" - } - } + "core:mediaType": "application/yaml" }, { "@id": "#22", @@ -1697,7 +1678,7 @@ "doc:APIContractProcessingData" ], "apiContract:modelVersion": "3.2.0", - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" } ], "@context": { 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 0940269479..bc18e9f424 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 @@ -5398,21 +5398,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/examples/vocabulary-fragment/api.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/validations/examples/vocabulary-fragment/api.raml/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/examples/vocabulary-fragment/api.raml/web-api#/source-map/lexical/element_2", @@ -5479,7 +5464,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 76be28a7f3..7fbf5a6206 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/validations/examples/vocabulary-fragment/api.raml/web-api", @@ -53,11 +53,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/examples/vocabulary-fragment/api.raml/web-api#/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/examples/vocabulary-fragment/api.raml/web-api#/source-map/lexical/element_2" @@ -103,11 +98,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/validations/examples/vocabulary-fragment/api.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/validations/examples/vocabulary-fragment/api.raml/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/validations/examples/vocabulary-fragment/api.raml/web-api#/source-map/lexical/element_2", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#name", diff --git a/amf-cli/shared/src/test/resources/validations/healthcare_reduced_v1.raml.resolved b/amf-cli/shared/src/test/resources/validations/healthcare_reduced_v1.raml.resolved index 73d7019ab0..04cb7dd578 100644 --- a/amf-cli/shared/src/test/resources/validations/healthcare_reduced_v1.raml.resolved +++ b/amf-cli/shared/src/test/resources/validations/healthcare_reduced_v1.raml.resolved @@ -247,21 +247,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/healthcare_reduced_v1.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/validations/healthcare_reduced_v1.raml/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/healthcare_reduced_v1.raml/web-api#/source-map/lexical/element_2", @@ -328,7 +313,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } diff --git a/amf-cli/shared/src/test/resources/validations/healthcare_reduced_v2.raml.resolved b/amf-cli/shared/src/test/resources/validations/healthcare_reduced_v2.raml.resolved index 6bbfd450e4..d7436e37af 100644 --- a/amf-cli/shared/src/test/resources/validations/healthcare_reduced_v2.raml.resolved +++ b/amf-cli/shared/src/test/resources/validations/healthcare_reduced_v2.raml.resolved @@ -242,21 +242,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/healthcare_reduced_v2.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/validations/healthcare_reduced_v2.raml/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/healthcare_reduced_v2.raml/web-api#/source-map/lexical/element_1", @@ -310,7 +295,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 4b210ed4ef..a05da37794 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 @@ -263,9 +263,6 @@ } ], "smaps": { - "source-vendor": { - "#6": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#6": "[(2,0)-(14,0)]" @@ -294,7 +291,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 e997c9c30d..2fc83d2074 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#6", @@ -24,9 +24,6 @@ } ], "smaps": { - "source-vendor": { - "#6": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#6": "[(2,0)-(14,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 c1c55ec57c..bede6f2313 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 @@ -22,9 +22,6 @@ } ], "smaps": { - "source-vendor": { - "#11": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#11": "[(2,0)-(7,21)]" @@ -53,7 +50,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } @@ -197,7 +194,7 @@ "@value": "3.2.0" } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } @@ -205,9 +202,6 @@ } ], "smaps": { - "source-vendor": { - "#1": "RAML 1.0" - }, "lexical": { "doc:usage": "[(2,0)-(3,0)]", "#1": "[(1,0)-(6,21)]" 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 b49a61b0b0..46ecd1432b 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#11", @@ -19,9 +19,6 @@ ], "core:name": "API", "smaps": { - "source-vendor": { - "#11": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#11": "[(2,0)-(7,21)]" @@ -76,9 +73,6 @@ "@id": "#6" }, "smaps": { - "source-vendor": { - "#1": "RAML 1.0" - }, "lexical": { "doc:usage": "[(2,0)-(3,0)]", "#1": "[(1,0)-(6,21)]" @@ -161,7 +155,7 @@ "doc:APIContractProcessingData" ], "apiContract:modelVersion": "3.2.0", - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#8", 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 83ba23ddd6..bc3d16e80a 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 @@ -22,9 +22,6 @@ } ], "smaps": { - "source-vendor": { - "#10": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#10": "[(2,0)-(9,16)]" @@ -53,7 +50,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 b47263acde..0b07d53e98 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#10", @@ -19,9 +19,6 @@ ], "core:name": "API", "smaps": { - "source-vendor": { - "#10": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#10": "[(2,0)-(9,16)]" 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 c3a7a0dccc..989bedcb6a 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 @@ -22,9 +22,6 @@ } ], "smaps": { - "source-vendor": { - "#11": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#11": "[(2,0)-(11,0)]" @@ -53,7 +50,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 f6eab35249..a3253b3f0a 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#11", @@ -19,9 +19,6 @@ ], "core:name": "API", "smaps": { - "source-vendor": { - "#11": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#11": "[(2,0)-(11,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 0f1cd7ecaf..4df6fef328 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 @@ -1086,21 +1086,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/japanese/cycle/oas30api.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/validations/japanese/cycle/oas30api.json#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 3.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/japanese/cycle/oas30api.json#/web-api/source-map/lexical/element_3", @@ -1175,7 +1160,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 3.0" } 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 cde4d60f0e..8c23a32e0e 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 3.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 3.0" }, { "@id": "file://amf-cli/shared/src/test/resources/validations/japanese/cycle/oas30api.json#/web-api", @@ -73,11 +73,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/japanese/cycle/oas30api.json#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/japanese/cycle/oas30api.json#/web-api/source-map/lexical/element_3" @@ -156,11 +151,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/validations/japanese/cycle/oas30api.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/validations/japanese/cycle/oas30api.json#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 3.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/validations/japanese/cycle/oas30api.json#/web-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 872d8542ed..3a2160e8b0 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 @@ -1254,21 +1254,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/japanese/cycle/oasapi.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/validations/japanese/cycle/oasapi.json#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/japanese/cycle/oasapi.json#/web-api/source-map/lexical/element_3", @@ -1343,7 +1328,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 d57f0ddfe7..924ea4222b 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/validations/japanese/cycle/oasapi.json#/web-api", @@ -94,11 +94,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/japanese/cycle/oasapi.json#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/japanese/cycle/oasapi.json#/web-api/source-map/lexical/element_3" @@ -206,11 +201,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/validations/japanese/cycle/oasapi.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/validations/japanese/cycle/oasapi.json#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/validations/japanese/cycle/oasapi.json#/web-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 4d13d479ff..7e9d76d582 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 @@ -1897,21 +1897,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/japanese/cycle/ramlapi.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/validations/japanese/cycle/ramlapi.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/japanese/cycle/ramlapi.raml#/web-api/source-map/lexical/element_3", @@ -1986,7 +1971,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 d3bf16829f..d3cc8f892c 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "file://amf-cli/shared/src/test/resources/validations/japanese/cycle/ramlapi.raml#/web-api", @@ -118,11 +118,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/japanese/cycle/ramlapi.raml#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/japanese/cycle/ramlapi.raml#/web-api/source-map/lexical/element_3" @@ -268,11 +263,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/validations/japanese/cycle/ramlapi.raml#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/validations/japanese/cycle/ramlapi.raml#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/validations/japanese/cycle/ramlapi.raml#/web-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#documentation", 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 42878423ef..7010976109 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 @@ -782,21 +782,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "amf://id#48/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "amf://id#48" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 3.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "amf://id#48/source-map/lexical/element_3", @@ -876,7 +861,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 3.0" } 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 e43fd9bf3c..d9fb69f0eb 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 3.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 3.0" }, { "@id": "amf://id#48", @@ -74,11 +74,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "amf://id#48/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "amf://id#48/source-map/lexical/element_3" @@ -157,11 +152,6 @@ } ] }, - { - "@id": "amf://id#48/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "amf://id#48", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 3.0" - }, { "@id": "amf://id#48/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 6b51f2e50f..afa5a21070 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 @@ -858,21 +858,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "amf://id#29/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "amf://id#29" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "amf://id#29/source-map/lexical/element_3", @@ -952,7 +937,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 de733085d9..79464a2f08 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "amf://id#29", @@ -95,11 +95,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "amf://id#29/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "amf://id#29/source-map/lexical/element_3" @@ -207,11 +202,6 @@ } ] }, - { - "@id": "amf://id#29/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "amf://id#29", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "amf://id#29/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 977c47535b..6900fb5367 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 @@ -1854,21 +1854,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "amf://id#31/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "amf://id#31" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "amf://id#31/source-map/lexical/element_2", @@ -1935,7 +1920,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 037df800f9..5636169e8d 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 @@ -7,7 +7,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", "http://a.ml/vocabularies/document#transformed": true, - "http://a.ml/vocabularies/apiContract#sourceSpec": "RAML 1.0" + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { "@id": "amf://id#31", @@ -92,11 +92,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "amf://id#31/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "amf://id#31/source-map/lexical/element_2" @@ -205,11 +200,6 @@ } ] }, - { - "@id": "amf://id#31/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "amf://id#31", - "http://a.ml/vocabularies/document-source-maps#value": "RAML 1.0" - }, { "@id": "amf://id#31/source-map/lexical/element_2", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#name", 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 9bb5abd27f..b9cc0ed898 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 @@ -76,9 +76,6 @@ "core:name": "[(4,0)-(5,0)]", "apiContract:server": "[(2,0)-(4,0)]", "apiContract:contentType": "[(6,0)-(7,0)]" - }, - "source-vendor": { - "#37": "RAML 1.0" } } } @@ -104,7 +101,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 c2c541a97c..dc2ac60098 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#37", @@ -44,9 +44,6 @@ "core:name": "[(4,0)-(5,0)]", "apiContract:server": "[(2,0)-(4,0)]", "apiContract:contentType": "[(6,0)-(7,0)]" - }, - "source-vendor": { - "#37": "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 743257b816..e2343a1f4d 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 @@ -190,9 +190,6 @@ } ], "smaps": { - "source-vendor": { - "#23": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#23": "[(2,0)-(28,19)]" @@ -221,7 +218,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 8925d42e75..293c88c335 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#23", @@ -24,9 +24,6 @@ } ], "smaps": { - "source-vendor": { - "#23": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#23": "[(2,0)-(28,19)]" 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 9c53a749f8..358730c2e8 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 @@ -176,7 +176,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 6d2c6a471d..7f56380510 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#1", 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 1909f9826a..b99c3e80fb 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 @@ -134,9 +134,6 @@ } ], "smaps": { - "source-vendor": { - "#10": "RAML 1.0" - }, "lexical": { "core:version": "[(2,0)-(3,0)]", "#10": "[(2,0)-(14,14)]", @@ -166,7 +163,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } @@ -331,14 +328,11 @@ "synthesized-field": { "shacl:closed": "true" }, - "type-property-lexical-info": { - "#2": "[(3,0)-(3,4)]" - }, "lexical": { "#2": "[(3,0)-(6,14)]" }, - "source-vendor": { - "#2": "RAML 1.0" + "type-property-lexical-info": { + "#2": "[(3,0)-(3,4)]" } } } @@ -359,7 +353,7 @@ "@value": "3.2.0" } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } @@ -526,15 +520,12 @@ "resolved-link-target": { "#8": "amf://id#2" }, - "source-vendor": { - "#8": "RAML 1.0" + "type-property-lexical-info": { + "#8": "[(3,0)-(3,4)]" }, "lexical": { "#8": "[(3,0)-(6,14)]" }, - "type-property-lexical-info": { - "#8": "[(3,0)-(3,4)]" - }, "resolved-link": { "#8": "amf://id#8" }, 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 f4d011cad1..a08fa70d75 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#10", @@ -25,9 +25,6 @@ } ], "smaps": { - "source-vendor": { - "#10": "RAML 1.0" - }, "lexical": { "core:version": "[(2,0)-(3,0)]", "#10": "[(2,0)-(14,14)]", @@ -136,15 +133,12 @@ "resolved-link-target": { "#8": "amf://id#2" }, - "source-vendor": { - "#8": "RAML 1.0" + "type-property-lexical-info": { + "#8": "[(3,0)-(3,4)]" }, "lexical": { "#8": "[(3,0)-(6,14)]" }, - "type-property-lexical-info": { - "#8": "[(3,0)-(3,4)]" - }, "resolved-link": { "#8": "amf://id#8" }, @@ -324,14 +318,11 @@ "synthesized-field": { "shacl:closed": "true" }, - "type-property-lexical-info": { - "#2": "[(3,0)-(3,4)]" - }, "lexical": { "#2": "[(3,0)-(6,14)]" }, - "source-vendor": { - "#2": "RAML 1.0" + "type-property-lexical-info": { + "#2": "[(3,0)-(3,4)]" } } }, @@ -341,7 +332,7 @@ "doc:APIContractProcessingData" ], "apiContract:modelVersion": "3.2.0", - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" } ], "@context": { diff --git a/amf-cli/shared/src/test/resources/validations/nil-type.raml.resolved b/amf-cli/shared/src/test/resources/validations/nil-type.raml.resolved index 1fb4335c5f..8c39132093 100644 --- a/amf-cli/shared/src/test/resources/validations/nil-type.raml.resolved +++ b/amf-cli/shared/src/test/resources/validations/nil-type.raml.resolved @@ -205,21 +205,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/nil-type.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/validations/nil-type.raml/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/nil-type.raml/web-api#/source-map/lexical/element_1", @@ -273,7 +258,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "RAML 1.0" } 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 2be22c18eb..e27eef9602 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 @@ -1123,21 +1123,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/oas-security/api-with-security-requirements.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/validations/oas-security/api-with-security-requirements.json#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/oas-security/api-with-security-requirements.json#/web-api/source-map/lexical/element_4", @@ -1225,7 +1210,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 ee99bfeab0..79f1ddd30b 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/validations/oas-security/api-with-security-requirements.json#/web-api", @@ -97,11 +97,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/oas-security/api-with-security-requirements.json#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/oas-security/api-with-security-requirements.json#/web-api/source-map/lexical/element_4" @@ -222,11 +217,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/validations/oas-security/api-with-security-requirements.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/validations/oas-security/api-with-security-requirements.json#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/validations/oas-security/api-with-security-requirements.json#/web-api/source-map/lexical/element_4", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/apiContract#endpoint", 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 df5e0e374d..e07621f098 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 @@ -120,21 +120,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/oas2/invalid-endpoint-path-still-parses.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/validations/oas2/invalid-endpoint-path-still-parses.json#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "OAS 2.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/oas2/invalid-endpoint-path-still-parses.json#/web-api/source-map/lexical/element_3", @@ -209,7 +194,7 @@ "@value": "3.2.0" } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "OAS 2.0" } 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 bd7b7a8b2a..a4cb183997 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 @@ -6,7 +6,7 @@ "http://a.ml/vocabularies/document#APIContractProcessingData" ], "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", - "http://a.ml/vocabularies/apiContract#sourceSpec": "OAS 2.0" + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { "@id": "file://amf-cli/shared/src/test/resources/validations/oas2/invalid-endpoint-path-still-parses.json#/web-api", @@ -52,11 +52,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/oas2/invalid-endpoint-path-still-parses.json#/web-api/source-map/source-vendor/element_0" - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/oas2/invalid-endpoint-path-still-parses.json#/web-api/source-map/lexical/element_3" @@ -97,11 +92,6 @@ } ] }, - { - "@id": "file://amf-cli/shared/src/test/resources/validations/oas2/invalid-endpoint-path-still-parses.json#/web-api/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": "file://amf-cli/shared/src/test/resources/validations/oas2/invalid-endpoint-path-still-parses.json#/web-api", - "http://a.ml/vocabularies/document-source-maps#value": "OAS 2.0" - }, { "@id": "file://amf-cli/shared/src/test/resources/validations/oas2/invalid-endpoint-path-still-parses.json#/web-api/source-map/lexical/element_3", "http://a.ml/vocabularies/document-source-maps#element": "http://a.ml/vocabularies/core#version", 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 ed45d742e8..a014d7bcf6 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 @@ -95,9 +95,6 @@ } ], "smaps": { - "source-vendor": { - "#4": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(4,0)]", "#4": "[(2,0)-(9,13)]" @@ -126,7 +123,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 a375c7ed3b..22a7a6c9a0 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#4", @@ -24,9 +24,6 @@ } ], "smaps": { - "source-vendor": { - "#4": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(4,0)]", "#4": "[(2,0)-(9,13)]" 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 b1c3d3fc79..fd717aa211 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 @@ -310,9 +310,6 @@ } ], "smaps": { - "source-vendor": { - "#20": "RAML 1.0" - }, "lexical": { "core:version": "[(4,0)-(6,0)]", "#20": "[(3,0)-(27,23)]", @@ -342,7 +339,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 a0432c7921..7069bd6ddf 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#20", @@ -25,9 +25,6 @@ } ], "smaps": { - "source-vendor": { - "#20": "RAML 1.0" - }, "lexical": { "core:version": "[(4,0)-(6,0)]", "#20": "[(3,0)-(27,23)]", 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 0d707a6e1a..8112dd04fb 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 @@ -33,9 +33,6 @@ ], "apiContract:endpoint": [], "smaps": { - "source-vendor": { - "#10": "OAS 3.0" - }, "lexical": { "apiContract:endpoint": "[(8,2)-(8,13)]", "core:description": "[(6,4)-(6,120)]", @@ -67,7 +64,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "OAS 3.0" } 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 4345d5a89e..ff3d8b1b5b 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "OAS 3.0" + "doc:sourceSpec": "OAS 3.0" }, { "@id": "#10", @@ -22,9 +22,6 @@ "core:version": "0.1", "apiContract:endpoint": [], "smaps": { - "source-vendor": { - "#10": "OAS 3.0" - }, "lexical": { "apiContract:endpoint": "[(8,2)-(8,13)]", "core:description": "[(6,4)-(6,120)]", 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 d7848ef993..288d4cd1dc 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 @@ -199,9 +199,6 @@ "core:name": "[(2,0)-(3,0)]", "#10": "[(2,0)-(17,17)]", "apiContract:accepts": "[(3,0)-(4,0)]" - }, - "source-vendor": { - "#10": "RAML 1.0" } } } @@ -227,7 +224,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 71ff99c8fb..d5d390f0c9 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#10", @@ -39,9 +39,6 @@ "core:name": "[(2,0)-(3,0)]", "#10": "[(2,0)-(17,17)]", "apiContract:accepts": "[(3,0)-(4,0)]" - }, - "source-vendor": { - "#10": "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 b08d1b2437..652a9845ef 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 @@ -167,9 +167,6 @@ } ], "smaps": { - "source-vendor": { - "#12": "RAML 1.0" - }, "lexical": { "apiContract:contentType": "[(4,0)-(6,0)]", "core:name": "[(2,0)-(4,0)]", @@ -200,7 +197,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 9d88168079..2ccc6650a2 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#12", @@ -32,9 +32,6 @@ } ], "smaps": { - "source-vendor": { - "#12": "RAML 1.0" - }, "lexical": { "apiContract:contentType": "[(4,0)-(6,0)]", "core:name": "[(2,0)-(4,0)]", diff --git a/amf-cli/shared/src/test/resources/validations/rt-parameters.raml.resolved b/amf-cli/shared/src/test/resources/validations/rt-parameters.raml.resolved index 2b2c14a7b7..b32f21656d 100644 --- a/amf-cli/shared/src/test/resources/validations/rt-parameters.raml.resolved +++ b/amf-cli/shared/src/test/resources/validations/rt-parameters.raml.resolved @@ -334,21 +334,6 @@ "@type": [ "http://a.ml/vocabularies/document-source-maps#SourceMap" ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "@id": "file://amf-cli/shared/src/test/resources/validations/rt-parameters.raml/web-api#/source-map/source-vendor/element_0", - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/validations/rt-parameters.raml/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], "http://a.ml/vocabularies/document-source-maps#lexical": [ { "@id": "file://amf-cli/shared/src/test/resources/validations/rt-parameters.raml/web-api#/source-map/lexical/element_1", @@ -402,7 +387,7 @@ "@value": true } ], - "http://a.ml/vocabularies/apiContract#sourceSpec": [ + "http://a.ml/vocabularies/document#sourceSpec": [ { "@value": "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 a59285e630..4d40d7e5a6 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 @@ -629,9 +629,6 @@ } ], "smaps": { - "source-vendor": { - "#27": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(4,0)]", "#27": "[(2,0)-(25,39)]" @@ -660,7 +657,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } @@ -691,12 +688,7 @@ { "@value": "application/yaml" } - ], - "smaps": { - "source-vendor": { - "#2": "RAML 1.0" - } - } + ] } ], "doc:root": [ @@ -715,7 +707,7 @@ "@value": "3.2.0" } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 c002e4e128..5238ee6f94 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#27", @@ -24,9 +24,6 @@ } ], "smaps": { - "source-vendor": { - "#27": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(4,0)]", "#27": "[(2,0)-(25,39)]" @@ -739,12 +736,7 @@ "doc:DomainElement" ], "doc:raw": "#%RAML 1.0 NamedExample\nsomeExample:\n name: some name", - "core:mediaType": "application/yaml", - "smaps": { - "source-vendor": { - "#2": "RAML 1.0" - } - } + "core:mediaType": "application/yaml" }, { "@id": "#3", @@ -752,7 +744,7 @@ "doc:APIContractProcessingData" ], "apiContract:modelVersion": "3.2.0", - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" } ], "@context": { 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 a3a6e941f6..99d0560a10 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 @@ -716,9 +716,6 @@ } ], "smaps": { - "source-vendor": { - "#24": "OAS 2.0" - }, "lexical": { "apiContract:endpoint": "[(24,2)-(105,3)]", "core:name": "[(4,4)-(4,49)]", @@ -749,7 +746,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "OAS 2.0" } 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 1d51b77820..d71f18d7bf 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "OAS 2.0" + "doc:sourceSpec": "OAS 2.0" }, { "@id": "#24", @@ -34,9 +34,6 @@ } ], "smaps": { - "source-vendor": { - "#24": "OAS 2.0" - }, "lexical": { "apiContract:endpoint": "[(24,2)-(105,3)]", "core:name": "[(4,4)-(4,49)]", 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 404697e3bd..ce68c90906 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 @@ -750,9 +750,6 @@ } ], "smaps": { - "source-vendor": { - "#2": "OAS 2.0" - }, "lexical": { "apiContract:endpoint": "[(8,0)-(48,28)]", "core:description": "[(5,2)-(6,0)]", @@ -784,7 +781,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "OAS 2.0" } 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 8242c78bba..7c031168df 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "OAS 2.0" + "doc:sourceSpec": "OAS 2.0" }, { "@id": "#2", @@ -26,9 +26,6 @@ } ], "smaps": { - "source-vendor": { - "#2": "OAS 2.0" - }, "lexical": { "apiContract:endpoint": "[(8,0)-(48,28)]", "core:description": "[(5,2)-(6,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 736a15b05e..a73948e8d5 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 @@ -605,9 +605,6 @@ "core:name": "[(2,0)-(4,0)]", "#23": "[(2,0)-(28,47)]", "apiContract:accepts": "[(4,0)-(6,0)]" - }, - "source-vendor": { - "#23": "RAML 1.0" } } } @@ -633,7 +630,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } @@ -798,14 +795,11 @@ "synthesized-field": { "shacl:closed": "true" }, - "type-property-lexical-info": { - "#2": "[(2,0)-(2,4)]" - }, "lexical": { "#2": "[(2,0)-(5,14)]" }, - "source-vendor": { - "#2": "RAML 1.0" + "type-property-lexical-info": { + "#2": "[(2,0)-(2,4)]" } } } @@ -826,7 +820,7 @@ "@value": "3.2.0" } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } @@ -862,12 +856,7 @@ { "@value": "application/yaml" } - ], - "smaps": { - "source-vendor": { - "#9": "RAML 1.0" - } - } + ] } ], "doc:root": [ @@ -886,7 +875,7 @@ "@value": "3.2.0" } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } @@ -922,12 +911,7 @@ { "@value": "application/yaml" } - ], - "smaps": { - "source-vendor": { - "#12": "RAML 1.0" - } - } + ] } ], "doc:root": [ @@ -946,7 +930,7 @@ "@value": "3.2.0" } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } @@ -1245,15 +1229,12 @@ "resolved-link-target": { "#14": "amf://id#2" }, - "source-vendor": { - "#14": "RAML 1.0" + "type-property-lexical-info": { + "#14": "[(2,0)-(2,4)]" }, "lexical": { "#14": "[(2,0)-(5,14)]" }, - "type-property-lexical-info": { - "#14": "[(2,0)-(2,4)]" - }, "resolved-link": { "#14": "amf://id#14" }, 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 0fddc4c5cd..ce12ab0f0d 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#23", @@ -39,9 +39,6 @@ "core:name": "[(2,0)-(4,0)]", "#23": "[(2,0)-(28,47)]", "apiContract:accepts": "[(4,0)-(6,0)]" - }, - "source-vendor": { - "#23": "RAML 1.0" } } }, @@ -323,15 +320,12 @@ "resolved-link-target": { "#14": "amf://id#2" }, - "source-vendor": { - "#14": "RAML 1.0" + "type-property-lexical-info": { + "#14": "[(2,0)-(2,4)]" }, "lexical": { "#14": "[(2,0)-(5,14)]" }, - "type-property-lexical-info": { - "#14": "[(2,0)-(2,4)]" - }, "resolved-link": { "#14": "amf://id#14" }, @@ -852,14 +846,11 @@ "synthesized-field": { "shacl:closed": "true" }, - "type-property-lexical-info": { - "#2": "[(2,0)-(2,4)]" - }, "lexical": { "#2": "[(2,0)-(5,14)]" }, - "source-vendor": { - "#2": "RAML 1.0" + "type-property-lexical-info": { + "#2": "[(2,0)-(2,4)]" } } }, @@ -869,7 +860,7 @@ "doc:APIContractProcessingData" ], "apiContract:modelVersion": "3.2.0", - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#9", @@ -878,12 +869,7 @@ "doc:DomainElement" ], "doc:raw": "#%RAML 1.0 NamedExample\nemployees:\n -\n id: 1\n name: Jhon\n -\n id: 2\n name: Sam", - "core:mediaType": "application/yaml", - "smaps": { - "source-vendor": { - "#9": "RAML 1.0" - } - } + "core:mediaType": "application/yaml" }, { "@id": "#10", @@ -891,7 +877,7 @@ "doc:APIContractProcessingData" ], "apiContract:modelVersion": "3.2.0", - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#12", @@ -900,12 +886,7 @@ "doc:DomainElement" ], "doc:raw": "#%RAML 1.0 NamedExample\nemployee:\n id: 1\n name: \"Jhon\"", - "core:mediaType": "application/yaml", - "smaps": { - "source-vendor": { - "#12": "RAML 1.0" - } - } + "core:mediaType": "application/yaml" }, { "@id": "#13", @@ -913,7 +894,7 @@ "doc:APIContractProcessingData" ], "apiContract:modelVersion": "3.2.0", - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" } ], "@context": { 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 35c90e8e52..63428a65e0 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 @@ -22,9 +22,6 @@ } ], "smaps": { - "source-vendor": { - "#11": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(4,0)]", "#11": "[(2,0)-(13,22)]" @@ -53,7 +50,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 3f8ebf5ba6..64b5815d19 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#11", @@ -19,9 +19,6 @@ ], "core:name": "some api", "smaps": { - "source-vendor": { - "#11": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(4,0)]", "#11": "[(2,0)-(13,22)]" 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 b178703654..c9850b4eb9 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 @@ -22,9 +22,6 @@ } ], "smaps": { - "source-vendor": { - "#6": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#6": "[(2,0)-(5,24)]" @@ -53,7 +50,7 @@ "@value": true } ], - "apiContract:sourceSpec": [ + "doc:sourceSpec": [ { "@value": "RAML 1.0" } 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 d60f0d305c..6ddb891fd9 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 @@ -7,7 +7,7 @@ ], "apiContract:modelVersion": "3.2.0", "doc:transformed": true, - "apiContract:sourceSpec": "RAML 1.0" + "doc:sourceSpec": "RAML 1.0" }, { "@id": "#6", @@ -19,9 +19,6 @@ ], "core:name": "New API", "smaps": { - "source-vendor": { - "#6": "RAML 1.0" - }, "lexical": { "core:name": "[(2,0)-(3,0)]", "#6": "[(2,0)-(5,24)]" diff --git a/amf-cli/shared/src/test/scala/amf/cycle/JsonSchemaSuite.scala b/amf-cli/shared/src/test/scala/amf/cycle/JsonSchemaSuite.scala index a909442684..b809c4ef1b 100644 --- a/amf-cli/shared/src/test/scala/amf/cycle/JsonSchemaSuite.scala +++ b/amf-cli/shared/src/test/scala/amf/cycle/JsonSchemaSuite.scala @@ -4,14 +4,12 @@ import amf.apicontract.client.scala.AMFConfiguration import amf.apicontract.client.scala.model.document.DataTypeFragment import amf.apicontract.internal.spec.common.parser.WebApiShapeParserContextAdapter import amf.apicontract.internal.spec.jsonschema.JsonSchemaWebApiContext -import amf.core.client.scala.{AMFParseResult, AMFResult} +import amf.core.client.scala.AMFParseResult import amf.core.client.scala.config.ParsingOptions import amf.core.client.scala.errorhandling.AMFErrorHandler import amf.core.client.scala.parse.document.{ParserContext, SchemaReference, SyamlParsedDocument} -import amf.core.internal.adoption.IdAdopter -import amf.core.internal.annotations.SourceSpec -import amf.core.internal.parser.{CompilerConfiguration, LimitedParseConfig, Root} -import amf.core.internal.remote.{Platform, Spec} +import amf.core.internal.parser.{LimitedParseConfig, Root} +import amf.core.internal.remote.{Oas20, Platform, Spec} import amf.shapes.client.scala.model.domain.AnyShape import amf.shapes.internal.spec.ShapeParserContext import amf.shapes.internal.spec.common.JSONSchemaDraft7SchemaVersion @@ -37,8 +35,8 @@ trait JsonSchemaSuite { val options = ParsingOptions() val eh = amfConfig.errorHandlerProvider.errorHandler() val parsed = new JsonSchemaParser().parse(root, getBogusParserCtx(path, options, eh), options, None) - parsed.annotations += SourceSpec(Spec.OAS20) - val unit = wrapInDataTypeFragment(root, parsed) + val unit = wrapInDataTypeFragment(root, parsed) + unit.processingData.withSourceSpec(Oas20) amfConfig.baseUnitClient().setBaseUri(unit, path) new AMFParseResult(unit, eh.getResults) } diff --git a/amf-cli/shared/src/test/scala/amf/javaparser/org/raml/ModelTest.scala b/amf-cli/shared/src/test/scala/amf/javaparser/org/raml/ModelTest.scala index 44a3bf1630..91d76d3c13 100644 --- a/amf-cli/shared/src/test/scala/amf/javaparser/org/raml/ModelTest.scala +++ b/amf-cli/shared/src/test/scala/amf/javaparser/org/raml/ModelTest.scala @@ -6,10 +6,9 @@ import amf.core.client.common.transform.PipelineId import amf.core.client.common.validation._ import amf.core.client.scala.config.RenderOptions import amf.core.client.scala.errorhandling.UnhandledErrorHandler -import amf.core.client.scala.model.document.{BaseUnit, Document, EncodesModel, Module} +import amf.core.client.scala.model.document.{BaseUnit, Document} import amf.core.client.scala.transform.TransformationPipelineRunner import amf.core.client.scala.validation.AMFValidationReport -import amf.core.internal.annotations.SourceSpec import amf.core.internal.remote.{Raml10YamlHint, _} import amf.core.internal.validation.CoreValidations.UnresolvedReference import amf.emit.AMFRenderer @@ -71,7 +70,7 @@ trait ModelValidationTest extends DirectoryTest { private def profileFromModel(unit: BaseUnit): ProfileName = { val maybeVendor = Option(unit) .collect({ case d: Document => d }) - .flatMap(_.encodes.annotations.find(classOf[SourceSpec]).map(_.spec)) + .flatMap(_.sourceSpec) maybeVendor match { case Some(Raml08) => Raml08Profile case Some(Oas20) => Oas20Profile @@ -83,19 +82,7 @@ trait ModelValidationTest extends DirectoryTest { val defaultTarget: Spec = Raml10 - def target(model: BaseUnit): Spec = model match { - case d: EncodesModel => - d.encodes.annotations - .find(classOf[SourceSpec]) - .map(_.spec) - .getOrElse(Raml10) - case m: Module => - m.annotations - .find(classOf[SourceSpec]) - .map(_.spec) - .getOrElse(Raml10) - case _ => Raml10 - } + def target(model: BaseUnit): Spec = model.sourceSpec.getOrElse(Raml10) } trait ModelResolutionTest extends ModelValidationTest { diff --git a/amf-cli/shared/src/test/scala/amf/validation/RamlBodyPayloadValidationTest.scala b/amf-cli/shared/src/test/scala/amf/validation/RamlBodyPayloadValidationTest.scala index 6bbe520bec..63e14455f3 100644 --- a/amf-cli/shared/src/test/scala/amf/validation/RamlBodyPayloadValidationTest.scala +++ b/amf-cli/shared/src/test/scala/amf/validation/RamlBodyPayloadValidationTest.scala @@ -65,7 +65,7 @@ class RamlBodyPayloadValidationTest extends ApiShapePayloadValidationTest { override def transform(unit: BaseUnit, client: AMFBaseUnitClient): BaseUnit = { - unit.asInstanceOf[Document].encodes.asInstanceOf[WebApi].sourceSpec match { + unit.sourceSpec match { case Some(Raml08) => client.transform(unit, PipelineId.Default).baseUnit case _ => diff --git a/documentation/model.md b/documentation/model.md index 2336804967..e06c69b49e 100644 --- a/documentation/model.md +++ b/documentation/model.md @@ -144,7 +144,7 @@ Class that groups data related to how a Base Unit was processed | ------ | ------ | ------ | ------ | | modelVersion | string | Version of the API contract model | http://a.ml/vocabularies/apiContract#modelVersion | | transformed | boolean | Indicates whether a BaseUnit was transformed with some pipeline | http://a.ml/vocabularies/document#transformed | - | sourceSpec | string | Standard of the original API Specification file (e.g. RAML 1.0, OAS 3.0) | http://a.ml/vocabularies/apiContract#sourceSpec | + | sourceSpec | string | Standard of the specification file | http://a.ml/vocabularies/document#sourceSpec | ## AbstractDeclaration Graph template that can be used to declare a re-usable graph structure that can be applied to different domain elements @@ -428,6 +428,7 @@ Class that groups data related to how a Base Unit was processed | Name | Value | Documentation | Namespace | | ------ | ------ | ------ | ------ | | transformed | boolean | Indicates whether a BaseUnit was transformed with some pipeline | http://a.ml/vocabularies/document#transformed | + | sourceSpec | string | Standard of the specification file | http://a.ml/vocabularies/document#sourceSpec | ## Callback Model defining the information for a HTTP callback/ webhook @@ -666,6 +667,7 @@ Class that groups data related to how a Base Unit was processed | definedBy | url | Dialect used to parse this Dialect Instance | http://a.ml/vocabularies/meta#definedBy | | graphDependencies | [url] | Other dialects referenced to parse specific nodes in this Dialect Instance | http://a.ml/vocabularies/document#graphDependencies | | transformed | boolean | Indicates whether a BaseUnit was transformed with some pipeline | http://a.ml/vocabularies/document#transformed | + | sourceSpec | string | Standard of the specification file | http://a.ml/vocabularies/document#sourceSpec | ## DialectLibrary Library of AML mappings that can be reused in different AML dialects From 58a0e74fbbd80aed6800d3fb10666fd25e68472d Mon Sep 17 00:00:00 2001 From: Tomas Fernandez Date: Thu, 30 Sep 2021 18:46:55 -0300 Subject: [PATCH 11/46] Test: fixed ids starting with null due to manual object construction. Removed jsonld file that wasn't being used --- .../configuration/async-model.jsonld | 8 +- .../configuration/webapi-model.jsonld | 8 +- .../golden.expanded.jsonld | 8 +- .../golden.flattened.jsonld | 8 +- .../golden.expanded.jsonld | 8 +- .../golden.flattened.jsonld | 8 +- .../golden.expanded.jsonld | 8 +- .../golden.flattened.jsonld | 8 +- .../golden.expanded.jsonld | 8 +- .../golden.flattened.jsonld | 8 +- .../golden.expanded.jsonld | 8 +- .../golden.flattened.jsonld | 8 +- .../message-simple/golden.expanded.jsonld | 8 +- .../message-simple/golden.flattened.jsonld | 8 +- .../merge/message-tags/golden.expanded.jsonld | 8 +- .../message-tags/golden.flattened.jsonld | 8 +- .../golden.expanded.jsonld | 8 +- .../golden.flattened.jsonld | 8 +- .../golden.expanded.jsonld | 8 +- .../golden.flattened.jsonld | 8 +- .../golden.expanded.jsonld | 8 +- .../golden.flattened.jsonld | 8 +- .../golden.expanded.jsonld | 8 +- .../golden.flattened.jsonld | 8 +- .../operation-simple/golden.expanded.jsonld | 8 +- .../operation-simple/golden.flattened.jsonld | 8 +- .../operation-tags/golden.expanded.jsonld | 8 +- .../operation-tags/golden.flattened.jsonld | 8 +- .../upanddown/parameters.raml.jsonld | 654 ------------------ .../E2ERenderConfigurationSetupTest.scala | 5 +- .../resolution/merge/JsonMergePatchTest.scala | 16 +- 31 files changed, 128 insertions(+), 771 deletions(-) delete mode 100644 amf-cli/shared/src/test/resources/upanddown/parameters.raml.jsonld 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 6a8495cf65..702ba7f6d7 100644 --- a/amf-cli/shared/src/test/resources/configuration/async-model.jsonld +++ b/amf-cli/shared/src/test/resources/configuration/async-model.jsonld @@ -1,11 +1,11 @@ { "@graph": [ { -"@id": "null/BaseUnitProcessingData", +"@id": "root/BaseUnitProcessingData", "@type": [ -"http://a.ml/vocabularies/document#BaseUnitProcessingData" +"http://a.ml/vocabularies/document#APIContractProcessingData" ], -"http://a.ml/vocabularies/document#transformed": false +"http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0" }, { "@id": "root/async-api", @@ -32,7 +32,7 @@ }, "http://a.ml/vocabularies/document#root": false, "http://a.ml/vocabularies/document#processingData": { -"@id": "null/BaseUnitProcessingData" +"@id": "root/BaseUnitProcessingData" } } ] 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 1a759e6948..df29f6cf8a 100644 --- a/amf-cli/shared/src/test/resources/configuration/webapi-model.jsonld +++ b/amf-cli/shared/src/test/resources/configuration/webapi-model.jsonld @@ -1,11 +1,11 @@ { "@graph": [ { -"@id": "null/BaseUnitProcessingData", +"@id": "root/BaseUnitProcessingData", "@type": [ -"http://a.ml/vocabularies/document#BaseUnitProcessingData" +"http://a.ml/vocabularies/document#APIContractProcessingData" ], -"http://a.ml/vocabularies/document#transformed": false +"http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0" }, { "@id": "root/web-api", @@ -32,7 +32,7 @@ }, "http://a.ml/vocabularies/document#root": false, "http://a.ml/vocabularies/document#processingData": { -"@id": "null/BaseUnitProcessingData" +"@id": "root/BaseUnitProcessingData" } } ] 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 4aea1ab9ce..522d3051ad 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 @@ -108,13 +108,13 @@ ], "http://a.ml/vocabularies/document#processingData": [ { - "@id": "null/BaseUnitProcessingData", + "@id": "testId/BaseUnitProcessingData", "@type": [ - "http://a.ml/vocabularies/document#BaseUnitProcessingData" + "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/document#transformed": [ + "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": false + "@value": "3.2.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 2c7540a6e7..c0d390832d 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 @@ -1,11 +1,11 @@ { "@graph": [ { - "@id": "null/BaseUnitProcessingData", + "@id": "testId/BaseUnitProcessingData", "@type": [ - "http://a.ml/vocabularies/document#BaseUnitProcessingData" + "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/document#transformed": false + "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0" }, { "@id": "testId/resp/message", @@ -88,7 +88,7 @@ }, "http://a.ml/vocabularies/document#root": false, "http://a.ml/vocabularies/document#processingData": { - "@id": "null/BaseUnitProcessingData" + "@id": "testId/BaseUnitProcessingData" } } ] 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 dec3a21177..d47641a30f 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 @@ -141,13 +141,13 @@ ], "http://a.ml/vocabularies/document#processingData": [ { - "@id": "null/BaseUnitProcessingData", + "@id": "testId/BaseUnitProcessingData", "@type": [ - "http://a.ml/vocabularies/document#BaseUnitProcessingData" + "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/document#transformed": [ + "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": false + "@value": "3.2.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 8e520a2608..4b94df4c3e 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 @@ -1,11 +1,11 @@ { "@graph": [ { - "@id": "null/BaseUnitProcessingData", + "@id": "testId/BaseUnitProcessingData", "@type": [ - "http://a.ml/vocabularies/document#BaseUnitProcessingData" + "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/document#transformed": false + "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0" }, { "@id": "testId/resp/message", @@ -113,7 +113,7 @@ }, "http://a.ml/vocabularies/document#root": false, "http://a.ml/vocabularies/document#processingData": { - "@id": "null/BaseUnitProcessingData" + "@id": "testId/BaseUnitProcessingData" } } ] 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 005cad7251..ae231bbb39 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 @@ -48,13 +48,13 @@ ], "http://a.ml/vocabularies/document#processingData": [ { - "@id": "null/BaseUnitProcessingData", + "@id": "testId/BaseUnitProcessingData", "@type": [ - "http://a.ml/vocabularies/document#BaseUnitProcessingData" + "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/document#transformed": [ + "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": false + "@value": "3.2.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 0432836ef7..381c9a20f0 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 @@ -1,11 +1,11 @@ { "@graph": [ { - "@id": "null/BaseUnitProcessingData", + "@id": "testId/BaseUnitProcessingData", "@type": [ - "http://a.ml/vocabularies/document#BaseUnitProcessingData" + "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/document#transformed": false + "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0" }, { "@id": "testId/resp/message", @@ -45,7 +45,7 @@ }, "http://a.ml/vocabularies/document#root": false, "http://a.ml/vocabularies/document#processingData": { - "@id": "null/BaseUnitProcessingData" + "@id": "testId/BaseUnitProcessingData" } } ] 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 fb36930fc7..1cc380a48b 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 @@ -111,13 +111,13 @@ ], "http://a.ml/vocabularies/document#processingData": [ { - "@id": "null/BaseUnitProcessingData", + "@id": "testId/BaseUnitProcessingData", "@type": [ - "http://a.ml/vocabularies/document#BaseUnitProcessingData" + "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/document#transformed": [ + "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": false + "@value": "3.2.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 2372b961a8..6704108284 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 @@ -1,11 +1,11 @@ { "@graph": [ { - "@id": "null/BaseUnitProcessingData", + "@id": "testId/BaseUnitProcessingData", "@type": [ - "http://a.ml/vocabularies/document#BaseUnitProcessingData" + "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/document#transformed": false + "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0" }, { "@id": "testId/resp/message", @@ -98,7 +98,7 @@ }, "http://a.ml/vocabularies/document#root": false, "http://a.ml/vocabularies/document#processingData": { - "@id": "null/BaseUnitProcessingData" + "@id": "testId/BaseUnitProcessingData" } } ] 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 dec3a21177..d47641a30f 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 @@ -141,13 +141,13 @@ ], "http://a.ml/vocabularies/document#processingData": [ { - "@id": "null/BaseUnitProcessingData", + "@id": "testId/BaseUnitProcessingData", "@type": [ - "http://a.ml/vocabularies/document#BaseUnitProcessingData" + "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/document#transformed": [ + "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": false + "@value": "3.2.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 8e520a2608..4b94df4c3e 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 @@ -1,11 +1,11 @@ { "@graph": [ { - "@id": "null/BaseUnitProcessingData", + "@id": "testId/BaseUnitProcessingData", "@type": [ - "http://a.ml/vocabularies/document#BaseUnitProcessingData" + "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/document#transformed": false + "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0" }, { "@id": "testId/resp/message", @@ -113,7 +113,7 @@ }, "http://a.ml/vocabularies/document#root": false, "http://a.ml/vocabularies/document#processingData": { - "@id": "null/BaseUnitProcessingData" + "@id": "testId/BaseUnitProcessingData" } } ] 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 d7e79460ba..3e794b30b8 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 @@ -90,13 +90,13 @@ ], "http://a.ml/vocabularies/document#processingData": [ { - "@id": "null/BaseUnitProcessingData", + "@id": "testId/BaseUnitProcessingData", "@type": [ - "http://a.ml/vocabularies/document#BaseUnitProcessingData" + "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/document#transformed": [ + "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": false + "@value": "3.2.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 9c4748e31a..26b7653a08 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 @@ -1,11 +1,11 @@ { "@graph": [ { - "@id": "null/BaseUnitProcessingData", + "@id": "testId/BaseUnitProcessingData", "@type": [ - "http://a.ml/vocabularies/document#BaseUnitProcessingData" + "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/document#transformed": false + "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0" }, { "@id": "testId/resp/message", @@ -66,7 +66,7 @@ }, "http://a.ml/vocabularies/document#root": false, "http://a.ml/vocabularies/document#processingData": { - "@id": "null/BaseUnitProcessingData" + "@id": "testId/BaseUnitProcessingData" } } ] 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 232fca92bc..35d06cb37a 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 @@ -48,13 +48,13 @@ ], "http://a.ml/vocabularies/document#processingData": [ { - "@id": "null/BaseUnitProcessingData", + "@id": "testId/BaseUnitProcessingData", "@type": [ - "http://a.ml/vocabularies/document#BaseUnitProcessingData" + "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/document#transformed": [ + "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": false + "@value": "3.2.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 ff19e42cfc..e9d3f94229 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 @@ -1,11 +1,11 @@ { "@graph": [ { - "@id": "null/BaseUnitProcessingData", + "@id": "testId/BaseUnitProcessingData", "@type": [ - "http://a.ml/vocabularies/document#BaseUnitProcessingData" + "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/document#transformed": false + "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0" }, { "@id": "testId/resp/message", @@ -43,7 +43,7 @@ }, "http://a.ml/vocabularies/document#root": false, "http://a.ml/vocabularies/document#processingData": { - "@id": "null/BaseUnitProcessingData" + "@id": "testId/BaseUnitProcessingData" } } ] 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 dca88e2a41..b407c17010 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 @@ -137,13 +137,13 @@ ], "http://a.ml/vocabularies/document#processingData": [ { - "@id": "null/BaseUnitProcessingData", + "@id": "testId/BaseUnitProcessingData", "@type": [ - "http://a.ml/vocabularies/document#BaseUnitProcessingData" + "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/document#transformed": [ + "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": false + "@value": "3.2.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 0d0e955557..f7d6662f42 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 @@ -1,11 +1,11 @@ { "@graph": [ { - "@id": "null/BaseUnitProcessingData", + "@id": "testId/BaseUnitProcessingData", "@type": [ - "http://a.ml/vocabularies/document#BaseUnitProcessingData" + "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/document#transformed": false + "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0" }, { "@id": "testId/subscribe/traitOperationId", @@ -110,7 +110,7 @@ }, "http://a.ml/vocabularies/document#root": false, "http://a.ml/vocabularies/document#processingData": { - "@id": "null/BaseUnitProcessingData" + "@id": "testId/BaseUnitProcessingData" } } ] 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 613a332300..2a0dd33f63 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 @@ -200,13 +200,13 @@ ], "http://a.ml/vocabularies/document#processingData": [ { - "@id": "null/BaseUnitProcessingData", + "@id": "testId/BaseUnitProcessingData", "@type": [ - "http://a.ml/vocabularies/document#BaseUnitProcessingData" + "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/document#transformed": [ + "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": false + "@value": "3.2.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 8675635c11..3f63777790 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 @@ -1,11 +1,11 @@ { "@graph": [ { - "@id": "null/BaseUnitProcessingData", + "@id": "testId/BaseUnitProcessingData", "@type": [ - "http://a.ml/vocabularies/document#BaseUnitProcessingData" + "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/document#transformed": false + "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0" }, { "@id": "testId/subscribe/traitOperationId", @@ -136,7 +136,7 @@ }, "http://a.ml/vocabularies/document#root": false, "http://a.ml/vocabularies/document#processingData": { - "@id": "null/BaseUnitProcessingData" + "@id": "testId/BaseUnitProcessingData" } } ] 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 8275c6c99a..3c5911918b 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 @@ -52,13 +52,13 @@ ], "http://a.ml/vocabularies/document#processingData": [ { - "@id": "null/BaseUnitProcessingData", + "@id": "testId/BaseUnitProcessingData", "@type": [ - "http://a.ml/vocabularies/document#BaseUnitProcessingData" + "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/document#transformed": [ + "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": false + "@value": "3.2.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 bc763f8692..a59d177428 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 @@ -1,11 +1,11 @@ { "@graph": [ { - "@id": "null/BaseUnitProcessingData", + "@id": "testId/BaseUnitProcessingData", "@type": [ - "http://a.ml/vocabularies/document#BaseUnitProcessingData" + "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/document#transformed": false + "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0" }, { "@id": "testId/subscribe/traitOperationId", @@ -45,7 +45,7 @@ }, "http://a.ml/vocabularies/document#root": false, "http://a.ml/vocabularies/document#processingData": { - "@id": "null/BaseUnitProcessingData" + "@id": "testId/BaseUnitProcessingData" } } ] 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 dca88e2a41..b407c17010 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 @@ -137,13 +137,13 @@ ], "http://a.ml/vocabularies/document#processingData": [ { - "@id": "null/BaseUnitProcessingData", + "@id": "testId/BaseUnitProcessingData", "@type": [ - "http://a.ml/vocabularies/document#BaseUnitProcessingData" + "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/document#transformed": [ + "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": false + "@value": "3.2.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 0d0e955557..f7d6662f42 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 @@ -1,11 +1,11 @@ { "@graph": [ { - "@id": "null/BaseUnitProcessingData", + "@id": "testId/BaseUnitProcessingData", "@type": [ - "http://a.ml/vocabularies/document#BaseUnitProcessingData" + "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/document#transformed": false + "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0" }, { "@id": "testId/subscribe/traitOperationId", @@ -110,7 +110,7 @@ }, "http://a.ml/vocabularies/document#root": false, "http://a.ml/vocabularies/document#processingData": { - "@id": "null/BaseUnitProcessingData" + "@id": "testId/BaseUnitProcessingData" } } ] 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 da2c25be5d..fccae2b3dc 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 @@ -43,13 +43,13 @@ ], "http://a.ml/vocabularies/document#processingData": [ { - "@id": "null/BaseUnitProcessingData", + "@id": "testId/BaseUnitProcessingData", "@type": [ - "http://a.ml/vocabularies/document#BaseUnitProcessingData" + "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/document#transformed": [ + "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": false + "@value": "3.2.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 ba39a51fd3..56e1c12c09 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 @@ -1,11 +1,11 @@ { "@graph": [ { - "@id": "null/BaseUnitProcessingData", + "@id": "testId/BaseUnitProcessingData", "@type": [ - "http://a.ml/vocabularies/document#BaseUnitProcessingData" + "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/document#transformed": false + "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0" }, { "@id": "testId/subscribe/traitOperationId", @@ -31,7 +31,7 @@ }, "http://a.ml/vocabularies/document#root": false, "http://a.ml/vocabularies/document#processingData": { - "@id": "null/BaseUnitProcessingData" + "@id": "testId/BaseUnitProcessingData" } } ] 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 17dc8feba7..55632d4b33 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 @@ -52,13 +52,13 @@ ], "http://a.ml/vocabularies/document#processingData": [ { - "@id": "null/BaseUnitProcessingData", + "@id": "testId/BaseUnitProcessingData", "@type": [ - "http://a.ml/vocabularies/document#BaseUnitProcessingData" + "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/document#transformed": [ + "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": false + "@value": "3.2.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 a3d371d722..29d4c3258f 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 @@ -1,11 +1,11 @@ { "@graph": [ { - "@id": "null/BaseUnitProcessingData", + "@id": "testId/BaseUnitProcessingData", "@type": [ - "http://a.ml/vocabularies/document#BaseUnitProcessingData" + "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/document#transformed": false + "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0" }, { "@id": "testId/subscribe/traitOperationId", @@ -43,7 +43,7 @@ }, "http://a.ml/vocabularies/document#root": false, "http://a.ml/vocabularies/document#processingData": { - "@id": "null/BaseUnitProcessingData" + "@id": "testId/BaseUnitProcessingData" } } ] diff --git a/amf-cli/shared/src/test/resources/upanddown/parameters.raml.jsonld b/amf-cli/shared/src/test/resources/upanddown/parameters.raml.jsonld deleted file mode 100644 index c53a1f3d04..0000000000 --- a/amf-cli/shared/src/test/resources/upanddown/parameters.raml.jsonld +++ /dev/null @@ -1,654 +0,0 @@ -[ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/parameters.raml", - "@type": [ - "http://a.ml/vocabularies/document#Document", - "http://a.ml/vocabularies/document#Fragment", - "http://a.ml/vocabularies/document#Module", - "http://a.ml/vocabularies/document#Unit" - ], - "http://a.ml/vocabularies/document#encodes": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/parameters.raml#/web-api", - "@type": [ - "http://a.ml/vocabularies/apiContract#WebAPI", - "http://a.ml/vocabularies/document#RootDomainElement", - "http://a.ml/vocabularies/document#DomainElement" - ], - "http://a.ml/vocabularies/core#name": [ - { - "@value": "test" - } - ], - "http://a.ml/vocabularies/core#version": [ - { - "@value": "1.0" - } - ], - "http://a.ml/vocabularies/apiContract#endpoint": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/parameters.raml#/web-api/end-points/%2Fa%2F%7Ba%7D", - "@type": [ - "http://a.ml/vocabularies/apiContract#EndPoint", - "http://a.ml/vocabularies/document#DomainElement" - ], - "http://a.ml/vocabularies/apiContract#path": [ - { - "@value": "/a/{a}" - } - ], - "http://a.ml/vocabularies/apiContract#parameter": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/parameters.raml#/web-api/end-points/%2Fa%2F%7Ba%7D/parameter/a", - "@type": [ - "http://a.ml/vocabularies/apiContract#Parameter", - "http://a.ml/vocabularies/document#DomainElement" - ], - "http://a.ml/vocabularies/core#name": [ - { - "@value": "a" - } - ], - "http://a.ml/vocabularies/apiContract#paramName": [ - { - "@value": "a" - } - ], - "http://a.ml/vocabularies/apiContract#required": [ - { - "@value": true - } - ], - "http://a.ml/vocabularies/apiContract#binding": [ - { - "@value": "path" - } - ], - "http://a.ml/vocabularies/document#link-target": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/parameters.raml#/parameters/parameter/a" - } - ], - "http://a.ml/vocabularies/document#link-label": [ - { - "@value": "a" - } - ], - "http://a.ml/vocabularies/document-source-maps#sources": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/parameters.raml#/web-api/end-points/%2Fa%2F%7Ba%7D/parameter/a/source-map", - "@type": [ - "http://a.ml/vocabularies/document-source-maps#SourceMap" - ], - "http://a.ml/vocabularies/document-source-maps#lexical": [ - { - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/parameters.raml#/web-api/end-points/%2Fa%2F%7Ba%7D/parameter/a" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "[(18,4)-(19,0)]" - } - ] - } - ] - } - ] - } - ], - "http://a.ml/vocabularies/document-source-maps#sources": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/parameters.raml#/web-api/end-points/%2Fa%2F%7Ba%7D/source-map", - "@type": [ - "http://a.ml/vocabularies/document-source-maps#SourceMap" - ], - "http://a.ml/vocabularies/document-source-maps#lexical": [ - { - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "http://a.ml/vocabularies/apiContract#parameter" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "[(17,16)-(19,0)]" - } - ] - }, - { - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/parameters.raml#/web-api/end-points/%2Fa%2F%7Ba%7D" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "[(16,0)-(19,0)]" - } - ] - } - ] - } - ] - } - ], - "http://a.ml/vocabularies/document-source-maps#sources": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/parameters.raml#/web-api/source-map", - "@type": [ - "http://a.ml/vocabularies/document-source-maps#SourceMap" - ], - "http://a.ml/vocabularies/document-source-maps#source-vendor": [ - { - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/parameters.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "RAML 1.0" - } - ] - } - ], - "http://a.ml/vocabularies/document-source-maps#lexical": [ - { - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "http://a.ml/vocabularies/core#version" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "[(15,0)-(16,0)]" - } - ] - }, - { - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/parameters.raml#/web-api" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "[(2,0)-(19,0)]" - } - ] - }, - { - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "http://a.ml/vocabularies/core#name" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "[(14,0)-(15,0)]" - } - ] - } - ] - } - ] - } - ], - "http://a.ml/vocabularies/document#declares": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/parameters.raml#/parameters/parameter/a", - "@type": [ - "http://a.ml/vocabularies/apiContract#Parameter", - "http://a.ml/vocabularies/document#DomainElement" - ], - "http://a.ml/vocabularies/core#name": [ - { - "@value": "a" - } - ], - "http://a.ml/vocabularies/apiContract#paramName": [ - { - "@value": "a" - } - ], - "http://a.ml/vocabularies/apiContract#required": [ - { - "@value": true - } - ], - "http://a.ml/vocabularies/apiContract#binding": [ - { - "@value": "path" - } - ], - "http://a.ml/vocabularies/shapes#schema": [ - { - "@id": "null/scalar/schema", - "@type": [ - "http://a.ml/vocabularies/shapes#ScalarShape", - "http://www.w3.org/ns/shacl#Shape", - "http://a.ml/vocabularies/shapes#Shape", - "http://a.ml/vocabularies/document#DomainElement" - ], - "http://www.w3.org/ns/shacl#datatype": [ - { - "@id": "http://www.w3.org/2001/XMLSchema#string" - } - ], - "http://www.w3.org/ns/shacl#name": [ - { - "@value": "schema" - } - ], - "http://a.ml/vocabularies/document-source-maps#sources": [ - { - "@id": "null/scalar/schema/source-map", - "@type": [ - "http://a.ml/vocabularies/document-source-maps#SourceMap" - ], - "http://a.ml/vocabularies/document-source-maps#type-property-lexical-info": [ - { - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "null/scalar/schema" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "[(5,4)-(5,8)]" - } - ] - } - ], - "http://a.ml/vocabularies/document-source-maps#lexical": [ - { - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "http://www.w3.org/ns/shacl#datatype" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "[(5,4)-(6,0)]" - } - ] - }, - { - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "null/scalar/schema" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "[(3,2)-(7,0)]" - } - ] - } - ] - } - ] - } - ], - "http://a.ml/vocabularies/document-source-maps#sources": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/parameters.raml#/parameters/parameter/a/source-map", - "@type": [ - "http://a.ml/vocabularies/document-source-maps#SourceMap" - ], - "http://a.ml/vocabularies/document-source-maps#declared-element": [ - { - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/parameters.raml#/parameters/parameter/a" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "" - } - ] - } - ], - "http://a.ml/vocabularies/document-source-maps#lexical": [ - { - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "http://a.ml/vocabularies/shapes#schema" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "[(3,2)-(7,0)]" - } - ] - }, - { - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "http://a.ml/vocabularies/apiContract#required" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "[(4,4)-(5,0)]" - } - ] - }, - { - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/parameters.raml#/parameters/parameter/a" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "[(3,2)-(7,0)]" - } - ] - }, - { - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "http://a.ml/vocabularies/apiContract#binding" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "[(6,4)-(7,0)]" - } - ] - } - ] - } - ] - }, - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/parameters.raml#/parameters/parameter/payload%3F", - "@type": [ - "http://a.ml/vocabularies/apiContract#Parameter", - "http://a.ml/vocabularies/document#DomainElement" - ], - "http://a.ml/vocabularies/core#name": [ - { - "@value": "payload" - } - ], - "http://a.ml/vocabularies/apiContract#paramName": [ - { - "@value": "payload" - } - ], - "http://a.ml/vocabularies/apiContract#required": [ - { - "@value": false - } - ], - "http://a.ml/vocabularies/apiContract#binding": [ - { - "@value": "body" - } - ], - "http://a.ml/vocabularies/shapes#schema": [ - { - "@id": "null#/schema", - "@type": [ - "http://www.w3.org/ns/shacl#NodeShape", - "http://www.w3.org/ns/shacl#Shape", - "http://a.ml/vocabularies/shapes#Shape", - "http://a.ml/vocabularies/document#DomainElement" - ], - "http://www.w3.org/ns/shacl#closed": [ - { - "@value": false - } - ], - "http://www.w3.org/ns/shacl#property": [ - { - "@id": "null#/schema/property/prop", - "@type": [ - "http://www.w3.org/ns/shacl#PropertyShape", - "http://www.w3.org/ns/shacl#Shape", - "http://a.ml/vocabularies/shapes#Shape" - ], - "http://www.w3.org/ns/shacl#path": [ - { - "@id": "http://a.ml/vocabularies/data#prop" - } - ], - "http://a.ml/vocabularies/shapes#range": [ - { - "@id": "null#/schema/property/prop/scalar/prop", - "@type": [ - "http://a.ml/vocabularies/shapes#ScalarShape", - "http://www.w3.org/ns/shacl#Shape", - "http://a.ml/vocabularies/shapes#Shape", - "http://a.ml/vocabularies/document#DomainElement" - ], - "http://www.w3.org/ns/shacl#datatype": [ - { - "@id": "http://www.w3.org/2001/XMLSchema#string" - } - ], - "http://www.w3.org/ns/shacl#name": [ - { - "@value": "prop" - } - ], - "http://a.ml/vocabularies/document-source-maps#sources": [ - { - "@id": "null#/schema/property/prop/scalar/prop/source-map", - "@type": [ - "http://a.ml/vocabularies/document-source-maps#SourceMap" - ], - "http://a.ml/vocabularies/document-source-maps#type-property-lexical-info": [ - { - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "null#/schema/property/prop/scalar/prop" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "[(11,8)-(11,12)]" - } - ] - } - ], - "http://a.ml/vocabularies/document-source-maps#lexical": [ - { - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "http://www.w3.org/ns/shacl#datatype" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "[(11,8)-(12,0)]" - } - ] - }, - { - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "null#/schema/property/prop/scalar/prop" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "[(10,6)-(13,0)]" - } - ] - } - ] - } - ] - } - ], - "http://www.w3.org/ns/shacl#minCount": [ - { - "@value": 0 - } - ], - "http://www.w3.org/ns/shacl#name": [ - { - "@value": "prop" - } - ], - "http://a.ml/vocabularies/document-source-maps#sources": [ - { - "@id": "null#/schema/property/prop/source-map", - "@type": [ - "http://a.ml/vocabularies/document-source-maps#SourceMap" - ], - "http://a.ml/vocabularies/document-source-maps#lexical": [ - { - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "http://www.w3.org/ns/shacl#minCount" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "[(12,8)-(13,0)]" - } - ] - }, - { - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "null#/schema/property/prop" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "[(10,6)-(13,0)]" - } - ] - } - ] - } - ] - } - ], - "http://www.w3.org/ns/shacl#name": [ - { - "@value": "schema" - } - ], - "http://a.ml/vocabularies/document-source-maps#sources": [ - { - "@id": "null#/schema/source-map", - "@type": [ - "http://a.ml/vocabularies/document-source-maps#SourceMap" - ], - "http://a.ml/vocabularies/document-source-maps#type-property-lexical-info": [ - { - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "null#/schema" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "[(8,4)-(8,8)]" - } - ] - } - ], - "http://a.ml/vocabularies/document-source-maps#lexical": [ - { - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "http://www.w3.org/ns/shacl#property" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "[(9,4)-(13,0)]" - } - ] - }, - { - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "null#/schema" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "[(7,2)-(14,0)]" - } - ] - } - ] - } - ] - } - ], - "http://a.ml/vocabularies/document-source-maps#sources": [ - { - "@id": "file://amf-cli/shared/src/test/resources/upanddown/parameters.raml#/parameters/parameter/payload%3F/source-map", - "@type": [ - "http://a.ml/vocabularies/document-source-maps#SourceMap" - ], - "http://a.ml/vocabularies/document-source-maps#declared-element": [ - { - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/parameters.raml#/parameters/parameter/payload%3F" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "" - } - ] - } - ], - "http://a.ml/vocabularies/document-source-maps#lexical": [ - { - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "http://a.ml/vocabularies/shapes#schema" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "[(7,2)-(14,0)]" - } - ] - }, - { - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "file://amf-cli/shared/src/test/resources/upanddown/parameters.raml#/parameters/parameter/payload%3F" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "[(7,2)-(14,0)]" - } - ] - }, - { - "http://a.ml/vocabularies/document-source-maps#element": [ - { - "@value": "http://a.ml/vocabularies/apiContract#binding" - } - ], - "http://a.ml/vocabularies/document-source-maps#value": [ - { - "@value": "[(13,4)-(14,0)]" - } - ] - } - ] - } - ] - } - ] - } -] diff --git a/amf-cli/shared/src/test/scala/amf/configuration/E2ERenderConfigurationSetupTest.scala b/amf-cli/shared/src/test/scala/amf/configuration/E2ERenderConfigurationSetupTest.scala index 6d08cd03df..fc91bfe7d5 100644 --- a/amf-cli/shared/src/test/scala/amf/configuration/E2ERenderConfigurationSetupTest.scala +++ b/amf-cli/shared/src/test/scala/amf/configuration/E2ERenderConfigurationSetupTest.scala @@ -1,6 +1,7 @@ package amf.configuration import amf.apicontract.client.scala.AMFConfiguration +import amf.apicontract.client.scala.model.document.APIContractProcessingData import amf.apicontract.client.scala.model.domain.api.{AsyncApi, WebApi} import amf.core.client.scala.model.document.{BaseUnit, Document} import amf.core.internal.remote.Mimes._ @@ -65,7 +66,7 @@ class E2ERenderConfigurationSetupTest extends ConfigurationSetupTest with FileAs .withVersion("1.0") .withEndPoints(Seq.empty) .withId("api") - Document().withId("root").withEncodes(api) + Document().withId("root").withProcessingData(APIContractProcessingData()).withEncodes(api) } private def asyncModel: BaseUnit = { @@ -74,6 +75,6 @@ class E2ERenderConfigurationSetupTest extends ConfigurationSetupTest with FileAs .withVersion("1.0") .withEndPoints(Seq.empty) .withId("api") - Document().withId("root").withEncodes(api) + Document().withId("root").withProcessingData(APIContractProcessingData()).withEncodes(api) } } 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 3f34382f22..c93097e20f 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 @@ -1,5 +1,6 @@ package amf.resolution.merge +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.{Async20WebApiContext, AsyncWebApiContext} @@ -151,7 +152,10 @@ class JsonMergePatchTest extends MultiJsonldAsyncFunSuite with Matchers with Fil val target = parseOperation(targetFile, "target") val patch = parseOperation(patchFile, "patch") val merged = adoptAndMerge(target, patch) - Document().withId("testId").withEncodes(merged.asInstanceOf[Operation]) + Document() + .withId("testId") + .withProcessingData(APIContractProcessingData()) + .withEncodes(merged.asInstanceOf[Operation]) } def parseOperation(filePath: String, id: String): Operation = { @@ -170,7 +174,10 @@ class JsonMergePatchTest extends MultiJsonldAsyncFunSuite with Matchers with Fil val target = parseMessage(targetFile, "target") val patch = parseMessage(patchFile, "patch") val merged = adoptAndMerge(target, patch) - Document().withId("testId").withEncodes(merged.asInstanceOf[Message]) + Document() + .withId("testId") + .withProcessingData(APIContractProcessingData()) + .withEncodes(merged.asInstanceOf[Message]) } def parseMessage(filePath: String, id: String): Message = { @@ -189,7 +196,10 @@ class JsonMergePatchTest extends MultiJsonldAsyncFunSuite with Matchers with Fil val target = parseNode(targetFile, "target") val patch = parseNode(patchFile, "patch") val merged = adoptAndMerge(target, patch) - Document().withId("testId").withEncodes(merged.asInstanceOf[DataNode]) + Document() + .withId("testId") + .withProcessingData(APIContractProcessingData()) + .withEncodes(merged.asInstanceOf[DataNode]) } def parseNode(filePath: String, id: String): DataNode = { From 9edb3785e71704ecda2edd83fe7c77ae27832928 Mon Sep 17 00:00:00 2001 From: Hernan Najles Date: Tue, 28 Sep 2021 15:42:20 -0300 Subject: [PATCH 12/46] APIMF-2743: filter first char at compiler input content if is mayor than 8 bits (allowed at utf8) --- .../parser-results/charset/utf-8-bom.json | 12 ++++++++ .../parser-results/charset/utf-8-bom.yaml | 8 +++++ .../scala/amf/error/CharSetExtendedTest.scala | 29 +++++++++++++++++++ 3 files changed, 49 insertions(+) create mode 100644 amf-cli/shared/src/test/resources/parser-results/charset/utf-8-bom.json create mode 100644 amf-cli/shared/src/test/resources/parser-results/charset/utf-8-bom.yaml create mode 100644 amf-cli/shared/src/test/scala/amf/error/CharSetExtendedTest.scala diff --git a/amf-cli/shared/src/test/resources/parser-results/charset/utf-8-bom.json b/amf-cli/shared/src/test/resources/parser-results/charset/utf-8-bom.json new file mode 100644 index 0000000000..9e53935904 --- /dev/null +++ b/amf-cli/shared/src/test/resources/parser-results/charset/utf-8-bom.json @@ -0,0 +1,12 @@ +{ + "openapi": "3.0.1", + "info": { + "title": "The Jira Cloud platform REST API", + "description": "Jira Cloud platform REST API documentation", + "termsOfService": "http://atlassian.com/terms/", + "contact": { + "email": "ecosystem@atlassian.com" + } + }, + "paths": {} +} diff --git a/amf-cli/shared/src/test/resources/parser-results/charset/utf-8-bom.yaml b/amf-cli/shared/src/test/resources/parser-results/charset/utf-8-bom.yaml new file mode 100644 index 0000000000..ae21835edc --- /dev/null +++ b/amf-cli/shared/src/test/resources/parser-results/charset/utf-8-bom.yaml @@ -0,0 +1,8 @@ +openapi: "3.0.1" +info: + title: The Jira Cloud platform REST API + description: Jira Cloud platform REST API documentation + termsOfService: http://atlassian.com/terms/ + contact: + email: ecosystem@atlassian.com +paths: {} diff --git a/amf-cli/shared/src/test/scala/amf/error/CharSetExtendedTest.scala b/amf-cli/shared/src/test/scala/amf/error/CharSetExtendedTest.scala new file mode 100644 index 0000000000..4c29171aa0 --- /dev/null +++ b/amf-cli/shared/src/test/scala/amf/error/CharSetExtendedTest.scala @@ -0,0 +1,29 @@ +package amf.error + +import amf.apicontract.client.scala.APIConfiguration +import amf.core.client.scala.model.document.Document +import amf.core.internal.unsafe.PlatformSecrets +import org.scalatest.{AsyncFunSuite, Matchers} + +import scala.concurrent.ExecutionContext + +class CharSetExtendedTest extends AsyncFunSuite with PlatformSecrets with Matchers { + val basePath = "file://amf-cli/shared/src/test/resources/parser-results/charset/" + implicit override def executionContext: ExecutionContext = scala.concurrent.ExecutionContext.Implicits.global + + test("test parse UTF-8 with BOM") { + checkContent("utf-8-bom.json") + } + + test("test parse yaml UTF-8 with BOM") { + checkContent("utf-8-bom.yaml") + } + + private def checkContent(file: String) = { + APIConfiguration.API().baseUnitClient().parse(basePath + file).map { r => + r.conforms shouldBe (true) + r.baseUnit.isInstanceOf[Document] shouldBe (true) + } + } + +} From dd7717500626c9954487babe8552c285086bb041 Mon Sep 17 00:00:00 2001 From: Tomas Fernandez Date: Mon, 4 Oct 2021 13:14:36 -0300 Subject: [PATCH 13/46] Test: add BOM manually if doesn't exist --- .../scala/amf/error/CharSetExtendedTest.scala | 26 ++++++++++++++++--- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/amf-cli/shared/src/test/scala/amf/error/CharSetExtendedTest.scala b/amf-cli/shared/src/test/scala/amf/error/CharSetExtendedTest.scala index 4c29171aa0..ebfbfeaf37 100644 --- a/amf-cli/shared/src/test/scala/amf/error/CharSetExtendedTest.scala +++ b/amf-cli/shared/src/test/scala/amf/error/CharSetExtendedTest.scala @@ -1,11 +1,13 @@ package amf.error import amf.apicontract.client.scala.APIConfiguration +import amf.core.client.common.remote.Content import amf.core.client.scala.model.document.Document +import amf.core.client.scala.resource.ResourceLoader import amf.core.internal.unsafe.PlatformSecrets import org.scalatest.{AsyncFunSuite, Matchers} -import scala.concurrent.ExecutionContext +import scala.concurrent.{ExecutionContext, Future} class CharSetExtendedTest extends AsyncFunSuite with PlatformSecrets with Matchers { val basePath = "file://amf-cli/shared/src/test/resources/parser-results/charset/" @@ -20,10 +22,26 @@ class CharSetExtendedTest extends AsyncFunSuite with PlatformSecrets with Matche } private def checkContent(file: String) = { - APIConfiguration.API().baseUnitClient().parse(basePath + file).map { r => - r.conforms shouldBe (true) - r.baseUnit.isInstanceOf[Document] shouldBe (true) + APIConfiguration.API().withResourceLoaders(List(BomResourceLoader)).baseUnitClient().parse(basePath + file).map { + r => + r.conforms shouldBe (true) + r.baseUnit.isInstanceOf[Document] shouldBe true } } + object BomResourceLoader extends ResourceLoader { + + private val BOM = 0xFEFF.toChar + + override def fetch(resource: String): Future[Content] = + platform.fs + .asyncFile(resource.replace("file://", "")) + .read() + .map(x => prependBomIfDoesntExist(x.toString)) + .map(x => new Content(x, resource)) + + private def prependBomIfDoesntExist(content: String): String = if (content.head == BOM) content else BOM + content + + override def accepts(resource: String): Boolean = true + } } From 275cba3fa669023b3fb7a9a0015efc164966e134 Mon Sep 17 00:00:00 2001 From: Agustin Bettati Date: Mon, 4 Oct 2021 14:16:13 -0300 Subject: [PATCH 14/46] update typings: remove serializationOrder from ScalarShape, remove sourceSpec from Api --- amf-cli/js/typings/amf-client-js.d.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/amf-cli/js/typings/amf-client-js.d.ts b/amf-cli/js/typings/amf-client-js.d.ts index d5d7e5f2f3..e4adb8d39a 100644 --- a/amf-cli/js/typings/amf-client-js.d.ts +++ b/amf-cli/js/typings/amf-client-js.d.ts @@ -1117,7 +1117,6 @@ declare module 'amf-client-js' { contentType: Array accepts: Array position: Range - sourceSpec: undefined | Spec extendsNode: Array withDocumentationTitle(title: string): CreativeWork @@ -2407,7 +2406,6 @@ declare module 'amf-client-js' { contentType: Array accepts: Array position: Range - sourceSpec: undefined | Spec extendsNode: Array constructor() @@ -2852,7 +2850,6 @@ declare module 'amf-client-js' { contentType: Array accepts: Array position: Range - sourceSpec: undefined | Spec extendsNode: Array constructor() @@ -3174,7 +3171,6 @@ declare module 'amf-client-js' { encoding: StrField mediaType: StrField schema: Shape - serializationOrder: Shape constructor() From 3de58edf9cfaa51948c3b03e4dd9399389b4e4a4 Mon Sep 17 00:00:00 2001 From: Agustin Bettati Date: Mon, 4 Oct 2021 15:21:36 -0300 Subject: [PATCH 15/46] publish 5.0.0-RC.1 adopting aml 6.0.0-RC.1 --- amf-apicontract.versions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/amf-apicontract.versions b/amf-apicontract.versions index 78be45f502..55b632c2bb 100644 --- a/amf-apicontract.versions +++ b/amf-apicontract.versions @@ -1,3 +1,3 @@ -amf.apicontract=5.0.0-RC.0 -amf.aml=6.0.0-RC.0 +amf.apicontract=5.0.0-RC.1 +amf.aml=6.0.0-RC.1 amf.model=3.2.0 From a96a3b90c3b843abb1a6ccd58e37266a434c7821 Mon Sep 17 00:00:00 2001 From: Agustin Bettati Date: Wed, 6 Oct 2021 15:22:37 -0300 Subject: [PATCH 16/46] APIMF-3471: include test for patternConstraint with undefined or null value --- .../validations/protocols-key-no-value.raml | 17 ++++++++++++ ...raml08-authorization-grant-null-value.raml | 26 +++++++++++++++++++ .../model/08/protocols-key-no-value.report | 14 ++++++++++ ...ml08-authorization-grant-null-value.report | 14 ++++++++++ .../RamlModelUniquePlatformReportTest.scala | 8 ++++++ 5 files changed, 79 insertions(+) create mode 100644 amf-cli/shared/src/test/resources/validations/protocols-key-no-value.raml create mode 100644 amf-cli/shared/src/test/resources/validations/raml08-authorization-grant-null-value.raml create mode 100644 amf-cli/shared/src/test/resources/validations/reports/model/08/protocols-key-no-value.report create mode 100644 amf-cli/shared/src/test/resources/validations/reports/model/08/raml08-authorization-grant-null-value.report diff --git a/amf-cli/shared/src/test/resources/validations/protocols-key-no-value.raml b/amf-cli/shared/src/test/resources/validations/protocols-key-no-value.raml new file mode 100644 index 0000000000..1187cbb03b --- /dev/null +++ b/amf-cli/shared/src/test/resources/validations/protocols-key-no-value.raml @@ -0,0 +1,17 @@ +#%RAML 0.8 +title: Pro +version: 1.0 + +/testmapping: + get: + description: makes a + is: + protocols: # should fail + responses: + 200: + description: returns updated Load balancer JSON object. + body: + application/json: + example: "" + 404: + description: there diff --git a/amf-cli/shared/src/test/resources/validations/raml08-authorization-grant-null-value.raml b/amf-cli/shared/src/test/resources/validations/raml08-authorization-grant-null-value.raml new file mode 100644 index 0000000000..ccfcb5732f --- /dev/null +++ b/amf-cli/shared/src/test/resources/validations/raml08-authorization-grant-null-value.raml @@ -0,0 +1,26 @@ +#%RAML 0.8 +title: asfd +baseUri: adfs +version: v1 + + +securitySchemes: + - oauth_2_0: + description: This API supports OAuth 2.0 for authenticating all API requests. + type: OAuth 2.0 + describedBy: + headers: + Authorization: + description: Used to send a valid OAuth 2 access token. Do not use with the "access_token" query string parameter. + type: string + responses: + 401: + description: Bad or expired token. This can happen if the user or the API revoked or expired an access token. To fix, you should re-authenticate the user. + 403: + description: Bad OAuth request (wrong consumer key, bad nonce, expired timestamp...). Unfortunately, re-authenticating the user won't help here. + settings: + authorizationUri: http://localhost:8081/api/v1/authorize + accessTokenUri: http://localhost:8081/api/v1/authorize + authorizationGrants: [null,credentials] + +/organizations: diff --git a/amf-cli/shared/src/test/resources/validations/reports/model/08/protocols-key-no-value.report b/amf-cli/shared/src/test/resources/validations/reports/model/08/protocols-key-no-value.report new file mode 100644 index 0000000000..0613c9af4e --- /dev/null +++ b/amf-cli/shared/src/test/resources/validations/reports/model/08/protocols-key-no-value.report @@ -0,0 +1,14 @@ +ModelId: file://amf-cli/shared/src/test/resources/validations/protocols-key-no-value.raml +Profile: RAML 0.8 +Conforms: false +Number of results: 1 + +Level: Violation + +- Constraint: http://a.ml/vocabularies/amf/parser#raml-operation-schemes-values + Message: Protocols must have a case insensitive value matching http or https + Severity: Violation + Target: file://amf-cli/shared/src/test/resources/validations/protocols-key-no-value.raml#/web-api/endpoint/%2Ftestmapping/supportedOperation/get + Property: http://a.ml/vocabularies/apiContract#scheme + Range: [(9,14)-(9,14)] + Location: file://amf-cli/shared/src/test/resources/validations/protocols-key-no-value.raml diff --git a/amf-cli/shared/src/test/resources/validations/reports/model/08/raml08-authorization-grant-null-value.report b/amf-cli/shared/src/test/resources/validations/reports/model/08/raml08-authorization-grant-null-value.report new file mode 100644 index 0000000000..1f3dcd7d8e --- /dev/null +++ b/amf-cli/shared/src/test/resources/validations/reports/model/08/raml08-authorization-grant-null-value.report @@ -0,0 +1,14 @@ +ModelId: file://amf-cli/shared/src/test/resources/validations/raml08-authorization-grant-null-value.raml +Profile: RAML 0.8 +Conforms: false +Number of results: 1 + +Level: Violation + +- Constraint: http://a.ml/vocabularies/amf/parser#Settings-authorizationGrant-pattern + Message: Invalid authorization grant. The options are: code, token, owner or credentials + Severity: Violation + Target: file://amf-cli/shared/src/test/resources/validations/raml08-authorization-grant-null-value.raml#/declares/scheme/oauth_2_0/settings/oauth2 + Property: http://a.ml/vocabularies/security#authorizationGrant + Range: [(24,27)-(24,45)] + Location: file://amf-cli/shared/src/test/resources/validations/raml08-authorization-grant-null-value.raml diff --git a/amf-cli/shared/src/test/scala/amf/validation/RamlModelUniquePlatformReportTest.scala b/amf-cli/shared/src/test/scala/amf/validation/RamlModelUniquePlatformReportTest.scala index e3d426511f..393248fcdf 100644 --- a/amf-cli/shared/src/test/scala/amf/validation/RamlModelUniquePlatformReportTest.scala +++ b/amf-cli/shared/src/test/scala/amf/validation/RamlModelUniquePlatformReportTest.scala @@ -674,4 +674,12 @@ class RamlModelUniquePlatformReportTest extends UniquePlatformReportGenTest { test("override type any with other type that is object[]") { validate("override-any-with-array-type.raml") } + + test("define protocol keys with no values") { + validate("protocols-key-no-value.raml", Some("08/protocols-key-no-value.report")) + } + + test("define authorization grant with null as value") { + validate("raml08-authorization-grant-null-value.raml", Some("08/raml08-authorization-grant-null-value.report")) + } } From b626934488c83a1f8ee9b631d45454e0f05104bf Mon Sep 17 00:00:00 2001 From: Agustin Bettati Date: Thu, 7 Oct 2021 08:26:50 -0300 Subject: [PATCH 17/46] delta fix: avoid closed shape when defining custom facet in nested child shape --- .../raml/custom-facet-in-inherited-shape.raml | 14 ++++++++++++++ .../amf/validation/ValidRamlModelParserTest.scala | 4 ++++ 2 files changed, 18 insertions(+) create mode 100644 amf-cli/shared/src/test/resources/validations/raml/custom-facet-in-inherited-shape.raml diff --git a/amf-cli/shared/src/test/resources/validations/raml/custom-facet-in-inherited-shape.raml b/amf-cli/shared/src/test/resources/validations/raml/custom-facet-in-inherited-shape.raml new file mode 100644 index 0000000000..1c0c02b4ea --- /dev/null +++ b/amf-cli/shared/src/test/resources/validations/raml/custom-facet-in-inherited-shape.raml @@ -0,0 +1,14 @@ +#%RAML 1.0 +title: A +types: + myDate: + type: string + facets: + format: string + year: + type: myDate + format: YYYY + yee: + type: year + format: YYYY +/q: diff --git a/amf-cli/shared/src/test/scala/amf/validation/ValidRamlModelParserTest.scala b/amf-cli/shared/src/test/scala/amf/validation/ValidRamlModelParserTest.scala index b781900017..a8cca8678e 100644 --- a/amf-cli/shared/src/test/scala/amf/validation/ValidRamlModelParserTest.scala +++ b/amf-cli/shared/src/test/scala/amf/validation/ValidRamlModelParserTest.scala @@ -283,5 +283,9 @@ class ValidRamlModelParserTest extends ValidModelTest { checkValid("/raml/trait-definition-numeric-name.raml") } + test("Custom facet defined in shapes with inheritance") { + checkValid("/raml/custom-facet-in-inherited-shape.raml") + } + override val hint: Hint = Raml10YamlHint } From 51d682f02733bd6aeee41a54d179f17e937d9476 Mon Sep 17 00:00:00 2001 From: Tomas Fernandez Date: Wed, 6 Oct 2021 16:34:55 -0300 Subject: [PATCH 18/46] Simplified dialect lookup by id in CLI --- .../scala/amf/cli/internal/commands/ValidateCommand.scala | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/amf-cli/shared/src/main/scala/amf/cli/internal/commands/ValidateCommand.scala b/amf-cli/shared/src/main/scala/amf/cli/internal/commands/ValidateCommand.scala index 5a1ce67212..b82bc108a7 100644 --- a/amf-cli/shared/src/main/scala/amf/cli/internal/commands/ValidateCommand.scala +++ b/amf-cli/shared/src/main/scala/amf/cli/internal/commands/ValidateCommand.scala @@ -37,11 +37,8 @@ class ValidateCommand(override val platform: Platform) extends CommandHelper { res } - // TODO ARM: move to registry? or to context parsing? discuss with tomi def findDialect(configuration: AMFConfiguration, id: String): Option[Dialect] = { - configuration.registry.plugins.parsePlugins.collectFirst({ - case aml: AMLDialectInstanceParsingPlugin if aml.dialect.id == id => aml.dialect - }) + configuration.configurationState().getDialects().find(_.id == id) } def report(model: BaseUnit, config: ParserConfig, configuration: AMFConfiguration): Future[AMFValidationReport] = { From ba2a6f0e72036942a91c15597f9eadf4b59e053a Mon Sep 17 00:00:00 2001 From: Tomas Fernandez Date: Wed, 6 Oct 2021 16:28:41 -0300 Subject: [PATCH 19/46] Chore: Removed TODOs that were not relevant or applicable or that ended up with a ticket created for them. Removed test file that was all commented out. --- .../client/platform/AMFElementClient.scala | 2 - .../plugins/ApiContractFallbackPlugin.scala | 2 - .../internal/spec/oas/OasParsePlugin.scala | 1 - .../scala/amf/compiler/AMFCompilerTest.scala | 2 +- .../FromJsonLDPayloadValidationTest.scala | 87 ------------------- .../client/scala/ShapesConfiguration.scala | 1 - .../emitter/JsonSchemaSerializer.scala | 1 - 7 files changed, 1 insertion(+), 95 deletions(-) delete mode 100644 amf-cli/shared/src/test/scala/amf/validation/FromJsonLDPayloadValidationTest.scala diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/AMFElementClient.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/AMFElementClient.scala index 7c6ae1dfb8..5abef74152 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/AMFElementClient.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/AMFElementClient.scala @@ -32,12 +32,10 @@ class AMFElementClient private[amf] (private val _internal: InternalAMFElementCl override def renderToBuilder[T](element: DomainElement, builder: DocBuilder[T]): Unit = AMFElementRenderer.renderToBuilder(element, builder, getConfiguration()) - // TODO ARM: Replace profile for spec /** Get this resource type as an endpoint. No variables will be replaced. Pass the BaseUnit that contains this trait to use its declarations and the profile ProfileNames.RAML08 if this is from a raml08 unit. */ def asEndpoint[T <: BaseUnit](unit: T, rt: ResourceType, profile: ProfileName = Raml10Profile): EndPoint = AbstractElementTransformer.asEndpoint(unit, rt, obtainEH, getConfiguration(), profile) - // TODO ARM: Replace profile for spec /** Get this trait as an operation. No variables will be replaced. Pass the BaseUnit that contains this trait to use its declarations and the profile ProfileNames.RAML08 if this is from a raml08 unit. */ def asOperation[T <: BaseUnit](unit: T, tr: Trait, profile: ProfileName = Raml10Profile): Operation = AbstractElementTransformer.asOperation(unit, tr, obtainEH, getConfiguration(), profile) diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/plugins/ApiContractFallbackPlugin.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/plugins/ApiContractFallbackPlugin.scala index fe15bdfc65..b78b8d1225 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/plugins/ApiContractFallbackPlugin.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/plugins/ApiContractFallbackPlugin.scala @@ -16,8 +16,6 @@ import amf.core.internal.remote.{JSONRefs, Spec} import amf.core.internal.utils.MediaTypeMatcher import amf.core.internal.validation.CoreParserValidations.{CantReferenceSpecInFileTree, CouldntGuessRoot} -// TODO ARM: change this, refactor to have different options based on the configuration (Raml strict, WebApi Relaxed). -// TODO ARM: Export withFallback and this object to the user. User cannot create instance or implement interface? yes? no? case class ApiContractFallbackPlugin(strict: Boolean = true, skipWarnings: Boolean = false) extends DomainParsingFallback { private def docMediaType(doc: Root) = if (doc.raw.isJson) `application/json` else `application/yaml` diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/OasParsePlugin.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/OasParsePlugin.scala index b324ec855c..7fb18e437c 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/OasParsePlugin.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/oas/OasParsePlugin.scala @@ -30,6 +30,5 @@ trait OasParsePlugin extends OasLikeParsePlugin { wrapped: ParserContext, ds: Option[OasWebApiDeclarations] = None): OasWebApiContext - // TODO ARM: Decide, should an OAS Document be able to reference another OAS Document? override def validSpecsToReference: Seq[Spec] = super.validSpecsToReference :+ spec } diff --git a/amf-cli/shared/src/test/scala/amf/compiler/AMFCompilerTest.scala b/amf-cli/shared/src/test/scala/amf/compiler/AMFCompilerTest.scala index 603560b4ea..4800e5b5f0 100644 --- a/amf-cli/shared/src/test/scala/amf/compiler/AMFCompilerTest.scala +++ b/amf-cli/shared/src/test/scala/amf/compiler/AMFCompilerTest.scala @@ -57,7 +57,7 @@ class AMFCompilerTest extends AsyncFunSuite with CompilerTestBuilder { s"file://amf-cli/shared/src/test/resources/reference-itself.raml", Raml10YamlHint, defaultConfig - .withErrorHandlerProvider(() => UnhandledErrorHandler), // TODO ARM then default should not throw exception? + .withErrorHandlerProvider(() => UnhandledErrorHandler), None ) } map { ex => diff --git a/amf-cli/shared/src/test/scala/amf/validation/FromJsonLDPayloadValidationTest.scala b/amf-cli/shared/src/test/scala/amf/validation/FromJsonLDPayloadValidationTest.scala deleted file mode 100644 index 4bc4d36661..0000000000 --- a/amf-cli/shared/src/test/scala/amf/validation/FromJsonLDPayloadValidationTest.scala +++ /dev/null @@ -1,87 +0,0 @@ -// TODO: ARM uncomment -//package amf.validation -// -//import amf.client.environment.{AsyncAPIConfiguration, WebAPIConfiguration} -//import amf.core.client.common.validation.{AmfProfile, Oas20Profile, Oas30Profile, Raml10Profile} -//import amf.core.internal.unsafe.PlatformSecrets -//import amf.facades.Validation -//import amf.plugins.features.validation.PlatformValidator -//import amf.plugins.features.validation.emitters.{JSLibraryEmitter, ShaclJsonLdShapeGraphEmitter} -//import org.scalatest.AsyncFunSuite -// -//import scala.concurrent.ExecutionContext -// -//class FromJsonLDPayloadValidationTest extends AsyncFunSuite with PlatformSecrets { -// override implicit val executionContext: ExecutionContext = ExecutionContext.Implicits.global -// -// val path = "file://amf-cli/shared/src/test/resources/validations/" -// val constraints = WebAPIConfiguration.WebAPI().merge(AsyncAPIConfiguration.Async20()).registry.constraintsRules.map { -// case (key, constraints) => key.p -> constraints -// } -// -// val testValidations = Map( -// "bad_domain/valid.jsonld" -> ExpectedReport(conforms = true, 0, Oas20Profile), -// "endpoint/amf.jsonld" -> ExpectedReport(conforms = true, 0, AmfProfile), -// "endpoint/valid.jsonld" -> ExpectedReport(conforms = true, 0, AmfProfile), -// "operation/amf.jsonld" -> ExpectedReport(conforms = true, 0, AmfProfile), -// "operation/valid.jsonld" -> ExpectedReport(conforms = true, 0, AmfProfile), -// "parameters/amf_properties.jsonld" -> ExpectedReport(conforms = false, 2, AmfProfile), -// "parameters/amf_empty.jsonld" -> ExpectedReport(conforms = false, 2, AmfProfile), -// "parameters/amf_valid.jsonld" -> ExpectedReport(conforms = true, 0, AmfProfile), -// "shapes/enum_amf.jsonld" -> ExpectedReport(conforms = false, 1, Oas20Profile), -// "shapes/enum_valid.jsonld" -> ExpectedReport(conforms = true, 0, Oas20Profile), -// "webapi/amf.jsonld" -> ExpectedReport(conforms = false, 1, Oas20Profile), -// "webapi/valid.jsonld" -> ExpectedReport(conforms = false, 1, Oas20Profile), -// "webapi/valid.jsonld" -> ExpectedReport(conforms = true, 0, Raml10Profile), -// "webapi/bad_protocol.jsonld" -> ExpectedReport(conforms = false, 1, Raml10Profile), -// "types/scalars/missing_type.jsonld" -> ExpectedReport(conforms = false, 1, Raml10Profile), -// "types/scalars/missing_type_valid.jsonld" -> ExpectedReport(conforms = true, 0, Raml10Profile), -// "types/scalars/wrong_facet.jsonld" -> ExpectedReport(conforms = false, 1, Raml10Profile), -// "types/scalars/valid_facet.jsonld" -> ExpectedReport(conforms = true, 0, Raml10Profile), -// "types/scalars/invalid_xml_attribute_non_scalar.jsonld" -> ExpectedReport(conforms = false, 1, Raml10Profile), -// "types/scalars/invalid_xml_wrapped_scalar.jsonld" -> ExpectedReport(conforms = false, 1, Raml10Profile), -// "types/arrays/empty_items.jsonld" -> ExpectedReport(conforms = true, 0, Raml10Profile), -// "types/arrays/empty_items.jsonld" -> ExpectedReport(conforms = false, 1, Oas20Profile), -// "annotationTypes/invalid.jsonld" -> ExpectedReport(conforms = false, 1, Raml10Profile), -// "annotationTypes/valid.jsonld" -> ExpectedReport(conforms = true, 0, Raml10Profile), -// "path-parameter-required/required-is-not-present.jsonld" -> ExpectedReport(conforms = false, 1, Oas20Profile), -// "path-parameter-required/required-set-to-true.jsonld" -> ExpectedReport(conforms = true, 0, Oas20Profile), -// "file-parameter/invalid.jsonld" -> ExpectedReport(conforms = false, 1, Oas20Profile), -// "../upanddown/oas3/basic-content.jsonld" -> ExpectedReport(conforms = false, 1, Oas30Profile) -// ) -// -// for { -// (file, expectedReport) <- testValidations -// } yield { -// test(s"SHACL Validator $file") { -// validate(file, expectedReport) -// } -// } -// -// private def validate(file: String, expectedReport: ExpectedReport) = { -// platform.resolve(path + file).flatMap { data => -// val model = data.stream.toString -// Validation(platform).flatMap { validation => -// val effectiveValidations = AMFValidatorPlugin.computeValidations(expectedReport.profile, constraints) -// val shapes = AMFValidatorPlugin.shapesGraph(effectiveValidations) -// val jsLibrary = new JSLibraryEmitter(None).emitJS(effectiveValidations.effective.values.toSeq) -// val validator = PlatformValidator.instance() -// -// jsLibrary match { -// case Some(code) => -// validator.registerLibrary(ShaclJsonLdShapeGraphEmitter.validationLibraryUrl, code) -// case _ => // ignore -// } -// validator.report( -// model, -// "application/ld+json", -// shapes, -// "application/ld+json" -// ) flatMap { report => -// assert(expectedReport == ExpectedReport(report.conforms, report.results.length, expectedReport.profile)) -// } -// } -// } -// } -// -//} diff --git a/amf-shapes/shared/src/main/scala/amf/shapes/client/scala/ShapesConfiguration.scala b/amf-shapes/shared/src/main/scala/amf/shapes/client/scala/ShapesConfiguration.scala index 15bc344181..a234cda9d5 100644 --- a/amf-shapes/shared/src/main/scala/amf/shapes/client/scala/ShapesConfiguration.scala +++ b/amf-shapes/shared/src/main/scala/amf/shapes/client/scala/ShapesConfiguration.scala @@ -185,7 +185,6 @@ object ShapesConfiguration { def predefined(): ShapesConfiguration = { ShapesRegister.register() // TODO ARM remove when APIMF-3000 is done - // TODO ARM: validate plugin and payload plugin of api? val predefinedAMLConfig = AMLConfiguration.predefined() val coreEntities = AMFGraphConfiguration.predefined().getRegistry.entitiesRegistry.domainEntities new ShapesConfiguration( diff --git a/amf-shapes/shared/src/main/scala/amf/shapes/internal/spec/jsonschema/emitter/JsonSchemaSerializer.scala b/amf-shapes/shared/src/main/scala/amf/shapes/internal/spec/jsonschema/emitter/JsonSchemaSerializer.scala index 9fb8e2b941..82137ac13a 100644 --- a/amf-shapes/shared/src/main/scala/amf/shapes/internal/spec/jsonschema/emitter/JsonSchemaSerializer.scala +++ b/amf-shapes/shared/src/main/scala/amf/shapes/internal/spec/jsonschema/emitter/JsonSchemaSerializer.scala @@ -10,7 +10,6 @@ trait JsonSchemaSerializer extends PlatformSecrets { // todo, check if its resolved? // todo lexical ordering? - // TODO ARM: change name, not descriptive. protected def toJsonSchema(element: AnyShape, config: AMFGraphConfiguration): String = { element.annotations From 7b10aded1d7bb109ed13727a4c391084b6da44b5 Mon Sep 17 00:00:00 2001 From: Agustin Bettati Date: Thu, 7 Oct 2021 16:43:14 -0300 Subject: [PATCH 20/46] APIMF-3472: test rdf round trip with oas api to jsonld --- .../src/test/resources/rdf/apis/banking.json | 97 +++++ .../test/resources/rdf/apis/banking.jsonld | 381 ++++++++++++++++++ .../amf/cycle/RdfModelRoundTripTest.scala | 28 ++ 3 files changed, 506 insertions(+) create mode 100644 amf-cli/shared/src/test/resources/rdf/apis/banking.json create mode 100644 amf-cli/shared/src/test/resources/rdf/apis/banking.jsonld create mode 100644 amf-cli/shared/src/test/scala/amf/cycle/RdfModelRoundTripTest.scala diff --git a/amf-cli/shared/src/test/resources/rdf/apis/banking.json b/amf-cli/shared/src/test/resources/rdf/apis/banking.json new file mode 100644 index 0000000000..f918db1f7c --- /dev/null +++ b/amf-cli/shared/src/test/resources/rdf/apis/banking.json @@ -0,0 +1,97 @@ +{ + "swagger": "2.0", + "info": { + "title": ", + "version": "1.0" + }, + "basePath": "/apis", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "paths": { + "/customers": { + + }, + "/customers/{customer_id}": { + "parameters": [ + { + "name": "customer_id", + "required": true, + "in": "path", + "type": "string" + } + ], + "delete": { + "description": "Removes a Customer from the system", + "responses": { + "200": { + "description": "OK" + } + } + }, + "get": { + "description": "Returns Customer data", + "responses": { + "200": { + "description": "OK" + } + } + } + }, + "/customers/{customer_id}/accounts": { + "parameters": [ + { + "name": "customer_id", + "required": true, + "in": "path", + "type": "string" + } + ], + "get": { + "description": "Returns a collection accounts", + "responses": { + "200": { + "description": "OK" + } + } + } + }, + "/customers/{customer_id}/cards/debit": { + "parameters": [ + { + "name": "customer_id", + "required": true, + "in": "path", + "type": "string" + } + ], + "get": { + "description": "Returns a collection of cards", + "responses": { + "200": { + "description": "OK" + } + } + }, + "post": { + "description": "Requests the creation of a new DebitCard", + "parameters": [ + { + "in": "query", + "name": "account", + "type": "integer", + "description": "account id" + } + ], + "responses": { + "200": { + "description": "OK" + } + } + } + } + } +} diff --git a/amf-cli/shared/src/test/resources/rdf/apis/banking.jsonld b/amf-cli/shared/src/test/resources/rdf/apis/banking.jsonld new file mode 100644 index 0000000000..39cc1986b5 --- /dev/null +++ b/amf-cli/shared/src/test/resources/rdf/apis/banking.jsonld @@ -0,0 +1,381 @@ +{ + "@graph": [ + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json/web-api", + "@type": [ + "http://a.ml/vocabularies/apiContract#WebAPI", + "http://a.ml/vocabularies/apiContract#API", + "http://a.ml/vocabularies/document#RootDomainElement", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://a.ml/vocabularies/core#name": "", + "http://a.ml/vocabularies/apiContract#server": [ + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/server/%2Fapis" + } + ], + "http://a.ml/vocabularies/apiContract#accepts": [ + "application/json" + ], + "http://a.ml/vocabularies/apiContract#contentType": [ + "application/json" + ], + "http://a.ml/vocabularies/core#version": "1.0", + "http://a.ml/vocabularies/apiContract#endpoint": [ + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers%2F%7Bcustomer_id%7D%2Fcards%2Fdebit" + }, + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers%2F%7Bcustomer_id%7D%2Faccounts" + }, + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers%2F%7Bcustomer_id%7D" + }, + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers" + } + ] + }, + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/BaseUnitProcessingData", + "@type": [ + "http://a.ml/vocabularies/document#APIContractProcessingData" + ], + "http://a.ml/vocabularies/apiContract#modelVersion": "3.2.0", + "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" + }, + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/server/%2Fapis", + "@type": [ + "http://a.ml/vocabularies/apiContract#Server", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://a.ml/vocabularies/core#urlTemplate": "/apis" + }, + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers%2F%7Bcustomer_id%7D%2Fcards%2Fdebit", + "@type": [ + "http://a.ml/vocabularies/apiContract#EndPoint", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://a.ml/vocabularies/apiContract#path": "/customers/{customer_id}/cards/debit", + "http://a.ml/vocabularies/apiContract#supportedOperation": [ + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers%2F%7Bcustomer_id%7D%2Fcards%2Fdebit/supportedOperation/post" + }, + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers%2F%7Bcustomer_id%7D%2Fcards%2Fdebit/supportedOperation/get" + } + ], + "http://a.ml/vocabularies/apiContract#parameter": [ + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers%2F%7Bcustomer_id%7D%2Fcards%2Fdebit/parameter/parameter/path/customer_id" + } + ] + }, + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers%2F%7Bcustomer_id%7D%2Faccounts", + "@type": [ + "http://a.ml/vocabularies/apiContract#EndPoint", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://a.ml/vocabularies/apiContract#path": "/customers/{customer_id}/accounts", + "http://a.ml/vocabularies/apiContract#supportedOperation": [ + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers%2F%7Bcustomer_id%7D%2Faccounts/supportedOperation/get" + } + ], + "http://a.ml/vocabularies/apiContract#parameter": [ + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers%2F%7Bcustomer_id%7D%2Faccounts/parameter/parameter/path/customer_id" + } + ] + }, + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers%2F%7Bcustomer_id%7D", + "@type": [ + "http://a.ml/vocabularies/apiContract#EndPoint", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://a.ml/vocabularies/apiContract#path": "/customers/{customer_id}", + "http://a.ml/vocabularies/apiContract#supportedOperation": [ + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers%2F%7Bcustomer_id%7D/supportedOperation/get" + }, + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers%2F%7Bcustomer_id%7D/supportedOperation/delete" + } + ], + "http://a.ml/vocabularies/apiContract#parameter": [ + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers%2F%7Bcustomer_id%7D/parameter/parameter/path/customer_id" + } + ] + }, + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers", + "@type": [ + "http://a.ml/vocabularies/apiContract#EndPoint", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://a.ml/vocabularies/apiContract#path": "/customers" + }, + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers%2F%7Bcustomer_id%7D%2Fcards%2Fdebit/supportedOperation/post", + "@type": [ + "http://a.ml/vocabularies/apiContract#Operation", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://a.ml/vocabularies/apiContract#method": "post", + "http://a.ml/vocabularies/core#description": "Requests the creation of a new DebitCard", + "http://a.ml/vocabularies/apiContract#expects": [ + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers%2F%7Bcustomer_id%7D%2Fcards%2Fdebit/supportedOperation/post/expects/request" + } + ], + "http://a.ml/vocabularies/apiContract#returns": [ + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers%2F%7Bcustomer_id%7D%2Fcards%2Fdebit/supportedOperation/post/returns/resp/200" + } + ] + }, + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers%2F%7Bcustomer_id%7D%2Fcards%2Fdebit/supportedOperation/get", + "@type": [ + "http://a.ml/vocabularies/apiContract#Operation", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://a.ml/vocabularies/apiContract#method": "get", + "http://a.ml/vocabularies/core#description": "Returns a collection of cards", + "http://a.ml/vocabularies/apiContract#returns": [ + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers%2F%7Bcustomer_id%7D%2Fcards%2Fdebit/supportedOperation/get/returns/resp/200" + } + ] + }, + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers%2F%7Bcustomer_id%7D%2Fcards%2Fdebit/parameter/parameter/path/customer_id", + "@type": [ + "http://a.ml/vocabularies/apiContract#Parameter", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://a.ml/vocabularies/core#name": "customer_id", + "http://a.ml/vocabularies/apiContract#paramName": "customer_id", + "http://a.ml/vocabularies/apiContract#required": true, + "http://a.ml/vocabularies/apiContract#binding": "path", + "http://a.ml/vocabularies/shapes#schema": { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers%2F%7Bcustomer_id%7D%2Fcards%2Fdebit/parameter/parameter/path/customer_id/any/schema" + } + }, + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers%2F%7Bcustomer_id%7D%2Faccounts/supportedOperation/get", + "@type": [ + "http://a.ml/vocabularies/apiContract#Operation", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://a.ml/vocabularies/apiContract#method": "get", + "http://a.ml/vocabularies/core#description": "Returns a collection accounts", + "http://a.ml/vocabularies/apiContract#returns": [ + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers%2F%7Bcustomer_id%7D%2Faccounts/supportedOperation/get/returns/resp/200" + } + ] + }, + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers%2F%7Bcustomer_id%7D%2Faccounts/parameter/parameter/path/customer_id", + "@type": [ + "http://a.ml/vocabularies/apiContract#Parameter", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://a.ml/vocabularies/core#name": "customer_id", + "http://a.ml/vocabularies/apiContract#paramName": "customer_id", + "http://a.ml/vocabularies/apiContract#required": true, + "http://a.ml/vocabularies/apiContract#binding": "path", + "http://a.ml/vocabularies/shapes#schema": { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers%2F%7Bcustomer_id%7D%2Faccounts/parameter/parameter/path/customer_id/any/schema" + } + }, + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers%2F%7Bcustomer_id%7D/supportedOperation/get", + "@type": [ + "http://a.ml/vocabularies/apiContract#Operation", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://a.ml/vocabularies/apiContract#method": "get", + "http://a.ml/vocabularies/core#description": "Returns Customer data", + "http://a.ml/vocabularies/apiContract#returns": [ + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers%2F%7Bcustomer_id%7D/supportedOperation/get/returns/resp/200" + } + ] + }, + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers%2F%7Bcustomer_id%7D/supportedOperation/delete", + "@type": [ + "http://a.ml/vocabularies/apiContract#Operation", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://a.ml/vocabularies/apiContract#method": "delete", + "http://a.ml/vocabularies/core#description": "Removes a Customer from the system", + "http://a.ml/vocabularies/apiContract#returns": [ + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers%2F%7Bcustomer_id%7D/supportedOperation/delete/returns/resp/200" + } + ] + }, + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers%2F%7Bcustomer_id%7D/parameter/parameter/path/customer_id", + "@type": [ + "http://a.ml/vocabularies/apiContract#Parameter", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://a.ml/vocabularies/core#name": "customer_id", + "http://a.ml/vocabularies/apiContract#paramName": "customer_id", + "http://a.ml/vocabularies/apiContract#required": true, + "http://a.ml/vocabularies/apiContract#binding": "path", + "http://a.ml/vocabularies/shapes#schema": { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers%2F%7Bcustomer_id%7D/parameter/parameter/path/customer_id/any/schema" + } + }, + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers%2F%7Bcustomer_id%7D%2Fcards%2Fdebit/supportedOperation/post/expects/request", + "@type": [ + "http://a.ml/vocabularies/apiContract#Request", + "http://a.ml/vocabularies/apiContract#Message", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://a.ml/vocabularies/apiContract#parameter": [ + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers%2F%7Bcustomer_id%7D%2Fcards%2Fdebit/supportedOperation/post/expects/request/parameter/parameter/query/account" + } + ] + }, + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers%2F%7Bcustomer_id%7D%2Fcards%2Fdebit/supportedOperation/post/returns/resp/200", + "@type": [ + "http://a.ml/vocabularies/apiContract#Response", + "http://a.ml/vocabularies/apiContract#Message", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://a.ml/vocabularies/apiContract#statusCode": "200", + "http://a.ml/vocabularies/core#name": "200", + "http://a.ml/vocabularies/core#description": "OK" + }, + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers%2F%7Bcustomer_id%7D%2Fcards%2Fdebit/supportedOperation/get/returns/resp/200", + "@type": [ + "http://a.ml/vocabularies/apiContract#Response", + "http://a.ml/vocabularies/apiContract#Message", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://a.ml/vocabularies/apiContract#statusCode": "200", + "http://a.ml/vocabularies/core#name": "200", + "http://a.ml/vocabularies/core#description": "OK" + }, + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers%2F%7Bcustomer_id%7D%2Fcards%2Fdebit/parameter/parameter/path/customer_id/any/schema", + "@type": [ + "http://a.ml/vocabularies/shapes#AnyShape", + "http://www.w3.org/ns/shacl#Shape", + "http://a.ml/vocabularies/shapes#Shape", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://www.w3.org/ns/shacl#name": "schema" + }, + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers%2F%7Bcustomer_id%7D%2Faccounts/supportedOperation/get/returns/resp/200", + "@type": [ + "http://a.ml/vocabularies/apiContract#Response", + "http://a.ml/vocabularies/apiContract#Message", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://a.ml/vocabularies/apiContract#statusCode": "200", + "http://a.ml/vocabularies/core#name": "200", + "http://a.ml/vocabularies/core#description": "OK" + }, + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers%2F%7Bcustomer_id%7D%2Faccounts/parameter/parameter/path/customer_id/any/schema", + "@type": [ + "http://a.ml/vocabularies/shapes#AnyShape", + "http://www.w3.org/ns/shacl#Shape", + "http://a.ml/vocabularies/shapes#Shape", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://www.w3.org/ns/shacl#name": "schema" + }, + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers%2F%7Bcustomer_id%7D/supportedOperation/get/returns/resp/200", + "@type": [ + "http://a.ml/vocabularies/apiContract#Response", + "http://a.ml/vocabularies/apiContract#Message", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://a.ml/vocabularies/apiContract#statusCode": "200", + "http://a.ml/vocabularies/core#name": "200", + "http://a.ml/vocabularies/core#description": "OK" + }, + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers%2F%7Bcustomer_id%7D/supportedOperation/delete/returns/resp/200", + "@type": [ + "http://a.ml/vocabularies/apiContract#Response", + "http://a.ml/vocabularies/apiContract#Message", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://a.ml/vocabularies/apiContract#statusCode": "200", + "http://a.ml/vocabularies/core#name": "200", + "http://a.ml/vocabularies/core#description": "OK" + }, + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers%2F%7Bcustomer_id%7D/parameter/parameter/path/customer_id/any/schema", + "@type": [ + "http://a.ml/vocabularies/shapes#AnyShape", + "http://www.w3.org/ns/shacl#Shape", + "http://a.ml/vocabularies/shapes#Shape", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://www.w3.org/ns/shacl#name": "schema" + }, + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers%2F%7Bcustomer_id%7D%2Fcards%2Fdebit/supportedOperation/post/expects/request/parameter/parameter/query/account", + "@type": [ + "http://a.ml/vocabularies/apiContract#Parameter", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://a.ml/vocabularies/core#name": "account", + "http://a.ml/vocabularies/apiContract#paramName": "account", + "http://a.ml/vocabularies/core#description": "account id", + "http://a.ml/vocabularies/apiContract#required": false, + "http://a.ml/vocabularies/apiContract#binding": "query", + "http://a.ml/vocabularies/shapes#schema": { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers%2F%7Bcustomer_id%7D%2Fcards%2Fdebit/supportedOperation/post/expects/request/parameter/parameter/query/account/any/schema" + } + }, + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/web-api/endpoint/%2Fcustomers%2F%7Bcustomer_id%7D%2Fcards%2Fdebit/supportedOperation/post/expects/request/parameter/parameter/query/account/any/schema", + "@type": [ + "http://a.ml/vocabularies/shapes#AnyShape", + "http://www.w3.org/ns/shacl#Shape", + "http://a.ml/vocabularies/shapes#Shape", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://www.w3.org/ns/shacl#name": "schema", + "http://a.ml/vocabularies/core#description": "account id" + }, + { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json", + "@type": [ + "http://a.ml/vocabularies/document#Document", + "http://a.ml/vocabularies/document#Fragment", + "http://a.ml/vocabularies/document#Module", + "http://a.ml/vocabularies/document#Unit" + ], + "http://a.ml/vocabularies/document#encodes": { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json/web-api" + }, + "http://a.ml/vocabularies/document#root": true, + "http://a.ml/vocabularies/document#processingData": { + "@id": "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json#/BaseUnitProcessingData" + } + } + ] +} diff --git a/amf-cli/shared/src/test/scala/amf/cycle/RdfModelRoundTripTest.scala b/amf-cli/shared/src/test/scala/amf/cycle/RdfModelRoundTripTest.scala new file mode 100644 index 0000000000..4ffa5b8a68 --- /dev/null +++ b/amf-cli/shared/src/test/scala/amf/cycle/RdfModelRoundTripTest.scala @@ -0,0 +1,28 @@ +package amf.cycle + +import amf.apicontract.client.scala.OASConfiguration +import amf.core.client.scala.config.RenderOptions +import amf.core.client.scala.model.document.Document +import amf.rdf.client.scala.RdfUnitConverter +import org.scalatest.AsyncFunSuite +import amf.io.FileAssertionTest + +import scala.concurrent.{ExecutionContext, Future} + +class RdfModelRoundTripTest extends AsyncFunSuite with FileAssertionTest { + + override implicit val executionContext: ExecutionContext = ExecutionContext.Implicits.global + + test("oas 20 api rdf round trip results in correct model") { + val src = "file://amf-cli/shared/src/test/resources/rdf/apis/banking.json" + val golden = "file://amf-cli/shared/src/test/resources/rdf/apis/banking.jsonld" + + val client = OASConfiguration.OAS20().withRenderOptions(RenderOptions().withPrettyPrint).baseUnitClient() + val rendered: Future[String] = client.parse(src) map { result => + val rdfModel = RdfUnitConverter.toNativeRdfModel(result.baseUnit) + val roundTripBaseUnit = RdfUnitConverter.fromNativeRdfModel(result.baseUnit.id, rdfModel, OASConfiguration.OAS20()) + client.render(roundTripBaseUnit, "application/ld+json") + } + rendered.flatMap(content => writeTemporaryFile(golden)(content)).flatMap(assertDifferences(_, golden)) + } +} From 9a698ef55f2d1239991f637145d5285eb1529aa0 Mon Sep 17 00:00:00 2001 From: Agustin Bettati Date: Thu, 7 Oct 2021 18:05:46 -0300 Subject: [PATCH 21/46] APIMF-3472: moved rdf round trip test suite to jvm due to js differences --- .../src/test/scala/amf/cycle/RdfModelRoundTripTest.scala | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) rename amf-cli/{shared => jvm}/src/test/scala/amf/cycle/RdfModelRoundTripTest.scala (95%) diff --git a/amf-cli/shared/src/test/scala/amf/cycle/RdfModelRoundTripTest.scala b/amf-cli/jvm/src/test/scala/amf/cycle/RdfModelRoundTripTest.scala similarity index 95% rename from amf-cli/shared/src/test/scala/amf/cycle/RdfModelRoundTripTest.scala rename to amf-cli/jvm/src/test/scala/amf/cycle/RdfModelRoundTripTest.scala index 4ffa5b8a68..b2bcc29528 100644 --- a/amf-cli/shared/src/test/scala/amf/cycle/RdfModelRoundTripTest.scala +++ b/amf-cli/jvm/src/test/scala/amf/cycle/RdfModelRoundTripTest.scala @@ -2,10 +2,9 @@ package amf.cycle import amf.apicontract.client.scala.OASConfiguration import amf.core.client.scala.config.RenderOptions -import amf.core.client.scala.model.document.Document +import amf.io.FileAssertionTest import amf.rdf.client.scala.RdfUnitConverter import org.scalatest.AsyncFunSuite -import amf.io.FileAssertionTest import scala.concurrent.{ExecutionContext, Future} From 58e86b23697e59cce780c50928eaeb3c425a4fdb Mon Sep 17 00:00:00 2001 From: Nicolas Schejtman Date: Tue, 12 Oct 2021 11:29:32 -0300 Subject: [PATCH 22/46] APIMF-3469: fix unnecessary media type guessing --- .../internal/plugins/ApiContractFallbackPlugin.scala | 4 +--- .../test/resources/validations/json-examples/api.raml | 10 ++++++++++ .../resources/validations/json-examples/examples.raml | 11 +++++++++++ .../validation/ValidApiExamplesValidationTest.scala | 5 +++++ 4 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 amf-cli/shared/src/test/resources/validations/json-examples/api.raml create mode 100644 amf-cli/shared/src/test/resources/validations/json-examples/examples.raml diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/plugins/ApiContractFallbackPlugin.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/plugins/ApiContractFallbackPlugin.scala index b78b8d1225..f66e575758 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/plugins/ApiContractFallbackPlugin.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/plugins/ApiContractFallbackPlugin.scala @@ -18,8 +18,6 @@ import amf.core.internal.validation.CoreParserValidations.{CantReferenceSpecInFi case class ApiContractFallbackPlugin(strict: Boolean = true, skipWarnings: Boolean = false) extends DomainParsingFallback { - private def docMediaType(doc: Root) = if (doc.raw.isJson) `application/json` else `application/yaml` - override def chooseFallback(root: Root, availablePlugins: Seq[AMFParsePlugin], isRoot: Boolean): AMFParsePlugin = { if (strict && isRoot) throw UnsupportedDomainForDocumentException(root.location) root.parsed match { @@ -40,7 +38,7 @@ case class ApiContractFallbackPlugin(strict: Boolean = true, skipWarnings: Boole ExternalDomainElement(Annotations(parsed.document)) .withId(document.location + "#/") .withRaw(document.raw) - .withMediaType(docMediaType(document)) + .withMediaType(document.mediatype) result.parsed = Some(parsed.document.node) val references = document.references.map(_.unit) val fragment = ExternalFragment() diff --git a/amf-cli/shared/src/test/resources/validations/json-examples/api.raml b/amf-cli/shared/src/test/resources/validations/json-examples/api.raml new file mode 100644 index 0000000000..10ed86e243 --- /dev/null +++ b/amf-cli/shared/src/test/resources/validations/json-examples/api.raml @@ -0,0 +1,10 @@ +#%RAML 1.0 +title: API +version: 1.0 +/endpoint: + get: + responses: + 200: + body: + application/json: + examples: !include examples.raml \ No newline at end of file diff --git a/amf-cli/shared/src/test/resources/validations/json-examples/examples.raml b/amf-cli/shared/src/test/resources/validations/json-examples/examples.raml new file mode 100644 index 0000000000..aeb91be946 --- /dev/null +++ b/amf-cli/shared/src/test/resources/validations/json-examples/examples.raml @@ -0,0 +1,11 @@ +{ + "example1": { + "property": 1 + }, + "example2": { + "property": 1 + }, + "example3": { + "property": 1 + } +} \ No newline at end of file diff --git a/amf-cli/shared/src/test/scala/amf/validation/ValidApiExamplesValidationTest.scala b/amf-cli/shared/src/test/scala/amf/validation/ValidApiExamplesValidationTest.scala index 38b3581457..49386f4059 100644 --- a/amf-cli/shared/src/test/scala/amf/validation/ValidApiExamplesValidationTest.scala +++ b/amf-cli/shared/src/test/scala/amf/validation/ValidApiExamplesValidationTest.scala @@ -260,5 +260,10 @@ class ValidApiExamplesValidationTest extends ValidModelTest { checkValid("/complex-multiple-recursions-calfa.raml") } + test("Test API with JSON examples") { + checkValid("/json-examples/api.raml") + + } + override val hint: Hint = Raml10YamlHint } From 8a148d21c19e41d67745d37cedbd057ca46571da Mon Sep 17 00:00:00 2001 From: Tomas Fernandez Date: Mon, 4 Oct 2021 16:21:00 -0300 Subject: [PATCH 23/46] ProfileName is received by constructor in plugins, registered profile together with effective validations to avoid performance impact. --- .../client/scala/AMFConfiguration.scala | 72 ++++++++++++++----- .../model/ApiValidationProfiles.scala | 21 ++++++ .../payload/PayloadValidationPlugin.scala | 23 ++++-- .../plugin/BaseApiValidationPlugin.scala | 16 ++++- .../shacl/ShaclModelValidationPlugin.scala | 21 +++--- .../ViolationModelValidationPlugin.scala | 10 +-- .../report.report | 2 +- .../scala/amf/compiler/AMFCompilerTest.scala | 13 ++-- .../ConfiguredValidationSetupTest.scala | 49 +++++++++++++ .../client/scala/ShapesConfiguration.scala | 6 ++ 10 files changed, 188 insertions(+), 45 deletions(-) create mode 100644 amf-cli/shared/src/test/scala/amf/configuration/ConfiguredValidationSetupTest.scala 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 3baa28edc1..cde1138438 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 @@ -1,8 +1,7 @@ package amf.apicontract.client.scala import amf.aml.client.scala.AMLConfiguration -import amf.aml.client.scala.model.document.Dialect -import amf.aml.client.scala.model.document.DialectInstance +import amf.aml.client.scala.model.document.{Dialect, DialectInstance} import amf.apicontract.internal.annotations.{APISerializableAnnotations, WebAPISerializableAnnotations} import amf.apicontract.internal.convert.ApiRegister import amf.apicontract.internal.entities.{APIEntities, FragmentEntities} @@ -17,9 +16,12 @@ import amf.apicontract.internal.transformation.compatibility.{ Raml08CompatibilityPipeline, Raml10CompatibilityPipeline } +import amf.apicontract.internal.validation.model.ApiEffectiveValidations._ import amf.apicontract.internal.validation.model.ApiValidationProfiles._ import amf.apicontract.internal.validation.payload.PayloadValidationPlugin import amf.apicontract.internal.validation.shacl.{ShaclModelValidationPlugin, ViolationModelValidationPlugin} +import amf.core.client.common.validation.ProfileNames._ +import amf.core.client.common.validation.{ProfileName, ProfileNames} import amf.core.client.scala.AMFGraphConfiguration import amf.core.client.scala.config._ import amf.core.client.scala.errorhandling.ErrorHandlerProvider @@ -33,6 +35,7 @@ import amf.core.internal.plugins.parse.DomainParsingFallback import amf.core.internal.registries.AMFRegistry import amf.core.internal.remote.Spec import amf.core.internal.resource.AMFResolvers +import amf.core.internal.validation.EffectiveValidations import amf.core.internal.validation.core.ValidationProfile import amf.shapes.client.scala.ShapesConfiguration import amf.shapes.client.scala.plugin.JsonSchemaShapePayloadValidationPlugin @@ -63,11 +66,9 @@ trait APIConfigurationBuilder { APISerializableAnnotations.annotations ++ WebAPISerializableAnnotations.annotations ++ ShapeSerializableAnnotations.annotations), configuration.listeners, configuration.options - ).withPlugins( - List( - PayloadValidationPlugin(), - JsonSchemaShapePayloadValidationPlugin - )) + ).withPlugins(List( + JsonSchemaShapePayloadValidationPlugin + )) .withFallback(ApiContractFallbackPlugin()) result } @@ -93,8 +94,14 @@ object RAMLConfiguration extends APIConfigurationBuilder { def RAML10(): AMFConfiguration = common() - .withPlugins(List(Raml10ParsePlugin, Raml10RenderPlugin, Raml10ElementRenderPlugin, ShaclModelValidationPlugin)) - .withValidationProfile(Raml10ValidationProfile) + .withPlugins(List( + Raml10ParsePlugin, + Raml10RenderPlugin, + Raml10ElementRenderPlugin, + ShaclModelValidationPlugin(ProfileNames.RAML10), + PayloadValidationPlugin(ProfileNames.RAML10) + )) + .withValidationProfile(Raml10ValidationProfile, Raml10EffectiveValidations) .withTransformationPipelines( List( Raml10TransformationPipeline(), @@ -104,8 +111,14 @@ object RAMLConfiguration extends APIConfigurationBuilder { )) def RAML08(): AMFConfiguration = common() - .withPlugins(List(Raml08ParsePlugin, Raml08RenderPlugin, Raml08ElementRenderPlugin, ShaclModelValidationPlugin)) - .withValidationProfile(Raml08ValidationProfile) + .withPlugins(List( + Raml08ParsePlugin, + Raml08RenderPlugin, + Raml08ElementRenderPlugin, + ShaclModelValidationPlugin(ProfileNames.RAML08), + PayloadValidationPlugin(ProfileNames.RAML08) + )) + .withValidationProfile(Raml08ValidationProfile, Raml08EffectiveValidations) .withTransformationPipelines( List( Raml08TransformationPipeline(), @@ -141,8 +154,14 @@ object OASConfiguration extends APIConfigurationBuilder { def OAS20(): AMFConfiguration = common() - .withPlugins(List(Oas20ParsePlugin, Oas20RenderPlugin, Oas20ElementRenderPlugin, ShaclModelValidationPlugin)) - .withValidationProfile(Oas20ValidationProfile) + .withPlugins(List( + Oas20ParsePlugin, + Oas20RenderPlugin, + Oas20ElementRenderPlugin, + ShaclModelValidationPlugin(ProfileNames.OAS20), + PayloadValidationPlugin(ProfileNames.OAS20) + )) + .withValidationProfile(Oas20ValidationProfile, Oas20EffectiveValidations) .withTransformationPipelines( List( Oas20TransformationPipeline(), @@ -150,10 +169,17 @@ object OASConfiguration extends APIConfigurationBuilder { Oas20CompatibilityPipeline(), Oas20CachePipeline() )) + def OAS30(): AMFConfiguration = common() - .withPlugins(List(Oas30ParsePlugin, Oas30RenderPlugin, Oas30ElementRenderPlugin, ShaclModelValidationPlugin)) - .withValidationProfile(Oas30ValidationProfile) + .withPlugins(List( + Oas30ParsePlugin, + Oas30RenderPlugin, + Oas30ElementRenderPlugin, + ShaclModelValidationPlugin(ProfileNames.OAS30), + PayloadValidationPlugin(ProfileNames.OAS30) + )) + .withValidationProfile(Oas30ValidationProfile, Oas30EffectiveValidations) .withTransformationPipelines( List( Oas30TransformationPipeline(), @@ -217,8 +243,15 @@ object AsyncAPIConfiguration extends APIConfigurationBuilder { def Async20(): AMFConfiguration = common() .withPlugins( - List(Async20ParsePlugin, Async20RenderPlugin, Async20ElementRenderPlugin, ShaclModelValidationPlugin)) - .withValidationProfile(Async20ValidationProfile) + List( + Async20ParsePlugin, + Async20RenderPlugin, + Async20ElementRenderPlugin, + ShaclModelValidationPlugin(ASYNC20), + PayloadValidationPlugin(ASYNC20) + ) + ) + .withValidationProfile(Async20ValidationProfile, Async20EffectiveValidations) .withTransformationPipelines( List( Async20TransformationPipeline(), @@ -321,6 +354,11 @@ class AMFConfiguration private[amf] (override private[amf] val resolvers: AMFRes private[amf] override def withValidationProfile(profile: ValidationProfile): AMFConfiguration = super._withValidationProfile(profile) + // Keep AMF internal, done to avoid recomputing validations every time a config is requested + private[amf] override def withValidationProfile(profile: ValidationProfile, + effective: EffectiveValidations): AMFConfiguration = + super._withValidationProfile(profile, effective) + /** * Add a [[TransformationPipeline]] * @param pipeline [[TransformationPipeline]] to add to configuration object diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/validation/model/ApiValidationProfiles.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/validation/model/ApiValidationProfiles.scala index 2b0aacd084..90034d33f7 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/validation/model/ApiValidationProfiles.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/validation/model/ApiValidationProfiles.scala @@ -1,8 +1,17 @@ package amf.apicontract.internal.validation.model import amf.apicontract.internal.validation.model.AMFRawValidations._ +import amf.apicontract.internal.validation.model.ApiValidationProfiles.{ + AmfValidationProfile, + Async20ValidationProfile, + Oas20ValidationProfile, + Oas30ValidationProfile, + Raml08ValidationProfile, + Raml10ValidationProfile +} import amf.apicontract.internal.validation.model.DefaultAMFValidations.buildProfileFrom import amf.core.client.common.validation._ +import amf.core.internal.validation.EffectiveValidations import amf.core.internal.validation.core.ValidationProfile object ApiValidationProfiles { @@ -27,3 +36,15 @@ object ApiValidationProfiles { def profile(name: ProfileName): Option[ValidationProfile] = apiProfiles.get(name) } + +object ApiEffectiveValidations { + val Raml08EffectiveValidations: EffectiveValidations = EffectiveValidations().someEffective(Raml08ValidationProfile) + val Raml10EffectiveValidations: EffectiveValidations = EffectiveValidations().someEffective(Raml10ValidationProfile) + + val Oas20EffectiveValidations: EffectiveValidations = EffectiveValidations().someEffective(Oas20ValidationProfile) + val Oas30EffectiveValidations: EffectiveValidations = EffectiveValidations().someEffective(Oas30ValidationProfile) + + val Async20EffectiveValidations: EffectiveValidations = + EffectiveValidations().someEffective(Async20ValidationProfile) + val AmfEffectiveValidations: EffectiveValidations = EffectiveValidations().someEffective(AmfValidationProfile) +} diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/validation/payload/PayloadValidationPlugin.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/validation/payload/PayloadValidationPlugin.scala index 7d00f4d7fd..3e511a3203 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/validation/payload/PayloadValidationPlugin.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/validation/payload/PayloadValidationPlugin.scala @@ -1,6 +1,11 @@ package amf.apicontract.internal.validation.payload -import amf.apicontract.internal.validation.payload.collector.{EnumInShapesCollector, ExtensionsCollector, PayloadsInApiCollector, ShapeFacetsCollector} +import amf.apicontract.internal.validation.payload.collector.{ + EnumInShapesCollector, + ExtensionsCollector, + PayloadsInApiCollector, + ShapeFacetsCollector +} import amf.apicontract.internal.validation.plugin.{AmlAware, BaseApiValidationPlugin} import amf.core.client.common.validation.ProfileName import amf.core.client.scala.model.document.BaseUnit @@ -14,22 +19,28 @@ object PayloadValidationPlugin { protected val id: String = this.getClass.getSimpleName - def apply() = new PayloadValidationPlugin() + def apply(profile: ProfileName) = new PayloadValidationPlugin(profile) } -class PayloadValidationPlugin extends BaseApiValidationPlugin with AmlAware with ShaclReportAdaptation { +class PayloadValidationPlugin(val profile: ProfileName) + extends BaseApiValidationPlugin + with AmlAware + with ShaclReportAdaptation { + override val id: String = PayloadValidationPlugin.id override def applies(element: ValidationInfo): Boolean = super.applies(element) - override protected def specificValidate(unit: BaseUnit, profile: ProfileName, options: ValidationOptions)( + override protected def specificValidate(unit: BaseUnit, options: ValidationOptions)( implicit executionContext: ExecutionContext): Future[AMFValidationReport] = { - val collectors = Seq(PayloadsInApiCollector, EnumInShapesCollector, ShapeFacetsCollector, ExtensionsCollector) + val collectors = Seq(PayloadsInApiCollector, EnumInShapesCollector, ShapeFacetsCollector, ExtensionsCollector) + val validations = effectiveOrException(options.config, profile) + UnitPayloadsValidation(unit, collectors) .validate(options.config) .map { results => val mappedSeverityResults = results.flatMap { result => - buildValidationWithCustomLevelForProfile(result, options.effectiveValidations) + buildValidationWithCustomLevelForProfile(result, validations) } AMFValidationReport(unit.id, profile, mappedSeverityResults) } diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/validation/plugin/BaseApiValidationPlugin.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/validation/plugin/BaseApiValidationPlugin.scala index c349384d3b..57b675f45a 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/validation/plugin/BaseApiValidationPlugin.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/validation/plugin/BaseApiValidationPlugin.scala @@ -5,9 +5,13 @@ import amf.core.client.common.{HighPriority, NormalPriority, PluginPriority} import amf.core.client.scala.model.document.BaseUnit import amf.core.client.scala.validation.AMFValidationReport import amf.core.internal.plugins.validation.{AMFValidatePlugin, ValidationInfo, ValidationOptions, ValidationResult} +import amf.core.internal.validation.{EffectiveValidations, ValidationConfiguration} import scala.concurrent.{ExecutionContext, Future} +case class ProfileNotFoundException(profile: ProfileName) + extends Exception(s"No Validation Profile in configuration for ${profile.profile}") + object BaseApiValidationPlugin { val standardApiProfiles = Seq(Raml08Profile, Raml10Profile, Oas20Profile, Oas30Profile, Async20Profile, AsyncProfile, AmfProfile) @@ -17,15 +21,17 @@ trait BaseApiValidationPlugin extends AMFValidatePlugin with ModelResolution wit override def priority: PluginPriority = NormalPriority + protected def profile: ProfileName + override def applies(element: ValidationInfo): Boolean = !isAmlUnit(element.baseUnit) override def validate(unit: BaseUnit, options: ValidationOptions)( implicit executionContext: ExecutionContext): Future[ValidationResult] = { - withResolvedModel(unit, options.profile, options.config) { (resolvedUnit, resolutionReport) => + withResolvedModel(unit, profile, options.config) { (resolvedUnit, resolutionReport) => val report = resolutionReport match { case Some(report) if !report.conforms => Future.successful(report) case _ => - specificValidate(resolvedUnit, options.profile, options).map { validationStepReport => + specificValidate(resolvedUnit, options).map { validationStepReport => resolutionReport.map(_.merge(validationStepReport)).getOrElse(validationStepReport) } } @@ -33,6 +39,10 @@ trait BaseApiValidationPlugin extends AMFValidatePlugin with ModelResolution wit } } - protected def specificValidate(unit: BaseUnit, profile: ProfileName, options: ValidationOptions)( + protected def specificValidate(unit: BaseUnit, options: ValidationOptions)( implicit executionContext: ExecutionContext): Future[AMFValidationReport] + + protected def effectiveOrException(config: ValidationConfiguration, profile: ProfileName): EffectiveValidations = { + config.effectiveValidations.getOrElse(profile, throw ProfileNotFoundException(profile)) + } } diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/validation/shacl/ShaclModelValidationPlugin.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/validation/shacl/ShaclModelValidationPlugin.scala index 3e987596b2..0c44573798 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/validation/shacl/ShaclModelValidationPlugin.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/validation/shacl/ShaclModelValidationPlugin.scala @@ -6,34 +6,35 @@ import amf.core.client.common.validation.ProfileName import amf.core.client.scala.model.document.BaseUnit import amf.core.client.scala.validation.AMFValidationReport import amf.core.internal.plugins.validation.{ValidationInfo, ValidationOptions} -import amf.core.internal.validation.ShaclReportAdaptation +import amf.core.internal.validation.{EffectiveValidations, ShaclReportAdaptation} import amf.validation.internal.shacl.custom.CustomShaclValidator import amf.validation.internal.shacl.custom.CustomShaclValidator.CustomShaclFunctions import scala.concurrent.{ExecutionContext, Future} -object ShaclModelValidationPlugin extends BaseApiValidationPlugin with ShaclReportAdaptation { +case class ShaclModelValidationPlugin(profile: ProfileName) + extends BaseApiValidationPlugin + with ShaclReportAdaptation { override val id: String = this.getClass.getSimpleName override def priority: PluginPriority = HighPriority - override protected def specificValidate(unit: BaseUnit, profile: ProfileName, options: ValidationOptions)( + override protected def specificValidate(unit: BaseUnit, options: ValidationOptions)( implicit executionContext: ExecutionContext): Future[AMFValidationReport] = { - validateWithShacl(unit, profile, options) + validateWithShacl(unit, options: ValidationOptions) } - private def validateWithShacl(unit: BaseUnit, profile: ProfileName, options: ValidationOptions)( + private def validateWithShacl(unit: BaseUnit, options: ValidationOptions)( implicit executionContext: ExecutionContext): Future[AMFValidationReport] = { - val shaclOptions = DefaultShaclOptions(options.config.amfConfig.listeners.toSeq) - .withMessageStyle(profile.messageStyle) - val validator = new CustomShaclValidator(functions, profile.messageStyle) + val validator = new CustomShaclValidator(functions, profile.messageStyle) + val validations = effectiveOrException(options.config, profile) validator - .validate(unit, options.effectiveValidations.effective.values.toSeq) + .validate(unit, validations.effective.values.toSeq) .map { report => - adaptToAmfReport(unit, profile, report, options.effectiveValidations) + adaptToAmfReport(unit, profile, report, validations) } } diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/validation/shacl/ViolationModelValidationPlugin.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/validation/shacl/ViolationModelValidationPlugin.scala index 0f1abde04b..f75b4a44e2 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/validation/shacl/ViolationModelValidationPlugin.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/validation/shacl/ViolationModelValidationPlugin.scala @@ -1,7 +1,7 @@ package amf.apicontract.internal.validation.shacl import amf.apicontract.internal.validation.plugin.BaseApiValidationPlugin -import amf.core.client.common.validation.{ProfileName, SeverityLevels} +import amf.core.client.common.validation.{ProfileName, ProfileNames, SeverityLevels, UnknownProfile} import amf.core.client.common.{NormalPriority, PluginPriority} import amf.core.client.scala.model.document.BaseUnit import amf.core.client.scala.validation.{AMFValidationReport, AMFValidationResult} @@ -14,16 +14,18 @@ case class ViolationModelValidationPlugin(configName: String) extends BaseApiVal override def priority: PluginPriority = NormalPriority + override protected def profile: ProfileName = ProfileNames.AMF + override def validate(unit: BaseUnit, options: ValidationOptions)( implicit executionContext: ExecutionContext): Future[ValidationResult] = { - specificValidate(unit, options.profile, options).map { report => + specificValidate(unit, options).map { report => ValidationResult(unit, report) } } - override protected def specificValidate(unit: BaseUnit, profile: ProfileName, options: ValidationOptions)( + override protected def specificValidate(unit: BaseUnit, options: ValidationOptions)( implicit executionContext: ExecutionContext): Future[AMFValidationReport] = { - Future.successful { AMFValidationReport(unit.id, options.profile, Seq(validationResult)) } + Future.successful { AMFValidationReport(unit.id, UnknownProfile, Seq(validationResult)) } } private def validationResult: AMFValidationResult = AMFValidationResult( diff --git a/amf-cli/shared/src/test/resources/configuration/validation/unrecognized-guess-root-fallback/report.report b/amf-cli/shared/src/test/resources/configuration/validation/unrecognized-guess-root-fallback/report.report index 0963908935..88e841e0ca 100644 --- a/amf-cli/shared/src/test/resources/configuration/validation/unrecognized-guess-root-fallback/report.report +++ b/amf-cli/shared/src/test/resources/configuration/validation/unrecognized-guess-root-fallback/report.report @@ -1,5 +1,5 @@ ModelId: file://amf-cli/shared/src/test/resources/configuration/validation/unrecognized-guess-root-fallback/api.raml -Profile: AMF Graph +Profile: Conforms: true Number of results: 1 diff --git a/amf-cli/shared/src/test/scala/amf/compiler/AMFCompilerTest.scala b/amf-cli/shared/src/test/scala/amf/compiler/AMFCompilerTest.scala index 4800e5b5f0..94895b0d79 100644 --- a/amf-cli/shared/src/test/scala/amf/compiler/AMFCompilerTest.scala +++ b/amf-cli/shared/src/test/scala/amf/compiler/AMFCompilerTest.scala @@ -1,6 +1,12 @@ package amf.compiler -import amf.apicontract.client.scala.{AMFConfiguration, APIConfiguration, AsyncAPIConfiguration, WebAPIConfiguration} +import amf.apicontract.client.scala.{ + AMFConfiguration, + APIConfiguration, + AsyncAPIConfiguration, + RAMLConfiguration, + WebAPIConfiguration +} import amf.apicontract.client.scala.model.domain.api.WebApi import amf.core.client.common.validation.Raml10Profile import amf.core.client.scala.errorhandling.{DefaultErrorHandler, IgnoringErrorHandler, UnhandledErrorHandler} @@ -102,9 +108,8 @@ class AMFCompilerTest extends AsyncFunSuite with CompilerTestBuilder { } test("Non existing included file") { - val eh = DefaultErrorHandler() - val amfConfig = - APIConfiguration.API().withErrorHandlerProvider(() => eh) + val eh = DefaultErrorHandler() + val amfConfig = RAMLConfiguration.RAML10().withErrorHandlerProvider(() => eh) build("file://amf-cli/shared/src/test/resources/non-exists-include.raml", Raml10YamlHint, amfConfig, None) .flatMap(bu => { AMFValidator.validate(bu, amfConfig) diff --git a/amf-cli/shared/src/test/scala/amf/configuration/ConfiguredValidationSetupTest.scala b/amf-cli/shared/src/test/scala/amf/configuration/ConfiguredValidationSetupTest.scala new file mode 100644 index 0000000000..670579aab3 --- /dev/null +++ b/amf-cli/shared/src/test/scala/amf/configuration/ConfiguredValidationSetupTest.scala @@ -0,0 +1,49 @@ +package amf.configuration + +import amf.apicontract.client.scala.model.domain.api.WebApi +import amf.core.client.common.validation.{Async20Profile, Oas20Profile, Oas30Profile, Raml08Profile, Raml10Profile} +import amf.core.client.scala.model.document.Document + +import scala.concurrent.ExecutionContext + +class ConfiguredValidationSetupTest extends ConfigurationSetupTest { + + implicit override val executionContext: ExecutionContext = ExecutionContext.Implicits.global + + private val model = Document() + .withId("someId") + .withEncodes( + WebApi() + .withName("something") + ) + + test("Model without source spec can be validated with RAML 1.0 config") { + raml10Config.baseUnitClient().validate(model).map { report => + report.profile shouldEqual Raml10Profile + } + } + + test("Model without source spec can be validated with RAML 0.8 config") { + raml08Config.baseUnitClient().validate(model).map { report => + report.profile shouldEqual Raml08Profile + } + } + + test("Model without source spec can be validated with OAS 2.0 config") { + oas20Config.baseUnitClient().validate(model).map { report => + report.profile shouldEqual Oas20Profile + } + } + + test("Model without source spec can be validated with OAS 3.0 config") { + oas30Config.baseUnitClient().validate(model).map { report => + report.profile shouldEqual Oas30Profile + } + } + + test("Model without source spec can be validated with ASYNC 2.0 config") { + async20Config.baseUnitClient().validate(model).map { report => + report.profile shouldEqual Async20Profile + } + } +} diff --git a/amf-shapes/shared/src/main/scala/amf/shapes/client/scala/ShapesConfiguration.scala b/amf-shapes/shared/src/main/scala/amf/shapes/client/scala/ShapesConfiguration.scala index a234cda9d5..c2c5b7c1d3 100644 --- a/amf-shapes/shared/src/main/scala/amf/shapes/client/scala/ShapesConfiguration.scala +++ b/amf-shapes/shared/src/main/scala/amf/shapes/client/scala/ShapesConfiguration.scala @@ -18,6 +18,7 @@ import amf.core.internal.plugins.AMFPlugin import amf.core.internal.plugins.parse.DomainParsingFallback import amf.core.internal.registries.AMFRegistry import amf.core.internal.resource.AMFResolvers +import amf.core.internal.validation.EffectiveValidations import amf.core.internal.validation.core.ValidationProfile import amf.shapes.client.scala.plugin.JsonSchemaShapePayloadValidationPlugin import amf.shapes.internal.annotations.ShapeSerializableAnnotations @@ -102,6 +103,11 @@ class ShapesConfiguration private[amf] (override private[amf] val resolvers: AMF private[amf] override def withValidationProfile(profile: ValidationProfile): ShapesConfiguration = super._withValidationProfile(profile) + // Keep AMF internal, done to avoid recomputing validations every time a config is requested + private[amf] override def withValidationProfile(profile: ValidationProfile, + effective: EffectiveValidations): ShapesConfiguration = + super._withValidationProfile(profile, effective) + /** * Add a [[TransformationPipeline]] * @param pipeline [[TransformationPipeline]] to add to configuration object From ef1c0e026ec4a3a73c40122c132d592f4765bab8 Mon Sep 17 00:00:00 2001 From: Agustin Bettati Date: Tue, 12 Oct 2021 21:02:28 -0300 Subject: [PATCH 24/46] APIMF-3482: adjust validation that was not present in editing to warning --- .../stage/MediaTypeResolutionStage.scala | 2 +- .../ResolutionSideValidations.scala | 3 +- .../raml10/request-with-type-file.raml | 37 +++++++++++++++++++ .../model/file-parameter-no-consumes.report | 6 +-- ...ion-file-parameter-invalid-consumes.report | 6 +-- ...ath-file-parameter-invalid-consumes.report | 8 ++-- .../CompatibilityCycledValidationTest.scala | 9 +++-- 7 files changed, 56 insertions(+), 15 deletions(-) create mode 100644 amf-cli/shared/src/test/resources/compatibility/raml10/request-with-type-file.raml diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/common/transformation/stage/MediaTypeResolutionStage.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/common/transformation/stage/MediaTypeResolutionStage.scala index 7c1dfa2b25..9ed1512e6f 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/common/transformation/stage/MediaTypeResolutionStage.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/common/transformation/stage/MediaTypeResolutionStage.scala @@ -162,7 +162,7 @@ class MediaTypeResolutionStage(profile: ProfileName, } private def mediaTypeError(prop: PropertyShape)(implicit errorHandler: AMFErrorHandler): Unit = - errorHandler.violation( + errorHandler.warning( InvalidConsumesWithFileParameter, prop.id, "Consumes must be either 'multipart/form-data', 'application/x-www-form-urlencoded', or both when a file parameter is present", diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/validation/definitions/ResolutionSideValidations.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/validation/definitions/ResolutionSideValidations.scala index f3b6c4b555..011a4b15e6 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/validation/definitions/ResolutionSideValidations.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/validation/definitions/ResolutionSideValidations.scala @@ -63,7 +63,8 @@ object ResolutionSideValidations extends Validations { ) override val levels: Map[String, Map[ProfileName, String]] = Map( - InvalidTypeInheritanceWarningSpecification.id -> all(WARNING) + InvalidTypeInheritanceWarningSpecification.id -> all(WARNING), + InvalidConsumesWithFileParameter.id -> all(WARNING) ) override val validations: List[ValidationSpecification] = List( diff --git a/amf-cli/shared/src/test/resources/compatibility/raml10/request-with-type-file.raml b/amf-cli/shared/src/test/resources/compatibility/raml10/request-with-type-file.raml new file mode 100644 index 0000000000..4329b09e25 --- /dev/null +++ b/amf-cli/shared/src/test/resources/compatibility/raml10/request-with-type-file.raml @@ -0,0 +1,37 @@ +#%RAML 1.0 +title: "Some title" +version: "1.0" +protocols: +- "HTTP" +mediaType: +- "*/*" + + +/pdfmarkup/v1/documents/prepareForPrint: + post: + body: + application/vnd.adobe.xfdf: + type: file + responses: + 200: + body: + application/json: + type: object +/model: + description: Project model + post: + body: + "*/*": + properties: + file: + description: The file that contains the project sources + type: file + innerBasePath: + description: The path inside the project sources file to use as base dir + type: string + required: false + responses: + 200: + description: A project model + body: + application/json: diff --git a/amf-cli/shared/src/test/resources/validations/reports/model/file-parameter-no-consumes.report b/amf-cli/shared/src/test/resources/validations/reports/model/file-parameter-no-consumes.report index f66f11b1a7..357596e48e 100644 --- a/amf-cli/shared/src/test/resources/validations/reports/model/file-parameter-no-consumes.report +++ b/amf-cli/shared/src/test/resources/validations/reports/model/file-parameter-no-consumes.report @@ -1,13 +1,13 @@ ModelId: file://amf-cli/shared/src/test/resources/validations/file-parameter-consumes/no-consumes-defined.json Profile: OAS 2.0 -Conforms: false +Conforms: true Number of results: 1 -Level: Violation +Level: Warning - Constraint: http://a.ml/vocabularies/amf/resolution#invalid-consumes-with-file-parameter Message: Consumes must be either 'multipart/form-data', 'application/x-www-form-urlencoded', or both when a file parameter is present - Severity: Violation + Severity: Warning Target: file://amf-cli/shared/src/test/resources/validations/file-parameter-consumes/no-consumes-defined.json#/web-api/endpoint/%2FaPath/supportedOperation/post/expects/request/payload/formData/shape/formData/property/property/file-parameter Property: Range: [(11,10)-(15,11)] diff --git a/amf-cli/shared/src/test/resources/validations/reports/model/operation-file-parameter-invalid-consumes.report b/amf-cli/shared/src/test/resources/validations/reports/model/operation-file-parameter-invalid-consumes.report index b210ae4df3..c54c05a639 100644 --- a/amf-cli/shared/src/test/resources/validations/reports/model/operation-file-parameter-invalid-consumes.report +++ b/amf-cli/shared/src/test/resources/validations/reports/model/operation-file-parameter-invalid-consumes.report @@ -1,13 +1,13 @@ ModelId: file://amf-cli/shared/src/test/resources/validations/file-parameter-consumes/parameter-in-operation.json Profile: OAS 2.0 -Conforms: false +Conforms: true Number of results: 1 -Level: Violation +Level: Warning - Constraint: http://a.ml/vocabularies/amf/resolution#invalid-consumes-with-file-parameter Message: Consumes must be either 'multipart/form-data', 'application/x-www-form-urlencoded', or both when a file parameter is present - Severity: Violation + Severity: Warning Target: file://amf-cli/shared/src/test/resources/validations/file-parameter-consumes/parameter-in-operation.json#/web-api/endpoint/%2FaPath/supportedOperation/post/expects/request/payload/formData/shape/formData/property/property/file-parameter Property: Range: [(12,10)-(17,11)] diff --git a/amf-cli/shared/src/test/resources/validations/reports/model/path-file-parameter-invalid-consumes.report b/amf-cli/shared/src/test/resources/validations/reports/model/path-file-parameter-invalid-consumes.report index 717c7f6494..cee2e16b05 100644 --- a/amf-cli/shared/src/test/resources/validations/reports/model/path-file-parameter-invalid-consumes.report +++ b/amf-cli/shared/src/test/resources/validations/reports/model/path-file-parameter-invalid-consumes.report @@ -1,13 +1,13 @@ ModelId: file://amf-cli/shared/src/test/resources/validations/file-parameter-consumes/parameter-in-path.json Profile: OAS 2.0 -Conforms: false +Conforms: true Number of results: 2 -Level: Violation +Level: Warning - Constraint: http://a.ml/vocabularies/amf/resolution#invalid-consumes-with-file-parameter Message: Consumes must be either 'multipart/form-data', 'application/x-www-form-urlencoded', or both when a file parameter is present - Severity: Violation + Severity: Warning Target: file://amf-cli/shared/src/test/resources/validations/file-parameter-consumes/parameter-in-path.json#/web-api/endpoint/%2FaPath/payload/formData/shape/formData/property/property/file-parameter Property: Range: [(10,8)-(15,9)] @@ -15,7 +15,7 @@ Level: Violation - Constraint: http://a.ml/vocabularies/amf/resolution#invalid-consumes-with-file-parameter Message: Consumes must be either 'multipart/form-data', 'application/x-www-form-urlencoded', or both when a file parameter is present - Severity: Violation + Severity: Warning Target: file://amf-cli/shared/src/test/resources/validations/file-parameter-consumes/parameter-in-path.json#/web-api/endpoint/%2FaPath/payload/formData/shape/formData/property/property/second-file-parameter Property: Range: [(16,8)-(21,9)] diff --git a/amf-cli/shared/src/test/scala/amf/emit/CompatibilityCycledValidationTest.scala b/amf-cli/shared/src/test/scala/amf/emit/CompatibilityCycledValidationTest.scala index 4bb198c5ae..c8b9568600 100644 --- a/amf-cli/shared/src/test/scala/amf/emit/CompatibilityCycledValidationTest.scala +++ b/amf-cli/shared/src/test/scala/amf/emit/CompatibilityCycledValidationTest.scala @@ -88,11 +88,14 @@ trait CompatibilityCycle extends FunSuiteCycleTests with Matchers with PlatformS } override def transform(unit: BaseUnit, config: CycleConfig, amfConfig: AMFConfiguration): BaseUnit = { - amfConfig - .withErrorHandlerProvider(() => UnhandledErrorHandler) + val result = amfConfig + .withErrorHandlerProvider(() => DefaultErrorHandler()) .baseUnitClient() .transform(unit, PipelineId.Compatibility) - .baseUnit + if(!result.conforms) { + throw new RuntimeException(s"Compatibility transformation does not conform: ${result.results.head.message}") + } + result.baseUnit } private def profile(spec: Spec): ProfileName = spec match { From 18d14b259a616115cfb042c1fa23cc20f5544d93 Mon Sep 17 00:00:00 2001 From: Agustin Bettati Date: Wed, 13 Oct 2021 14:29:11 -0300 Subject: [PATCH 25/46] APIMF-3482: define valid media types in raml -> oas 2.0 conversion when type file is present in request body --- .../Oas20CompatibilityPipeline.scala | 5 ++- .../oas3/SetValidConsumesForFileParam.scala | 31 ++++++++++++++ .../oas20/request-with-type-file-in-body.json | 40 +++++++++++++++++++ .../request-with-type-file-in-body.raml | 18 +++++++++ .../CompatibilityCycleGoldenTest.scala | 8 ++++ 5 files changed, 100 insertions(+), 2 deletions(-) create mode 100644 amf-api-contract/shared/src/main/scala/amf/apicontract/internal/transformation/compatibility/oas3/SetValidConsumesForFileParam.scala create mode 100644 amf-cli/shared/src/test/resources/compatibility/cycled-apis/oas20/request-with-type-file-in-body.json create mode 100644 amf-cli/shared/src/test/resources/compatibility/raml10/request-with-type-file-in-body.raml diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/transformation/compatibility/Oas20CompatibilityPipeline.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/transformation/compatibility/Oas20CompatibilityPipeline.scala index 9da9323745..6dcce4d12b 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/transformation/compatibility/Oas20CompatibilityPipeline.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/transformation/compatibility/Oas20CompatibilityPipeline.scala @@ -2,7 +2,7 @@ package amf.apicontract.internal.transformation.compatibility import amf.apicontract.internal.transformation.Oas20TransformationPipeline import amf.apicontract.internal.transformation.compatibility.oas._ -import amf.apicontract.internal.transformation.compatibility.oas3.CleanRepeatedOperationIds +import amf.apicontract.internal.transformation.compatibility.oas3.{CleanRepeatedOperationIds, SetValidConsumesForFileParam} import amf.core.client.common.transform._ import amf.core.client.scala.transform.{TransformationPipeline, TransformationStep} import amf.core.internal.remote.Oas20 @@ -21,7 +21,8 @@ class Oas20CompatibilityPipeline private (override val name: String) extends Tra new CleanNullSecurity(), new CleanParameterExamples(), new CleanIdenticalExamples(), - new CleanRepeatedOperationIds() + new CleanRepeatedOperationIds(), + new SetValidConsumesForFileParam() ) } diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/transformation/compatibility/oas3/SetValidConsumesForFileParam.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/transformation/compatibility/oas3/SetValidConsumesForFileParam.scala new file mode 100644 index 0000000000..631b768e2e --- /dev/null +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/transformation/compatibility/oas3/SetValidConsumesForFileParam.scala @@ -0,0 +1,31 @@ +package amf.apicontract.internal.transformation.compatibility.oas3 + +import amf.apicontract.client.scala.model.domain.Operation +import amf.core.client.scala.AMFGraphConfiguration +import amf.core.client.scala.errorhandling.AMFErrorHandler +import amf.core.client.scala.model.document.BaseUnit +import amf.core.client.scala.transform.TransformationStep +import amf.shapes.client.scala.model.domain.FileShape +import org.mulesoft.common.collections.FilterType + +class SetValidConsumesForFileParam() extends TransformationStep { + override def transform(model: BaseUnit, + errorHandler: AMFErrorHandler, + configuration: AMFGraphConfiguration): BaseUnit = { + val operations = model.iterator().toList.filterType[Operation] + operations.foreach(modifyConsumesIfFileIsPresent) + model + } + + val validConsumes = List("multipart/form-data", "application/x-www-form-urlencoded") + + def modifyConsumesIfFileIsPresent(o: Operation): Unit = { + val payloads = o.requests.flatMap(_.payloads) + val fileShapePresent = payloads.exists { p => + Option(p.schema).exists(_.isInstanceOf[FileShape]) + } + if(fileShapePresent) + o.withAccepts(validConsumes) + } + +} diff --git a/amf-cli/shared/src/test/resources/compatibility/cycled-apis/oas20/request-with-type-file-in-body.json b/amf-cli/shared/src/test/resources/compatibility/cycled-apis/oas20/request-with-type-file-in-body.json new file mode 100644 index 0000000000..05113a4fc8 --- /dev/null +++ b/amf-cli/shared/src/test/resources/compatibility/cycled-apis/oas20/request-with-type-file-in-body.json @@ -0,0 +1,40 @@ +{ + "swagger": "2.0", + "info": { + "title": "Some title", + "version": "1.0" + }, + "schemes": [ + "http" + ], + "paths": { + "/pdfmarkup/v1/documents/prepareForPrint": { + "post": { + "consumes": [ + "multipart/form-data", + "application/x-www-form-urlencoded" + ], + "produces": [ + "*/*" + ], + "parameters": [ + { + "name": "generated", + "in": "formData", + "type": "file" + } + ], + "responses": { + "200": { + "description": "", + "x-amf-mediaType": "application/json", + "schema": { + "type": "object", + "additionalProperties": true + } + } + } + } + } + } +} diff --git a/amf-cli/shared/src/test/resources/compatibility/raml10/request-with-type-file-in-body.raml b/amf-cli/shared/src/test/resources/compatibility/raml10/request-with-type-file-in-body.raml new file mode 100644 index 0000000000..3e8bc4df7d --- /dev/null +++ b/amf-cli/shared/src/test/resources/compatibility/raml10/request-with-type-file-in-body.raml @@ -0,0 +1,18 @@ +#%RAML 1.0 +title: "Some title" +version: "1.0" +protocols: +- "HTTP" +mediaType: +- "*/*" + +/pdfmarkup/v1/documents/prepareForPrint: + post: + body: + application/vnd.adobe.xfdf: + type: file + responses: + 200: + body: + application/json: + type: object diff --git a/amf-cli/shared/src/test/scala/amf/resolution/CompatibilityCycleGoldenTest.scala b/amf-cli/shared/src/test/scala/amf/resolution/CompatibilityCycleGoldenTest.scala index d7ba8083ee..63f12c0840 100644 --- a/amf-cli/shared/src/test/scala/amf/resolution/CompatibilityCycleGoldenTest.scala +++ b/amf-cli/shared/src/test/scala/amf/resolution/CompatibilityCycleGoldenTest.scala @@ -194,4 +194,12 @@ class CompatibilityCycleGoldenTest extends ResolutionTest { ) } + test("Raml with file request payload converted to oas with valid consumes mediatype") { + cycle("raml10/request-with-type-file-in-body.raml", + "cycled-apis/oas20/request-with-type-file-in-body.json", + Raml10YamlHint, + Oas20JsonHint, + transformWith = Some(Oas20)) + } + } From 1311f0a3d18791c939611c969b60a61ca7a62e8f Mon Sep 17 00:00:00 2001 From: Agustin Bettati Date: Wed, 13 Oct 2021 14:52:14 -0300 Subject: [PATCH 26/46] typings update: new SkippedValidationPluginEvent, removeField method in Graph interface --- amf-cli/js/typings/amf-client-js.d.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/amf-cli/js/typings/amf-client-js.d.ts b/amf-cli/js/typings/amf-client-js.d.ts index e4adb8d39a..bd07f5f8ba 100644 --- a/amf-cli/js/typings/amf-client-js.d.ts +++ b/amf-cli/js/typings/amf-client-js.d.ts @@ -198,6 +198,8 @@ declare module 'amf-client-js' { findSemanticByName(dialect: Dialect, name: string): undefined | SemanticExtension + } + export class SkippedValidationPluginEvent { } export class AMFConfiguration extends BaseShapesConfiguration { baseUnitClient(): AMFBaseUnitClient @@ -1005,6 +1007,8 @@ declare module 'amf-client-js' { scalarByProperty(uri: string): Array + removeField(uri: string): this + } export interface TransformationPipeline { @@ -3463,6 +3467,7 @@ declare module 'amf-client-js' { static readonly FoundReferences: 'FoundReferences' static readonly SelectedParsePlugin: 'SelectedParsePlugin' static readonly DetectedSyntaxMediaType: 'DetectedSyntaxMediaType' + static readonly SkippedValidationPlugin: 'SkippedValidationPlugin' } export class AnyShape implements Shape { From 529c11035cbd256f664b791940f53480b1d33dcf Mon Sep 17 00:00:00 2001 From: Agustin Bettati Date: Wed, 13 Oct 2021 15:05:59 -0300 Subject: [PATCH 27/46] publish 5.0.0-RC.2 adopting aml 6.0.0-RC.2 --- amf-apicontract.versions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/amf-apicontract.versions b/amf-apicontract.versions index 55b632c2bb..f5051f7674 100644 --- a/amf-apicontract.versions +++ b/amf-apicontract.versions @@ -1,3 +1,3 @@ -amf.apicontract=5.0.0-RC.1 -amf.aml=6.0.0-RC.1 +amf.apicontract=5.0.0-RC.2 +amf.aml=6.0.0-RC.2 amf.model=3.2.0 From 07a379f5c7f8be51df00a2c9faed58620a969d3e Mon Sep 17 00:00:00 2001 From: Tomas Fernandez Date: Thu, 14 Oct 2021 16:57:09 -0300 Subject: [PATCH 28/46] Publish AMF 5.0.0 --- Jenkinsfile | 1 + amf-apicontract.versions | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 957d18e544..a531093c43 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -178,6 +178,7 @@ pipeline { anyOf { branch 'master' branch 'develop' + branch 'release/*' } } steps { diff --git a/amf-apicontract.versions b/amf-apicontract.versions index f5051f7674..ea0255fcb0 100644 --- a/amf-apicontract.versions +++ b/amf-apicontract.versions @@ -1,3 +1,3 @@ -amf.apicontract=5.0.0-RC.2 -amf.aml=6.0.0-RC.2 +amf.apicontract=5.0.0 +amf.aml=6.0.0 amf.model=3.2.0 From b33ceb34a1e1e6a6b966755c8c93bad5757b8795 Mon Sep 17 00:00:00 2001 From: Tomas Fernandez Date: Thu, 14 Oct 2021 17:53:31 -0300 Subject: [PATCH 29/46] Bumped memory to sbt command --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index a531093c43..1243a41b53 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -24,7 +24,7 @@ pipeline { wrap([$class: 'AnsiColorBuildWrapper', 'colorMapName': 'XTerm']) { script { try{ - sh 'sbt -mem 4096 -Dfile.encoding=UTF-8 clean coverage test coverageReport' + sh 'sbt -mem 8192 -Dfile.encoding=UTF-8 clean coverage test coverageReport' } catch (ignored) { failedStage = failedStage + " TEST " unstable "Failed tests" From 3704a5b0f2ca7dbd3a09e3dcbf24eae14e6fd715 Mon Sep 17 00:00:00 2001 From: Tomas Fernandez Date: Mon, 8 Nov 2021 12:28:55 -0300 Subject: [PATCH 30/46] APIMF-3489: commented out publish section in Jenkinsfile --- Jenkinsfile | 54 ++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1243a41b53..e5a544f02c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -58,33 +58,33 @@ pipeline { } } } - stage('Publish') { - when { - anyOf { - branch 'master' - branch 'develop' - branch 'release/*' - } - } - steps { - wrap([$class: 'AnsiColorBuildWrapper', 'colorMapName': 'XTerm']) { - script { - try{ - if (failedStage.isEmpty()) { - sh ''' - echo "about to publish in sbt" - sbt publish - echo "sbt publishing successful" - ''' - } - } catch(ignored) { - failedStage = failedStage + " PUBLISH " - unstable "Failed publication" - } - } - } - } - } +// stage('Publish') { +// when { +// anyOf { +// branch 'master' +// branch 'develop' +// branch 'release/*' +// } +// } +// steps { +// wrap([$class: 'AnsiColorBuildWrapper', 'colorMapName': 'XTerm']) { +// script { +// try{ +// if (failedStage.isEmpty()) { +// sh ''' +// echo "about to publish in sbt" +// sbt publish +// echo "sbt publishing successful" +// ''' +// } +// } catch(ignored) { +// failedStage = failedStage + " PUBLISH " +// unstable "Failed publication" +// } +// } +// } +// } +// } stage('Tag version') { when { anyOf { From f9aa06014f0d6c2378e11062873a9d002464288e Mon Sep 17 00:00:00 2001 From: arielmirra Date: Mon, 28 Mar 2022 17:01:08 -0300 Subject: [PATCH 31/46] publish 5.0.6-RC.0 --- Jenkinsfile | 2 ++ amf-apicontract.versions | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8573bfebb4..0e0036c83c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -72,6 +72,7 @@ pipeline { anyOf { branch 'master' branch 'develop' + branch 'release/*' } } steps { @@ -86,6 +87,7 @@ pipeline { anyOf { branch 'master' branch 'develop' + branch 'release/*' } } steps { diff --git a/amf-apicontract.versions b/amf-apicontract.versions index e59b2b7e15..8fe7bfc364 100644 --- a/amf-apicontract.versions +++ b/amf-apicontract.versions @@ -1,3 +1,3 @@ -amf.apicontract=5.1.0-SNAPSHOT -amf.aml=6.1.0-SNAPSHOT +amf.apicontract=5.0.6-RC.0 +amf.aml=6.0.6-RC.0 amf.model=3.4.0 From 16860b552ddeff803025f23a566833e96008031a Mon Sep 17 00:00:00 2001 From: Tomas Fernandez Date: Tue, 29 Mar 2022 11:15:29 -0300 Subject: [PATCH 32/46] (publish): Publish RC.1 because JS package was published wrong. --- Jenkinsfile | 2 ++ amf-apicontract.versions | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0e0036c83c..d2b418fb7b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -57,6 +57,7 @@ pipeline { anyOf { branch 'master' branch 'develop' + branch 'release/*' } } steps { @@ -106,6 +107,7 @@ pipeline { anyOf { branch 'master' branch 'support/*' + branch 'release/*' } } steps { diff --git a/amf-apicontract.versions b/amf-apicontract.versions index 8fe7bfc364..d26a88ad14 100644 --- a/amf-apicontract.versions +++ b/amf-apicontract.versions @@ -1,3 +1,3 @@ -amf.apicontract=5.0.6-RC.0 +amf.apicontract=5.0.6-RC.1 amf.aml=6.0.6-RC.0 amf.model=3.4.0 From 29d7be3aea074b9a93a8a63b9b92720b9b337c47 Mon Sep 17 00:00:00 2001 From: hghianni Date: Wed, 30 Mar 2022 16:24:00 -0300 Subject: [PATCH 33/46] Update typings --- amf-cli/js/typings/amf-client-js.d.ts | 41 +++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/amf-cli/js/typings/amf-client-js.d.ts b/amf-cli/js/typings/amf-client-js.d.ts index a9eeaf4af0..76fd42f09d 100644 --- a/amf-cli/js/typings/amf-client-js.d.ts +++ b/amf-cli/js/typings/amf-client-js.d.ts @@ -788,6 +788,9 @@ declare module 'amf-client-js' { } export class FoundReferencesEvent { + root: string + amount: number + } export class AMFGraphElementClient { getConfiguration(): AMFGraphConfiguration @@ -856,6 +859,37 @@ declare module 'amf-client-js' { export class AMLDialectResult extends AMFResult { dialect: Dialect + } + export class AnyMapping implements DomainElement { + customDomainProperties: Array + isExternalLink: BoolField + id: string + position: Range + extendsNode: Array + + or(): Array + + and(): Array + + components(): Array + + withComponents(components: Array): AnyMapping + + graph(): Graph + + withOr(orMappings: Array): AnyMapping + + withIsExternalLink(isExternalLink: boolean): DomainElement + + withExtendsNode(extension: Array): this + + withCustomDomainProperties(extensions: Array): this + + withAnd(andMappings: Array): AnyMapping + + withId(id: string): this + + } export interface JsTransformationStep { transform(model: BaseUnit, errorHandler: ClientErrorHandler, configuration: AMFGraphConfiguration): BaseUnit @@ -4263,9 +4297,10 @@ declare module 'amf-client-js' { } - export class NodeMapping implements DomainElement, Linkable { + export class NodeMapping extends AnyMapping implements Linkable { name: StrField customDomainProperties: Array + closed: BoolField idTemplate: StrField linkTarget: undefined | DomainElement isLink: boolean @@ -4733,7 +4768,7 @@ declare module 'amf-client-js' { } - export class ConditionalNodeMapping implements DomainElement, Linkable { + export class ConditionalNodeMapping extends AnyMapping implements Linkable { name: StrField customDomainProperties: Array linkTarget: undefined | DomainElement @@ -5299,7 +5334,7 @@ declare module 'amf-client-js' { } - export class UnionNodeMapping implements DomainElement, Linkable { + export class UnionNodeMapping extends AnyMapping implements Linkable { name: StrField customDomainProperties: Array linkTarget: undefined | DomainElement From 4d65fb560e2c5c54c3e729b678663f9b14e3cd83 Mon Sep 17 00:00:00 2001 From: Tomas Fernandez Date: Thu, 31 Mar 2022 15:04:13 -0300 Subject: [PATCH 34/46] publish-setup: 5.0.6 --- amf-apicontract.versions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/amf-apicontract.versions b/amf-apicontract.versions index d26a88ad14..ac149c692b 100644 --- a/amf-apicontract.versions +++ b/amf-apicontract.versions @@ -1,3 +1,3 @@ -amf.apicontract=5.0.6-RC.1 -amf.aml=6.0.6-RC.0 +amf.apicontract=5.0.6 +amf.aml=6.0.6 amf.model=3.4.0 From a429e18741c00396f78f5646abf9fd2ce42cbe8e Mon Sep 17 00:00:00 2001 From: Tomas Fernandez Date: Thu, 31 Mar 2022 15:23:56 -0300 Subject: [PATCH 35/46] publish-setup: 5.0.6 part 2 --- Jenkinsfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d2b418fb7b..8573bfebb4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -57,7 +57,6 @@ pipeline { anyOf { branch 'master' branch 'develop' - branch 'release/*' } } steps { @@ -73,7 +72,6 @@ pipeline { anyOf { branch 'master' branch 'develop' - branch 'release/*' } } steps { @@ -88,7 +86,6 @@ pipeline { anyOf { branch 'master' branch 'develop' - branch 'release/*' } } steps { @@ -107,7 +104,6 @@ pipeline { anyOf { branch 'master' branch 'support/*' - branch 'release/*' } } steps { From c90b9ffc449e47342797210fbe70614f9c3ec4c1 Mon Sep 17 00:00:00 2001 From: Loose Date: Tue, 7 Jun 2022 14:53:40 -0300 Subject: [PATCH 36/46] Use JDK 11 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 211ff2e71a..d0fd60a1f7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,7 @@ ENV LC_ALL en_US.UTF-8 USER root RUN mkdir -p /usr/share/man/man1 && \ apt-get update -y && \ - apt-get install -y openjdk-8-jdk + apt-get install -y openjdk-11-jdk RUN apt-get install unzip -y && \ apt-get autoremove -y && \ From 05c997803c0f789e7d06c365d67aff1bbee2b1a8 Mon Sep 17 00:00:00 2001 From: Tomas Fernandez Date: Tue, 20 Sep 2022 11:43:02 -0300 Subject: [PATCH 37/46] Publish 5.1.0 --- Jenkinsfile | 3 --- amf-apicontract.versions | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 553f8b908f..48ec4bc702 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -66,7 +66,6 @@ pipeline { anyOf { branch 'master' branch 'develop' - branch 'release/*' } } steps { @@ -82,7 +81,6 @@ pipeline { anyOf { branch 'master' branch 'develop' - branch 'release/*' } } steps { @@ -97,7 +95,6 @@ pipeline { anyOf { branch 'master' branch 'develop' - branch 'release/*' } } steps { diff --git a/amf-apicontract.versions b/amf-apicontract.versions index 9065095cd8..dcfcabbe94 100644 --- a/amf-apicontract.versions +++ b/amf-apicontract.versions @@ -1,4 +1,4 @@ -amf.apicontract=5.1.0-RC.2 -amf.aml=6.1.0-RC.1 +amf.apicontract=5.1.0 +amf.aml=6.1.0 amf.model=3.7.0 antlr4Version=0.5.17 From c874d434c644d8e8ec306227cad60fa7dcea0d58 Mon Sep 17 00:00:00 2001 From: hghianni Date: Fri, 14 Oct 2022 11:21:48 -0300 Subject: [PATCH 38/46] Update npm README --- amf-cli/js/README.md | 189 +++++++++++++------------------------------ 1 file changed, 55 insertions(+), 134 deletions(-) diff --git a/amf-cli/js/README.md b/amf-cli/js/README.md index 98bba94474..627ca431c2 100644 --- a/amf-cli/js/README.md +++ b/amf-cli/js/README.md @@ -1,174 +1,95 @@ -[![Build Status](https://jenkins.build.msap.io/buildStatus/icon?job=application/AMF/amf/master)](https://jenkins.build.msap.io/job/application/job/AMF/job/amf/job/master/) +[![GitHub license](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](https://github.com/aml-org/amf/blob/master/LICENSE) [![Build Status](https://jenkins.build.msap.io/buildStatus/icon?job=application/AMF/amf/master)](https://jenkins.build.msap.io/job/application/job/AMF/job/amf/job/master/) [![Version](https://img.shields.io/github/v/release/aml-org/amf)](https://github.com/aml-org/amf/releases) # AML Modeling Framework +AMF (AML Modeling Framework) is an open-source programming framework, capable of parsing, generating and validating metadata documents defined using [AML](https://a.ml/aml-spec). It can be used as a library in Scala, Java, or JavaScript projects. The modular design of AMF facilitates creating plugins capable of parsing other metadata syntaxes not defined by AML. -This project aims to provide a common programming interface that lets developers interact with any API specification, whether it is written in OpenAPI Specification (OAS) or RAML, similar to the way the HTML DOM allows programmatic interaction with an HTML document. -## Vision +# 📃 Documentation +- [The AML Project](https://a.ml) +- [AMF Documentation website](https://a.ml/docs) +- [AMF model documentation](./documentation/model.md) +- [GitHub repository of AMF code examples](https://github.com/aml-org/examples) -The API Modeling Framework (AMF) allows users to formally describe different kinds of APIs, parse and generate instances of those APIS as sets of modular documents and store those connected descriptions into a single unified data graph. +# 📦 Artifacts +[![NPMJS](https://img.shields.io/npm/v/amf-client-js.svg)](https://www.npmjs.com/package/amf-client-js) +[![github releases](https://img.shields.io/github/v/release/aml-org/amf?label=nexus)](https://repository-master.mulesoft.org/nexus/content/repositories/releases/com/github/amlorg/amf-api-contract_2.12) -## Goals - -- Support for multiple languages with a unified output API/model for clients -- Support for both, document (RAML modularity) and domain (service clients), layers -- Bi-directional transformation -- Support for validation at document and service layers -- Produce a formal specification for the language -- Extensible, single document model for multiple domain vocabularies -- Consistent parsing behavior - -## General scope -The library supports many of the required uses cases: -- Parse a 0.8 / 1.0 RAML, 2.0 / 3.0 OAS and JSON-LD AMF model. -- AMF API design model creation. -- Model edition. -- Export to any of the mentioned standards. - -## Usage - -To use AMF you should first generate or get the right distribution for your project and import them as dependencies. - -## Installation - -### Requirements -* Scala 2.12.2 -* sbt 0.13.15 -* Node - -### Useful sbt commands - -#### Test -* Tests on jvm and js - -```sh -sbt test -``` - -#### Coverage reports -```sh -sbt coverage test coverageReport -``` -### Generate artifacts directly from cloned repository - -```sh -sbt package -``` -This will generate *jvm* JARs in each of the module's targets. - -```sh -sbt buildJS -``` -This will generate a *js* artifact in ./file://amf-client/js/amf.js - -### JVM artifacts - -To use, specify dependency. - -Gradle example: - -```groovy -dependencies { - compile 'com.github.amlorg:amf-client_2.12:x.y.z' -} -``` +## Gradle ```groovy +// add mulesoft repository repositories { - ... maven { - url 'https://repository-master.mulesoft.org/nexus/content/repositories/releases' - } - ... + url 'https://repository-master.mulesoft.org/nexus/content/repositories/releases' + } +} +dependencies { + compile 'com.github.amlorg:amf-api-contract_2.12:x.y.z' } ``` -Maven example: - +## Maven ```xml com.github.amlorg - amf-client_2.12 + amf-api-contract_2.12 x.y.z ``` -NOTE: you may use the `-SNAPSHOT` versions of the JVM artifacts at your own risk since those snapshot versions may contain breaking changes. - -### JS artifacts +NOTE: you may use the `-SNAPSHOT` versions of the artifacts at your own risk since those snapshot versions may contain breaking changes. -Execute the command - -```bash -npm install --save amf-client-js -``` - -Using *Node.js* just import it using: +## JavaScript ```bash -import amf from 'amf-client-js' +$ npm install --save amf-client-js ``` -The *amf* package will contain all exported classes: -```javascript -amf.plugins.document.WebApi.register(); -amf.plugins.document.Vocabularies.register(); -amf.plugins.features.AMFValidation.register(); +## Generate artifacts directly from cloned repository -amf.Core.init().then(function () { - // AMF code here -}) +To build into a JVM jar: +```sh +sbt package ``` - -### Command line usage - -You can build a standalone Java executable (JAR) running the following SBT target: -```bash -sbt buildCommandLine +To build into a JS bundle: +```sh +sh js-build.sh ``` -This will generate an executable JAR at the top level directory that can be used to execute AMF from the command line. - -Using this JAR, you can run tasks from command line, for instance: -```bash -java -jar amf-x.y.z.jar parse -in "RAML 1.0" -mime-in "application/yaml" yourAPIfile -``` -or -```bash -java -jar amf-x.y.z.jar validate -in "RAML 1.0" -mime-in "application/yaml" -p "RAML" yourAPIfile -``` -or -```bash -java -jar amf-x.y.z.jar translate yourAPIOASfile --format-in "OAS 3.0" -mime-in "application/json" --format-out "RAML 1.0" -mime-out "application/raml+yaml" -``` -To get all available options: -```bash -java -jar amf-x.y.z.jar -``` +More info on how to add AMF to your project [here](https://a.ml/docs/amf/using-amf/amf_setup). -Using this JAR you can execute AMF by passing one of the following commands: -- parse -in FORMAT -- translate -in FORMAT_IN -out FORMAT_OUT -- validate -in FORMAT_IN -p VALIDATION_PROFILE +# AMF Native support -An interactive section can be started using the `repl` command. +AMF natively supports the following formats: +- YAML +- JSON -If you want to parse any RAML dialect other than RAML 1.0, you can pass a list of dialects to be loaded in the parser through the `dialects` option. +the following semantic models: +- WebApi (or "Web APIs" as in "APIs accessible over the network") +- AsyncApi -Refer to the usage of the application for additional commands and explanations. +and the following syntactic models: +- JSON-LD "AMF model" +- RAML 0.8 / 1.0 (mapped to "WebApi") +- OpenAPI (OAS) 2.0 / 3.0 (mapped to "WebApi") +- AsyncAPI 2.0 (mapped to "AsyncApi") -## Examples +The models above and any other models may be extended and supported via custom [AML-defined models](https://a.ml/aml-spec). Other formats and models that cannot be expressed with AML may also be supported via plugins. -Go to [amf examples repository](https://github.com/mulesoft/amf-examples) There are examples for each one of the three usages and a *converter* project that add some UI on top of the library. +## Guaranteed output -## Validation +The **only** guaranteed output of AMF is the JSON-LD "AMF model". Any other output such as any output provided natively by the models listed under the section above may change at any time. This means that while the semantic representation of those outputs may remain unchanged, the syntactical expression such as the order in which the outputted metadata is expressed and any other syntax-related constructs may change from one version of AMF to another. If this is an issue for your use-case, you may consider using a custom resolution/generation pipeline. -Validation is one of the key features of AMF. Please check the following link to get more information: +# AMF ecosystem modules +The following image shows each module in the AMF ecosystem as a dependency graph. -[Validation insights](./documentation/validation.md) +For AMF adopters it is recommended to use the `amf-api-contract` module which contains transitive dependencies with every +module in the ecosystem except the CLI. For AML adopters (with no Web API nor Custom validation features usage) it is recommended to +adopt the `amf-aml` module which includes parsing, validation & resolution for AML documents only. For more details on +AML visit the [AML repository]("https://github.com/aml-org/amf-aml"). -## Want to learn more? -[Click here for more documentation and playground](https://a.ml) +![AMF ecosystem modules](./amf-ecosystem-modules.png) +The `amf-api-contract` and `amf-aml` are the recommended modules for AMF and AML adopters respectively. -## Want to contribute? -If you are interested in contributing code to this project, thanks! Please [read and accept the Contributors Agreement](https://api-notebook.anypoint.mulesoft.com/notebooks#380297ed0e474010ff43). This should automatically create a Github issue with the record of your signature [here](https://github.com/mulesoft/contributor-agreements/issues). If for any reason, you do not see your signature there, please contact us. +## Contributing +If you are interested in contributing to this project, please make sure to read our [contributing guidelines](./CONTRIBUTING.md). \ No newline at end of file From 7a909e4670b3cd16e2c16788f23de8671236b2d0 Mon Sep 17 00:00:00 2001 From: Tomas Fernandez Date: Tue, 18 Oct 2022 16:09:40 -0300 Subject: [PATCH 39/46] W-11818324: Bump model version -> 3.8.0 --- amf-apicontract.versions | 8 ++++---- .../resources/configuration/async-model.jsonld | 2 +- .../configuration/webapi-model.jsonld | 2 +- .../transformation/introspected-types.jsonld | 2 +- .../valid/directive-with-directives.jsonld | 2 +- .../tck/apis/valid/external-extend-type.jsonld | 2 +- .../tck/apis/valid/external-type.jsonld | 2 +- .../apis/valid/federation-directives.jsonld | 2 +- .../tck/apis/valid/graphql-directives.jsonld | 2 +- .../apis/valid/inaccessible-argument.jsonld | 2 +- .../apis/valid/inaccessible-enum-value.jsonld | 2 +- .../tck/apis/valid/inaccessible-enum.jsonld | 2 +- .../inaccessible-field-with-argument.jsonld | 2 +- .../tck/apis/valid/inaccessible-field.jsonld | 2 +- .../apis/valid/inaccessible-input-field.jsonld | 2 +- .../valid/inaccessible-input-object.jsonld | 2 +- .../apis/valid/inaccessible-interface.jsonld | 2 +- .../tck/apis/valid/inaccessible-object.jsonld | 2 +- .../tck/apis/valid/inaccessible-scalar.jsonld | 2 +- .../tck/apis/valid/inaccessible-union.jsonld | 2 +- .../tck/apis/valid/key-extend-interface.jsonld | 2 +- .../apis/valid/key-extend-type-complex.jsonld | 2 +- .../valid/key-extend-type-resolvable.jsonld | 2 +- .../tck/apis/valid/key-extend-type.jsonld | 2 +- .../tck/apis/valid/key-interface.jsonld | 2 +- .../tck/apis/valid/key-type-complex.jsonld | 2 +- .../valid/key-type-multi-resolvable.jsonld | 2 +- .../tck/apis/valid/key-type-resolvable.jsonld | 2 +- .../tck/apis/valid/key-type.jsonld | 2 +- .../tck/apis/valid/link.jsonld | 2 +- .../tck/apis/valid/override.jsonld | 2 +- .../tck/apis/valid/provides.jsonld | 2 +- .../tck/apis/valid/requires.jsonld | 2 +- .../tck/apis/valid/shareable-field.jsonld | 2 +- .../tck/apis/valid/shareable-object.jsonld | 2 +- .../apis/valid/argument-enum-values.api.jsonld | 2 +- .../argument-enum-values.api.resolved.jsonld | 2 +- .../argument-input-object-values.api.jsonld | 2 +- ...ent-input-object-values.api.resolved.jsonld | 2 +- .../valid/argument-scalar-values.api.jsonld | 2 +- .../argument-scalar-values.api.resolved.jsonld | 2 +- .../tck/apis/valid/covariance.api.jsonld | 2 +- .../apis/valid/covariance.api.resolved.jsonld | 2 +- .../tck/apis/valid/custom-scalar.api.jsonld | 2 +- .../valid/custom-scalar.api.resolved.jsonld | 2 +- .../tck/apis/valid/deprecated.api.jsonld | 2 +- .../apis/valid/deprecated.api.resolved.jsonld | 2 +- .../apis/valid/descriptions-enum.api.jsonld | 2 +- .../descriptions-enum.api.resolved.jsonld | 2 +- .../tck/apis/valid/descriptions.api.jsonld | 2 +- .../valid/descriptions.api.resolved.jsonld | 2 +- .../valid/directive-applications.api.jsonld | 2 +- .../directive-applications.api.resolved.jsonld | 2 +- .../apis/valid/directive-arguments.api.jsonld | 2 +- .../directive-arguments.api.resolved.jsonld | 2 +- .../apis/valid/directive-locations.api.jsonld | 2 +- .../directive-locations.api.resolved.jsonld | 2 +- .../valid/directive-multitarget.api.jsonld | 2 +- .../directive-multitarget.api.resolved.jsonld | 2 +- .../directive-repeatable.flattened.jsonld | 2 +- .../tck/apis/valid/directive-repeatable.jsonld | 2 +- .../valid/directive-repeatable.resolved.jsonld | 2 +- .../tck/apis/valid/directive-simple.api.jsonld | 2 +- .../valid/directive-simple.api.resolved.jsonld | 2 +- .../tck/apis/valid/extension-enum.api.jsonld | 2 +- .../valid/extension-enum.api.resolved.jsonld | 2 +- .../apis/valid/extension-input-type.api.jsonld | 2 +- .../extension-input-type.api.resolved.jsonld | 2 +- .../apis/valid/extension-interface.api.jsonld | 2 +- .../extension-interface.api.resolved.jsonld | 2 +- .../apis/valid/extension-objects.api.jsonld | 2 +- .../extension-objects.api.resolved.jsonld | 2 +- .../apis/valid/extension-scalars.api.jsonld | 2 +- .../extension-scalars.api.resolved.jsonld | 2 +- .../tck/apis/valid/extension-union.api.jsonld | 2 +- .../valid/extension-union.api.resolved.jsonld | 2 +- .../valid/interface-chain-covariant.jsonld | 2 +- .../interface-chain-covariant.resolved.jsonld | 2 +- .../tck/apis/valid/interface-double.api.jsonld | 2 +- .../valid/interface-double.api.resolved.jsonld | 2 +- .../tck/apis/valid/interface-simple.api.jsonld | 2 +- .../valid/interface-simple.api.resolved.jsonld | 2 +- .../apis/valid/interface-with-interface.jsonld | 2 +- .../interface-with-interface.resolved.jsonld | 2 +- .../is-input-type-directive-arguments.jsonld | 2 +- ...ut-type-directive-arguments.resolved.jsonld | 2 +- .../tck/apis/valid/is-input-type-fields.jsonld | 2 +- .../is-input-type-interface-arguments.jsonld | 2 +- ...ut-type-interface-arguments.resolved.jsonld | 2 +- .../is-input-type-object-arguments.jsonld | 2 +- ...input-type-object-arguments.resolved.jsonld | 2 +- .../is-output-type-interface-fields.api.jsonld | 2 +- ...t-type-interface-fields.api.resolved.jsonld | 2 +- .../is-output-type-object-fields.api.jsonld | 2 +- ...tput-type-object-fields.api.resolved.jsonld | 2 +- .../apis/valid/nested-interfaces.api.jsonld | 2 +- .../nested-interfaces.api.resolved.jsonld | 2 +- .../tck/apis/valid/no-schema.api.jsonld | 2 +- .../apis/valid/no-schema.api.resolved.jsonld | 2 +- .../tck/apis/valid/recursion.api.jsonld | 2 +- .../tck/apis/valid/root-types-extends.jsonld | 2 +- .../valid/root-types-extends.resolved.jsonld | 2 +- .../valid/root-types-in-schema-extends.jsonld | 2 +- ...oot-types-in-schema-extends.resolved.jsonld | 2 +- .../tck/apis/valid/root-types-in-schema.jsonld | 2 +- .../valid/root-types-in-schema.resolved.jsonld | 2 +- .../graphql/tck/apis/valid/root-types.jsonld | 2 +- .../tck/apis/valid/root-types.resolved.jsonld | 2 +- .../tck/apis/valid/specified-by.api.jsonld | 2 +- .../valid/specified-by.api.resolved.jsonld | 2 +- .../tck/apis/valid/types-arguments.api.jsonld | 2 +- .../valid/types-arguments.api.resolved.jsonld | 2 +- .../tck/apis/valid/types-enum.api.jsonld | 2 +- .../apis/valid/types-enum.api.resolved.jsonld | 2 +- .../tck/apis/valid/types-input-type.api.jsonld | 2 +- .../valid/types-input-type.api.resolved.jsonld | 2 +- .../tck/apis/valid/types-list.api.jsonld | 2 +- .../apis/valid/types-list.api.resolved.jsonld | 2 +- .../tck/apis/valid/types-matrix.api.jsonld | 2 +- .../valid/types-matrix.api.resolved.jsonld | 2 +- .../tck/apis/valid/types-non-null.api.jsonld | 2 +- .../valid/types-non-null.api.resolved.jsonld | 2 +- .../tck/apis/valid/types-object.api.jsonld | 2 +- .../valid/types-object.api.resolved.jsonld | 2 +- .../tck/apis/valid/types-scalars.api.jsonld | 2 +- .../valid/types-scalars.api.resolved.jsonld | 2 +- .../tck/apis/valid/types-union.api.jsonld | 2 +- .../apis/valid/types-union.api.resolved.jsonld | 2 +- .../jsonschema/cycled/api-2019.raml.jsonld | 2 +- .../jsonschema/cycled/api.raml.jsonld | 2 +- .../jsonschema/cycled/oas20-2019.yaml.jsonld | 2 +- .../jsonschema/cycled/oas20.yaml.jsonld | 2 +- .../base-type-array.expanded.jsonld | 2 +- .../base-type-array.flattened.jsonld | 2 +- .../matrix-type-array.expanded.jsonld | 2 +- .../matrix-type-array.flattened.jsonld | 2 +- ...expression-with-inheritance.expanded.jsonld | 2 +- ...xpression-with-inheritance.flattened.jsonld | 2 +- .../union-type-array.expanded.jsonld | 2 +- .../union-type-array.flattened.jsonld | 2 +- .../child-declaration-links.expanded.jsonld | 2 +- .../child-declaration-links.flattened.jsonld | 2 +- .../union-right-declaration.expanded.jsonld | 2 +- .../union-right-declaration.flattened.jsonld | 2 +- .../parser/union-with-lib/api.expanded.jsonld | 4 ++-- .../parser/union-with-lib/api.flattened.jsonld | 4 ++-- .../golden.expanded.jsonld | 2 +- .../golden.flattened.jsonld | 2 +- .../production/event-api/api.expanded.jsonld | 2 +- .../production/event-api/api.flattened.jsonld | 2 +- .../example-in-union.raml.expanded.jsonld | 2 +- .../example-in-union.raml.flattened.jsonld | 2 +- ...onv1.2swagger.raml.resolved.expanded.jsonld | 2 +- ...nv1.2swagger.raml.resolved.flattened.jsonld | 2 +- .../add-facet.raml.expanded.jsonld | 2 +- .../add-facet.raml.flattened.jsonld | 2 +- .../test-ramlfragment.raml.expanded.jsonld | 2 +- .../test-ramlfragment.raml.flattened.jsonld | 2 +- .../knowledge-graph-reduced/api.jsonld | 2 +- .../api.resolved.expanded.jsonld | 4 ++-- .../api.resolved.flattened.jsonld | 4 ++-- .../production/lib-types/lib.expanded.jsonld | 2 +- .../production/lib-types/lib.flattened.jsonld | 2 +- ..._blob_service.raml.resolved.expanded.jsonld | 2 +- ...blob_service.raml.resolved.flattened.jsonld | 2 +- .../api.resolved.expanded.jsonld | 2 +- .../api.resolved.flattened.jsonld | 2 +- .../oas-example.json.expanded.jsonld | 2 +- .../oas-example.json.flattened.jsonld | 2 +- .../oas-multiple-example.json.expanded.jsonld | 2 +- .../oas-multiple-example.json.flattened.jsonld | 2 +- ...s-multiple-example.resolved.expanded.jsonld | 2 +- ...-multiple-example.resolved.flattened.jsonld | 2 +- .../oas20/xml-payload.json.expanded.jsonld | 2 +- .../oas20/xml-payload.json.flattened.jsonld | 2 +- .../api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../definitions-loops/api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../lock-unlock/api.raml.expanded.jsonld | 2 +- .../lock-unlock/api.raml.flattened.jsonld | 2 +- .../api.raml.expanded.jsonld | 10 +++++----- .../api.raml.flattened.jsonld | 10 +++++----- .../banking-api/api.raml.expanded.jsonld | 18 +++++++++--------- .../banking-api/api.raml.flattened.jsonld | 16 ++++++++-------- .../raml10/demo-api/api.raml.expanded.jsonld | 2 +- .../raml10/demo-api/api.raml.flattened.jsonld | 2 +- .../api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../raml10/jsonschema/api.raml.expanded.jsonld | 2 +- .../jsonschema/api.raml.flattened.jsonld | 2 +- .../locations-api/api.raml.expanded.jsonld | 8 ++++---- .../locations-api/api.raml.flattened.jsonld | 8 ++++---- .../raml10/xsdexample/api.raml.expanded.jsonld | 2 +- .../xsdexample/api.raml.flattened.jsonld | 2 +- .../api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../raml10/xsdschema/api.raml.expanded.jsonld | 2 +- .../raml10/xsdschema/api.raml.flattened.jsonld | 2 +- .../recursive-union.raml.expanded.jsonld | 2 +- .../recursive-union.raml.flattened.jsonld | 2 +- .../recursive3.editing.expanded.jsonld | 2 +- .../recursive3.editing.flattened.jsonld | 2 +- .../api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../api.resolved.raml.expanded.jsonld | 2 +- .../api.resolved.raml.flattened.jsonld | 2 +- ...onal-prop-and-defined-after.expanded.jsonld | 2 +- ...nal-prop-and-defined-after.flattened.jsonld | 2 +- ...nal-prop-and-defined-before.expanded.jsonld | 2 +- ...al-prop-and-defined-before.flattened.jsonld | 2 +- .../production/union-type/api.raml.resolved | 2 +- .../unions-example.raml.expanded.jsonld | 2 +- .../unions-example.raml.flattened.jsonld | 2 +- .../src/test/resources/rdf/apis/banking.jsonld | 2 +- .../data-type-fragment.json.expanded.jsonld | 4 ++-- .../data-type-fragment.json.flattened.jsonld | 4 ++-- ...fragment.reference.resolved.expanded.jsonld | 4 ++-- ...ragment.reference.resolved.flattened.jsonld | 4 ++-- .../references/lib/lib.json.expanded.jsonld | 2 +- .../references/lib/lib.json.flattened.jsonld | 2 +- .../references/lib/lib.raml.expanded.jsonld | 2 +- .../references/lib/lib.raml.flattened.jsonld | 2 +- .../references/libraries.json.expanded.jsonld | 4 ++-- .../references/libraries.json.flattened.jsonld | 4 ++-- .../oas/oas-references/oas-2-root.jsonld | 2 +- .../oas/oas-references/oas-3-root.jsonld | 2 +- .../governance-mode/async/api.expanded.jsonld | 2 +- .../governance-mode/async/api.flattened.jsonld | 2 +- .../governance-mode/oas/api.expanded.jsonld | 2 +- .../governance-mode/oas/api.flattened.jsonld | 2 +- .../governance-mode/raml/api.expanded.jsonld | 2 +- .../governance-mode/raml/api.flattened.jsonld | 2 +- .../resources/render/recursion.expanded.jsonld | 2 +- .../render/recursion.flattened.jsonld | 2 +- .../resources/render/types.expanded.jsonld | 2 +- .../resources/render/types.flattened.jsonld | 2 +- .../resources/render/union.expanded.jsonld | 2 +- .../resources/render/union.flattened.jsonld | 2 +- .../api.expanded.jsonld | 2 +- .../api.flattened.jsonld | 2 +- .../content-type-override.expanded.jsonld | 2 +- .../content-type-override.flattened.jsonld | 2 +- ...message-example-propagation.expanded.jsonld | 2 +- ...essage-example-propagation.flattened.jsonld | 2 +- .../async20/message-references.expanded.jsonld | 2 +- .../message-references.flattened.jsonld | 2 +- ...e-trait-merging-and-removed.expanded.jsonld | 2 +- ...-trait-merging-and-removed.flattened.jsonld | 2 +- .../message-trait-merging.expanded.jsonld | 2 +- .../message-trait-merging.flattened.jsonld | 2 +- .../named-parameter-with-ref.expanded.jsonld | 2 +- .../named-parameter-with-ref.flattened.jsonld | 2 +- ...n-trait-merging-and-removed.expanded.jsonld | 2 +- ...-trait-merging-and-removed.flattened.jsonld | 2 +- .../operation-trait-merging.expanded.jsonld | 2 +- .../operation-trait-merging.flattened.jsonld | 2 +- .../type-forward-referencing.expanded.jsonld | 2 +- .../type-forward-referencing.flattened.jsonld | 2 +- .../binary-fragment/api.expanded.jsonld | 2 +- .../binary-fragment/api.flattened.jsonld | 2 +- .../api.resolved.expanded.jsonld | 4 ++-- .../api.resolved.flattened.jsonld | 4 ++-- .../api.resolved.expanded.jsonld | 4 ++-- .../api.resolved.flattened.jsonld | 4 ++-- .../api.expanded.jsonld | 2 +- .../api.flattened.jsonld | 2 +- .../examples-defined-in-rt.expanded.jsonld | 2 +- .../examples-defined-in-rt.flattened.jsonld | 2 +- ...examples-shortener.resolved.expanded.jsonld | 2 +- ...xamples-shortener.resolved.flattened.jsonld | 2 +- ...s-with-multiple-media-types.expanded.jsonld | 2 +- ...-with-multiple-media-types.flattened.jsonld | 2 +- .../response-examples.json.expanded.jsonld | 2 +- .../response-examples.json.flattened.jsonld | 2 +- .../response-examples.raml.expanded.jsonld | 2 +- .../response-examples.raml.flattened.jsonld | 2 +- ...-with-quoted-value.resolved.expanded.jsonld | 2 +- ...with-quoted-value.resolved.flattened.jsonld | 2 +- ...-traits-resource-types.raml.expanded.jsonld | 2 +- ...traits-resource-types.raml.flattened.jsonld | 2 +- .../extends/data.editing.expanded.jsonld | 2 +- .../extends/data.editing.flattened.jsonld | 2 +- .../merging/api.expanded.jsonld | 2 +- .../merging/api.flattened.jsonld | 2 +- .../resource-type/api.expanded.jsonld | 2 +- .../resource-type/api.flattened.jsonld | 2 +- .../trait/api.expanded.jsonld | 2 +- .../trait/api.flattened.jsonld | 2 +- .../optional-method.raml.expanded.jsonld | 2 +- .../optional-method.raml.flattened.jsonld | 2 +- .../extends/parameters.raml.expanded.jsonld | 2 +- .../extends/parameters.raml.flattened.jsonld | 2 +- .../simple-merge.editing.expanded.jsonld | 2 +- .../simple-merge.editing.flattened.jsonld | 2 +- .../extends/simple-merge.raml.expanded.jsonld | 2 +- .../extends/simple-merge.raml.flattened.jsonld | 2 +- .../to-jsonld-and-back/api.expanded.jsonld | 2 +- .../to-jsonld-and-back/api.flattened.jsonld | 2 +- .../extension/operation/output.expanded.jsonld | 2 +- .../operation/output.flattened.jsonld | 2 +- .../traits/input.resolved.expanded.jsonld | 2 +- .../traits/input.resolved.flattened.jsonld | 2 +- .../extension/traits/output.expanded.jsonld | 2 +- .../extension/traits/output.flattened.jsonld | 2 +- .../jsonexample.raml.expanded.jsonld | 2 +- .../jsonexample.raml.flattened.jsonld | 2 +- .../jsonschema.raml.expanded.jsonld | 2 +- .../jsonschema.raml.flattened.jsonld | 2 +- .../api.resolved.expanded.jsonld | 2 +- .../api.resolved.flattened.jsonld | 2 +- .../xmlexample.raml.expanded.jsonld | 2 +- .../xmlexample.raml.flattened.jsonld | 2 +- .../xmlschema.raml.expanded.jsonld | 2 +- .../xmlschema.raml.flattened.jsonld | 2 +- .../jsonld-example/api.expanded.jsonld | 2 +- .../jsonld-example/api.flattened.jsonld | 2 +- .../in-api/link-of-link-in-api.expanded.jsonld | 4 ++-- .../link-of-link-in-api.flattened.jsonld | 4 ++-- .../link-of-link-of-link.expanded.jsonld | 2 +- .../link-of-link-of-link.flattened.jsonld | 2 +- .../link-of-link/link-of-link.expanded.jsonld | 2 +- .../link-of-link/link-of-link.flattened.jsonld | 2 +- .../link-of-link-in-api.expanded.jsonld | 4 ++-- .../link-of-link-in-api.flattened.jsonld | 4 ++-- .../avoid-extract-to-declares.expanded.jsonld | 2 +- .../avoid-extract-to-declares.flattened.jsonld | 2 +- ...o-declares-and-refs-default.expanded.jsonld | 2 +- ...-declares-and-refs-default.flattened.jsonld | 2 +- ...o-declares-and-refs-editing.expanded.jsonld | 8 ++++---- ...-declares-and-refs-editing.flattened.jsonld | 8 ++++---- ...pe-override-oas-target.json.expanded.jsonld | 2 +- ...e-override-oas-target.json.flattened.jsonld | 2 +- .../media-type-override.json.expanded.jsonld | 2 +- .../media-type-override.json.flattened.jsonld | 2 +- .../media-type-override.raml.expanded.jsonld | 2 +- .../media-type-override.raml.flattened.jsonld | 2 +- .../media-type/media-type.json.expanded.jsonld | 2 +- .../media-type.json.flattened.jsonld | 2 +- .../media-type/media-type.raml.expanded.jsonld | 2 +- .../media-type.raml.flattened.jsonld | 2 +- .../media-types.json.expanded.jsonld | 2 +- .../media-types.json.flattened.jsonld | 2 +- .../media-types.raml.expanded.jsonld | 2 +- .../media-types.raml.flattened.jsonld | 2 +- ...e-use-global-mediatype.raml.expanded.jsonld | 2 +- ...-use-global-mediatype.raml.flattened.jsonld | 2 +- .../api.expanded.jsonld | 2 +- .../api.flattened.jsonld | 2 +- .../merge-inherits/api.expanded.jsonld | 2 +- .../merge-inherits/api.flattened.jsonld | 2 +- .../api.expanded.jsonld | 2 +- .../api.flattened.jsonld | 2 +- .../api.expanded.jsonld | 2 +- .../api.flattened.jsonld | 2 +- .../api.expanded.jsonld | 2 +- .../api.flattened.jsonld | 2 +- .../golden.expanded.jsonld | 2 +- .../golden.flattened.jsonld | 2 +- .../golden.expanded.jsonld | 2 +- .../golden.flattened.jsonld | 2 +- .../golden.expanded.jsonld | 2 +- .../golden.flattened.jsonld | 2 +- .../golden.expanded.jsonld | 2 +- .../golden.flattened.jsonld | 2 +- .../golden.expanded.jsonld | 2 +- .../golden.flattened.jsonld | 2 +- .../message-simple/golden.expanded.jsonld | 2 +- .../message-simple/golden.flattened.jsonld | 2 +- .../merge/message-tags/golden.expanded.jsonld | 2 +- .../merge/message-tags/golden.flattened.jsonld | 2 +- .../golden.expanded.jsonld | 2 +- .../golden.flattened.jsonld | 2 +- .../golden.expanded.jsonld | 2 +- .../golden.flattened.jsonld | 2 +- .../golden.expanded.jsonld | 2 +- .../golden.flattened.jsonld | 2 +- .../golden.expanded.jsonld | 2 +- .../golden.flattened.jsonld | 2 +- .../operation-simple/golden.expanded.jsonld | 2 +- .../operation-simple/golden.flattened.jsonld | 2 +- .../operation-tags/golden.expanded.jsonld | 2 +- .../operation-tags/golden.flattened.jsonld | 2 +- .../result.expanded.jsonld | 2 +- .../result.flattened.jsonld | 2 +- .../nested-parameters.raml.expanded.jsonld | 2 +- .../nested-parameters.raml.flattened.jsonld | 2 +- ...oas-declared-link-of-scalar.expanded.jsonld | 2 +- ...as-declared-link-of-scalar.flattened.jsonld | 2 +- .../api.expanded.jsonld | 2 +- .../api.flattened.jsonld | 2 +- .../all-objects-case.expanded.jsonld | 2 +- .../all-objects-case.flattened.jsonld | 2 +- .../array-in-the-middle.expanded.jsonld | 2 +- .../array-in-the-middle.flattened.jsonld | 2 +- .../array-with-child-recursion.expanded.jsonld | 2 +- ...array-with-child-recursion.flattened.jsonld | 2 +- .../resolution/oas-recursion.expanded.jsonld | 2 +- .../resolution/oas-recursion.flattened.jsonld | 2 +- ...ookie-parameter-propagation.expanded.jsonld | 2 +- ...okie-parameter-propagation.flattened.jsonld | 2 +- .../oas3-inlined-shapes.expanded.jsonld | 2 +- .../oas3-inlined-shapes.flattened.jsonld | 2 +- .../api.expanded.jsonld | 2 +- .../api.flattened.jsonld | 2 +- .../oas30-discriminator/api.expanded.jsonld | 2 +- .../oas30-discriminator/api.flattened.jsonld | 2 +- .../result.expanded.jsonld | 2 +- .../result.flattened.jsonld | 2 +- .../overrided-baseUriParams.expanded.jsonld | 2 +- .../overrided-baseUriParams.flattened.jsonld | 2 +- .../parameter-without-type.expanded.jsonld | 2 +- .../parameter-without-type.flattened.jsonld | 2 +- .../resolution/parameters.json.expanded.jsonld | 2 +- .../parameters.json.flattened.jsonld | 2 +- .../resolution/parameters.raml.expanded.jsonld | 2 +- .../parameters.raml.flattened.jsonld | 2 +- ...xamples-resolution.resolved.expanded.jsonld | 2 +- ...amples-resolution.resolved.flattened.jsonld | 2 +- .../query-string.json.expanded.jsonld | 2 +- .../query-string.json.flattened.jsonld | 2 +- .../query-string.raml.expanded.jsonld | 2 +- .../query-string.raml.flattened.jsonld | 2 +- ...rity-with-query-string.json.expanded.jsonld | 2 +- ...ity-with-query-string.json.flattened.jsonld | 2 +- ...rity-with-query-string.raml.expanded.jsonld | 2 +- ...ity-with-query-string.raml.flattened.jsonld | 2 +- .../output.source-info.jsonld | 8 ++++---- .../api.expanded.jsonld | 2 +- .../api.flattened.jsonld | 2 +- ...ive-additional-properties-2.expanded.jsonld | 2 +- ...ve-additional-properties-2.flattened.jsonld | 2 +- ...rsive-additional-properties.expanded.jsonld | 2 +- ...sive-additional-properties.flattened.jsonld | 2 +- .../api.resolved.expanded.jsonld | 2 +- .../api.resolved.flattened.jsonld | 2 +- .../recursive-tuple/api.expanded.jsonld | 2 +- .../recursive-tuple/api.flattened.jsonld | 2 +- .../api.expanded.jsonld | 2 +- .../api.flattened.jsonld | 2 +- .../security-requirements.expanded.jsonld | 6 +++--- .../security-requirements.flattened.jsonld | 6 +++--- .../security/security.json.expanded.jsonld | 2 +- .../security/security.json.flattened.jsonld | 2 +- .../security/security.raml.expanded.jsonld | 2 +- .../security/security.raml.flattened.jsonld | 2 +- .../shared-oas-30-examples/api.expanded.jsonld | 2 +- .../api.flattened.jsonld | 2 +- .../oas30/api.expanded.jsonld | 2 +- .../oas30/api.flattened.jsonld | 2 +- .../oas20/api.expanded.jsonld | 2 +- .../oas20/api.flattened.jsonld | 2 +- .../oas30/api.expanded.jsonld | 2 +- .../oas30/api.flattened.jsonld | 2 +- .../resolution/trait-with-link.expanded.jsonld | 2 +- .../trait-with-link.flattened.jsonld | 2 +- .../union-of-arrays/api.expanded.jsonld | 2 +- .../union-of-arrays/api.flattened.jsonld | 2 +- .../api.raml.resolved.expanded.jsonld | 2 +- .../api.raml.resolved.flattened.jsonld | 2 +- .../unresolved-shape.raml.expanded.jsonld | 2 +- .../unresolved-shape.raml.flattened.jsonld | 2 +- .../resolution/uri-params/api-operation.jsonld | 2 +- .../resources/resolution/uri-params/api.jsonld | 2 +- .../instance-nested-object.raml.jsonld | 2 +- .../semantic/instance-scalar.async.jsonld | 2 +- .../semantic/instance-scalar.oas20.jsonld | 2 +- .../semantic/instance-scalar.oas30.jsonld | 2 +- .../instance-scalar.parsed.async.jsonld | 2 +- .../instance-scalar.parsed.oas20.jsonld | 2 +- .../instance-scalar.parsed.oas30.jsonld | 2 +- .../instance-scalar.parsed.raml.jsonld | 2 +- .../semantic/instance-scalar.raml.jsonld | 2 +- .../resources/semantic/instance.async.jsonld | 2 +- .../resources/semantic/instance.oas20.jsonld | 2 +- .../resources/semantic/instance.oas30.jsonld | 2 +- .../semantic/instance.parsed.async.jsonld | 2 +- .../semantic/instance.parsed.oas20.jsonld | 2 +- .../semantic/instance.parsed.oas30.jsonld | 2 +- .../semantic/instance.parsed.raml.jsonld | 2 +- .../resources/semantic/instance.raml.jsonld | 2 +- .../additional-properties.expanded.jsonld | 2 +- .../additional-properties.flattened.jsonld | 2 +- .../upanddown/annotations.json.expanded.jsonld | 2 +- .../annotations.json.flattened.jsonld | 2 +- .../upanddown/basic.json.expanded.jsonld | 2 +- .../upanddown/basic.json.flattened.jsonld | 2 +- .../collection-format.expanded.jsonld | 2 +- .../collection-format.flattened.jsonld | 2 +- .../upanddown/complete.json.expanded.jsonld | 2 +- .../upanddown/complete.json.flattened.jsonld | 2 +- .../default-arguments/default-arguments.jsonld | 2 +- .../invalid-default-arguments.jsonld | 2 +- .../cycle/graphql/descriptions/block.jsonld | 2 +- .../cycle/graphql/descriptions/simple.jsonld | 2 +- .../directive-with-directives/api.jsonld | 2 +- .../cycle/graphql/directives/arguments.jsonld | 2 +- .../cycle/graphql/directives/default.jsonld | 2 +- .../cycle/graphql/directives/multiple.jsonld | 2 +- .../cycle/graphql/directives/simple.jsonld | 2 +- .../graphql/fragment-reserved-name/api.jsonld | 2 +- .../graphql/keyword-enum-values/api.jsonld | 2 +- .../cycle/graphql/keyword-names/api.jsonld | 2 +- .../graphql/non-root-optional-array/api.jsonld | 2 +- .../recursion/invalid/arguments-array.jsonld | 2 +- .../graphql/recursion/invalid/arguments.jsonld | 2 +- .../recursion/invalid/directives.jsonld | 2 +- .../invalid/input-objects-array.jsonld | 2 +- .../recursion/invalid/input-objects.jsonld | 2 +- .../invalid/mix-input-output-objects.jsonld | 2 +- .../graphql/recursion/invalid/self.jsonld | 2 +- .../graphql/recursion/valid/inheritance.jsonld | 2 +- .../recursion/valid/interfaces-array.jsonld | 2 +- .../graphql/recursion/valid/interfaces.jsonld | 2 +- .../valid/mix-interface-objects.jsonld | 2 +- .../recursion/valid/objects-array.jsonld | 2 +- .../graphql/recursion/valid/objects.jsonld | 2 +- .../cycle/graphql/recursion/valid/self.jsonld | 2 +- .../cycle/graphql/recursion/valid/union.jsonld | 2 +- .../simple.resolved.jsonld | 2 +- .../graphql/root-type/non-root-type.jsonld | 2 +- .../cycle/graphql/root-type/root-type.jsonld | 2 +- .../upanddown/cycle/graphql/simple/api.jsonld | 2 +- .../upanddown/cycle/graphql/swapi/api.jsonld | 2 +- .../cycle/oas-component/simple.jsonld | 2 +- .../pathitem-fragment/api.json.expanded.jsonld | 2 +- .../api.json.flattened.jsonld | 2 +- ...pe-definitions-with-refs.source-info.jsonld | 2 +- .../invalid-param-ref/api.yaml.expanded.jsonld | 2 +- .../api.yaml.flattened.jsonld | 2 +- .../api.yaml.expanded.jsonld | 2 +- .../api.yaml.flattened.jsonld | 2 +- .../api.yaml.expanded.jsonld | 2 +- .../api.yaml.flattened.jsonld | 2 +- .../americanflightapi/api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../default_value/api.raml.expanded.jsonld | 2 +- .../default_value/api.raml.flattened.jsonld | 2 +- .../api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../empty_payload/api.raml.expanded.jsonld | 2 +- .../empty_payload/api.raml.flattened.jsonld | 2 +- .../raml08/file-array/api.raml.expanded.jsonld | 2 +- .../file-array/api.raml.flattened.jsonld | 2 +- .../json_schema_array/api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../missing_payload/api.raml.expanded.jsonld | 2 +- .../missing_payload/api.raml.flattened.jsonld | 2 +- .../schema-position/api.raml.expanded.jsonld | 2 +- .../schema-position/api.raml.flattened.jsonld | 2 +- .../all-type-types/api.raml.expanded.jsonld | 2 +- .../all-type-types/api.raml.flattened.jsonld | 2 +- .../annotations-full/api.raml.expanded.jsonld | 2 +- .../annotations-full/api.raml.flattened.jsonld | 2 +- .../api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../annotations/api.raml.expanded.jsonld | 2 +- .../annotations/api.raml.flattened.jsonld | 2 +- .../api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../array-example/api.raml.expanded.jsonld | 2 +- .../array-example/api.raml.flattened.jsonld | 2 +- .../banking-api/api.raml.expanded.jsonld | 2 +- .../banking-api/api.raml.flattened.jsonld | 2 +- .../raml10/basic/api.raml.expanded.jsonld | 2 +- .../raml10/basic/api.raml.flattened.jsonld | 2 +- .../basic_with_xsd/api.raml.expanded.jsonld | 2 +- .../basic_with_xsd/api.raml.flattened.jsonld | 2 +- .../bells with spaces/api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../boolean_in_key/api.raml.expanded.jsonld | 2 +- .../boolean_in_key/api.raml.flattened.jsonld | 2 +- .../api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../raml10/complete/api.raml.expanded.jsonld | 2 +- .../raml10/complete/api.raml.flattened.jsonld | 2 +- .../api.raml.expanded.jsonld | 4 ++-- .../api.raml.flattened.jsonld | 4 ++-- .../api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../default-types/api.raml.expanded.jsonld | 2 +- .../default-types/api.raml.flattened.jsonld | 2 +- .../api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../empty-library/api.raml.expanded.jsonld | 2 +- .../empty-library/api.raml.flattened.jsonld | 2 +- .../api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../empty_union/api.raml.expanded.jsonld | 2 +- .../empty_union/api.raml.flattened.jsonld | 2 +- .../raml10/endpoints/api.raml.expanded.jsonld | 2 +- .../raml10/endpoints/api.raml.flattened.jsonld | 2 +- .../enum-inheritance/api.raml.expanded.jsonld | 2 +- .../enum-inheritance/api.raml.flattened.jsonld | 2 +- .../raml10/enums/api.raml.expanded.jsonld | 2 +- .../raml10/enums/api.raml.flattened.jsonld | 2 +- .../api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../raml10/examples/api.raml.expanded.jsonld | 2 +- .../raml10/examples/api.raml.flattened.jsonld | 2 +- .../api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../raml10/extensions/api.raml.expanded.jsonld | 4 ++-- .../extensions/api.raml.flattened.jsonld | 4 ++-- .../raml10/externals/api.raml.expanded.jsonld | 2 +- .../raml10/externals/api.raml.flattened.jsonld | 2 +- .../file-detection/api.raml.expanded.jsonld | 2 +- .../file-detection/api.raml.flattened.jsonld | 2 +- .../api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../raml10/file_types/api.raml.expanded.jsonld | 2 +- .../file_types/api.raml.flattened.jsonld | 2 +- .../api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../fragment_usage/api.raml.expanded.jsonld | 2 +- .../fragment_usage/api.raml.flattened.jsonld | 2 +- .../full-example/api.raml.expanded.jsonld | 2 +- .../full-example/api.raml.flattened.jsonld | 2 +- .../api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../include-repeated/api.raml.expanded.jsonld | 2 +- .../include-repeated/api.raml.flattened.jsonld | 2 +- .../api.raml.expanded.jsonld | 8 ++++---- .../api.raml.flattened.jsonld | 8 ++++---- .../int_uri_param/api.raml.expanded.jsonld | 2 +- .../int_uri_param/api.raml.flattened.jsonld | 2 +- .../jukebox-api/api.raml.expanded.jsonld | 2 +- .../jukebox-api/api.raml.flattened.jsonld | 2 +- .../raml10/konst1/api.raml.expanded.jsonld | 2 +- .../raml10/konst1/api.raml.flattened.jsonld | 2 +- .../api.raml.expanded.jsonld | 4 ++-- .../api.raml.flattened.jsonld | 4 ++-- .../libraries-3-alias/api.raml.expanded.jsonld | 4 ++-- .../api.raml.flattened.jsonld | 4 ++-- .../raml10/libraries/api.raml.expanded.jsonld | 4 ++-- .../raml10/libraries/api.raml.flattened.jsonld | 4 ++-- .../api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../raml10/matrix-id/api.raml.expanded.jsonld | 2 +- .../raml10/matrix-id/api.raml.flattened.jsonld | 2 +- .../raml10/matrix/api.raml.expanded.jsonld | 2 +- .../raml10/matrix/api.raml.flattened.jsonld | 2 +- .../missing_example/api.raml.expanded.jsonld | 2 +- .../missing_example/api.raml.flattened.jsonld | 2 +- .../api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../named-example/api.raml.expanded.jsonld | 4 ++-- .../named-example/api.raml.flattened.jsonld | 4 ++-- .../null-secured-by/api.raml.expanded.jsonld | 2 +- .../null-secured-by/api.raml.flattened.jsonld | 2 +- .../number_title/api.raml.expanded.jsonld | 2 +- .../number_title/api.raml.flattened.jsonld | 2 +- .../numeric-facets/api.raml.expanded.jsonld | 2 +- .../numeric-facets/api.raml.flattened.jsonld | 2 +- .../api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../raml10/overlay/api.raml.expanded.jsonld | 4 ++-- .../raml10/overlay/api.raml.flattened.jsonld | 4 ++-- .../raml10/parameters/api.raml.expanded.jsonld | 2 +- .../parameters/api.raml.flattened.jsonld | 2 +- .../raml10/payloads/api.raml.expanded.jsonld | 2 +- .../raml10/payloads/api.raml.flattened.jsonld | 2 +- .../query-string/api.raml.expanded.jsonld | 2 +- .../query-string/api.raml.flattened.jsonld | 2 +- .../raml-security/api.raml.expanded.jsonld | 2 +- .../raml-security/api.raml.flattened.jsonld | 2 +- .../api.raml.expanded.jsonld | 4 ++-- .../api.raml.flattened.jsonld | 4 ++-- .../api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../api.raml.expanded.jsonld | 4 ++-- .../api.raml.flattened.jsonld | 4 ++-- .../api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../sapi-customer/api.raml.expanded.jsonld | 6 +++--- .../sapi-customer/api.raml.flattened.jsonld | 6 +++--- .../raml10/secured-by/api.raml.expanded.jsonld | 4 ++-- .../secured-by/api.raml.flattened.jsonld | 4 ++-- .../api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../raml10/security/api.raml.expanded.jsonld | 2 +- .../raml10/security/api.raml.flattened.jsonld | 2 +- .../api.raml.expanded.jsonld | 4 ++-- .../api.raml.flattened.jsonld | 4 ++-- .../simple_xml_schema/api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../trait-fragment/api.raml.expanded.jsonld | 4 ++-- .../trait-fragment/api.raml.flattened.jsonld | 4 ++-- .../api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../type-closed-true/api.raml.expanded.jsonld | 2 +- .../type-closed-true/api.raml.flattened.jsonld | 2 +- .../api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../type-facets/api.raml.expanded.jsonld | 2 +- .../type-facets/api.raml.flattened.jsonld | 2 +- .../type_nil_shortcut/api.raml.expanded.jsonld | 2 +- .../api.raml.flattened.jsonld | 2 +- .../types-dependency/api.raml.expanded.jsonld | 2 +- .../types-dependency/api.raml.flattened.jsonld | 2 +- .../types-facet/api.raml.expanded.jsonld | 2 +- .../types-facet/api.raml.flattened.jsonld | 2 +- .../raml10/types/api.raml.expanded.jsonld | 2 +- .../raml10/types/api.raml.flattened.jsonld | 2 +- .../types_problems2/api.raml.expanded.jsonld | 2 +- .../types_problems2/api.raml.flattened.jsonld | 2 +- .../unresolved-shape/api.raml.expanded.jsonld | 2 +- .../unresolved-shape/api.raml.flattened.jsonld | 2 +- .../users_accounts/api.raml.expanded.jsonld | 2 +- .../users_accounts/api.raml.flattened.jsonld | 2 +- .../with_references/api.raml.expanded.jsonld | 10 +++++----- .../with_references/api.raml.flattened.jsonld | 10 +++++----- .../declared-responses.json.expanded.jsonld | 2 +- .../declared-responses.json.flattened.jsonld | 2 +- .../upanddown/endpoints.json.expanded.jsonld | 2 +- .../upanddown/endpoints.json.flattened.jsonld | 2 +- .../upanddown/enums/enums.raml.expanded.jsonld | 2 +- .../enums/enums.raml.flattened.jsonld | 2 +- .../upanddown/examples.json.expanded.jsonld | 2 +- .../upanddown/examples.json.flattened.jsonld | 2 +- .../upanddown/externals.json.expanded.jsonld | 2 +- .../upanddown/externals.json.flattened.jsonld | 2 +- .../test/resources/upanddown/file-type.json | 2 +- .../upanddown/form-data-params.expanded.jsonld | 2 +- .../form-data-params.flattened.jsonld | 2 +- .../formDataParameters.expanded.jsonld | 2 +- .../formDataParameters.flattened.jsonld | 2 +- ...ormdata-parameters-multiple.expanded.jsonld | 2 +- ...rmdata-parameters-multiple.flattened.jsonld | 2 +- .../full-example.json.expanded.jsonld | 2 +- .../full-example.json.flattened.jsonld | 2 +- .../grpc/google/any.proto.expanded.jsonld | 2 +- .../grpc/google/any.proto.flattened.jsonld | 2 +- .../grpc/google/api.proto.expanded.jsonld | 10 +++++----- .../grpc/google/api.proto.flattened.jsonld | 8 ++++---- .../grpc/google/duration.proto.expanded.jsonld | 2 +- .../google/duration.proto.flattened.jsonld | 2 +- .../grpc/google/empty.proto.expanded.jsonld | 2 +- .../grpc/google/empty.proto.flattened.jsonld | 2 +- .../google/field_mask.proto.expanded.jsonld | 2 +- .../google/field_mask.proto.flattened.jsonld | 2 +- .../source_context.proto.expanded.jsonld | 2 +- .../source_context.proto.flattened.jsonld | 2 +- .../grpc/google/struct.proto.expanded.jsonld | 2 +- .../grpc/google/struct.proto.flattened.jsonld | 2 +- .../google/timestamp.proto.expanded.jsonld | 2 +- .../google/timestamp.proto.flattened.jsonld | 2 +- .../grpc/google/type.proto.expanded.jsonld | 6 +++--- .../grpc/google/type.proto.flattened.jsonld | 6 +++--- .../grpc/google/wrappers.proto.expanded.jsonld | 2 +- .../google/wrappers.proto.flattened.jsonld | 2 +- .../upanddown/grpc/simple.expanded.jsonld | 4 ++-- .../upanddown/grpc/simple.flattened.jsonld | 4 ++-- .../api.resolved.expanded.jsonld | 2 +- .../api.resolved.flattened.jsonld | 2 +- .../parameter-payload-examples.expanded.jsonld | 2 +- ...parameter-payload-examples.flattened.jsonld | 2 +- ...ed-to-operations-resolution.expanded.jsonld | 2 +- ...d-to-operations-resolution.flattened.jsonld | 2 +- ...foward_definitions.resolved.expanded.jsonld | 2 +- ...oward_definitions.resolved.flattened.jsonld | 2 +- .../oas_response_declaration.expanded.jsonld | 2 +- .../oas_response_declaration.flattened.jsonld | 2 +- ...sponse_declaration.resolved.expanded.jsonld | 2 +- ...ponse_declaration.resolved.flattened.jsonld | 2 +- .../orphan_extensions.expanded.jsonld | 2 +- .../orphan_extensions.flattened.jsonld | 2 +- .../upanddown/parameters.json.expanded.jsonld | 2 +- .../upanddown/parameters.json.flattened.jsonld | 2 +- .../petstore/petstore.expanded.jsonld | 2 +- .../petstore/petstore.flattened.jsonld | 2 +- .../query-string.json.expanded.jsonld | 2 +- .../query-string.json.flattened.jsonld | 2 +- .../schemas-lexical-info.expanded.jsonld | 2 +- .../schemas-lexical-info.flattened.jsonld | 2 +- .../upanddown/raml10/annotations/api.jsonld | 2 +- .../api.expanded.jsonld | 2 +- .../api.flattened.jsonld | 2 +- .../api.expanded.jsonld | 2 +- .../api.flattened.jsonld | 2 +- ...raml-default-schema-version.expanded.jsonld | 2 +- ...aml-default-schema-version.flattened.jsonld | 2 +- .../raml-reference-draft-7.expanded.jsonld | 2 +- .../raml-reference-draft-7.flattened.jsonld | 2 +- ...h-json-schema-in-type-facet.expanded.jsonld | 2 +- ...-json-schema-in-type-facet.flattened.jsonld | 2 +- ...rity-with-query-string.json.expanded.jsonld | 2 +- ...ity-with-query-string.json.flattened.jsonld | 2 +- .../upanddown/security.json.expanded.jsonld | 2 +- .../upanddown/security.json.flattened.jsonld | 2 +- .../shapes-with-items.expanded.jsonld | 2 +- .../shapes-with-items.flattened.jsonld | 2 +- ...imple_example_type.resolved.expanded.jsonld | 4 ++-- ...mple_example_type.resolved.flattened.jsonld | 4 ++-- .../resources/upanddown/tags.expanded.jsonld | 2 +- .../resources/upanddown/tags.flattened.jsonld | 2 +- .../traits-resource-types.json.expanded.jsonld | 2 +- ...traits-resource-types.json.flattened.jsonld | 2 +- .../upanddown/type-facets.json.expanded.jsonld | 2 +- .../type-facets.json.flattened.jsonld | 2 +- .../types-dependency.json.expanded.jsonld | 2 +- .../types-dependency.json.flattened.jsonld | 2 +- .../upanddown/types-facet.json.expanded.jsonld | 2 +- .../types-facet.json.flattened.jsonld | 2 +- .../union_arrays.resolved.expanded.jsonld | 2 +- .../union_arrays.resolved.flattened.jsonld | 2 +- .../with_references_resolved.expanded.jsonld | 2 +- .../with_references_resolved.flattened.jsonld | 2 +- .../api-with-xml-examples/api.expanded.jsonld | 2 +- .../api-with-xml-examples/api.flattened.jsonld | 2 +- .../amqp-channel-binding.expanded.jsonld | 2 +- .../amqp-channel-binding.flattened.jsonld | 2 +- .../amqp-message-binding.expanded.jsonld | 2 +- .../amqp-message-binding.flattened.jsonld | 2 +- .../amqp-operation-binding.expanded.jsonld | 2 +- .../amqp-operation-binding.flattened.jsonld | 2 +- .../async20/channel-parameters.expanded.jsonld | 2 +- .../channel-parameters.flattened.jsonld | 2 +- .../async-components.expanded.jsonld | 2 +- .../async-components.flattened.jsonld | 2 +- .../external-operation-traits.expanded.jsonld | 2 +- .../external-operation-traits.flattened.jsonld | 2 +- .../components/message-traits.expanded.jsonld | 2 +- .../components/message-traits.flattened.jsonld | 2 +- .../operation-traits.expanded.jsonld | 2 +- .../operation-traits.flattened.jsonld | 2 +- .../async20/draft-7-schemas.expanded.jsonld | 2 +- .../async20/draft-7-schemas.flattened.jsonld | 2 +- .../async20/draft-7/references.expanded.jsonld | 2 +- .../draft-7/references.flattened.jsonld | 2 +- ...pty-binding-and-annotations.expanded.jsonld | 2 +- ...ty-binding-and-annotations.flattened.jsonld | 2 +- .../http-message-binding.expanded.jsonld | 2 +- .../http-message-binding.flattened.jsonld | 2 +- .../http-operation-binding.expanded.jsonld | 2 +- .../http-operation-binding.flattened.jsonld | 2 +- .../kafka-message-binding.expanded.jsonld | 2 +- .../kafka-message-binding.flattened.jsonld | 2 +- .../kafka-operation-binding.expanded.jsonld | 2 +- .../kafka-operation-binding.flattened.jsonld | 2 +- .../async20/message-obj.expanded.jsonld | 2 +- .../async20/message-obj.flattened.jsonld | 2 +- .../mqtt-message-binding.expanded.jsonld | 2 +- .../mqtt-message-binding.flattened.jsonld | 2 +- .../mqtt-operation-binding.expanded.jsonld | 2 +- .../mqtt-operation-binding.flattened.jsonld | 2 +- .../mqtt-server-binding.expanded.jsonld | 2 +- .../mqtt-server-binding.flattened.jsonld | 2 +- .../async20/publish-subscribe.expanded.jsonld | 2 +- .../async20/publish-subscribe.flattened.jsonld | 2 +- .../chained-include.expanded.jsonld | 6 +++--- .../chained-include.flattened.jsonld | 6 +++--- .../include-root-payload.expanded.jsonld | 4 ++-- .../include-root-payload.flattened.jsonld | 4 ++-- ...-data-type-fragment-invalid.expanded.jsonld | 4 ++-- ...data-type-fragment-invalid.flattened.jsonld | 4 ++-- .../ref-data-type-fragment.expanded.jsonld | 4 ++-- .../ref-data-type-fragment.flattened.jsonld | 4 ++-- .../ref-external-yaml.expanded.jsonld | 2 +- .../ref-external-yaml.flattened.jsonld | 2 +- .../ref-type-in-library.expanded.jsonld | 4 ++-- .../ref-type-in-library.flattened.jsonld | 4 ++-- .../async20/rpc-server.expanded.jsonld | 2 +- .../async20/rpc-server.flattened.jsonld | 2 +- .../async20/security-schemes.expanded.jsonld | 2 +- .../async20/security-schemes.flattened.jsonld | 2 +- .../external-ref-message-trait.expanded.jsonld | 2 +- ...external-ref-message-trait.flattened.jsonld | 2 +- ...xternal-ref-operation-trait.expanded.jsonld | 2 +- ...ternal-ref-operation-trait.flattened.jsonld | 2 +- .../async20/ws-channel-binding.expanded.jsonld | 2 +- .../ws-channel-binding.flattened.jsonld | 2 +- ...o-generated-schema-name-oas.expanded.jsonld | 2 +- ...-generated-schema-name-oas.flattened.jsonld | 2 +- ...ed-schema-name-with-default.expanded.jsonld | 2 +- ...d-schema-name-with-default.flattened.jsonld | 2 +- .../auto-generated-schema-name.expanded.jsonld | 8 ++++---- ...auto-generated-schema-name.flattened.jsonld | 8 ++++---- .../body-link-name.expanded.jsonld | 2 +- .../body-link-name.flattened.jsonld | 2 +- .../dup-name-example-tracking.expanded.jsonld | 2 +- .../dup-name-example-tracking.flattened.jsonld | 2 +- .../dialect-fragment/api.expanded.jsonld | 2 +- .../dialect-fragment/api.flattened.jsonld | 2 +- .../api.resolved.expanded.jsonld | 8 ++++---- .../api.resolved.flattened.jsonld | 8 ++++---- .../vocabulary-fragment/api.expanded.jsonld | 2 +- .../vocabulary-fragment/api.flattened.jsonld | 2 +- .../healthcare_reduced_v1.raml.resolved | 2 +- .../healthcare_reduced_v2.raml.resolved | 2 +- .../from-declaration/api.expanded.jsonld | 2 +- .../from-declaration/api.flattened.jsonld | 2 +- .../with-library/api.expanded.jsonld | 4 ++-- .../with-library/api.flattened.jsonld | 4 ++-- .../api.expanded.jsonld | 2 +- .../api.flattened.jsonld | 2 +- .../api.expanded.jsonld | 2 +- .../api.flattened.jsonld | 2 +- .../japanese/cycle/oas30api.expanded.jsonld | 2 +- .../japanese/cycle/oas30api.flattened.jsonld | 2 +- .../japanese/cycle/oasapi.expanded.jsonld | 2 +- .../japanese/cycle/oasapi.flattened.jsonld | 2 +- .../japanese/cycle/ramlapi.expanded.jsonld | 2 +- .../japanese/cycle/ramlapi.flattened.jsonld | 2 +- .../japanese/resolve/oas30api.expanded.jsonld | 2 +- .../japanese/resolve/oas30api.flattened.jsonld | 2 +- .../japanese/resolve/oasapi.expanded.jsonld | 2 +- .../japanese/resolve/oasapi.flattened.jsonld | 2 +- .../japanese/resolve/ramlapi.expanded.jsonld | 2 +- .../japanese/resolve/ramlapi.flattened.jsonld | 2 +- .../result.expanded.jsonld | 2 +- .../result.flattened.jsonld | 2 +- ...aw-source-maps-compact-uris.expanded.jsonld | 2 +- ...w-source-maps-compact-uris.flattened.jsonld | 2 +- .../parsed-result.expanded.jsonld | 2 +- .../parsed-result.flattened.jsonld | 2 +- .../validations/links/api.expanded.jsonld | 4 ++-- .../validations/links/api.flattened.jsonld | 4 ++-- .../validations/nil-type.raml.resolved | 2 +- ...-with-security-requirements.expanded.jsonld | 2 +- ...with-security-requirements.flattened.jsonld | 2 +- ...oint-path-still-parses.json.expanded.jsonld | 2 +- ...int-path-still-parses.json.flattened.jsonld | 2 +- .../extension-in-components.jsonld | 2 +- .../spec-extensions/extension-in-flow.jsonld | 2 +- .../spec-extensions/extension-in-flows.jsonld | 2 +- .../spec-extensions/extension-in-info.jsonld | 2 +- .../spec-extensions/extension-in-server.jsonld | 2 +- .../extension-in-xml-object.jsonld | 2 +- .../optional-scalar-value.expanded.jsonld | 2 +- .../optional-scalar-value.flattened.jsonld | 2 +- ...sion-inheritance-properties.expanded.jsonld | 2 +- ...ion-inheritance-properties.flattened.jsonld | 2 +- .../result.expanded.jsonld | 2 +- .../result.flattened.jsonld | 2 +- .../api.expanded.jsonld | 2 +- .../api.flattened.jsonld | 2 +- .../root-mediatype-propagation.expanded.jsonld | 2 +- ...root-mediatype-propagation.flattened.jsonld | 2 +- .../validations/rt-parameters.raml.resolved | 2 +- .../tracked-from-resource-type.expanded.jsonld | 4 ++-- ...tracked-from-resource-type.flattened.jsonld | 4 ++-- .../tracked-oas-examples.expanded.jsonld | 2 +- .../tracked-oas-examples.flattened.jsonld | 2 +- .../tracked-oas-param-body.expanded.jsonld | 2 +- .../tracked-oas-param-body.flattened.jsonld | 2 +- .../tracked-to-linked.expanded.jsonld | 8 ++++---- .../tracked-to-linked.flattened.jsonld | 8 ++++---- .../union-type-array.expanded.jsonld | 2 +- .../union-type-array.flattened.jsonld | 2 +- .../union-type-containg-array.expanded.jsonld | 2 +- .../union-type-containg-array.flattened.jsonld | 2 +- 990 files changed, 1146 insertions(+), 1146 deletions(-) diff --git a/amf-apicontract.versions b/amf-apicontract.versions index 21bb6f6dcf..e1c6d3f22f 100644 --- a/amf-apicontract.versions +++ b/amf-apicontract.versions @@ -1,4 +1,4 @@ -amf.apicontract=5.2.0-SNAPSHOT -amf.aml=6.2.0-SNAPSHOT -amf.model=3.7.0 -antlr4Version=0.5.17 +amf.apicontract=5.1.1-RC.0 +amf.aml=6.1.1-RC.0 +amf.model=3.8.0 +antlr4Version=0.5.17 \ No newline at end of file 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 e316e1674b..e098d26def 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.7.0" +"http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 79a9ba1f27..f1fa916703 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.7.0" +"http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 673377e433..8c7d7e97c6 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.7.0", + "apiContract:modelVersion": "3.8.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 6bfee63692..422547a4b7 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.7.0" + "@value": "3.8.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 cf6dfbd129..12a6424088 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.7.0" + "@value": "3.8.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 1313e25fc2..9c7e4b949d 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.7.0" + "@value": "3.8.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 450113efe6..b24778ff0a 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.7.0" + "@value": "3.8.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 3be68cef80..803ee26a24 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 @@ -282,7 +282,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 d9f21b7c10..d38e95cd36 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.7.0" + "@value": "3.8.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 054dc2c137..1a0c999f96 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.7.0" + "@value": "3.8.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 bd389308c9..56b09c20a0 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.7.0" + "@value": "3.8.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 99581dc271..3927647ca4 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.7.0" + "@value": "3.8.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 46bb3d0bdb..ac1020da86 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.7.0" + "@value": "3.8.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 d24167ea11..aa2f001342 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.7.0" + "@value": "3.8.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 4ae16c9d51..c45584d528 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.7.0" + "@value": "3.8.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 7ea167ab39..5f18432d82 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.7.0" + "@value": "3.8.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 51a38bbcfa..03aa169ec4 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.7.0" + "@value": "3.8.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 008702fcb5..d5b8554743 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.7.0" + "@value": "3.8.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 43548c2fdd..5db6d409b0 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.7.0" + "@value": "3.8.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 51636723c9..7dd55d4a0c 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.7.0" + "@value": "3.8.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 fd6d2cd262..e9c550dbcf 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.7.0" + "@value": "3.8.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 25c8046cf6..b9368faebd 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.7.0" + "@value": "3.8.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 3ab3a0c1da..63ec13e41d 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.7.0" + "@value": "3.8.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 139182ba2f..ce12044fe5 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.7.0" + "@value": "3.8.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 4726963a6c..af70750336 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.7.0" + "@value": "3.8.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 3382433363..1bebc06a7f 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.7.0" + "@value": "3.8.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 4ea49a64e9..c69ef9b39e 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.7.0" + "@value": "3.8.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 49e43b8ecb..45b61fb577 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.7.0" + "@value": "3.8.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 33f350c38c..ee0a40e2aa 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.7.0" + "@value": "3.8.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 53949366f8..324bb28627 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.7.0" + "@value": "3.8.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 11df9b54c3..26632a3176 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.7.0" + "@value": "3.8.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 fcd3976e32..22d970a714 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.7.0" + "@value": "3.8.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 42787338cc..2f3aba85c4 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.7.0" + "@value": "3.8.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 fcbcd545db..bdfc701c6c 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.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#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 5b8b9459bf..fcf018b617 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.7.0" + "@value": "3.8.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 9e1a0d4451..d811cbde07 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.7.0" + "@value": "3.8.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 35fc00e7db..052b9857bd 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.7.0" + "@value": "3.8.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 eabcf7db92..9586b92cab 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.7.0" + "@value": "3.8.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 6d95d83586..c0312c2be8 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.7.0" + "@value": "3.8.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 d2d97cf668..a3e1d76d67 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.7.0" + "@value": "3.8.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 1c7ebe0e00..217cecc609 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.7.0" + "@value": "3.8.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 efc14da226..efbb37880e 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.7.0" + "@value": "3.8.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 9634c5b7a3..4eda68fac3 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.7.0" + "@value": "3.8.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 3be45a5e7b..65231766b3 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.7.0" + "@value": "3.8.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 5d338c8695..fa052f83d0 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.7.0" + "@value": "3.8.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 354a7713cd..9a70890989 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.7.0" + "@value": "3.8.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 6b2e975571..a8a29cdd06 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.7.0" + "@value": "3.8.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 05b19b1e4f..7a579e5af4 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.7.0" + "@value": "3.8.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 c73b0465d2..0c8bde35a0 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.7.0" + "@value": "3.8.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 0bcafc807a..955fd52199 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.7.0" + "@value": "3.8.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 a94a336455..4903b379d7 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.7.0" + "@value": "3.8.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 170a552f9d..508bbd867a 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.7.0" + "@value": "3.8.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 e4a9be028d..93b2a25bfe 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.7.0" + "@value": "3.8.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 752e402d63..bf63384e68 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.7.0" + "@value": "3.8.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 e4ba453d37..988892f144 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.7.0" + "@value": "3.8.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 730b8d5156..54ad01493e 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.7.0" + "@value": "3.8.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 738d9b37f8..aeac614b5d 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.7.0" + "@value": "3.8.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 f72aec55c6..e14364f91a 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.7.0" + "@value": "3.8.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 c5a126cbc7..702b7f8ef3 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 1417c490f4..661b45c1fa 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.7.0" + "@value": "3.8.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 74d44ce8c6..9d3903719c 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.7.0" + "@value": "3.8.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 d331c2af14..6066349ece 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.7.0" + "@value": "3.8.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 9e8136c0f8..37fa00feab 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.7.0" + "@value": "3.8.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 2c55112815..3df72833cc 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.7.0" + "@value": "3.8.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 8a2e3210a2..a464738350 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.7.0" + "@value": "3.8.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 1b1f63306e..58e0018540 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.7.0" + "@value": "3.8.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 6168b325c5..f15b2fcc76 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.7.0" + "@value": "3.8.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 00ea959b6c..d098fd8ebd 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.7.0" + "@value": "3.8.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 e8ecb7a46a..f17dfa53fb 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.7.0" + "@value": "3.8.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 ce7285a203..ebd1e7b212 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.7.0" + "@value": "3.8.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 3f6db6809e..9f176302e8 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.7.0" + "@value": "3.8.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 99c195f9a5..85998d5b68 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.7.0" + "@value": "3.8.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 fa112cc0cd..4517cbba3d 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.7.0" + "@value": "3.8.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 94572c5f8c..0ad34a5bcd 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.7.0" + "@value": "3.8.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 5a6a825b16..8ea3c67fcc 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.7.0" + "@value": "3.8.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 41f34cbf09..d372fa892f 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.7.0" + "@value": "3.8.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 cfbc62c216..824a6efabd 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.7.0" + "@value": "3.8.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 22ce244d27..a1e1a96cfd 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.7.0" + "@value": "3.8.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 5892c0e506..999950fd8e 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.7.0" + "@value": "3.8.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 d16c92e330..c1d88e53c0 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.7.0" + "@value": "3.8.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 2c98ad576d..f63abd4b5e 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.7.0" + "@value": "3.8.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 2a73a2a989..308446a656 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.7.0" + "@value": "3.8.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 62405aab8e..df50dcebea 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.7.0" + "@value": "3.8.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 f3b61024c6..e3c7866492 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.7.0" + "@value": "3.8.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 83abbbe8df..6a9517b507 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.7.0" + "@value": "3.8.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 f9b3598ab0..97a519d9ae 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.7.0" + "@value": "3.8.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 e12f315a1c..839380f0f0 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.7.0" + "@value": "3.8.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 bce29c2121..384f47ef36 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.7.0" + "@value": "3.8.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 8d4276cdc8..777519d499 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.7.0" + "@value": "3.8.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 dfbb4b4fcd..d4f4ff7b67 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.7.0" + "@value": "3.8.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 88ecefad8c..3b50d78ca2 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.7.0" + "@value": "3.8.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 4c26ddceea..fcc13161cf 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.7.0" + "@value": "3.8.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 1df349b807..b8d4377e53 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.7.0" + "@value": "3.8.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 531b29a6bd..bfd35bdd2c 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.7.0" + "@value": "3.8.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 878b14133b..ec095f2dbc 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.7.0" + "@value": "3.8.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 82316e424a..d27ce79e8b 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.7.0" + "@value": "3.8.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 16f43ac1f7..dbfe1d0ad3 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.7.0" + "@value": "3.8.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 f7b1e08e45..9d33e202ae 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.7.0" + "@value": "3.8.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 1fe3badd70..65e7aa88f0 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.7.0" + "@value": "3.8.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 89b371b627..094dad1b7c 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.7.0" + "@value": "3.8.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 42a6da5094..b429738de0 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.7.0" + "@value": "3.8.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 f9dd68a1ca..5092583d1a 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.7.0" + "@value": "3.8.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 1fff26bc18..25d943b136 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.7.0" + "@value": "3.8.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 a25d5d0964..e19e8fb871 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.7.0" + "@value": "3.8.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 eb4a9770ce..ac84f11f35 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.7.0" + "@value": "3.8.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 86246bfde8..9296d180c6 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.7.0" + "@value": "3.8.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 51027d5dad..9a791d1012 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.7.0" + "@value": "3.8.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 a41ed8769e..8efe1716c0 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.7.0" + "@value": "3.8.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 068b310008..660db77461 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.7.0" + "@value": "3.8.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 82b5c78326..ef5b868ce3 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.7.0" + "@value": "3.8.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 89645d7199..3a0b7ff2d0 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.7.0" + "@value": "3.8.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 ea8040d893..4e9eb100ec 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.7.0" + "@value": "3.8.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 ffc5d611d9..d887ea32cc 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.7.0" + "@value": "3.8.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 874cf8d796..95d48c50c4 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.7.0" + "@value": "3.8.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 efb34aa861..7eeb299696 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.7.0" + "@value": "3.8.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 3630e3f6be..96d1a1107f 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.7.0" + "@value": "3.8.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 4a541da6e6..681a0dfe50 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.7.0" + "@value": "3.8.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 46360b5f1c..8fc3c4b011 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.7.0" + "@value": "3.8.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 e6151f05a7..7e66d07886 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.7.0" + "@value": "3.8.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 b3f1029d2e..1b347f8934 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.7.0" + "@value": "3.8.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 e46d78f83d..52ed2c2bfc 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.7.0" + "@value": "3.8.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 3422ed5f7c..2315b46c67 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.7.0" + "@value": "3.8.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 550b408807..130f197451 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.7.0" + "@value": "3.8.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 188002a926..e9d3283595 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.7.0" + "@value": "3.8.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 2f23633a16..a12f56c06f 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.7.0" + "@value": "3.8.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 14be30b8fc..3f1b142597 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.7.0" + "@value": "3.8.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 eef2b4c830..134ba4fd38 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.7.0" + "@value": "3.8.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 f3ba50998e..65845531ae 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.7.0", + "apiContract:modelVersion": "3.8.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 da9d584988..4a524a93b3 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.7.0", + "apiContract:modelVersion": "3.8.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 800ba25583..6706e8d39a 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.7.0", + "apiContract:modelVersion": "3.8.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 5b1f8f48ed..9a3c5f35e9 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.7.0", + "apiContract:modelVersion": "3.8.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 890ca09ab5..de3274a21e 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.7.0" + "@value": "3.8.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 202b8066bf..699870c39d 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 9888e35f8f..bf734bf843 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.7.0" + "@value": "3.8.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 55aa6d7681..bc5a210f2c 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 75a356a64f..f684438487 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.7.0" + "@value": "3.8.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 e05d994f74..e60f9cb5d5 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 a72e55737c..fab145269d 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.7.0" + "@value": "3.8.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 333a8eed8f..432be67370 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 7c0c117f2a..fe6a8d93ba 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.7.0" + "@value": "3.8.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 d1f32e0f0d..f70175b5ef 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 87dcf69c39..485c2fb8ef 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.7.0" + "@value": "3.8.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 d786eacca1..13bab1fbde 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 ced0886e5b..5a86aa6be6 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.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -370,7 +370,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 d6338590c4..83d0937c8b 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.0", "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 283bdd4534..3e920f09e1 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.7.0" + "@value": "3.8.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 8c102e49fe..64623004dd 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 1855ce34e3..da4ca68072 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.7.0" + "@value": "3.8.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 b07e18ec20..74531bd7eb 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.7.0", + "apiContract:modelVersion": "3.8.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 4e26b90b98..23611be348 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 @@ -935,7 +935,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 d11216f765..42ae774b7f 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 05fb84eb92..4004436107 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.7.0" + "@value": "3.8.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 15e8868e3f..4544971a55 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 323718eb75..9a75519708 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.7.0" + "@value": "3.8.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 2e0973a7c8..3a870cad7c 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 7b9a241857..3460e542be 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.7.0" + "@value": "3.8.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 9747df3419..cbc2e7916b 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 7b4fde5b02..bc16047db8 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 @@ -2485,7 +2485,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 4cf48aab80..c0624368c6 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.7.0" + "@value": "3.8.0" } ], "doc:transformed": [ @@ -502,7 +502,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 124e658be9..ce5df5a2ab 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.7.0", + "apiContract:modelVersion": "3.8.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, @@ -328,7 +328,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.7.0", + "apiContract:modelVersion": "3.8.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 8fcb97f1c2..4374a3d7a3 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.7.0" + "@value": "3.8.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 256f2581d8..3f550c0b21 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.7.0", + "apiContract:modelVersion": "3.8.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 b887d4dc8c..65c1b56349 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.7.0" + "@value": "3.8.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 ec1decd612..33e2699f99 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 ba61a47e7e..321d1e06d4 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.7.0" + "@value": "3.8.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 2794384b36..0f9365d542 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 08eee185a4..3ed896a65e 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 @@ -4278,7 +4278,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 98ab019c53..7d16fdda6f 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 98116ce4be..59fce48081 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.7.0" + "@value": "3.8.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 68202cff02..2591bda35d 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 d05a2a95b0..190b743832 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 @@ -1093,7 +1093,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 7f31c1336a..d22ac2007f 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.7.0", + "apiContract:modelVersion": "3.8.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 7002985f4d..657206d221 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.7.0" + "@value": "3.8.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 3ce8ca99d2..a926f2697c 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 cf0d613c2f..5dae3eea76 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.7.0" + "@value": "3.8.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 6f892095c9..99419f47c7 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 3006a4f120..7ae618995a 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.7.0" + "@value": "3.8.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 90bf36d73f..0743f876a8 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 419b2513ff..681b5b5beb 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.7.0" + "@value": "3.8.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 0b85a4f94f..3a095596c2 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 ffa62e8e22..98ac685196 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.7.0" + "@value": "3.8.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 dfa093500f..0d5ecfed60 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 4f16dbd0f6..1517aeecf2 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 @@ -8427,7 +8427,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -10040,7 +10040,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -10113,7 +10113,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -10186,7 +10186,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -10259,7 +10259,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 c75d27c7cd..973f2a834b 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -6517,7 +6517,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -6545,7 +6545,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -6573,7 +6573,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -6601,7 +6601,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 542a3df87e..d68540e903 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.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -35384,7 +35384,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -37327,7 +37327,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -37808,7 +37808,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -39862,7 +39862,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -40432,7 +40432,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -40498,7 +40498,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -41336,7 +41336,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -43377,7 +43377,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 5fc0188214..6a581606ac 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -9165,7 +9165,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -9335,7 +9335,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -9402,7 +9402,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -9437,7 +9437,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -13162,7 +13162,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -13200,7 +13200,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.0", "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" }, { @@ -13238,7 +13238,7 @@ "@type": [ "http://a.ml/vocabularies/document#APIContractProcessingData" ], - "http://a.ml/vocabularies/apiContract#modelVersion": "3.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 2568aa96bf..719fb79ca6 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 @@ -12148,7 +12148,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 f4cce1229a..219903b177 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 8a27a9d016..c9c5a0bb5f 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.7.0" + "@value": "3.8.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 efb1ac3ec6..6d6e6839c4 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 8c8dc8723d..8ee676e8cd 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.7.0" + "@value": "3.8.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 347455528b..283b28e607 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 afddd1ee7b..46ee6178cd 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.7.0" + "@value": "3.8.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 19201d11b9..217f6a78f7 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 faecc2d59c..e1bea01654 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.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -6256,7 +6256,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -6337,7 +6337,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -6468,7 +6468,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 e9a80a28ce..e2c6bfb3e6 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 52daaf0635..691a73de0c 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.7.0" + "@value": "3.8.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 8ba1e3fecf..4c68810310 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 136c72fd45..3eed1f3874 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.7.0" + "@value": "3.8.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 719c0f6940..4161306d6d 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 1e39aa6420..69a57bef83 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.7.0" + "@value": "3.8.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 1568f70271..c6964c4f8d 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 1a57119893..a69c12184c 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.7.0" + "@value": "3.8.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 121bd55d4d..7c50e3d8c8 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 38c094bd30..5495235d87 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.7.0" + "@value": "3.8.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 4bba7aa583..f1b626779a 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.7.0", + "apiContract:modelVersion": "3.8.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 ee96b23472..0fbc105d7d 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.7.0" + "@value": "3.8.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 948c0d3c3a..8317b796d6 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 703652e624..0d4a4bae41 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.7.0" + "@value": "3.8.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 dd45b5272f..2d4e8ed5f5 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 bd58d502bb..0c39affaef 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 @@ -149,7 +149,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 0e94888ca4..7d2cec2388 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.7.0", + "apiContract:modelVersion": "3.8.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 7d1eca99bf..501fd302aa 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 @@ -149,7 +149,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 29c4428930..cbd8b5a72a 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.7.0", + "apiContract:modelVersion": "3.8.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/production/union-type/api.raml.resolved b/amf-cli/shared/src/test/resources/production/union-type/api.raml.resolved index 5583bdfc8a..5fcfdfcb1d 100644 --- a/amf-cli/shared/src/test/resources/production/union-type/api.raml.resolved +++ b/amf-cli/shared/src/test/resources/production/union-type/api.raml.resolved @@ -290,7 +290,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 351175a774..aef5b29fa3 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 @@ -4835,7 +4835,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 b4636f2ddc..f800607a0f 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 033365fea4..a8b236ae13 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 c58d175b6d..6661135e92 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.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -358,7 +358,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 0b61378ccd..199c7ab279 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 2f2eafded9..748cc0b545 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.7.0" + "@value": "3.8.0" } ], "doc:transformed": [ @@ -181,7 +181,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 0dfa913e42..945f64fd5b 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.7.0", + "apiContract:modelVersion": "3.8.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, @@ -137,7 +137,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.7.0", + "apiContract:modelVersion": "3.8.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 110712a31d..14bc4b60eb 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.7.0" +"@value": "3.8.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 25a0f9d6e8..8dce969a53 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.7.0", +"http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 13e80c1416..b1ae8147ba 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.7.0" +"@value": "3.8.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 fa521a0d0e..dc4689522c 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.7.0", +"http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 cfaafa1bcd..cad3c004f5 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.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -550,7 +550,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 68a7ad6d59..1e96b499d9 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 6a4165ec85..cc74ce5f4b 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.7.0" + "@value": "3.8.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 a111dd4c18..95e0b7bc5a 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.7.0" + "@value": "3.8.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 6b17d1a5f6..8564ec36d9 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.7.0" + "@value": "3.8.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 4e011b0f9b..e8f78e80ea 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 084c5fb97c..56788f5b42 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.7.0" + "@value": "3.8.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 dbc3737ac7..28f6b65866 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 b16731018e..bf8eafaa59 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.7.0" + "@value": "3.8.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 fb04d67036..72a076ee6f 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 dedae9b6ff..15280e8be8 100644 --- a/amf-cli/shared/src/test/resources/render/recursion.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/render/recursion.expanded.jsonld @@ -269,7 +269,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 59f9ef29fa..26021e3a63 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 bca5a8d59e..564c6dd6d1 100644 --- a/amf-cli/shared/src/test/resources/render/types.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/render/types.expanded.jsonld @@ -269,7 +269,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 83115015d0..0527723c57 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 6b38e1d7f4..ece222dc2b 100644 --- a/amf-cli/shared/src/test/resources/render/union.expanded.jsonld +++ b/amf-cli/shared/src/test/resources/render/union.expanded.jsonld @@ -269,7 +269,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 40a34e9cd7..7e847d421e 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 600c707b74..89dc7b4ea7 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.7.0" + "@value": "3.8.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 8ef692f32b..c447e6f2eb 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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/content-type-override.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/async20/content-type-override.expanded.jsonld index f5ce7b3fc6..805304d5d2 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 @@ -733,7 +733,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 d1fd417ccb..af77effc1c 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.7.0", + "apiContract:modelVersion": "3.8.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 a6281f68b5..d9e98569ba 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 @@ -878,7 +878,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 900c93a092..599a574e9f 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.7.0", + "apiContract:modelVersion": "3.8.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 f43be2466e..40fb09e052 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.7.0" + "@value": "3.8.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 2a7b8881de..2ae51ecc39 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.7.0", + "apiContract:modelVersion": "3.8.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 86c7e93ee7..d8732efcf9 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 @@ -145,7 +145,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 24d3eb5e7a..b8313cca38 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.7.0", + "apiContract:modelVersion": "3.8.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 8d629fb277..daca8fb7ae 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 @@ -242,7 +242,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 9adbf43bec..ff2aa0a8f2 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.7.0", + "apiContract:modelVersion": "3.8.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 500ec9ae16..eedc6e1f67 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 @@ -142,7 +142,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 f8db76165b..f35a8ffa9b 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.7.0", + "apiContract:modelVersion": "3.8.0", "doc:transformed": true, "doc:sourceSpec": "ASYNC 2.0" }, 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 888ca83cd5..281310ea00 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 @@ -105,7 +105,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 2fddbe89f4..c09d28c86e 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.7.0", + "apiContract:modelVersion": "3.8.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 040739eb49..4efa11d5af 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 @@ -208,7 +208,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 8538dec524..7c2dada350 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.7.0", + "apiContract:modelVersion": "3.8.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 cdcaeed2f6..28d2a95383 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.7.0" + "@value": "3.8.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 89d330eade..7605663116 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.7.0", + "apiContract:modelVersion": "3.8.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 faa2d6538d..b2a978e41a 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.7.0" + "@value": "3.8.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 dafcdfc2d8..fb72ebaa70 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.7.0", + "apiContract:modelVersion": "3.8.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 c8ac6aedc6..d092f79c18 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.7.0" + "@value": "3.8.0" } ], "doc:transformed": [ @@ -180,7 +180,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 2e0e97440c..4d1e25ceb6 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.7.0", + "apiContract:modelVersion": "3.8.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, @@ -148,7 +148,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.7.0", + "apiContract:modelVersion": "3.8.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 019e6ea818..1ab741f1bf 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.7.0" + "@value": "3.8.0" } ], "doc:transformed": [ @@ -172,7 +172,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 a0c6f361d9..c7154978d3 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.7.0", + "apiContract:modelVersion": "3.8.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, @@ -172,7 +172,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.7.0", + "apiContract:modelVersion": "3.8.0", "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 ed07e0289c..192a144edf 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.7.0" + "@value": "3.8.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 ed07e0289c..192a144edf 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.7.0" + "@value": "3.8.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 99e5ffc315..32c6960ed8 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.7.0" + "@value": "3.8.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 b1e9ae1c07..99d22dfa7c 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.7.0", + "apiContract:modelVersion": "3.8.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 a73d591277..64a8cedb29 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.7.0" + "@value": "3.8.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 15f2a60c3f..2da6b03fe1 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.7.0", + "apiContract:modelVersion": "3.8.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 c1e106f672..be83b14971 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.7.0" + "@value": "3.8.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 b4bb19ae00..b6512d1c0e 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 2834d6c330..9ef2928436 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 @@ -5287,7 +5287,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 12c998fb4f..cfc8bd997f 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 b374d21b05..de2917a6ea 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.7.0" + "@value": "3.8.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 77b61afc2d..e37859dd01 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 61e8fc2dba..383ea61ca1 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.7.0" + "@value": "3.8.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 6936038bf4..bb58581d27 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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/complex-traits-resource-types.raml.expanded.jsonld b/amf-cli/shared/src/test/resources/resolution/extends/complex-traits-resource-types.raml.expanded.jsonld index 6398d00aa8..664fc91def 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.7.0" + "@value": "3.8.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 4dca669d5b..0d9297df25 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 106d8e49e4..58697516f7 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 @@ -611,7 +611,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 b934f0e4f4..d9bfc3103d 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.7.0", + "apiContract:modelVersion": "3.8.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 cab9a3093a..7d42f72800 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.7.0" + "@value": "3.8.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 5075072241..2f8ec16e07 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 b1cac35fa5..a787cc89f7 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.7.0" + "@value": "3.8.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 4057ec9d3d..59b61884b6 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 d538a106ae..89a1c37a07 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.7.0" + "@value": "3.8.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 a50cc08abd..868598a545 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 8929f02c1b..30d86541fb 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.7.0" + "@value": "3.8.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 9df0ea381a..82fad8fa08 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 cc07ec280f..310c050436 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.7.0" + "@value": "3.8.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 cc5831c79c..9b12b52410 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 23c34f4e55..3077d736a1 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.7.0" + "@value": "3.8.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 411858ddd8..d0a8a8851e 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.7.0", + "apiContract:modelVersion": "3.8.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 218bdd9399..3a8065154c 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.7.0" + "@value": "3.8.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 f2e11b949b..792331b836 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 0688b9211f..c83be0f76a 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.7.0" + "@value": "3.8.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 cb361944db..2194940238 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.7.0", + "apiContract:modelVersion": "3.8.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 1f671f704c..2482bcc6c3 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.7.0" + "@value": "3.8.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 28ed2b1dd7..e8d48b61ca 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 df729778ee..0d37f635f0 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.7.0" + "@value": "3.8.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 7402681022..7374728b94 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.7.0", + "apiContract:modelVersion": "3.8.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 b201acc92e..3a94e7cda6 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.7.0" + "@value": "3.8.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 123d24f3f3..247690ede1 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 8f2012d051..8af568bef5 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.7.0" + "@value": "3.8.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 d70393821e..05ba988287 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 28779e8452..7dc3ef2559 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.7.0" + "@value": "3.8.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 8c07023f09..a1a22dca11 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 e5ae8c7139..6e20abddf7 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.7.0" + "@value": "3.8.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 0ce4047bcc..5dd3ba6c14 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.7.0", + "apiContract:modelVersion": "3.8.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 5e28c55499..c60ec3d784 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.7.0" + "@value": "3.8.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 cc7d542784..0c639c4a74 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 9a10cc306f..79b08aa8ea 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.7.0" + "@value": "3.8.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 1291611beb..1355541b8f 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 1b42371dbf..4f22bbae99 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.7.0" + "@value": "3.8.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 b152d066be..f2088da1f5 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.7.0", + "apiContract:modelVersion": "3.8.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 6e657f9b7a..72ffc2059f 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.7.0" + "@value": "3.8.0" } ], "doc:transformed": [ @@ -449,7 +449,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 e9a3d3041a..018bbeea0f 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.7.0", + "apiContract:modelVersion": "3.8.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, @@ -330,7 +330,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.7.0", + "apiContract:modelVersion": "3.8.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 30fd805c00..7de4b7b969 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.7.0" + "@value": "3.8.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 ccee65fed8..f5f20024c9 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.7.0", + "apiContract:modelVersion": "3.8.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 01b730e7c7..db75d7c97a 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.7.0" + "@value": "3.8.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 3008ed9724..924682196d 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.7.0", + "apiContract:modelVersion": "3.8.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 ba8a3e292e..bd6c2132b8 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.7.0" + "@value": "3.8.0" } ], "doc:transformed": [ @@ -559,7 +559,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 8907bcf9bb..d3203e2319 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.7.0", + "apiContract:modelVersion": "3.8.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, @@ -373,7 +373,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.7.0", + "apiContract:modelVersion": "3.8.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 af63dad174..6ba67786ac 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 @@ -254,7 +254,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 226648fcfa..b453e1cba1 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.7.0", + "apiContract:modelVersion": "3.8.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 f4b4396c70..7d9e7839b4 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.7.0" + "@value": "3.8.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 9d2c5b8e0d..9b3b1af179 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 397202cf61..161e0a59e8 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.7.0" + "@value": "3.8.0" } ], "doc:transformed": [ @@ -910,7 +910,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.0" } ], "doc:sourceSpec": [ @@ -1187,7 +1187,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.0" } ], "doc:sourceSpec": [ @@ -1446,7 +1446,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 93800eec1c..dc1a146a33 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.7.0", + "apiContract:modelVersion": "3.8.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, @@ -1034,7 +1034,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.7.0", + "apiContract:modelVersion": "3.8.0", "doc:sourceSpec": "RAML 1.0" }, { @@ -1078,7 +1078,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.7.0", + "apiContract:modelVersion": "3.8.0", "doc:sourceSpec": "RAML 1.0" }, { @@ -1086,7 +1086,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.7.0", + "apiContract:modelVersion": "3.8.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 3df5808662..67e79ef680 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.7.0" + "@value": "3.8.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 510fff4526..23be6cc932 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 b519f0aab6..9798e1a86c 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.7.0" + "@value": "3.8.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 7f0dfdb4ca..bb29734e17 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 e27a52ab36..1a9fea4572 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.7.0" + "@value": "3.8.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 23a5e68ffc..1d5f2449c4 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 e033d84cf3..7463b80157 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.7.0" + "@value": "3.8.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 f4a4eaa1b8..f31f82ad21 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 63161a2f2d..3ea0e98e41 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.7.0" + "@value": "3.8.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 8e125b0696..528caf0cfd 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 5092b8dd57..e08d5613ea 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.7.0" + "@value": "3.8.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 15b3009e56..8eff7204a9 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 9637d4c474..db213cfb28 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.7.0" + "@value": "3.8.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 60fefcabe6..79b478ef8b 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 340511dfe6..a7de624a08 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 @@ -809,7 +809,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 59fe12b8f0..6ba4aefe7c 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 76dc987029..de79208e13 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.7.0" + "@value": "3.8.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 175864c69d..f115e0dd44 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.7.0", + "apiContract:modelVersion": "3.8.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 4e72f257be..5028661653 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.7.0" + "@value": "3.8.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 206983002f..05a77b1659 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.7.0", + "apiContract:modelVersion": "3.8.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 e0ca228fde..8a28f147e5 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.7.0" + "@value": "3.8.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 b2a08b8e28..331a56eb64 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.7.0", + "apiContract:modelVersion": "3.8.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 7d1c17042b..acd419c65a 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.7.0" + "@value": "3.8.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 ace5a42487..53d05696a6 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.7.0", + "apiContract:modelVersion": "3.8.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 913a05fca6..d381f8af96 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.7.0" + "@value": "3.8.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 eef6a372d7..fd4f1fe5a8 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.7.0", + "apiContract:modelVersion": "3.8.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 b54bd80ac2..d826b42e4f 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.7.0" + "@value": "3.8.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 76b1b538b5..66fb8e19ed 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.7.0" + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 f576949d71..007b19251d 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.7.0" + "@value": "3.8.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 35cd0522bf..a6e03629f7 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.7.0" + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 357cff8c2a..2a5cf728d8 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.7.0" + "@value": "3.8.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 fc124e1462..a1960b5a65 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.7.0" + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 efaba6df0c..329a6b5d7f 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.7.0" + "@value": "3.8.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 fc7dbe9b6a..6af6405636 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.7.0" + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 f576949d71..007b19251d 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.7.0" + "@value": "3.8.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 35cd0522bf..a6e03629f7 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.7.0" + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 e63aaac51c..e89372ba34 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.7.0" + "@value": "3.8.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 acb6e6c47e..57121e5e06 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.7.0" + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 f0fa9b827a..e29227db61 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.7.0" + "@value": "3.8.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 f343db002e..468019e36a 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.7.0" + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 0ed3bfbce8..4a7fef23ae 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.7.0" + "@value": "3.8.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 864a03e7dc..ac00e995ba 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.7.0" + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 3386772fef..6e5ba5623b 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.7.0" + "@value": "3.8.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 853326055b..23dfb253ba 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.7.0" + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 bf1171c82d..083dfcf16c 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.7.0" + "@value": "3.8.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 53a82ae3a4..daebe7f1fe 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.7.0" + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 0ed3bfbce8..4a7fef23ae 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.7.0" + "@value": "3.8.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 864a03e7dc..ac00e995ba 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.7.0" + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 6f571b9c85..f4d4ee5f04 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.7.0" + "@value": "3.8.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 b263ace8f3..d2e5cb313e 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.7.0" + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 a63b0f8553..541cf561c2 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.7.0" + "@value": "3.8.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 609bbefd03..0afa953dd1 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.7.0" + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 d17cbfd457..bb644961b6 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 @@ -839,7 +839,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 12588fc870..c78b0513c0 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.7.0", + "apiContract:modelVersion": "3.8.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 f12da8707e..c70dff0ae6 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.7.0" + "@value": "3.8.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 3459f8739d..9eff5e5e47 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 11bf3a9069..3e6fed61f0 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.7.0" + "@value": "3.8.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 26bf37ad03..5df6e08068 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.7.0", + "apiContract:modelVersion": "3.8.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 45388712eb..64c979d02c 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 @@ -331,7 +331,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 ae6abe6930..47de04dc7b 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.7.0", + "apiContract:modelVersion": "3.8.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 d1b5cfc1f2..425629694c 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.7.0" + "@value": "3.8.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 7e0d82b3eb..56ed82511f 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 2c153cc7ed..d49a414a66 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.7.0" + "@value": "3.8.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 fca589f530..a784f2513b 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 135e0dcee3..c342ff1cdf 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.7.0" + "@value": "3.8.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 e8944f3ceb..0910623d75 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 811a6bdd1b..262212434f 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.7.0" + "@value": "3.8.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 4568fd95d4..835ea9d59f 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.7.0", + "apiContract:modelVersion": "3.8.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 8c60e7fb65..afa2a819ac 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.7.0" + "@value": "3.8.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 ce9bbf2614..016d93b8a3 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.7.0", + "apiContract:modelVersion": "3.8.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 399a9835df..41d849462a 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.7.0" + "@value": "3.8.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 fabe492b83..fcbce54413 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.7.0", + "apiContract:modelVersion": "3.8.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 95f186b0cc..7cbab114b7 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.7.0" + "@value": "3.8.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 b8b533a883..01692d1fcf 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.7.0", + "apiContract:modelVersion": "3.8.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 39860425f0..4596adcc18 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.7.0" + "@value": "3.8.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 3c4cd1bfed..5cab6e7d47 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.7.0", + "apiContract:modelVersion": "3.8.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 868d1077af..fe1566a5a1 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 @@ -595,7 +595,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 101235f846..8a207e168e 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.7.0", + "apiContract:modelVersion": "3.8.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 11b70dbf6a..faaad4f75c 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.7.0" + "@value": "3.8.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 95482c8cbe..c7ca14e30d 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 02545bdb68..da2a0c8b1e 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 @@ -202,7 +202,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 c209d2f897..b0c7a02541 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.7.0", + "apiContract:modelVersion": "3.8.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 e368dc43ad..c5ded1956d 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.7.0" + "@value": "3.8.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 b2ddb72ef7..cd16bb0d02 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 4c0100573c..e892a063b2 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.7.0" + "@value": "3.8.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 8e073031df..3c6fac6da3 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 a3d9fe1990..36ab6ee6e4 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 @@ -222,7 +222,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 318b998cde..420ff16958 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.7.0", + "apiContract:modelVersion": "3.8.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 7812667c7d..62be58e11f 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.7.0" + "@value": "3.8.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 0001acff23..d7feca07d0 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 bb63c97806..59ac6bb8a2 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.7.0" + "@value": "3.8.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 1d4c155d12..5332e3f7d0 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 0c73ebd914..0d05920bd8 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.7.0" + "@value": "3.8.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 e6cd85fb5c..c4ceec581d 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 05a88449f5..2309d72f7a 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.7.0" + "@value": "3.8.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 4d74b53e90..5861b99f29 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 4fed17d9ab..c9d1607845 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.7.0", + "apiContract:modelVersion": "3.8.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, @@ -364,7 +364,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.7.0", + "apiContract:modelVersion": "3.8.0", "doc:sourceSpec": "RAML 1.0" }, { @@ -430,7 +430,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.7.0", + "apiContract:modelVersion": "3.8.0", "doc:sourceSpec": "RAML 1.0" }, { @@ -465,7 +465,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.7.0", + "apiContract:modelVersion": "3.8.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 21b964c325..bdceb2fdd4 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 @@ -382,7 +382,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 f9e47ab1d5..ad20a47e97 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.7.0", + "apiContract:modelVersion": "3.8.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 00b115efc9..d0a65a4e2b 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.7.0" + "@value": "3.8.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 25756fe528..794c41a9d4 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.7.0", + "apiContract:modelVersion": "3.8.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 f7575ac534..3e612d18b1 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 @@ -237,7 +237,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 93992acde3..693a94c417 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.7.0", + "apiContract:modelVersion": "3.8.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 42f6444512..af7ec47056 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.7.0" + "@value": "3.8.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 77295136dc..4391b195d6 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.7.0", + "apiContract:modelVersion": "3.8.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 10241bf3f6..fe8d30a45b 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.7.0" + "@value": "3.8.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 516d4c8948..4232ff7afb 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.7.0", + "apiContract:modelVersion": "3.8.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 7e695d17cb..3c92f03a42 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 @@ -619,7 +619,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 a5e505d800..25c972af8e 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.7.0", + "apiContract:modelVersion": "3.8.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 8b883faaeb..fa85d25e2c 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.7.0" + "@value": "3.8.0" } ], "doc:transformed": [ @@ -1478,7 +1478,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.0" } ], "doc:sourceSpec": [ @@ -1782,7 +1782,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 25a04a7649..adaa4d9b7b 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.7.0", + "apiContract:modelVersion": "3.8.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, @@ -851,7 +851,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.7.0", + "apiContract:modelVersion": "3.8.0", "doc:sourceSpec": "RAML 1.0" }, { @@ -897,7 +897,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.7.0", + "apiContract:modelVersion": "3.8.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 dfed6a2956..c8999e97be 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.7.0" + "@value": "3.8.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 004a4531cd..1d26a42445 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 fcd635fbcc..a18972a56e 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.7.0" + "@value": "3.8.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 ca96c66167..386592af63 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 87517feeed..09164c67b1 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 @@ -1375,7 +1375,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 230f73fbb3..8a6689f4b2 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.7.0", + "apiContract:modelVersion": "3.8.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 961bea4438..84e94889e7 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 @@ -357,7 +357,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 14e1d4527d..9298f626ac 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.7.0", + "apiContract:modelVersion": "3.8.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 d548dc4b10..73041ab0da 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 @@ -309,7 +309,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 de3fa61cff..dfe4466812 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.7.0", + "apiContract:modelVersion": "3.8.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 a57147a3e5..6de9427325 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.7.0" + "@value": "3.8.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 a463849947..8ee4281c33 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.7.0", + "apiContract:modelVersion": "3.8.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 fffd91fef9..970ed92176 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.7.0" + "@value": "3.8.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 f70104d60b..8098f27a48 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.7.0", + "apiContract:modelVersion": "3.8.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 5e6bfafef0..218e91b300 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 @@ -143,7 +143,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 33e7e72336..8e866c8588 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.7.0", + "apiContract:modelVersion": "3.8.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 84967f0ec5..35585b4011 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 @@ -336,7 +336,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 52a401f16e..4b131b1a62 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.7.0", + "apiContract:modelVersion": "3.8.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 3cc3d1d854..8731ef96d2 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.7.0" + "@value": "3.8.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 fd142dd447..8df5c590c7 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.7.0", + "apiContract:modelVersion": "3.8.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 f7c7e11c3e..300aa040bb 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.7.0", + "apiContract:modelVersion": "3.8.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 e5de904181..2a34335147 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.7.0", + "apiContract:modelVersion": "3.8.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.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 5ee0c4028e..b910b4dc45 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.7.0", + "apiContract:modelVersion": "3.8.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 b35055291f..97914e351c 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.7.0", + "apiContract:modelVersion": "3.8.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 a292d4bbde..520adbcb64 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.7.0", + "apiContract:modelVersion": "3.8.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 4729817e59..5bdf45b2dd 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.7.0", + "apiContract:modelVersion": "3.8.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 0a094fc7fd..f3fc0c1325 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.7.0", + "apiContract:modelVersion": "3.8.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 d6750554c7..14b078d365 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.7.0", + "apiContract:modelVersion": "3.8.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 d8e5aaebdf..9ba0be1ab4 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.7.0", + "apiContract:modelVersion": "3.8.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 25ba7fc260..6c7d7e50b4 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.7.0", + "apiContract:modelVersion": "3.8.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 c1899c142f..fe41de3084 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.7.0", + "apiContract:modelVersion": "3.8.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 733dd88e2e..8796983272 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.7.0", + "apiContract:modelVersion": "3.8.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 0d53179770..1f388a0638 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.7.0", + "apiContract:modelVersion": "3.8.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 39a800ae20..aa22f3c89b 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.7.0", + "apiContract:modelVersion": "3.8.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 bf22f2ab3c..9acd3ebe5a 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.7.0", + "apiContract:modelVersion": "3.8.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 c2a9966ed2..32a2c50bcb 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.7.0", + "apiContract:modelVersion": "3.8.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 67b8d4546d..36a509020a 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.7.0", + "apiContract:modelVersion": "3.8.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 8d1abfda94..3f54a6d52c 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.7.0", + "apiContract:modelVersion": "3.8.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 1ccd1b87cd..ab5eac9a3a 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.7.0", + "apiContract:modelVersion": "3.8.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 edb3651541..521bad2db4 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.7.0" + "@value": "3.8.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 d8b8bc9957..650426e76c 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 2b41ec102f..ed80458cce 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.7.0" + "@value": "3.8.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 a74b0cd481..c8aa02a0b9 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 0ff92ed1a6..4679dba94f 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.7.0" + "@value": "3.8.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 e88990874f..e4e3905e80 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 9e28527019..9667f830e6 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.7.0" + "@value": "3.8.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 4d4d4287e8..7b12e44676 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 4ba0f786a2..5d32855be1 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.7.0" + "@value": "3.8.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 75c418e6b6..0bbfac7da0 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.0", "http://a.ml/vocabularies/document#sourceSpec": "OAS 2.0" }, { 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 a66507a854..68a3245ae7 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.7.0" + "@value": "3.8.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 8b27848870..a8b7b89f71 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.7.0" + "@value": "3.8.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 773ca78d49..8e9a306d01 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 @@ -474,7 +474,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 477b156a13..17f1687603 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 @@ -474,7 +474,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 70413405e1..d4e62522ee 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 @@ -36,7 +36,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 be57bb64c2..8789bd0a40 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.7.0" + "@value": "3.8.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 c36bd2a7bd..63dd39e85e 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.7.0" + "@value": "3.8.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 7b16ae2f7e..d7faad6a16 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.7.0" + "@value": "3.8.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 759963ac64..9c2dfd8de3 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.7.0" + "@value": "3.8.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 c9846fa3ca..5fb8c809f8 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.7.0" + "@value": "3.8.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 c2f2b9e64e..847bb202cb 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.7.0" + "@value": "3.8.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 65911b18cb..8a9e75eaaa 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.7.0" + "@value": "3.8.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 9fc1ce720f..031e8a516b 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.7.0" + "@value": "3.8.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 0dc8663ea6..9e9a14e933 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.7.0" + "@value": "3.8.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 a962149a0e..41ab491181 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.7.0" + "@value": "3.8.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 967a535255..1c44ec3e5a 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.7.0" + "@value": "3.8.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 f9e2dde2f8..47e8802b72 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.7.0" + "@value": "3.8.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 20a7f7fb54..072638cac3 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.7.0" + "@value": "3.8.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 9ae2d47996..501f634180 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.7.0" + "@value": "3.8.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 4159ad486d..5e07a0577e 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.7.0" + "@value": "3.8.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 26da460473..342afdfd9e 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.7.0" + "@value": "3.8.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 a6692a4c45..84bd0384c8 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.7.0" + "@value": "3.8.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 000dd40983..8d6ed2e8d4 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.7.0" + "@value": "3.8.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 4a97062067..5fd23b682b 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.7.0" + "@value": "3.8.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 fa12dc7736..5c9e419d74 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.7.0" + "@value": "3.8.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 17968dde06..3a46d56c5a 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.7.0" + "@value": "3.8.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 6b08ab062c..5e5e6399ab 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.7.0" + "@value": "3.8.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 cf6a587a33..4b87411177 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.7.0" + "@value": "3.8.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 3dc0979ffb..8ccec33975 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 @@ -252,7 +252,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 358ab269cb..869c059496 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.7.0" + "@value": "3.8.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 8cbd2ac421..0c23461da3 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.7.0" + "@value": "3.8.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 413512090e..2f9fa59e2d 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.7.0" + "@value": "3.8.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 0e6251100b..027f5579c7 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.7.0" + "@value": "3.8.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 b65d3625ce..a15d400d51 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.7.0", +"http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 23f8a04099..9b052daacf 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.7.0" + "@value": "3.8.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 6af305b527..9d4056b3b3 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 d46f10fa66..5421885668 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.7.0", + "apiContract:modelVersion": "3.8.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 a5117b0bb1..c2f6ecce77 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.7.0" + "@value": "3.8.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 9721cedf22..d4836bbcbc 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 503882f8eb..b91162b33e 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.7.0" + "@value": "3.8.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 0e5a33dc93..b119895649 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 8737b68155..748119135e 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.7.0" + "@value": "3.8.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 ce8a8688f5..7edde68779 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 b68ce14c48..8928a4507d 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.7.0" + "@value": "3.8.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 1b165ecf3f..4c9694e11a 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 2623d62605..824e817741 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 @@ -759,7 +759,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 6629e843dc..efe1abc451 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 81d928d248..d420d96990 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.7.0" + "@value": "3.8.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 f4d11229cb..0099dc442a 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 2b510a8706..72b9042c87 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.7.0" + "@value": "3.8.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 5d87ea3232..77abca72a7 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 27e411fbb0..ed043f7f8b 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.7.0" + "@value": "3.8.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 3a03937458..60df7f75ef 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 c762b8be0b..36a2ebeafd 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.7.0" + "@value": "3.8.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 2770d164ac..2bf5f97cc2 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 8310a5de2a..78002c524d 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.7.0" + "@value": "3.8.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 c8fa9ddf48..3d951ff883 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 38cc101484..06a7d92284 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.7.0" + "@value": "3.8.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 adae86620c..bd5b897275 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 e0ec53fdbd..8c9f77d568 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.7.0" + "@value": "3.8.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 4822f583a9..1eae1b9f98 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 e0cb1a161c..ded262f3bc 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.7.0" + "@value": "3.8.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 27396e0daf..48652c4d10 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 f440aa2f84..a4ce6731b9 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.7.0" + "@value": "3.8.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 425c5790b5..af9d416305 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 446e699381..1e52218dfc 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.7.0" + "@value": "3.8.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 09a4a019d8..f3a4ab4f64 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 510e59ab16..3a6594aeb3 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.7.0" + "@value": "3.8.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 bc69f1f653..a7ccf15675 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 95dd1fa9df..3a4d01a801 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.7.0" + "@value": "3.8.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 5da8e6e8bc..d85d085fac 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 9500841090..d1984855c0 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.7.0" + "@value": "3.8.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 67255e01f0..8638afd35c 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 8394eaadc5..29fb7a8e55 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.7.0" + "@value": "3.8.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 0c53e963a6..f192eebfa6 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 0c67d51280..eda74c95ed 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.7.0" + "@value": "3.8.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 32aab53cc3..9bcbcdc932 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 544a78a71b..687e259c1f 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.7.0" + "@value": "3.8.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 38a144dd7b..9d6445307d 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 ad430a228c..ece3ca885f 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.7.0" + "@value": "3.8.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 16d16875b5..ffddc9255e 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 01bb54e783..0a196b3f18 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.7.0" + "@value": "3.8.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 b413421a03..e2fafb9f81 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 7075f80639..8b6253cc77 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.7.0" + "@value": "3.8.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 d185006399..eddc7c2f19 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 07bbc32009..93eb671731 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.7.0" + "@value": "3.8.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 125b9517ef..52edccec8c 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 e4cf87ed43..38b5c376ac 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.7.0" + "@value": "3.8.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 4f4e867579..a37877e4e9 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 dc69944d01..e9f786ccc5 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.7.0" + "@value": "3.8.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 df55db7296..1d14ae8ff8 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 8a4c45c500..1cb37b2e79 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.7.0" + "@value": "3.8.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 b498095aea..71cea69c8e 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 f75d21dba2..f6117b9d4d 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.7.0" + "@value": "3.8.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 be1f72eb36..ab9f1b76b8 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 520ce8d7d3..819c6c6cbe 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.7.0" + "@value": "3.8.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 6cc8619f85..91a335afcf 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 9282b8d57d..677adda942 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.7.0" + "@value": "3.8.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 1dd4f20683..1e5425428e 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 1aaeff5d68..2e0990b93f 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.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -321,7 +321,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 2d96abd6c4..59c6d25a57 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 e4fb33c039..2793c05f28 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.7.0" + "@value": "3.8.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 c2fb038be3..3f020a8f3f 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 4070b3d13b..0128345283 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.7.0" + "@value": "3.8.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 fba61a7487..7733ab2605 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 01d8fec850..1803b8fc69 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.7.0" + "@value": "3.8.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 727d4e1142..a2a583c1e6 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 be11e4e029..7e1e971380 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.7.0" + "@value": "3.8.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 4853a1de22..f10f57db60 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 377ef84054..f95551ec3c 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.7.0" + "@value": "3.8.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 46dd8826eb..b345f8e15a 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 206ccc3d0a..8c25b08f64 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.7.0" + "@value": "3.8.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 5dc2daab7b..b7f248bd89 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 c921a98ecb..e1e11836de 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.7.0" + "@value": "3.8.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 2fcc1266b3..02f1b78a1a 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 076458e8dc..0be08bde01 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.7.0" + "@value": "3.8.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 bed980f3a3..17f74f12d1 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 0ef568578c..833913aeaa 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.7.0" + "@value": "3.8.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 7b3a83baf8..8d11f19ba3 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 a7a2ff099f..ba6548f5f0 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.7.0" + "@value": "3.8.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 4139987d04..603eee91fe 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 d5c0342db1..223e8452dc 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.7.0" + "@value": "3.8.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 029f9fa863..16f4c5abf8 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 ee79201558..9f065bcfcc 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.7.0" + "@value": "3.8.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 94bbb88aa3..014d1b884b 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 c2dc817db4..2a0aa9afea 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.7.0" + "@value": "3.8.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 628902d547..d94fa34d0c 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 11902df27e..5a105f7ff4 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.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -2352,7 +2352,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 29003fc739..b1d8f88085 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 86f1af76d9..a50792ea28 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.7.0" + "@value": "3.8.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 a26385f370..1a1de4657b 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 ff5cb14475..6b02341185 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.7.0" + "@value": "3.8.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 78be8a0949..6799f3b4b6 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 7bc2002400..6c9b7a1bb5 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.7.0" + "@value": "3.8.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 0ee45a1143..287faf4b4b 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 3c3a516a22..7e1050bf55 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.7.0" + "@value": "3.8.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 1367e7f488..9789a1cda4 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 45824db396..8d22349979 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.7.0" + "@value": "3.8.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 722e728a37..1f1ff728be 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 cbfb50f4b7..be736b158f 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.7.0" + "@value": "3.8.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 0dc9e4a8c3..5cf6c6b476 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 f22d606742..868306ead5 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.7.0" + "@value": "3.8.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 d36dea04b3..b4bdf12b66 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 e4eea0b594..cbf43e9f33 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.7.0" + "@value": "3.8.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 74c0d72990..366cf07428 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 8b8b56deff..7e51ba86ed 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.7.0" + "@value": "3.8.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 9d0cf99e01..d08f4726ec 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 4ab152e60a..58c660dcf2 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.7.0" + "@value": "3.8.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 09895cda46..c8b3827c22 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 9583b1544b..2f70800099 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.7.0" + "@value": "3.8.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 b544f5ecc1..033257c84a 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 ff075ca883..2e265b8414 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.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -4860,7 +4860,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -4933,7 +4933,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -5006,7 +5006,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 6d97c19a10..576b853d31 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 c9908ca7e2..4efcf0cd79 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.7.0" + "@value": "3.8.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 5ad8d4d2ed..3dfc82adfb 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 df6aebf1cf..e1022c778f 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.7.0" + "@value": "3.8.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 61aa552fb5..34b7d71565 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 f324ca0f34..9449e6fbe2 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.7.0" + "@value": "3.8.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 21a89d06b5..6432226921 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 b5095bec99..6f0bee88db 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.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -394,7 +394,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 a3a0d50370..03d0989543 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 501d2bf2f1..0392f4dac0 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.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -394,7 +394,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 be6db22a32..a30ec5c9da 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 e1f060e488..3be0f350b0 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.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -555,7 +555,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 06d293b4d2..16e76f613c 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 576d4573ec..a78af98a52 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.7.0" + "@value": "3.8.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 b2ccd78ba8..352d4c1c2d 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 22e6296e24..f0eb7bd213 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.7.0" + "@value": "3.8.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 234da9923a..c675da1654 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 93b43803a7..90288bb5ba 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.7.0" + "@value": "3.8.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 4d68517ff7..5e43a6940e 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 4ba4a6396c..7240888e57 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.7.0" + "@value": "3.8.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 463f94903b..1b1ed1fadd 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 91f188bcce..9fa320fdd1 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.7.0" + "@value": "3.8.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 08510d5a13..29139910ee 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 4bbb62115c..17c1d2ebc9 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.7.0" + "@value": "3.8.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 f27d40c68c..a47e7814d9 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 4c3b2f3e0f..ee470b1929 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.7.0" + "@value": "3.8.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 06ca5b7809..e5ac04ca2a 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 4edd62839f..e29b6a3a8f 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.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -104,7 +104,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 d974a54c15..1ee849a83b 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 df3c71e45e..69f980b832 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.7.0" + "@value": "3.8.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 e336f4275b..5fe1b66900 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 e1bbcf8adb..27d16e2185 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.7.0" + "@value": "3.8.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 d7209ea4d5..69ff88b546 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 db4d7084c0..db4ab4bfa0 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.7.0" + "@value": "3.8.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 6ff4ce0a70..13c3677438 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 cb79682e7b..622eb745d3 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.7.0" + "@value": "3.8.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 e6ea2913e8..2995ae8c42 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 1051956136..4d89d017fe 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.7.0" + "@value": "3.8.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 888ad47e44..35f2189d29 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 a5afafc124..024bf5feb5 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.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -2352,7 +2352,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 333858a420..da0c733ed8 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 1b28a70b9f..a51fd0a076 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.7.0" + "@value": "3.8.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 73b2418e3b..ff67104e0d 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 92a7205c21..7150dd2e03 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.7.0" + "@value": "3.8.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 0f8cf8044d..8540ace8f6 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 a0c8bb98e9..7686041805 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.7.0" + "@value": "3.8.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 18491130cb..9416a03cf0 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 46b2231435..9d995f63d7 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.7.0" + "@value": "3.8.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 bbaa9171d2..3c8399d5a4 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 f31d791c13..0172a6286e 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.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -1030,7 +1030,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 185ddfa73c..ed55411ddc 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 9db960f333..17c1192920 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.7.0" + "@value": "3.8.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 1b672d5eac..6db3203faa 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 284ffa4ccf..f3b4c0d1fa 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.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -650,7 +650,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 8223137fbd..152c76bed5 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 cae9d4898b..4bf3326907 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.7.0" + "@value": "3.8.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 8dac9bdec4..a2255cee71 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 e4e8e1d2d8..59726b89c3 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.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -5555,7 +5555,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -5628,7 +5628,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 633f50638a..0a6f9c3a23 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 486da5c3d0..c0889e3c79 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.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -3034,7 +3034,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 68245940b1..d5b9599aac 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 2439a074a9..38548f92c8 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.7.0" + "@value": "3.8.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 184355185a..ab938604a2 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 1f5a1e146c..40bac43a89 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.7.0" + "@value": "3.8.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 fdfb1105d9..b52c8b5749 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 1e7e9bc97c..47e07231ea 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.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -1029,7 +1029,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 7c0077e3d1..132d2ee1af 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 964690c4fc..538d03ca11 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.7.0" + "@value": "3.8.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 1ae8acc6b9..8a4655a1af 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 c3ba647835..f6fc899a1e 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.7.0" + "@value": "3.8.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 2f9eed7c96..3ac546222a 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 e4e4f51493..563a33dc08 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.7.0" + "@value": "3.8.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 48fc01a1c4..bdfa9c0b0d 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 52cd71630a..c686ad7a81 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.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -423,7 +423,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 2fda76a1f6..2034629f2f 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 1e5cf2768a..00d4d9b19e 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.7.0" + "@value": "3.8.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 06629e7afa..24ef016b1a 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 a51430be0f..a0b2c43637 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.7.0" + "@value": "3.8.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 51a47abdea..6aa4a7946c 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 932bbec0eb..8f50a93846 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.7.0" + "@value": "3.8.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 9c8393d94f..141e7ee57e 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 367dfb8595..ce94ca9a6a 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.7.0" + "@value": "3.8.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 684dc43609..9facd8e800 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 937e2fc641..a6191be333 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.7.0" + "@value": "3.8.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 0ab0c40449..e748b15baa 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 5f26ab9be3..2af4098588 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.7.0" + "@value": "3.8.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 e9af6ace15..74fba4212d 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 9a9c3365e9..7ab53213e9 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.7.0" + "@value": "3.8.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 1ade2e1a11..914f97e4a2 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 e55475e18f..3feeb558b7 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.7.0" + "@value": "3.8.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 aa3041622d..abf135ceb1 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 516a28132f..31a309d55d 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.7.0" + "@value": "3.8.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 e7b50d15bf..2163614b14 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 1708d35880..6ad3a0ab70 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.7.0" + "@value": "3.8.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 aa0d5f2ef2..a67a75c01e 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 868e3c5749..4ff377cbe4 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.7.0" + "@value": "3.8.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 d5464538d5..a5ce6bb67b 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 3dc4c6121a..e527c9d30e 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.7.0" + "@value": "3.8.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 b61d5f415a..e6e64c78ad 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 b3b3a80fbb..78d2464ad9 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.7.0" + "@value": "3.8.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 782f2906b6..ca0e01bc26 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 7529588fbc..b8a93b2baf 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.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -1492,7 +1492,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -1670,7 +1670,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -1912,7 +1912,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -2673,7 +2673,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 1f58f39825..056bb74040 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 4c8f25fa95..9316fede2e 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.7.0" + "@value": "3.8.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 e06a9018e1..0dc7868871 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 b51738d866..012d96406b 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.7.0" + "@value": "3.8.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 301dc8272e..14525b5ade 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 6af12a2353..95839ed8df 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.7.0" + "@value": "3.8.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 79e5d0c375..90c0ee7c95 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 58e4575776..bf359baa82 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.7.0" + "@value": "3.8.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 0ca7081a72..1254c5dba3 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 6ef86a96d1..b6328cb07e 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.7.0" + "@value": "3.8.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 39f5ed7a41..f37c2d8fba 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 58906ff203..7c179036f7 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.7.0" + "@value": "3.8.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 d2dcbd7099..cd28eefd7d 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.7.0" + "@value": "3.8.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 5a8652a95b..3da281e826 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 a5af647bd1..c0721b20c2 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.7.0" + "@value": "3.8.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 04af7ca9d3..104f8ffd59 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 c6b7b469f1..04a70f4504 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.7.0" + "@value": "3.8.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 431f1db8a0..885e039fa5 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 be1fbaba75..8aca8a7f51 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.7.0" + "@value": "3.8.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 1beb782ce4..409e27f25f 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 567d8ffb41..9aedc08bd8 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.7.0" + "@value": "3.8.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 bfd9265885..1537a6c9a0 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 75c3617ab5..f36ff50a59 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.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -833,7 +833,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -7167,7 +7167,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -7662,7 +7662,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -7692,7 +7692,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 a280b0a326..f5d2d9fca2 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 a3cb609e42..6fcd91c9de 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.7.0" + "@value": "3.8.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 1f94f3a7ba..3051be3277 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 451575c3d6..80c91843e0 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.7.0" + "@value": "3.8.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 35ff00808b..bf6d308102 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 4f5349a759..8c0edfea51 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.7.0" + "@value": "3.8.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 7ad9cbe3d2..2b7f0eae7c 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 cf0bfbddc5..c38cd38bad 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.7.0" + "@value": "3.8.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 acaca0120e..335f1d3f1f 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 3371f4b64b..112eca1d32 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.7.0" + "@value": "3.8.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 970849b8dc..74494bc8a6 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 0360e3d3b9..cfaa67e145 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.7.0" + "@value": "3.8.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 1ff9154c6e..7444740cc8 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 be113a47d2..1ec4cfa7e8 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.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -964,7 +964,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -1459,7 +1459,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 44b0483462..ff26ad62d4 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 48ebc8280d..90e977c813 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.7.0" + "@value": "3.8.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 4ac834a2d6..5fafd3b5c3 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 a67f58b8ac..f0194233ae 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.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ @@ -1464,7 +1464,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 e3225f1465..4882c8838d 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 7b8928c6e5..f8a3172810 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.7.0" + "@value": "3.8.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 c36d1fdfff..d3acabea42 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 ace92d7a5e..19632d735c 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.7.0" + "@value": "3.8.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 89032c4580..2c4eb31bbe 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.7.0", + "apiContract:modelVersion": "3.8.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 152023cdfb..b5a02d084b 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.7.0" + "@value": "3.8.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 78307f3544..c2041b8b99 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 5e24eafbce..0af67bd8fa 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.7.0" + "@value": "3.8.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 db63bc6ccc..d20bc6daf8 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 6b4017096a..aa3c9ed321 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.7.0" + "@value": "3.8.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 ca4f678e73..77e0d9c46b 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 134953f690..447569abfe 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 @@ -425,7 +425,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 fd00c05cfd..0da0569da3 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 651e347735..1e47aea25e 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.7.0" + "@value": "3.8.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 2c4f7b6681..347addb4ad 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 3229ab00ef..31eb69636a 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.7.0" + "@value": "3.8.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 532c357fc6..314246ef43 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 940e6f23be..b4e72894de 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.7.0" + "@value": "3.8.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 b20b13d2ca..5064fadc24 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 bc9c394eb8..571ba67ebb 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.7.0" + "@value": "3.8.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 1ed1fbbbf5..f462255623 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 57b1df14c7..f47f24153c 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.7.0" + "@value": "3.8.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 6a503c06b7..e1d07ad9b1 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 eb099ed7f8..89b8aa0ac3 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.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#sourceSpec": [ 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 09108a7367..c5e61f49a3 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.7.0" + "@value": "3.8.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 384a00b1b4..369fce2359 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 7160078caf..a727df3ed8 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.7.0" + "@value": "3.8.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 a488906fb8..9014aa4aff 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 ec1477378b..85f87b0da3 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.7.0" + "@value": "3.8.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 8fd43c021a..a20306742b 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 4e9b87bb96..266ef85ca7 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.7.0" + "@value": "3.8.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 950eb6524c..30db032608 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 72df4aa911..cf2bd8beca 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.7.0" + "@value": "3.8.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 ee878a4959..02263b43fc 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.0", "http://a.ml/vocabularies/document#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 9d927fac8a..07acd30b70 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.7.0" + "@value": "3.8.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 6a7f45a964..bb0d695f40 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 115e9bf3ce..40a3e9e2a1 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.7.0" + "@value": "3.8.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 96f059ad67..68d577c7c5 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 5f12dba580..3c2cc358b1 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 @@ -756,7 +756,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 7dd2ffad26..7e3db08d6f 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 c9c09a5136..f7f091bbac 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 @@ -190,7 +190,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.0" } ], "doc:transformed": [ @@ -410,7 +410,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 bb8497d2b7..34161f5661 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.7.0", + "apiContract:modelVersion": "3.8.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, @@ -384,7 +384,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.7.0", + "apiContract:modelVersion": "3.8.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 c30ada23e5..936ace59ac 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.7.0" + "@value": "3.8.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 f20356c2fe..d80e82dd66 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 932425c4f7..3cfb87e7ce 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.7.0" + "@value": "3.8.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 320cffd608..dc37bcc9db 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 e8b9a6259c..be0bbb8092 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.7.0" + "@value": "3.8.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 9213c53ed9..0cea05e691 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 0512519a8e..793a87835a 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.7.0" + "@value": "3.8.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 d1659ec048..3b3273b60d 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 f41e7041c2..35e2330a8c 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.7.0" + "@value": "3.8.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 a2eabcfad2..92e298707e 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 de3d4d820c..fae019f13a 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.7.0" + "@value": "3.8.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 0436a24eff..0c98c1ec9d 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.7.0", + "apiContract:modelVersion": "3.8.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 ac693dbfe9..82ab795b2b 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.7.0" + "@value": "3.8.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 1d2ca01f87..64398a7351 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 140e1178e2..10e72a6fc2 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.7.0" + "@value": "3.8.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 baf56b1571..fd7e3c47cb 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.7.0", + "apiContract:modelVersion": "3.8.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 d74dcd0fe7..2ad949bfdc 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.7.0" + "@value": "3.8.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 ce73516599..f4ee3aff75 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 10e40e8dd6..9a12ac15b8 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.7.0" + "@value": "3.8.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 4b3e102b19..92a3aff900 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 9ea2cd1ef0..eb7fdb4d67 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.7.0" + "@value": "3.8.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 c1a4026e81..627ced2be2 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 4fcd04dbd1..36e9189898 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.7.0" + "@value": "3.8.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 4db5fe16fe..f2d8e095e2 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 d249c45c5f..c969552edd 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.7.0" + "@value": "3.8.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 1ddafa3598..3627539a08 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 2061c3ffd3..c77e105d2b 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.7.0" + "@value": "3.8.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 4399a93753..a1afebb725 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 68858a3b4c..31b2e278e8 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.7.0" + "@value": "3.8.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 bd09889e7f..9b1b4d140a 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 feb1023539..fb8cdc638c 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.7.0" + "@value": "3.8.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 0787800362..a76039e56b 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 6000dc47be..50fca1e620 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.7.0" + "@value": "3.8.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 ffc004b682..ea26e20300 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 600a178e33..93acedce45 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.7.0" + "@value": "3.8.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 d7c55dd65e..3824f51f31 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 d1c6847be7..02e3ca78c2 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.7.0" + "@value": "3.8.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 441e65ff29..cdf8e65537 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 3e9823d9b1..ce40593557 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.7.0" + "@value": "3.8.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 fc4e366f56..0931d156e4 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 c2b12335be..00c6926524 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.7.0" + "@value": "3.8.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 def5571969..55dd1b9b74 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 3f611886d7..3a66cffd30 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.7.0" + "@value": "3.8.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 c9abc81534..54f6079865 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 7a6784ffcd..ba86c8d217 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.7.0" + "@value": "3.8.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 ab8a27d374..12ce279317 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 e19009b79d..cfeb1153d8 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.7.0" + "@value": "3.8.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 ff6ed7308d..35eb3cbeed 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 ee295a08c2..68ab916cbb 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.7.0" + "@value": "3.8.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 ff2b11f865..bd513243ee 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 2fce5ed1c7..d14a410efa 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.7.0" + "@value": "3.8.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 44d10f1f09..3a19de453b 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 8b04a46077..5d306d257e 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.7.0" + "@value": "3.8.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 bf424426b7..2d43c6d306 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 52b9e5f593..a252a056c8 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.7.0" + "@value": "3.8.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 f5b1cc587e..b31f841a31 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 8df040cbe0..ddf5d0c110 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 @@ -221,7 +221,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.0" } ], "doc:transformed": [ @@ -460,7 +460,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.0" } ], "doc:sourceSpec": [ @@ -490,7 +490,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 52a1c3d06c..a2dcf5695e 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.7.0", + "apiContract:modelVersion": "3.8.0", "doc:transformed": true, "doc:sourceSpec": "ASYNC 2.0" }, @@ -398,7 +398,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.7.0", + "apiContract:modelVersion": "3.8.0", "doc:sourceSpec": "RAML 1.0" }, { @@ -406,7 +406,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.7.0", + "apiContract:modelVersion": "3.8.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 7b38753a8a..a00e0e29ac 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 @@ -152,7 +152,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.0" } ], "doc:transformed": [ @@ -248,7 +248,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 b96bc33fe6..d87cafe88e 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.7.0", + "apiContract:modelVersion": "3.8.0", "doc:transformed": true, "doc:sourceSpec": "ASYNC 2.0" }, @@ -253,7 +253,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.7.0", + "apiContract:modelVersion": "3.8.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 c32281e9ff..6730ffea1c 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 @@ -146,7 +146,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.0" } ], "doc:transformed": [ @@ -198,7 +198,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 05828de1a0..6c25e0a0ee 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.7.0", + "apiContract:modelVersion": "3.8.0", "doc:transformed": true, "doc:sourceSpec": "ASYNC 2.0" }, @@ -207,7 +207,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.7.0", + "apiContract:modelVersion": "3.8.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 7e23052b41..6ed7b9f62e 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 @@ -152,7 +152,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.0" } ], "doc:transformed": [ @@ -248,7 +248,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 64cb98d4b4..38dd243ded 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.7.0", + "apiContract:modelVersion": "3.8.0", "doc:transformed": true, "doc:sourceSpec": "ASYNC 2.0" }, @@ -219,7 +219,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.7.0", + "apiContract:modelVersion": "3.8.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 8bde6f3000..22787dabc9 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 @@ -191,7 +191,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 c6f0efb7f1..42ab8bee45 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.7.0", + "apiContract:modelVersion": "3.8.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 e4943538d4..52c2fc4904 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 @@ -152,7 +152,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.0" } ], "doc:transformed": [ @@ -367,7 +367,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 55a9c66b40..5b186be18e 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.7.0", + "apiContract:modelVersion": "3.8.0", "doc:transformed": true, "doc:sourceSpec": "ASYNC 2.0" }, @@ -306,7 +306,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.7.0", + "apiContract:modelVersion": "3.8.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 fc865877db..873815f6af 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.7.0" + "@value": "3.8.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 f6fafdde5d..f044c55c0b 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 ca4dabbc2e..999e9b7cca 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.7.0" + "@value": "3.8.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 8a8dea6821..87ecadf63f 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.0", "http://a.ml/vocabularies/document#sourceSpec": "ASYNC 2.0" }, { 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 b508473c3b..ecf4762aec 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 @@ -229,7 +229,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 724c9c5337..bdffc3b9bc 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.7.0", + "apiContract:modelVersion": "3.8.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 90617530fe..eca89a9f6a 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 @@ -229,7 +229,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 150eaf2680..2445f88739 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.7.0", + "apiContract:modelVersion": "3.8.0", "doc:transformed": true, "doc:sourceSpec": "ASYNC 2.0" }, 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 e6f113de1f..4a144723ea 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.7.0" + "@value": "3.8.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 f3b8af531e..41f3a7278c 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 9e442d0be7..f169a6683f 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 @@ -427,7 +427,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 34083d49db..3b8154a4a3 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.7.0", + "apiContract:modelVersion": "3.8.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 4029675775..98f67b21bd 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 @@ -428,7 +428,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 161a04c64c..44deebbf89 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.7.0", + "apiContract:modelVersion": "3.8.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 8657b6c252..078b119da6 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 @@ -1393,7 +1393,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.0" } ], "doc:transformed": [ @@ -1541,7 +1541,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.0" } ], "doc:sourceSpec": [ @@ -1689,7 +1689,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.0" } ], "doc:sourceSpec": [ @@ -1837,7 +1837,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 3c33bc5b1b..c6d2406279 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.7.0", + "apiContract:modelVersion": "3.8.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, @@ -1843,7 +1843,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.7.0", + "apiContract:modelVersion": "3.8.0", "doc:sourceSpec": "RAML 1.0" }, { @@ -1851,7 +1851,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.7.0", + "apiContract:modelVersion": "3.8.0", "doc:sourceSpec": "RAML 1.0" }, { @@ -1859,7 +1859,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.7.0", + "apiContract:modelVersion": "3.8.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 4cea7ed7db..73dc9c8c51 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 @@ -252,7 +252,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 62d9acb5d5..7574fe160e 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.7.0", + "apiContract:modelVersion": "3.8.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 69e9336eb3..e3f23ec105 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 @@ -252,7 +252,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 8a25a5dbbf..63cb96491e 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.7.0", + "apiContract:modelVersion": "3.8.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 06c0066340..6c9fa6e858 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.7.0" + "@value": "3.8.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 e732731632..24988428df 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 2f4846b65c..ae09580be9 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 @@ -1223,7 +1223,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.0" } ], "doc:transformed": [ @@ -1686,7 +1686,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.0" } ], "doc:sourceSpec": [ @@ -1741,7 +1741,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.0" } ], "doc:sourceSpec": [ @@ -1796,7 +1796,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 2a8e5a37e8..94ed4dff58 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.7.0", + "apiContract:modelVersion": "3.8.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, @@ -1654,7 +1654,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.7.0", + "apiContract:modelVersion": "3.8.0", "doc:sourceSpec": "RAML 1.0" }, { @@ -1671,7 +1671,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.7.0", + "apiContract:modelVersion": "3.8.0", "doc:sourceSpec": "RAML 1.0" }, { @@ -1688,7 +1688,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.7.0", + "apiContract:modelVersion": "3.8.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 3d024f8718..8f4cca16f2 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.7.0" + "@value": "3.8.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 136b1e0de5..d4475f21e7 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 b/amf-cli/shared/src/test/resources/validations/healthcare_reduced_v1.raml.resolved index ae1d4d9c45..13ca889043 100644 --- a/amf-cli/shared/src/test/resources/validations/healthcare_reduced_v1.raml.resolved +++ b/amf-cli/shared/src/test/resources/validations/healthcare_reduced_v1.raml.resolved @@ -308,7 +308,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#transformed": [ diff --git a/amf-cli/shared/src/test/resources/validations/healthcare_reduced_v2.raml.resolved b/amf-cli/shared/src/test/resources/validations/healthcare_reduced_v2.raml.resolved index 3d2c095e32..2796ea6d5b 100644 --- a/amf-cli/shared/src/test/resources/validations/healthcare_reduced_v2.raml.resolved +++ b/amf-cli/shared/src/test/resources/validations/healthcare_reduced_v2.raml.resolved @@ -290,7 +290,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 1c01012874..ed6fa56e90 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 @@ -289,7 +289,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 ad7f1dc8d6..9a83ac1b47 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.7.0", + "apiContract:modelVersion": "3.8.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 e14deb323c..bb47559ce5 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.7.0" + "@value": "3.8.0" } ], "doc:transformed": [ @@ -191,7 +191,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 118c035827..41d5d66cbb 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.7.0", + "apiContract:modelVersion": "3.8.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, @@ -157,7 +157,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.7.0", + "apiContract:modelVersion": "3.8.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 92a2667eab..6e00b96fb1 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.7.0" + "@value": "3.8.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 20db54a0c5..3a7dd9fc95 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.7.0", + "apiContract:modelVersion": "3.8.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 2f64c0fc82..5bd31f1c6f 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.7.0" + "@value": "3.8.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 d7501234a3..d767fc3fbe 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.7.0", + "apiContract:modelVersion": "3.8.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 1764390986..cb84a39ac8 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.7.0" + "@value": "3.8.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 c0392b1f42..fa5110f87b 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 fbc2ba684b..dff11f2190 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 @@ -1396,7 +1396,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 02bdcc80f9..67484eedfe 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 afdec08b90..900de6d2d9 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.7.0" + "@value": "3.8.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 7b713c6c90..9b7980c567 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 d7f69f496c..34fecbddd2 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.7.0" + "@value": "3.8.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 74bcefd8f1..2d59ea3e30 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 e5b1ce1ff9..4fb8999e07 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 @@ -1016,7 +1016,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 568f0f3901..8ac6899428 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 fac25f7308..9cef9ad4e8 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 @@ -1936,7 +1936,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 3573a7eea3..3e17fa9e99 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 91d24fdfb7..e19731193c 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.7.0" + "@value": "3.8.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 99d2cb7672..082a7c6a12 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.7.0", + "apiContract:modelVersion": "3.8.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 a3d9fe1990..36ab6ee6e4 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 @@ -222,7 +222,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 318b998cde..420ff16958 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.7.0", + "apiContract:modelVersion": "3.8.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 1c6f37929f..96c88c1f5a 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.7.0" + "@value": "3.8.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 6f726fa0fc..b1f9736983 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 @@ -5,7 +5,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.7.0", + "apiContract:modelVersion": "3.8.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 b4f8cdaaac..7e23d2814a 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.7.0" + "@value": "3.8.0" } ], "doc:transformed": [ @@ -353,7 +353,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 404f32b199..2a005bfe7e 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.7.0", + "apiContract:modelVersion": "3.8.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, @@ -334,7 +334,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.7.0", + "apiContract:modelVersion": "3.8.0", "doc:sourceSpec": "RAML 1.0" } ], diff --git a/amf-cli/shared/src/test/resources/validations/nil-type.raml.resolved b/amf-cli/shared/src/test/resources/validations/nil-type.raml.resolved index 8918de8400..74704bb892 100644 --- a/amf-cli/shared/src/test/resources/validations/nil-type.raml.resolved +++ b/amf-cli/shared/src/test/resources/validations/nil-type.raml.resolved @@ -268,7 +268,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 46560b3482..045add68c3 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.7.0" + "@value": "3.8.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 8613023946..25407a825a 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 0097295f52..06b0c0938f 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.7.0" + "@value": "3.8.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 5a78d8c708..8b875d8030 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 579d403b2a..6bfe63c13a 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 b53e60ef27..28d7bcd276 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 41a95da7be..dc81eea97a 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 d3470aba2f..9f9356574f 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 88ce1bed37..380446e328 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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-xml-object.jsonld b/amf-cli/shared/src/test/resources/validations/oas3/spec-extensions/extension-in-xml-object.jsonld index 3cd1cecf69..3fa69f5d17 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.7.0", + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.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 e08d17fdfc..a04f2041df 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.7.0" + "@value": "3.8.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 c3c55c61ed..7b7594a0e0 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.7.0", + "apiContract:modelVersion": "3.8.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, 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 f4fd051466..d629a949e5 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 @@ -337,7 +337,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 39858c34bb..9ca83c4e37 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.7.0", + "apiContract:modelVersion": "3.8.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 cbab33a4b9..6d4a9d87ae 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.7.0" + "@value": "3.8.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 a2e2410c74..bcf86d8220 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.7.0", + "apiContract:modelVersion": "3.8.0", "doc:transformed": true, "doc:sourceSpec": "OAS 3.0" }, 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 7d8b4e4030..6b616291d1 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 @@ -232,7 +232,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 19ba1efb02..e4d8178e22 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.7.0", + "apiContract:modelVersion": "3.8.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 f8d7e20903..d90850e96f 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 @@ -198,7 +198,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 0efdc20b9d..d855fd4111 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.7.0", + "apiContract:modelVersion": "3.8.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, diff --git a/amf-cli/shared/src/test/resources/validations/rt-parameters.raml.resolved b/amf-cli/shared/src/test/resources/validations/rt-parameters.raml.resolved index c84f565d66..8b833bb0c3 100644 --- a/amf-cli/shared/src/test/resources/validations/rt-parameters.raml.resolved +++ b/amf-cli/shared/src/test/resources/validations/rt-parameters.raml.resolved @@ -399,7 +399,7 @@ ], "http://a.ml/vocabularies/apiContract#modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.0" } ], "http://a.ml/vocabularies/document#transformed": [ 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 50a3bfa33a..16923103fe 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.7.0" + "@value": "3.8.0" } ], "doc:transformed": [ @@ -708,7 +708,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 01b128a3a2..3886aad81a 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.7.0", + "apiContract:modelVersion": "3.8.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, @@ -744,7 +744,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.7.0", + "apiContract:modelVersion": "3.8.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 76322db409..67ad72d622 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 @@ -770,7 +770,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 22a296fdd1..e46dba3509 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.7.0", + "apiContract:modelVersion": "3.8.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 31a69d7eb8..c0687f89cd 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.7.0" + "@value": "3.8.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 dade5b6b56..db4f5dc01c 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.7.0", + "apiContract:modelVersion": "3.8.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 3c14cc2743..24645b5b0c 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 @@ -654,7 +654,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.0" } ], "doc:transformed": [ @@ -849,7 +849,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.0" } ], "doc:sourceSpec": [ @@ -904,7 +904,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.0" } ], "doc:sourceSpec": [ @@ -959,7 +959,7 @@ ], "apiContract:modelVersion": [ { - "@value": "3.7.0" + "@value": "3.8.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 822c96f29e..79a837ae8c 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.7.0", + "apiContract:modelVersion": "3.8.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, @@ -888,7 +888,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.7.0", + "apiContract:modelVersion": "3.8.0", "doc:sourceSpec": "RAML 1.0" }, { @@ -905,7 +905,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.7.0", + "apiContract:modelVersion": "3.8.0", "doc:sourceSpec": "RAML 1.0" }, { @@ -922,7 +922,7 @@ "@type": [ "doc:APIContractProcessingData" ], - "apiContract:modelVersion": "3.7.0", + "apiContract:modelVersion": "3.8.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 f070c0def2..b1349a5f62 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.7.0" + "@value": "3.8.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 3f6462a0c6..edb7599b07 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.7.0", + "apiContract:modelVersion": "3.8.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 4f47b02e8b..8b1991e0b9 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.7.0" + "@value": "3.8.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 ca7f9dcd4e..06a072b56e 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.7.0", + "apiContract:modelVersion": "3.8.0", "doc:transformed": true, "doc:sourceSpec": "RAML 1.0" }, From 9ee4dee5ec3f5de15ea92def88ef01d0313417a4 Mon Sep 17 00:00:00 2001 From: hghianni Date: Fri, 14 Oct 2022 14:37:51 -0300 Subject: [PATCH 40/46] Publish 5.1.1-RC.1 --- amf-apicontract.versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amf-apicontract.versions b/amf-apicontract.versions index e1c6d3f22f..c60f378889 100644 --- a/amf-apicontract.versions +++ b/amf-apicontract.versions @@ -1,4 +1,4 @@ -amf.apicontract=5.1.1-RC.0 +amf.apicontract=5.1.1-RC.1 amf.aml=6.1.1-RC.0 amf.model=3.8.0 antlr4Version=0.5.17 \ No newline at end of file From 18f11d72454ce01df7b7f6862b3fe7b1a31e7d20 Mon Sep 17 00:00:00 2001 From: Tomas Fernandez Date: Tue, 18 Oct 2022 15:39:37 -0300 Subject: [PATCH 41/46] Publish 5.2.0 --- amf-apicontract.versions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/amf-apicontract.versions b/amf-apicontract.versions index c60f378889..688931d644 100644 --- a/amf-apicontract.versions +++ b/amf-apicontract.versions @@ -1,4 +1,4 @@ -amf.apicontract=5.1.1-RC.1 -amf.aml=6.1.1-RC.0 +amf.apicontract=5.2.0 +amf.aml=6.2.0 amf.model=3.8.0 antlr4Version=0.5.17 \ No newline at end of file From b159b73912f4fe59c2522ecbfbd22b4c79b7253f Mon Sep 17 00:00:00 2001 From: Loose Date: Fri, 6 Jan 2023 10:19:28 -0300 Subject: [PATCH 42/46] Publish 5.2.3-RC.0 --- Jenkinsfile | 3 +++ amf-apicontract.versions | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d4be5c813b..9bfde1f5ad 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -69,6 +69,7 @@ pipeline { anyOf { branch 'master' branch 'develop' + branch 'release/*' } } steps { @@ -84,6 +85,7 @@ pipeline { anyOf { branch 'master' branch 'develop' + branch 'release/*' } } steps { @@ -98,6 +100,7 @@ pipeline { anyOf { branch 'master' branch 'develop' + branch 'release/*' } } steps { diff --git a/amf-apicontract.versions b/amf-apicontract.versions index a7499da568..6f0a472205 100644 --- a/amf-apicontract.versions +++ b/amf-apicontract.versions @@ -1,4 +1,4 @@ -amf.apicontract=5.3.0-SNAPSHOT -amf.aml=6.3.0-SNAPSHOT +amf.apicontract=5.2.3-RC.0 +amf.aml=6.2.3-RC.0 amf.model=3.8.1 antlr4Version=0.6.21 \ No newline at end of file From 3493a2aba67a874cc14bef7f66c94d19af2d6452 Mon Sep 17 00:00:00 2001 From: nschejtman Date: Mon, 9 Jan 2023 17:59:28 -0300 Subject: [PATCH 43/46] W-12348272: fix HasShapeFederationMetadata interface change --- .../client/scala/model/domain/operations/ShapeOperation.scala | 4 ++-- .../client/scala/model/domain/operations/ShapeParameter.scala | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/amf-shapes/shared/src/main/scala/amf/shapes/client/scala/model/domain/operations/ShapeOperation.scala b/amf-shapes/shared/src/main/scala/amf/shapes/client/scala/model/domain/operations/ShapeOperation.scala index 4a434c80a6..ccda1b6425 100644 --- a/amf-shapes/shared/src/main/scala/amf/shapes/client/scala/model/domain/operations/ShapeOperation.scala +++ b/amf-shapes/shared/src/main/scala/amf/shapes/client/scala/model/domain/operations/ShapeOperation.scala @@ -1,7 +1,7 @@ package amf.shapes.client.scala.model.domain.operations import amf.core.client.scala.model.StrField -import amf.core.client.scala.model.domain.federation.{HasFederationMetadata, ShapeFederationMetadata} +import amf.core.client.scala.model.domain.federation.HasShapeFederationMetadata import amf.core.internal.metamodel.Field import amf.core.internal.parser.domain.{Annotations, Fields} import amf.shapes.internal.domain.metamodel.operations.ShapeOperationModel @@ -9,7 +9,7 @@ import amf.shapes.internal.domain.metamodel.operations.ShapeOperationModel._ import org.yaml.model.YPart case class ShapeOperation(fields: Fields, annotations: Annotations) extends AbstractOperation(fields, annotations) with - HasFederationMetadata[ShapeFederationMetadata] { + HasShapeFederationMetadata { override type RequestType = ShapeRequest override type ResponseType = ShapeResponse diff --git a/amf-shapes/shared/src/main/scala/amf/shapes/client/scala/model/domain/operations/ShapeParameter.scala b/amf-shapes/shared/src/main/scala/amf/shapes/client/scala/model/domain/operations/ShapeParameter.scala index a66e105d43..617895fe14 100644 --- a/amf-shapes/shared/src/main/scala/amf/shapes/client/scala/model/domain/operations/ShapeParameter.scala +++ b/amf-shapes/shared/src/main/scala/amf/shapes/client/scala/model/domain/operations/ShapeParameter.scala @@ -1,6 +1,6 @@ package amf.shapes.client.scala.model.domain.operations -import amf.core.client.scala.model.domain.federation.{HasFederationMetadata, ShapeFederationMetadata} +import amf.core.client.scala.model.domain.federation.HasShapeFederationMetadata import amf.core.client.scala.model.{BoolField, StrField} import amf.core.internal.parser.domain.{Annotations, Fields} import amf.shapes.internal.domain.metamodel.operations.ShapeParameterModel @@ -8,7 +8,7 @@ import amf.shapes.internal.domain.metamodel.operations.ShapeParameterModel._ import org.yaml.model.YPart case class ShapeParameter(override val fields: Fields, override val annotations: Annotations) - extends AbstractParameter(fields, annotations) with HasFederationMetadata[ShapeFederationMetadata] { + extends AbstractParameter(fields, annotations) with HasShapeFederationMetadata { override private[amf] def buildParameter(ann: Annotations): ShapeParameter = ShapeParameter(ann) override def parameterName: StrField = fields.field(ParameterName) From bdf40e635d125d5b3575095fed60f618f65721be Mon Sep 17 00:00:00 2001 From: Loose Date: Tue, 10 Jan 2023 12:00:01 -0300 Subject: [PATCH 44/46] Publish 5.2.3-RC.1 --- amf-apicontract.versions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/amf-apicontract.versions b/amf-apicontract.versions index 6f0a472205..9d0738355b 100644 --- a/amf-apicontract.versions +++ b/amf-apicontract.versions @@ -1,4 +1,4 @@ -amf.apicontract=5.2.3-RC.0 -amf.aml=6.2.3-RC.0 +amf.apicontract=5.2.3-RC.1 +amf.aml=6.2.3-RC.1 amf.model=3.8.1 antlr4Version=0.6.21 \ No newline at end of file From 872abf5eb136cc11ba2ad3825b0336cc349da9ed Mon Sep 17 00:00:00 2001 From: Loose Date: Tue, 10 Jan 2023 18:29:01 -0300 Subject: [PATCH 45/46] Publish 5.2.3 --- Jenkinsfile | 3 --- amf-apicontract.versions | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9bfde1f5ad..d4be5c813b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -69,7 +69,6 @@ pipeline { anyOf { branch 'master' branch 'develop' - branch 'release/*' } } steps { @@ -85,7 +84,6 @@ pipeline { anyOf { branch 'master' branch 'develop' - branch 'release/*' } } steps { @@ -100,7 +98,6 @@ pipeline { anyOf { branch 'master' branch 'develop' - branch 'release/*' } } steps { diff --git a/amf-apicontract.versions b/amf-apicontract.versions index 9d0738355b..a9b4f52fdf 100644 --- a/amf-apicontract.versions +++ b/amf-apicontract.versions @@ -1,4 +1,4 @@ -amf.apicontract=5.2.3-RC.1 -amf.aml=6.2.3-RC.1 +amf.apicontract=5.2.3 +amf.aml=6.2.3 amf.model=3.8.1 antlr4Version=0.6.21 \ No newline at end of file From af319f21dbb01d27f969afc2700b02303ee10005 Mon Sep 17 00:00:00 2001 From: damianpedra <109177940+damianpedra@users.noreply.github.com> Date: Wed, 26 Jul 2023 16:36:30 -0300 Subject: [PATCH 46/46] Publish 5.4.1 (#1836) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Publish 5.5.0-SNAPSHOT * W-13104073 (feat): adopted amf-core change in IdAdoption * W-13599698: skip computing min shape between shapes that share the same ID * W-13272640: add UnionFlattenerStage * W-13272640: add triple-unions test * W-13272640: avoid deleting annotations * W-13272640: avoid flattening links * W-13272640: avoid adopting again when flattening * W-13119160: added removeProperty to JsonLDObject * W-13674143 - Handle NPE in inheritance of Unions with empty anyOf * Remove legacy out-dated documentation * W-13679560: fix setting & rendering properties of type 'double' in JSONLDObject * (chore): fix code smells while debugging SN Regression * W-13741667 - Fix wrong positive in parsing validation with multiple flows * W-13739999 (fix): unnest unions in parsing. Didn't remove transformation step because it is still useful in some cases * W-13704689: add semantic parser builder to 0rphan nodes annotation parsing * Added some semex nesting tests * Added annotation mappings with mapKey tests * Updated model documentation * W-13796171: make idAdopter plugable into amf configuration (#1830) * w-13735186 add automatic-module-name to manifest file * W-13804080: fix multiple inheritance computation between union and object * Publish 5.4.1-RC.0 * W-13183752 Temp branh 5.4.1 (#1832) * Publish 5.4.1-RC.0 * fixed version of amf * Publish 5.4.1 (#1835) --------- Co-authored-by: Ariel Mirra Co-authored-by: Tomas Fernandez Co-authored-by: nschejtman Co-authored-by: Loose Co-authored-by: Hernán Najles <50325041+pope1838@users.noreply.github.com> --- .../client/platform/AMFConfiguration.scala | 27 +- .../client/scala/AMFConfiguration.scala | 24 +- .../parser/SecurityRequirementsParsers.scala | 6 +- .../common/transformation/ExtendsHelper.scala | 5 +- .../ParametrizedDeclarationParser.scala | 6 +- .../transformation/AmfEditingPipeline.scala | 2 + .../stages/ExtendsResolutionStage.scala | 69 +- .../stages/ExtensionsResolutionStage.scala | 10 +- .../GraphQLTypeRecursionDetectionStage.scala | 3 +- .../stages/UnionFlattenerStage.scala | 39 + amf-apicontract.versions | 6 +- .../resources/base-union-empty-anyof.raml | 19 + .../parser/examples/madness/output.txt.js | 3 +- .../parser/examples/madness/output.txt.jvm | 3 +- .../types/inheritance/madness/output.txt | 64 +- .../types/recursive-union-invalid/output.txt | 40 +- .../overriden-cyclic-properties.raml | 15 + .../annotation-mapping-with-map-key/api.yaml | 14 + .../dialect.yaml | 42 + .../resources/semantic/info-object/api.yaml | 7 + .../semantic/info-object/dialect.yaml | 33 + .../semantic/nested-semex-1/api.yaml | 8 + .../semantic/nested-semex-1/dialect.yaml | 32 + .../semantic/nested-semex-2/api.yaml | 8 + .../semantic/nested-semex-2/dialect.yaml | 37 + .../src/test/resources/union/inner-union.raml | 2 +- .../api.expanded.jsonld | 835 ++++++ .../api.flattened.jsonld | 515 ++++ .../api.raml | 21 + .../api.expanded.jsonld | 787 ++++++ .../api.flattened.jsonld | 494 ++++ .../api.raml | 21 + .../api.expanded.jsonld | 263 ++ .../api.flattened.jsonld | 237 ++ .../multiple-non-nested-unions/api.raml | 15 + .../raml10/unions/triple-unions.raml | 23 + .../triple-unions.resolved.expanded.jsonld | 562 ++++ .../triple-unions.resolved.flattened.jsonld | 456 ++++ .../multiple-inheritance-object-union.raml | 27 + .../validations/raml/triple-union.raml | 11 + .../security-schemes/multiple-flows.yaml | 35 + .../cli/internal/convert/WrapperTests.scala | 32 +- .../scala/amf/cycle/ParsedCloneTest.scala | 6 +- .../scala/amf/parser/Raml10ParserTest.scala | 11 + .../resolution/EditingResolutionTest.scala | 50 +- .../resolution/merge/JsonMergePatchTest.scala | 6 +- .../amf/semantic/SemanticExtensionTest.scala | 119 + .../scala/amf/testing/BaseUnitUtils.scala | 2 + .../validation/AMFModelAssertionTest.scala | 64 +- .../validation/ValidOasModelParserTest.scala | 4 + .../validation/ValidRamlModelParserTest.scala | 4 + .../IntrospectionElementsAdditionStep.scala | 27 +- .../client/platform/ShapesConfiguration.scala | 7 +- .../config/JsonLDSchemaConfiguration.scala | 16 +- .../SemanticJsonSchemaConfiguration.scala | 5 + .../client/scala/ShapesConfiguration.scala | 27 +- .../config/JsonLDSchemaConfiguration.scala | 20 +- .../SemanticJsonSchemaConfiguration.scala | 21 +- .../domain/jsonldinstance/JsonLDObject.scala | 19 +- .../scala/render/JsonLDObjectRender.scala | 9 +- .../MinShapeAlgorithm.scala | 26 +- .../NormalizationContext.scala | 2 +- .../spec/common/parser/AnnotationParser.scala | 7 +- .../JsonSchemaDialectParsePlugin.scala | 8 +- .../expression/RamlExpressionASTBuilder.scala | 10 +- build.sbt | 6 + documentation/behaviour_changes.md | 41 - documentation/dialects/validation.raml | 183 -- .../images/validation/example_graph1.png | Bin 45120 -> 0 bytes .../images/validation/shacl_diagram.png | Bin 287382 -> 0 bytes .../images/validation/validation_arch.png | Bin 99462 -> 0 bytes documentation/model.md | 4 + documentation/shapes_normalization.md | 361 --- documentation/validation.md | 766 ------ .../examples/example1/api.json | 8 - .../examples/example1/api.raml | 4 - .../examples/example1/profile.yaml | 14 - .../examples/example10/api.raml | 10 - .../examples/example10/profile.yaml | 20 - .../examples/example10/profile2.yaml | 20 - .../examples/example11/api.raml | 12 - .../examples/example11/profile.yaml | 37 - .../examples/example12/api.raml | 12 - .../examples/example12/profile.yaml | 41 - .../examples/example13/profile.yaml | 51 - .../examples/example14/profile.yaml | 68 - .../examples/example15/api.raml | 6 - .../examples/example15/profile.yaml | 3 - .../examples/example15/profile2.yaml | 5 - .../examples/example15/profile3.yaml | 8 - .../examples/example2/api.json | 12 - .../examples/example2/profile.yaml | 14 - .../examples/example3/api.yaml | 9 - .../examples/example3/profile.yaml | 14 - .../examples/example3/profile2.yaml | 15 - .../examples/example4/api.raml | 9 - .../examples/example4/profile.yaml | 17 - .../examples/example5/profile.yaml | 14 - .../examples/example6/api.yaml | 13 - .../examples/example6/profile.yaml | 14 - .../examples/example7/profile.yaml | 22 - .../examples/example8/api.raml | 12 - .../examples/example8/profile.yaml | 18 - .../examples/example8/profile2.yaml | 22 - .../examples/example9/profile.yaml | 18 - .../examples/example9/profile2.yaml | 18 - .../validation_tutorial/validation.md | 2370 ----------------- documentation/validations/amf_profile.raml | 1135 -------- .../validations/openapi_profile.raml | 82 - documentation/validations/raml_profile.raml | 37 - project/AutomaticModuleName.scala | 11 + 111 files changed, 5139 insertions(+), 5745 deletions(-) create mode 100644 amf-api-contract/shared/src/main/scala/amf/apicontract/internal/transformation/stages/UnionFlattenerStage.scala create mode 100644 amf-cli/shared/src/test/resources/base-union-empty-anyof.raml create mode 100644 amf-cli/shared/src/test/resources/overriden-cyclic-properties.raml create mode 100644 amf-cli/shared/src/test/resources/semantic/annotation-mapping-with-map-key/api.yaml create mode 100644 amf-cli/shared/src/test/resources/semantic/annotation-mapping-with-map-key/dialect.yaml create mode 100644 amf-cli/shared/src/test/resources/semantic/info-object/api.yaml create mode 100644 amf-cli/shared/src/test/resources/semantic/info-object/dialect.yaml create mode 100644 amf-cli/shared/src/test/resources/semantic/nested-semex-1/api.yaml create mode 100644 amf-cli/shared/src/test/resources/semantic/nested-semex-1/dialect.yaml create mode 100644 amf-cli/shared/src/test/resources/semantic/nested-semex-2/api.yaml create mode 100644 amf-cli/shared/src/test/resources/semantic/nested-semex-2/dialect.yaml create mode 100644 amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions-in-resource-types/api.expanded.jsonld create mode 100644 amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions-in-resource-types/api.flattened.jsonld create mode 100644 amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions-in-resource-types/api.raml create mode 100644 amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions-in-traits/api.expanded.jsonld create mode 100644 amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions-in-traits/api.flattened.jsonld create mode 100644 amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions-in-traits/api.raml create mode 100644 amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.expanded.jsonld create mode 100644 amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.flattened.jsonld create mode 100644 amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml create mode 100644 amf-cli/shared/src/test/resources/upanddown/raml10/unions/triple-unions.raml create mode 100644 amf-cli/shared/src/test/resources/upanddown/raml10/unions/triple-unions.resolved.expanded.jsonld create mode 100644 amf-cli/shared/src/test/resources/upanddown/raml10/unions/triple-unions.resolved.flattened.jsonld create mode 100644 amf-cli/shared/src/test/resources/validations/raml/multiple-inheritance-object-union.raml create mode 100644 amf-cli/shared/src/test/resources/validations/raml/triple-union.raml create mode 100644 amf-cli/shared/src/test/resources/validations/security-schemes/multiple-flows.yaml delete mode 100644 documentation/behaviour_changes.md delete mode 100644 documentation/dialects/validation.raml delete mode 100644 documentation/images/validation/example_graph1.png delete mode 100644 documentation/images/validation/shacl_diagram.png delete mode 100644 documentation/images/validation/validation_arch.png delete mode 100644 documentation/shapes_normalization.md delete mode 100644 documentation/validation.md delete mode 100644 documentation/validation_tutorial/examples/example1/api.json delete mode 100644 documentation/validation_tutorial/examples/example1/api.raml delete mode 100644 documentation/validation_tutorial/examples/example1/profile.yaml delete mode 100644 documentation/validation_tutorial/examples/example10/api.raml delete mode 100644 documentation/validation_tutorial/examples/example10/profile.yaml delete mode 100644 documentation/validation_tutorial/examples/example10/profile2.yaml delete mode 100644 documentation/validation_tutorial/examples/example11/api.raml delete mode 100644 documentation/validation_tutorial/examples/example11/profile.yaml delete mode 100644 documentation/validation_tutorial/examples/example12/api.raml delete mode 100644 documentation/validation_tutorial/examples/example12/profile.yaml delete mode 100644 documentation/validation_tutorial/examples/example13/profile.yaml delete mode 100644 documentation/validation_tutorial/examples/example14/profile.yaml delete mode 100644 documentation/validation_tutorial/examples/example15/api.raml delete mode 100644 documentation/validation_tutorial/examples/example15/profile.yaml delete mode 100644 documentation/validation_tutorial/examples/example15/profile2.yaml delete mode 100644 documentation/validation_tutorial/examples/example15/profile3.yaml delete mode 100644 documentation/validation_tutorial/examples/example2/api.json delete mode 100644 documentation/validation_tutorial/examples/example2/profile.yaml delete mode 100644 documentation/validation_tutorial/examples/example3/api.yaml delete mode 100644 documentation/validation_tutorial/examples/example3/profile.yaml delete mode 100644 documentation/validation_tutorial/examples/example3/profile2.yaml delete mode 100644 documentation/validation_tutorial/examples/example4/api.raml delete mode 100644 documentation/validation_tutorial/examples/example4/profile.yaml delete mode 100644 documentation/validation_tutorial/examples/example5/profile.yaml delete mode 100644 documentation/validation_tutorial/examples/example6/api.yaml delete mode 100644 documentation/validation_tutorial/examples/example6/profile.yaml delete mode 100644 documentation/validation_tutorial/examples/example7/profile.yaml delete mode 100644 documentation/validation_tutorial/examples/example8/api.raml delete mode 100644 documentation/validation_tutorial/examples/example8/profile.yaml delete mode 100644 documentation/validation_tutorial/examples/example8/profile2.yaml delete mode 100644 documentation/validation_tutorial/examples/example9/profile.yaml delete mode 100644 documentation/validation_tutorial/examples/example9/profile2.yaml delete mode 100644 documentation/validation_tutorial/validation.md delete mode 100644 documentation/validations/amf_profile.raml delete mode 100644 documentation/validations/openapi_profile.raml delete mode 100644 documentation/validations/raml_profile.raml create mode 100644 project/AutomaticModuleName.scala diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/AMFConfiguration.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/AMFConfiguration.scala index 484fa37641..0b0ac2e88f 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/AMFConfiguration.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/client/platform/AMFConfiguration.scala @@ -21,6 +21,8 @@ import amf.core.internal.convert.TransformationPipelineConverter._ import scala.scalajs.js.annotation.{JSExportAll, JSExportTopLevel} import amf.apicontract.client.scala +import amf.core.client.platform.AMFGraphConfiguration +import amf.core.client.platform.adoption.{IdAdopter, IdAdopterProvider} import amf.core.client.platform.execution.BaseExecutionEnvironment import amf.core.client.platform.validation.payload.AMFShapePayloadValidationPlugin import amf.core.internal.convert.PayloadValidationPluginConverter.PayloadValidationPluginMatcher @@ -151,6 +153,9 @@ class AMFConfiguration private[amf] (private[amf] override val _internal: scala. override def withShapePayloadPlugin(plugin: AMFShapePayloadValidationPlugin): AMFConfiguration = _internal.withPlugin(PayloadValidationPluginMatcher.asInternal(plugin)) + + override def withIdAdopterProvider(idAdopterProvider: IdAdopterProvider): AMFConfiguration = + _internal.withIdAdopterProvider(idAdopterProvider) } /** common configuration with all configurations needed for RAML like: @@ -175,18 +180,16 @@ object RAMLConfiguration { @JSExportAll @JSExportTopLevel("OASConfiguration") object OASConfiguration { - def OAS20(): AMFConfiguration = InternalOASConfiguration.OAS20() - def OAS30(): AMFConfiguration = InternalOASConfiguration.OAS30() - def OAS30Component(): AMFConfiguration = InternalOASConfiguration.OAS30Component() - - /** - * common configuration to parse OAS20 and OAS30 APIs - */ - def OAS(): AMFConfiguration = InternalOASConfiguration.OAS() - - /** - * common configuration to parse OAS30Component fragments - */ + def OAS20(): AMFConfiguration = InternalOASConfiguration.OAS20() + def OAS30(): AMFConfiguration = InternalOASConfiguration.OAS30() + def OAS30Component(): AMFConfiguration = InternalOASConfiguration.OAS30Component() + + /** common configuration to parse OAS20 and OAS30 APIs + */ + def OAS(): AMFConfiguration = InternalOASConfiguration.OAS() + + /** common configuration to parse OAS30Component fragments + */ def OASComponent(): AMFConfiguration = InternalOASConfiguration.OASComponent() def fromSpec(spec: Spec): AMFConfiguration = InternalOASConfiguration.fromSpec(spec) } 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 d5af01ab16..8f90d16bbe 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 @@ -24,6 +24,7 @@ import amf.apicontract.internal.validation.shacl.{APIShaclModelValidationPlugin, import amf.core.client.common.validation.ProfileNames import amf.core.client.common.validation.ProfileNames._ import amf.core.client.scala.AMFGraphConfiguration +import amf.core.client.scala.adoption.IdAdopterProvider import amf.core.client.scala.config._ import amf.core.client.scala.errorhandling.ErrorHandlerProvider import amf.core.client.scala.execution.ExecutionEnvironment @@ -71,7 +72,8 @@ trait APIConfigurationBuilder { APISerializableAnnotations.annotations ++ WebAPISerializableAnnotations.annotations ++ ShapeSerializableAnnotations.annotations ), configuration.listeners, - configuration.options + configuration.options, + configuration.idAdopterProvider ).withPlugins( List( JsonSchemaShapePayloadValidationPlugin @@ -346,8 +348,9 @@ class AMFConfiguration private[amf] ( override private[amf] val errorHandlerProvider: ErrorHandlerProvider, override private[amf] val registry: AMLRegistry, override private[amf] val listeners: Set[AMFEventListener], - override private[amf] val options: AMFOptions -) extends ShapesConfiguration(resolvers, errorHandlerProvider, registry, listeners, options) { + override private[amf] val options: AMFOptions, + override private[amf] val idAdopterProvider: IdAdopterProvider +) extends ShapesConfiguration(resolvers, errorHandlerProvider, registry, listeners, options, idAdopterProvider) { /** Contains common AMF graph operations associated to documents */ override def baseUnitClient(): AMFBaseUnitClient = new AMFBaseUnitClient(this) @@ -511,14 +514,25 @@ class AMFConfiguration private[amf] ( override def withExecutionEnvironment(executionEnv: ExecutionEnvironment): AMFConfiguration = super._withExecutionEnvironment(executionEnv) + override def withIdAdopterProvider(idAdopterProvider: IdAdopterProvider): AMFConfiguration = + super._withIdAdopterProvider(idAdopterProvider) + override protected[amf] def copy( resolvers: AMFResolvers, errorHandlerProvider: ErrorHandlerProvider, registry: AMFRegistry, listeners: Set[AMFEventListener], - options: AMFOptions + options: AMFOptions, + idAdopterProvider: IdAdopterProvider = idAdopterProvider ): AMFConfiguration = - new AMFConfiguration(resolvers, errorHandlerProvider, registry.asInstanceOf[AMLRegistry], listeners, options) + new AMFConfiguration( + resolvers, + errorHandlerProvider, + registry.asInstanceOf[AMLRegistry], + listeners, + options, + idAdopterProvider + ) } object ConfigurationAdapter extends APIConfigurationBuilder { diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/common/parser/SecurityRequirementsParsers.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/common/parser/SecurityRequirementsParsers.scala index 7799d4bd3b..55f10bde61 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/common/parser/SecurityRequirementsParsers.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/common/parser/SecurityRequirementsParsers.scala @@ -87,7 +87,7 @@ case class OasLikeSecurityRequirementParser(node: YNode, adopted: SecurityRequir scheme.scheme.settings match { case se: OAuth2Settings => scopes.foreach(s => { - if (!isValidScope(se.flows.headOption, s)) { + if (!isValidScope(se.flows, s)) { ctx.eh.violation( UnknownScopeErrorSpecification, s, @@ -121,8 +121,8 @@ case class OasLikeSecurityRequirementParser(node: YNode, adopted: SecurityRequir } } - private def isValidScope(maybeFlow: Option[OAuth2Flow], scope: Scope): Boolean = - maybeFlow.exists(flow => flow.scopes.nonEmpty && flow.scopes.map(_.name.value()).contains(scope.name.value())) + private def isValidScope(flows: Seq[OAuth2Flow], scope: Scope): Boolean = + flows.exists(flow => flow.scopes.nonEmpty && flow.scopes.map(_.name.value()).contains(scope.name.value())) private def parseTarget(name: String, scheme: ParametrizedSecurityScheme, part: YPart): SecurityScheme = { ctx.declarations.findSecurityScheme(name, SearchScope.All) match { diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/common/transformation/ExtendsHelper.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/common/transformation/ExtendsHelper.scala index bf15217316..91f493b7e9 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/common/transformation/ExtendsHelper.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/common/transformation/ExtendsHelper.scala @@ -14,7 +14,6 @@ import amf.core.client.scala.errorhandling.{AMFErrorHandler, IgnoringErrorHandle import amf.core.client.scala.model.document.{BaseUnit, DeclaresModel, Fragment, Module} import amf.core.client.scala.model.domain.{DataNode, DomainElement, NamedDomainElement} import amf.core.client.scala.parse.document.ParserContext -import amf.core.internal.adoption.IdAdopter import amf.core.internal.annotations._ import amf.core.internal.datanode.DataNodeEmitter import amf.core.internal.parser.domain.{Annotations, FragmentRef} @@ -85,7 +84,7 @@ case class ExtendsHelper( val operation = ctxForTrait.factory .operationParser(entry, id, true) .parse() - new IdAdopter(operation, extensionId + "/applied").adoptFromRelative() + ctx.wrapped.config.idAdopterProvider.idAdopter(extensionId + "/applied").adoptFromRelative(operation) operation } } @@ -194,7 +193,7 @@ case class ExtendsHelper( collector.toList match { case element :: _ => - new IdAdopter(element, extensionId + "/applied").adoptFromRelative() + ctx.wrapped.config.idAdopterProvider.idAdopter(extensionId + "/applied").adoptFromRelative(element) new ReferenceResolutionStage(keepEditingInfo).resolveDomainElement(element, errorHandler, configuration) case Nil => errorHandler.violation( diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/raml/parser/domain/ParametrizedDeclarationParser.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/raml/parser/domain/ParametrizedDeclarationParser.scala index dda99dc923..53b165b326 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/raml/parser/domain/ParametrizedDeclarationParser.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/spec/raml/parser/domain/ParametrizedDeclarationParser.scala @@ -30,10 +30,8 @@ case class ParametrizedDeclarationParser( val declaration = fromStringNode(entry.key) declaration.add(Annotations(entry)) case _ => - val name = entry.key.as[YScalar].text - val declaration = - producer(name) - .add(Annotations(entry)) + val name = entry.key.as[YScalar].text + val declaration = producer(name).add(Annotations(entry)) setName(declaration, name, entry.key) declaration.fields.setWithoutId( ParametrizedDeclarationModel.Target, diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/transformation/AmfEditingPipeline.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/transformation/AmfEditingPipeline.scala index 540f6e6491..f67a169a8d 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/transformation/AmfEditingPipeline.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/transformation/AmfEditingPipeline.scala @@ -4,6 +4,7 @@ import amf.aml.internal.transform.steps.SemanticExtensionFlatteningStage import amf.apicontract.internal.spec.common.transformation.stage._ import amf.apicontract.internal.transformation.stages.{ ExtensionsResolutionStage, + UnionFlattenerStage, VirtualElementLexicalStage, WebApiReferenceResolutionStage } @@ -25,6 +26,7 @@ class AmfEditingPipeline private[amf] (urlShortening: Boolean = true, override v override def steps: Seq[TransformationStep] = { Seq( + new UnionFlattenerStage(), references, new VirtualElementLexicalStage(profileName, keepEditingInfo = true), new ExtensionsResolutionStage(profileName, keepEditingInfo = true), diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/transformation/stages/ExtendsResolutionStage.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/transformation/stages/ExtendsResolutionStage.scala index 76a772ed9f..db066702ba 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/transformation/stages/ExtendsResolutionStage.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/transformation/stages/ExtendsResolutionStage.scala @@ -1,6 +1,11 @@ package amf.apicontract.internal.transformation.stages -import amf.apicontract.client.scala.model.domain.templates.{ParametrizedResourceType, ParametrizedTrait, ResourceType, Trait} +import amf.apicontract.client.scala.model.domain.templates.{ + ParametrizedResourceType, + ParametrizedTrait, + ResourceType, + Trait +} import amf.apicontract.client.scala.model.domain.{EndPoint, Operation} import amf.apicontract.internal.spec.common.WebApiDeclarations.{ErrorEndPoint, ErrorTrait} import amf.apicontract.internal.spec.common.emitter.{Raml10EndPointEmitter, Raml10OperationEmitter} @@ -51,7 +56,7 @@ class ExtendsResolutionStage(profile: ProfileName, val keepEditingInfo: Boolean, .transform(model, configuration) } - class ExtendsResolution( + private class ExtendsResolution( profile: ProfileName, val keepEditingInfo: Boolean, val fromOverlay: Boolean = false, @@ -61,17 +66,29 @@ class ExtendsResolutionStage(profile: ProfileName, val keepEditingInfo: Boolean, )(implicit val errorHandler: AMFErrorHandler) { /** Default to raml10 context. */ - def ctx(): RamlWebApiContext = profile match { + private def ctx(): RamlWebApiContext = profile match { case Raml08Profile => new Raml08WebApiContext("", Nil, ParserContext(config = ParseConfig(config, errorHandler))) case _ => new Raml10WebApiContext("", Nil, ParserContext(config = ParseConfig(config, errorHandler))) } - def transform[T <: BaseUnit](model: T, configuration: AMFGraphConfiguration): T = - model.transform(findExtendsPredicate, transform(model)(_, _, configuration)).asInstanceOf[T] + def transform[T <: BaseUnit](model: T, configuration: AMFGraphConfiguration): T = { + + def findExtendsPredicate(element: DomainElement): Boolean = { + if (visited.contains(element.id) && !fromOverlay) true + else { + visited += element.id + element.isInstanceOf[EndPoint] + } + } + + val extendsResolutionTransformation = transform(model)(_, _, configuration) + + model.transform(findExtendsPredicate, extendsResolutionTransformation).asInstanceOf[T] + } - def asEndPoint( + private def asEndPoint( r: ParametrizedResourceType, context: Context, apiContext: RamlWebApiContext, @@ -85,7 +102,14 @@ class ExtendsResolutionStage(profile: ProfileName, val keepEditingInfo: Boolean, apiContext.eh.violation(TransformationValidation, r.id, None, message, r.position(), r.location()) ) val extendsHelper = - ExtendsHelper(profile, keepEditingInfo = keepEditingInfo, errorHandler, configuration, index, Some(apiContext)) + ExtendsHelper( + profile, + keepEditingInfo = keepEditingInfo, + errorHandler, + configuration, + index, + Some(apiContext) + ) val result = extendsHelper.asEndpoint( context.model, node, @@ -97,12 +121,14 @@ class ExtendsResolutionStage(profile: ProfileName, val keepEditingInfo: Boolean, result case _ => - apiContext.eh.violation(TransformationValidation, - r.id, - None, - s"Cannot find target for parametrized resource type ${r.id}", - r.position(), - r.location()) + apiContext.eh.violation( + TransformationValidation, + r.id, + None, + s"Cannot find target for parametrized resource type ${r.id}", + r.position(), + r.location() + ) ErrorEndPoint(r.id, r.annotations.find(classOf[SourceYPart]).map(_.ast).getOrElse(YNode.Null)) } } @@ -123,7 +149,6 @@ class ExtendsResolutionStage(profile: ProfileName, val keepEditingInfo: Boolean, configuration: AMFGraphConfiguration ): ListBuffer[EndPoint] = { val result = ListBuffer[EndPoint]() - collectResourceTypes(result, endpoint, context, apiContext, tree, configuration) result } @@ -225,14 +250,6 @@ class ExtendsResolutionStage(profile: ProfileName, val keepEditingInfo: Boolean, private def resourcePath(endPoint: EndPoint) = endPoint.path.option().map(_.replaceAll("\\{ext\\}", "")).getOrElse("") - private def findExtendsPredicate(element: DomainElement): Boolean = { - if (visited.contains(element.id) && !fromOverlay) true - else { - visited += element.id - element.isInstanceOf[EndPoint] - } - } - case class Branches()(implicit extendsContext: RamlWebApiContext) { def apply(branches: Seq[Branch]): BranchContainer = BranchContainer(branches) @@ -412,17 +429,17 @@ class ExtendsResolutionStage(profile: ProfileName, val keepEditingInfo: Boolean, val node: YNode = element.annotations.find(classOf[SourceYPart]).map(_.ast).collectFirst({ case e: YMapEntry => e }) match { case Some(entry) => entry.value - case _ => astFromEmition + case _ => astFromEmission } ElementTree(rootKey, buildNode(node)) } - protected def astFromEmition: YNode + protected def astFromEmission: YNode protected val rootKey: String } private case class EndPointTreeBuilder(endpoint: EndPoint) extends ElementTreeBuilder(endpoint) { - override protected def astFromEmition: YNode = + override protected def astFromEmission: YNode = YDocument(f => f.obj( Raml10EndPointEmitter(endpoint, SpecOrdering.Lexical)( @@ -442,7 +459,7 @@ class ExtendsResolutionStage(profile: ProfileName, val keepEditingInfo: Boolean, private case class OperationTreeBuilder(operation: Operation)(implicit errorHandler: IllegalTypeHandler) extends ElementTreeBuilder(operation) { - override protected def astFromEmition: YNode = + override protected def astFromEmission: YNode = YDocument(f => emitOperation(operation, f)).node .as[YMap] .entries diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/transformation/stages/ExtensionsResolutionStage.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/transformation/stages/ExtensionsResolutionStage.scala index e4c2cac81b..f07ecd2997 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/transformation/stages/ExtensionsResolutionStage.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/transformation/stages/ExtensionsResolutionStage.scala @@ -17,7 +17,12 @@ import amf.core.client.scala.transform.TransformationStep import amf.core.internal.annotations.Aliases import amf.core.internal.metamodel.Type.Scalar import amf.core.internal.metamodel.document.BaseUnitModel -import amf.core.internal.metamodel.domain.common.{DescribedElementModel, DisplayNameField, NameFieldSchema, NameFieldShacl} +import amf.core.internal.metamodel.domain.common.{ + DescribedElementModel, + DisplayNameField, + NameFieldSchema, + NameFieldShacl +} import amf.core.internal.metamodel.domain.{DomainElementModel, ShapeModel} import amf.core.internal.metamodel.{Field, Type} import amf.core.internal.parser.domain.DotQualifiedNameExtractor @@ -45,7 +50,8 @@ class ExtensionsResolutionStage(val profile: ProfileName, val keepEditingInfo: B new OverlayResolutionStage(profile, keepEditingInfo)(errorHandler).resolve(model, overlay, configuration) case extension: Extension => new ExtensionResolutionStage(profile, keepEditingInfo)(errorHandler).resolve(model, extension, configuration) - case _ => extendsStage.transform(model, errorHandler, configuration) + case _ => + extendsStage.transform(model, errorHandler, configuration) } assignNewRoot(resolvedModel) } diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/transformation/stages/GraphQLTypeRecursionDetectionStage.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/transformation/stages/GraphQLTypeRecursionDetectionStage.scala index 776626c22a..1df684940f 100644 --- a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/transformation/stages/GraphQLTypeRecursionDetectionStage.scala +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/transformation/stages/GraphQLTypeRecursionDetectionStage.scala @@ -6,7 +6,6 @@ import amf.core.client.scala.model.document.{BaseUnit, DeclaresModel} import amf.core.client.scala.model.domain.extensions.PropertyShape import amf.core.client.scala.model.domain.{NamedDomainElement, RecursiveShape, Shape} import amf.core.client.scala.transform.TransformationStep -import amf.core.internal.adoption.IdAdopter import amf.core.internal.metamodel.domain.ShapeModel import amf.core.internal.metamodel.{Field, Type} import amf.core.internal.unsafe.PlatformSecrets @@ -139,7 +138,7 @@ case class GraphQLTypeRecursionDetectionStage() extends TransformationStep() wit d.declares.filterType[Shape].foreach { shape => traverse(shape)(errorHandler) } - new IdAdopter(model, model.id).adoptFromRoot() + configuration.idAdopterProvider.adoptFromRoot(model, model.id) model case _ => model } diff --git a/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/transformation/stages/UnionFlattenerStage.scala b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/transformation/stages/UnionFlattenerStage.scala new file mode 100644 index 0000000000..9f2398f709 --- /dev/null +++ b/amf-api-contract/shared/src/main/scala/amf/apicontract/internal/transformation/stages/UnionFlattenerStage.scala @@ -0,0 +1,39 @@ +package amf.apicontract.internal.transformation.stages + +import amf.core.client.scala.AMFGraphConfiguration +import amf.core.client.scala.errorhandling.AMFErrorHandler +import amf.core.client.scala.model.document.{BaseUnit, FieldsFilter} +import amf.core.client.scala.model.domain.Shape +import amf.core.client.scala.transform.TransformationStep +import amf.shapes.client.scala.model.domain.UnionShape +import amf.shapes.internal.domain.metamodel.UnionShapeModel.AnyOf + +class UnionFlattenerStage extends TransformationStep() { + override def transform( + model: BaseUnit, + errorHandler: AMFErrorHandler, + configuration: AMFGraphConfiguration + ): BaseUnit = { + model.iterator(fieldsFilter = FieldsFilter.All).foreach { + case u: UnionShape => + if (u.anyOf.exists(_.isInstanceOf[UnionShape])) { + val newMembers = flattenedMembers(members = u.anyOf, visited = Seq(u)) + val annotations = u.fields.getValue(AnyOf).annotations + u.setArrayWithoutId(AnyOf, newMembers, annotations) + } + case _ => // ignore + } + model + } + + private def flattenedMembers(members: Seq[Shape], visited: Seq[UnionShape]): Seq[Shape] = { + members.flatMap { + case u: UnionShape if visited.contains(u) => + Nil + case u: UnionShape if !u.isLink => + flattenedMembers(u.anyOf, visited :+ u) + case other => + Seq(other) + }.distinct + } +} diff --git a/amf-apicontract.versions b/amf-apicontract.versions index 78ca6b5bd6..8d0248a5a9 100644 --- a/amf-apicontract.versions +++ b/amf-apicontract.versions @@ -1,6 +1,6 @@ -amf.apicontract=5.4.0 -amf.aml=6.4.0 +amf.apicontract=5.4.1 +amf.aml=6.4.1 amf.model=3.8.2 -antlr4Version=0.7.24 +antlr4Version=0.7.25 amf.validation.profile.dialect=1.4.0 amf.validation.report.dialect=1.1.0 diff --git a/amf-cli/shared/src/test/resources/base-union-empty-anyof.raml b/amf-cli/shared/src/test/resources/base-union-empty-anyof.raml new file mode 100644 index 0000000000..5aff1a8f57 --- /dev/null +++ b/amf-cli/shared/src/test/resources/base-union-empty-anyof.raml @@ -0,0 +1,19 @@ +#%RAML 1.0 + +title: something + +types: + superUnion: + type: string | number | nil + pivotType: + type: object + properties: + p1: string + p2: + type: object + properties: + i1: string + baseUnion: + type: pivotType + properties: + p2: superUnion \ No newline at end of file diff --git a/amf-cli/shared/src/test/resources/org/raml/parser/examples/madness/output.txt.js b/amf-cli/shared/src/test/resources/org/raml/parser/examples/madness/output.txt.js index 73229422fc..5e14dded40 100644 --- a/amf-cli/shared/src/test/resources/org/raml/parser/examples/madness/output.txt.js +++ b/amf-cli/shared/src/test/resources/org/raml/parser/examples/madness/output.txt.js @@ -6,7 +6,8 @@ Number of results: 1 Level: Violation - Constraint: http://a.ml/vocabularies/amf/validation#example-validation-error - Message: livesInside should be boolean + Message: feathers should NOT be longer than 5 characters +livesInside should be boolean should have required property 'bite' should have required property 'claw' should have required property 'livesOutside' diff --git a/amf-cli/shared/src/test/resources/org/raml/parser/examples/madness/output.txt.jvm b/amf-cli/shared/src/test/resources/org/raml/parser/examples/madness/output.txt.jvm index bfb26ebaa6..3851517a6d 100644 --- a/amf-cli/shared/src/test/resources/org/raml/parser/examples/madness/output.txt.jvm +++ b/amf-cli/shared/src/test/resources/org/raml/parser/examples/madness/output.txt.jvm @@ -6,7 +6,8 @@ Number of results: 1 Level: Violation - Constraint: http://a.ml/vocabularies/amf/validation#example-validation-error - Message: /livesInside expected type: Boolean, found: String + Message: /feathers expected maxLength: 5, actual: 9 +/livesInside expected type: Boolean, found: String required key [bite] not found required key [claw] not found required key [livesOutside] not found diff --git a/amf-cli/shared/src/test/resources/org/raml/parser/types/inheritance/madness/output.txt b/amf-cli/shared/src/test/resources/org/raml/parser/types/inheritance/madness/output.txt index cac18d6bb1..031c01ccc1 100644 --- a/amf-cli/shared/src/test/resources/org/raml/parser/types/inheritance/madness/output.txt +++ b/amf-cli/shared/src/test/resources/org/raml/parser/types/inheritance/madness/output.txt @@ -32,23 +32,21 @@ types: discriminator: type: string - - anyOf: - - - properties: - claw: - type: string - livesInside: - type: boolean - discriminator: - type: string - - - properties: - feathers: - type: string - livesInside: - type: boolean - discriminator: - type: string + properties: + claw: + type: string + livesInside: + type: boolean + discriminator: + type: string + - + properties: + feathers: + type: string + livesInside: + type: boolean + discriminator: + type: string - properties: bite: @@ -58,20 +56,18 @@ types: discriminator: type: string - - anyOf: - - - properties: - claw: - type: string - livesOutside: - type: boolean - discriminator: - type: string - - - properties: - feathers: - type: string - livesOutside: - type: boolean - discriminator: - type: string + properties: + claw: + type: string + livesOutside: + type: boolean + discriminator: + type: string + - + properties: + feathers: + type: string + livesOutside: + type: boolean + discriminator: + type: string diff --git a/amf-cli/shared/src/test/resources/org/raml/parser/types/recursive-union-invalid/output.txt b/amf-cli/shared/src/test/resources/org/raml/parser/types/recursive-union-invalid/output.txt index a398d391ec..c4bc86477f 100644 --- a/amf-cli/shared/src/test/resources/org/raml/parser/types/recursive-union-invalid/output.txt +++ b/amf-cli/shared/src/test/resources/org/raml/parser/types/recursive-union-invalid/output.txt @@ -6,23 +6,21 @@ types: - type: object - - anyOf: - - - items: - anyOf: - - - type: object - - - type: object - (amf-recursive): amf://id#3 - - - items: - anyOf: - - - type: object - - - type: object - (amf-recursive): amf://id#3 + items: + anyOf: + - + type: object + - + type: object + (amf-recursive): amf://id#6 + - + items: + anyOf: + - + type: object + - + type: object + (amf-recursive): amf://id#6 SomeUnion: anyOf: - @@ -32,7 +30,7 @@ types: type: object - type: object - (amf-recursive): amf://id#3 + (amf-recursive): amf://id#6 - items: anyOf: @@ -40,18 +38,18 @@ types: type: object - type: object - (amf-recursive): amf://id#3 + (amf-recursive): amf://id#6 AnotherType: anyOf: - type: object - type: object - (amf-recursive): amf://id#3 + (amf-recursive): amf://id#6 OneMoreType: anyOf: - type: object - type: object - (amf-recursive): amf://id#3 + (amf-recursive): amf://id#6 diff --git a/amf-cli/shared/src/test/resources/overriden-cyclic-properties.raml b/amf-cli/shared/src/test/resources/overriden-cyclic-properties.raml new file mode 100644 index 0000000000..afef35d757 --- /dev/null +++ b/amf-cli/shared/src/test/resources/overriden-cyclic-properties.raml @@ -0,0 +1,15 @@ +#%RAML 1.0 + +title: I am a title + +types: + Element: + type: object + properties: + extension?: + type: Extension[] + Extension: + type: Element + properties: + extension?: + type: Extension[] \ No newline at end of file diff --git a/amf-cli/shared/src/test/resources/semantic/annotation-mapping-with-map-key/api.yaml b/amf-cli/shared/src/test/resources/semantic/annotation-mapping-with-map-key/api.yaml new file mode 100644 index 0000000000..59cc70b99c --- /dev/null +++ b/amf-cli/shared/src/test/resources/semantic/annotation-mapping-with-map-key/api.yaml @@ -0,0 +1,14 @@ +openapi: 3.0.0 +info: + title: API with nested semantic extensions + version: 1.0.0 +x-declarations: + declarationA: + properties: + propertyA1: string + propertyA2: string + declarationB: + properties: + propertyB1: integer + propertyB2: integer +paths: { } \ No newline at end of file diff --git a/amf-cli/shared/src/test/resources/semantic/annotation-mapping-with-map-key/dialect.yaml b/amf-cli/shared/src/test/resources/semantic/annotation-mapping-with-map-key/dialect.yaml new file mode 100644 index 0000000000..94d1e49863 --- /dev/null +++ b/amf-cli/shared/src/test/resources/semantic/annotation-mapping-with-map-key/dialect.yaml @@ -0,0 +1,42 @@ +#%Dialect 1.0 +dialect: Annotation mapping semex +version: 1.0 + +external: + apiContract: http://a.ml/vocabularies/apiContract# + aml: http://a.ml/vocab# + +documents: { } + +annotationMappings: + DeclarationAnnotationMapping: + domain: apiContract.WebAPI + propertyTerm: aml.declarations + range: Declaration + mapKey: name + +nodeMappings: + Declaration: + classTerm: aml.Declaration + mapping: + name: + propertyTerm: aml.name + range: string + properties: + propertyTerm: aml.properties + range: Property + mapKey: name + mapValue: range + + Property: + classTerm: aml.Property + mapping: + name: + propertyTerm: aml.name + range: string + range: + propertyTerm: aml.range + range: string + +extensions: + declarations: DeclarationAnnotationMapping diff --git a/amf-cli/shared/src/test/resources/semantic/info-object/api.yaml b/amf-cli/shared/src/test/resources/semantic/info-object/api.yaml new file mode 100644 index 0000000000..370ff534ff --- /dev/null +++ b/amf-cli/shared/src/test/resources/semantic/info-object/api.yaml @@ -0,0 +1,7 @@ +openapi: "3.0.0" +info: + version: 1.0.0 + title: Test API + x-technology: + technology: "ASD" +paths: {} \ No newline at end of file diff --git a/amf-cli/shared/src/test/resources/semantic/info-object/dialect.yaml b/amf-cli/shared/src/test/resources/semantic/info-object/dialect.yaml new file mode 100644 index 0000000000..63fffd00df --- /dev/null +++ b/amf-cli/shared/src/test/resources/semantic/info-object/dialect.yaml @@ -0,0 +1,33 @@ +#%Dialect 1.0 +dialect: Info +version: 1.1.0 + +external: + apiContract: http://a.ml/vocabularies/apiContract# + cataloging: http://mycompany.org/extensions/cataloging# + +documents: {} + +annotationMappings: + + TechnologyAnnotation: + domain: apiContract.WebAPI + propertyTerm: cataloging.technologyObject + range: TechnologyNode + + +nodeMappings: + TechnologyNode: + classTerm: cataloging.TechnologyNode + mapping: + technology: + propertyTerm: cataloging.technology + range: string + mandatory: true + enum: + - ASD + - ASD1 + - ASD2 + +extensions: + technology: TechnologyAnnotation diff --git a/amf-cli/shared/src/test/resources/semantic/nested-semex-1/api.yaml b/amf-cli/shared/src/test/resources/semantic/nested-semex-1/api.yaml new file mode 100644 index 0000000000..f0269c1eca --- /dev/null +++ b/amf-cli/shared/src/test/resources/semantic/nested-semex-1/api.yaml @@ -0,0 +1,8 @@ +openapi: 3.0.0 +info: + title: API with nested semantic extensions + version: 1.0.0 +x-parent: + x-child: + name: Juan +paths: {} \ No newline at end of file diff --git a/amf-cli/shared/src/test/resources/semantic/nested-semex-1/dialect.yaml b/amf-cli/shared/src/test/resources/semantic/nested-semex-1/dialect.yaml new file mode 100644 index 0000000000..4ceaa3f0dc --- /dev/null +++ b/amf-cli/shared/src/test/resources/semantic/nested-semex-1/dialect.yaml @@ -0,0 +1,32 @@ +#%Dialect 1.0 +dialect: Nested semex +version: 1.0 + +external: + apiContract: http://a.ml/vocabularies/apiContract# + aml: http://a.ml/vocab# + +documents: {} + +annotationMappings: + ParentAnnotationMapping: + domain: apiContract.WebAPI + propertyTerm: aml.parent + range: ParentNodeMapping + +nodeMappings: + ParentNodeMapping: + classTerm: aml.Parent + mapping: + x-child: + range: ChildNodeMapping + mandatory: true + ChildNodeMapping: + classTerm: aml.Child + mapping: + name: + range: string + mandatory: true + +extensions: + parent: ParentAnnotationMapping diff --git a/amf-cli/shared/src/test/resources/semantic/nested-semex-2/api.yaml b/amf-cli/shared/src/test/resources/semantic/nested-semex-2/api.yaml new file mode 100644 index 0000000000..f0269c1eca --- /dev/null +++ b/amf-cli/shared/src/test/resources/semantic/nested-semex-2/api.yaml @@ -0,0 +1,8 @@ +openapi: 3.0.0 +info: + title: API with nested semantic extensions + version: 1.0.0 +x-parent: + x-child: + name: Juan +paths: {} \ No newline at end of file diff --git a/amf-cli/shared/src/test/resources/semantic/nested-semex-2/dialect.yaml b/amf-cli/shared/src/test/resources/semantic/nested-semex-2/dialect.yaml new file mode 100644 index 0000000000..13b165796d --- /dev/null +++ b/amf-cli/shared/src/test/resources/semantic/nested-semex-2/dialect.yaml @@ -0,0 +1,37 @@ +#%Dialect 1.0 +dialect: Nested semex +version: 1.0 + +external: + apiContract: http://a.ml/vocabularies/apiContract# + aml: http://a.ml/vocab# + +documents: { } + +annotationMappings: + ParentAnnotationMapping: + domain: apiContract.WebAPI + propertyTerm: aml.parent + range: ParentNodeMapping + ChildAnnotationMapping: + domain: aml.Parent + propertyTerm: aml.child + range: ChildNodeMapping + +nodeMappings: + ParentNodeMapping: + classTerm: aml.Parent + mapping: + child: + range: ChildNodeMapping + mandatory: true + ChildNodeMapping: + classTerm: aml.Child + mapping: + name: + range: string + mandatory: true + +extensions: + parent: ParentAnnotationMapping + child: ChildAnnotationMapping diff --git a/amf-cli/shared/src/test/resources/union/inner-union.raml b/amf-cli/shared/src/test/resources/union/inner-union.raml index fd7754a941..939eb93457 100644 --- a/amf-cli/shared/src/test/resources/union/inner-union.raml +++ b/amf-cli/shared/src/test/resources/union/inner-union.raml @@ -13,4 +13,4 @@ types: post: body: application/json: - type: UnionType \ No newline at end of file + type: UnionType 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 new file mode 100644 index 0000000000..671900efa1 --- /dev/null +++ b/amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions-in-resource-types/api.expanded.jsonld @@ -0,0 +1,835 @@ +[ + { + "@id": "", + "@type": [ + "doc:Document", + "doc:Fragment", + "doc:Module", + "doc:Unit" + ], + "doc:encodes": [ + { + "@id": "#16", + "@type": [ + "apiContract:WebAPI", + "apiContract:API", + "doc:RootDomainElement", + "doc:DomainElement" + ], + "core:name": [ + { + "@value": "asd" + } + ], + "apiContract:endpoint": [ + { + "@id": "#17", + "@type": [ + "apiContract:EndPoint", + "doc:DomainElement" + ], + "apiContract:path": [ + { + "@value": "/reprints" + } + ], + "apiContract:supportedOperation": [ + { + "@id": "#21", + "@type": [ + "apiContract:Operation", + "core:Operation", + "doc:DomainElement" + ], + "apiContract:method": [ + { + "@value": "get" + } + ], + "apiContract:returns": [ + { + "@id": "#22", + "@type": [ + "apiContract:Response", + "core:Response", + "apiContract:Message", + "doc:DomainElement" + ], + "apiContract:statusCode": [ + { + "@value": "200" + } + ], + "core:name": [ + { + "@value": "200" + } + ], + "apiContract:payload": [ + { + "@id": "#23", + "@type": [ + "apiContract:Payload", + "core:Payload", + "doc:DomainElement" + ], + "core:mediaType": [ + { + "@value": "application/json" + } + ], + "raml-shapes:schema": [ + { + "@id": "#24", + "@type": [ + "raml-shapes:UnionShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "raml-shapes:anyOf": [ + { + "@id": "#1/link-813846181", + "@type": [ + "shacl:NodeShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "doc:link-target": [ + { + "@id": "#1" + } + ], + "doc:link-label": [ + { + "@value": "TestType1" + } + ] + }, + { + "@id": "#3/link-813846182", + "@type": [ + "raml-shapes:ScalarShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "doc:link-target": [ + { + "@id": "#3" + } + ], + "doc:link-label": [ + { + "@value": "TestType2" + } + ] + }, + { + "@id": "#5/link-813846183", + "@type": [ + "raml-shapes:ScalarShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "doc:link-target": [ + { + "@id": "#5" + } + ], + "doc:link-label": [ + { + "@value": "TestType3" + } + ] + } + ], + "smaps": { + "auto-generated-name": { + "#24": "" + }, + "lexical": { + "#24": "[(16,14)-(16,41)]" + } + } + } + ], + "smaps": { + "lexical": { + "#23": "[(15,12)-(16,41)]" + } + } + } + ], + "smaps": { + "lexical": { + "apiContract:payload": "[(14,10)-(16,41)]", + "#22": "[(13,8)-(16,41)]" + } + } + } + ], + "smaps": { + "lexical": { + "apiContract:returns": "[(12,6)-(16,41)]", + "#21": "[(11,4)-(16,41)]" + } + } + } + ], + "doc:extends": [ + { + "@id": "#18", + "@type": [ + "apiContract:ParametrizedResourceType", + "doc:ParametrizedDeclaration", + "doc:DomainElement" + ], + "core:name": [ + { + "@value": "item-resource" + } + ], + "doc:target": [ + { + "@id": "#7", + "@type": [ + "apiContract:ResourceType", + "doc:AbstractDeclaration", + "doc:DomainElement" + ], + "core:name": [ + { + "@value": "item-resource" + } + ], + "doc:dataNode": [ + { + "@id": "#8", + "@type": [ + "data:Object", + "data:Node", + "doc:DomainElement" + ], + "data:get": [ + { + "@id": "#9", + "@type": [ + "data:Object", + "data:Node", + "doc:DomainElement" + ], + "data:responses": [ + { + "@id": "#10", + "@type": [ + "data:Object", + "data:Node", + "doc:DomainElement" + ], + "data:200": [ + { + "@id": "#11", + "@type": [ + "data:Object", + "data:Node", + "doc:DomainElement" + ], + "data:body": [ + { + "@id": "#12", + "@type": [ + "data:Object", + "data:Node", + "doc:DomainElement" + ], + "data:application%2Fjson": [ + { + "@id": "#13", + "@type": [ + "data:Object", + "data:Node", + "doc:DomainElement" + ], + "data:type": [ + { + "@id": "#14", + "@type": [ + "data:Scalar", + "data:Node", + "doc:DomainElement" + ], + "data:value": [ + { + "@value": "<>" + } + ], + "shacl:datatype": [ + { + "@id": "http://www.w3.org/2001/XMLSchema#string" + } + ], + "core:name": [ + { + "@value": "type" + } + ], + "smaps": { + "synthesized-field": { + "core:name": "true", + "shacl:datatype": "true" + }, + "lexical": { + "#14": "[(16,20)-(16,41)]" + } + } + } + ], + "core:name": [ + { + "@value": "application/json" + } + ], + "smaps": { + "synthesized-field": { + "core:name": "true" + }, + "lexical": { + "data:type": "[(16,14)-(18,0)]", + "#13": "[(16,0)-(18,0)]" + } + } + } + ], + "core:name": [ + { + "@value": "body" + } + ], + "smaps": { + "synthesized-field": { + "core:name": "true" + }, + "lexical": { + "data:application%2Fjson": "[(15,12)-(18,0)]", + "#12": "[(15,0)-(18,0)]" + } + } + } + ], + "core:name": [ + { + "@value": "200" + } + ], + "smaps": { + "synthesized-field": { + "core:name": "true" + }, + "lexical": { + "data:body": "[(14,10)-(18,0)]", + "#11": "[(14,0)-(18,0)]" + } + } + } + ], + "core:name": [ + { + "@value": "responses" + } + ], + "smaps": { + "synthesized-field": { + "core:name": "true" + }, + "lexical": { + "data:200": "[(13,8)-(18,0)]", + "#10": "[(13,0)-(18,0)]" + } + } + } + ], + "core:name": [ + { + "@value": "get" + } + ], + "smaps": { + "synthesized-field": { + "core:name": "true" + }, + "lexical": { + "data:responses": "[(12,6)-(18,0)]", + "#9": "[(12,0)-(18,0)]" + } + } + } + ], + "core:name": [ + { + "@value": "object_1" + } + ], + "smaps": { + "synthesized-field": { + "core:name": "true" + }, + "lexical": { + "data:get": "[(11,4)-(18,0)]", + "#8": "[(11,4)-(18,0)]" + } + } + } + ], + "doc:variable": [ + { + "@value": "type-response-get" + } + ], + "smaps": { + "declared-element": { + "#7": "" + }, + "lexical": { + "doc:variable": "[(10,16)-(18,0)]", + "core:name": "[(10,2)-(10,15)]", + "#7": "[(10,2)-(18,0)]", + "doc:dataNode": "[(11,4)-(18,0)]" + } + } + } + ], + "doc:variable": [ + { + "@id": "#19", + "@type": [ + "doc:VariableValue", + "doc:DomainElement" + ], + "core:name": [ + { + "@value": "type-response-get" + } + ], + "doc:value": [ + { + "@id": "#20", + "@type": [ + "data:Scalar", + "data:Node", + "doc:DomainElement" + ], + "data:value": [ + { + "@value": "TestType1 | TestType2 | TestType3" + } + ], + "shacl:datatype": [ + { + "@id": "http://www.w3.org/2001/XMLSchema#string" + } + ], + "core:name": [ + { + "@value": "scalar_1" + } + ], + "smaps": { + "synthesized-field": { + "core:name": "true", + "shacl:datatype": "true" + }, + "lexical": { + "#20": "[(21,25)-(21,58)]" + } + } + } + ], + "smaps": { + "lexical": { + "doc:value": "[(21,25)-(21,58)]", + "#19": "[(21,6)-(21,58)]" + } + } + } + ], + "smaps": { + "lexical": { + "core:name": "[(20,4)-(20,17)]", + "#18": "[(20,4)-(21,58)]" + } + } + } + ], + "smaps": { + "lexical": { + "apiContract:path": "[(18,0)-(18,9)]", + "#17": "[(18,0)-(21,58)]" + } + } + } + ], + "smaps": { + "lexical": { + "core:name": "[(2,0)-(4,0)]", + "#16": "[(2,0)-(21,58)]" + } + } + } + ], + "doc:root": [ + { + "@value": true + } + ], + "doc:processingData": [ + { + "@id": "#15", + "@type": [ + "doc:APIContractProcessingData" + ], + "apiContract:modelVersion": [ + { + "@value": "3.8.2" + } + ], + "doc:transformed": [ + { + "@value": true + } + ], + "doc:sourceSpec": [ + { + "@value": "RAML 1.0" + } + ] + } + ], + "doc:declares": [ + { + "@id": "#1", + "@type": [ + "shacl:NodeShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "shacl:name": [ + { + "@value": "TestType1" + } + ], + "smaps": { + "resolved-link-target": { + "#1": "amf://id#1" + }, + "declared-element": { + "#1": "" + }, + "lexical": { + "shacl:name": "[(5,2)-(5,11)]", + "#1": "[(5,2)-(6,0)]" + }, + "resolved-link": { + "#1": "amf://id#2" + } + } + }, + { + "@id": "#3", + "@type": [ + "raml-shapes:ScalarShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "shacl:datatype": [ + { + "@id": "http://www.w3.org/2001/XMLSchema#integer" + } + ], + "shacl:name": [ + { + "@value": "TestType2" + } + ], + "smaps": { + "resolved-link-target": { + "#3": "amf://id#3" + }, + "declared-element": { + "#3": "" + }, + "lexical": { + "shacl:name": "[(6,2)-(6,11)]", + "#3": "[(6,2)-(7,0)]", + "shacl:datatype": "[(6,13)-(6,20)]" + }, + "resolved-link": { + "#3": "amf://id#4" + } + } + }, + { + "@id": "#5", + "@type": [ + "raml-shapes:ScalarShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "shacl:datatype": [ + { + "@id": "http://www.w3.org/2001/XMLSchema#string" + } + ], + "shacl:name": [ + { + "@value": "TestType3" + } + ], + "smaps": { + "resolved-link-target": { + "#5": "amf://id#5" + }, + "declared-element": { + "#5": "" + }, + "lexical": { + "shacl:name": "[(7,2)-(7,11)]", + "#5": "[(7,2)-(9,0)]", + "shacl:datatype": "[(7,13)-(7,19)]" + }, + "resolved-link": { + "#5": "amf://id#6" + } + } + }, + { + "@id": "#7", + "@type": [ + "apiContract:ResourceType", + "doc:AbstractDeclaration", + "doc:DomainElement" + ], + "core:name": [ + { + "@value": "item-resource" + } + ], + "doc:dataNode": [ + { + "@id": "#8", + "@type": [ + "data:Object", + "data:Node", + "doc:DomainElement" + ], + "data:get": [ + { + "@id": "#9", + "@type": [ + "data:Object", + "data:Node", + "doc:DomainElement" + ], + "data:responses": [ + { + "@id": "#10", + "@type": [ + "data:Object", + "data:Node", + "doc:DomainElement" + ], + "data:200": [ + { + "@id": "#11", + "@type": [ + "data:Object", + "data:Node", + "doc:DomainElement" + ], + "data:body": [ + { + "@id": "#12", + "@type": [ + "data:Object", + "data:Node", + "doc:DomainElement" + ], + "data:application%2Fjson": [ + { + "@id": "#13", + "@type": [ + "data:Object", + "data:Node", + "doc:DomainElement" + ], + "data:type": [ + { + "@id": "#14", + "@type": [ + "data:Scalar", + "data:Node", + "doc:DomainElement" + ], + "data:value": [ + { + "@value": "<>" + } + ], + "shacl:datatype": [ + { + "@id": "http://www.w3.org/2001/XMLSchema#string" + } + ], + "core:name": [ + { + "@value": "type" + } + ], + "smaps": { + "synthesized-field": { + "core:name": "true", + "shacl:datatype": "true" + }, + "lexical": { + "#14": "[(16,20)-(16,41)]" + } + } + } + ], + "core:name": [ + { + "@value": "application/json" + } + ], + "smaps": { + "synthesized-field": { + "core:name": "true" + }, + "lexical": { + "data:type": "[(16,14)-(18,0)]", + "#13": "[(16,0)-(18,0)]" + } + } + } + ], + "core:name": [ + { + "@value": "body" + } + ], + "smaps": { + "synthesized-field": { + "core:name": "true" + }, + "lexical": { + "data:application%2Fjson": "[(15,12)-(18,0)]", + "#12": "[(15,0)-(18,0)]" + } + } + } + ], + "core:name": [ + { + "@value": "200" + } + ], + "smaps": { + "synthesized-field": { + "core:name": "true" + }, + "lexical": { + "data:body": "[(14,10)-(18,0)]", + "#11": "[(14,0)-(18,0)]" + } + } + } + ], + "core:name": [ + { + "@value": "responses" + } + ], + "smaps": { + "synthesized-field": { + "core:name": "true" + }, + "lexical": { + "data:200": "[(13,8)-(18,0)]", + "#10": "[(13,0)-(18,0)]" + } + } + } + ], + "core:name": [ + { + "@value": "get" + } + ], + "smaps": { + "synthesized-field": { + "core:name": "true" + }, + "lexical": { + "data:responses": "[(12,6)-(18,0)]", + "#9": "[(12,0)-(18,0)]" + } + } + } + ], + "core:name": [ + { + "@value": "object_1" + } + ], + "smaps": { + "synthesized-field": { + "core:name": "true" + }, + "lexical": { + "data:get": "[(11,4)-(18,0)]", + "#8": "[(11,4)-(18,0)]" + } + } + } + ], + "doc:variable": [ + { + "@value": "type-response-get" + } + ], + "smaps": { + "declared-element": { + "#7": "" + }, + "lexical": { + "doc:variable": "[(10,16)-(18,0)]", + "core:name": "[(10,2)-(10,15)]", + "#7": "[(10,2)-(18,0)]", + "doc:dataNode": "[(11,4)-(18,0)]" + } + } + } + ], + "@context": { + "@base": "amf://id", + "shacl": "http://www.w3.org/ns/shacl#", + "raml-shapes": "http://a.ml/vocabularies/shapes#", + "data": "http://a.ml/vocabularies/data#", + "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/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 new file mode 100644 index 0000000000..836b850d23 --- /dev/null +++ b/amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions-in-resource-types/api.flattened.jsonld @@ -0,0 +1,515 @@ +{ + "@graph": [ + { + "@id": "#15", + "@type": [ + "doc:APIContractProcessingData" + ], + "apiContract:modelVersion": "3.8.2", + "doc:transformed": true, + "doc:sourceSpec": "RAML 1.0" + }, + { + "@id": "#16", + "@type": [ + "apiContract:WebAPI", + "apiContract:API", + "doc:RootDomainElement", + "doc:DomainElement" + ], + "core:name": "asd", + "apiContract:endpoint": [ + { + "@id": "#17" + } + ], + "smaps": { + "lexical": { + "core:name": "[(2,0)-(4,0)]", + "#16": "[(2,0)-(21,58)]" + } + } + }, + { + "@id": "#17", + "@type": [ + "apiContract:EndPoint", + "doc:DomainElement" + ], + "apiContract:path": "/reprints", + "apiContract:supportedOperation": [ + { + "@id": "#21" + } + ], + "doc:extends": [ + { + "@id": "#18" + } + ], + "smaps": { + "lexical": { + "apiContract:path": "[(18,0)-(18,9)]", + "#17": "[(18,0)-(21,58)]" + } + } + }, + { + "@id": "#21", + "@type": [ + "apiContract:Operation", + "core:Operation", + "doc:DomainElement" + ], + "apiContract:method": "get", + "apiContract:returns": [ + { + "@id": "#22" + } + ], + "smaps": { + "lexical": { + "apiContract:returns": "[(12,6)-(16,41)]", + "#21": "[(11,4)-(16,41)]" + } + } + }, + { + "@id": "#18", + "@type": [ + "apiContract:ParametrizedResourceType", + "doc:ParametrizedDeclaration", + "doc:DomainElement" + ], + "core:name": "item-resource", + "doc:target": { + "@id": "#7" + }, + "doc:variable": [ + { + "@id": "#19" + } + ], + "smaps": { + "lexical": { + "core:name": "[(20,4)-(20,17)]", + "#18": "[(20,4)-(21,58)]" + } + } + }, + { + "@id": "#22", + "@type": [ + "apiContract:Response", + "core:Response", + "apiContract:Message", + "doc:DomainElement" + ], + "apiContract:statusCode": "200", + "core:name": "200", + "apiContract:payload": [ + { + "@id": "#23" + } + ], + "smaps": { + "lexical": { + "apiContract:payload": "[(14,10)-(16,41)]", + "#22": "[(13,8)-(16,41)]" + } + } + }, + { + "@id": "#7", + "@type": [ + "apiContract:ResourceType", + "doc:AbstractDeclaration", + "doc:DomainElement" + ], + "core:name": "item-resource", + "doc:dataNode": { + "@id": "#8" + }, + "doc:variable": [ + "type-response-get" + ], + "smaps": { + "declared-element": { + "#7": "" + }, + "lexical": { + "doc:variable": "[(10,16)-(18,0)]", + "core:name": "[(10,2)-(10,15)]", + "#7": "[(10,2)-(18,0)]", + "doc:dataNode": "[(11,4)-(18,0)]" + } + } + }, + { + "@id": "#19", + "@type": [ + "doc:VariableValue", + "doc:DomainElement" + ], + "core:name": "type-response-get", + "doc:value": { + "@id": "#20" + }, + "smaps": { + "lexical": { + "doc:value": "[(21,25)-(21,58)]", + "#19": "[(21,6)-(21,58)]" + } + } + }, + { + "@id": "#23", + "@type": [ + "apiContract:Payload", + "core:Payload", + "doc:DomainElement" + ], + "core:mediaType": "application/json", + "raml-shapes:schema": { + "@id": "#24" + }, + "smaps": { + "lexical": { + "#23": "[(15,12)-(16,41)]" + } + } + }, + { + "@id": "#8", + "@type": [ + "data:Object", + "data:Node", + "doc:DomainElement" + ], + "data:get": { + "@id": "#9" + }, + "core:name": "object_1", + "smaps": { + "synthesized-field": { + "core:name": "true" + }, + "lexical": { + "data:get": "[(11,4)-(18,0)]", + "#8": "[(11,4)-(18,0)]" + } + } + }, + { + "@id": "#20", + "@type": [ + "data:Scalar", + "data:Node", + "doc:DomainElement" + ], + "data:value": "TestType1 | TestType2 | TestType3", + "shacl:datatype": [ + { + "@id": "http://www.w3.org/2001/XMLSchema#string" + } + ], + "core:name": "scalar_1", + "smaps": { + "synthesized-field": { + "core:name": "true", + "shacl:datatype": "true" + }, + "lexical": { + "#20": "[(21,25)-(21,58)]" + } + } + }, + { + "@id": "#24", + "@type": [ + "raml-shapes:UnionShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "raml-shapes:anyOf": [ + { + "@id": "#1" + }, + { + "@id": "#3" + }, + { + "@id": "#5" + } + ], + "smaps": { + "auto-generated-name": { + "#24": "" + }, + "lexical": { + "#24": "[(16,14)-(16,41)]" + } + } + }, + { + "@id": "#9", + "@type": [ + "data:Object", + "data:Node", + "doc:DomainElement" + ], + "data:responses": { + "@id": "#10" + }, + "core:name": "get", + "smaps": { + "synthesized-field": { + "core:name": "true" + }, + "lexical": { + "data:responses": "[(12,6)-(18,0)]", + "#9": "[(12,0)-(18,0)]" + } + } + }, + { + "@id": "#1", + "@type": [ + "shacl:NodeShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "shacl:name": "TestType1", + "smaps": { + "resolved-link-target": { + "#1": "amf://id#1" + }, + "declared-element": { + "#1": "" + }, + "lexical": { + "shacl:name": "[(5,2)-(5,11)]", + "#1": "[(5,2)-(6,0)]" + }, + "resolved-link": { + "#1": "amf://id#2" + } + } + }, + { + "@id": "#3", + "@type": [ + "raml-shapes:ScalarShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "shacl:datatype": [ + { + "@id": "http://www.w3.org/2001/XMLSchema#integer" + } + ], + "shacl:name": "TestType2", + "smaps": { + "resolved-link-target": { + "#3": "amf://id#3" + }, + "declared-element": { + "#3": "" + }, + "lexical": { + "shacl:name": "[(6,2)-(6,11)]", + "#3": "[(6,2)-(7,0)]", + "shacl:datatype": "[(6,13)-(6,20)]" + }, + "resolved-link": { + "#3": "amf://id#4" + } + } + }, + { + "@id": "#5", + "@type": [ + "raml-shapes:ScalarShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "shacl:datatype": [ + { + "@id": "http://www.w3.org/2001/XMLSchema#string" + } + ], + "shacl:name": "TestType3", + "smaps": { + "resolved-link-target": { + "#5": "amf://id#5" + }, + "declared-element": { + "#5": "" + }, + "lexical": { + "shacl:name": "[(7,2)-(7,11)]", + "#5": "[(7,2)-(9,0)]", + "shacl:datatype": "[(7,13)-(7,19)]" + }, + "resolved-link": { + "#5": "amf://id#6" + } + } + }, + { + "@id": "#10", + "@type": [ + "data:Object", + "data:Node", + "doc:DomainElement" + ], + "data:200": { + "@id": "#11" + }, + "core:name": "responses", + "smaps": { + "synthesized-field": { + "core:name": "true" + }, + "lexical": { + "data:200": "[(13,8)-(18,0)]", + "#10": "[(13,0)-(18,0)]" + } + } + }, + { + "@id": "#11", + "@type": [ + "data:Object", + "data:Node", + "doc:DomainElement" + ], + "data:body": { + "@id": "#12" + }, + "core:name": "200", + "smaps": { + "synthesized-field": { + "core:name": "true" + }, + "lexical": { + "data:body": "[(14,10)-(18,0)]", + "#11": "[(14,0)-(18,0)]" + } + } + }, + { + "@id": "#12", + "@type": [ + "data:Object", + "data:Node", + "doc:DomainElement" + ], + "data:application%2Fjson": { + "@id": "#13" + }, + "core:name": "body", + "smaps": { + "synthesized-field": { + "core:name": "true" + }, + "lexical": { + "data:application%2Fjson": "[(15,12)-(18,0)]", + "#12": "[(15,0)-(18,0)]" + } + } + }, + { + "@id": "#13", + "@type": [ + "data:Object", + "data:Node", + "doc:DomainElement" + ], + "data:type": { + "@id": "#14" + }, + "core:name": "application/json", + "smaps": { + "synthesized-field": { + "core:name": "true" + }, + "lexical": { + "data:type": "[(16,14)-(18,0)]", + "#13": "[(16,0)-(18,0)]" + } + } + }, + { + "@id": "#14", + "@type": [ + "data:Scalar", + "data:Node", + "doc:DomainElement" + ], + "data:value": "<>", + "shacl:datatype": [ + { + "@id": "http://www.w3.org/2001/XMLSchema#string" + } + ], + "core:name": "type", + "smaps": { + "synthesized-field": { + "core:name": "true", + "shacl:datatype": "true" + }, + "lexical": { + "#14": "[(16,20)-(16,41)]" + } + } + }, + { + "@id": "", + "doc:declares": [ + { + "@id": "#1" + }, + { + "@id": "#3" + }, + { + "@id": "#5" + }, + { + "@id": "#7" + } + ], + "@type": [ + "doc:Document", + "doc:Fragment", + "doc:Module", + "doc:Unit" + ], + "doc:encodes": { + "@id": "#16" + }, + "doc:root": true, + "doc:processingData": { + "@id": "#15" + } + } + ], + "@context": { + "@base": "amf://id", + "shacl": "http://www.w3.org/ns/shacl#", + "raml-shapes": "http://a.ml/vocabularies/shapes#", + "data": "http://a.ml/vocabularies/data#", + "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/upanddown/raml10/multiple-non-nested-unions-in-resource-types/api.raml b/amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions-in-resource-types/api.raml new file mode 100644 index 0000000000..aa4db79ffe --- /dev/null +++ b/amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions-in-resource-types/api.raml @@ -0,0 +1,21 @@ +#%RAML 1.0 +title: asd + +types: + TestType1: object + TestType2: integer + TestType3: string + +resourceTypes: + item-resource: + get: + responses: + 200: + body: + application/json: + type: <> + +/reprints: + type: + item-resource: + type-response-get: TestType1 | TestType2 | TestType3 \ No newline at end of file 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 new file mode 100644 index 0000000000..71c034db33 --- /dev/null +++ b/amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions-in-traits/api.expanded.jsonld @@ -0,0 +1,787 @@ +[ + { + "@id": "", + "@type": [ + "doc:Document", + "doc:Fragment", + "doc:Module", + "doc:Unit" + ], + "doc:encodes": [ + { + "@id": "#15", + "@type": [ + "apiContract:WebAPI", + "apiContract:API", + "doc:RootDomainElement", + "doc:DomainElement" + ], + "core:name": [ + { + "@value": "e-terminal-common" + } + ], + "apiContract:endpoint": [ + { + "@id": "#16", + "@type": [ + "apiContract:EndPoint", + "doc:DomainElement" + ], + "apiContract:path": [ + { + "@value": "/reprints" + } + ], + "apiContract:supportedOperation": [ + { + "@id": "#17", + "@type": [ + "apiContract:Operation", + "core:Operation", + "doc:DomainElement" + ], + "apiContract:method": [ + { + "@value": "post" + } + ], + "apiContract:returns": [ + { + "@id": "#21", + "@type": [ + "apiContract:Response", + "core:Response", + "apiContract:Message", + "doc:DomainElement" + ], + "apiContract:statusCode": [ + { + "@value": "200" + } + ], + "core:name": [ + { + "@value": "200" + } + ], + "apiContract:payload": [ + { + "@id": "#22", + "@type": [ + "apiContract:Payload", + "core:Payload", + "doc:DomainElement" + ], + "core:mediaType": [ + { + "@value": "application/json" + } + ], + "raml-shapes:schema": [ + { + "@id": "#23", + "@type": [ + "raml-shapes:UnionShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "raml-shapes:anyOf": [ + { + "@id": "#1/link-813846181", + "@type": [ + "shacl:NodeShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "doc:link-target": [ + { + "@id": "#1" + } + ], + "doc:link-label": [ + { + "@value": "TestType1" + } + ] + }, + { + "@id": "#3/link-813846182", + "@type": [ + "raml-shapes:ScalarShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "doc:link-target": [ + { + "@id": "#3" + } + ], + "doc:link-label": [ + { + "@value": "TestType2" + } + ] + }, + { + "@id": "#5/link-813846183", + "@type": [ + "raml-shapes:ScalarShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "doc:link-target": [ + { + "@id": "#5" + } + ], + "doc:link-label": [ + { + "@value": "TestType3" + } + ] + } + ], + "smaps": { + "auto-generated-name": { + "#23": "" + }, + "lexical": { + "#23": "[(15,12)-(15,39)]" + } + } + } + ], + "smaps": { + "lexical": { + "#22": "[(14,10)-(15,39)]" + } + } + } + ], + "smaps": { + "lexical": { + "apiContract:payload": "[(13,8)-(15,39)]", + "#21": "[(12,6)-(15,39)]" + } + } + } + ], + "doc:extends": [ + { + "@id": "#18", + "@type": [ + "apiContract:ParametrizedTrait", + "doc:ParametrizedDeclaration", + "doc:DomainElement" + ], + "core:name": [ + { + "@value": "myTrait" + } + ], + "doc:target": [ + { + "@id": "#7", + "@type": [ + "apiContract:Trait", + "doc:AbstractDeclaration", + "doc:DomainElement" + ], + "core:name": [ + { + "@value": "myTrait" + } + ], + "doc:dataNode": [ + { + "@id": "#8", + "@type": [ + "data:Object", + "data:Node", + "doc:DomainElement" + ], + "data:responses": [ + { + "@id": "#9", + "@type": [ + "data:Object", + "data:Node", + "doc:DomainElement" + ], + "data:200": [ + { + "@id": "#10", + "@type": [ + "data:Object", + "data:Node", + "doc:DomainElement" + ], + "data:body": [ + { + "@id": "#11", + "@type": [ + "data:Object", + "data:Node", + "doc:DomainElement" + ], + "data:application%2Fjson": [ + { + "@id": "#12", + "@type": [ + "data:Object", + "data:Node", + "doc:DomainElement" + ], + "data:type": [ + { + "@id": "#13", + "@type": [ + "data:Scalar", + "data:Node", + "doc:DomainElement" + ], + "data:value": [ + { + "@value": "<>" + } + ], + "shacl:datatype": [ + { + "@id": "http://www.w3.org/2001/XMLSchema#string" + } + ], + "core:name": [ + { + "@value": "type" + } + ], + "smaps": { + "synthesized-field": { + "core:name": "true", + "shacl:datatype": "true" + }, + "lexical": { + "#13": "[(15,18)-(15,39)]" + } + } + } + ], + "core:name": [ + { + "@value": "application/json" + } + ], + "smaps": { + "synthesized-field": { + "core:name": "true" + }, + "lexical": { + "data:type": "[(15,12)-(17,0)]", + "#12": "[(15,0)-(17,0)]" + } + } + } + ], + "core:name": [ + { + "@value": "body" + } + ], + "smaps": { + "synthesized-field": { + "core:name": "true" + }, + "lexical": { + "data:application%2Fjson": "[(14,10)-(17,0)]", + "#11": "[(14,0)-(17,0)]" + } + } + } + ], + "core:name": [ + { + "@value": "200" + } + ], + "smaps": { + "synthesized-field": { + "core:name": "true" + }, + "lexical": { + "data:body": "[(13,8)-(17,0)]", + "#10": "[(13,0)-(17,0)]" + } + } + } + ], + "core:name": [ + { + "@value": "responses" + } + ], + "smaps": { + "synthesized-field": { + "core:name": "true" + }, + "lexical": { + "data:200": "[(12,6)-(17,0)]", + "#9": "[(12,0)-(17,0)]" + } + } + } + ], + "core:name": [ + { + "@value": "object_1" + } + ], + "smaps": { + "synthesized-field": { + "core:name": "true" + }, + "lexical": { + "data:responses": "[(11,4)-(17,0)]", + "#8": "[(11,4)-(17,0)]" + } + } + } + ], + "doc:variable": [ + { + "@value": "type-response-get" + } + ], + "smaps": { + "declared-element": { + "#7": "" + }, + "lexical": { + "doc:variable": "[(10,10)-(17,0)]", + "core:name": "[(10,2)-(10,9)]", + "#7": "[(10,2)-(17,0)]", + "doc:dataNode": "[(11,4)-(17,0)]" + } + } + } + ], + "doc:variable": [ + { + "@id": "#19", + "@type": [ + "doc:VariableValue", + "doc:DomainElement" + ], + "core:name": [ + { + "@value": "type-response-get" + } + ], + "doc:value": [ + { + "@id": "#20", + "@type": [ + "data:Scalar", + "data:Node", + "doc:DomainElement" + ], + "data:value": [ + { + "@value": "TestType1 | TestType2 | TestType3" + } + ], + "shacl:datatype": [ + { + "@id": "http://www.w3.org/2001/XMLSchema#string" + } + ], + "core:name": [ + { + "@value": "scalar_1" + } + ], + "smaps": { + "synthesized-field": { + "core:name": "true", + "shacl:datatype": "true" + }, + "lexical": { + "#20": "[(20,25)-(20,58)]" + } + } + } + ], + "smaps": { + "lexical": { + "doc:value": "[(20,25)-(20,58)]", + "#19": "[(20,6)-(20,58)]" + } + } + } + ], + "smaps": { + "lexical": { + "core:name": "[(19,10)-(19,17)]", + "#18": "[(19,10)-(21,5)]" + } + } + } + ], + "smaps": { + "lexical": { + "doc:extends": "[(19,4)-(21,6)]", + "#17": "[(18,2)-(21,6)]" + } + } + } + ], + "smaps": { + "lexical": { + "apiContract:path": "[(17,0)-(17,9)]", + "#16": "[(17,0)-(21,6)]" + } + } + } + ], + "smaps": { + "lexical": { + "core:name": "[(2,0)-(4,0)]", + "#15": "[(2,0)-(21,6)]" + } + } + } + ], + "doc:root": [ + { + "@value": true + } + ], + "doc:processingData": [ + { + "@id": "#14", + "@type": [ + "doc:APIContractProcessingData" + ], + "apiContract:modelVersion": [ + { + "@value": "3.8.2" + } + ], + "doc:transformed": [ + { + "@value": true + } + ], + "doc:sourceSpec": [ + { + "@value": "RAML 1.0" + } + ] + } + ], + "doc:declares": [ + { + "@id": "#1", + "@type": [ + "shacl:NodeShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "shacl:name": [ + { + "@value": "TestType1" + } + ], + "smaps": { + "resolved-link-target": { + "#1": "amf://id#1" + }, + "declared-element": { + "#1": "" + }, + "lexical": { + "shacl:name": "[(5,2)-(5,11)]", + "#1": "[(5,2)-(6,0)]" + }, + "resolved-link": { + "#1": "amf://id#2" + } + } + }, + { + "@id": "#3", + "@type": [ + "raml-shapes:ScalarShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "shacl:datatype": [ + { + "@id": "http://www.w3.org/2001/XMLSchema#integer" + } + ], + "shacl:name": [ + { + "@value": "TestType2" + } + ], + "smaps": { + "resolved-link-target": { + "#3": "amf://id#3" + }, + "declared-element": { + "#3": "" + }, + "lexical": { + "shacl:name": "[(6,2)-(6,11)]", + "#3": "[(6,2)-(7,0)]", + "shacl:datatype": "[(6,13)-(6,20)]" + }, + "resolved-link": { + "#3": "amf://id#4" + } + } + }, + { + "@id": "#5", + "@type": [ + "raml-shapes:ScalarShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "shacl:datatype": [ + { + "@id": "http://www.w3.org/2001/XMLSchema#string" + } + ], + "shacl:name": [ + { + "@value": "TestType3" + } + ], + "smaps": { + "resolved-link-target": { + "#5": "amf://id#5" + }, + "declared-element": { + "#5": "" + }, + "lexical": { + "shacl:name": "[(7,2)-(7,11)]", + "#5": "[(7,2)-(9,0)]", + "shacl:datatype": "[(7,13)-(7,19)]" + }, + "resolved-link": { + "#5": "amf://id#6" + } + } + }, + { + "@id": "#7", + "@type": [ + "apiContract:Trait", + "doc:AbstractDeclaration", + "doc:DomainElement" + ], + "core:name": [ + { + "@value": "myTrait" + } + ], + "doc:dataNode": [ + { + "@id": "#8", + "@type": [ + "data:Object", + "data:Node", + "doc:DomainElement" + ], + "data:responses": [ + { + "@id": "#9", + "@type": [ + "data:Object", + "data:Node", + "doc:DomainElement" + ], + "data:200": [ + { + "@id": "#10", + "@type": [ + "data:Object", + "data:Node", + "doc:DomainElement" + ], + "data:body": [ + { + "@id": "#11", + "@type": [ + "data:Object", + "data:Node", + "doc:DomainElement" + ], + "data:application%2Fjson": [ + { + "@id": "#12", + "@type": [ + "data:Object", + "data:Node", + "doc:DomainElement" + ], + "data:type": [ + { + "@id": "#13", + "@type": [ + "data:Scalar", + "data:Node", + "doc:DomainElement" + ], + "data:value": [ + { + "@value": "<>" + } + ], + "shacl:datatype": [ + { + "@id": "http://www.w3.org/2001/XMLSchema#string" + } + ], + "core:name": [ + { + "@value": "type" + } + ], + "smaps": { + "synthesized-field": { + "core:name": "true", + "shacl:datatype": "true" + }, + "lexical": { + "#13": "[(15,18)-(15,39)]" + } + } + } + ], + "core:name": [ + { + "@value": "application/json" + } + ], + "smaps": { + "synthesized-field": { + "core:name": "true" + }, + "lexical": { + "data:type": "[(15,12)-(17,0)]", + "#12": "[(15,0)-(17,0)]" + } + } + } + ], + "core:name": [ + { + "@value": "body" + } + ], + "smaps": { + "synthesized-field": { + "core:name": "true" + }, + "lexical": { + "data:application%2Fjson": "[(14,10)-(17,0)]", + "#11": "[(14,0)-(17,0)]" + } + } + } + ], + "core:name": [ + { + "@value": "200" + } + ], + "smaps": { + "synthesized-field": { + "core:name": "true" + }, + "lexical": { + "data:body": "[(13,8)-(17,0)]", + "#10": "[(13,0)-(17,0)]" + } + } + } + ], + "core:name": [ + { + "@value": "responses" + } + ], + "smaps": { + "synthesized-field": { + "core:name": "true" + }, + "lexical": { + "data:200": "[(12,6)-(17,0)]", + "#9": "[(12,0)-(17,0)]" + } + } + } + ], + "core:name": [ + { + "@value": "object_1" + } + ], + "smaps": { + "synthesized-field": { + "core:name": "true" + }, + "lexical": { + "data:responses": "[(11,4)-(17,0)]", + "#8": "[(11,4)-(17,0)]" + } + } + } + ], + "doc:variable": [ + { + "@value": "type-response-get" + } + ], + "smaps": { + "declared-element": { + "#7": "" + }, + "lexical": { + "doc:variable": "[(10,10)-(17,0)]", + "core:name": "[(10,2)-(10,9)]", + "#7": "[(10,2)-(17,0)]", + "doc:dataNode": "[(11,4)-(17,0)]" + } + } + } + ], + "@context": { + "@base": "amf://id", + "shacl": "http://www.w3.org/ns/shacl#", + "raml-shapes": "http://a.ml/vocabularies/shapes#", + "data": "http://a.ml/vocabularies/data#", + "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/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 new file mode 100644 index 0000000000..f25b0a7782 --- /dev/null +++ b/amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions-in-traits/api.flattened.jsonld @@ -0,0 +1,494 @@ +{ + "@graph": [ + { + "@id": "#14", + "@type": [ + "doc:APIContractProcessingData" + ], + "apiContract:modelVersion": "3.8.2", + "doc:transformed": true, + "doc:sourceSpec": "RAML 1.0" + }, + { + "@id": "#15", + "@type": [ + "apiContract:WebAPI", + "apiContract:API", + "doc:RootDomainElement", + "doc:DomainElement" + ], + "core:name": "e-terminal-common", + "apiContract:endpoint": [ + { + "@id": "#16" + } + ], + "smaps": { + "lexical": { + "core:name": "[(2,0)-(4,0)]", + "#15": "[(2,0)-(21,6)]" + } + } + }, + { + "@id": "#16", + "@type": [ + "apiContract:EndPoint", + "doc:DomainElement" + ], + "apiContract:path": "/reprints", + "apiContract:supportedOperation": [ + { + "@id": "#17" + } + ], + "smaps": { + "lexical": { + "apiContract:path": "[(17,0)-(17,9)]", + "#16": "[(17,0)-(21,6)]" + } + } + }, + { + "@id": "#17", + "@type": [ + "apiContract:Operation", + "core:Operation", + "doc:DomainElement" + ], + "apiContract:method": "post", + "apiContract:returns": [ + { + "@id": "#21" + } + ], + "doc:extends": [ + { + "@id": "#18" + } + ], + "smaps": { + "lexical": { + "doc:extends": "[(19,4)-(21,6)]", + "#17": "[(18,2)-(21,6)]" + } + } + }, + { + "@id": "#21", + "@type": [ + "apiContract:Response", + "core:Response", + "apiContract:Message", + "doc:DomainElement" + ], + "apiContract:statusCode": "200", + "core:name": "200", + "apiContract:payload": [ + { + "@id": "#22" + } + ], + "smaps": { + "lexical": { + "apiContract:payload": "[(13,8)-(15,39)]", + "#21": "[(12,6)-(15,39)]" + } + } + }, + { + "@id": "#18", + "@type": [ + "apiContract:ParametrizedTrait", + "doc:ParametrizedDeclaration", + "doc:DomainElement" + ], + "core:name": "myTrait", + "doc:target": { + "@id": "#7" + }, + "doc:variable": [ + { + "@id": "#19" + } + ], + "smaps": { + "lexical": { + "core:name": "[(19,10)-(19,17)]", + "#18": "[(19,10)-(21,5)]" + } + } + }, + { + "@id": "#22", + "@type": [ + "apiContract:Payload", + "core:Payload", + "doc:DomainElement" + ], + "core:mediaType": "application/json", + "raml-shapes:schema": { + "@id": "#23" + }, + "smaps": { + "lexical": { + "#22": "[(14,10)-(15,39)]" + } + } + }, + { + "@id": "#7", + "@type": [ + "apiContract:Trait", + "doc:AbstractDeclaration", + "doc:DomainElement" + ], + "core:name": "myTrait", + "doc:dataNode": { + "@id": "#8" + }, + "doc:variable": [ + "type-response-get" + ], + "smaps": { + "declared-element": { + "#7": "" + }, + "lexical": { + "doc:variable": "[(10,10)-(17,0)]", + "core:name": "[(10,2)-(10,9)]", + "#7": "[(10,2)-(17,0)]", + "doc:dataNode": "[(11,4)-(17,0)]" + } + } + }, + { + "@id": "#19", + "@type": [ + "doc:VariableValue", + "doc:DomainElement" + ], + "core:name": "type-response-get", + "doc:value": { + "@id": "#20" + }, + "smaps": { + "lexical": { + "doc:value": "[(20,25)-(20,58)]", + "#19": "[(20,6)-(20,58)]" + } + } + }, + { + "@id": "#23", + "@type": [ + "raml-shapes:UnionShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "raml-shapes:anyOf": [ + { + "@id": "#1" + }, + { + "@id": "#3" + }, + { + "@id": "#5" + } + ], + "smaps": { + "auto-generated-name": { + "#23": "" + }, + "lexical": { + "#23": "[(15,12)-(15,39)]" + } + } + }, + { + "@id": "#8", + "@type": [ + "data:Object", + "data:Node", + "doc:DomainElement" + ], + "data:responses": { + "@id": "#9" + }, + "core:name": "object_1", + "smaps": { + "synthesized-field": { + "core:name": "true" + }, + "lexical": { + "data:responses": "[(11,4)-(17,0)]", + "#8": "[(11,4)-(17,0)]" + } + } + }, + { + "@id": "#20", + "@type": [ + "data:Scalar", + "data:Node", + "doc:DomainElement" + ], + "data:value": "TestType1 | TestType2 | TestType3", + "shacl:datatype": [ + { + "@id": "http://www.w3.org/2001/XMLSchema#string" + } + ], + "core:name": "scalar_1", + "smaps": { + "synthesized-field": { + "core:name": "true", + "shacl:datatype": "true" + }, + "lexical": { + "#20": "[(20,25)-(20,58)]" + } + } + }, + { + "@id": "#1", + "@type": [ + "shacl:NodeShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "shacl:name": "TestType1", + "smaps": { + "resolved-link-target": { + "#1": "amf://id#1" + }, + "declared-element": { + "#1": "" + }, + "lexical": { + "shacl:name": "[(5,2)-(5,11)]", + "#1": "[(5,2)-(6,0)]" + }, + "resolved-link": { + "#1": "amf://id#2" + } + } + }, + { + "@id": "#3", + "@type": [ + "raml-shapes:ScalarShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "shacl:datatype": [ + { + "@id": "http://www.w3.org/2001/XMLSchema#integer" + } + ], + "shacl:name": "TestType2", + "smaps": { + "resolved-link-target": { + "#3": "amf://id#3" + }, + "declared-element": { + "#3": "" + }, + "lexical": { + "shacl:name": "[(6,2)-(6,11)]", + "#3": "[(6,2)-(7,0)]", + "shacl:datatype": "[(6,13)-(6,20)]" + }, + "resolved-link": { + "#3": "amf://id#4" + } + } + }, + { + "@id": "#5", + "@type": [ + "raml-shapes:ScalarShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "shacl:datatype": [ + { + "@id": "http://www.w3.org/2001/XMLSchema#string" + } + ], + "shacl:name": "TestType3", + "smaps": { + "resolved-link-target": { + "#5": "amf://id#5" + }, + "declared-element": { + "#5": "" + }, + "lexical": { + "shacl:name": "[(7,2)-(7,11)]", + "#5": "[(7,2)-(9,0)]", + "shacl:datatype": "[(7,13)-(7,19)]" + }, + "resolved-link": { + "#5": "amf://id#6" + } + } + }, + { + "@id": "#9", + "@type": [ + "data:Object", + "data:Node", + "doc:DomainElement" + ], + "data:200": { + "@id": "#10" + }, + "core:name": "responses", + "smaps": { + "synthesized-field": { + "core:name": "true" + }, + "lexical": { + "data:200": "[(12,6)-(17,0)]", + "#9": "[(12,0)-(17,0)]" + } + } + }, + { + "@id": "#10", + "@type": [ + "data:Object", + "data:Node", + "doc:DomainElement" + ], + "data:body": { + "@id": "#11" + }, + "core:name": "200", + "smaps": { + "synthesized-field": { + "core:name": "true" + }, + "lexical": { + "data:body": "[(13,8)-(17,0)]", + "#10": "[(13,0)-(17,0)]" + } + } + }, + { + "@id": "#11", + "@type": [ + "data:Object", + "data:Node", + "doc:DomainElement" + ], + "data:application%2Fjson": { + "@id": "#12" + }, + "core:name": "body", + "smaps": { + "synthesized-field": { + "core:name": "true" + }, + "lexical": { + "data:application%2Fjson": "[(14,10)-(17,0)]", + "#11": "[(14,0)-(17,0)]" + } + } + }, + { + "@id": "#12", + "@type": [ + "data:Object", + "data:Node", + "doc:DomainElement" + ], + "data:type": { + "@id": "#13" + }, + "core:name": "application/json", + "smaps": { + "synthesized-field": { + "core:name": "true" + }, + "lexical": { + "data:type": "[(15,12)-(17,0)]", + "#12": "[(15,0)-(17,0)]" + } + } + }, + { + "@id": "#13", + "@type": [ + "data:Scalar", + "data:Node", + "doc:DomainElement" + ], + "data:value": "<>", + "shacl:datatype": [ + { + "@id": "http://www.w3.org/2001/XMLSchema#string" + } + ], + "core:name": "type", + "smaps": { + "synthesized-field": { + "core:name": "true", + "shacl:datatype": "true" + }, + "lexical": { + "#13": "[(15,18)-(15,39)]" + } + } + }, + { + "@id": "", + "doc:declares": [ + { + "@id": "#1" + }, + { + "@id": "#3" + }, + { + "@id": "#5" + }, + { + "@id": "#7" + } + ], + "@type": [ + "doc:Document", + "doc:Fragment", + "doc:Module", + "doc:Unit" + ], + "doc:encodes": { + "@id": "#15" + }, + "doc:root": true, + "doc:processingData": { + "@id": "#14" + } + } + ], + "@context": { + "@base": "amf://id", + "shacl": "http://www.w3.org/ns/shacl#", + "raml-shapes": "http://a.ml/vocabularies/shapes#", + "data": "http://a.ml/vocabularies/data#", + "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/upanddown/raml10/multiple-non-nested-unions-in-traits/api.raml b/amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions-in-traits/api.raml new file mode 100644 index 0000000000..21e623e49b --- /dev/null +++ b/amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions-in-traits/api.raml @@ -0,0 +1,21 @@ +#%RAML 1.0 +title: e-terminal-common + +types: + TestType1: object + TestType2: integer + TestType3: string + +traits: + myTrait: + responses: + 200: + body: + application/json: + type: <> + +/reprints: + post: + is: [ myTrait: { + type-response-get: TestType1 | TestType2 | TestType3 + }] \ No newline at end of file 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 new file mode 100644 index 0000000000..d77b607645 --- /dev/null +++ b/amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.expanded.jsonld @@ -0,0 +1,263 @@ +[ + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml", + "@type": [ + "http://a.ml/vocabularies/document#Document", + "http://a.ml/vocabularies/document#Fragment", + "http://a.ml/vocabularies/document#Module", + "http://a.ml/vocabularies/document#Unit" + ], + "http://a.ml/vocabularies/document#encodes": [ + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/web-api", + "@type": [ + "http://a.ml/vocabularies/apiContract#WebAPI", + "http://a.ml/vocabularies/apiContract#API", + "http://a.ml/vocabularies/document#RootDomainElement", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://a.ml/vocabularies/core#name": [ + { + "@value": "asd" + } + ], + "http://a.ml/vocabularies/apiContract#endpoint": [ + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/web-api/endpoint/%2Freprints", + "@type": [ + "http://a.ml/vocabularies/apiContract#EndPoint", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://a.ml/vocabularies/apiContract#path": [ + { + "@value": "/reprints" + } + ], + "http://a.ml/vocabularies/apiContract#supportedOperation": [ + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/web-api/endpoint/%2Freprints/supportedOperation/get", + "@type": [ + "http://a.ml/vocabularies/apiContract#Operation", + "http://a.ml/vocabularies/core#Operation", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://a.ml/vocabularies/apiContract#method": [ + { + "@value": "get" + } + ], + "http://a.ml/vocabularies/apiContract#returns": [ + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/web-api/endpoint/%2Freprints/supportedOperation/get/returns/resp/200", + "@type": [ + "http://a.ml/vocabularies/apiContract#Response", + "http://a.ml/vocabularies/core#Response", + "http://a.ml/vocabularies/apiContract#Message", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://a.ml/vocabularies/apiContract#statusCode": [ + { + "@value": "200" + } + ], + "http://a.ml/vocabularies/core#name": [ + { + "@value": "200" + } + ], + "http://a.ml/vocabularies/apiContract#payload": [ + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/web-api/endpoint/%2Freprints/supportedOperation/get/returns/resp/200/payload/application%2Fjson", + "@type": [ + "http://a.ml/vocabularies/apiContract#Payload", + "http://a.ml/vocabularies/core#Payload", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://a.ml/vocabularies/core#mediaType": [ + { + "@value": "application/json" + } + ], + "http://a.ml/vocabularies/shapes#schema": [ + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/web-api/endpoint/%2Freprints/supportedOperation/get/returns/resp/200/payload/application%2Fjson/union/schema", + "@type": [ + "http://a.ml/vocabularies/shapes#UnionShape", + "http://a.ml/vocabularies/shapes#AnyShape", + "http://www.w3.org/ns/shacl#Shape", + "http://a.ml/vocabularies/shapes#Shape", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://www.w3.org/ns/shacl#name": [ + { + "@value": "schema" + } + ], + "http://a.ml/vocabularies/shapes#inherits": [ + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/web-api/endpoint/%2Freprints/supportedOperation/get/returns/resp/200/payload/application%2Fjson/union/schema/inherits/union/default-union", + "@type": [ + "http://a.ml/vocabularies/shapes#UnionShape", + "http://a.ml/vocabularies/shapes#AnyShape", + "http://www.w3.org/ns/shacl#Shape", + "http://a.ml/vocabularies/shapes#Shape", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://a.ml/vocabularies/shapes#anyOf": [ + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/web-api/endpoint/%2Freprints/supportedOperation/get/returns/resp/200/payload/application%2Fjson/union/schema/inherits/union/default-union/anyOf/shape/default-node", + "@type": [ + "http://www.w3.org/ns/shacl#NodeShape", + "http://a.ml/vocabularies/shapes#AnyShape", + "http://www.w3.org/ns/shacl#Shape", + "http://a.ml/vocabularies/shapes#Shape", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://a.ml/vocabularies/document#link-target": [ + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/declares/shape/TestType1" + } + ], + "http://a.ml/vocabularies/document#link-label": [ + { + "@value": "TestType1" + } + ] + }, + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/web-api/endpoint/%2Freprints/supportedOperation/get/returns/resp/200/payload/application%2Fjson/union/schema/inherits/union/default-union/anyOf/scalar/default-scalar", + "@type": [ + "http://a.ml/vocabularies/shapes#ScalarShape", + "http://a.ml/vocabularies/shapes#AnyShape", + "http://www.w3.org/ns/shacl#Shape", + "http://a.ml/vocabularies/shapes#Shape", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://a.ml/vocabularies/document#link-target": [ + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/declares/scalar/TestType2" + } + ], + "http://a.ml/vocabularies/document#link-label": [ + { + "@value": "TestType2" + } + ] + }, + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/web-api/endpoint/%2Freprints/supportedOperation/get/returns/resp/200/payload/application%2Fjson/union/schema/inherits/union/default-union/anyOf/scalar/default-scalar_1", + "@type": [ + "http://a.ml/vocabularies/shapes#ScalarShape", + "http://a.ml/vocabularies/shapes#AnyShape", + "http://www.w3.org/ns/shacl#Shape", + "http://a.ml/vocabularies/shapes#Shape", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://a.ml/vocabularies/document#link-target": [ + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/declares/scalar/TestType3" + } + ], + "http://a.ml/vocabularies/document#link-label": [ + { + "@value": "TestType3" + } + ] + } + ] + } + ] + } + ] + } + ] + } + ] + } + ] + } + ] + } + ], + "http://a.ml/vocabularies/document#root": [ + { + "@value": true + } + ], + "http://a.ml/vocabularies/document#processingData": [ + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/BaseUnitProcessingData", + "@type": [ + "http://a.ml/vocabularies/document#APIContractProcessingData" + ], + "http://a.ml/vocabularies/apiContract#modelVersion": [ + { + "@value": "3.8.2" + } + ], + "http://a.ml/vocabularies/document#sourceSpec": [ + { + "@value": "RAML 1.0" + } + ] + } + ], + "http://a.ml/vocabularies/document#declares": [ + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/declares/shape/TestType1", + "@type": [ + "http://www.w3.org/ns/shacl#NodeShape", + "http://a.ml/vocabularies/shapes#AnyShape", + "http://www.w3.org/ns/shacl#Shape", + "http://a.ml/vocabularies/shapes#Shape", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://www.w3.org/ns/shacl#name": [ + { + "@value": "TestType1" + } + ] + }, + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/declares/scalar/TestType2", + "@type": [ + "http://a.ml/vocabularies/shapes#ScalarShape", + "http://a.ml/vocabularies/shapes#AnyShape", + "http://www.w3.org/ns/shacl#Shape", + "http://a.ml/vocabularies/shapes#Shape", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://www.w3.org/ns/shacl#datatype": [ + { + "@id": "http://www.w3.org/2001/XMLSchema#integer" + } + ], + "http://www.w3.org/ns/shacl#name": [ + { + "@value": "TestType2" + } + ] + }, + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/declares/scalar/TestType3", + "@type": [ + "http://a.ml/vocabularies/shapes#ScalarShape", + "http://a.ml/vocabularies/shapes#AnyShape", + "http://www.w3.org/ns/shacl#Shape", + "http://a.ml/vocabularies/shapes#Shape", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://www.w3.org/ns/shacl#datatype": [ + { + "@id": "http://www.w3.org/2001/XMLSchema#string" + } + ], + "http://www.w3.org/ns/shacl#name": [ + { + "@value": "TestType3" + } + ] + } + ] + } +] 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 new file mode 100644 index 0000000000..215f06bc1c --- /dev/null +++ b/amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.flattened.jsonld @@ -0,0 +1,237 @@ +{ + "@graph": [ + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/BaseUnitProcessingData", + "@type": [ + "http://a.ml/vocabularies/document#APIContractProcessingData" + ], + "http://a.ml/vocabularies/apiContract#modelVersion": "3.8.2", + "http://a.ml/vocabularies/document#sourceSpec": "RAML 1.0" + }, + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/web-api", + "@type": [ + "http://a.ml/vocabularies/apiContract#WebAPI", + "http://a.ml/vocabularies/apiContract#API", + "http://a.ml/vocabularies/document#RootDomainElement", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://a.ml/vocabularies/core#name": "asd", + "http://a.ml/vocabularies/apiContract#endpoint": [ + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/web-api/endpoint/%2Freprints" + } + ] + }, + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/web-api/endpoint/%2Freprints", + "@type": [ + "http://a.ml/vocabularies/apiContract#EndPoint", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://a.ml/vocabularies/apiContract#path": "/reprints", + "http://a.ml/vocabularies/apiContract#supportedOperation": [ + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/web-api/endpoint/%2Freprints/supportedOperation/get" + } + ] + }, + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/web-api/endpoint/%2Freprints/supportedOperation/get", + "@type": [ + "http://a.ml/vocabularies/apiContract#Operation", + "http://a.ml/vocabularies/core#Operation", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://a.ml/vocabularies/apiContract#method": "get", + "http://a.ml/vocabularies/apiContract#returns": [ + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/web-api/endpoint/%2Freprints/supportedOperation/get/returns/resp/200" + } + ] + }, + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/web-api/endpoint/%2Freprints/supportedOperation/get/returns/resp/200", + "@type": [ + "http://a.ml/vocabularies/apiContract#Response", + "http://a.ml/vocabularies/core#Response", + "http://a.ml/vocabularies/apiContract#Message", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://a.ml/vocabularies/apiContract#statusCode": "200", + "http://a.ml/vocabularies/core#name": "200", + "http://a.ml/vocabularies/apiContract#payload": [ + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/web-api/endpoint/%2Freprints/supportedOperation/get/returns/resp/200/payload/application%2Fjson" + } + ] + }, + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/web-api/endpoint/%2Freprints/supportedOperation/get/returns/resp/200/payload/application%2Fjson", + "@type": [ + "http://a.ml/vocabularies/apiContract#Payload", + "http://a.ml/vocabularies/core#Payload", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://a.ml/vocabularies/core#mediaType": "application/json", + "http://a.ml/vocabularies/shapes#schema": { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/web-api/endpoint/%2Freprints/supportedOperation/get/returns/resp/200/payload/application%2Fjson/union/schema" + } + }, + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/web-api/endpoint/%2Freprints/supportedOperation/get/returns/resp/200/payload/application%2Fjson/union/schema", + "@type": [ + "http://a.ml/vocabularies/shapes#UnionShape", + "http://a.ml/vocabularies/shapes#AnyShape", + "http://www.w3.org/ns/shacl#Shape", + "http://a.ml/vocabularies/shapes#Shape", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://www.w3.org/ns/shacl#name": "schema", + "http://a.ml/vocabularies/shapes#inherits": [ + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/web-api/endpoint/%2Freprints/supportedOperation/get/returns/resp/200/payload/application%2Fjson/union/schema/inherits/union/default-union" + } + ] + }, + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/web-api/endpoint/%2Freprints/supportedOperation/get/returns/resp/200/payload/application%2Fjson/union/schema/inherits/union/default-union", + "@type": [ + "http://a.ml/vocabularies/shapes#UnionShape", + "http://a.ml/vocabularies/shapes#AnyShape", + "http://www.w3.org/ns/shacl#Shape", + "http://a.ml/vocabularies/shapes#Shape", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://a.ml/vocabularies/shapes#anyOf": [ + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/web-api/endpoint/%2Freprints/supportedOperation/get/returns/resp/200/payload/application%2Fjson/union/schema/inherits/union/default-union/anyOf/shape/default-node" + }, + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/web-api/endpoint/%2Freprints/supportedOperation/get/returns/resp/200/payload/application%2Fjson/union/schema/inherits/union/default-union/anyOf/scalar/default-scalar" + }, + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/web-api/endpoint/%2Freprints/supportedOperation/get/returns/resp/200/payload/application%2Fjson/union/schema/inherits/union/default-union/anyOf/scalar/default-scalar_1" + } + ] + }, + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/web-api/endpoint/%2Freprints/supportedOperation/get/returns/resp/200/payload/application%2Fjson/union/schema/inherits/union/default-union/anyOf/shape/default-node", + "@type": [ + "http://www.w3.org/ns/shacl#NodeShape", + "http://a.ml/vocabularies/shapes#AnyShape", + "http://www.w3.org/ns/shacl#Shape", + "http://a.ml/vocabularies/shapes#Shape", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://a.ml/vocabularies/document#link-target": [ + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/declares/shape/TestType1" + } + ], + "http://a.ml/vocabularies/document#link-label": "TestType1" + }, + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/web-api/endpoint/%2Freprints/supportedOperation/get/returns/resp/200/payload/application%2Fjson/union/schema/inherits/union/default-union/anyOf/scalar/default-scalar", + "@type": [ + "http://a.ml/vocabularies/shapes#ScalarShape", + "http://a.ml/vocabularies/shapes#AnyShape", + "http://www.w3.org/ns/shacl#Shape", + "http://a.ml/vocabularies/shapes#Shape", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://a.ml/vocabularies/document#link-target": [ + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/declares/scalar/TestType2" + } + ], + "http://a.ml/vocabularies/document#link-label": "TestType2" + }, + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/web-api/endpoint/%2Freprints/supportedOperation/get/returns/resp/200/payload/application%2Fjson/union/schema/inherits/union/default-union/anyOf/scalar/default-scalar_1", + "@type": [ + "http://a.ml/vocabularies/shapes#ScalarShape", + "http://a.ml/vocabularies/shapes#AnyShape", + "http://www.w3.org/ns/shacl#Shape", + "http://a.ml/vocabularies/shapes#Shape", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://a.ml/vocabularies/document#link-target": [ + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/declares/scalar/TestType3" + } + ], + "http://a.ml/vocabularies/document#link-label": "TestType3" + }, + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml", + "http://a.ml/vocabularies/document#declares": [ + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/declares/shape/TestType1" + }, + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/declares/scalar/TestType2" + }, + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/declares/scalar/TestType3" + } + ], + "@type": [ + "http://a.ml/vocabularies/document#Document", + "http://a.ml/vocabularies/document#Fragment", + "http://a.ml/vocabularies/document#Module", + "http://a.ml/vocabularies/document#Unit" + ], + "http://a.ml/vocabularies/document#encodes": { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/web-api" + }, + "http://a.ml/vocabularies/document#root": true, + "http://a.ml/vocabularies/document#processingData": { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/BaseUnitProcessingData" + } + }, + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/declares/shape/TestType1", + "@type": [ + "http://www.w3.org/ns/shacl#NodeShape", + "http://a.ml/vocabularies/shapes#AnyShape", + "http://www.w3.org/ns/shacl#Shape", + "http://a.ml/vocabularies/shapes#Shape", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://www.w3.org/ns/shacl#name": "TestType1" + }, + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/declares/scalar/TestType2", + "@type": [ + "http://a.ml/vocabularies/shapes#ScalarShape", + "http://a.ml/vocabularies/shapes#AnyShape", + "http://www.w3.org/ns/shacl#Shape", + "http://a.ml/vocabularies/shapes#Shape", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://www.w3.org/ns/shacl#datatype": [ + { + "@id": "http://www.w3.org/2001/XMLSchema#integer" + } + ], + "http://www.w3.org/ns/shacl#name": "TestType2" + }, + { + "@id": "file://amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml#/declares/scalar/TestType3", + "@type": [ + "http://a.ml/vocabularies/shapes#ScalarShape", + "http://a.ml/vocabularies/shapes#AnyShape", + "http://www.w3.org/ns/shacl#Shape", + "http://a.ml/vocabularies/shapes#Shape", + "http://a.ml/vocabularies/document#DomainElement" + ], + "http://www.w3.org/ns/shacl#datatype": [ + { + "@id": "http://www.w3.org/2001/XMLSchema#string" + } + ], + "http://www.w3.org/ns/shacl#name": "TestType3" + } + ] +} diff --git a/amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml b/amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml new file mode 100644 index 0000000000..a7452c8ac5 --- /dev/null +++ b/amf-cli/shared/src/test/resources/upanddown/raml10/multiple-non-nested-unions/api.raml @@ -0,0 +1,15 @@ +#%RAML 1.0 +title: asd + +types: + TestType1: object + TestType2: integer + TestType3: string + +/reprints: + get: + responses: + 200: + body: + application/json: + type: TestType1 | TestType2 | TestType3 \ No newline at end of file diff --git a/amf-cli/shared/src/test/resources/upanddown/raml10/unions/triple-unions.raml b/amf-cli/shared/src/test/resources/upanddown/raml10/unions/triple-unions.raml new file mode 100644 index 0000000000..1394f8f104 --- /dev/null +++ b/amf-cli/shared/src/test/resources/upanddown/raml10/unions/triple-unions.raml @@ -0,0 +1,23 @@ +#%RAML 1.0 +title: test + +types: + Shape: any # AnyShape + + UnionInArray: # ArrayShape + type: array + items: string | number | Shape # normal union shape (all in 1 level inside anyOf) + + UnionInProperty: # NodeShape + properties: + # fixed in transformation + # doing complex: string | Shape | number works just fine, adding type: breaks it in parsing + complex: # PropertyShape with Range as an UnionShape + type: string | Shape | number # UnionShape with 0 anyOf members, and inherits an UnionShape with the 3 types + + UnionInArrayProperty: # NodeShape + properties: + complexArray: # PropertyShape with Range as an ArrayShape + type: array # ArrayShape + # fixed in UnionFlattenerStage but with duplicated IDs + items: Shape | number | string # UnionShape with the AnyShape and an UnionShape with the 2 ScalarShapes 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 new file mode 100644 index 0000000000..f15bc0a9f6 --- /dev/null +++ b/amf-cli/shared/src/test/resources/upanddown/raml10/unions/triple-unions.resolved.expanded.jsonld @@ -0,0 +1,562 @@ +[ + { + "@id": "", + "@type": [ + "doc:Document", + "doc:Fragment", + "doc:Module", + "doc:Unit" + ], + "doc:encodes": [ + { + "@id": "#21", + "@type": [ + "apiContract:WebAPI", + "apiContract:API", + "doc:RootDomainElement", + "doc:DomainElement" + ], + "core:name": [ + { + "@value": "test" + } + ], + "smaps": { + "lexical": { + "core:name": "[(2,0)-(4,0)]", + "#21": "[(2,0)-(24,0)]" + } + } + } + ], + "doc:root": [ + { + "@value": true + } + ], + "doc:processingData": [ + { + "@id": "#20", + "@type": [ + "doc:APIContractProcessingData" + ], + "apiContract:modelVersion": [ + { + "@value": "3.8.2" + } + ], + "doc:transformed": [ + { + "@value": true + } + ], + "doc:sourceSpec": [ + { + "@value": "RAML 1.0" + } + ] + } + ], + "doc:declares": [ + { + "@id": "#1", + "@type": [ + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "shacl:name": [ + { + "@value": "Shape" + } + ], + "smaps": { + "resolved-link-target": { + "#1": "amf://id#1" + }, + "declared-element": { + "#1": "" + }, + "lexical": { + "shacl:name": "[(5,2)-(5,7)]", + "#1": "[(5,2)-(7,0)]" + }, + "resolved-link": { + "#1": "amf://id#4" + } + } + }, + { + "@id": "#5", + "@type": [ + "raml-shapes:ArrayShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "raml-shapes:items": [ + { + "@id": "#6", + "@type": [ + "raml-shapes:UnionShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "raml-shapes:anyOf": [ + { + "@id": "#7", + "@type": [ + "raml-shapes:ScalarShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "shacl:datatype": [ + { + "@id": "http://www.w3.org/2001/XMLSchema#string" + } + ], + "smaps": { + "lexical": { + "#7": "[(9,11)-(9,17)]" + } + } + }, + { + "@id": "#8", + "@type": [ + "raml-shapes:ScalarShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "shacl:datatype": [ + { + "@id": "http://a.ml/vocabularies/shapes#number" + } + ], + "smaps": { + "lexical": { + "#8": "[(9,20)-(9,26)]" + } + } + }, + { + "@id": "#1", + "@type": [ + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "shacl:name": [ + { + "@value": "Shape" + } + ], + "smaps": { + "resolved-link-target": { + "#1": "amf://id#1" + }, + "declared-element": { + "#1": "" + }, + "lexical": { + "shacl:name": "[(5,2)-(5,7)]", + "#1": "[(5,2)-(7,0)]" + }, + "resolved-link": { + "#1": "amf://id#4" + } + } + } + ], + "shacl:name": [ + { + "@value": "items" + } + ], + "smaps": { + "lexical": { + "#6": "[(9,4)-(11,0)]" + } + } + } + ], + "shacl:name": [ + { + "@value": "UnionInArray" + } + ], + "smaps": { + "declared-element": { + "#5": "" + }, + "lexical": { + "shacl:name": "[(7,2)-(7,14)]", + "#5": "[(7,2)-(11,0)]" + }, + "type-property-lexical-info": { + "#5": "[(8,4)-(8,8)]" + } + } + }, + { + "@id": "#9", + "@type": [ + "shacl:NodeShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "shacl:closed": [ + { + "@value": false + } + ], + "shacl:property": [ + { + "@id": "#10", + "@type": [ + "shacl:PropertyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "shacl:path": [ + { + "@id": "http://a.ml/vocabularies/data#complex" + } + ], + "raml-shapes:range": [ + { + "@id": "#11", + "@type": [ + "raml-shapes:UnionShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "raml-shapes:anyOf": [ + { + "@id": "#12", + "@type": [ + "raml-shapes:ScalarShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "shacl:datatype": [ + { + "@id": "http://www.w3.org/2001/XMLSchema#string" + } + ], + "smaps": { + "lexical": { + "#12": "[(16,14)-(16,20)]" + } + } + }, + { + "@id": "#1", + "@type": [ + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "shacl:name": [ + { + "@value": "Shape" + } + ], + "smaps": { + "resolved-link-target": { + "#1": "amf://id#1" + }, + "declared-element": { + "#1": "" + }, + "lexical": { + "shacl:name": "[(5,2)-(5,7)]", + "#1": "[(5,2)-(7,0)]" + }, + "resolved-link": { + "#1": "amf://id#4" + } + } + }, + { + "@id": "#13", + "@type": [ + "raml-shapes:ScalarShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "shacl:datatype": [ + { + "@id": "http://a.ml/vocabularies/shapes#number" + } + ], + "smaps": { + "lexical": { + "#13": "[(16,31)-(16,37)]" + } + } + } + ], + "smaps": { + "lexical": { + "#11": "[(16,8)-(18,0)]" + } + } + } + ], + "shacl:minCount": [ + { + "@value": 1 + } + ], + "shacl:name": [ + { + "@value": "complex" + } + ], + "smaps": { + "synthesized-field": { + "shacl:minCount": "true", + "shacl:path": "true" + }, + "lexical": { + "raml-shapes:range": "[(15,14)-(18,0)]", + "#10": "[(15,6)-(18,0)]" + } + } + } + ], + "shacl:name": [ + { + "@value": "UnionInProperty" + } + ], + "smaps": { + "synthesized-field": { + "shacl:closed": "true" + }, + "lexical": { + "shacl:name": "[(11,2)-(11,17)]", + "#9": "[(11,2)-(18,0)]" + }, + "declared-element": { + "#9": "" + } + } + }, + { + "@id": "#14", + "@type": [ + "shacl:NodeShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "shacl:closed": [ + { + "@value": false + } + ], + "shacl:property": [ + { + "@id": "#15", + "@type": [ + "shacl:PropertyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "shacl:path": [ + { + "@id": "http://a.ml/vocabularies/data#complexArray" + } + ], + "raml-shapes:range": [ + { + "@id": "#16", + "@type": [ + "raml-shapes:ArrayShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "raml-shapes:items": [ + { + "@id": "#17", + "@type": [ + "raml-shapes:UnionShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "raml-shapes:anyOf": [ + { + "@id": "#1", + "@type": [ + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "shacl:name": [ + { + "@value": "Shape" + } + ], + "smaps": { + "resolved-link-target": { + "#1": "amf://id#1" + }, + "declared-element": { + "#1": "" + }, + "lexical": { + "shacl:name": "[(5,2)-(5,7)]", + "#1": "[(5,2)-(7,0)]" + }, + "resolved-link": { + "#1": "amf://id#4" + } + } + }, + { + "@id": "#18", + "@type": [ + "raml-shapes:ScalarShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "shacl:datatype": [ + { + "@id": "http://a.ml/vocabularies/shapes#number" + } + ], + "smaps": { + "lexical": { + "#18": "[(23,23)-(23,29)]" + } + } + }, + { + "@id": "#19", + "@type": [ + "raml-shapes:ScalarShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "shacl:datatype": [ + { + "@id": "http://www.w3.org/2001/XMLSchema#string" + } + ], + "smaps": { + "lexical": { + "#19": "[(23,32)-(23,38)]" + } + } + } + ], + "shacl:name": [ + { + "@value": "items" + } + ], + "smaps": { + "lexical": { + "#17": "[(23,8)-(24,0)]" + } + } + } + ], + "shacl:name": [ + { + "@value": "complexArray" + } + ], + "smaps": { + "type-property-lexical-info": { + "#16": "[(21,8)-(21,12)]" + }, + "lexical": { + "#16": "[(20,6)-(24,0)]" + } + } + } + ], + "shacl:minCount": [ + { + "@value": 1 + } + ], + "shacl:name": [ + { + "@value": "complexArray" + } + ], + "smaps": { + "synthesized-field": { + "shacl:minCount": "true", + "shacl:path": "true" + }, + "lexical": { + "raml-shapes:range": "[(20,19)-(24,0)]", + "#15": "[(20,6)-(24,0)]" + } + } + } + ], + "shacl:name": [ + { + "@value": "UnionInArrayProperty" + } + ], + "smaps": { + "synthesized-field": { + "shacl:closed": "true" + }, + "lexical": { + "shacl:name": "[(18,2)-(18,22)]", + "#14": "[(18,2)-(24,0)]" + }, + "declared-element": { + "#14": "" + } + } + } + ], + "@context": { + "@base": "amf://id", + "shacl": "http://www.w3.org/ns/shacl#", + "raml-shapes": "http://a.ml/vocabularies/shapes#", + "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/upanddown/raml10/unions/triple-unions.resolved.flattened.jsonld b/amf-cli/shared/src/test/resources/upanddown/raml10/unions/triple-unions.resolved.flattened.jsonld new file mode 100644 index 0000000000..9c14f6f024 --- /dev/null +++ b/amf-cli/shared/src/test/resources/upanddown/raml10/unions/triple-unions.resolved.flattened.jsonld @@ -0,0 +1,456 @@ +{ + "@graph": [ + { + "@id": "#20", + "@type": [ + "doc:APIContractProcessingData" + ], + "apiContract:modelVersion": "3.8.2", + "doc:transformed": true, + "doc:sourceSpec": "RAML 1.0" + }, + { + "@id": "#21", + "@type": [ + "apiContract:WebAPI", + "apiContract:API", + "doc:RootDomainElement", + "doc:DomainElement" + ], + "core:name": "test", + "smaps": { + "lexical": { + "core:name": "[(2,0)-(4,0)]", + "#21": "[(2,0)-(24,0)]" + } + } + }, + { + "@id": "", + "doc:declares": [ + { + "@id": "#1" + }, + { + "@id": "#5" + }, + { + "@id": "#9" + }, + { + "@id": "#14" + } + ], + "@type": [ + "doc:Document", + "doc:Fragment", + "doc:Module", + "doc:Unit" + ], + "doc:encodes": { + "@id": "#21" + }, + "doc:root": true, + "doc:processingData": { + "@id": "#20" + } + }, + { + "@id": "#1", + "@type": [ + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "shacl:name": "Shape", + "smaps": { + "resolved-link-target": { + "#1": "amf://id#1" + }, + "declared-element": { + "#1": "" + }, + "lexical": { + "shacl:name": "[(5,2)-(5,7)]", + "#1": "[(5,2)-(7,0)]" + }, + "resolved-link": { + "#1": "amf://id#4" + } + } + }, + { + "@id": "#5", + "@type": [ + "raml-shapes:ArrayShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "raml-shapes:items": { + "@id": "#6" + }, + "shacl:name": "UnionInArray", + "smaps": { + "declared-element": { + "#5": "" + }, + "lexical": { + "shacl:name": "[(7,2)-(7,14)]", + "#5": "[(7,2)-(11,0)]" + }, + "type-property-lexical-info": { + "#5": "[(8,4)-(8,8)]" + } + } + }, + { + "@id": "#9", + "@type": [ + "shacl:NodeShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "shacl:closed": false, + "shacl:property": [ + { + "@id": "#10" + } + ], + "shacl:name": "UnionInProperty", + "smaps": { + "synthesized-field": { + "shacl:closed": "true" + }, + "lexical": { + "shacl:name": "[(11,2)-(11,17)]", + "#9": "[(11,2)-(18,0)]" + }, + "declared-element": { + "#9": "" + } + } + }, + { + "@id": "#14", + "@type": [ + "shacl:NodeShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "shacl:closed": false, + "shacl:property": [ + { + "@id": "#15" + } + ], + "shacl:name": "UnionInArrayProperty", + "smaps": { + "synthesized-field": { + "shacl:closed": "true" + }, + "lexical": { + "shacl:name": "[(18,2)-(18,22)]", + "#14": "[(18,2)-(24,0)]" + }, + "declared-element": { + "#14": "" + } + } + }, + { + "@id": "#6", + "@type": [ + "raml-shapes:UnionShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "raml-shapes:anyOf": [ + { + "@id": "#7" + }, + { + "@id": "#8" + }, + { + "@id": "#1" + } + ], + "shacl:name": "items", + "smaps": { + "lexical": { + "#6": "[(9,4)-(11,0)]" + } + } + }, + { + "@id": "#10", + "@type": [ + "shacl:PropertyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "shacl:path": [ + { + "@id": "http://a.ml/vocabularies/data#complex" + } + ], + "raml-shapes:range": { + "@id": "#11" + }, + "shacl:minCount": 1, + "shacl:name": "complex", + "smaps": { + "synthesized-field": { + "shacl:minCount": "true", + "shacl:path": "true" + }, + "lexical": { + "raml-shapes:range": "[(15,14)-(18,0)]", + "#10": "[(15,6)-(18,0)]" + } + } + }, + { + "@id": "#15", + "@type": [ + "shacl:PropertyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "shacl:path": [ + { + "@id": "http://a.ml/vocabularies/data#complexArray" + } + ], + "raml-shapes:range": { + "@id": "#16" + }, + "shacl:minCount": 1, + "shacl:name": "complexArray", + "smaps": { + "synthesized-field": { + "shacl:minCount": "true", + "shacl:path": "true" + }, + "lexical": { + "raml-shapes:range": "[(20,19)-(24,0)]", + "#15": "[(20,6)-(24,0)]" + } + } + }, + { + "@id": "#7", + "@type": [ + "raml-shapes:ScalarShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "shacl:datatype": [ + { + "@id": "http://www.w3.org/2001/XMLSchema#string" + } + ], + "smaps": { + "lexical": { + "#7": "[(9,11)-(9,17)]" + } + } + }, + { + "@id": "#8", + "@type": [ + "raml-shapes:ScalarShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "shacl:datatype": [ + { + "@id": "http://a.ml/vocabularies/shapes#number" + } + ], + "smaps": { + "lexical": { + "#8": "[(9,20)-(9,26)]" + } + } + }, + { + "@id": "#11", + "@type": [ + "raml-shapes:UnionShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "raml-shapes:anyOf": [ + { + "@id": "#12" + }, + { + "@id": "#1" + }, + { + "@id": "#13" + } + ], + "smaps": { + "lexical": { + "#11": "[(16,8)-(18,0)]" + } + } + }, + { + "@id": "#16", + "@type": [ + "raml-shapes:ArrayShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "raml-shapes:items": { + "@id": "#17" + }, + "shacl:name": "complexArray", + "smaps": { + "type-property-lexical-info": { + "#16": "[(21,8)-(21,12)]" + }, + "lexical": { + "#16": "[(20,6)-(24,0)]" + } + } + }, + { + "@id": "#12", + "@type": [ + "raml-shapes:ScalarShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "shacl:datatype": [ + { + "@id": "http://www.w3.org/2001/XMLSchema#string" + } + ], + "smaps": { + "lexical": { + "#12": "[(16,14)-(16,20)]" + } + } + }, + { + "@id": "#13", + "@type": [ + "raml-shapes:ScalarShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "shacl:datatype": [ + { + "@id": "http://a.ml/vocabularies/shapes#number" + } + ], + "smaps": { + "lexical": { + "#13": "[(16,31)-(16,37)]" + } + } + }, + { + "@id": "#17", + "@type": [ + "raml-shapes:UnionShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "raml-shapes:anyOf": [ + { + "@id": "#1" + }, + { + "@id": "#18" + }, + { + "@id": "#19" + } + ], + "shacl:name": "items", + "smaps": { + "lexical": { + "#17": "[(23,8)-(24,0)]" + } + } + }, + { + "@id": "#18", + "@type": [ + "raml-shapes:ScalarShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "shacl:datatype": [ + { + "@id": "http://a.ml/vocabularies/shapes#number" + } + ], + "smaps": { + "lexical": { + "#18": "[(23,23)-(23,29)]" + } + } + }, + { + "@id": "#19", + "@type": [ + "raml-shapes:ScalarShape", + "raml-shapes:AnyShape", + "shacl:Shape", + "raml-shapes:Shape", + "doc:DomainElement" + ], + "shacl:datatype": [ + { + "@id": "http://www.w3.org/2001/XMLSchema#string" + } + ], + "smaps": { + "lexical": { + "#19": "[(23,32)-(23,38)]" + } + } + } + ], + "@context": { + "@base": "amf://id", + "shacl": "http://www.w3.org/ns/shacl#", + "raml-shapes": "http://a.ml/vocabularies/shapes#", + "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/validations/raml/multiple-inheritance-object-union.raml b/amf-cli/shared/src/test/resources/validations/raml/multiple-inheritance-object-union.raml new file mode 100644 index 0000000000..a6c7d2c96c --- /dev/null +++ b/amf-cli/shared/src/test/resources/validations/raml/multiple-inheritance-object-union.raml @@ -0,0 +1,27 @@ +#%RAML 1.0 +title: API +version: 1.0.0 + +types: + RestrictedObject: + type: object + additionalProperties: false + MemberA: + type: RestrictedObject + properties: + a: string + MemberB: + type: RestrictedObject + properties: + b: string + Union: + type: MemberA | MemberB + Another: + type: object + properties: + another: string + Everything: + type: [Union, Another] + example: + a: a + another: another \ No newline at end of file diff --git a/amf-cli/shared/src/test/resources/validations/raml/triple-union.raml b/amf-cli/shared/src/test/resources/validations/raml/triple-union.raml new file mode 100644 index 0000000000..32c95c9568 --- /dev/null +++ b/amf-cli/shared/src/test/resources/validations/raml/triple-union.raml @@ -0,0 +1,11 @@ +#%RAML 1.0 +title: test + +types: + Shape: any # AnyShape + + UnionInArrayProperty: # NodeShape + properties: + complexArray: # PropertyShape with Range as an ArrayShape + type: array # ArrayShape + items: Shape | number | string # UnionShape with the AnyShape and an UnionShape with the 2 ScalarShapes diff --git a/amf-cli/shared/src/test/resources/validations/security-schemes/multiple-flows.yaml b/amf-cli/shared/src/test/resources/validations/security-schemes/multiple-flows.yaml new file mode 100644 index 0000000000..48f84b587f --- /dev/null +++ b/amf-cli/shared/src/test/resources/validations/security-schemes/multiple-flows.yaml @@ -0,0 +1,35 @@ +openapi: 3.0.0 +info: + title: A + version: 1.1.1 + +paths: + /claims: + patch: + operationId: a + responses: + "500": + description: a + content: + application/json: + schema: + type: string + security: + - oauth2: + - customerclaim:write:be + - customerclaim:write:fe + +components: + securitySchemes: + oauth2: + type: oauth2 + flows: + clientCredentials: + tokenUrl: 'https://auth.com/as/token.oauth2' + scopes: + customerclaim:write:be: write access for applications without authenticated user + authorizationCode: + tokenUrl: 'https://auth.com/as/token.oauth2' + authorizationUrl: 'https://auth.com/as/authorization.oauth2' + scopes: + customerclaim:write:fe: write access with authenticated user diff --git a/amf-cli/shared/src/test/scala/amf/cli/internal/convert/WrapperTests.scala b/amf-cli/shared/src/test/scala/amf/cli/internal/convert/WrapperTests.scala index 47fbad377d..adb7fc2361 100644 --- a/amf-cli/shared/src/test/scala/amf/cli/internal/convert/WrapperTests.scala +++ b/amf-cli/shared/src/test/scala/amf/cli/internal/convert/WrapperTests.scala @@ -17,17 +17,13 @@ import amf.core.client.platform.config.RenderOptions import amf.core.client.platform.model.document.{BaseUnit, DeclaresModel, Document, EncodesModel} import amf.core.client.platform.model.domain._ import amf.core.client.platform.parse.AMFParser -import amf.core.client.platform.parse.AMFParser.parseStartingPoint +import amf.core.client.platform.parse.AMFParser.{parse, parseStartingPoint} import amf.core.client.platform.resource.{ResourceNotFound, ResourceLoader => ClientResourceLoader} import amf.core.client.scala.errorhandling.DefaultErrorHandler import amf.core.client.scala.exception.UnsupportedVendorException import amf.core.client.scala.model.document.{Document => InternalDocument} import amf.core.client.scala.model.domain.extensions.{DomainExtension => InternalDomainExtension} -import amf.core.client.scala.model.domain.{ - ArrayNode => InternalArrayNode, - ObjectNode => InternalObjectNode, - ScalarNode => InternalScalarNode -} +import amf.core.client.scala.model.domain.{ArrayNode => InternalArrayNode, ObjectNode => InternalObjectNode, ScalarNode => InternalScalarNode} import amf.core.client.scala.resource.ResourceLoader import amf.core.client.scala.validation.AMFValidationReport import amf.core.client.scala.vocabulary.Namespace @@ -2171,6 +2167,30 @@ trait WrapperTests extends MultiJsonldAsyncFunSuite with Matchers with NativeOps } } + test("Stackoverflow in minShape with overriden cyclic properties") { + val client = RAMLConfiguration.RAML10().baseUnitClient() + val path = "file://amf-cli/shared/src/test/resources/overriden-cyclic-properties.raml" + for { + parsingResult <- client.parse(path).asFuture + resolutionResult <- Future.successful(client.transform(parsingResult.baseUnit, PipelineId.Editing)) + } yield { + assert(parsingResult.conforms) + assert(resolutionResult.conforms) + } + } + + test("NPE in minShape with baseUnion with empty anyOf involved in inheritance") { + val client = RAMLConfiguration.RAML10().baseUnitClient() + val path = "file://amf-cli/shared/src/test/resources/base-union-empty-anyof.raml" + for { + parsingResult <- client.parse(path).asFuture + resolutionResult <- Future.successful(client.transform(parsingResult.baseUnit, PipelineId.Editing)) + } yield { + assert(parsingResult.conforms) + assert(resolutionResult.conforms) + } + } + // // // todo: move to common (file system) def getAbsolutePath(path: String): String diff --git a/amf-cli/shared/src/test/scala/amf/cycle/ParsedCloneTest.scala b/amf-cli/shared/src/test/scala/amf/cycle/ParsedCloneTest.scala index 111937dca2..ea70e0e08a 100644 --- a/amf-cli/shared/src/test/scala/amf/cycle/ParsedCloneTest.scala +++ b/amf-cli/shared/src/test/scala/amf/cycle/ParsedCloneTest.scala @@ -6,7 +6,6 @@ import amf.apicontract.client.scala.model.domain.templates.Trait import amf.core.client.scala.errorhandling.AMFErrorHandler import amf.core.client.scala.model.document.DeclaresModel import amf.core.client.scala.validation.AMFValidationResult -import amf.core.internal.adoption.IdAdopter import amf.core.internal.annotations.{ErrorDeclaration, TrackedElement} import amf.core.internal.remote.{AmfJsonHint, Oas30JsonHint, Raml10YamlHint} import amf.io.FunSuiteCycleTests @@ -43,11 +42,12 @@ class ParsedCloneTest extends FunSuiteCycleTests with Matchers { test("Test clone with tracked parameter at example") { val config = CycleConfig("security-scheme-fragment.raml", "", Raml10YamlHint, AmfJsonHint, basePath, None, None) + val configuration = buildConfig(None, None) for { - model <- build(config, buildConfig(None, None)) + model <- build(config, configuration) } yield { val cloned = model.cloneUnit() - new IdAdopter(cloned, "http://fake.location.com#").adoptFromRoot() + configuration.idAdopterProvider.adoptFromRoot(cloned, "http://fake.location.com#") val param = cloned.asInstanceOf[SecuritySchemeFragment].encodes.headers.head diff --git a/amf-cli/shared/src/test/scala/amf/parser/Raml10ParserTest.scala b/amf-cli/shared/src/test/scala/amf/parser/Raml10ParserTest.scala index 2eab4529bd..9245f00a95 100644 --- a/amf-cli/shared/src/test/scala/amf/parser/Raml10ParserTest.scala +++ b/amf-cli/shared/src/test/scala/amf/parser/Raml10ParserTest.scala @@ -77,4 +77,15 @@ class Raml10ParserTest extends FunSuiteCycleTests with Matchers { ) } + multiGoldenTest("Multiple unions shouldn't be nested", "api.%s") { config => + cycle( + "api.raml", + config.golden, + Raml10YamlHint, + AmfJsonHint, + renderOptions = Some(config.renderOptions.withPrettyPrint), + directory = s"${basePath}multiple-non-nested-unions/", + eh = Some(UnhandledErrorHandler) + ) + } } diff --git a/amf-cli/shared/src/test/scala/amf/resolution/EditingResolutionTest.scala b/amf-cli/shared/src/test/scala/amf/resolution/EditingResolutionTest.scala index c1c3f5ae30..08fca30ff0 100644 --- a/amf-cli/shared/src/test/scala/amf/resolution/EditingResolutionTest.scala +++ b/amf-cli/shared/src/test/scala/amf/resolution/EditingResolutionTest.scala @@ -112,6 +112,17 @@ class EditingResolutionTest extends ResolutionTest { ) } + multiGoldenTest("Test triple unions", "raml10/unions/triple-unions.resolved.%s") { config => + cycle( + "raml10/unions/triple-unions.raml", + config.golden, + Raml10YamlHint, + target = AmfJsonHint, + cyclePath, + renderOptions = Some(config.renderOptions) + ) + } + multiGoldenTest("Exchange issueNil API resolution to Amf", "api.resolved.%s") { config => cycle( "api.raml", @@ -1316,19 +1327,44 @@ class EditingResolutionTest extends ResolutionTest { ) } + multiGoldenTest("propagate Endpoint cookie parameters to Operations", "oas3-cookie-parameter-propagation.%s") { + config => + cycle( + "oas3-cookie-parameter-propagation.yaml", + config.golden, + Oas30JsonHint, + target = AmfJsonHint, + directory = resolutionPath + "oas3-cookie-propagation/", + renderOptions = Some(config.renderOptions), + transformWith = Some(Oas30) + ) + } - multiGoldenTest("propagate Endpoint cookie parameters to Operations", "oas3-cookie-parameter-propagation.%s") { config => + multiGoldenTest("Multiple unions shouldn't be nested with resource types", "api.%s") { config => cycle( - "oas3-cookie-parameter-propagation.yaml", + "api.raml", config.golden, - Oas30JsonHint, - target = AmfJsonHint, - directory = resolutionPath + "oas3-cookie-propagation/", - renderOptions = Some(config.renderOptions), - transformWith = Some(Oas30) + Raml10YamlHint, + AmfJsonHint, + renderOptions = Some(config.renderOptions.withPrettyPrint), + directory = s"${cyclePath}raml10/multiple-non-nested-unions-in-resource-types/", + eh = Some(UnhandledErrorHandler), + transformWith = Some(Raml10) ) } + multiGoldenTest("Multiple unions shouldn't be nested with traits", "api.%s") { config => + cycle( + "api.raml", + config.golden, + Raml10YamlHint, + AmfJsonHint, + renderOptions = Some(config.renderOptions.withPrettyPrint), + directory = s"${cyclePath}raml10/multiple-non-nested-unions-in-traits/", + eh = Some(UnhandledErrorHandler), + transformWith = Some(Raml10) + ) + } override val basePath: String = "" } 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 02e860dcac..9d9425c8b9 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 @@ -8,12 +8,12 @@ import amf.apicontract.internal.spec.async.parser.context.{Async20WebApiContext, import amf.apicontract.internal.spec.async.parser.domain.{AsyncMessageParser, AsyncOperationParser} 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 import amf.core.client.scala.config.RenderOptions import amf.core.client.scala.errorhandling.DefaultErrorHandler import amf.core.client.scala.model.document.Document import amf.core.client.scala.model.domain.{AmfElement, AmfObject, DataNode, ScalarNode} import amf.core.client.scala.parse.document.ParserContext -import amf.core.internal.adoption.IdAdopter import amf.core.internal.convert.BaseUnitConverter import amf.core.internal.datanode.{DataNodeEmitter, DataNodeParser} import amf.core.internal.parser._ @@ -136,8 +136,8 @@ class JsonMergePatchTest extends MultiJsonldAsyncFunSuite with Matchers with Fil def getMerger: JsonMergePatch = AsyncJsonMergePatch() def adoptAndMerge(target: AmfObject, patch: AmfObject): AmfElement = { - new IdAdopter(target, "target").adoptFromRelative() - new IdAdopter(patch, "patch").adoptFromRelative() + new IdAdopter("target").adoptFromRelative(target) + new IdAdopter("patch").adoptFromRelative(patch) getMerger.merge(target, patch) } diff --git a/amf-cli/shared/src/test/scala/amf/semantic/SemanticExtensionTest.scala b/amf-cli/shared/src/test/scala/amf/semantic/SemanticExtensionTest.scala index 5acddd6201..6cbe4812fd 100644 --- a/amf-cli/shared/src/test/scala/amf/semantic/SemanticExtensionTest.scala +++ b/amf-cli/shared/src/test/scala/amf/semantic/SemanticExtensionTest.scala @@ -1,7 +1,10 @@ package amf.semantic +import amf.aml.client.scala.model.domain.DialectDomainElement import amf.apicontract.client.scala.model.domain.api.Api import amf.core.client.scala.model.document.Document +import amf.core.client.scala.model.domain._ +import amf.core.internal.parser.domain.Fields import amf.core.internal.remote.{AsyncApi20, Oas20, Oas30, Raml10} import org.scalatest.funsuite.AsyncFunSuite import org.scalatest.matchers.should.Matchers @@ -44,6 +47,118 @@ class SemanticExtensionTest extends AsyncFunSuite with SemanticExtensionParseTes } } + test("Apply SemEx to Info node on OAS API") { + val testDir = "info-object" + assertModel(s"$testDir/dialect.yaml", s"$testDir/api.yaml", Oas30) { doc => + val assertion = for { + technologyNode <- findExtension[DomainElement]( + doc.encodes, + "http://mycompany.org/extensions/cataloging#technologyObject" + ) + technologyValue <- technologyNode.fields + .getValueAsOption("http://mycompany.org/extensions/cataloging#technology") + .map(_.value.asInstanceOf[AmfScalar].toString) + } yield { + technologyValue should be("ASD") + } + assertion.getOrElse(fail("Technology extension not found")) + } + } + + test("Nested semex > Nesting without semex") { + val testDir = "nested-semex-1" + assertModel(s"$testDir/dialect.yaml", s"$testDir/api.yaml", Oas30) { doc => + val webAPIExtensions = extensionsFrom(doc.encodes) + val childName = for { + parent <- webAPIExtensions.getValueAsOption("http://a.ml/vocab#parent") + child <- parent.value + .asInstanceOf[DomainElement] + .fields + .getValueAsOption("http://a.ml/vocabularies/data#x-child") + childName <- child.value + .asInstanceOf[DomainElement] + .fields + .getValueAsOption("http://a.ml/vocabularies/data#name") + } yield { + childName.value.asInstanceOf[AmfScalar].toString + } + assert(childName.contains("Juan")) + } + } + + test("Nested semex > Nesting with semex") { + val testDir = "nested-semex-2" + assertModel(s"$testDir/dialect.yaml", s"$testDir/api.yaml", Oas30) { doc => + val webAPIExtensions = extensionsFrom(doc.encodes) + val childName = for { + parent <- webAPIExtensions.getValueAsOption("http://a.ml/vocab#parent") + child <- extensionsFrom(parent.value.asInstanceOf[DomainElement]).getValueAsOption("http://a.ml/vocab#child") + childName <- child.value + .asInstanceOf[DomainElement] + .fields + .getValueAsOption("http://a.ml/vocabularies/data#name") + } yield { + childName.value.asInstanceOf[AmfScalar].toString + } + assert(childName.contains("Juan")) + } + } + + test("Annotation mapping with map key") { + val testDir = "annotation-mapping-with-map-key" + assertModel(s"$testDir/dialect.yaml", s"$testDir/api.yaml", Oas30) { doc => + val webAPIExtensions = extensionsFrom(doc.encodes) + val assertions = for { + declarations <- webAPIExtensions.getValueAsOption("http://a.ml/vocab#declarations") + declarationA <- + declarations.value + .asInstanceOf[AmfArray] + .values + .find { + case d: DialectDomainElement => + d.fields.getValueAsOption("http://a.ml/vocab#name").exists { v => + v.value.isInstanceOf[AmfScalar] && v.value.asInstanceOf[AmfScalar].value == "declarationA" + } + case _ => false + } + declarationB <- + declarations.value + .asInstanceOf[AmfArray] + .values + .find { + case d: DialectDomainElement => + d.fields.getValueAsOption("http://a.ml/vocab#name").exists { v => + v.value.isInstanceOf[AmfScalar] && v.value.asInstanceOf[AmfScalar].value == "declarationB" + } + case _ => false + } + propertiesA <- declarationA + .asInstanceOf[DialectDomainElement] + .fields + .getValueAsOption("http://a.ml/vocab#properties") + propertiesB <- declarationB + .asInstanceOf[DialectDomainElement] + .fields + .getValueAsOption("http://a.ml/vocab#properties") + + } yield { + declarations.value shouldBe a[AmfArray] + declarations.value.asInstanceOf[AmfArray].values.size shouldEqual 2 + + declarationA shouldBe a[DialectDomainElement] + declarationB shouldBe a[DialectDomainElement] + + propertiesA.value shouldBe a[AmfArray] + propertiesA.value.asInstanceOf[AmfArray].values.size shouldEqual 2 + propertiesB.value shouldBe a[AmfArray] + propertiesB.value.asInstanceOf[AmfArray].values.size shouldEqual 2 + } + assertions.get + } + } + + private def extensionsFrom(d: DomainElement): Fields = d.customDomainProperties.head.fields + private def lookupOperation(document: Document) = { val extension = document.encodes.asInstanceOf[Api].endPoints.head.operations.head.customDomainProperties.head @@ -51,6 +166,10 @@ class SemanticExtensionTest extends AsyncFunSuite with SemanticExtensionParseTes assertPaginationExtension(extension, 10) } + private def findExtension[T <: AmfElement](d: DomainElement, extension: String) = { + d.customDomainProperties.head.fields.getValueAsOption(extension).map(_.value.asInstanceOf[T]) + } + private def lookupEndpoint(document: Document) = { val extension = document.encodes.asInstanceOf[Api].endPoints.head.customDomainProperties.head diff --git a/amf-cli/shared/src/test/scala/amf/testing/BaseUnitUtils.scala b/amf-cli/shared/src/test/scala/amf/testing/BaseUnitUtils.scala index 8e4f6bb149..2baa50e6fa 100644 --- a/amf-cli/shared/src/test/scala/amf/testing/BaseUnitUtils.scala +++ b/amf-cli/shared/src/test/scala/amf/testing/BaseUnitUtils.scala @@ -18,6 +18,8 @@ object BaseUnitUtils { def getDeclarations(bu: BaseUnit): Seq[DomainElement] = bu.asInstanceOf[Document].declares + def getReferences(bu: BaseUnit): Seq[BaseUnit] = bu.asInstanceOf[Document].references + def getFirstDeclaration(bu: BaseUnit): DomainElement = getDeclarations(bu).head def getEndpoints(bu: BaseUnit, isWebApi: Boolean = true): Seq[EndPoint] = getApi(bu, isWebApi).endPoints 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 2eee3afa88..d570fa7735 100644 --- a/amf-cli/shared/src/test/scala/amf/validation/AMFModelAssertionTest.scala +++ b/amf-cli/shared/src/test/scala/amf/validation/AMFModelAssertionTest.scala @@ -4,7 +4,6 @@ import amf.apicontract.client.scala._ import amf.apicontract.client.scala.model.domain.api.WebApi import amf.apicontract.internal.metamodel.domain.{EndPointModel, OperationModel} import amf.core.client.common.transform.PipelineId -import amf.core.client.scala.AMFParseResult import amf.core.client.scala.config.RenderOptions import amf.core.client.scala.model.document.{BaseUnit, Document} import amf.core.client.scala.model.domain.extensions.PropertyShape @@ -531,4 +530,67 @@ class AMFModelAssertionTest extends AsyncFunSuite with Matchers { } } } + + // W-13595824 + test("transforming raml with 3+ unions should flatten union members") { + val api = "file://amf-cli/shared/src/test/resources/upanddown/raml10/unions/triple-unions.raml" + ramlClient.parse(api) flatMap { parseResult => + val parseBU = parseResult.baseUnit + val transformBU = ramlClient.transform(parseBU, pipeline = PipelineId.Editing).baseUnit + val declarations = getDeclarations(transformBU) + + val unionInArray = declarations(1).asInstanceOf[ArrayShape] + val unionInArrayUnion = unionInArray.items.asInstanceOf[UnionShape] + + val unionInProperty = declarations(2).asInstanceOf[NodeShape] + val complexProperty = unionInProperty.properties.head + val complexRange = complexProperty.range + val complexUnion = complexRange.asInstanceOf[UnionShape] + + val unionInArrayProperty = declarations(3).asInstanceOf[NodeShape] + val complexArrayProperty = unionInArrayProperty.properties.head + val complexArrayRange = complexArrayProperty.range + val complexArrayUnion = complexArrayRange.asInstanceOf[ArrayShape].items.asInstanceOf[UnionShape] + + unionInArrayUnion.anyOf.length shouldBe 3 + complexUnion.anyOf.length shouldBe 3 + complexArrayUnion.anyOf.length shouldBe 3 + } + } + + // W-13595824 + test("transforming raml with nested UnionShapes should NOT flatten union members") { + val api = "file://amf-cli/shared/src/test/resources/union/inner-union.raml" + ramlClient.parse(api) flatMap { parseResult => + val transformBU = ramlClient.transform(parseResult.baseUnit, pipeline = PipelineId.Editing).baseUnit + val declarations = getDeclarations(transformBU) + + // in parsing they are an union that inherits an union with anyOf of a ScalarShape and an UnionShape with link-target to the next Union (SomeType, OtherType) + val unionType = declarations.head.asInstanceOf[UnionShape] + val someType = declarations(1).asInstanceOf[UnionShape] + + // in parsing it's an union that inherits an union with scalar and nil shape + val otherType = declarations(2).asInstanceOf[UnionShape] + + // after transformation they all should be an Union with an anyOf with 2 members + unionType.anyOf.length shouldBe 2 + someType.anyOf.length shouldBe 2 + otherType.anyOf.length shouldBe 2 + } + } + + // W-13595824 + test("transforming raml with 3+ unions should NOT duplicate IDs when flattening members") { + val api = s"$basePath/raml/triple-union.raml" + ramlClient.parse(api) flatMap { parseResult => + val transformBU = ramlClient.transform(parseResult.baseUnit, pipeline = PipelineId.Editing).baseUnit + val declarations = getDeclarations(transformBU) + val unionInArrayProperty = declarations.last.asInstanceOf[NodeShape] + val complexArrayProperty = unionInArrayProperty.properties.head + val complexArrayRange = complexArrayProperty.range + val complexArrayUnion = complexArrayRange.asInstanceOf[ArrayShape].items.asInstanceOf[UnionShape] + + complexArrayUnion.anyOf.map(_.id).distinct.length shouldBe 3 + } + } } diff --git a/amf-cli/shared/src/test/scala/amf/validation/ValidOasModelParserTest.scala b/amf-cli/shared/src/test/scala/amf/validation/ValidOasModelParserTest.scala index 2bce15f6a5..927cd36afe 100644 --- a/amf-cli/shared/src/test/scala/amf/validation/ValidOasModelParserTest.scala +++ b/amf-cli/shared/src/test/scala/amf/validation/ValidOasModelParserTest.scala @@ -89,4 +89,8 @@ class ValidOasModelParserTest extends ValidModelTest { checkValid("/http-with-hashtag/http-with-hashtag.json") } + test("Parse multiple flows") { + checkValid("security-schemes/multiple-flows.yaml") + } + } diff --git a/amf-cli/shared/src/test/scala/amf/validation/ValidRamlModelParserTest.scala b/amf-cli/shared/src/test/scala/amf/validation/ValidRamlModelParserTest.scala index 545e5add81..e0953cfbf8 100644 --- a/amf-cli/shared/src/test/scala/amf/validation/ValidRamlModelParserTest.scala +++ b/amf-cli/shared/src/test/scala/amf/validation/ValidRamlModelParserTest.scala @@ -300,4 +300,8 @@ class ValidRamlModelParserTest extends ValidModelTest { checkValid("/raml/api-referencing-draft-6.raml") } + test("Multiple inheritance with object and union") { + checkValid("/raml/multiple-inheritance-object-union.raml") + } + } diff --git a/amf-graphql/shared/src/main/scala/amf/graphqlfederation/internal/spec/transformation/IntrospectionElementsAdditionStep.scala b/amf-graphql/shared/src/main/scala/amf/graphqlfederation/internal/spec/transformation/IntrospectionElementsAdditionStep.scala index efbcaf5519..e1e79a8d86 100644 --- a/amf-graphql/shared/src/main/scala/amf/graphqlfederation/internal/spec/transformation/IntrospectionElementsAdditionStep.scala +++ b/amf-graphql/shared/src/main/scala/amf/graphqlfederation/internal/spec/transformation/IntrospectionElementsAdditionStep.scala @@ -2,11 +2,11 @@ package amf.graphqlfederation.internal.spec.transformation import amf.apicontract.client.scala.model.domain.api.Api import amf.core.client.scala.AMFGraphConfiguration +import amf.core.client.scala.adoption.{DefaultIdMaker, IdAdopter} import amf.core.client.scala.errorhandling.AMFErrorHandler import amf.core.client.scala.model.document.{BaseUnit, Document} import amf.core.client.scala.model.domain.{AmfObject, DomainElement} import amf.core.client.scala.transform.TransformationStep -import amf.core.internal.adoption.IdAdopter import amf.core.internal.metamodel.document.DocumentModel import amf.graphqlfederation.internal.spec.transformation.introspection.IntrospectionTypes._ import amf.graphqlfederation.internal.spec.transformation.introspection.IntrospectionDirectives._ @@ -20,14 +20,14 @@ object IntrospectionElementsAdditionStep extends TransformationStep { errorHandler: AMFErrorHandler, configuration: AMFGraphConfiguration ): BaseUnit = model match { - case doc: Document => transform(doc) + case doc: Document => transform(doc, configuration) case other => other } - private def transform(doc: Document): Document = { + private def transform(doc: Document, configuration: AMFGraphConfiguration): Document = { val existing = doc.declares.toList val nextDoc = addIntrospectionElements(doc) - adopt(nextDoc, existing) + adopt(nextDoc, existing, configuration) } private def addIntrospectionElements(doc: Document): Document = { @@ -58,7 +58,15 @@ object IntrospectionElementsAdditionStep extends TransformationStep { case _ => List(fieldSet, _service) } } - val directives = List(`@external`, `@requires`(fieldSet), `@provides`(fieldSet), `@key`(fieldSet), `@shareable`, `@inaccessible`, `@override`) + val directives = List( + `@external`, + `@requires`(fieldSet), + `@provides`(fieldSet), + `@key`(fieldSet), + `@shareable`, + `@inaccessible`, + `@override` + ) doc.setArrayWithoutId(DocumentModel.Declares, doc.declares ++ types ++ directives) } @@ -74,10 +82,12 @@ object IntrospectionElementsAdditionStep extends TransformationStep { doc } - private def adopt(doc: Document, existing: List[DomainElement]): Document = { + private def adopt(doc: Document, existing: List[DomainElement], configuration: AMFGraphConfiguration): Document = { val entries: List[(String, DomainElement)] = existing.map(x => x.id -> x) val skipped: mutable.Map[String, AmfObject] = mutable.Map(entries: _*) - new IdAdopter(doc, doc.id, skipped).adoptFromRelative() + // there are hacks to avoid or force adoption on declared introspected custom domain properties. + // Is ok to ignore indexed adopter? is this a different internal case to generate ids for out of the box declarations? + new IdAdopter(doc.id, new DefaultIdMaker(), skipped).adoptFromRelative(doc) doc } @@ -85,5 +95,6 @@ object IntrospectionElementsAdditionStep extends TransformationStep { case n: NodeShape if isEntity(n) => n } - private def isEntity(n: NodeShape): Boolean = n.keys.nonEmpty && n.keys.exists(_.isResolvable.value()) && !n.isAbstract.value() + private def isEntity(n: NodeShape): Boolean = + n.keys.nonEmpty && n.keys.exists(_.isResolvable.value()) && !n.isAbstract.value() } diff --git a/amf-shapes/shared/src/main/scala/amf/shapes/client/platform/ShapesConfiguration.scala b/amf-shapes/shared/src/main/scala/amf/shapes/client/platform/ShapesConfiguration.scala index 13f9f8d7e8..ea3768f31a 100644 --- a/amf-shapes/shared/src/main/scala/amf/shapes/client/platform/ShapesConfiguration.scala +++ b/amf-shapes/shared/src/main/scala/amf/shapes/client/platform/ShapesConfiguration.scala @@ -1,10 +1,10 @@ package amf.shapes.client.platform -import amf.aml.client.platform.model.document.Dialect -import amf.aml.client.platform.model.document.DialectInstance +import amf.aml.client.platform.model.document.{Dialect, DialectInstance} import amf.aml.client.platform.{AMLBaseUnitClient, AMLConfigurationState} import amf.aml.client.scala.{AMLBaseUnitClient => InternalAMLBaseUnitClient} import amf.aml.internal.convert.VocabulariesClientConverter.{ClientFuture, ClientList} +import amf.core.client.platform.adoption.IdAdopterProvider import amf.core.client.platform.config.{AMFEventListener, ParsingOptions, RenderOptions} import amf.core.client.platform.errorhandling.ErrorHandlerProvider import amf.core.client.platform.execution.BaseExecutionEnvironment @@ -140,6 +140,9 @@ class ShapesConfiguration private[amf] (private[amf] override val _internal: Int override def withShapePayloadPlugin(plugin: AMFShapePayloadValidationPlugin): ShapesConfiguration = _internal.withPlugin(PayloadValidationPluginMatcher.asInternal(plugin)) + + override def withIdAdopterProvider(idAdopterProvider: IdAdopterProvider): ShapesConfiguration = + _internal.withIdAdopterProvider(idAdopterProvider) } @JSExportAll diff --git a/amf-shapes/shared/src/main/scala/amf/shapes/client/platform/config/JsonLDSchemaConfiguration.scala b/amf-shapes/shared/src/main/scala/amf/shapes/client/platform/config/JsonLDSchemaConfiguration.scala index 059cc9f57b..d63f75e644 100644 --- a/amf-shapes/shared/src/main/scala/amf/shapes/client/platform/config/JsonLDSchemaConfiguration.scala +++ b/amf-shapes/shared/src/main/scala/amf/shapes/client/platform/config/JsonLDSchemaConfiguration.scala @@ -1,23 +1,19 @@ package amf.shapes.client.platform.config import amf.aml.client.platform.model.document.Dialect -import amf.core.client.platform.AMFGraphElementClient -import amf.core.client.platform.config.AMFEventListener +import amf.core.client.platform.adoption.IdAdopterProvider +import amf.core.client.platform.config._ import amf.core.client.platform.errorhandling.ErrorHandlerProvider import amf.core.client.platform.execution.ExecutionEnvironment import amf.core.client.platform.reference.UnitCache import amf.core.client.platform.resource.ResourceLoader import amf.core.client.scala.transform._ -import amf.core.client.platform.config._ +import amf.core.internal.convert.ClientErrorHandlerConverter._ import amf.core.internal.convert.CoreClientConverters.ClientFuture +import amf.shapes.client.platform.model.document.JsonSchemaDocument import amf.shapes.client.platform.{BaseShapesConfiguration, JsonLDSchemaElementClient, ShapesConfiguration} -import amf.shapes.client.scala.config.{ - JsonLDSchemaConfiguration => InternalJsonLDSchemaDocumentConfiguration, - JsonLDSchemaConfigurationClient => InternalJsonLDSchemaConfigurationClient -} +import amf.shapes.client.scala.config.{JsonLDSchemaConfiguration => InternalJsonLDSchemaDocumentConfiguration} import amf.shapes.internal.convert.ShapeClientConverters._ -import amf.core.internal.convert.ClientErrorHandlerConverter._ -import amf.shapes.client.platform.model.document.JsonSchemaDocument import scala.scalajs.js.annotation.{JSExportAll, JSExportTopLevel} @@ -82,6 +78,8 @@ class JsonLDSchemaConfiguration private[amf] ( def forInstance(url: String): ClientFuture[JsonLDSchemaConfiguration] = _internal.forInstance(url).asClient + override def withIdAdopterProvider(idAdopterProvider: IdAdopterProvider): JsonLDSchemaConfiguration = + _internal.withIdAdopterProvider(idAdopterProvider) } @JSExportAll @JSExportTopLevel("JsonLDSchemaConfiguration") diff --git a/amf-shapes/shared/src/main/scala/amf/shapes/client/platform/config/SemanticJsonSchemaConfiguration.scala b/amf-shapes/shared/src/main/scala/amf/shapes/client/platform/config/SemanticJsonSchemaConfiguration.scala index 77d758ce90..a762892ded 100644 --- a/amf-shapes/shared/src/main/scala/amf/shapes/client/platform/config/SemanticJsonSchemaConfiguration.scala +++ b/amf-shapes/shared/src/main/scala/amf/shapes/client/platform/config/SemanticJsonSchemaConfiguration.scala @@ -3,6 +3,8 @@ package amf.shapes.client.platform.config import amf.aml.client.platform.AMLConfigurationState import amf.aml.client.platform.model.document.{Dialect, DialectInstance} import amf.aml.internal.convert.VocabulariesClientConverter.{ClientFuture, ClientList} +import amf.core.client.platform.AMFGraphConfiguration +import amf.core.client.platform.adoption.{IdAdopter, IdAdopterProvider} import amf.core.client.platform.config.{AMFEventListener, ParsingOptions, RenderOptions} import amf.core.client.platform.errorhandling.ErrorHandlerProvider import amf.core.client.platform.execution.BaseExecutionEnvironment @@ -141,6 +143,9 @@ class SemanticJsonSchemaConfiguration private[amf] ( override def withShapePayloadPlugin(plugin: AMFShapePayloadValidationPlugin): SemanticJsonSchemaConfiguration = _internal.withPlugin(PayloadValidationPluginMatcher.asInternal(plugin)) + + override def withIdAdopterProvider(idAdopterProvider: IdAdopterProvider): SemanticJsonSchemaConfiguration = + _internal.withIdAdopterProvider(idAdopterProvider) } @JSExportAll diff --git a/amf-shapes/shared/src/main/scala/amf/shapes/client/scala/ShapesConfiguration.scala b/amf-shapes/shared/src/main/scala/amf/shapes/client/scala/ShapesConfiguration.scala index 881b5bdc83..5b75d50e43 100644 --- a/amf-shapes/shared/src/main/scala/amf/shapes/client/scala/ShapesConfiguration.scala +++ b/amf-shapes/shared/src/main/scala/amf/shapes/client/scala/ShapesConfiguration.scala @@ -6,6 +6,7 @@ import amf.aml.internal.annotations.serializable.AMLSerializableAnnotations import amf.aml.internal.entities.AMLEntities import amf.aml.internal.registries.AMLRegistry import amf.core.client.scala.AMFGraphConfiguration +import amf.core.client.scala.adoption.{DefaultIdAdopterProvider, IdAdopter, IdAdopterProvider} import amf.core.client.scala.config._ import amf.core.client.scala.errorhandling.{DefaultErrorHandlerProvider, ErrorHandlerProvider} import amf.core.client.scala.execution.ExecutionEnvironment @@ -34,8 +35,9 @@ class ShapesConfiguration private[amf] ( override private[amf] val errorHandlerProvider: ErrorHandlerProvider, override private[amf] val registry: AMLRegistry, override private[amf] val listeners: Set[AMFEventListener], - override private[amf] val options: AMFOptions -) extends AMLConfiguration(resolvers, errorHandlerProvider, registry, listeners, options) { + override private[amf] val options: AMFOptions, + override private[amf] val idAdopterProvider: IdAdopterProvider +) extends AMLConfiguration(resolvers, errorHandlerProvider, registry, listeners, options, idAdopterProvider) { private implicit val ec: ExecutionContext = this.getExecutionContext @@ -44,9 +46,17 @@ class ShapesConfiguration private[amf] ( errorHandlerProvider: ErrorHandlerProvider = errorHandlerProvider, registry: AMFRegistry = registry, listeners: Set[AMFEventListener] = listeners, - options: AMFOptions = options + options: AMFOptions = options, + idAdopterProvider: IdAdopterProvider ): ShapesConfiguration = - new ShapesConfiguration(resolvers, errorHandlerProvider, registry.asInstanceOf[AMLRegistry], listeners, options) + new ShapesConfiguration( + resolvers, + errorHandlerProvider, + registry.asInstanceOf[AMLRegistry], + listeners, + options, + idAdopterProvider + ) /** Contains common AMF graph operations associated to documents */ override def baseUnitClient(): ShapesBaseUnitClient = new ShapesBaseUnitClient(this) @@ -210,6 +220,9 @@ class ShapesConfiguration private[amf] ( */ override def forInstance(url: String): Future[ShapesConfiguration] = super.forInstance(url).map(_.asInstanceOf[ShapesConfiguration])(getExecutionContext) + + override def withIdAdopterProvider(idAdopterProvider: IdAdopterProvider): ShapesConfiguration = + super._withIdAdopterProvider(idAdopterProvider) } object ShapesConfiguration { @@ -220,7 +233,8 @@ object ShapesConfiguration { DefaultErrorHandlerProvider, AMLRegistry.empty, Set.empty, - AMFOptions.default() + AMFOptions.default(), + new DefaultIdAdopterProvider() ) } @@ -235,7 +249,8 @@ object ShapesConfiguration { .withEntities(AMLEntities.entities) .withAnnotations(AMLSerializableAnnotations.annotations), predefinedAMLConfig.listeners, - predefinedAMLConfig.options + predefinedAMLConfig.options, + predefinedAMLConfig.idAdopterProvider ).withEntities(ShapeEntities.entities ++ coreEntities) .withAnnotations(ShapeSerializableAnnotations.annotations) .withPlugin(JsonSchemaShapePayloadValidationPlugin) diff --git a/amf-shapes/shared/src/main/scala/amf/shapes/client/scala/config/JsonLDSchemaConfiguration.scala b/amf-shapes/shared/src/main/scala/amf/shapes/client/scala/config/JsonLDSchemaConfiguration.scala index f595325e68..6830a7af59 100644 --- a/amf-shapes/shared/src/main/scala/amf/shapes/client/scala/config/JsonLDSchemaConfiguration.scala +++ b/amf-shapes/shared/src/main/scala/amf/shapes/client/scala/config/JsonLDSchemaConfiguration.scala @@ -3,6 +3,7 @@ package amf.shapes.client.scala.config import amf.aml.client.scala.model.document.Dialect import amf.aml.internal.registries.AMLRegistry import amf.core.client.common.transform.PipelineId +import amf.core.client.scala.adoption.IdAdopterProvider import amf.core.client.scala.config._ import amf.core.client.scala.errorhandling.ErrorHandlerProvider import amf.core.client.scala.execution.ExecutionEnvironment @@ -18,8 +19,8 @@ import amf.core.internal.registries.AMFRegistry import amf.core.internal.resource.AMFResolvers import amf.core.internal.validation.EffectiveValidations import amf.core.internal.validation.core.ValidationProfile -import amf.shapes.client.scala.{JsonLDSchemaElementClient, ShapesConfiguration, ShapesElementClient} import amf.shapes.client.scala.model.document.JsonSchemaDocument +import amf.shapes.client.scala.{JsonLDSchemaElementClient, ShapesConfiguration} import amf.shapes.internal.convert.JsonLDSchemaRegister import amf.shapes.internal.plugins.parser.AMFJsonLDSchemaGraphParsePlugin import amf.shapes.internal.plugins.render.AMFJsonLDSchemaGraphRenderPlugin @@ -33,8 +34,9 @@ class JsonLDSchemaConfiguration private[amf] ( override private[amf] val errorHandlerProvider: ErrorHandlerProvider, override private[amf] val registry: AMLRegistry, override private[amf] val listeners: Set[AMFEventListener], - override private[amf] val options: AMFOptions -) extends ShapesConfiguration(resolvers, errorHandlerProvider, registry, listeners, options) { + override private[amf] val options: AMFOptions, + override private[amf] val idAdopterProvider: IdAdopterProvider +) extends ShapesConfiguration(resolvers, errorHandlerProvider, registry, listeners, options, idAdopterProvider) { private implicit val ec: ExecutionContext = this.getExecutionContext @@ -43,14 +45,16 @@ class JsonLDSchemaConfiguration private[amf] ( errorHandlerProvider: ErrorHandlerProvider = errorHandlerProvider, registry: AMFRegistry = registry, listeners: Set[AMFEventListener] = listeners, - options: AMFOptions = options + options: AMFOptions = options, + idAdopterProvider: IdAdopterProvider = idAdopterProvider ): JsonLDSchemaConfiguration = new JsonLDSchemaConfiguration( resolvers, errorHandlerProvider, registry.asInstanceOf[AMLRegistry], listeners, - options + options, + idAdopterProvider ) override def baseUnitClient(): JsonLDSchemaConfigurationClient = new JsonLDSchemaConfigurationClient(this) @@ -225,6 +229,9 @@ class JsonLDSchemaConfiguration private[amf] ( */ override def forInstance(url: String): Future[JsonLDSchemaConfiguration] = super.forInstance(url).map(_.asInstanceOf[JsonLDSchemaConfiguration])(getExecutionContext) + + override def withIdAdopterProvider(idAdopterProvider: IdAdopterProvider): JsonLDSchemaConfiguration = + super._withIdAdopterProvider(idAdopterProvider) } object JsonLDSchemaConfiguration { @@ -236,7 +243,8 @@ object JsonLDSchemaConfiguration { base.errorHandlerProvider, base.registry, base.listeners, - base.options + base.options, + base.idAdopterProvider ).withTransformationPipeline(JsonLDSchemaEditingPipeline()) .withPlugins(List(AMFJsonLDSchemaGraphRenderPlugin, AMFJsonLDSchemaGraphParsePlugin)) diff --git a/amf-shapes/shared/src/main/scala/amf/shapes/client/scala/config/SemanticJsonSchemaConfiguration.scala b/amf-shapes/shared/src/main/scala/amf/shapes/client/scala/config/SemanticJsonSchemaConfiguration.scala index 895368c6e6..c58d6a75a9 100644 --- a/amf-shapes/shared/src/main/scala/amf/shapes/client/scala/config/SemanticJsonSchemaConfiguration.scala +++ b/amf-shapes/shared/src/main/scala/amf/shapes/client/scala/config/SemanticJsonSchemaConfiguration.scala @@ -4,6 +4,7 @@ import amf.aml.client.scala.AMLConfigurationState import amf.aml.client.scala.model.document.{Dialect, DialectInstance} import amf.aml.internal.registries.AMLRegistry import amf.core.client.scala.AMFGraphConfiguration +import amf.core.client.scala.adoption.{DefaultIdAdopterProvider, IdAdopter, IdAdopterProvider} import amf.core.client.scala.config._ import amf.core.client.scala.errorhandling.{DefaultErrorHandlerProvider, ErrorHandlerProvider} import amf.core.client.scala.execution.ExecutionEnvironment @@ -28,8 +29,9 @@ class SemanticJsonSchemaConfiguration private[amf] ( override private[amf] val errorHandlerProvider: ErrorHandlerProvider, override private[amf] val registry: AMLRegistry, override private[amf] val listeners: Set[AMFEventListener], - override private[amf] val options: AMFOptions -) extends ShapesConfiguration(resolvers, errorHandlerProvider, registry, listeners, options) { + override private[amf] val options: AMFOptions, + override private[amf] val idAdopterProvider: IdAdopterProvider +) extends ShapesConfiguration(resolvers, errorHandlerProvider, registry, listeners, options, idAdopterProvider) { private implicit val ec: ExecutionContext = this.getExecutionContext @@ -38,14 +40,16 @@ class SemanticJsonSchemaConfiguration private[amf] ( errorHandlerProvider: ErrorHandlerProvider = errorHandlerProvider, registry: AMFRegistry = registry, listeners: Set[AMFEventListener] = listeners, - options: AMFOptions = options + options: AMFOptions = options, + idAdopterProvider: IdAdopterProvider = idAdopterProvider ): SemanticJsonSchemaConfiguration = new SemanticJsonSchemaConfiguration( resolvers, errorHandlerProvider, registry.asInstanceOf[AMLRegistry], listeners, - options + options, + idAdopterProvider ) /** Contains common AMF graph operations associated to documents */ @@ -207,6 +211,9 @@ class SemanticJsonSchemaConfiguration private[amf] ( */ override def forInstance(url: String): Future[SemanticJsonSchemaConfiguration] = super.forInstance(url).map(_.asInstanceOf[SemanticJsonSchemaConfiguration])(getExecutionContext) + + override def withIdAdopterProvider(idAdopterProvider: IdAdopterProvider): SemanticJsonSchemaConfiguration = + super._withIdAdopterProvider(idAdopterProvider) } object SemanticJsonSchemaConfiguration { @@ -217,7 +224,8 @@ object SemanticJsonSchemaConfiguration { DefaultErrorHandlerProvider, AMLRegistry.empty, Set.empty, - AMFOptions.default() + AMFOptions.default(), + new DefaultIdAdopterProvider() ) } @@ -228,7 +236,8 @@ object SemanticJsonSchemaConfiguration { shapesConfig.errorHandlerProvider, shapesConfig.registry, shapesConfig.listeners, - shapesConfig.options + shapesConfig.options, + shapesConfig.idAdopterProvider ).withPlugin(JsonSchemaDialectParsePlugin) } } diff --git a/amf-shapes/shared/src/main/scala/amf/shapes/client/scala/model/domain/jsonldinstance/JsonLDObject.scala b/amf-shapes/shared/src/main/scala/amf/shapes/client/scala/model/domain/jsonldinstance/JsonLDObject.scala index 46155c61b1..d6ed295248 100644 --- a/amf-shapes/shared/src/main/scala/amf/shapes/client/scala/model/domain/jsonldinstance/JsonLDObject.scala +++ b/amf-shapes/shared/src/main/scala/amf/shapes/client/scala/model/domain/jsonldinstance/JsonLDObject.scala @@ -41,6 +41,7 @@ case class JsonLDObject( def toBoolListField: Field = Field(Type.Array(Type.Bool), ValueType(property)) def toFloatField: Field = Field(Type.Float, ValueType(property)) + def toDoubleField: Field = Field(Type.Double, ValueType(property)) def toFloatListField: Field = Field(Type.Array(Type.Float), ValueType(property)) } @@ -50,8 +51,8 @@ case class JsonLDObject( private def buildInteger(value: Int) = new JsonLDScalar(value, DataTypes.Integer) private def buildBoolean(value: Boolean) = new JsonLDScalar(value, DataTypes.Boolean) - - private def buildFloat(value: Float) = new JsonLDScalar(value, DataTypes.Float) + private def buildFloat(value: Float) = new JsonLDScalar(value, DataTypes.Float) + private def buildDouble(value: Double) = new JsonLDScalar(value, DataTypes.Double) private def buildArray(values: Seq[JsonLDElement]) = JsonLDArray(values) @@ -73,6 +74,9 @@ case class JsonLDObject( def withProperty(property: String, value: Float): JsonLDObject = updateModelAndSet(property.toFloatField, buildFloat(value)) + def withProperty(property: String, value: Double): JsonLDObject = + updateModelAndSet(property.toDoubleField, buildDouble(value)) + def withProperty(property: String, value: Boolean): JsonLDObject = updateModelAndSet(property.toBoolField, buildBoolean(value)) @@ -93,4 +97,15 @@ case class JsonLDObject( def withObjPropertyCollection(property: String, values: Seq[JsonLDObject]): JsonLDObject = updateModelAndSet(property.toObjListField, buildArray(values)) + + def removeProperty(property: String): JsonLDObject = { + // update model + val newModelFields = model.fields.filterNot(f => f.value.iri() == property) + model = model.copy(fields = newModelFields) + + // update fields + fields.remove(property) + + this + } } diff --git a/amf-shapes/shared/src/main/scala/amf/shapes/client/scala/render/JsonLDObjectRender.scala b/amf-shapes/shared/src/main/scala/amf/shapes/client/scala/render/JsonLDObjectRender.scala index ffe73fc580..8261981fb0 100644 --- a/amf-shapes/shared/src/main/scala/amf/shapes/client/scala/render/JsonLDObjectRender.scala +++ b/amf-shapes/shared/src/main/scala/amf/shapes/client/scala/render/JsonLDObjectRender.scala @@ -1,16 +1,12 @@ package amf.shapes.client.scala.render -import amf.core.client.platform.model.DataTypes import amf.core.client.scala.model.domain.{AmfArray, AmfElement, AmfScalar} -import amf.core.client.scala.vocabulary.{Namespace, ValueType} -import amf.core.internal.metamodel.{Obj, Type} -import amf.core.internal.metamodel.Type.{ArrayLike, Scalar} -import amf.core.internal.parser.domain.Value +import amf.core.client.scala.vocabulary.ValueType import amf.core.internal.render.emitters.PartEmitter import amf.shapes.client.scala.model.domain.jsonldinstance.JsonLDObject import org.mulesoft.common.client.lexical.Position +import org.yaml.model.YDocument.PartBuilder import org.yaml.model.{YDocument, YNode} -import org.yaml.model.YDocument.{EntryBuilder, PartBuilder} class JsonLDObjectRender(obj: JsonLDObject, syntaxProvider: SyntaxProvider) extends PartEmitter { override def emit(b: YDocument.PartBuilder): Unit = { @@ -45,6 +41,7 @@ class JsonLDObjectRender(obj: JsonLDObject, syntaxProvider: SyntaxProvider) exte case s: String => pb += s case i: Int => pb += i case f: Float => pb += f + case d: Double => pb += d case b: Boolean => pb += b case _ => pb += YNode.Null } diff --git a/amf-shapes/shared/src/main/scala/amf/shapes/internal/domain/resolution/shape_normalization/MinShapeAlgorithm.scala b/amf-shapes/shared/src/main/scala/amf/shapes/internal/domain/resolution/shape_normalization/MinShapeAlgorithm.scala index d0aecc6742..380d0e7a7e 100644 --- a/amf-shapes/shared/src/main/scala/amf/shapes/internal/domain/resolution/shape_normalization/MinShapeAlgorithm.scala +++ b/amf-shapes/shared/src/main/scala/amf/shapes/internal/domain/resolution/shape_normalization/MinShapeAlgorithm.scala @@ -2,16 +2,10 @@ package amf.shapes.internal.domain.resolution.shape_normalization import amf.core.client.scala.errorhandling.AMFErrorHandler import amf.core.client.scala.model.DataType -import amf.core.client.scala.model.domain.extensions.PropertyShape import amf.core.client.scala.model.domain._ +import amf.core.client.scala.model.domain.extensions.PropertyShape import amf.core.client.scala.validation.AMFValidationResult -import amf.core.internal.annotations.{ - DeclaredElement, - Inferred, - InheritanceProvenance, - LexicalInformation, - ResolvedInheritance -} +import amf.core.internal.annotations._ import amf.core.internal.metamodel.Field import amf.core.internal.metamodel.domain.extensions.PropertyShapeModel import amf.core.internal.metamodel.domain.{DomainElementModel, ShapeModel} @@ -686,7 +680,10 @@ private[resolution] class MinShapeAlgorithm()(implicit val context: Normalizatio case _ => false } + private def areSameShape(child: Shape, parent: Shape): Boolean = child.id == parent.id && child.id != null def computeMinShape(child: Shape, parent: Shape): Shape = { + if (areSameShape(child, parent)) return child + val parentCopy = parent.copyShape() val childClone = child.cloneElement(mutable.Map.empty).asInstanceOf[Shape] // this is destructive, we need to clone @@ -1057,16 +1054,19 @@ private[resolution] class MinShapeAlgorithm()(implicit val context: Normalizatio private def computeMinUnionNode(baseUnion: UnionShape, superNode: NodeShape): Shape = { val unionContext: NormalizationContext = UnionErrorHandler.wrapContext(context) - val newUnionItems = for { - baseUnionElement <- baseUnion.anyOf - } yield { - unionContext.minShape(baseUnionElement, superNode) + val newUnionItems = baseUnion.anyOf.zipWithIndex.map { case (unionMember, idx) => + val resolvedMember = unionContext.minShape(unionMember, superNode) + val memberId = s"${baseUnion.id}/$idx" + resolvedMember.withId(memberId) } baseUnion.fields.setWithoutId( UnionShapeModel.AnyOf, AmfArray(newUnionItems), - baseUnion.fields.getValue(UnionShapeModel.AnyOf).annotations + Option(baseUnion.fields.getValue(UnionShapeModel.AnyOf)) match { + case Some(value) => value.annotations + case None => Annotations() + } ) computeNarrowRestrictions(UnionShapeModel.fields, baseUnion, superNode, filteredFields = Seq(UnionShapeModel.AnyOf)) diff --git a/amf-shapes/shared/src/main/scala/amf/shapes/internal/domain/resolution/shape_normalization/NormalizationContext.scala b/amf-shapes/shared/src/main/scala/amf/shapes/internal/domain/resolution/shape_normalization/NormalizationContext.scala index 311cf7cc9e..776bb21d93 100644 --- a/amf-shapes/shared/src/main/scala/amf/shapes/internal/domain/resolution/shape_normalization/NormalizationContext.scala +++ b/amf-shapes/shared/src/main/scala/amf/shapes/internal/domain/resolution/shape_normalization/NormalizationContext.scala @@ -37,7 +37,7 @@ private[resolution] class NormalizationContext( TransformationValidation, derivedShape.id, Some(ShapeModel.Inherits.value.iri()), - other.getMessage, + Option(other.getMessage()).getOrElse(other.toString), derivedShape.position(), derivedShape.location() ) diff --git a/amf-shapes/shared/src/main/scala/amf/shapes/internal/spec/common/parser/AnnotationParser.scala b/amf-shapes/shared/src/main/scala/amf/shapes/internal/spec/common/parser/AnnotationParser.scala index 7d8e905e3d..2cdc3a0e97 100644 --- a/amf-shapes/shared/src/main/scala/amf/shapes/internal/spec/common/parser/AnnotationParser.scala +++ b/amf-shapes/shared/src/main/scala/amf/shapes/internal/spec/common/parser/AnnotationParser.scala @@ -10,7 +10,6 @@ import amf.core.internal.metamodel.domain.DomainElementModel.CustomDomainPropert import amf.core.internal.metamodel.domain.extensions.DomainExtensionModel import amf.core.internal.parser.domain._ import amf.core.internal.parser.{LimitedParseConfig, YMapOps} -import amf.shapes.client.scala.model.domain.AnyShape import amf.shapes.internal.annotations.OrphanOasExtension import amf.shapes.internal.spec.common.parser.AnnotationParser.parseExtensions import amf.shapes.internal.spec.common.parser.WellKnownAnnotation.resolveAnnotation @@ -34,7 +33,11 @@ case class AnnotationParser(element: AmfObject, map: YMap, target: List[String] def parseOrphanNode(orphanNodeName: String): Unit = { map.key(orphanNodeName) match { case Some(orphanMapEntry) if orphanMapEntry.value.tagType == YType.Map => - val extensions = parseExtensions(Some(element), orphanMapEntry.value.as[YMap]) + val extensions = parseExtensions( + Some(element), + orphanMapEntry.value.as[YMap], + semanticParserBuilder = Some(ctx.extensionsFacadeBuilder) + ) extensions.foreach { extension => Option(extension.extension).foreach(_.annotations += OrphanOasExtension(orphanNodeName)) } diff --git a/amf-shapes/shared/src/main/scala/amf/shapes/internal/spec/jsonschema/semanticjsonschema/JsonSchemaDialectParsePlugin.scala b/amf-shapes/shared/src/main/scala/amf/shapes/internal/spec/jsonschema/semanticjsonschema/JsonSchemaDialectParsePlugin.scala index 2fe72f6b40..667f7fdbc1 100644 --- a/amf-shapes/shared/src/main/scala/amf/shapes/internal/spec/jsonschema/semanticjsonschema/JsonSchemaDialectParsePlugin.scala +++ b/amf-shapes/shared/src/main/scala/amf/shapes/internal/spec/jsonschema/semanticjsonschema/JsonSchemaDialectParsePlugin.scala @@ -2,29 +2,25 @@ package amf.shapes.internal.spec.jsonschema.semanticjsonschema import amf.aml.client.scala.model.document.Dialect import amf.core.client.common.{HighPriority, PluginPriority} -import amf.core.client.scala.AMFGraphConfiguration import amf.core.client.scala.errorhandling.AMFErrorHandler import amf.core.client.scala.model.document.BaseUnit import amf.core.client.scala.parse.AMFParsePlugin import amf.core.client.scala.parse.document.{ParserContext, ReferenceHandler, SyamlParsedDocument, UnspecifiedReference} -import amf.core.internal.adoption.IdAdopter import amf.core.internal.parser.Root import amf.core.internal.remote.{JsonSchemaDialect, Mimes, Spec} -import amf.shapes.client.scala.model.document.JsonSchemaDocument import amf.shapes.client.scala.model.domain.{AnyShape, SemanticContext} import amf.shapes.internal.spec.common.JSONSchemaDraft201909SchemaVersion import amf.shapes.internal.spec.common.parser.ShapeParserContext import amf.shapes.internal.spec.jsonschema.ref.JsonSchemaParser import amf.shapes.internal.spec.jsonschema.semanticjsonschema import amf.shapes.internal.spec.jsonschema.semanticjsonschema.SemanticJsonSchemaValidations.ExceededMaxCombiningComplexity -import amf.shapes.internal.spec.jsonschema.semanticjsonschema.context.JsonLdSchemaContext import amf.shapes.internal.spec.jsonschema.semanticjsonschema.reference.SemanticContextReferenceHandler import amf.shapes.internal.spec.jsonschema.semanticjsonschema.transform.{ DialectWrapper, SchemaTransformer, SchemaTransformerOptions } -import amf.shapes.internal.transformation.stages.{ContextTransformationStage, SemanticContextResolver} +import amf.shapes.internal.transformation.stages.SemanticContextResolver import org.yaml.model.YMap object JsonSchemaDialectParsePlugin extends AMFParsePlugin { @@ -47,7 +43,7 @@ object JsonSchemaDialectParsePlugin extends AMFParsePlugin { val options = SchemaTransformerOptions.DEFAULT val newCtx = context(ctx.copyWithSonsReferences().copy(refs = document.references)) val parsed = new JsonSchemaParser().parse(document, newCtx, ctx.parsingOptions) - new IdAdopter(parsed, document.location).adoptFromRelative() + ctx.config.idAdopterProvider.idAdopter(document.location).adoptFromRelative(parsed) // Evaluate the combining complexity of the Dialect: given the current behavior of AML, we need to generate all the possible mappings // that could be generated in an allOf. The result of this could be huge, so there is a parsing option to limit it. if (evaluateCombiningComplexity(parsed, ctx)) transformSchemaToDialect(document, ctx, options, parsed) diff --git a/amf-shapes/shared/src/main/scala/amf/shapes/internal/spec/raml/parser/expression/RamlExpressionASTBuilder.scala b/amf-shapes/shared/src/main/scala/amf/shapes/internal/spec/raml/parser/expression/RamlExpressionASTBuilder.scala index c495a3ecbb..637a0041ee 100644 --- a/amf-shapes/shared/src/main/scala/amf/shapes/internal/spec/raml/parser/expression/RamlExpressionASTBuilder.scala +++ b/amf-shapes/shared/src/main/scala/amf/shapes/internal/spec/raml/parser/expression/RamlExpressionASTBuilder.scala @@ -73,16 +73,16 @@ private[expression] class RamlExpressionASTBuilder( } private def calculateAnyOf(previousShape: Shape, nextShape: Shape): Seq[Shape] = { - val atLeastOneIsDeclaredElement = linksToDeclaredElement(previousShape) || linksToDeclaredElement(nextShape) - if (atLeastOneIsDeclaredElement) return Seq(previousShape, nextShape) (previousShape, nextShape) match { - case (previousUnion: UnionShape, nextUnion: UnionShape) => previousUnion.anyOf ++ nextUnion.anyOf - case (_, union: UnionShape) => Seq(previousShape) ++ union.anyOf - case (union: UnionShape, _) => union.anyOf ++ Seq(nextShape) + case (previousUnion: UnionShape, nextUnion: UnionShape) => linkOrAnyOf(previousUnion) ++ linkOrAnyOf(nextUnion) + case (_, union: UnionShape) => Seq(previousShape) ++ linkOrAnyOf(union) + case (union: UnionShape, _) => linkOrAnyOf(union) ++ Seq(nextShape) case (_, _) => Seq(previousShape, nextShape) } } + private def linkOrAnyOf(shape: UnionShape) = if (shape.isLink) List(shape) else shape.anyOf + private def parseArray(token: Token, previous: Option[Shape]): Shape = { val array = ArrayShape() previous match { diff --git a/build.sbt b/build.sbt index 9592fe20d7..272fc2d280 100644 --- a/build.sbt +++ b/build.sbt @@ -80,6 +80,7 @@ lazy val shapes = crossProject(JSPlatform, JVMPlatform) Compile / fullOptJS / artifactPath := baseDirectory.value / "target" / "artifact" / "amf-shapes-module.js", npmDependencies ++= npmDeps ) + .settings(AutomaticModuleName.settings("amf.shapes")) lazy val shapesJVM = shapes.jvm @@ -123,6 +124,7 @@ lazy val apiContract = crossProject(JSPlatform, JVMPlatform) Compile / fullOptJS / artifactPath := baseDirectory.value / "target" / "artifact" / "amf-api-contract-module.js", npmDependencies ++= npmDeps ) + .settings(AutomaticModuleName.settings("amf.apicontract")) lazy val apiContractJVM = apiContract.jvm @@ -164,6 +166,7 @@ lazy val antlr = crossProject(JSPlatform, JVMPlatform) Compile / fullOptJS / artifactPath := baseDirectory.value / "target" / "artifact" / "amf-antlr-syntax.js", npmDependencies ++= npmDeps ) + .settings(AutomaticModuleName.settings("amf.antlr")) lazy val antlrJVM = antlr.jvm @@ -201,6 +204,7 @@ lazy val grpc = crossProject(JSPlatform, JVMPlatform) npmDependencies ++= npmDeps ) + .settings(AutomaticModuleName.settings("amf.grpc")) lazy val grpcJVM = grpc.jvm @@ -235,6 +239,7 @@ lazy val graphql = crossProject(JSPlatform, JVMPlatform) Compile / fullOptJS / artifactPath := baseDirectory.value / "target" / "artifact" / "amf-graphql.js", npmDependencies ++= npmDeps ) + .settings(AutomaticModuleName.settings("amf.graphql")) lazy val graphqlJVM = graphql.jvm @@ -290,6 +295,7 @@ lazy val cli = crossProject(JSPlatform, JVMPlatform) npmDependencies ++= npmDeps, jsDependencies += rdfLibJS / "shacl.js" % "test" ) + .settings(AutomaticModuleName.settings("amf.cli")) // .jsSettings(TypingGenerationSettings.settings: _*) lazy val cliJVM = cli.jvm.in(file("./amf-cli/jvm")).sourceDependency(rdfJVMRef % "test", rdfLibJVM % "test") diff --git a/documentation/behaviour_changes.md b/documentation/behaviour_changes.md deleted file mode 100644 index 704e554afe..0000000000 --- a/documentation/behaviour_changes.md +++ /dev/null @@ -1,41 +0,0 @@ -# AMF Behaviur Changes with Java Parser - -* When specifying an string example with a number value, AMF validation will not conform, and it will give you the following message: - Scalar at / must have data type http://www.w3.org/2001/XMLSchema#string - - Example: - - ```yaml - #%RAML 0.8 - From: - description: | - The phone number or client identifier to use as the caller id. If - using a phone number, it must be a Twilio number or a Verified - outgoing caller id for your account. - type: string - required: true - pattern: (\+1|1)?([2-9]\d\d[2-9]\d{6}) # E.164 standard - example: +14158675309 - - ``` - -* Java parser allows set example to body and not to the shape in the body. - Actually, java parser handle all media type map as a type ( storing the media type in the shape name). - For 0.8 this is valid, but in 1.0 not. We only parse the example in 0.8 an store inside the shape. - - Example: - - ```yaml - - #%RAML 1.0 - title: Test API - version: 1.0 - - /subscription: - post: - body: - application/json: - schema: !include schema.json - example: !include example.json - - ``` \ No newline at end of file diff --git a/documentation/dialects/validation.raml b/documentation/dialects/validation.raml deleted file mode 100644 index 793fa776c7..0000000000 --- a/documentation/dialects/validation.raml +++ /dev/null @@ -1,183 +0,0 @@ -#%Dialect 1.0 - -dialect: Validation Profile -version: 1.0 -usage: Dialect to describe validations over RAML documents -external: - schema-org: "http://schema.org/" - shacl: "http://www.w3.org/ns/shacl#" - validation: "http://a.ml/vocabularies/amf-validation#" -nodeMappings: - functionConstraintNode: - classTerm: shacl.JSConstraint - mapping: - message: - propertyTerm: shacl.message - range: string - code: - range: string - propertyTerm: validation.jsCode - #pattern: '^function\(.+\)\s*\{.+\}$' - libraries: - propertyTerm: shacl.jsLibrary - range: string - allowMultiple: true - functionName: - propertyTerm: shacl.jsFunctionName - range: string - propertyConstraintNode: - classTerm: shacl.PropertyShape - mapping: - message: - propertyTerm: shacl.message - range: string - name: - propertyTerm: validation.ramlPropertyId - mandatory: true - range: string - pattern: - propertyTerm: shacl.pattern - range: string - maxCount: - propertyTerm: shacl.maxCount - range: integer - minCount: - propertyTerm: shacl.minCount - range: integer - minExclusive: - propertyTerm: shacl.minExclusive - range: number - maxExclusive: - propertyTerm: shacl.maxExclusive - range: number - minInclusive: - propertyTerm: shacl.minInclusive - range: number - maxInclusive: - propertyTerm: shacl.maxInclusive - range: number - datatype: - propertyTerm: shacl.datatype - range: string - in: - propertyTerm: shacl.in - allowMultiple: true - range: string - functionValidationNode: - classTerm: validation.FunctionValidation - mapping: - name: - propertyTerm: schema-org.name - range: string - message: - propertyTerm: shacl.message - range: string - targetClass: - propertyTerm: validation.ramlClassId - range: string - allowMultiple: true - functionConstraint: - mandatory: true - propertyTerm: shacl.js - range: functionConstraintNode - shapeValidationNode: - classTerm: validation.ShapeValidation - mapping: - name: - propertyTerm: schema-org.name - range: string - message: - propertyTerm: shacl.message - range: string - targetClass: - propertyTerm: validation.ramlClassId - range: string - allowMultiple: true - propertyConstraints: - mandatory: true - propertyTerm: shacl.property - mapKey: name - range: propertyConstraintNode - queryValidationNode: - classTerm: validation.QueryValidation - mapping: - name: - propertyTerm: schema-org.name - range: string - message: - propertyTerm: shacl.message - range: string - targetClass: - propertyTerm: validation.ramlClassId - range: string - allowMultiple: true - propertyConstraints: - propertyTerm: shacl.property - mapKey: name - range: propertyConstraintNode - targetQuery: - mandatory: true - propertyTerm: validation.targetQuery - range: string - - ramlPrefixNode: - classTerm: validation.RamlPrefix - mapping: - prefix: - propertyTerm: validation.ramlPrefixName - range: string - uri: - propertyTerm: validation.ramlPrefixUri - range: string - - profileNode: - classTerm: validation.Profile - mapping: - prefixes: - propertyTerm: validation.ramlPrefixes - mapKey: prefix - mapValue: uri - range: ramlPrefixNode - profile: - propertyTerm: schema-org.name - mandatory: true - range: string - description: - propertyTerm: schema-org.description - range: string - extends: - propertyTerm: validation.extendsProfile - range: string - violation: - propertyTerm: validation.setSeverityViolation - range: string - allowMultiple: true - info: - propertyTerm: validation.setSeverityInfo - range: string - allowMultiple: true - warning: - propertyTerm: validation.setSeverityWarning - range: string - allowMultiple: true - disabled: - propertyTerm: validation.disableValidation - range: string - allowMultiple: true - validations: - propertyTerm: validation.validations - mapKey: name - range: [ shapeValidationNode, queryValidationNode,functionValidationNode] -documents: - fragments: - encodes: - ShapeValidation: queryValidationNode - FunctionValidation: functionValidationNode - - library: - declares: - shapes: queryValidationNode - functions: functionValidationNode - - root: - encodes: profileNode diff --git a/documentation/images/validation/example_graph1.png b/documentation/images/validation/example_graph1.png deleted file mode 100644 index b84e9d4641a86e59c6ccfdc492dffad7ac037adb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 45120 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 z z|6hzgY?qjNm9s1IM%4IQg++O1cF|fL=PxsdtCT_l3j~Vtl3JHiKL(hsQ z0%nr1z}GYui&!itQUz9k*`x6%wJrNM-g9$$gUb&Bn7^^p%ufUoZTma4bodo1jsO7og{y=rP za<&QVB)@o)!9Z^@P;ustXuW9R>67+$QvtKQ5_~ti9yk=%5Gb{?Y4B|xfot9uW zx`-D87b*%6ewzWpVPIs|?NLrju-3_lLvt_40U0uc%bJIZe0MV&L#Dk`g2os*Ox67f z$$Ar}1_E;0Doo%WLrleWyGv)a8VRI_6!5m_KjJ(WURooKWK2i(v`(+nyv37&_(HK5 zZ+f6hKM||tN?3dAhYg)c32I)mvDy!{>>BL__vDsD_6lLQH7PGzn{DczanS;bK+nQT zYXsACQ}zm5id7Byrerg)*3{b^)jE!ACFyg0*hg@i?t#F0qW~aec2l^*axQcyDVb9dl??aT>=TgL8(# zv$p-0-=$su=A1%w%w3pcn}hQ63>ys2+u+eRj$G{F;E~+SOKPxkr_z8Ym)PB(w9RRB z%09KK20S&a0^3`jIz{^4%^MbT^q61j%uN~Z0sKoUY z=@Mzzo_yFy86`}LevQr^FCr3SDfyNu5 zDL=tZmEcd3Quc}GmN+Ql9Ty}gXF7k%B?M|*%L`Mf;JD31m_*`2GA9aworT%k%L#ur zvKo}TpHW~N3v4N|fN?z&QQij^Pk5h_e%PQ1b=W{T9orBbx{^o$fWCB(#jEB9)=H$y zZEyApKhTN&Qprr5nRDEAJ3qMbCs+qMtGG$vcb1%X-pNI{6{K_EbVGN=RB)dupN^S| z>bpW~L7h2?O2?w88kGfX^abR^0B57=NV;L{_qMk)LU5l2*P&_{Fplg@++)Ccp*5h+ zyvY+(elp`dHxHgU(XHFY46!B&?joRwVSl`pM#=K|lm9X+gQG3gF-GK*GYzRaOK9)h zwFVLR#?KS9o*<*mrBX~HeGhvjWiH%rM=_*tAgU>R4fCETo=JF9%AjONZa?e52#q$U z2A~BqMN{(6PjVJr&6=W?F!uOp{G?DnQuF4x+z0C5#zH~tf<~4sa4H>2x_+xIWK{m@ z4|b1t{aScaZ+&F$H{39FVWCY?E(rOJmHif(Dg~aOVSURJxtv{CZAhDd9z4^se?d|E zk_VH&67q^OlUK*pGa1O#HsSTvz68-%YfveVqE3Xd)z@KD&Pyb@CTF9FQ}GCqt)q1K9s*wu*j_p2Z3=r`aqtV zjRNB!ptm6*YFcto!CLgKcs?*`1C!wEUrhx_Gd}mK9KW5vXg3|d?0#@%>M3 z?tsPI6Tt2dFf9L2QC+#$EaMVzqz5hpp4)%jvY%)5b~h>R25!57+yGC_ z20mSRm&bS*Tq9@rLx8}b%I%@<=v=^4@C@wxS$%D7%Ol`oSWNB(!x>p-+&bxr?oA`W zdjLVI{9ejPb+tFy_bWiIqWwJe`ME8b3O;=G`c7Z^DS-PzK9()Ubp7sImk-^5v|%vJ zRUq=g{>JX$PMooaZXGTrKnz#a$TEX2LpL7$B>{1C1hg8pj)8~cPNzT~Zr?D;56T2c z6Zjjt+4c>T?x%2V0k%t@z<41ja}d5$4g?JiKr`HgMuR3+=ZbHlt2T$AWtrp!WiRgt zW%IyQ)jxwWR#9(|WwI$b$3(y}>rF`ex0Y>#mK}A+MO@h;3j*wf(E+}qKO0u#h!X~M z2waba)G%LV1B_|C+kluZ&jN{>|3QHm2&&p~+JVZFbaX=gU~>~5l0{;-7;m8v1!;F; zJqW4EKLHUnCI}Kb=9{T604aN(5BhCfifaKCv}coL;&afn+r(SPge}lLLftHjt?@!= z+y(HQ55Iw;?O;Np_ERz4LMR7XVn=AMIz?$_&pdMolK)O<5_6<=jGiClzA0uFG;tPS z-gry1aDC7!l)RZaaYc#1UqEEc0NM7@4X$x44HRIna==T`u#RL4zyxAevx|YTPR`~9 zpghnlVg?q1sLp_Sz+yB?K}x9yA?w-B{$V|ELlDO(CVvv=`va{pIArMo@HDZ>6Ayy_ zvDrwjJ9txhw?9F0y!dY^#eo|h?1&ZBIc1t%b_z%-VKJSMgoe8n76DV(GN3pJY01Sc z8GU*IisO&$ug)0b_3dp4=u(dg6A;)k`|YNpVx&R6C)-bWb2R}) zrEHnQxo3dbVz{59{8D9s_b}M+APq4t3IJVxkm6zvK??`mA|*>UWeqz52EvXS6~v%D zXvaq(Lwgnr(tv$7+WjB%sW%6d^y%Thgkw|;E`F}MC7c*VkfTrU0k`z+6Bwg0K&iqE zL5+NR_}>N;;|5Cc_AZe1E$Jxz0n&<4h7Vre(yb5VOYB>KZXAW zi5fiiJ4od)D#QYs-uZ1)&`JgnsDnTp{4WoS*$1XwPQom^e>^N^9|RBI9lRJ8n{xuX z9py9(stJ0Wwu91wo-B~MXMRd!ju1AvgzkRzTnR_tFlu3Vd)T3R&F0eh8;Xohe!#vpFk3Xme|&$>4hbno-H! z$bPjRbVG~c%xkxp>g@e=QEnDz1FuY7C;87-!7pw!RkY&ck#IcQ$Tovpbd$rT(-jy` zZm`~Ro!>O)uZ$LE-|yGFvG94>L9u-2q-s!8hw3njH^bqQ-sQU}1wjA31}p=lf4{B)iXhs&whndI-5TUs0Ad)_QxG-6UUm zAl*$^D$P+rn*Cq^x`gHPHz2s`{z{9M-*coaGj0?`-l?@*%-JUtG_`i4_zjXTK=^n* z*$X{?G3*|8qI4%3YAIb!6pHq*1g$p(E-Z zbG|o~KIGrxs-tLEszjOswSX$s11 z9;w;lmaixcSEhE@(1ThGRiTggoeBY4jIsYn7o?ja9N-hxC)lSO_>}98PK4B;8lB)_y@Av>Ze()ho_?)HIo?BppZM)31a~pWOf5l+AB*Fr)xfRwmI5*& zj4*3!D$9}FyY8534MW=Go6dp_n;Atvy$p}F*3LI`_P3;>4hVGL>XqiU|UVQ4(bgl8MdYjoRsD17dTfdW1{VJ9@tWeQ0W$Rhh;w^ZOz>YH5 zj5yV)pg<7^W2Yo6@d>ET%GGH6YWLkLHN!*!f}9jCNKw9Xh7|l9F=o#_=U8GBNgPLc z$1>y6FgsrROdl<(AHT%z{N!%|lyKSmK$5HvfV?{DJXf#^rkje9Y?CUV6nF2T)%7uQ zWY&3jdrx`_d67rM?@4}Lz%J|OBjC*0GC#X}X~Z%a0Be(f$%ETGOz8?}VjgBNp-@|v z8m7u3;@hfaUH#Kb>@iY_ZP;@ZT|GT<@p7qG({5U)B-`75iUNYr(aIH-3Q`8)&z z2GvB5Clou3eZzaF6RGhrV!*ghV8+8MB$kP-kNS+M>%9cuxVRvmM3&_v(9fvj>^`^n`4I{!>rODe}D#kRW>m4n5N>b|B>OF0t{;Tp0muP8k=EgblW@G3< z^-#N5rmfZ5?WasPrkvGvPt38T2x`z?551!&3hV#IQG%zfrv^zb9D2(Dl&qG6`$2W$ z-#eDs*JKxxL#`f3BzD3J_2h%Xt5`f2caYKvwyI3~M%)zH??TG>?8s6JJI8Tlib(G9 z9{dnaSu2QTwmsrb-dN()HchzH?Juu;p9e=#|DN%;!GTT_!w>FcOgF7!DI>kl^1BO_ z=V;vVpy8(gDlVnPlzeimuDA!}FV~5Z~Zk>E5fWq3FS~EX*1Z1yEFPtZb zWkk~&(ZcE!n@$yDn}rPA3yeC~4ToS-?zv&|&goJ)QL?lBitV1KGZ-bc`=M=Hss!8( zvn7~==BQne-NU@0{1CFd!{9CsJsm%9x*71}+#NvCn~xEgi)}vtZ%?gu1j>-3^PM60 zH=;N5ao8xBq&jKks8dvde9)AE$vq1G?>9i64dz~Bh@s->d?20NN=>UTf)ukGFeRIr zx)b1`+hCy<6^Y!XiZTk!fAIjA{$*_d zsWTu74KTZ@wsnEZTW|zcT?&G-6klkF&i?^T0fIJfwHlQAV+cYp1EjCQ`9Yg$G;Dt& zNc}fv@%JCa8f-t93w8v9MaE{54oikc6f)4a_L7oL(sSWiBou~Y96@j;=jtTjR`M)dsIU?LhXXO&{Yv;hPgT^PfbAA0u zG?BTyxXZth$Z>DNHcquHg1DVr3QjmPa~La)jEVcVz%Pk9<$A($mnjVHo5O8A)u~ut zz$(#gpa!KvpE{U4btuV9eGza;abdhENIXhwZLzQvr@2v(RfXm*%w=nFfZmL@t3UAH z2{v%E$2RoaY~nHbbY+JDmZ%4VYv5EjcoyrwX@!=*n{)){&dFc@`ZjS+7`Z$rCl1_7 z{GM$k{$yjBg+%wY2_qxFBYBh!aqx4bdtK2VZj;I|j{Iz!NlmMHWHF8Jb6eRQE>&{w zrhVmEQs>(K%_=MF8TBgZ%AZ_R9SeE!5ixgy%Zm%!JqrR+yYVcA+u%p4Ac7wa)wlc~ z+TJs+$*hSR_Fiw-UEQ^UsI*;ol@4N|2W;4A0xD7hD@fB&Lk~$@T`V9(6bML(qJT(~ zUP2NTAwq!ABtQs3LJ>j|Y665L&y@tr-oN*KpHJ`gVVA^{>zp%ZX3ot2%$fONRde#@ zUGtBC1a*@(Xp5(L@%_&!aSKdbH{(T%Q(Xtvw_g+?LSby$g)BEw&^sq!exvJluH_~a zOtL6FilS5mPHxq_OR&X5x>lAlie{Z@9kL%C!fqY5&Jd1Q6JQ_Xi+4({s9n#T1v^Af zpJ@_abMpHSUIUL&$>ek>ZcRy8A1YBC3$0xx-2@$4{*cwIlHxgnXnt#5m-s&3H9y)+ zDWN~~U5U^672-nFK%~I|bh5`gRXldL*h?{R(#6qR>OM058ArPz=Pizd!zCFDr%%X5 zPh*-8Q?W+Fd@v`MG`zERFOnz3?e$O zZUg_cndSjvdoHKbg>3XBJu^gnwLHvPL+of-!|JvclP=+7il)!Rm>K$Z3p*f+WyT@ENr;(=Y-smC`c!qS#|>W&iV05CplQ_gW=0!1oMsSWF5sL z3g5ZYYpqo*JILkXz$W(Ab7*6USl(P8{KU1+@-zo0owld}n-^{-9DScHxr@4*VPJZX z@sEM)SwCJdAx-&ipbIf`O??Kg^U9CTW_;|Kaf9<|-E`rivdVTb-=2E$#K8X^<8D*_ z80V4i80vWIwV5l98(l)g_Th9)T+cz!sy7BX3w4Nn93!UizOu6;5&IG}?5GuUa$7!b zX}==Iq{a9K_pQ(0V4j4l??FmQ;J1R;31(8UfieF)D$@sOq(6AB61Gf?A0&Yi%xNRa^CL^qp|VmMex z#T(%mg>E7kdXF zSa)_(EHE5gQYI=Nc!M5uyp@jAPO_0%;c0?P{@tmfyWE z%XDz;miKM2pAlQm#u~YY>d&R^lvj>kO4OFFMdHsiR**vSTnr=qn)c~uMVi6S@~py{#@UN4at}F=e+YJg1g3|G#BYU7X?oUe95RN9Ci%)khR4^k z6r7S~DL|ZGDE|Yr1tc+|{!kKQ0)N?Dv+;j_?l=2J3B%kg^jBX#Un*F=mvDTI;W_&} zts&8?&3U=85{BRI*l=+!s6Kga!+6{u20wn3k`o6>1hJJr|2I`ap${u|wE_HRyQt6q zh3)qF#;zqAjAf-C1gx-6I8*5%!Rz@lb1nxNG4Un&;*UFtS0@AGSWuV7CbYk~H*U_h6T9`F*iOaKt zruP6d5-_v@l`ZD^>BpaUML^3KfN9a(tSRBJM8)$8c{$bQQ~U}(czA6X(8oWj7~xk} zBh$Iol zbh*BYsc>Z`;7g`Qt~k@ko!P1z7-k#CF2Kb2QkQ3Klh(Q{OL}kuHt;++x!u`5HKE6q-NUP<;}z%pbiv6rgo2QtMZLe z8x7D4gyc*2?Y%)}^|zlKGWE3nY~bif1{AYy-Ii!zA8JYQ?Jh@;2sBSlmVe zkYTcn3fnNm8cjw1u_fne+9o-0Q+P|**{aZ4VjwLJewkX4llRbVLeL@Q*)wC8^!YGv zj;QPHiw=azeKIIs<`sU03%vaPKD2vY=$S$oRrRMW)sE+$!I_5R^m`|@e0qiB`WM1# zJCw}lB3%CDrEjC=u{n3~RvN2b#m@^sfC9F!1-RKSY#<6C%gstycbkxJCVI_N8S8qo zi6z+S@1e4M2Ye7~dUP?cKG^KJ8QM#WnOdO?Z9!0Ccg0txdB{nA9KHHV0TRySxqTe9&<9 z3SRY@S|S(ez;G}0=+E`!swi~_o6pox#0M8y{J~Fp01X2_Xm|acC1Z0#wPGu$`-*Y1 z{`6BzV^^Pmw7un(OmM0F`?_j2tZfVNc?GBibom(^d-(YW;k5B0L1PoE%qE5_L@ zad|KcIbX#QJuP0kftixa`%B`DReHSoX8XOzzxAt~*a|Fb=44P;5pythr+3ghElTGO zR6N1_PWPEGQL%-nG%bG*-6U*j6SVG&fld2qfu1jobP z9GPt>y(e;W7P9FJ_UT=Rt?^rwmDMtju>hQn!e#9)z;!A7e9vMh<1^<4@9}c3>{m zTay|!W>c32?=n6XdCb;VPUIJzp&2w9gpn0R@+e<5gC=HG;az*vYBuy9ae?4GyE<#6 zTU<$YZ`tr?j^`BW91Hdlz7@+duYS-RWk}ml_sIn! zaK@q2wXDt=7)>yg0CMnCoaR7(a+9^9~-G)&5EtqF8gsMf`YBdkb;w&Dlbky*f~)-5l={tEu;NBkunxbOxomE z`NM}9sC@3_`Wud0v1Hw&S^q^%C|HkyqX?uhC3H%@-T}elAzm5^UTnYlhg#1)c#c{O zSB>FJ9VgB|C^9ahJ}>_1<4W`_t{u*`Pnkdp=t5L3QOn*SzergS(o>$7nsTPqd zIYCJ9E5YdmKT;Fok6=y^M8O06IX1w9P})EtwQ25T94uXzOgr5ap67{G%m)WvS}9Tr z>l&}x?7=@g>uNz~q@+dM@ip)EWNJ#oHZ8?*q-+|<)h zs)TPh;vGHD_pjw#U_mv(7rN%Kdzk^67HFaHYN4Beut+eTtzi?k>ipwFWet9kX?x7M>y4yoL1vVM_k`PK&jj7vwnoSv$>sJA}|Ew!4A!UUHY%5K_LOIGV8 ze_{l4N-rKsuXCx5TX(*(J%y~^W-#3xU|Ahgnkom#>>OfBl5QtOhWExi*x1;Na z4TJeHT!T;aLrq%riNT4wwiEm-r5-IyRS2%{1x*b%KXSE){+O+=$*Zd+ zA869zx$>zor9kKNEpW86KWZmaj7I0vQ3JcR4vptktbrR1vg|F|cX`YwYr=lC5fSl_PTGHh zF_HejJ;$o5_N|-MbNoAcG=?6?$^|oR+4K<1$$HmGj(sk@*l(lzFDt;gkZDN-QZV}} zo;Cxec|F7F;Y&@&@D8=JZL%)dVnQ*s3Yq@T5xe)T@ouYB|GoTyB`zi)5x9Fy#!dIk z=J-X|Uq%{@mil?+M+{nJy2_{9*&eF4%<+2{XnBWPe&pFY%ACCIilQPvD-`2L;sw>{ zJa(S2kW(A&<)^qqr)bvCxv)&?mIs33(I#9VYRrMze#JI4anH|An^`%V_3CtA3BoFb zyA}g&T?QuQl%e5v3;FZ|Ib zgMjB9Lq^o@|5zy_!G>NB_N{na9b|V|Y!}1&!=K;ZPfQMpXInf2wb`^TVw){gR)S-2 zN1jEb?6rYVfZg7o!ydxqcjOZ+pTQ&M4m(6#pNt}BjwvO~EKW|RD`GC|q)4Ly`viej+_DZz^UL+yZ(GV?6Shz`G#CW`Ez-aKJoC5+W~+X0v^RMWrjT&PBs|=$qZnHi+Om@J zxFaV>E%YSUrVef0imuvOTPk1tM=iPN2x|t=?bwpJB+gZ~5SNqvCJ+ay{mlc=XllG5 za_BB=oKLRVfrb;qeHRCFCc~X|cJ+BZ163E>q%{%DP8U%h5A^+FY-aC)4pf(Ud&dK$ zhy9S0W_wQ$eW&~fE8NrUi^l>ofAuzK&)IxEm@LP%i6&T3TRgoX z>Q-3g5=vP~B45*qchpH|<$mbZnvB}bYEEAEFX3laFkpWez0AJ~(#7YK&PX)54f>m0bHy_jTRePG!``oV6AF`J^IB%tuQenv)h%&xy zPSid+M6J8H4kEy_PdtOSEREwGJPw<@Xtmt7Ipaggt^*e4?^D_btN<>P%TLliHfdx5 z1vfMIruVXr`EFvFBcV=Sr<-wJ?Ar58H~$Q0gc)?h+^4YLc###Y$1Y$Ok4=u;OF02! zjS%yhe~|(@XQ1tV9Oq3ed+mQTwA@(LUQ=8|XXxw26ZZ#>Ea$xA9pDA%SC%AFbH}xh zT*n;@>EGP9LTwo^a!9}Q)H6NoCh>ewbi`Z+wFSXTZtxL%07+iH8)(`5%RU&p9%|S# z+{MUXH*R?IOv*^lW_sYCE!z#ZbK4Cb8h@i%k^=u^Zj>h8#E z;>YGSWz$~|qvffeYQ~xhLv-y~^SiN)Z~9F8dqQ82&1%uGS^!7Ot!mC8Mh@TC<%D~q zxf*sJz^q>Q)7nQjwFvw?3-xC~;7gz2EkafjJU*r0C`I63g`lI=DtO2|C_SgtcPtNJ zCr}#vZxIOC-N*_j#JgL4YR>wsEkRTFsV;9l(qp)nFxN^v`${iGv5o}WRUZNQ-MH@I z_~e#he8v()Emqsvrv&`lL*r%>&+GJ_K>Cb1<$0<5c#`i2XPa9(<%k!uy9S^!pVT<| zS{Hmu;%Toou?m#v1AGAKc_k{LH16=_S|k;zlRiZ8QDk0{8{nhbSkD)U&#L^3 zr@}qZ_I1bhOO@AdSsv|%X)W?|47c~)m4ORDfcd+-74Jr7U#F%x%Q@8z-2hMcZU9cf zoB2oVeB8zsSaC8K;wF~uK{cAZNzw3VxSu7jw8NEY;>^W9f)R4u&pJKrFkQU$z)xlX ziV27&a*VMcC7)^i}6{b*! zM)8|Hm|cByR=Art65~KlRks^>y;1);MGEst1mX{N=Kx1#dC?g6`ty7>-w~~V%U~ZA z{F&eM4Mbcr%nMDS^@;oY!|o`~bLwaB%HvY9_?;HsaW;7@I0RX!ds zV0S5H{nREao~Q*at%1LjQug8g8}r-*dh!Waendy+4C@h0L{+VzXn*ic`_WidJIM!Z zwks`6U(43V&GQV5iM!UlBZlj;{U9DoN(g{JN1(A}LeA$Q!cxwd5|Mu-G`jdVY|9D$ zKAO-Yract!wh6XHho3{lVFD2Sp;~9RQT*0|C%bU;BHV`!a=wjiQx8M9FhO4Muk@xN#`%?JDD(m?Eu0{OW<9?m|-FZJ}Uaj4Us{|qs$^e5S zKG?tNW~khN!)$Z|u^LbJgKX>t`{;m8?A7;a+4+#;IYw+XdGmKmc(hmP?yx=9H0{w? zPy??Nh}dA?x?`S~;C2n-#NM8DhGkx{EW@QX8$6YyV$c8@$DyIzRr$yXMHN!FW2S*>wp~J`7{}mVkmXiBfU!0~aG+1R0(7wze?h7qIrNG+}}OXHpPfUcpZyq$&#x_5q{QCq7U8c^P0nsb4|xgO7x6;;8elNPVF^l6s2 z>p1xYEXVi7oPhcN0H7ZNc{{7^3twfd=>(M>e*fu2KkCFm+bO z!wKSJW+NBz`K2lp#ob^X0xac3{;X+E&MmKuQTbgiBbC7_*P)~Vf}1D$Q`r`qK(vvv z^U#@M)vO=wN4YltH1XpeKdps%RE0EEhWU(Hj}Z9^3Fec~D_*hm!H5SmGkj?69eV#I zfLR%6XW>%o3TZdf$M?GEYNEcwj9TbID9Nup7cTH_$Dvk%`x1H;U1Rw|DPHi8puz>{=VW1bBV$YHtIBl1|$MBPM7C+)F{-( z{S?f6A82SH_ZhJHpiH=*{3HJAiboP3=D&QN_nVs+e2?>12G(Toa&H|EDkm(u?iMm- zL@l$jf?e_9i0+Iw6%#D&{f#SH8y#WMC@yhSD2aVHFRvI;!=oxYT#bIu(s(*rcjLT@ ze)sBVNO+f?YhK7Zlkl?FIrk2kOr|^Idy9Fcumm2b+Q{VhEaRWedJV5kJq?)rpp5r& zShCSzn@n!w@b6|h3Eg%saR!EM{Dp26gw+0V)Pt?oNB*{A8WsYmh4nRws z)t`npzAp9kms6`iR~c(DsK~9g*35{6!ElWfXw8;iHs8-F7F@mh`eLd!_-s!d9&HpQ zhuawb;H2-~&;IE9$7J`wPEq(+K z+@9j_II$6PJ!c3&UfI+M7|Gk^ ziNK@Ay5xBWz6~A^sCd3dDy*m{@OWF2-vB;u0c=$g$CBHUE|$-sCpof%Dsz2+yu)_n zwVuN{C6uhN}=L zHQ5~alM)})8Xv&MUcz4ZEk)lh%Ch)*dDtPsLM;W6o?FQAU6C{(yBS@a-gjX;C|{GTdKPZ+B&NQ zdw@Lm&UKY(16-rVbjB;ws`3_|(1MHWI+QRcPdWs4R|SIsm_^Vjth1w%X?GL2?0K?4 zn@4wM8S8}-cyAJtfw(Ev!u9%FFk;4WjhkGTj;)ayAa1U*XQPZR`zULqevF;gGEZ`G za3x)ADcW$elr6ew(3zp(`f-y_4$NqxcVh4e#rN71mglB@wIj#ah8CnAx0Hd@l)4=b zwmzI*h8^0u@cHb3{icKVrg2>Y|8Rj4%cF5Df&;cyb69ZB?Ql)6s}GIFhN`EO=3LoD zPR1JSclhiRi7#cf_5jv;`IU-}At%e}@b2EOVBHJ#y?uQzew7=@TRlB}9|sSeu(jB3gio*3-HY9wDTdAsmk_Ai`9^e?H_7HnHQ=`1(2I z5{*s7L+?|=$~T5!NIkkmMJls~m4&xyMqOGqn$DAvH^_#ooXW*(5W#MF<|hwm<4DTm z?i{i^1eWA1>}r%P!W?IM8+%fBFl0D6{4J-B`_yEGGOw}9Q|s8j67^lf0VgZ=ZviJr ze}6EEmwTjF5Q=v$?&T%Rm#47Yd5-Uy<|87W2+Zam<>Ef4?xvQ$9t~=> z+$sm2aIPi^ct^+dvqPivqVaJEuUdBqX=&V*z(<61{}WCxRb!HSIAOjD!HlFsjYD0H zewDBuow`C=p=OTmbvVj{+Lgi@OIq|yWVHr@KXdq+bJ!Glx*Fkl9Q#I+tA`>0&P`;j zqz>|@bZl6#+ExU|bbmQLjADHHf%^&&*h=L*c9%p!kc;gZ&6oNiJb2M_%WHDwpBIQg zNkOTlWPkG`Id13JNPsbqyzA43orrc>*o+`e&bAF=2-7r>gBK@o05> z4RqbfJj({neP#DY{nH9mPT$` zgZSRda38MDhTo%h)BG8Di+%%)m%F^dP{2CnFmo;qhTnT~dw&d&?21&UwhWcqz@i5D zPrCmdfutq%%@S(;B8-OfUz@)WgdJ2vBDs&|Kk0ht$Zg33B=e?6Sh}ThNr$$b>iB4^ zov&*k$4Ctt)R}N^da7r#!LPp$ULCG0NIPveej=}nKJ9kztXFOv^^QkVsyhB6gb;T2 zS72}o1^V6p38P)e?$F+`;iXgO0ngaWx?}aFI}^b=6`UK1IOY|y)n>Q2I5qP>s}y}_ zix(bG49ZpM>TfBKj6p`l(lu1&eb002Q)(4)3pOoHVb3lHqHbN13Ci9)lzRUIAUGbd z$`W%fV&ol=8+W{$idmn;i7uAnF zb`^a7DFv+U)VR`LR6xU_+Wz@{A2#aQ1<3Oi!}qL9E=RUCE(r0b>K)|F?w>VFi#s5f z$rT((j$?UmDUpmV_{ond=dvTlztm_DssJ?_sPC30cMu=SskuQ=+L4XoOAf;?>!;4& z^L-lnGFEadJuRA60*W2P1BD8T@H|d2-28Uv~z&#rXAt+Ts_uG$;d_KJdL?2{6 zl~(HOZ+JiJ5(V43`1q)z#ZXRksleZ=1h_W1?zO#pl$rep>A}0gP|_?jt6gwlERNMV zTiho;mR6|O&-^L(q4e0jpQ*;+=!KX>CeJl;Kj)f3Yb4#3)ewgY)JDG^AN&6M_&6YL zFi+kjxBl#yJHPg%znCZwacL)p1i%eV@xx`~r_)mpnX1%LfZKAzh))mYfi?!$0@x)y zARfgaa_x1u?=vbFs$Rm&8$DW7tLS;aESi4T2bu=Hw6+_6@j)NC^!V`=Ns!Av<0J!X zi-5R(-aMl&)414@u#0M=5G5w#-Op`;fj{V?nf9-z>}M4)Ije#WoAA+^L$Qm?cn;Qer&eXLY(;#qU$dh2F(gh9pkTe9*C~PaJDwuvR&u?C>u-oCM8F{VnMM*$L$yQO=A>jHb@LU6mRTKaPEdw@pqUIT8Cj%b?O2z&z z9q9PYv-|uh&p4KtNau8=p$PkT5HBU~TOtmUe%Bq$WSa@~GL6(XPg{?k-ZJSdp&V=$*2O zwh;pt#<16-S1jdV3OYG+pcd~l5s*EZ{O}mvTC2PCelgJ%o*8`Fu3}oI5-W+fv6PZc z9B%`}YG7{#f70`u%wd2_#qPAhS#*BjyUz?8(~mUi;+~;3DiO`|U9J&A&KgER_Rxgh zcf^qs2B(6$o`(eB@+5(w;^>J^X~fH!L`iwoi`uX0DvgYcxFmvAf2nnmWF+@LANw$b z6$fr&B#}BHlCdP-wpQQ)K}G7}-c0urV+}=zT=WTXHvBiojl_2YL;Ry>KAo{aF7wSY zZ?63Us2%fu)>?er+=fE$c1S^hZ~r}R=O3MZ7fdD>B;jA;2*g{`lCoU&AcdX8!+$2m#mLr;SX5f5eKHaSVKz55>h^4^5>U-Zv6qcXj*gkBlhfA{<5t2 zV%5#(+f>e;-prOvrb9ZJq5}yQdpA$B8}Nwo1-mO`_>WEEa6f~+&o}UZ*r$<66i*bm z7MP~@#9+&PM&gS%_!~f^Z6aFQ=`NN0XTw5(%Ruli@q8~Z61`gp6eQVBR18{89M}ZZ z$(gJQQ;2k1g82U;UXMTsFcMBCPPFi`nqG^ND&fKfAu}jrJ5m1JMn3+YJKyRPw9Z2N z7SMcMLWj>=P+MLy%73TIj}qN*E%E*AsfLA_P1D$-ix5;oxK#P8wsl#koLGE;)|S%A z@gy&bvIhk9shZc`grR#x)#gbI30os89q^{0M=zrGO#?g^sv~XQJOl$J$aO^o0YNdV zK~onXB^h!Fdz2@DOw0gToOD@q&+Dm|P3I)bHY-%N)|6~A3ce!|za?yTN>Cmr?xDC% z!+;2M{<%}fFQS`67<|n-iiMm{`ihvezu_$DSL)>G>G@-_(n=T!1vNtkM_0R7Yuv}T zG5>lWvxApR78l9Bxo`swn>-bpEv3%L%0b>a-pVs&m7(0=Qrd)gujts>{a@F-JFr?H zUR2B$i5?ooX6-1sb_FBF_%2PKpl2}>yXja{WRzik*ToRjsyJYH1&CU_X)0We81_O$19#Ci3+1;qn@jGHnRn&{Cbo3{=r#W(U{xv;J<{k>J9nfB zm*gReZV|3Vi$wb-oyN@zH`m6!W)Re>#FTq*<>hB3d)w2LR*q=(w!d_&M}ce|i12Bo zP3jKUpv+yi7j)Vp!mdhk=MPwAxth)aTqTIsIosVT(R77gMoWE!1i|!?qSyXT5xKwu z^1R7KHVzU-{HyM>e~tCnW9?0n3KRRNT7_n9JW9#qNxb9Wxv?5flSD{0wd)k>)W%gp zv3YMV&a-DFnudr#Eds?bICZ^PwNEyRuU?S~ztGAH;nhj~HZmArx$qtEZei*!>qw*5}c#?ceq zttyR@soP%EvD%2t3fWN}DVJ}Oe#=>sZolvxVFrOtF@C!=f3Bs*%~PMX3dE@g?{g4u z9#tuQ%B)-@O3))K^AR)7Z`;J2ex&+x!e4%ui1kh~Hwci>!t!`c2WZHCJc|S7!5nUi zs01P7y`)Zjp=K$vU$zIUy|{ss?^;K!%OCC!wS^#63yD%s*?Aj}>+DE@?G1S&k}wGn zO|}v_WeuJYZ}5kDGnM%9rJ~*ZM2#unT4({5c$9y@>xwFE-?Wsp5VsJEQx2ybqTTA| z;i-UaxPZ1^GDut@@{ynK$N|i0c&m7!j}s>#6dwk0H#^`;4CzQ#?37$HuFz1y7D7-f zW*xFB4pnbQ8>wA>ji{<)C(%wxl@KyIhaT3 zCNM8f>~?X$Z{lPHOlh$Dt8%xtd&= ztG%GMVR8P2g`&1y|HqT7Rp3yLVkFg zOP#=46T))IkMfJJ?&-t{uPn8LcZ-joZ!&hM#Cc7Qz3;fR5_&yqL!?-oX^MY1gQIfLdWRx{$~w?F)87u2h;9g{v@;mU= z8|NT5t{q^NN(A7Ihz=w(s!AD){K4$+LmO%LpPY}nU@}Zu-gMyAQ(bEFyZ??sZnf7Z zhaGqc`D@?&qnLyr>yBtD>ggPU90WrQh6i4hSMT&yO^H|6*j0k`%xB`ENFHXtC~41~`G65LCko2O)^bmKtjH2je-6Yto?FCz-49s3c!UkLV8tA)#agl1`c zC2Fne$8vFRWXWbKepN-|&@|YSpZ0Yns^O~q)l4ZNZiK!+0dmboo}BT@zbT( zqN|eXflT?*XNPT7iG^!b$=COeW?v)&z0X~c)P@r`N{$1DQdu)t&$gQy@XbH_~xEQTrL?W#4#4JeGogQ&ar$ zUsLQ$2We0}A|pM;wu1Qivz;SdIz9bw3l#%!0K)%US1GaLu5w1Drjht(1KALQc4R;P z(3c-QjI$HZ;p?P*u&R;$N+i<1*d_p2Hv*3QFKRmWJaP&6nEdREu)4JV1uWzhSA^HM0du`L>eTOes7*3Sc)8%qnq0Vl0_0T+u<^f^ zEi0L|{TpSnA#Ta_knh$J416SLZ}t2#=L`48MgVS2K|4rn0bu;c+=DPyzG&8LW$ib9 zRqesHaK9;+sw?WIDG$ggkKFct8I4a|nV@delb`(cM}x0`k1ZWyQUlL1?UcCxog-`2 zG#yx7=vT7%*}eqkldCGpH30nRx6sQTKc>~cih zDeyeRYSKLUt>0uuQx22-Z{drRi247ri)|t0Uz3!zXe2(G?YEoz#vguwr~?xBjl3U1 zlUW+y=6FThR4fC_-wB{trMOmo$Gz$3dI%jtSkq?fF1qJ0r8WYj`FAfC_yBP&4(Vf5 z_&;JU9s~Mr8fWd_kL^#1LxBdEWgu?wcMRh?SN1($8ft7U?<+5ZOU*^#r%$y~Vu1zt z@QqRZ0fj91#vAOi{~N3LAuv{e$oz{X11zu*y3AK*e<7Wq)_%fw`r4B(=E85BJNQ3> zCs{M*+`;)TBzT!Ymng33vEr{A!TVKH^ttJ;%(F&}83p%Vo_qS?hPQ_eZVW=9;t+oE zqmUlD>?;Bm^X=gp$RPB_*YD-cjmeVQ43btyflq$5ILpeIfPD0xyPXp1%f;fTnXx(GW7w}pw|=A&|IaVpkGNWGSQIcFM>NNY6u0oZEKjdFB26-QeIoiZ7PNcFZ zDSspcU77=ZnE1$y)(h55H!GixWR+BVL{lQ#imT|%a?1n)-MmOQnInr)J>Z$y z)U#pA|FU1w?Y92DlcYMG#|)PMd-T16(TVh&K(BBdEh$ok#?VFNc z#7)&sInFvZW78XlOt?uW45nu)Uo#DMb-B<8-&7-J=Gp4 zXZqorz>FkXHDx`yIxA4QD5^cca3u0_Gcv%4Elp&yZdmqu3IZI%?0}4$PwI4qTg38Y zxuL#$8a=>H>=gR|Q-9q+D{!OGe7Rz<-b%^djlvEhP3bx&;?*$PR>~8u$j`rNqz71t zETC*a@t{?vn#*0UBNg^z=!6efdp2z zl;CCk^*medr~Bz$L)ZUu%;XHX*{o4%rN`nPPs>}$+?S%%wFp_zZX?pT(Iq7&+Bt;R zCEi9QQ3>{DVYYCj?Fy+gbLHfJ!HtXkZ;rN;miE&ENHgl|PwM@FDJV&Dvy7lk5qmux z<+`dt#JWAp8QA1qz0J4|hYE~UgqGKOj|*;;+=(lpwGuZDh)6nQe}1x*_}Q5qWs7jK zt`9iP_Zl`#-w#~hq2!D|#Bcpsv!%v!o=IHPYQ*m`7>b6~H@=BP^}9uXxISuF64mrM zY9w+YnUCJd&av7fTz9J9;};#3LDWe`py4O7BW^>(pqu^INx~d$w5WNzsNkmdSe+ak zaj}o%`J}v)Sr%z~2c5rl@xge(dhkSF5E9bqN`A_5GQ~Syr<7NwD@W}lojMqHAdHTm+#e|%12i%V?7(5UzpZ-#ejtdEf2(Uv7qit53SV(CjKZX*RJyZ$V+G7 z)0+{O?s(s^fz$Y=f4-iqEpE*6fWvOW)Y|n;QvyViuy%A$ap@RTF;gioQ(n|W%=J8HFTszag;J8)}yr`}H2qego$-Qu23OT~^- zlKpfieqeq;ZY(m6>vcT(@JuviEYKVV{h7;5n5fwuMB^h~e|o5_^pb2Q-;Ex4j#K#T zDjnZC*V0tAL6;NthS=JnJU(Rjifx~Em9Mrv;$^nr)dQV^yP7Raw-&aU!{&F(ttW>& zZ*e$JDft9>#~i57Dgcog9p*6Z?}_~%CT_5;kf4!T?I<=@jn|n3TT@XH|FL~aoEx?^ zX#Y_OI4>XS(LBuGG~zj_9kBIM1%<4uZ1`jUqE5>^pym%D+-6qxZUymSj&YiWvFy;?LvxrKYcAYjFFhn$0A%VU zX9a}&SLc9kMEB}e$tjYL=K8qBM;DdxeL!=AK@WN#!a=7k@VR2OP4PaTvzVhVX zs@l&Fy6Ep1i;{Wdy)&U)b?eyZb=ZRf7Lup&aqQ zm&$Mb=0%%711#Rz%5Mf>l`7Sv83=1#{)UTG^`Qa3kMPY8be8x`U+|X?jlTeX0csED z@HaoDR38Qa4BuRZsv1exOHaO<(mQNl(o>?t{_UJ8Su_Fu&38SkQvaVk`p`&K#uwM{ z{B#>IgVOrd|1tIdZ|H&D?Ej(%<^00`8+t$j9IO994`7$80@#PY&2(2xlnfI9K)!RW z0nhc2>Hoqc;mIs1_$yvNz}1%cp?-w5{T}c}egxi3d=UQCeE-uu03b6#Yb&hoi%*u^ zDDl#WlqA*~7d*Uo0&xES_|AnX)qzcu0Sf(p`}JbPpy@kbjcPur{k?Oo_5Xq(d=LG6 z@zTC|o&#Pv*zcWd^L$_+|H3N71l47H=XZJnPD~qo{HyaikbME=4vdcc9n1D3oag$# zchkPiQR5o}0!OF$0765ST!~|=MpCd3ZdnInj7cW;mZtgxp^&0T~TO+=Cx%;?Yz-X<$hYT~&cg1V>9YeTt0m__7`L?|6 zEe#U9@GJ42`h{V{SkTAs`Z_OOgFT#Y5Ryv@yA1wK!lbkOCIqo3K(UL3f#1*pV2Px} z{7x|bP0R}OekJj$0f4|)5iC9*-j4{o#Rvj2L~IlXgaDXrdZlLM@iH|)2r)Yvfz$!w z`W?XYSJJ$cu5V_7o#=z0Pqp|Oo*bCATukO zexfW}DJ*wJCuOEyEwUe>N%-$2$*})stcdiaJRP`@4MDkud3o}!A_aV3bxD1eJcw5C zsbzXRA;5HrAz9q|4RBBXsw}2jGDAcQ`&5E~s6qLvczDBFS5j8dPt)h3NI=;_VA%yp zYB$WKh{w#PH9kj|%tXrqDZFF3_PH-*rG3BA*j`Qn0L0+gmi9}M6*lw4)ZbAyL&!u{ zF3)2`g;Eq{sNONM4+G+xf1Z-fl&%P(#T2gmk3(^)w402Zs#MB;k@@E+z5p$)bAdTz zZhU5ph6OSUNCtWB{V&{Uxo5fz!E_9Oq=<_Gn|a2DCA7%7MPDUL+q`%`G~KUr!b69* zyg3WKHdPsxLNZXZd*v~Vt4~;Nqmhw9sC4`@xmp&06bMgDypV8@w9AIOTZ^&l9 z(c0fNM*#J2dqrlaJJ+x!>&C(mGz*Xdn^56BjI@feO%!lR%>OdprkH#L3fSy0$R#O3BSbu z0PmcKdXIHK0+nUW)PJ3m#sF$%Z=7`6!^9If?Y3~o11Ju4LJ&O)UE@T{PT{6lE(gzN zvl&EGI2|d%Wy4?WE(pLcj}ry`W}?-3ViF5ELlmFEuZys7-?Ic56#SUamlpeqAHl1q zS5rYlUl`8^xxt)YtctKW%*0T|1>+faW!-;aR0^ic$xTTt4WuM*@4A3TJQMs4 zo4KVG|2;Ecynsu6%b;xF`s+cb8DP=sg-%xtGZoa3moe|}#xMZT|PXX)VGl(B|h zL4!4T8q^czr}W%VyZ>n8tUGz07SX6%j^SX1HA73a2G)WBc5!$se9jW+ZR~j?mo5j? z#}z+APdxieAZ8rHsx{WpG4YuEcT-yvk3J z5qN~<fmsSkc|Xeu5-uu@_Is35o(t1d--N^7d*APZ`$TfbK^>L~ z`saBoQN-xLPkZ7dvUgLTWk#P6B@<;?)nixHRvu)7v$W_UzL^3%=iYL@OnrJO?Oglk7iHWziT%7MNgpse+`kyh0FAdIj^dbO3HB zDY$~dEYDRF@cd~xGrsQ~Iz5w)6A_U$e6E{l^67-q#18TzJ3y2RDwq)(GF(<#ggQbJ zvW~fOxRVF6t&lV4>l%MhVzuo!tnrqa#<2~iJZTI!sj7V+(YhCv*4b93XM7r*d-`{p zi_j#Y*7$V!FF+ks#674|xkEHKOTVPV)d+FE6EA<;pai_ED0;xqBjz!0{~CHunL@1> zE_Ilniw!rIY=3XM;~oierya^Thino`43bpT20Zj4%Uw7v4g@~`c54zjcBc4!=r!W~ zM|dXrR2YjbXInw|d869ENw;T%nugCa+EO0q{1Mw1;Zj~v@E}J=wS;UiVRIV|<{BY|txjCWYdF+;+A4RJ0a;D2j7Yx~ZDfGJ{hAIky%M;%zp( z`oDaAW&GYt6)3HK(tldG%0dqT1G1QpR2p$=a*-6Q3mAF}R2)1}>*{2x;h63TQFvZ( zY6xVb@Q1M9;d3vY1A{ocrA=&`SnbQkaia5fvA~Rr$cIl6?c;Ncv;Vnky4d=a22RNh z$2X_st#LcmDLkN1;X~$XiI{YG4ARuM7iwY}%g3ip z+HV@i=dghyw8|qHz<-GwcXRjL9beueJK6>J3m&$oyu{Q+M`zf`3@1ipodsuc9<^OZVdQ}-%jGk&tZX0T zVW8)`Ta`_t>$*-?PDi-?E{|%9U9oH1TY~n*IAthj`_OqAZgoD&>h%DiWi~#$HpxlA zc*$V|kh*1AOcqpaAg9_VKs(VDS&{|HlAQ%xyz@pC#c@vVH(mFT^{X3Dw&9m$uQXRo ziMUQ;KvQ{}&;M!f+@q4d;sCyxTeZ%K%GcUSt(`11AG7RX3Y=|tZ7aY8YCbR(5g#BTxXYtXXMgUG?Vs)+{P8>Y z!u{Rv_j|vOdk>$o6ZQK&?YTXdY=lXvi${@KxGc>DiSM^Unm33#o&pzMS{;vd3u^GX zrO;1l*}RqH$EeB6Pu2B`L(cqYZw=T<@d5|=Y_4kdmz{AONOl&q4`|eJdnN{(Pw)QC zTeXcJn@C>$B;NHAx(thZGd(PsR4Vw5{@Qj~8W;?#4$g@toAyB}F2q3oALYtpZU107Y%~_}kRdwc=UN>MlR5?bD>2eVcg|>uNDlSuwc{ zqbQQ2zpLL7Xh67u=8+R0mmIW7->7{2LeoqOU<7-Y;IH*ae8kOmD||C`bqsDHjY5ykU*Eu$#%jb##h0Dc&w`pc{Ek%l)@C~$@Jtd8 zYzsRgx))9Sc|%8gx;PqD_|rP;ZQx&XK||j=9+D2!V#ma* zUi~9t-R8Wh>!oKRT%CZ(9L7Nj_h2nV{#;zl3a9dd+GFWubX36}$t-=}wVA-)^jchw zXFN~kabSb)1mJu(u{Ju^Ld~+STmxk7st)3IZs{Iu%Tzg&VSl=+qe2+IgkE?5(mPQ* zl5wfC^@IliVM0+dID(;bX^2cwY-+?^kwmGhkdda(@*+L5MZ=8Tou6qytRbjzwnRYQR zH1!FgJ`1>asKLFrPTcVzYR6_8rTQ_1LE|Po*o%$#$kI~Ar z*IX)#O0K04vt*9#ENNY_I~=PFwNZ1=%QPIzxR2GPA*N`eM_ll(>a7$1{-U0 zD(DBr^r@3Tjb$YQpc4fGzze5gWWAr@rzPMH1S7;6!}MXpE$^;W{^G{ zJ$#wfWnt1Y2R+}QtdVKvr%?M_%~o^%cxJM9O4RVY(84!BHGFXr*co($E*jlOsv2a4&@eU7K2h*E zAI*<%u-YbyIQul^Z9oy&%+1P^6P&a{8X>fWsCgMdc3073Mv>NX$Bq+fT&!|+yN#tO;{y?nkVqB2{I~KYGWXJ8mtAJY#Z`6HN4iy9R*JwS{kzn zhI)??n`h{>DbSeXvLG&RDV$$jF~+kKgg_%v6ZH9hxe+y*tjI9ZKn=rC<;Gwg?|95e z9|cb$EsWW$SX*vnnHoBQ^K=8h^uv_?<5fCevB(Pp=U ze=GUSf9ea=NLhX-QXR$3@32>#e$H42@+~#0hv}-BS)t6=!_4wFi2j|1m}*C6o%){# z^^?HWQ_~sa!{vcD0DR44D8N$QE3`#gyjP7gy~~Hsf3X7dI^rOzqVUj-3b#0B1j_&NQ-n!cZzg_bV_%3ojv2f-uJxE zbG@I=`SN&O49x7k@73#G>$mPPOjTJ13;h{792^{$oUEie9NZIeI5?yV)F;3vJHnTl zaB!F;))Eq`auO2MsxFRTYdZ@#IN7lHL=;U8IpXfkcmi>83`vmumQt)y&Lu51gDFOow>WJ{^c&RocVoA*}?&T&D>nZesrMK~?3$7c@#s~BD zry0EiLfmjYa}`KIn40i`ivFc9JC-6yi8I>h&*6}kK~M4#35kScmPsio5xzw=KRO&b zbXZwU4g9Kq(0epi`t)@H=0Y@4Zj7$*R zM{~|RSv`pXIrW+^osv>s5*Gj|i}K(Xa6MtC+^5qoUdE)tRWM}yT$NaapNUHA`vW=% z5q`nVjZq;?Sm8Y8>8<{dz-=we6cNugG*&Jfx%aal&-};6ea854D;u{2&txb&>x8B$ zDA;SjY4IY*5;=m@Mke`MF4HtNp4xcLnf~}~OA0gkN6IKFlTELm0*IJ!s%@s%ND?8g zVO)~iqv=_8gHPpWJG^+lB$AQv_Q`b=e;mEDq7N z^D{n#a!@5IJbp)Vc;oo3I8FcSgC4mUOiKIPmtwz#+*qZbhvV8#hTie%Z4uK%wQF*_ zc6EKw`=J-tqDkYsmMe`cJNMRkKD92E6N|hwrc4vDYvm+MrrOlW-CHWMhV7|&a7>rk zTpj5H-k5h6_WGJsboGAU2Mk3)oarncZPhwWu?yu`GD?QuA*<9#UWim}NVK|fAR<}B zrVB_2{FQ?KDvB-$RUMA_Ym85qey6<6)e$M$Nqa_Y9kpdsT4Htr#>uzG{yLo-9+cj= zSz);dw<9DM#?t7<6?QMwcRp=zqlEq_o9%x+F>8M67be;X_nm6g+yI5Fa41j;)$6f~ z7<0+sm0&s1!!$|DI-M|$+fzzB2iyiUPY|XTYcJO`-V`0`yVnBvipUEuQ2;!K7f z%1P#N3u}HhJL%+8*>scE3BK&MUy&7d_I$-Bv~_QkX=N~1TYpzBR=#uC&ApSz9bZYN z^@-Z3+3_Fs`pR{!mzJTI#h9SD^ve}6`O-($OmAD*eH zN%~t7YqU3?ZYS(XmfDsg5AvY&>8Q9HuYR<4Cd!D<8IKQgGsGi{V}u6Nq=E!-ynTRE zW`GRi=hGkNiXYiJ!ppge(Tjd1F9-Nx?RGu+5%UT!Z&h)gymS~&_?hME%oXiBLLaad@Rhx#mPxFP#rU$?!)yn}#Qa7ZF^t7^%O@l~m`_Jkk2|oRE26 zT`+4xp?k~6%~3F=C9);OKYB4wQIk&{TT@wsT}?E9zEn8>d-mI+r&(M&IqK`d^8AQq zBwPrjq>;RlKO<8jRq%P3yp)%fbpItw!g_HrY18ATS2YTkEM`ENY?AZcEN|3EE&{=@2rmw;Y?OUIh~XAZ>&8*9rX)B3rS z^!PZfSS^Uw=ij!r8n!j=Ip^+V$x#`DZ&RdGbZWpg26Of`wfkEh8v6-z)w6!(oiUkq}m3ZW?U<915ua+L+zA=jqM&%L?7I z@8CsqX+tUNR9fkRgJP{@Err9vf#3n_CG({Wr4J=}j0mNQh?4NQFpgKtS;g5?ABt0- z!~MPHk;Y#rr^lBsF03!LPNFVKj{LUrb`$^TtnzO;Zi+3nG6dq{lK)^|*8T>j7WyIR z^s%5-GL#Ky_oN$MyIcO2JLc3jiVW@O@A<1qAD@QDOj2T0ds`sN49iuB6NN~;o` zGDe2Bz`k6tR%g&hj8A7hGoNnhmZZF;O2Qh5?aA4~9il$PB;jdLoQh5|)$r5^Ik?Ps z)Uh1z95-EcA*qWicBBVqZnuo{D<7tq@@H9f4JJu*Zw@u_DEMi272{W~TULUpN^I1!AH9U?aBFKWk}LD*^#vU)Mid! zRT9?u&+pd;2CN6PLS)kTK9z4Vsi~yDF|t?;72tG@9?(kd&zR#Ic3bT8Ryn;t2}p_= zwj6de{8nkQ9hCkd9mA7doQQ$V#;~}y&dGV{=_A8!f_g$O$9;2K#kZ>E{fcP|r4Pv; z6wrMGP96(#WlLps-E8aoPxe`k2%8A^S?skPjIOJ{YP_rOtjI22J7vBo>=%1;Z}4#1 zv$OVl-*#`x?u~*$zp<}t+HHehPI%6BPV;VFY1vZSylT_Re%A~cNBm5J{gUJi{p^Gx zrTSu>Ucl+>UIZ-=RQql)`+?8WFgp?l9s9a8Q1 zecFS*xpQ;Rfdh=zR}bpVGJYz(=^Vb-zKxesdqQvaRSlbs%^s7VRY_}(2bgq0qTh?6 zkl7B}dQNig$YVn!zDo=TDBYcJtStX5ks*(npyYkkuugKX>nx%!R_6bMraH5cv!(ph zYvg#6F)`PyRqw8*RxhvqB)Bh(m+1u)hDvm5pBV21trh93G?#{2caPm>ZfDEVj5Lp$ zdxN9;h|T+Mx-CYwc;8M&zFDXhsLfdDtvlUuSX@}~RXD&uAQn^g zQoT@JHT_M+7%<^J=b5o}ylw4EaJ^;3(Rlf5HMKkA7CmDm{fo$NfBpM`8$H)nR{V`RJ)6QM{yO**T;i|9?vEo(PEj4_XnMAa2fSbHAW9>mCmc;v$YSLNm9 z5qSA3JoW5>fm71Q@(b>j3Ttzg+yG@@GbNlP2Rt=Wx>`;9Teu|jr9Z2lUr<2yc3u7X z>-2NF3a)A^Y#~Rc=4(-maM_G-EvPcmA+^zw?`E)mEy90ec;j=3PllI%?5X>)AnTCf zYV-m5d%L}w@Ho~T&?=xg$?Cbn!4WY)f8gcR>5t&x;4`c>b=`E86a~#3?b%Ju9p758 zd)Yeycf-L6dkF%6+FQ7pQhV9kIk*aXiO|CC5Cr~)e#}8j4ZFq7R)khpNtIf{(ZzzA zmz{_GC9NnrH8r)ci#b?OT~hiVj|1;SXsz7boCG;IJUuxmY{7SvxvVL)SHZ>*($#LQ4xJ^sj$^`Lyt| z{x>BD*MEow2*?4w!okV@lH*@%1CI(rKNVE9_Oh_km9)0EaBu}^h;s7194+Ep8^UKMHlAym-0o?C$>&90DF*IOR8uB zzY(Cu0eh zg|DbaXbcwJPy2hU@Fpn`{v0uBE149)6WC%2xuOXoJ}HKGlLtw`A9~@}Vj^fnniet! z(miux>xiaHdS-ynL9{ZtEa{fxZWyP>rSRCs=CAT7u&|jbn&u|U@0QWT&AWCcFuXK1 zuDhAaF?@>IXzt&MgMdmM2=`ySEK5L4k;LD15C1D!ple@g2ZBC2h9*SQ z{5O;!xGjkP4UOeD@CY<56#9Z8{|zNTA=v+;kpHmu|7nGQ{LxcI{q)OP9~u^YcG=wB z+_pFZt`+<}g0<=XZTnbwNb7B5>-c`{Qt9nst1$)<>qr#;;#Y|J3j~<2Loyja)aF)E z{LNB;^Sfv-Ki*|LW>GyHh5D>U@w?PS@nHTtCLl#@s)mLo`*XFsOOLk!0o5tu_kSH} zEeZ}2+eFIzEF9{DI?Im_OOHj32Mr3{F;p>bF4rgPg(W4w>zr5b=B$1G!>>Te2pR8A z!i?S>OEuq}^nW5>@!hPcso`<`{7FKop*5J#R5U4PXxyotJde6ijHynWMe8a%_A4FXojd<_Y>>kgR6csR@Jd7!QZ42?_ht^Yq_7gKTh zXyxY(&f|*M)}rsBmRAU>*gr0h)B-ED_|-uzLLF-XX}wNq9sPhode(ABfwDCaj{_yd>^|V#u>@VvORt#L!UaptFVD5Fs_R??FN^H#c52-3AAtB$_)xAc-e44u zqZl2atoAAo;0hk8G!X7`R0l4J8Mb%4qXSWQ@=M6cKsmUB$|}|!1%zW@EhyitR=RZ0 z$pCXeKO4t}NnprgU*a%tw*G;T?S3nzs_3i8I^}(T@(goJSK4}$$B=$r4)OjbhI{d~ zb$nD+#wrO^Jxp69xD%Wf=pT&f0Fzr~`1RjR`@x?b@7r`w0T7B$7DOg_Zd} z3U<`YDN%v<3?XW;!K)lzoTl%aOrUqBxz zKA1u26hi4}O&1Wr=%_&HY`2ZtLFsTn=~&QjqadILBbS1y*LrSv8xHT!EQ9EyroSBS zrkr2SD&wP;n>u|2%(9jW=tqE`o(C1SQYdt#qva7EU?r31s7G-81ky>Ov@hL|O7*Gf zuY?xLw`yJ3`v^TaM!0`p=DYME5k8g>-0f98{J8w#f2P*ss_K8b!=23S;kEY+f~!KW z42@I)+BQG8XiTI*Sf1#?0Jbl0PDP%l0Lh~=I2@-3iZ?zXfgDIa!z|`}q8v>oKHOvI zxY-9YztMw(1wE3Rw2eW+2ZQd1=AA))~D|r$g zFHt$kvVyw}zyqHzl$|+G@c;^S@_^qNGk6t3^CxbP0+hIb9nUi;@fav^QU#x&Kw~8F zycpZzi=~~M%f`=OU8Jta$rHWx!c_m-aFL7NBg|k;vBHgPmwAx8}royOP;x_mRdeY|RQ+j`qU z_p(V<194T$Ix_Fs=Z-aS(PpRVzT>_8hjKWntqv!pd((J%>2%(%R`+KqCkZ-Vw#6Qg zZkgE*ij-Eu*$YoE9c`yB%zO^GHzSj_!Sh8*DH~s%sn$6UCS%N^gX*BtXzcz4f)`s&g^0aD?Tm? zH&>rHls%=}?5Grf7+1*CG$6pjJu?t48#}xQk!`#oYxG4Hm)=>|o7$E^QO;xKe`k7m z>RyO#keHf#S(je2n8P#}9Pto-7-u?OEy5-Kl>tUzIT>*o_(+Rth=%HUhy}6SybMh-MkgJRTnQpGNq$P_uNw0 zcafHtqY^=+oK}Tuk|L%ljpvrhD6<>lJ1-LFgbwxf1|YWem~s)I!ogFa;i4Xonv4+w z@2IJey#o8Y)v^XruT-F?M++yRBlZ#mj(AvQkRjG+Nbm+F6DKNK7y~WCRq=^D4TRrpq3L)KRUM!uwR?3 zuX%NtoDwZeJ25^8?7yF5J{#P)UF}VS#9nPz;do4mW$heKa_Jdc&7GCp$j#Q51TUId z7_RdJ4(Y^zR2S3ov~L2ob1V}BG3!q%cLRO5Rsh7Tx1bXb8GHtsSF=He$nNcp)_!xj z9x?dwqeSai_TT|l@8CeFA$UWA_34-n=kKAn7^kA{z zB$0k{GjK2uBRE)g9N+YwofTh)7 zdsp4HK9xLw6sG0!$5X9sKwppKR6%X>>l-&a!}u8u^I&mHm2H!sWz|PtZMCCWwpMwy zwR0fOwO@0Z9kfhP9Nm(C@Lwq%EdEd5| z7l(SLYrhQBMh;XP>SGh{VH+|ER2w8xH_#GjtsJTiVJ{vEz`o>qt=gB(hwtDY2a*YW zzIW7%{c2CvN?!NbT)Mi`VD!REGhHFAda2CuwZewN!kYuX+ILO^O!|D&E=slAA}dD+xrQZPE<1Ub*d> zfC@~#Oa+J!%h^!zbD-kGviTBPl_U4&v9v_LtckyO}Dn$duAscrBw%~a?m%%#cp(if6oA}Ul?FUWQj*3{Y zbp3z_r0b0GY$j;BHiD+>#Glexct>d<%hho(;=!W-EwA5zm6kH6g8X1|?%3PSfhZ?% z8R+BYlLf|-si!LAgWyHSdj8XcTCH9*A7zTEcK)UDbcu{DES9U-RMzW(wIuM*3+wVz zBM2^c1RYmOM?CMZ$QUz5dl%K$I|6?4X=xNUKW~lmS1Zc~9wmmT!<(;o5NOidlVnMa zli<3*I&c!4?`N)TQJ{~0-dvW}Mt&cGeWxWW$ijYT4e?Hr+C0#NUIq>liS9&|rlyQ8 z0WBns>fs=`88|N&pzmA^15xS>sAy(G+eYwE(*%njtM>LG&Dox8zVQ)|*lfH#k)n&s zrP1+}X2hpq--2{-X$0!ui zXXPVr%b$D$K8#6?`U0?l{dwff4TbuG zGPF7$|0%JGOA>^zIWgm-dz%uy-K%nwE?~OCYWzUgeAVVjOI4;#o!xAmhwbk%y61#< zk9MzBSnMrn@k^UU#6M-dn3A9DYwKD=Ro|JVM79_yX7Cy3Dx*mP*&Ci~A?C(?A|(=6 z<;V3;%|j-d&mgf2;GZ`;(;??W2VUnie014cUk|+2_Olu4!7BAqo>CV9&IxM|XNefd zH|;0>kqb#zFte)yX2*Q14lP9j0}r7{jsM4OYN&K`P_tiLjR+!zRJDCLMfdlRXA%;u zdTi?k%e~m_+HfYDlU~qa!hLIWp;I<4K2;p5C1#k3HEy5sshiA>!fW%5(P_R>@iWJ# z-pF|Dj?%KjhsM8a({K2T{!AazHec?b$H!D3R=cRKZmdWyszAqzjg77Z>saG}lq6wY zwatPcz&zrssHN5FF(mH9=1pkreMl^*{#bb6+g)AIurKB3fk3nQ8((;{lgztBI;si* zb+ft^oJM)qnItI%q*;-e=j++H+;rwqXh_1FeF;%H<$}9|;4|Mehp;53nkT6?%8Ru> zH^`K?t9zSxlryLb<#ud!fDL!vsZ0Cyl~XotN}aJ;5c>h>V|_#81F2RF)j^-DwoLM( zn(D>r`rxoea(wtbV}*d_ zn+gfB3ZbR&@-JsbtVyC-Nn&T3J)2LiJs*>@EazgNwDs4wp!>PW%}>`^#ar!>)$g-4_7fr~^DR<>4;wb|MrOMR(7+vU;jOd`rjx7g7o*)Y+79im-BQ_ZLR8#(es6D| z5^a}Qe5SRmS0v zTlw+VL{1j)4`6<|EG~{-s$^RFE?|~T=lGD~;r)g1YEjtl$BBasr6?5h(@_Tkilsow z5D*Ct;hG&pO}``)djZ7-yxH3j4bpL_2W5bURHOv!X7b6DVocSI_BT&Y`;m$18x5n^ z5i^XcW8@fLrX$XLG7sY?iv~K2LnOmQ0_F=GMXsIybOy#qr;uXD%z$5+v*UgrcPv=` zGznk(Jh@%qw4;;r*})evBCj^ttXxCM+zGWffW{tU5w>2xd9{ z%b8*sNVaZZnd;JN@-tOWb*%Q4`jVK`s#{ZwbWSw!?II+$=iyoTdfuN8$x6LNlujHR zL~{{z2^S{_*rU(V^&axmy{MZYjkRxhw8R3i`Tge2Znhj6hmy*d;+ifM`u<3#7H&BX*lBqU8>$0^JAnvdE-c}LA2VfvQP8aj;&Iu=q zS6sfkse4mpIw&3=Rn5m5V}zAvHQ6)E=c~@iM=zS(0R)|-XF8>eA%$0zG{;pd?=g(GWlza`JZ@VV*jCqNi634z$u{a}7c|h; z`+X7-A7I?Wpuo47uathvkQ_Bd#ZMN~x|VNJ^YMO&mGmI zyK32USk=F{S9{>NpXNPY6OFlL zXjWDz@ilwl=7gMk>Xl?W$8eHThofqFi+ZB>sF=-wuF~_gZ)4@rFQ|2Lxtom(npe&I zuGhVLk>t=L6yG3pxtaUq8bM;aHZ#Wl1ft2Gr)zD7eZDy<0}rr&eI&krPg*8-j5RU7 zZL)RtqB`Jh-^<$q*`?>gGWlKuZ0Jag)|z8>ac=VTSWx$*fV$_Zd;!coAE53z?3|+m zb}_Zj)jFjNwa> z=I}0EM4X)Z9YBJH256IGNx*_(&<%Ki)F_2VzYADqnhz&O@|q>J(G);Ak( z&q*QU1*z8ZRD;X=y0NJW>CeajI5!{YNG05sw_z1tn+4F4*0b_)!9+Kg2WluqIdyEP z7*H~SZK_X~MSY$}@%h1^8|2Ol2WOM0X{QC)$=TOy!XDMg=)g3c1$N2U(TL!vZPktaF>Iyu2Rx!c9hYicF z07rhJZEiSF{;9K|4&Ntd3X=_y5KzuPpN1(11o|VI?D!85dmGrq<(9&~!0y$<1&|wz zd;*xW!mPCH3td^P(+wB4@_XpYALafc`p`3W4$I)Rzl*|T4ZOAb=KwC70|+5M7Ij$I zn7;;Gl=YiBbQAmQqCmA;7jtosJN_D`L`*>9UTQ`um_uV40Cz)DJ|RMB{==pRS=axV z%Eh(--h5Uf`!}MH0b^DK%76Ojy1=jzXnJQaB@|I$%Hw(tu<`yY0W`>{Uphep)!D?o50b%Df zI;7GX(DQ87Y^)8>eAN$G1CM1MDfzIyf|>&ekD&@oW4Er8PpS0$_m+OTXSxe$cx!shFn%vo>whyML&5>zCbFf&T;3ITu4=? z^NWr`hnz}0FM7vBrq=t#eH41P%H%{FR`l+>x*LSF5+$2m^jf;?xbW-3=W^II!40z$ zKiog->nqh|N;0z=X67n!m)iWGnV!i_@KdtUZ&pJ2Ip}$hv@ucWAQiQt{pDh2sI*4A z`Z8G4szKYpD6`_v+CyXb2DDiV42(f?*%h6Y`Qe5PO)hPTK*+xnD0YLPzEqG@pTJ#_ z(%T}BZPnm1)$ZgBZ9OWEzEc_Rk5y+K#IuzxuQ6hz9{v0ToBd6%X@85p?B%w$yw_Kn zC1bJm0yU!$U0kcrR^lpy)u^*`N$IMniRAK&A640SEuwD(FMnJAX|kl))VyvOsvT$* zG$XasS%{oFw+pS5D-dIwoMWo7kuK1Y<;$k9pgU77E)LudXe@dx=wC;Nu}+2LvLiZ+ z^9@!Of!d~^tcx_cVFQBn_(553bTYsZ`=QWCYe(naO{`rivw@sDK zS&aMJ(L{V3*ynuOOgW^wO4&ojfoQ=4ypY)YQT5Fx5AoZCFSCVP6LF^a)#DzFE+k$` zn{$Z<$K{yreAbG5*ZzS7xW%VKDE`E%kzPcN( zdgWyAa?NN`(S@X#?rMk@*(k-qew%*qEa3eNSto0{Tjm=>rf6#&iK6s~`Zs!D9kRz9 z>ecX3tZIlCYM!DF-V|l<3@CyVfm{tgzB=Qf>QA;beV$by`Rnu0pf_Wo=^gdZX$i5K)~ky^ia)j_zc zq3Zrqy1yQzQxcs%lYR2V*C%*lRyE7IfA3U}Z)YG!kg$7h!Sivo_Z4hsJt_eyFUZ_# zC;dHEb0q~FvN4v9^M^*bH*>58j#D)8;f&F<-R~Eyeq5Y%***nHpI*|a$Z#qQ@^On$ z0zcms;^i7^MRIn+=u+d;{3VcMnkp zgDXn}8s~6wku4@%lZ5Zjh>XK+%9RafX>L38bP6@v{aAQ>7HcHkA#8% z#_w-*-AeixRVEFW(nf|w5s7m!%Hiv~lC7Q8+Q;(-drxQU?Gn>@ie<9AQjJ)gTd z*U1m4E6a%y4;56deid94%PBpu63Rv(OkDidmiAeT@8Kq!buw&ZTZOQRWXNnR=21C& zFmt@y{iqFPXGes?kXUtpOcIXz(_!|56YKn8#HXAb^j7;Fu6yXLem1$)r z=4q)O65DW_9fz73zc{N!&V5+Pr7%;{gO87H9+Hp0vcGwDw^uwdm#N3Hq#?7{cM=-# zO-mzuAa7Son6E){@)NJE+Y)ELg#P(B;q1$WpB!op`&(ZqGalsM8h`qW?prj2m4$G* zK9+~^Z*=HYw?3v{r>9NkHE-P7w0Jh;j*uw5T$)Sy>M<|MfOGErN^dCGq~R;Ky^4|`rlQH>(jPEf?j(1u?QJ!5>I#q6)qXLv zuxNOD*UPi}z9{*|mo!7I&0;?5e5KgPJip*p_3NUYwSae^CR^JiVg}bwN{_W24uK}~ z+pN;k?5t3hnMuMjS1j`jHl@}85knhZv(d@P7ZL>5hdud!#=fd0aaLE)?K=IqZthzn zhZc>U$Q2$y3uw443QNOcP?*)#U>gd8#quL01q2G^(arg1-ePz1)hpAK7lJ?WX$o8h z$I{_)>31798_Q_(?Z~`{V4i^7{4OLvOwPeA9p_DXJxPfV);PQchB=|?RV;Tt$GWHE z%n>L=Lj@(ywFfi!b6O%=Eh}`@zV~#L{jZY(`-|Q6pJCMPEo$dAD&On#x0rlDA2 z^6-1PkLS;~N)#Dhqf|T7C7)PIjzZ%{F6Ii$F29!FRS&upi;A7CRz2i2Yw7#mODiq< zDnnM5z6SQc^7H@3nBMvb>M`kNoDDCP5ISGph*^cFDzd*=0_NFS#`a$+aK@&~u=rY= zi#59ql@#2@gE}XI*Y26s*CW&TZ`}u8-nx@VzDv!*-}KD4_4@!8O(EHoublCYu&+E# zzhKmwZ=ufVx0Mmo%(R{gvLEFt9vl<$92n^g{m$!M(^swMqhtGiL-|cYMYRJw5LEYN8(){jy*}z(#GmD<<+%=;xuy3`DqAxzIAzLP z$AsD+q)B~xIok8LEm$^&&eWiXFo5=A?E?r*wLFw^PdizE5g|MH<8CF#$GOE`fLVr` z-d%Jvo|eMVsASA*nbzYsl5nA7+bR~zvBeYd*$m^N-oxNx^_%O;y z%aC0#Wg11C1GOZDuVUNUdoRw2fsoBPL$dU44x_Hu0RRpV6SZcPUNj7jZj@=psKG*|T8-V< zR#KQZ!9`qLG@Y^dwhID{A$X=RWv^eGfzUyy+^cNp@aygoj`4nf?s#^_l`1VN=Q3Pe z$<5l&2Lu`so98TJTuiPmoX6Y|=b31#@d6>d*$ISnJg#qq)iO}3%Q8kLuP;n`OinNL zD2RbN0YbwOJ9E25GmHiUHv)&D0r)O(n-Us;y9i0|0x{h8csRQ3$xLEM^E?v+R3MyE z;G`S}_omb61J{9Kr@@JJTt4Z1i)NK}99r_Gr~3 z42l_FU9s}oIo7%JgHo(yeY?1Hk%IeBW%+=6ah%yM7N<8LvfN13t%f(ed2fT};qiw> zB=?j^mYp*ov5JvOW06GMMV3nOxykE8=w)aHyVHkfXW&~;NuTQ^K@lHI9+T|$4XQvH z%g^4Kt<=Zjk0*#U<@p~9g!~EeCsO}>>(i;qcaSbmO-Yp@Bh_tEOR)jx*Zq*O7vi&? zsaYeX0;X>hzjOWeUw@dL+@+a|{LExDS9GGbaoCs7HCXbJW0#^*v*UbVbT@RW=zB5! z$z@Sdv(|1No9g!|_509;LT9Cvt^O`j)ZQ~u20s*WpV^wit%L6GfuF>PZ4X1;3!ifa z^onoX{+=nMNFnM`w#JeEP)R>%#mOy$U6xT+@s!)0p1?@CSZHqSA%$QLg=F7SmXzLD`W&fgOvMl2h~fB2zCtBU2f5x zZK>_FTV8Qj=ZAX{_$x@N+&h$#hx4OSz+xUL!-bP4O~3}2RzX9SV+w zy~$NiU*6l+o|iS7hBz1#?cSwMO*A`(owlN^1O=5ObNcAp&2V!Yg$`S3*x`R^-%zRg zOb0`LI3S9PGQRP{0)KI!J9^-7qe_;XG0>w!gb8})5mS=}Rqestokk=m0~o6~Z#g0t zSW#@Xt+n^=Z@)j|PRU{>3UopdkGmL>{j%mIcTmrxNn3LHi5tWTJ6n{pCOZopDfxWS zg&9G}0zdu_I+wD3DVib?U zm!!e{1%)qCvrgUtulhWZeYrUK(#{!UE2q%czTV4WdpGCv9VVsJZgqulk1Bs%FK^-O zH~SFqBt=YrIsRrGNa|C11z8Jh;E<4_2a|}9sB}^>fz4{1YDYP}yUP2vX8L#`+~rig zr;CZ^8FZ*CsU_uVmh8WOU51uV;q&xcM%5$?bM>1Ua`hYLT&`kjS`F!m<##y|^v$D4izgQkTbilS{4dX-(Q z-R5B9PJeBYCRy7}Axjb6DL0xL-z(lQ(kDZMV}|{>zqqAw$T>1Ym)`Qt_;;Q%6tbl3 zXK{m82vOAziFbtE`I7Ujn&i8EhCNVQt}zy_#L_aKIQ^^? zshJeI=>CC%rg-#y2hzFtykF_twiL^Vc|Vny8HySr0Y%=Hy+Tv)mD@JBSq zk1c+Kc7(pjuEH&4?+2-<-m|zYV+OPG`O57%?J?ll2Xoi07=T|CBxNcOQgCv%xW#kh zni&1`1o~)6TWMJrYWiuL3!0=FK_fdai8G4b&E)mkKY35QmoYUBWY}A*m_mLWJlq zu1RtNC^h6x2l#IgfVs>Ly7>uwX_0r9gTs$W+=?5mZ|fS2`4xY#k>y*>5-#c|8)EO~ z&i^!*@0;!AS)`LS-K?HYZ#!QfJ84id*hZ@R3#Ai*_qj z&eu3?wO_x|T7tyR{8kuzYEXmqrzE5vfhG!^RPf7>m77q|l#jVA%3jj}Cpgt#0Xe2h zKgXtCFUWSEppxU`IjxvK!#fiM%7w%2uJ|yED)LHEgVmKfu!|7b?yJ8q2itnS6Nrj@ zeeQNkt8YDWaGO8!x365zV2gcfA&Z07at#{e)p~lpnS$u_UCsB3fGy16>{*^Biw{Y9 zKiDRpO(|Tj@d+YgAz}qTuNxi^O-j_F`ZR;{{!KrtglK1^#yA1U+khRhG!9Fq9e8CIf|ec)r5$sva50fM{D9@2!Jf z_+jJ9zFNN463aMFA+si*Xw7z2{K)a2=0oD$Xb?#KsGa#o+0ynCaiEP+tDd2Cw zuQXIooL8alG(#(O(mQxKBi3}vu0=*8-_+peS|^nG@e@EHR+C?}_$1=FtY~bo6{P zmf!tFXyoD5*jx}&^r?0ARMM73B~DM)q$qXtu`G6Q9lxjNnmbX-iAK-B9w}+YjD`tc zc0iwk)l>7{l&mPy=4SE@Ko zvI-$v=KveWm+i?G+VmYQiE==E0WB5bf&&}Y20QPs&1{hDD?{1+TaSE)#fqzttrso| z5ym=~(br**xzbOu`2zZ8>!1@FOmE1*k_?WwIvfnRe#Z)Ik=^eVrl4EoJKUZPL<8tt z`jv+w3QpRDYlbeFi;xz=Qc50<_9BJIw%73i_VZV#0>)RDX_HCgHxtHze~LY{9mmwC z`j2NmJF1=APZfC$VBL5eV=q{g;u&TZX> zZzmPWHd((-0M&0)RHZ;>Wk%ttZfJCsf3abA!}>MORp?S-84jyQvsH8g;JibV<~QSQ zh&1=ZsM|ugu@2OoJJ$J3`9l|c)irzL(UzV*w57_&TO0fpD91w_o)-d1m09oLx+`=na+4R3u()BLXozw`*3{!0dA^x!&iM ziY8(517pU9N-RKYY(JXo^+fz>$sXrzbX9G2frats^abyi&g~uq(=M9(EPeKtPeb1i zW;_pr)h>`9Ail#ayuYK)Hb>|N$oKsWIy>y)hOk`1c^b9jQ|!2WZt{WxfJAg#!Pl3by zijS>!Y}((G*OBwKJT)wR+f2IW;AT@Zt?B#cl5A0Iiq#c7)KQ&TKHEzFr*oG^T-<^l z_9L28kzrqW4PF(5Qdv!~vp`sSV!3eR%FD}{FCHk+)|y>)V-Bx7kJTUe&xfssuC|H^ z4^u}g-w!V7%pkV%9f3ZQ178ET;eiA~q4NvT2N%m=uXu7%VsGoE1{D^fVvnoC`%{KN zHo5qI_m(^*3n|aJlQ~Pbx-lQWJ)5x~DMX!RNHy=Qf-omtObZZc43)r+G00)fB1Eko znpg^bBK!ii!-dX=cu&iwPpPv_Ec5g)?SBXT4r|EPzrP;Sj`!Lq&mf0_S>(`ZuY|^O z-+~N|lCjTUB$or)>pxTRfi(?jpf1Yg0r1lBB;PL1#=XZwjBI@2q(TV(3HX@pkm5LbYE@cka%o-BMD#8qi0Blu{0^luAeA}LsZWh}wKRx^bMR3)Z(F{K2r+hD z?&VL6p0Y8kR1V4yCCUzx9XJ3q2o+~}Bdb8}H0@JUQ z*_kS}&oytjbre-MfN2=ku)f^QwdP!*@uW&|b|M+-C^6XMm-gIV_-O7>x9~1zGWB58 zF?E!6ESoHKjLU;t&p@4=jptb>UM0_OzvG+&19wJb@pRxA4U6t_`ftUTpIA|KZk2~m3orc=2UGVX<2&St(R%TzZr|C%6ObqYmOcki6F zKo)lv8i{JV~yK4z$YBS)ZhH^AE?8F476c9BM&J)|* zP_#w@A;~xJR?{}OwRp3*C8}O4V~RuDS^a1^6}!~is51J)+ZT?bQ=yb$rPqgE$D-4u zGjjDqFV0?vD1v5_|{Om9j&?Ty$=3iS%Hv`Ui*EmdshDx}{4 zC{;7;dqUPt^p+wAdN{}C8{al#lRi|;B!76yzC%Re_)apXCh2+m(jgywFt%%X+nrcV zZ3rFi+dk(3FlX;T?pa2P(stURDo0`SG4cQ6?k&8kioX3(K_o>|LZp%I?vn2A?oR0v z1f;uDy1N^sTe@4iyWzJF_`UbO`y2250dI`$9&*l(x#pU+=K9QelA1|so8v^8J>ux{ zB{5jz$)mMYl=J3~wT$K1y?lNSy-y#WexJTm(_XJWRljvljAP0kettw zqJMjayW0)bx(+=ExSLq*-~-mx_lO zopTQMg;A*Owwrh@9$T$*aj3Ig_7+ThBdrK#c&w7C+A9n9d*3}HqSmoB@l+$n-(4<7 zkoD|4)!@KJ1 zQA<$j2bmZY z*#O{lv$GP(Fx*6HC^n!YBoaY$SBV&j?|tiy@>z`~eR~Hme?g}wa+mfUfYB>q{dV() z@XF&rdt`np`$ITGk~|!?E%|5Vn^y);b?rV$uWM&sw5QTA1&hZAlfBe6V14L%2kT2} zIvQ#+Hkh}V3FCz|-Z4GlN@&5d2*F3KMsqT3tcTp05IbsfGkCX_?{GvkIPWcmNiBrR{up03arm0~`#3WuwW%#=8 zBKNttP}RU_o+yr}ibNa}nl6x@fmv?h+}vT5qrU^wjRU!Nt7)uS$*@+G8WiF+9cNu= zU0o{*q+1ei{QbEACGhw`Q1RHJB=Q~KQn^unYRYq0r<9j2ej+T-5-7vs% z1r``pb;Ve!lDffUpbURfT|nbtQu1;=?+uh}B{Uu$SD66*DdpO3X`iulJ$-3&7&*wR zs4^;wQ!By|9N}OQI(9!-lyu!)S!eqU)fs$|d>PENJ%aUj@y&8}T-tf*a4%CKf$vDOTFzW8 z-@2d1*k4?wCo4=haJPy&jT8Uv@Gy!#cd7VX!)|L@WZ7Tu%-7=;ZKYk#Zu@&9zw(NS z$wDm?+38|98#`Z8+BkT+ETO>iu}j-*cwE(iiGedNv+|P(vpY-22lL-Ta?g^8ncdYc zTYHa6kiEz4>s0dYC7ku zvwv^2z5Ow4J=JdgV#Vutw~n)xm`+~y<==ok1D!!mM^(mAfG_cA-c??{L5EF~yB8+8 z+?=yF0!u_9e=x6WbcIteyF#ruKO+hibIowSyx}))lanq}ecDL^pC~2x81`*AWam-r zus3YifHs>yI@jhe&kjcpio)LfGr_mJn8wD@WILh!SqMs@hQWpqYJbImwp#QWiCqa!jSldd9$d%J2}^O=5m{E1TjccY$J>!%xxx)07Dwd2_lkw&e3 z-f?w2=lpqBH9N=TN8U_57AEj%CX#Od;6{anqfIV<$2GL^B-Y0(w!oc~>D;SQoR7(m z96nrfrlyGlVoQSp@Rb!tiFsF7jt=jBz$Rj-IWL5b*rev<7$xT0#nxY)Vi;IP9%Q6Z z%NyqvR0;cacf-DG8oHH@WFM4hNi3vq-WE|;H|{F^b78Jv8%RefIiE~q5;wF5(~AHn zT#%j3O7=^)hQ(yw{7Ky430*;1TGxPcU~urx@>u6w_|MG?%(5LnqU7F0_zM79e!*0b zfYMI%5#K;x_9+9fNju}euIyoZ2-^PIwrMjf?rxO>Z)fr>QarMb+GCEBxtNb66XW1s zk}oeOAnnb~ex4fxs+Gt4U;Cs0(z=0O0^Q*xPugr+Sjo)_6!TS-Tw15Hv`M!a#&w&8 zraS9urkb@Sn^_h))Bm$LAkyf8y5nzg8`ZfxlN1ow-C|J;7GUA`?+BoMPaBzCWKbk64XW>2H%XP>&Ty(OYS0|@K(=F~ zl~KqRoOqkWaO_6jU{$~I3HQ}hgBVu|>Q|sVl9crF(U~?-dG!>I&jtGGObx)>a$>Z? zp=X6Q`?m|@grG^jW*>pQSD*vI1tO+N<15@23Gly|y4i>zZTBAhh;i_C(d*v&`OvP2 z7#IAj)+*0a?=$OPc%V}fXnydt-$AB^9h4<}>0HFy0|9ye2G|?d z|H{Yr6(|MkL;U=$@da7Gisjw0EPM~?6ZXoC2!G%{#t0FR+sBLG0w%iBSiJxBnV>74 zfa;R@HhuBYm%-74pvV6aJ=!s#;BSAeCc=6ys zz;m!zf){w&%eC$_?H<*~KNCK@%&Y;ZV(mZTr?U!z(l3U5{%=Bn?h?aJudngG0Ol*( zT2Ku1PH#$30mM6npnrS?UUt#~Oh_xP9{Y=iMDT$)+m%iFaqoK|A}jF#SwfQ`d!hg3&45-c3g7=L1pLkm36Noc7@het8c3juX|a9y zwXq1mI1uI6WA323ec<6DAgQ=h%6=iT&j(ObRo)ztSDt~cSb?*_J-o-y{qZtjOrXFc zicccw1^A9p4_y70g%D_-@n1v(Ove8I3zH+%f$(NmXM>=@DvzkUpKyLwCz57SUw z4aG@4reWGYWLIg&-krDyuNP-H4rAChWoDL|vn`kLF^!H{_wP3`=b!Zh*1-iI1R8b0 z7b1Kafqx}n8ZtQVF0cUs?gRUO;9#l$ZyYS2$_oxw%%1q`hmeJjroaCgb<~1lUSM40 zWbI>f^|H}d-#C&P9+W&hbZpz6$vMC2g$qr4A`T`Wo;os*okwrnlQ1Rm_UQq|+6oP> z^pkT2;P`Os!)}LNE>vU=@A#AAOxAr;PZ{IwW$y1_EK{|UVwh6zqUkp~V2s)!RJRGNbpZ7C;qaQs+TJ$*r3z9t-p+8UE>PxCD~ z{u2ijgT(XzNCE0>d9O_02R6H_!H)+vLm?t*Nb4u1?wZ@`TMKbh1Gqo_#vwzCGOxV{ z|0<1_2b9O)@Nm6~6sXkCg;|FY9c1#7LGpzJ-Ct4`4`eEhMY3Ui6G9;_v?eCV+o&Dl z0ee}yHn0i9sy&;B1f6)^NPU>R;$@g2#Wa+fZ+P{wCXKaNJemBn%S6FSB)&8^>-{G1 z0Pc&6i!L{Mvlx405&&2F35XWjf4)FMziKzWLPGyn>J}gZ$cG!d3H1pw5dQ7&3W?au zG1FqlKklI^f@c=j=dy_F38GdcK3u+vDI^KAQNTp-^{ss<6Ll{KaJ!S z`R$W61pP`ZX5agFDDPG2^fEJpITNpxri+?#dgzjgQtuchCMeW{sgiShDNK4 z22_GZ;L_WYtNjfss@e_qx1SjJ?OeW@V1X-(ftXjOkoQ^$2e??k#@Z#?7`$wF_l5i~ zFl%nX8oIWZvO;zx$J<6w{CqZl-wCuhCyt}mO=t-w-KgWX)jqnqsC~Ke%wT3f^J2Y<<@Zw8*~7J(r<;!X zD6^{)PKE_E`y3q+Yr#&cIpb0d2B-46fl_12>5Fk~3F;MMK?;ZB|Lu@?s+nzdSZRrQ zcE;e~dLb3gE^+4ljz7d}Ul*J6n;5on$?zQ9N9d55N!9E8p(5Nh<_0f{G^h_nn8|IiLYhu3#26DMs(~?V zwy3a$EyE8U7RL(G2{aEhH^Jfxa%zQVXLhk6VvlBxBp8e?zY}34G&ZzlY+NFa%Js zrX8L|(`-f)Cmw;4ox{7|_Ui2Nt~m@^uc^#TO%>h#BstKD8Gig&m>`=`$xZpyXwj$C z7VaGfp`n9dPa8kQR(#&nd*e1>lT3?&|M%rj^~F~GK%>&y-0{i1P6mfhhOJUrLr(qo z$vSt7(}lIQQWKu%*t9EovRh4RpPoEp(XPjqBYZUZ5-DqsB`3>jxb9L5RVw*6j|iym zk0HGyxFLUtL%+xLE(S93n0)Ln)orvfpiDf_(7Fr=1b9Edg7#Wd!YuCnjyQDOu#U!# z6`6voGX`o%e*VAUV^eYv3q}BZte{iAlXMNNTloG{p(gv^vD}@4SATTc{+q3a>1dkE zO|PjiZ-B);+p)|`V9KfS2PyF?y?JU}4>)yG-PCTWeB1Oe&D;P5Y(gznNUKg*%yaBj znf0F^$JegY%pPKXPlj3|EM*qKTDVqcxaHe*m6{4}@>#^zbyJ3#m7eIKQ%zWC=6g3L zI)v`*lNIWO%4%x}6d8wgCEUVz28&#Gu9DuZmm)<}rzVfPfAq;KQY$`8!24dLIEy39 z)b_kZRr0()ZU+|pMvwflUA@DeOzswxpR~vRa;@Pd%#50}+`Bhil`Uc|d|q}VE4LY0 z#ZA6EiMI6c{P}5ya(X@JRO@4oQ)!WCrF4OwJr2QBMzqB<;fOR)R47#zUO`(TW|4SlE=kUi3gDUK$5rGU|r&p$V?2jaaGD(zTtI^fIir)RP)Oyr?-|il)uk#Vodhv>;){Xt+ z&uvBdEeq%J7Ey64Z9EE#sFX6fGHk0qQ9)7J;u#~@pXg3Ac5Y83(mf2-w7F$Z*XWf$ zV=B zi9jnZiz}L7?-XAvv1K4fjMJL!V4!nR6Q)1%l7l= z;yvicN-vvO=l!Lr$ENhAm z_Ubm954F>#7uCik;#=>W>s-LnP;CP>oUVb4t<{vGb6zOA35U&gU0tV`Ev^XA+O9GjDaoqR?S^|`^6CF%{3t#4T)&S9Y{R

aJ?ox;$tkYOAI1#e0R8)l}KqJ2$RW=%`q(D6OQtT$sl!1{hS7_ zA2dWSzO?7OjlHy;pt_di5lN0n-z*Y3cr>PoVlA_ykQ`@q6hJeBT52)Y8E$s(KGW7J z{SkT$2)wPB#A`JsNBj|xy^%wwt>eO#claa8i;hC6=j{G3U~g=bs{f{V)x!+U%2+tJ zSo1~rC}$uA>s$P_39$3DRzmu(*}PRij|%3a9Y_+Ou6m_>uvZ(#$d_wcINsnH=8N#;z4^;0b&qUX&>?>S$vd2p}E)%S>lj2}_ zc_GqoOC?G2NbovrM!sEd+4C-LE|k|9D1J{p=RRQ$V;;Ykxj=`8d1;SOE3#k06E~V% zpm+{0`#d^d)0Uwq?P;V5|BO>Kitwm%<@7sM5{t>S$zE+Nlgw#{XS7MtZza?*G4V8YdP_lz`B%3maV z`;1x5lPXYCn4uVULU$#( z(G{z@uHa(uoLK`{z+lm;*inG^C-P?Vr4>bG^T%&cE3rcX!hR8Fa3XZfhbaGo`peJJZ@ z9*xFXJ6uS62HFfE7Kyt_#<9-&*k7IVL19GJRz_{CQkp>`Zs=jD{5qL8AT;?agntY# z@p0Bq)X%A}_4!di8q5E0`GhH;2Y5~p^tW%e6JThGf0bdO6PJN`-8nTrN3Qh5e|)Xj z;kwG41$?L5^z~)YyxTAw?}GG6ej(bSBm`YgOfn{t;t1oN!a`hYre@2#yV@a%@2A&0 zCGgh^u#qtA#X(TmM#?;9%;HXv@{LJ#J6n+Z-B%(E3pyoxg5M1kXU1%ZaF=2w#hRdjNp6yK+ALVJptzC!Dzv3IMF1% z#$MKPfq5_O21BR{Sil_RObvs0PhO^#bQ?;b?{3uD{ z(D&o--YO}XGtaP?;I>SX9hWBF-t-XnH(ef?Wvi;V#;mGvTCb^ytp#dF&~`H($42}4 zg8riK5l3a9SSD+L1yN7ME*Yr%_hELKsM1L=Y#djZ51*;1bH(-28zvZ5tlJ9%l^1eB z-vg&yua9pAPiFl*-{Rv`u}2LY?8+^)LQ1-kE?0^~)s1QdH7nHRN#}XG-TmD#IKIm= zf|PVQD^5^CVN60p_>|b*v0z-y^bp5$wn5o@cRbS5f@>y7^ealkUfVe3Q4E43)8zmR z?3xJ$+SW48v)>}_=%Hd8L0i?rsQ$oa*oH1|cqOoMY{J5;t~UREJm_YHN*JpoUwRYG zV^#s!G^%=zS2A)`B!04DT{yhdw7-g$1~Rq6AZ+yg*iY_PsJsr4YtoxpeQnYj1ZQvr zHZo+C&s>Gsn579Vkye1f>}$+M^!&M4HAl5#DhzEZVeYeH#T#D^#HeZ~p-jqNIOoxv z3}n-m@D!SP<7C5-B+Wq#hnGx3hRM}}(O&ZK@?#|73GMg+UFCFbZ$MR=jV?_B`dy7E z&Bds>*DyO5hJ7IA?Pad&+2F_K0LGq2yA>p8y3K^mew+u=`2+4jI?=FV7Czr=eUERW zxi+Cc326~2mgzo(IchKtW^?VT5L-52?xUAfFyG$4_f2u_gs@+(V$YbHGIEd0RWsUy z^_y#L;Ijbcis^MPr*~C7@++YlX!}=~#`?Q( z?6fJbhHqsa5myAL$i!46rkdI8i}FJl;re7Y+?KXtc0Y4|1&d8n7#$~W*D4dQ>c4B^ z6wJ9in4A-6;l|i^%ijzXx(U|N1S{`rp^>?FoDwX!dk!DqS9I0<6lngA3MFcoLTgx` z8^dbkn@yV6HgPFDny~8o@ta7tRNj+-S$I~dhmm!H%PE}4F+9p-u5MP%ycqUuCc`0x zUI+Dcy{Nhbuc6;eyXx)z&EY}3y~Sn&qf#dAPp9$gK?t#{l0TB?>$3DMRy`K2=0nBf zu0v6}g0){d4?0MVu_QmBJnS=fwEabt%YCu}s$+ZnR-oS-dJh3nzMeT(0>yNMPKgT>M)^GKo zQZJ>G@dPc<{13b9I5hW0N8b1;;|a8A=bul`nIH*nD6&uAch{X8-UH~rezk?PFC(su zBSTuIHltc}iuFENX@?aKJrz!YTyJ!N_lX>Yu7BX34GO?v2f*>@52dH&P>{uTazJ1P ztDJ7I)i%qLc}#&gK4;S76wWl*lQ>$q@YFO&>E&SWeoH}tv02IDT~jukd(lrLl=a1r z{VE}6i8}y2d8e!>Wr18mW{9ncG>yz|HAR%6$+ZAxT_7IWK6mgaPX+|H7Fz0R5Q;)CfAq}nXiha!9%T$(5 zs&r23U@*feFw)lNreZbjYMA{#W@E4)Nf}LK@S2wzto9fc+8Sa@KfmQnpV^kUPTA%f zJx^d!5U!pqLF^!!`Ch^vdN?jtU|KP~5tQvJ#)5#@TWj{iqmiJS4p%r`SMm&D!*MXP zd}%(+xu=ecu6|;v9$Hn1FV4MSZd|WmE;FqpK!t!ib>H$st?~@Kp&Vy(hC(2(yj#$d zXsR-SA7XH7Y_F|4fhIxQPvH^mCd3ha_d8=lf%b%8 z$atV5^o<{)78DULIB+<{@DkvzvL|<8YNEe~p)+FoV7?{s)$=IJ#)vzhn$cd2AWK%K zbKRNeB<^8v*_4Lc`OD?_Xy~MP;|2gBoeVFu=ZHI5J>Hv^bZ)W|vy7l#thdEX6JOeS zI8wK;n!&zOE85`~5y-0-WXz9mh!;#~Vh$o8Nbrj&O4nH&P$~(0t`U;6X<--M^V#_w z?b-fJZPCQj`F5Y*w3>g!%Tz}dVN<0%J)b|I8m6d77a1vrO{Jb}w`b@aF3jAc>S{B5 zph4X%mJ_{DF^WW%CtW4eGscsWK+dE!zFgESt+{|D?Ublhn?w8tqMOsB?b)N5HM!~J zZs1WUG^W0kDkmKO4zC8SS*y%oKI)l$X(uK|y)+JT^7Ae@a(j7~z+3SvytiZiFwui}ce4&M{fOGa!swl9A9Ay)jB>Kh9Q zHhwUPwwa>(Jv1c@F8O-Hxo&mLH zn%^muyMM?LHtv*=<^`Io+}N^lhNndtGJ3;N#ej~;I+9pZLZZWt>U)E;4tjOgyeshM z&4+?4O&Rs!5F$F?kVO7^TFB;AKNQAd5rPQ+}frej#hg zWG_Ea-2H_}1p=?F1al>`o)r~4D;x{chuj(Cye2>)aXi7L7lraL8DlG|E|!{NNiEH;saY34OFFD-#DP?S1eoFg5y z>JtCBJR()iY~8I_!_M|WJTyYkv=I9=q%2MMiKrNkSm!jbox3V}Wl?PIs(Q6l^gL8E zG7wobf+2_lNftM>X@QaT~$9aNrZ|t5e1^>Izj{lOhRu zw@%u^<9Ge$!(<6V7qyqG(I5qSox&7aLg@!B&z8-}Pi_2^!0;H&71Egfj*!boN^kT^Z=0nq2On*f- zbqkvGWck-IwRaV6Y2TdcWy9f%c_6(L(!for*#?@w3w$Uz=zIrYKLT&9x*C^<3GI>r z5v)cQdGNR}`O@tY`6{AsQKy%;9s`c4S{Gq4f2O9J-!1>5z%g3T^-Pv|ov#z7}j zjdNhIL7j647zjVJp~2#+#nws=ukxjiPqYu6bhSm9lvL9?^6ts+@XXa+=>k9WBoIL0OQ{j@V}SB!c2DJQXXT)iIe3c8 zc?36|Gp}kmA2j}WDl!{EdJUtZB;1pCAjM_1#ul4;f*@54PW9B#*CN63n?}@Po-$~B zIzoOcQOoe{J@_@EOho!yBzLv5;QEC1Y3Up3ZO*?20-`YJDg68^?$oFf34uB`eC6gO z)5nFpj;_Sx6Y@lon(X5fa)0JXy9?2wqT%5S5D8}ZeoVHj6#WFzIA z=ez##crrhQoBE3D{PW77_eOl}u9QLo0gBLM#ofDw-);_`kNKGtKIIsoP z+WiN^PbuC0Z6gO=IXWCEvpzpW!NrKvJoeMakuM?>g5c4jW0n=H zmxS3p{K_0@RF8iGGTCGZFJ&ta_OndBIx!zcxl+!&RT4nr|1jAa81+87;&D!4THl5r z+6JEE%u&CJuJ!HZAj8QK)CvUl;MV0)XP~5d`7f@7Ad9`|n*ys0+uSAp8l4uN8jNh4 zW-=zFp-=d6s49`Z5jlg(Yd^-l`D?1UPwyuQ=6UCqtMVyED?;662#9|Bf=y*`*9Rab z8mmBbTE=j6B|b+S4LPk}IH226k>#y_$!707Or03p#*>cvZQmgPV++=F%qPtnlGO-%{)$c05ZZ( zrhv*fu?yP}9K)mTsGi-8)i8h?0aYGJwkk{I0!0bFh$<Ke1`VqR6?WMjJiH{J2{_u(#0?WG;9=q*Eq0rMRJ5s+M}W* zACdL;)0N^uWFyp>VT8SsWf8xpkb&$V2CX*$#C?}gcPj9!_n~FSk}TZB+WuCP6n46@ zM+Of6B(oInW6_V?k3qauU{eVt!hyb_D?Fry44fVO0Xb>iGSK)(LV*dY?nJDnRpq*) ze5xG9y|D{Z9pD#*-wln6Ji@Qs6ibyNJ1C)5!n=c@kvJqBWDyw@6QSTYKblOpcH{iw z-&;YwU?3o}eet(tOm0bw;=sfuK@%NtyE5{vX@J}-aNvOh{uZg-hULZkwx1x1%)U+O z2J_Mx#Uf242-8W9FVj!Y_P!%_?)v*z>GN?XrLW33O#@b){vA}~wz>t|9XWkXer)+n zT|Su$0?oc86uGZRm%y;kl5>MJu1-|QZRTMD4w5Mjt-vQ!Yczg~yW4Hi!1}SKn&$Mm zMi^f$#JSSjY?l-v~+^al8-^lvm zi+dp2CsozfX>~{E@w+(kulu`LST?~Oi<4KQhd3zs;l`qz$R1*m4wbjHDk8zN;#rCl zRM)6QCXB9YP{(I3G}a>xHyoG>c4WI`psMNe`|invKNVfyeC|vgjtVNu?{O^L57!oU z=y=n~mn}S{Yki!8<17$>4o|R7IU)Etc~bE-#G2!DRjRB=YOk@FIVq+e13q$GUp3QQ zq2jA1%Volt$KtDZc3CRvrQ{D7u9;O!rOMQ#g%zS?cNYx$ledt(WmzJ$*Bsi@@ngJ} zahAC;^o}g>0dUxsUM0I(XQ_bOxj+_~1tKHCuEc+C=R4nb{s3S%Z#KRJE{CC%n} z)_cEwvX%EDFT}hp&eUkkvW1oz+PX>hjdqvRgW}(oDHONY>WLc&&InExm$C%n&F>bl zdf5@uho(*14oSIYiQ06!$z{qoe$s^>pXy}QZbMGY6+s@5QGtLi zBE*r4d2%BYD{G9uUoCt_F~Ww;orzjLLxcV?fcTb)AIjNn5K@8L*80zUySkSjqRO6) zFMCz#H3Gr=Lq?dd^iR3yGKu#(JE)fXanQ1Y1OmJJlp5SiZSeM&{jN{`!tqbt`TK7g zz{93WqoLvLhd&%9EgngCZ=zae5zfXFB>7%O2VFgyN2cZm;iu6cta%T+f;m^v2%!eC zV@{CR+8IkHSEVh2UejRp16<4Zj!M{=$AyWq19 zckG3~?fhJ_mx$y!M9HS9$hsdc`KntL)T4!m(9&kd&7=%D}!sUu1vpaf~1AV_Yei0Rw<0&K{ z1tuc%7T|7oV782J{Fs|Q89Z^@5_H>_eu?+lL$iK%%-iDg`ToG@db99gi?^e=z7A7#>;ng~3M?ZZ@*!+~`e;XCfCc zPjB<2sg2vh>t6e@Fy+(OjrCQQbN*Cw`;T0#<(`^m-IEqiZrDRI5Z4p@0LAqa1pGt0 zt&IAEGKq2if>TpMR2a&dU`Bhl<32yiR@^=Z)5~YuG@_SoEjd?g`RYw~P_!V!BO_mD zE?}@Ty_$W&x!Rw6^w{n7_BRoXgJ}`M9`)Ec>$FTX{)QwcD%@e^n#Cnqj0z4Vq@)Cd|QIA zcUyT%yFT10b9)v!(&vuQS7e1NUZ!f@Lp(L8iC_AIp%h1O8+KLRad3h?0}+6^aDH+{)b_a^NO@vP`#rzjTR% zMw>V_NiLMHd*%<&Zl}%b4Ps3Qa9gOV(9cQ}rug$m)$Kzm>~KXX`{bdopUjLEWh2F4 z0Bzv(bke%We%6%+4SD6)utS-)Q)|_Rxw!~he1WQ43l?%aeq{|{Vi~ZU&LIsx?h5|V zPmy&*T!PPu+t<>p6M)0tc1=c7BR_BaDSWAtxKkxN)AKWKPcWfure+LF(0PSgmL7{z zmVS?Q&C$0JnHlC5F#VGFL|yUfM6|WgL|5Fd78M&7qAxDG2M6%b`qsm2`k-ux2swD5 z*Y|rc;o9l7+tI_UFBkn~WOtzgA2~Oja`*2i6(pkc3Pt5461(BEGU|=zRySP zRT{SuH7n*64b4esP=wW(QH9em7c6no_glwPhRbRSKkB$}`ueW=^624sL;iGZnjV$g zk!KS8#BP$v_jAFl9_pEvdAn3jhP?jvHd83#BLUT*G4KXOIoR$D~+9cE9- z1Er0@S(aRLlYrqaj~$A!+12W+NVf7Mnuny+kAFx%97~g->9(|Bf)NAB+`?q6mz z?hC4WV5c$WfXjc7_QZHDR`s#2dqR@-DiH+Q%dq2>%}s;ta=N@3JwA}}qp>&MAX%G8 zHB3nU2vgW#>wCzT+XH*C_i@{*mbk&IGU(p*_)k+Pm-_MY_BjRxT zh~JfKB*^%75gvKz7rNujCpGiJE;`TZr{Uh_BO_5wB?D;jE&aQzyOz9)8qS%mrsJ>=xZ2baQZwo%h!2&|}GPg7P zylw7d{8@d5jptrSGW6o8^WuU6i-Jh`3 z!(7Kxe{=VMCyPG*QC5T%R!x?`>_9$FH6!T$2(L+zJ`-BY%)+Uq$}>hQH$EPjm>5`% zs`%$bWPq{^?OfWzotXI@d7?679AYT-I`I^=O;^qyDMZW&~$)70Z zEczWYu2nxzH~M4anx8xLm3bnoRZ3jHHn$kQB~O>hk`MW@i07S6_-ne17d$ANWC_(2 z@zvcV;I-fH&{Yhj5WW1(>jNzVEs7}O_(}vVEx7x4ER4Dg)6ommuD7%C`h` zDq9JcexVP*cOm~L`tO;*mW2_Rbg!gehm-`o8&k5VzX7z6ZHFdm2gF&eS{?m#-2T#e zMo&(w@GVRA{JBSKIl*shYgLLdyhwQy)y8#U2*oQM+U{6T%N~Ns)(I;;USjTb(@3ln zXc!_Gu=FNb--vEBb6DHjCQP=#5-&^4AGrS}MP~=}@SWL8jJy5IhTW3y{a>;JYrD1KLGEr|V>9x&EjC$|i}&Nl*kzwLppZq>z|)iz6c2>* zFm}#wBUEL);XejPY>B7^n_~RqRTmL3PYD6DuPepx5buFOyhmO9m-<2hgu#g<|Jr^? z-NPH@DEDMc+Rg$<4!p<_aQ-Uv9YE*!$6C|=MDLqQUK2H)7o{8v!JZO++JUa=N`fNIAk;l=+OMgs;9dYpHK5Lkr#XVOp!}=u9D#NhoZMkdUPaOp zWN8-mN9SHe^!3j7A#VVo>j^dfmphaMDC^m3w4VksAc7H~ES^!E@9V4Yd_4;x0+faS z>dq{9<)Tvxuqfkbg^>UpwS%CJg0bB2mzXONML`Oy$A`J?k2sXK%0i~#z4n5X~qrM7xO!u_I!mOA8t z);G^Nf5M*&`WKeF!DjeB3^&O~z24H+DXD1q0NuKk(jQW;;KK!EFAYpF3* ziDemnN)gaR3Eb;l9zbfEIX6U!v$lfs++I)ix8EaVEw6f?DBGIc3WvK9I50|?IUsN= z)y7WVI&tI=Za~F>^k!=@SWCHqfcs`~xUZkQa;OavSQA8IhnM1W-7mr?MAT5W3d*Xn z$+|ToeSBvtPCYR9@H%gZJl@%j;bAKlwXePd&zplEFhbZJBYdy&^9@||@{Q9zXBykMaOykTjR0<6+fpS2FU3t6R!Pf!R8AMuI0;7>(AVU z9`JscNaJdOe@>zTRJ>~+p`xyb+}$g!v~B_e8;Oypr0e})78#mnvYTwtbG>XlzF%>? zEY*%soAxshekxh?L>(7vhU3^yEUAPQci)4fP;v$=Z^;Qln`(SRN5icc;nDVui1UQT z4+S6{-DB=7xcLK`*sT?l`Xuuz;!v4jhB6tm; zfS~m97ZYeIX}6$>rrs`=vlqE_t2TApOjA>;1?5gn^e)~Br)NXrqsX>xVGgB6dRM#EoV%{I*uonpJ^6geBhrl8jI9GY0Vs?pT@&vm zVIU#lcRESBN=>hMr}BOLBjCP9Nuov8&$spWK07X0;LF9L!1j!#bDhw*(PiSNI~MF4 zi)Y~HhsU+Z%93Z5&xDI<eZ%00N#e)2R%F&WW(A`@FEltYy$0EduwPr zx4(rArWjac7endL_+G3HjK%*}>gP#RM5{8A<{W{;DsbkLiOwtcr?ZNa;# zf9;<{&itNOEFWRHXr?;o!H z8>VkTwMQ}*#ShqLLJJRW-XUTG zyE$ymYs{JEpSY`;6m+gCb+UunvcxnRTCjFq^W4Lec_*2|n$Vd64Zt{rh}z?Jt?t}< z_-AZ60ZU2f3B&g41?GUS!Kihmj-96kBv-1+4c;Xw3FONoNjqg#gl6}sQ5RHz7YuxV z%T$&@G`LRMHtB0yv=B4bR+j@?lvb}jXZ*Yd^|^31@XJ;^M3KISN*RnB#ZT*F8;xkQ zJF4eJVvbXfM`SOqa~1nbPnS15D~lP7Zf?N=%F+qlMXaS*IX@$>@f)KTL(iHje+?o* z(Od+5U)#ARD&ga1^9j3|U?cC^>%kL?b3ke*=E4|3P}GZgAa`&V z(1G_6ymA15#^wWO=s)-E9}KvVHG*N=*Fjsryq|lkG4mzG)bgvk8;ez6UlP_4kGy>3 zV**O}Xi^wz6aS!6-nDE262YzuC;EsO(C_(N2yd@F(iNf7c=-2*v_$Y{+tu_EU#vw~ zse7xII6hoXj ztB3B_+%3>583^(oPBkCV(zp*lo2H-sS}|IgI%l;#p!jxm0e;OcOE!iw9e=zh=ss3D z+%%e=+jlCCDZZ7OhK5L3T`lN6!(}sjI>~X+;LofYOf&EG{n&WJ;NeuS7j<_qaEOc; zs&-jxYwxxcZfCdM$05UK#ysvBt!zj%R_R(aD2q3!m?4>&Yz$94zN{T8=Mga`hMfrP zEow*iRnm^%y?CPZzMw`-&B+oncUv>Ut&6l?={cVVn(ndIC_;w^N<@@V{JJ=g;Pl4;Zf|W4TuSX&)_LxhF)Wd%k*vHq9vsydL$vQ+Bkv-hQ__^5!RRP9BiUPZ?RUD$1W+}3~?SgF6=(26sG zv)z{w&6V${bSz)E;6If0dL7;%B$ZN3hz#V~!VhTuv=QI$b@=tI3jwh8qQW|TM_JKU zxr{GM89?+Qr2*HsidhNu8jkZJiafksluRkOMM>i}LWM4`If@O+nN_kV=+9tn>E>(N zR!vb=4o4?&+-$Fy5A7Q*7a%hsRLjJSxFdD_5Zj(H8C1?NtoG-YczzFIwg2l@`Mc!v z9_cRc5(?R~1VsU)4#N(#VrW=uC^P2OQ*qpN<>RC~afcvF@rRK*-cg>_zG-&OXP59{ zUf$&tjR&Vlgf_JqG*)h{5gsFMZ5~N+V+ESs5DER=pBLAYWH;Z`F}I9-eZjPQ!6Y=$ z?*to`C!J?{tFn2)iPzFe{tsDy0aexa#r?uRMWrMTsq~>6q#LEXr9(=(LmKIl?w0QE z?hpy-?&i?ly!(j%`#kTxV>le+9L^eh?-g^cIp_B?x6b}I90J*KdLB6=>N#E#Z2ki` zHpZ0Ar0eq%HIB+dhRBf0JQ-nE>DQIxZ_QwE2O2e|IVPr_4W^6(`qGs|7`l%sK#eX z`=r;{HiuKKVQK+_)00WTfasrNKy$ybm#jJFs-(|B`!y=(bo8<NE>(@oX3EShIwz<2H@RBRXAKMkxZK?(iKt}o~|6Eh-P=*|06;T7eCcM{BF@p(cK zSo9ssBiOuI1y(F0*0z4f)b7F7sJaw4AOT4evycQo)Ng_>D!qFoPjfuP>|`ixr81Fz z&gIV@S@HBLW7h3^$T~|N0*e+`QU|fYk9KEd(Y76ulJZ5tyA2Ho@KF0MpT;xs^<4W zF_1k+W+|13&1@N^#S2u^^A=rJ!*dun!0mV!^a{=ti1Vupr_Wp05Ts}#ss z7Au}IuW;zVX8&{wQjpUuxm%HP_?b07mTsBM)>|SuBY*BesX*3SFT=U?K}{&l1>_u4 zs}jVMZ+IG}2qH`B8D&Lm%>72Pl9*huv7L{h!mc5Nb zQIf^^crjdkWy4XsjndCP-6U5^cc)HLdaIS-&`;W*&{S>CK&KvzqO9S|W3t|K{2?v> zt?;O-OqE*-ap&k!IKW!=Qr zAl|3#@`uE%8K;3-$){oU)rS5i%;>EHMjVqhF+W4vho2op_4;?amY}&zp^_bnzgbry zRIz>c^S}hA(ElC2UqH`SU+j4z|8C4gpjT*s03R|#5%$MQ;Hz|6uD=GMu7RUGm z^{nb`dD$UN*3T-eq2tk{x8lpu!S`!4U)*ND$Ba-TdX%K4#M#4A?XJ6xxZu9sU^a$Hl42#!xV+is8}mt2#?xoz`*xDJQ0 ziWkEvf8W;rRQv7A`08(RS8wUg-U);RtGJlYru;{r2jeH?uR6CI{Fwt}*A1%{i3!{q zJ#n{8BQdnFZ8kQ9#ck}7Mv|v~b9Mz;*pat?J0hVROnp-)ge}D`jGZs@?QEu^w&aJ@ zZc?TuIxO|(+(1l>Wc>WeE!&y8>AG~!6$Ooej9N~*HMraERMzQBUK|tMxq8)#IPFmM zIZ);0511-HE=55&iki3MFu3H7;Qd|LQ1e`~B&bVKcZH47uGVr~M#`mS|S0dcdrp?ze?^HRUJxPUR+c zbb-N}mmOI&Y~ZTxjyjDWPcM;zs)yQWkz|>3{M&C1=3DC&7npYVzdYzv5sq&EX~^N!+?ifkP*w6mxF~e_0+($U1V+}ONJ`eq^smVtarCk*rSYBDZ3Y#QfZFCLX5z5u_eoCF!C=%`W_ z6xxo`>WMUp2$~ugP!;;1yUMbEiOjBu;wO$;D#V;Ti+?Y?`tWfoz4u^G^C|Z-+yVLa zMd+_71##xB2o^O9x`Z~V(Bu9x-hjAZ^OlCE7Kbh^MiZ1u2Ev*EvQxoVaOt9BuHxDK zA*^0A>FqpMVyDVal02S~fu@z^`&l$|2$W6=$SrT&5n&W6~u0=ZpyCZx-DiFLnO zj@qxiJm(#;zg&hiY8gJ}XLCrjBs8tC0e%}AIw0P(N0W`t{TE^TC;)Zb;6xmsBT9^N zFN55^E2dN{e7_N;YR9{5nlAF}s-k()%O-F!w7{(0e4Y9WSSgHIeuy4EPX%rgp^nEX z!Y5;0U{Kdo#vPrha&!0tuLAq05Ym1pv~+XCTn&UyuIe>RL3>rzN{Qf{B0Y(`Z1daL z$VwApzQr@@Eg5)J>fjM8CDSfD1aP$ygIOgGp%7 z1oz_Z>#I}^DNQ0BV$4fe=VAx@|>mMn@vtNis2`@IojE&)K;J{NXrfcO-_9NN7m=5Nxgm@UaX{*F<*=G09UPC|T0P#4)2hC90$asc)a^ z9bHrlvt+2^9wQS1D1Dgoci&F`lFb{h!wrt0jXWK1h&1!^9%_lTE z8XjmhaczH$*o^25%PGXe_sw^X-kTOQBA%I@^TtLInAJ(U6w8=Lm~}+-&OYFnw`6ETsP@d{I)^YD(F?MOB4yj*ZXL12dPGB`9-Q_Y3or2G{EXTB-8hnNX^QLKExAIBn5h{|?89** zY~Zxpa4Wa?){fNwwa?LS-h_HJZ0bRI`Mnx6M``sbEf6U7!vqcito;kfUY`Qx19O(4 z>Qiqd2U}(kHGWhwHh*JNSZW;C|k}^%3$fbW214M1$8dy4jwCjDjLWkto(iY!*@WQjPj} zPKGxM&FY0ByzkH(Hb;)c1JZrrl?H#y*C4tarEjpF-|VP}cACX^@QKb4+~0 zKco!Lsqs#)v`%1h@Uy}sZY81TYV(Scm5epHP!mo5LY5SQ%ia2!SIV)_VQORBXRAO{ zBMI~{BW+v~4k7G8h}v5XU=|R6H{?|csHJx6pw&*8>27*ohKeSg{XLtTyTZ{fUnJB| z^5<0G*GT8k3CMrUQhsw5p(Vwoo8B4nx*}OGV3p zcx|2)?|4h(p$<%aU%y0{-7dkQvPs_DSi`My04gW7f4Fke~)0` zf#$XD$!RuvP{>G}9)tWqnC;$By^PJHx0ZqMBC2q&F?+Xi-1a_CLcQ#zI0O@~PA+(c z{Vrri(tbcIV<%>yOQqaZ-o=_RnO*WcQ0;B7)uR_*Y;7*5pNP`*EbV{078BK~5F25k zMEeJ#zbpRr-xZHQl=ABDQT{)8AuzDw5%389WfokZ`xeA}j=mt~MtMUfITf&lu+x5!%=woCAq$jZGv-Tby#Pbr7=2rR;$GjO z`5mUxP-YEbp*v0NQ7K5l3@UGj~_C&L@vguOF+rx1ScJ?6G`6zN)S@Q=W1_B_wVJqyLkh-?j zPzXYetCrgG?>N|zv7P*s2B?*B1Xwu*;zjlwH>M zh#zjDOE3tY`EaJPKXJ#NZaJqsH-`X@m@t8YFyVd$7#aF?;ycG;>c!$B>c#h33Rl?@ zC9ZlnVadRHCIQeQ0Fj`4ne;ac2Yh1#oc+<*si9#=Xu=8MWsv)KNR-RFNfF++z`MMi zHWSV7YdNrI-*?<1xd`@nncC_>`lOG7Q5lIS+-UQv_-3T5S=m;Hy0A}xx3=X^htIYo zr|!?4T=!NCQz*9}<+O;y$zRSVV(X_9J5oYGhkt5CY`QBsPybMpi206$qphwpi2j@* z5)g~dMofO!KtUahe>0a>(-}j25Qoc4a`CG;T&b(C??oGO&2Mq$v`&K1 zB-|t1g1#FEVZ8wV%2#LmGIo#uV!SJ5<0SOG*-~NPf5rT6GQp*y2zkdHG@T#SC2$mC z^a%GTPdKh}$^#S#yJ<=DTm1N_c%&|PV>r7zCWrZc$@{^R>yogTx@mm9JGc$c{@p#U zoS2@VFXL{=>v$YI5iA})^0gK!QR94t=1RzGyCp68&(wY)g6400aYml=hGOr$y7}8L zIw#M;Y?JQ#_oqCW6^evC;SOXOF*Lz2lN-ggyB{68MXb#18ux?yc4?`8NC>t))*baV zPMb>Nt&3qlq=t|2c?tBpD!>}VYQqYtg{um{q0+@B#zvjaQi~*PWnpl#Ba%wMW}qNo zSAEPK?5P$Rc$DKmvE;<2?NNyx&j=J)&yy&u4fe=29T)j=r2c87jzeMIcUx8~++=Gk zb9v2Y5^XiJrPwYOhlig)9qsn4S1cV3ltQvS zeSK8_29734(~QB1qJHjg;w}}1FWjfSwa$RxF_Aa`^6+tqQ%L+vEQ%4m0Q!;iKjJ1} z3PWcxhgXK%_cQI5z_3fl6b@&Qm3Hlr{>yD<;cL^y{q|QFu!Xa66vS?dsTD2djEVslIcayc9J)t^V zFs=IHbR+4Sw38J?GbWJQM#UtU7!p)gsZ*SE564G$BdpnM4WYQtvm>x&Is}0?9HjWO z^Ta|(YG`MNF_cAJS078i}=DG#+uoVH~VFpFU@`Q z0QvGu5L}SxclkRc;R#B+9bj{%RkgwtKrlneq-ItyrH%C-+5YJGiGIvSm#{Duc643= zN4tz_M!4Bx5h*01W?$@>mX|j!35!PQTB{~J9f)j-@Ofnbx#=5w4w!%OB{?8%F7JGd z{v2LnM2A8u-^VWpGZa-%8`QKCd_4)=LA&aojG%@_d7iO?t9gXI1&7yAL6s0VMFiJ_ zDP$ei?ouTqazkF_K4#9N>EpE!iaVbdXY-6f*o7DnknR6cDjk8}DFyny=Gf(2w8=s)Ur_oU*6oPGbw9y29*DT^jbFdmgZgFB zh4aSBTS+fx#BmUXZ-N51TCSy=Qp&P!b2SwP7vv2%<}JKKnW}!N{(x<=VV(wJn8-mnUpnd>f~d;7}Dd5#ek>M z61YHIHuT^f7G=DAa-$k)!qFbsWb{r);cr~78j#~Ni+CR+&g`u&NPjKpQ}r7H5E;QA zVR$<(@~7F+K6vC6Y_H(-d8-Kz)kZfzj*Yzc0h36Q)xqL$quoJzAPPR@v~s23D$jCa z1^%&qJ1mCJY2NIg+3pVG9W>snvm5f7`=W9J3R&u}_{_q0VihOpj&D*93x_V#C(J(0 zNqJ!KUI21l6Ag2xzaICZ)pDW`&pyqKK4q|xZP@u|JT15i5%GkP3j9qd%F+Sq_oH`N zDzy0AKZ5$HOS4&f*cA}z2XzMigi{l$mAz_vPg_jzpnjrt{qCt|(hoz8#%hk1#ln4R zO5i67#gt`-cbSh~psjo0iZUMBLN)T=gfmmXwRYUvsqL6oowi`mxP7bPkcc{Y{`PhRp1^s7(RFR_cbhG8Ng;SzuZoGylBW~`z3W_`C8lmKlIusZ#d@2O$?`bxzFl!%b=U& zts!A8yIA>l9!ncRslc`pYzGBRkBgx1i+-*ndN73_G{Vt>elc+9wgRz?A7U@zq0^u$ zZ}j<`Px^-+IQQT7g_JyRPH0j@x+vCIu=ifPRzD4b3*@SPS?cuhNoih5TZivXp9RA> z0LXAuj+L1e3v z@V{X~M*H;gTAHK8WiivDyy~HR2Aw`|19GdvoG<4P9h;ajax1@yj%Qa=AtaQ}tYRr0 zO~PO9R=$ib){FdYGr05nLroEa0r5+*d9;#}&07?7d#Ng(D)EFm$Y5T-n+IVrg&s(N zb~>AjKPWr6veXikp9^^z%gH3NZ{0$+Hc1ujL^i#j=gOvM>3d|>e@>5AnBR-0ML2;> zIjvou(>bU85%Gd^Lc=B)ZAsZ6Zx~UlucKPZkJ{y3axp z0t?tK@@XbUkq5iA-0Kd9O?%m`euuO1X_+~FrvOHI?cC9MGB#zN=YTwXkheM)fjiG; zA(d5MFY22o4qg=}mMj%B5O1_#_z1)W^2{fmhzsN?Plk0M>L$1(B`SG=bSRjUGwRik z*A7b9fz(~tK;Ar`G@|@&M_xQ2`k$KSMJ%9vjD_WYj%>YU_Uh(scc*cHSwfsdicm*f zo{j_4N%7PNp(ihOdOI$H?if9I8kppSlx=<%4x7?oU0`23T5QHc5SRLr8_S7yyHB%#S{q?IOqq#HtIcWp5W}Nk*`yi@mBdpEMvjV> zjl1>a6MPl&>v6MR&d!Lwp9}-Ns0oC^Y|C>sqDo0C*LB@$FV!{-W`(TIHMb3EZWI}DNL zugZiSlc@cjT6uh7*^+&ePr_IF^bP&-r*_^+qne_9qO>0hvb!+G&uzn1*Uu3N%TaB- zNa~)HWwbObk`dW!yMObfSa5m7KVt{tme{M{bUFygX+s+okv75FIXws_j@cNBI=9+u zu7N`z@ndUlx?pe`N4>AM!@IVBf^-zLdal^?u6F?;)V z^CMVB$4baD>Bcl}F-;jmDkl%o3%2iSs`h<^R_KdG<>kXa>_1V3&##!td2k zI!CAdLh$itRF=IS8acq|>c)?gO=}-((AfoEDP?r#mRw-p>b7aByhbS5ZZ0TTdzI#G zp-vaUxLuEzzS(`7X>uKYX!iJWlA#XLQz7VRqEUvi*`Jb{aF?KLCV)?og!=NHNFK~B zEf4ncm>zU~H}0|36*N_Jt*XziEfm4WoB5G1U}z|c>-X}I&_r2cfJwpnvFB4Oy#r}? zg@raX2)UD3uJ~N^tZDW#tz?@z1p=f49)LKhge*3U z6|#`*U9;Ny7<`SXViCG;2yOQyfwGl&3tC}=7=#NYp{n+@_Cs!^TqVIot^9)p5$5*7;z3YAYbc*%-g!b1*-F9l}06Ftwl{ew4pW*K6zJr`K%CyPGpKMa$OPf%_#9?=FSEIZLBmviXWH7!z z$a$4G&@tCmI#5U5v4DR3_%J@W{?dzTD6!3NEu{`LY>+Brz8Lm8y+}{g=?K`(i``#9 z&IsP}yIoj0Id1AmMN+LwpYtBIRA3bmG|4{gc!oPj3%qJHB6HcywpHFh(Us@h%2gTB zyBX-p)w|mA8LcIYRX*SXNlH0<8XTfqZYj4n+N%9fTQa=!81mvTUzE=cg4_p&xrU?; zI2b$R-x&d0WiO(uFt1B6zN_FD_`bDZwG`n)+yd8V5uTB12sHmqOJy3t5j-jZUKWmC3oc?dPsN|)O>0MIhvY3(=SxNX> zaU6!Cbd(;ofS2vEAGuVqIie#M08QWC$wgW{X-mp)7btKv(W`RIGYZqVwcyeWwv}Ul zYi?j{yxSoVH#|pKe`~1kM$I>;?%&yWD5^SY6^&|}trv1a^T>)>bSzVWMTK@SNkJ9E z*PS~T_VHCo#Th0sM9*JMq7uj?VWc+pW1V0h2Qr(ULO&`Sus!VVNY++p-}I;UPnoY>Z7K6 zyINTe`}_^uQW-`D@WzPG$6Xu~R_b1rnz*e4HHH+vuNrrr38FySTCrEXdECEA(a6vk zcSXC4-8CQ;0u0KQA0|03bStXf&epPW>ghxur}TvlJj~#IwzIwND>uxTu|u~A4LH7q zeF_xRv{?y_a#p=)au$P^bT-;Mk8`_9i>|is(1JB3wI!$VHrC@BvSe1irEIdBa0eJ3 zRJ6c#>$PJ{s{Yi{TDZH7NWJ;jRr2VcY{nJ1KN~cD&>g#PFUVb6@xo7?v7Q$EQ}k7+ zunc5pnK}fJNW@*uVh`_-)@F8MCgf3e3$i-*YmeF&n{m~I8RiJjkB0h|#*rvdP@?7h zA}YJ;wNt&3q9i0kNk*IKyF2V0D2I>{>;B;OH=&d`;4)e{gqox`ChDk#ENak@DhMr> zx$hm_YawkWG)UF3MWGT$3pc=h$(Vuw=E6bsw$!=^TD|29DLS-nhFI>W`Txbvxq$t5 z^yZlIpMC=UT_G$7AU)R9(diB?OFQ>;D1-DEnxJm?40?939)Ln z>Rkms@2!lEY&;7p#VOtHx3v}~kDu;&7x1(-D>J$5#$qgxwa?W<@t>35N+FE2w1XGK1Z?)WM z8w^JtB`|mKb&9ac-(-JqKpeMXctF%vGkcOO{dS<9Ms60zNf!Ji=bVL$&uPKJ*v?^K zF7MaHk+Aw#a@$JgyCDbrKgXSub8o)o!SV&%BSnatXflmgZSv#xfH_Ra3Og}4*KL|M z)FHmp%fnvhQo9t)bRM#X|rgc*pw6ACPZO{I@0q_}9>X?Lq*@4*!Pzc~fkzFYt{zSIN`$Chdk$Pz*+2^ToNlNm)`l<)Vu113Fx}8(*AM zJ-iK(@9jC{KQtDxvOj@+<6pzSh4rc+@l_4ZsS>-j*3`!Hc@^aiTrXPhz43Eup&bs$ zEExFGVhllJ$X=ro0NL@YsxmEC%jqY*(g=x_GEkXJ=?4o*s45{3{$H?ZO}}ejoWt{6 z*g!-A-mn@s8CP3;WOBE`p8+|&7f}a7)krRZpP&+HVU3?`&S8f3&h%xLI^5`(T>}|w zeD)hVcF9FFMY>1;ed;R}W}Y~nr3kW_&pV;|PcO4lp_jiyu=9AnUJwA= zkVdl10)8JC`P<-e} zoCEo)C#TlCj$FLxSK^0FDDM`la+UN+oGq(UUjY^E%McwLN{)*NO&ankhX`JX^qFMl zVSdJJ8l@U?=Obi7q%P0U1C8O?q>X%q4gz$li1skqqCMYN7qnX#y|x&iKVAZJ(`baO z;BpCJ%ds)JQ&gb@G4%goXx@!O0h-+S^yp_qW`_bWt`DzzxBfjN8RHCWJpfdd1+fOU zKtmcXFQK1AAMiMVlfd7(DEp=SYBVby)ky3g`~wEoh5&8-bK2V)7D{M^0pNiu3$pl2 z5-8FFYW>cV{=A6)HtzmkOZ_0=uNBpEDKyYNB?SY(3)yPsAJTu3&A->nrU3AiY#m~p z=SD!07$7V?s`m#2`lELtP~rzmCDrcV$ppAV;9FWK@e@Zh^8AeNB!MPBawfMlp|*nv z9vC=!cx*rNf9jLJOb;n9(1hXvZS>>wQ<4$`gB^tBlM5Z|c2y|fS5d#0!u)sa|F(!| z{{j!dSmm#r`Tl;{t_n0UpeIzjQ85AN66_St z5Pu%O=l{iJfhOW@LM#z~JDn&9DzC}x`AG%+Gb0x8{Fbz(T-#FrgSVjHszQk;+D~c! z_{KOW1SDBB)BwHFk7#JXQbVIhkp5qk?5H#qeJQE-C`B=~345#%TXnFMk|EUvak| zV*nvNXVb)pf!P*i{J|Ij`Xiu#5P)KZ6b*Ae+iB=%0meHHSRt^I5!?TaHyPA;kD1z) zLT@y}7izqHLj$ z=Gm(J^J9a_BQ#O0`B#JVjdt?&Y`!8qMj%?{G@iT0S}KoSE)w_Qe%*`DpYV z?NN?nim_=|>r@fPEVgA4vjg$zwp5qZS(biyj%3MRgM|@Omu7eQYH7(-k^lJZOB+l-sfR4mH_FbFI=9a2OVETnC4OE0Isx zzeL|7IgO9$wiN5kexDi{8^wRzv19)tFje^z^9GQMdYe~W6AAqChgX}?t*|@t(~dDp z!d1sf;J?+ROkhN(7`$6spr3cZYbrvZ{Mh#^WC%JZpg2tf-t&`@Mr=Th(#^|J9_Rr7 zMNeKFPC3(hTJm4sWyp5l9MMJ zHEV8qL*-_@>u!fD#7Gha_I2@bS0qsMLTw$=|Ncw1$c9G^39)Z6DwvdV@a;lmTE0i7 z2KP)>YG~7O5lZP@lg)5{j|z7>zIi-o=`Wij5hphc?w+-35hIP?tgq z#3zO%K*o+mFQq3gdGb+r%)7NvcFmdzR4i3Uv`pHeQv9qSD3KCQUY>&Zcjf~TQot%I z(bG`;-5y8+J}U6GBUPd5ImR$N^H`$8ok#&Wl>|M+Qto(ozqO_6sl2-gkvhPC?1_3SE`P>2mPVZt={oGjf!m_02!qekecs>u0+({9m{&p-O4e#w0GHV96Q2n6n^mi@IC z@on0w?_BWH3-IRz0vv?gN^%w1_0ibAQC+RHUy9b|&h#l!kJQ3Nuyzn~uC}{36sEGP zo4;KaBmRgVS*V44mR-P}11;E2LN)FeW(Ii3=2Tq^zpjW32Ob2iLw%9>H@NlS!KMDf z2@U&Ve~>AV(=3E6U4pYqB_MtGB?4mL+M|I{TN}TYW&(C~(@VcHqgmbaU^<)LpS~B| zao<#@uTuiGY|K>k-{Wn|K-B}#4wLg|0g47fZOuO5S~EFLB{4%mTCZ$UD3}FUJP3~b z6ihj~fE!Q}QEyWP+?2Pq($}~aSm4l%CVgBjgr0!Edtuc=ZW4~B^#qm|2)qt2^Pq7s z+aS{u8`yx&fpao${8h=yBhX(r6LXbDW)VxSTrBVl{SrigL)gSR9cRxa&(97nDB{t?qx$YfKH)f5(Wx789coZAUtg%dy(FrP6!MEZJjp$4*Q^hx}dZ zKvnxT!-meph$Ee!U{nPHEx1vc%WCuX z?3;`|QfPHMFNwe)vy|kh$9;N|2etR~3zi?vZ*4AzpvN+CQRtIKhan^VZBCpX0u2$Kj!y}4-F?o``_;My<2WzX1TFZt}N zRUKcWkLz)`Zc^OWd9N>&OxN!CZ0~)ZrJ@Q~KI+^0GC=ZwlURo+>@o@u_1tr#CpSPn z4M>4UFPQGkgM%>HZ~wYYrLf+`rK6 zC9$3kT~`K&K6#{RMmxgv^XbG}BWjC=Ro`W5+ijUmW>lm(p)eWo5Kjl56B>~QT}90} zDLpp*oF1_5cUh!h+xk+fSfZaLT4e7g7yddO(hyFb;VuiWaC>_XqSakT-e?LsHb&*v zrG44iekdvZuC8%tf)sN*-16MB&z(Tm?Hl{jla~7qHzy4?zvVzARS zmLR=X={gTqLGh+qNrA3p=Un24oH~7>L=WHZ-}AcyX33Jnv2erzZu9si{lmXRz9wnv z21oNKk#ti$h`;2V*!-%SML=Kk$kA9Q@iZ1rLPoadke9^B2!5qt;2w#ghVmx+ryNMG zyHO^bzbTG{49SG*u}#mquJ-5TBz)OSf`+ysN$}0R1{Oyk7odW&?I)is$VLkBv97S4amn56oo z+fvMcGVtK>obckSEV=};Df~J90uEo9ou~Ab+UPn7z)9j^+E2qMS zm8XHWm&koQVAARV3eo-CTGn^{-;ukW5o+Y#MsPlRyB`gp@x!JdW>(M6@jiQs(ubKc zCE6aKmYg)QFkGVVnQK~4qQiv~SWg8RuV^vw{w=FS2Y+VIEOLvbz=$)CMl-*Ju2p~# zYqMprX?;-bEsWEtTzO&RgZ=jt1#EqYL=4YYO!)~M^#6Z6OF}w;j9hdZg`=_tc|-$Z z@~Uq*IXdKt{&ZEvrDN~J_VL5nO=Bd$sZQxn!RA(+3*Nf!VYoF)?=c#@@W-^~z?8VhXj+iLatEI<_vfu|S^D9DY9oMv=8o$D$ftN}N>-<8op`SH^^n~}bm43=X;Zlj7h?X*P< zr_&-GP$$m{j)raAyULa!spxlP=`QtFyljHhpTwBeg^LpF&pfZP+=3fQYPISSv2luG zI?txa2~@Ju-3^9sW?UPQHyd`R6hR~Rbr!B~lG#!bxK)-{i+KY?`ra7OA*xx+CB!Br z>{?u0#ho@WdZs^$m&VTz{h%MU0R*~Hz8}|s)4qWoi_hOZ_xmgV@4(p<{C$A_*~wa? z01BJcYp19-y+&*ev$|*ft+JA;pvXln3>Q>}BF2?_78OP{jspUF0~k30A!PBb9Gp$d z1@+g|;H`uySh!|FCkV=#6iN_6Qq`Ph%wpo+N71?*{zbNu5RLfqteuBHWowg%U3{E| zvH=zyC(yii*xI#9Q=zAs&&2MZ6vzXHKz99weO5hdxpjxtF@Nl6%EMm0V>*USkE7+S z8ns5vN{fpWKgrY`jhV9UyxmqlVhv#vhQ?Bu;Pp*onVtha2mRTNd~jF5Luu1CF&pNz z#-5eX;pt2odj$U`#ov>(e0O}rcgFgougPvGX)Nw2xA;hCDZxhq(GxKy%;Z}-Rm)(1 z4tU=!-4q-LLFrFq9=2qS;JtzlAJZgiBM&|<8DG4aN0B6=KMFV)0$lQ`4|0@ABxzt& z41pE2yr;n(fqqVqfH!8H{s>*=PtYW75Zs6PNQOamZ>pM!52^j%99MkBUya_fB7)PV zOr?_QKI~a%_}p-~x4dpJ$>2rf^05U4yhUnvqg-KP!$*h`?Rd%AegT&$9rw89o%C4Oh->o)H_+xT&|FD;yBaNrm@k5aq8aA7KFAnz! zdzht0!aIs@zvzydH0BE$pL#TyDncPr=U%B@e$fFdJdS`Zloi=Z1tZH~SjomiqA&(G z>Jc)McicHmuG>YDMMe9+S^%`B*D4D5(xc4quw)2erP2a&OU^d>r9sk< z#uIcW>GUKmTEr&pU+-T&%`bUL2QVb>!&ftAYIzgZ6fOap^WO1;UgTNp6`;gpl=`mr zHP5v5*0D*md9B8nqx)ZaYq-BOgv0if`1r`oX{lO!_`QsIGV_a8SHe%amLJvRo1dBKOsNc(txvo5cMwExXg@;u~iaLJuQ|q3sZ%>J{!_stZH&VkNBE1ypacSI zgYqrDz4+Sp4$ZYT{h-(XXW^G0yDHj~pRKpBiHBg6YFM&9mcO%*9-_WV>-86&^=eCw z;wpBAxS3Dz-ak4*Y#tnIvctx7_VCVI{v?>w#m1;3J1ulNJTeJV9@jk=289bvQ!W4k z>{VBMf8=9t9-flzzWdYH1}#p0c}-$YRxlMLS}UT`=C3Y}8t*$Jq1uSrL!V(OZjJde zjk-}ZFj!I`UK(InG$hJd;Y-EZYkW&R_1NRO^_b1ELydLqA0lVblBukb+eT6wu7=$Y zQ$0zUe+_Q%x*8nvT-}^GYmcPvw~V;*rH}0A4bfNo6#6Tl-1iInw;voD_hx>+7`O=y zkjd!H989naW_*Huti{=W;#Z?RNmDaO)SSFrq>SPBPQ2+s>qIoB9v1jRWso)4)XQ}A z^Zn8=m%(E50BztFub%S83m_~Ph!(gFP?tEv9Z=5+>O5gUy^Gg7c+W*Hh{TA}P^=d( z)_5yMuy@=FB|UChRc9kk(>YG;7B1RlheB5;QB?H1QfOXU2mpoRdEfFJ{WKRhvu1WM z&ENP#nB_5hHp9tC5HDyeHdv2YW>HVWVZ%9BWnM$YHKI^WW;kW-7aV0)MRR6pm1z;GlhjT z>%bN-k$5XC*{`}sSc$}}3^+`S-pDP94ag1m%PP4B6GJ58d?kPD@g3Av!&+gdf;mqF zhoq=A&jPzY!NF{V0sDl?Qns^K zv;`PeVN6=z%Mrn03-3ExV}?!xSEIcxCP*CYR4&NjCX{SHYw}}nv-_o?V65s^ZoG3I zjM5jv7lqt3^bv|ovZppsUMlm2xk_mfca|M?xilHKpy-wPQZ#M5AE>$t?}!c)Xg?(w z+AWf=%}fbmzPL|?eT)o!+*aWUhb0LF$IU&uQERj@<07(-;3jiqO)5@J)ykKi>mzdK zmS&{7k|L-7-n!3S+2SFWtgq=iw>C57NAOuM6FWU(myV7T%df*O$ygd>wq3d5wA4IR zw99g++320It|L$AccFr$d9f#_3whB;sW!E@bE63qPGW%SBsi)zT{x=x2mS9BdBPm* z(op;lg6qkHd%%48JfFcrym_TYfu(5b8w-DyX>o5S!EEP~NDwr<_vStgC}lIo%L{dg z;Jt*=S8sF7HhtXjKp@g;mHc?oPWKC6jtcv43`qk$?w>rV1imXPlcr%G6mI*qnd;#7 zYPEc{!lYvlfvs83{Zb-7U-Le%vB&{5%NIcHW}kt~DWU~wQW5$=8xkm=xycCcOAA3C zT{SJ*K?PF;sB}6Ts&zUa@H=!It!5%&p55a+9GKB!Hm6b!H_o1;BD^Q~jfGVt*6C0) z-|1lDcmf2!7;j�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 diff --git a/documentation/images/validation/validation_arch.png b/documentation/images/validation/validation_arch.png deleted file mode 100644 index 87d8b66c2e12fa83ba3f0bffb8d87bafeefd8bf9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 99462 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 z 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 diff --git a/documentation/model.md b/documentation/model.md index 1733840e7f..bdd88a06ad 100644 --- a/documentation/model.md +++ b/documentation/model.md @@ -378,6 +378,10 @@ Types: | unique | boolean | - | Marks the values for the property mapping as a primary key for this type of node | `http://a.ml/vocabularies/meta#unique` | | externallyLinkable | boolean | - | Marks this object property as supporting external links | `http://a.ml/vocabularies/meta#externallyLinkable` | | typeDiscriminatorName | string | - | Information about the field in the source AST to be used as discrimintaro in the property mapping | `http://a.ml/vocabularies/meta#typeDiscriminatorName` | + | mapProperty | string | - | Marks the mapping as a 'map' mapping syntax. Directly related with mapTermKeyProperty | `http://a.ml/vocabularies/meta#mapProperty` | + | mapValueProperty | string | - | Marks the mapping as a 'map value' mapping syntax. Directly related with mapTermValueProperty | `http://a.ml/vocabularies/meta#mapValueProperty` | + | mapTermProperty | url | - | Marks the mapping as a 'map' mapping syntax. | `http://a.ml/vocabularies/meta#mapTermProperty` | + | mapTermValueProperty | url | - | Marks the mapping as a 'map value' mapping syntax | `http://a.ml/vocabularies/meta#mapTermValueProperty` | | domain | [url] | false | Domain node type IRI for which a specific annotation mapping can be applied. Similar rdfs:domain but at an instance level, rather than schema level. | `http://a.ml/vocabularies/amf/aml#domain` | | 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` | diff --git a/documentation/shapes_normalization.md b/documentation/shapes_normalization.md deleted file mode 100644 index e9113836bc..0000000000 --- a/documentation/shapes_normalization.md +++ /dev/null @@ -1,361 +0,0 @@ -# Shape Normalization Algorithms - -In this section we introduce two homomorphic transformations for RAML types that can be used to obtain a canonical representation of the type. - - -## Expanded Form - -A RAML type expressed in expanded form has the following properties: - -- All type expressions have been expanded -- All type names have been replaced by their expanded forms -- All nested types in the RAML type have an explicit type property that can be a built-in type name string or the declaration of a expanded RAML type (single inheritance) or array of RAML types (multiple inheritance) -- All facets with default values like `required` are made explicit -- All nullable property values have been replaced by unions - -The algorithm takes as input a RAML type form and a map of type bindings, a dictionary mapping type names (strings) into type expressions. -The output of the algorithm is the expanded form for the RAML type. - -Before describing the algorithm, we need to describe the data model for a RAML type form. - -A RAML type form is defined using the following algebraic data types: - -``` closure -(constructor Record [a1:String f1:RAMLForm, ..., an:String fn:RAMLForm]) -(constructor Seq [a1:RAMLForm, ... an:RAMLForm]) -(constructor Scalar String | Integer | Boolean | $recur | ...) -(constructor RAMLForm Scalar | Record | Seq) - -``` - -Since we are going to expand all type expressions, we need to provide a form representation for RAML union type, not currently defined in the spec: - -``` closure -(constructor Union [a1:RAMLForm, an:RAMLForm] (Record "type" "union", "of" (Seq a1 ... an))) -``` - -RAML types can be recursive, at the same time they are anonymous, no identifier for a type exist. To address both problems, we introduce another type form to designate a fixpoint recursion: - -``` closure -(constructor Fixpoint RAMLForm) -``` - -Where the recursion point is marked by the scalar type ```$recur```. Also note that there are not nesting restrictions on fixpoints. - - -It is trivial to create a mapping for a concrete syntax (JSON, XML, RAML) into these data types. - -For example, provided the following definition of RAML types - -``` raml -#%RAML 1.0 Library - -types: - Song: - properties: - title: string - length: number - Album: - properties: - title: string - songs: Song[] -``` - -The output of expanding the `Album` type is the following - -``` closure -{"type" "object" - "properties" {"title" {"type" "string" - "required" true} - "songs" {"type" "array" - "items" {"type" "object" - "properties" {"title" {"type" "string" "required" true} - "length" {"type" "number" "required" true}} - "additional-properties" true - "required" true} - "required" true}} - "additional-properties" true - "required" true} -``` - -A recursive ```List``` type like: - -``` raml -types: - List: - cell: Cell - Cell: - properties: - car: any - cdr: List | nil -``` - -Will be expanded in the following form: - -``` closure -{:type :fixpoint, - :value {:type "object", - :properties {"cell" {:properties {"car" {:type "any", :required true}, - "cdr" {:anyOf [{:type :$recur, :required true} - {:type "nil", :required true}], - :type "union", - :required true}}, - :additionalProperties true, - :type "object", - :required true}}, - :additionalProperties true, - :required true}} -``` - -The pseudo-code for the transformation is the following: - - -The input for the algorithm is: - - `form` The form being expanded - - `bindings` A `Record` from `String` into `RAMLForm` holding a mapping from user defined RAML type names to RAML type forms. - - `top-level-type` a `String` with the default RAML type whose base type is not explicit and cannot be inferred, it can be `any` or `string` depending if the the type comes from the `body` of RAML service definition or any other node. - -*Algorithm* - -1. if `form` is a `String` - 1. if `form` is a RAML built-in data type, we return `(Record "type" form)` - 2. if `form` is a Type Expression, we return the output of calling the algorithm recursively with the parsed type expression and the provided `bindings` - 3. if `form` is a key in `bindings`: - 1. If the type hasn't been traversed yet, we return the output of invoking the algorithm recursively with the value for `form` found in `bindings` and the `bindings` mapping and we add the type to the current traverse path - 2. If the type has been traversed: - 1. We mark the value for the current form as a fixpoint recursion: `$recur` - 2. We find the container form matching the recursion type and we wrap it into a `(fixpoint RAMLForm)` form. - 4. else we return an error -2. if `form` is a `Record` - 1. we initialize a variable `type` - 1. if `type` has a defined value in `form` we initialize `type` with that value - 2. if `form` has a `properties` key defined, we initialize `type` with the value `object` - 3. if `form` has a `items` key defined, we initialize `type` with the value `object` - 4. otherwise we initialise `type` with the value passed in `top-level-type` - 2. if `type` is a `String` with value `array` - 1. we initialize the value `expanded-items` with the result of invoking the algorithm on the value in `form` for the key `items` - 2. we replace the value of the key `items` in `form` by `expanded-items` - 3. if `type` is a `String` with value `object` - 1. we iterate over the `Record` associated to the key `properties` in `form` - 1. for each pair `(Seq property-name property-value)` in the record associated to the key `properties` in `form` - 1. we initialize the variable `expanded-property-value` with the value of invoking the algorithm with input arguments `property-value` and the provided `bindings` - 2. if the string `property-name` finishes with a `?` string - 1. we remove the key `property-name` from the `properties` record - 2. we replace the `?` character in `property-name` by the empty string and - 3. we re-assigned the value of `expanded-property-value` by the union `(Union expanded-property-value (Record "type" "null"))` - 3. if the output `Record` assigned to `expanded-property-value` does not have a `required` key, we assign a value `true` to the key - 4. we re-assigned the key `property-name` in the `properties` `Record` to the computed value for `expanded-property-value` - 2. if the `Record` in `form` does not have a defined value for the key `additional-properties`, we assign a value `true` to the key `additional-properties` - 4. if `type` is a `String` with value `union` - 1. we iterate through all the values stored in the key `of` in `form` of type `Seq[RAMLForm]` - 1. we initialize the variable `i` with the position of the value we are iterating and `elem` with the current value - 2. we initialize the variable `expanded-elem` with the output of invoking the algorithm with input arguments `elem` and the provided map of bindings - 3. we replace the value at position `i` in the sequence `of` by the the computed `expanded-elem` - 5. if `type` is a `Record` - 1. we return the output of invoking the algorithm on the value of `type` with the current value for `bindings` - 6. if `type` is a `Seq[RAMLForm]` - 1. we iterate through all the values in `type` - 1. for initialise the variable `i` with the position of the value we are iterating and `elem` with the current value - 2. we initialise the variable `expanded-type` with the output of invoking the algorithm on `elem` with `bindings` - 3. we replace the element `i` in `type` with the computed `expanded-type` - 7. we return the new value for `form` - -## Canonical Form - -A RAML type expressed in canonical form has all the properties of RAML type in expanded form plus the following: - -- Unions can only appear at the top level of the type form -- All inheritance relationships have been resolved -- All `type` properties have a `String` value -- All the constraints defined for the type are valid - -The canonical form can be used to represent a RAML type in a unique way. It can also be used to perform validation since inheritance and union types have been resolved. - -In order to work with inheritance over RAML types we will consider standard set inclusion semantics, where saying that type `A` is a sub-type of `B` means that all instances of `A` are included in the domain of the type `B`. - -The algorithm we show in the following section computes the canonical form for a RAML type. -It takes as input a RAML type in expanded form and produces the canonical form as output or throws an error if an inconsistency structurally or in a constraint is found - -For example, provided the following (not expanded) RAML type: - -``` raml -properties: - a: string - b: number | string -``` - -The computed canonical form of the type is: - -``` closure -{"type" "union", - "required" true, - "of" [{"type" "object" - "properties" {"a" {"type" "string", "required" true}, - "b" {"type" "number", "required" true}}, - "additional-properties" true, - "required" true} - {"type" "object", - "properties" {"a" {"type" "string", "required" true}, - "b" {"type" "string", "required" true}}, - "additional-properties" true, - "required" true}]} -``` - -The input of the algorithm is: - -- `expanded-form` the form being processed of type `Record[String][RAMLForm]` - -*Algorithm* - -1. we initialize the variable type with the value of the property `type` of `expanded-form` -2. if `type` is in the set `any boolean datetime datetime-only number integer string null file xml json"` - 1. we return the output of applying the `consistency-check` to the `form` -3. if `type` is the string `array` - 1. we initialize the variable `items` with the output of applying the algorithm to the value of the key `items` of the input `form` of type `Record[String]RAMLForm]` - 2. we initialize the variable `items-type` with the value of the `type` property of the `items` variable - 3. if `items-type` has a value `array` - 1. we replace the property `items` in `form` with the value of `items` variable - 2. we return the output of applying the `consistency-check` algorithm to the new value of `form` - 4. if `items-type` has a value `union` - 1. for each value `elem` in position `i` of the property `of` in `items-type` - 1. we initialize the variable `union-array` cloning the value of `form` - 2. we replace the property `items` of the cloned value in `union-array` with `elem` - 3. we replace the element `i` in the property `of` in `items-type` with the modified value in `union-array` - 4. we return the output of applying the `consistency-check` algorithm to `items-type` -4. if `type` is the string `object` - 1. we initialize the variable properties with the value of the `properties` key in `form` - 2. we initialize the variable `accum` with the cloned value of `form` - 3. we reset the key `properties` in `accum` to an empty record - 4. for each pair `property-name` and `property-value` in the variable `properties` - 1. we initialize the variable `tmp` with the output of invoking the algorithm over the value in `property-value` - 2. if the property `type` of `tmp` has the value `object` - 1. we add the pair `property-name` `tmp` to the `properties` keys in each record in `accum` - 3. if the property `type` of `tmp` has the value `union` - 1. we initialize the variable `new-accum` to the empty sequence - 2. for each value `elem-of` in the property `of` of `tmp` - 1. for each value `elem` in `accum` - 1. we clone `elem` - 2. we add the pair `property-name` `elem-of` to the key `properties` of the cloned`elem` - 3. we add the cloned `elem` to the sequence `new-new-accum` - 3. we replace `accum` with `new-accum` - 4. if `accum` contains a single element - 1. we return the output of applying the `consistency-check` algorithm to the only element in `accum` - 5. if `accum` contains more than one element - 1. we replace the `type` of `form` with `union` - 2. we remove the key `properties` - 3. we add the key `of` with the value of `accum` - 4. we return the output of applying the `consistency-check` algorithm to the modified value of `form` -5. if `type` is a `Record[String][RAMLForm]` - 1. we initialize the variable `super-type-name` to the first value of type string in the chain of nested records for the value `type` starting with the one assigned to `type` in `form` - 1. if `super-type-name` has a value `array` we transform `form` adding the property `items` pointing a record `(Record "type" "any")` - 2. if `super-type-name` has a value `object` we transform `form` adding the property `properties` with the empty record `(Record)` - 3. if `super-type-name` has a value `union` we transform `form` adding the property `of` with the empty sequence `(Seq)` - 4. we initialize the variable `canonical-super-type` to the output of applying the algorithm to the value for the property `type` in `form` - 5. we set the `type` property of `form` to `super-type-name` - 2. we initialize the variable `tmp` with the output of invoking the algorithm `min-type` to the inputs `canonical-super-type` and `form` - 3. we return the output of applying the `consistency-check` algorithm to the modified value of `tmp` -6. if `type` is `Seq[RAMLForm]` - 1. we initialize the variable `super-type-name` to the first value of type string in the chain of nested records for the value `type` starting with the one assigned to `type` in `form` - 1. if `super-type-name` has a value `array` we transform `form` adding the property `items` pointing a record `(Record "type" "any")` - 2. if `super-type-name` has a value `object` we transform `form` adding the property `properties` with the empty record `(Record)` - 3. if `super-type-name` has a value `union` we transform `form` adding the property `of` with the empty sequence `(Seq)` - 4. we initialize the variable `super-types` to the value for the property `type` in `form` - 5. we set the `type` property of `form` to `super-type-name` - 2. for each value `elem` in `super-types` - 1. we initialize the variable `tmp` with the output of computing the result of invoking the algorithm `min-type` to `elem` and `form` - 2. we re-assign `form` to the value computed in `tmp` - 3. we return the output of applying the `consistency-check` algorithm to the modified value of `tmp` - -In the previous algorithm we have used two auxiliary algorithms `min-type` and `consistency-check`. - -`min-type` computes a canonical RAML type that will compute the biggest intersection between the sets defined `super` and `sub`. If such an RAML type is empty, an error will be thrown. - -The input of the algorithm is: - -- `super` the RAML canonical super-type -- `sub` the RAML canonical sub-type - -*Algorithm `min-type`* - -1. we initialize the variables `super-type` and `sub-type` with the values of the properties `type` of `super` and `sub` respectively. -2. if `super-type` and `sub-type` have the same value and the value is in the set `any boolean datetime datetime-only number integer string null file xml json"` - 1. we initialize the variable `computed` to the record with property `type` having the common `super-type` and `sub-type` value - 2. for each restriction in `super` and `sub` we compute the narrower restriction and we assign it in `computed` - 3. for each restriction only in `super` or `sub` we assign it directly to `computed` - 3. we return the output of computing the algorithm `consistency-check` on `computed` -3. if only one of `super-type` or `sub-type` has a value of `any` - 1. for each restriction in the `any` type and in the other type, we compute the narrower restriction and we re-assign it to the other type - 2. for each restriction only in `any` we assign it directly to the other type - 3. we return the output of computing the algorithm `consistency-check` on the other type -4. if `super-type` is `number` and the `sub-type` is `integer` - 1. for each restriction in the `number` type and in the `integer` type, we compute the narrower restriction and we re-assign it to the `integer` type - 2. for each restriction only in `number` we assign it directly to the `integer` type - 3. we return the output of computing the algorithm `consistency-check` on the `integer` type -5. if `super-type` is `array` and `sub-type` is `array` - 1. we initialize the variable `min-items` with the output of applying this algorithm to the values for the key `items` in `super` and `sub` - 2. we re-assign the value of the property `items` in `sub` with the value of `min-items` - 3. for each restriction in `super` and `sub` we compute the narrower restriction and we assign it in `sub` - 4. for each restriction only in `super` we assign it directly to `sub` - 5. we return the output of computing the algorithm `consistency-check` on `sub` -5. if `super-type` is `object` and `sub-type` is `object` - 1. for initialize the variable `common-props` to the empty record - 2. for each key in the `properties` value `sub` that is also present in the `properties` value of `super` - 1. we initialize the variable `tmp` with the output of applying the algorithm to the value for the common property in `super` and in `sub` - 2. we assign the computed value using the name of the common property as the key in the `common-props` record - 3. for each pair `property-name` `property-value` only in either `super` or `sub` we add it to the record `common-props` - 4. for each restriction in `super` and `sub` we compute the narrower restriction and we assign it in `sub` - 5. for each restriction only in `super` we assign it directly to `sub` - 6. we assign the value of the key `properties` in `sub` to be `common-props` - 7. we return the output of computing the algorithm `consistency-check` on `sub` -6. if `super-type` is `union` and `sub-type` is `union` - 1. we initialize the variable `accum` to the empty sequence - 2. for each value `elem-super` in the property `of` of `super` - 1. for each value `elem-sub` in the property `of` of `sub` - 1. we add to `accum` the output of applying this algorithm to `elem-super` and `elem-sub` - 3. for each restriction in `super` and `sub` we compute the narrower restriction and we assign it in `sub` - 4. for each restriction only in `super` we assign it directly to `sub` - 5. we assign the value of the key `of` in `sub` to be `accum` - 6. we return the output of computing the algorithm `consistency-check` on `sub` -6. if `super-type` is `union` and `sub-type` is any other type - 2. for each value `i` `elem-super` in the property `of` of `super` - 1. we replace `i` in `of` with the output of applying this algorithm to `elem-super` and `sub` - 3. for each restriction in `super` and `sub` we compute the narrower restriction and we assign it in `super` - 4. for each restriction only in `sub` we assign it directly to `super` - 6. we return the output of computing the algorithm `consistency-check` on `super` - -In the previous algorithm we need to define how the narrower version of a constraint is computed. -The following table provides the details: - -| property | valid | narrower | -|----------|-------|----------| -| minProperties | (<= super sub) | (max super sub) | -| maxProperties |(>= super sub) | (min super sub) | -| minLength | (<= super sub) | (max super sub) | -| maxLength | (>= super sub) | (min super sub) | -| minimum | (<= super sub) | (max super sub) | -| maximum | (>= super sub) | (min super sub) | -| minItems | (<= super sub) | (max super sub) | -| maxItems | (>= super sub) | (min super sub) | -| format | (or (nil? super) (= super sub)) | (or super sub) | -| pattern | (or (nil? super) (= super sub)) | (or super sub) | -| discriminator | (or (nil? super) (= super sub)) | (or super sub) | -| discriminatorValue | (or (nil? super) (= super sub)) | (or super sub) | -| enumValues | (subset? sub super) | (intersection super sub) | -| uniqueItems | (or (false? super) (= super sub)) | (and super sub) | -| required | (or (false? super) (= super sub)) | (or super sub) | -| additionalProperties | (or (false? super) (= super sub)) | (and super sub) | - -If the valid condition in the previous table is not met, the `min-type` algorithm will fail throwing an error. - - -The other algorithm is `consistency-check`. It just iterates through all the possible restriction constraints defined in the RAML specification and checks that the constraints hold for the provided type using custom logic. The check functions are: - -| check name | restrictions | check | -|------------|------------|-------| -| num-properites| `minProperties` and `maxProperties` | `minProperties` <= `maxProperties` | -| length| `minLength` and `maxLength` | `minLength` <= `maxLength` | -| size| `minimum` and `maximum` | `minimum` <= `maximum` | -| num-items | `minItems` and `maxItems` | `minItems` <= `maxItems` | - -If any of the restrictions involved in the check are not defined, it automatically succeeds. -In order to support additional restrictions will require to plug in the algorithm additional check functions or extend the structural type system here outlined to provide a generic way of expressing properties and there automatic check. diff --git a/documentation/validation.md b/documentation/validation.md deleted file mode 100644 index c79da08a47..0000000000 --- a/documentation/validation.md +++ /dev/null @@ -1,766 +0,0 @@ -# AMF Validation - -## Validation approach - -AMF includes a powerful validation framework that can be used to define constraints and validate them over parsed models for HTTP APIs or any other type of RAML document. - -AMF validation has the following design goals: - -- **Validation is explicit** - -Constraints over the parsed model are explicit. We want to avoid ambiguity about what is valid and invalid for a particular model. All the constraints defined have explicit identifiers and clients can access the full list of validations and their definitions. - -- **The validation mechanism is formal** - -AMF uses a W3C recommendation [SHACL](https://www.w3.org/TR/shacl/), to implement validation. SHACL provide powerful and clearly defined closed world semantics to validate information models, beyond what can be achieved through more limited validation schema languages like JSON-Schema. Thanks to SHACL sound logical foundation, we can explain easily why a model is invalid. - -- **Validations can be customised** - -AMF introduces the notion of a validation profile. Profiles group validations into sets of related constraints following certain semantics or standard requirements. RAML 1.0, RAML 0.8, OAS 2.0, OAS 3.0 are valid profiles that will ensure compatibility between the parsed model and these specifications. Furthermore, clients can create a custom validation profile, selecting the validations that are important for their use case, setting the right severity level for each validation or modifying one of the standard profiles, turning on and off individual validations in that profile. - -- **Validations can be extended** - -AMF validation profiles can be extended with custom validations defined by clients. A declarative approach using AMF validation profile dialect can be used to define new validations or a programmatic mechanism based on JavaScript functions can be followed. Advanced users can always define standard SHACL constraints to have complete control over the validation mechanism. - -- **Validations are data** - -AMF can parse the validation profile for an API and generate a model in the same way it parses the API definition itself. API model and validation profile model can be linked, stored, and queried as a single unified data graph. - -### Validation using data shapes - -The main notion in AMF validation is that of a `data shape`. - -The output of the AMF parser is a data graph where the nodes in the graph and their relationships capture the information of the input RAML or OAS document. - -Data shapes impose restrictions about the valid properties and relationships for the nodes in the parsed data graph, grouped by node type. - -For example, the following extract from a RAML document located at `http://exchange.mulesoft.com/myorg/loans.raml`: - -```yaml -title: Loans API -version: 0.3 -``` - -Will produce the following data graph: - -![example1](images/validation/example_graph1.png) - -As we can see in the image, the 'title' RAML property has been parsed and mapped to the [schema-org 'name' property](http://schema.org/name) in the parsed model and the 'version' property has been mapped to the [schema-org 'version' property](http://schema.org/version). At the same time, the main API document located at the root of the document `#/` has been marked as being an [instance of schema-org WebAPI class](https://pending.schema.org/WebAPI). - -In order to consider the model encoded in this graph as valid, we might want to impose some restrictions for the nodes in the graph of type `schema:WebAPI`, for example, if certain properties are mandatory or optional, the range of the data type for the properties, etc. -In order to do this, we can define a 'data shape' constraining all instances of the `schema:WebAPI` type. For example, we can make the version mandatory and impose a pattern for the version string. This can be achieved using AMF validation profile syntax in the following way: - - -``` -validations: - - version-constraints: - message: Version is mandatory and must be a semantic version M.m.r? - targetClass: schema.WebAPI - propertyConstraints: - schema.version: - minCount: 1 - pattern: "\d+\.\d+(\.\d+)?" -``` - -This snippet of text declares a new data shape (identified by 'version-constraints') for all instances of the `schema:WebAPI` class where for the `schema.version` property the minimum count of the property must be 1 (making it mandatory) and the value of the property must match the provided regular expression. - -AMF validation will parse this data shape definition and validate that the model complies with all the data shapes defined. If some constraints are not met, a validation report including the node in the graph that violates the constraint, the identifier of the violated constraint and property, a descriptive message and information about the location in the input document of the model information violating the constraint will be generated. - -### Validation Profiles - -In order to use data shapes in any realistic way, a number of data shapes must be defined and re-used together many times to provide a consistency in different RAML documents. We call these sets of related validations 'validation profiles'. AMF allows customers to define validation profiles using a declarative validation syntax. - -Additionally, profiles also support the notion of a severity level for each validation, ranging from `VIOLATION` to `INFO`, that can be attached to each specific data shape in the profile. - -Profiles can extend other profiles, adding or re-defining validations, changing the severity level or disabling some of the base profile validations. - -AMF includes by default 3 validation profiles: [RAML](validations/raml_profile.raml), [OpenAPI](validations/openapi_profile.raml) and [AMF](validations/amf_profile.raml) that follow respectively the constraints defined in the RAML 1.0 specification, OpenAPI 2.0 specification and the common set of validations across both specifications. - -For example, the OpenAPI profile defines a validation to make the 'schema:version' property mandatory (identified by amf-parser.mandatory-api-version), but the RAML profile doesn't include this validation since it is not mandatory in RAML. - -AMF clients can decide if they want to use the OpenAPI or RAML standard profile, create a custom profile inheriting from each of these but adapting some of the data shapes to their own needs or to create a new validation profile completely from scratch. - - -### Validation architecture - -This section describes the technical details of the AMF validation mechanism. If you are just interested into using the validation mechanism and you are not interested into advanced use cases like using SHACL directly, this section can be safely skipped. - -The following diagram shows the main components of the validation mechanism in AMF: - -![validation arch](images/validation/validation_arch.png) - -Validation involves two model graphs: - -- data graph - -Generated after parsing the input RAML/OAS document, containing all the information in the domain model, like the HTTP API - -- shapes graph - -Generated after parsing a custom or standard validation profile and containing restrictions about the shape of the domain entities in the data graph. Shapes are expressed as SHACL shapes. - -The following diagram shows the standard data shapes that can be expressed in SHACL: - -![shacl shapes](images/validation/shacl_diagram.png) - -Additional shapes can be added to SHACL to define new types of validations. Additionally SHACL also supports JavaScript constraints that can be defined inline as JavaScript code or collected into validation libraries. - -Both graphs, the data graph and the shapes graph, can be serialised using AMF as [JSON-LD](https://www.w3.org/TR/json-ld/) documents containing all the information about the graph. - -In order to trigger the validation, both graphs are passed to the standard SHACL 1.0 library that will compute the potential violations according to SHACL semantics and generate a validation report as an output data graph. -This report can be serialised as a JSON-LD document that can be processed by machines or as a human-friendly textual report. - -## Validation Profile syntax - -Validation profile documents are defined as a [AML Dialect extension](https://github.com/mulesoft/amf/blob/master/vocabularies/dialects/validation.raml) (see the documentation about RAML Vocabulary and Dialect to know how to work with RAML extensions). - -### Header and dialect document type - -The header identifying the Validation Profile dialect and the current 1.0 version is: - -``` yaml -#%Validation Profile 1.0 -``` - -This header is mandatory in all validation profile documents. - - -### Profile node - -The main node in a Validation Profile document is the Profile node. - -These are the possible properties in the node: - -| property | description | range | allow multiple values | is map | -| --- | --- | --- | --- | --- | -| profile | Name for the custom profile | string | false | false | -| prefixes | Map of prefixes used to build identifiers in validation of dialects | (String,String) | true | true | -| description? | Human readable description of the profile | string | false | false | -| extends? | Base profile this profile is extending | string: RAML, OpenAPI, AMF | false | false | -| violation? | List of validations identifiers that will have VIOLATION severity | string | true | true | -| warning? | List of validations identifiers that will have WARNING severity | string | true | false | -| info? | List of validations identifiers that will have INFO severity | string | true | false | -| disabled? | List of validations from the extended profile that will be disabled | string | true | false | -| validations? | List of custom data shapes defining validations in this profile | ShapeValidation node or FunctionValidation node | - | true | - - -In order to change the severity level or disable a validation, the identifier of the validation must be added to the right section of the document. -Refer to the list of standard validations defined for each profile to find which validations can be modified. - -The following example defines a new profile named `Custom` extending the [RAML standard profile](validations/raml_profile.raml) and disabling the `amf-parser.raml-status-code` validation including in that profile. - -``` yaml -#%Validation Profile 1.0 - -profile: Custom - -extends: RAML - -disabled: - - amf-parser.raml-status-code -``` - -Also note that declaring a validation to the map of `validations` does not automatically enable it. Custom validation must still be added to the section with the right severity level for them to be effective. - -Review the Validation Profile documents for the standard profiles to review the list of standard validations and their definitions: - -- [AMF](validations/amf_profile.raml) -- [RAML](validations/raml_profile.raml) -- [OpenAPI](validations/openapi_profile.raml) - -### Identifying classes and properties - -AMF Validation support identifiers for the standard domain elements generated by the AMF parser for RAML and OpenAPI. -If you want to other classes and properties, for example when working with dialects, the URI of the element or register a prefix to use CURIEs: - -```yaml -#%Validation Profile 1.0 - -profile: Custom Profile for My Vocabulary - -prefixes: - myvocab: http://myorg.com/vocabularies/myvocab# -``` - -Now we could identify target classes and properties using CURIEs like `myvocab.MyClass` or `myvocab.MyProperty`. - -### ShapeValidation node - -Custom data shapes can be defined declaratively as `ShapeValidation` nodes that can be added to the `validations` property in the profile document. - -These are the properties of a shape validation: - -| property | description | range | alllow multiple values | is map | -| --- | --- | --- | --- | --- | -| message? | Error message that will be returned in case of a violation | string | false | false | -| targetClass | Identifier of the class in the AMF parsed model the data shape will be validating. It must be a valid class identifier in the model | string | false | false | -| propertyConstraints | map of property constraints for the data shape | PropertyConstriaint node | - | true | - -Check the list of target class identifiers to find classes in the AMF model that can be the target of the data shape in the appendix at the end of this document. - -Each data shape can contain one or more constraints over properties for the class defined in a property constraint node. - -The following example introduces a shape validation redefining the valid values for the status code of a response: - -``` yaml -#%Validation Profile 1.0 - -profile: Custom - -extends: RAML - -disabled: - - amf-parser.raml-status-code - -violation: - - my-status-code - -validations: - - my-status-code: - message: Invalid status code value - targetClass: http.statusCode - propertyConstraint: hydra.statusCode - hydra.statusCode: - pattern: ^(ok|failure|exception)$ -``` - -After adding this constrint and disabling the standard RAML status code validation, the following fragment from RAML document will be valid: - -``` yaml -/endpoint: - get: - responses: - ok: - failure: - exception: -``` - -### PropertyConstraint node - -Each property constraint node is built as a map with keys targeting properties in the AMF parsed model and the constraints for that property in the model. - -The following table defines the constraints that can be used to define the shape of the property in the model: - -| property | description | range | alllow multiple values | is map | -| --- | --- | --- | --- | --- | -| pattern? | Regular expression | string | false | false | -| minLength? | Minimum length of a string | integer | false | false | -| maxLength? | Maximum length of a string | integer | false | false | -| maxCount? | Maximum cardinality for the parsed property | integer | false | false | -| minCount? | Minimum cardinality for the parsed property | integer | false | false | -| minExclusive? | Minimum exclusive value for the parsed property | number | false | false | -| maxExclusive? | Maximum exclusive value for the parsed property | number | false | false | -| minInclusive? | Minimum inclusive value for the parsed property | number | false | false | -| maxInclusive? | Maximum inclusive value for the parsed property | number | false | false | -| in? | Enumeration of values allowed for the property | any | true | false | -| range? | Literal range of a property from string, integer, float, anyUri, boolean | false | false | - - -A single property constraint can have more than one constraint in the map of constraints. - - -### FunctionValidation node - -Alternatively, validations can be defined programmatically using JavaScript functions. - -FunctionConstraint nodes are added to the `validations` property by the name of the function constraint and can have the following properties: - -| property | description | range | alllow multiple values | is map | -| --- | --- | --- | --- | --- | -| message? | Error message that will be returned in case of a violation | string | false | false | -| targetClass | Identifier of the class in the AMF parsed model the data shape will be validating. It must be a valid class identifier in the model | string | false | false | -| code? | JavaScript function that will be invoked to check if a violation has happened for the instance of the target class passed as an argument | string | false | false | -| libraries? | URLs pointing to JavaScript files including function definitions that will can be used in the validation | string | true | false | -| functionName? | Name of a function in one of the libraries that will be used to check if a violation has happend for the instance of the target class passed as an argument | string | false | false | - -Validation functions must be coded as anonymous functions accepting as single input the node in the model encoded as JSON-LD in expanded form that is an instance of `targetClass`. -Validation functions must return `true` if no constraint violation is found or `false` to signal a validation error. - -#### JS Validation API - -AMF validation provides a minimal interface to help build the validation functions: - -In order to traverse the model, prefixes for all the namespaces in the model have been defined: - -``` json -{ - "raml-shapes":"http://raml.org/vocabularies/shapes#", - "shacl": "http://www.w3.org/ns/shacl#", - "amf-parser": "http://raml.org/vocabularies/amf/parser#", - "rdfs": "http://www.w3.org/2000/01/rdf-schema#", - "doc": "http://raml.org/vocabularies/document#", - "data": "http://raml.org/vocabularies/data#", - "owl": "http://www.w3.org/2002/07/owl#", - "meta": "http://raml.org/vocabularies/meta#", - "sourcemaps": "http://raml.org/vocabularies/document-source-maps#", - "rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#", - "xsd": "http://www.w3.org/2001/XMLSchema#", - "schema": "http://schema.org/", - "http": "http://raml.org/vocabularies/http#", - "sh": "http://www.w3.org/ns/shacl#", - "hydra": "http://www.w3.org/ns/hydra/core#", - "amf-parser": "http://a.ml/vocabularies/amf/parser#", - "amf-core": "http://a.ml/vocabularies/amf/core#", - "amf-resolution": "http://a.ml/vocabularies/amf/resolution#", - "amf-validation": "http://a.ml/vocabularies/amf/validation#", - "amf-render": "http://a.ml/vocabularies/amf/render#" -} -``` - -This means that validation code can use [CURIEs](http://www.w3.org/TR/curie) to traverse the model JSON-LD structure instead of full URIs - -For example the following validation targets the requests in the endpoints. In the validation function to get to the headers, we can just use `http:header` instead of the full URI `http://raml.org/vocabularies/http#header`: -Notice that since we are working with the JSON-LD graph in expanded form, the value of a property will always be an array, even if the property has a single value. - -``` yaml -validations: - - test-validation: - message: All requests should have headers - targetClass: http.Request - functionConstraint: - code: | - function(request) { - var headers = request[http:header]; - return headers.length > 0; - } -``` - -Sometimes we need to traverse the model from the root node using a chain of properties. the `path` function can be used for this. It accepts a sequence of properties and will try to follow the path returning all the accumulated values found for the path. -Paths are expressed as sequences of CURIEs joined by the `/` separator. - -For example, imagine we need to modify the previous validation to check that a particular header with a name is present in all the requests. In order to do this, we need to traverse from the http:Request to the header (http:header) and from there to the name of each header (schema:header) and check that the name of the property is present. Instead of nesting loops, we could use the `path` property for this: - -``` yaml -validations: - - test-validation: - message: Header x-token is mandatory in all requests - targetClass: http.Request - functionConstraint: - code: | - function(request) { - var pathChain = 'http:header / schema:name'; - var headerNames = path(request, pathChain); - for (var i=0; i name) + Seq( + Compile / packageBin / packageOptions += Package.ManifestAttributes(pair) + ) + } +}