From c82c2e8555baf412e301c7a0bd6b9f68b741c8f9 Mon Sep 17 00:00:00 2001 From: Tomas Fernandez Date: Wed, 4 Jan 2023 15:38:38 -0300 Subject: [PATCH 1/2] (interface): make withAliases public --- .../amf/apicontract/client/scala/AMFConfiguration.scala | 4 ++++ .../scala/amf/shapes/client/scala/ShapesConfiguration.scala | 5 +++++ .../client/scala/config/JsonLDSchemaConfiguration.scala | 4 ++++ 3 files changed, 13 insertions(+) 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 2688e3bfe1..d5af01ab16 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 @@ -31,6 +31,7 @@ import amf.core.client.scala.model.domain.AnnotationGraphLoader import amf.core.client.scala.parse.AMFParsePlugin import amf.core.client.scala.resource.ResourceLoader import amf.core.client.scala.transform.TransformationPipeline +import amf.core.client.scala.vocabulary.NamespaceAliases import amf.core.internal.metamodel.ModelDefaultBuilder import amf.core.internal.plugins.AMFPlugin import amf.core.internal.plugins.parse.DomainParsingFallback @@ -413,6 +414,9 @@ class AMFConfiguration private[amf] ( override def withPlugins(plugins: List[AMFPlugin[_]]): AMFConfiguration = super._withPlugins(plugins) + override def withAliases(aliases: NamespaceAliases): AMFConfiguration = + super._withAliases(aliases) + private[amf] override def withEntities(entities: Map[String, ModelDefaultBuilder]): AMFConfiguration = super._withEntities(entities) 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 d4cbbdf94c..881b5bdc83 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 @@ -13,6 +13,7 @@ import amf.core.client.scala.model.domain.AnnotationGraphLoader import amf.core.client.scala.parse.AMFParsePlugin import amf.core.client.scala.resource.ResourceLoader import amf.core.client.scala.transform.TransformationPipeline +import amf.core.client.scala.vocabulary.NamespaceAliases import amf.core.internal.metamodel.ModelDefaultBuilder import amf.core.internal.plugins.AMFPlugin import amf.core.internal.plugins.parse.DomainParsingFallback @@ -20,6 +21,7 @@ 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.config.JsonLDSchemaConfiguration import amf.shapes.client.scala.plugin.JsonSchemaShapePayloadValidationPlugin import amf.shapes.internal.annotations.ShapeSerializableAnnotations import amf.shapes.internal.convert.ShapesRegister @@ -163,6 +165,9 @@ class ShapesConfiguration private[amf] ( private[amf] override def withEntities(entities: Map[String, ModelDefaultBuilder]): ShapesConfiguration = super._withEntities(entities) + override def withAliases(aliases: NamespaceAliases): ShapesConfiguration = + super._withAliases(aliases) + private[amf] override def withExtensions(dialect: Dialect): ShapesConfiguration = { super.withExtensions(dialect).asInstanceOf[ShapesConfiguration] } 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 ed8a9439c1..4b6bf0dc34 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 @@ -10,6 +10,7 @@ import amf.core.client.scala.model.domain.AnnotationGraphLoader import amf.core.client.scala.parse.AMFParsePlugin import amf.core.client.scala.resource.ResourceLoader import amf.core.client.scala.transform.TransformationPipeline +import amf.core.client.scala.vocabulary.NamespaceAliases import amf.core.internal.metamodel.ModelDefaultBuilder import amf.core.internal.plugins.AMFPlugin import amf.core.internal.plugins.parse.DomainParsingFallback @@ -167,6 +168,9 @@ class JsonLDSchemaConfiguration private[amf] ( override def withEventListener(listener: AMFEventListener): JsonLDSchemaConfiguration = super._withEventListener(listener) + override def withAliases(aliases: NamespaceAliases): JsonLDSchemaConfiguration = + super._withAliases(aliases) + private[amf] override def withEntities(entities: Map[String, ModelDefaultBuilder]): JsonLDSchemaConfiguration = super._withEntities(entities) From 3c55adec021dcaa59fa06e648a3ab44a9b529433 Mon Sep 17 00:00:00 2001 From: Loose Date: Fri, 6 Jan 2023 09:51:07 -0300 Subject: [PATCH 2/2] Bump amf-validation dialects versions --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index fed87318b6..a8f1bea4c5 100644 --- a/build.sbt +++ b/build.sbt @@ -305,8 +305,8 @@ lazy val adhocCli = (project in file("adhoc-cli")) .settings( version := "0.1-SNAPSHOT", publishTo := Some(snapshots), - libraryDependencies += "com.github.amlorg" %% "amf-validation-profile-dialect" % "1.3.0-SNAPSHOT", - libraryDependencies += "com.github.amlorg" %% "amf-validation-report-dialect" % "1.2.0-SNAPSHOT", + libraryDependencies += "com.github.amlorg" %% "amf-validation-profile-dialect" % "1.3.0", + libraryDependencies += "com.github.amlorg" %% "amf-validation-report-dialect" % "1.1.0", libraryDependencies += "commons-io" % "commons-io" % "2.11.0", libraryDependencies += "org.mule.common" %%% "scala-common-test" % "0.0.10" % Test )