Merge pull request #467 from aml-org/publish-6.0.4

publish 6.0.4
aml-org · Feb 7, 2022 · 84151a0 · 84151a0
2 parents 4ecfe49 + 2007b46
commit 84151a0
Show file tree

Hide file tree

Showing 38 changed files with 148 additions and 110 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,7 @@ FROM ubuntu:18.04
 ARG USER_HOME_DIR="/root"
 
 ENV SCALA_VERSION 2.12.11
-ENV SBT_VERSION 1.3.9
+ENV SBT_VERSION 1.6.1
 
 # Update the repository sources list and install dependencies
 RUN apt-get update
@@ -43,7 +43,7 @@ RUN \
   curl -L -o sbt-$SBT_VERSION.deb https://scala.jfrog.io/artifactory/debian/sbt-$SBT_VERSION.deb && \
   dpkg -i sbt-$SBT_VERSION.deb && \
   rm sbt-$SBT_VERSION.deb && \
-  sbt sbtVersion
+  sbt -Dsbt.rootdir=true sbtVersion
 
 VOLUME "$USER_HOME_DIR/.sbt"
 

diff --git a/amf-aml/shared/src/main/scala/amf/aml/client/platform/model/domain/AnnotationMapping.scala b/amf-aml/shared/src/main/scala/amf/aml/client/platform/model/domain/AnnotationMapping.scala
@@ -59,6 +59,10 @@ case class AnnotationMapping(override private[amf] val _internal: InternalAnnota
     _internal.withAllowMultiple(allow)
     this
   }
+  def withDomain(domains: ClientList[String]): AnnotationMapping = {
+    _internal.withDomain(domains.asInternal)
+    this
+  }
   def withEnum(values: ClientList[Any]): AnnotationMapping = {
     _internal.withEnum(values.asInternal)
     this

diff --git a/amf-aml/shared/src/main/scala/amf/aml/client/scala/model/document/Dialect.scala b/amf-aml/shared/src/main/scala/amf/aml/client/scala/model/document/Dialect.scala
@@ -103,6 +103,8 @@ case class Dialect(fields: Fields, annotations: Annotations)
     usesKeyProperty.contains(true)
   }
 
+  private[amf] def hasExtensions(): Boolean = this.extensions().nonEmpty
+
   private[amf] def usesHeaderMatching: Boolean = !usesKeyPropertyMatching
   private[amf] def extensionIndex: Map[String, Dialect] =
     extensions().map(e => e.extensionName().value() -> this).toMap

diff --git a/...l/shared/src/main/scala/amf/aml/internal/parse/instances/DialectInstancePatchParser.scala b/...l/shared/src/main/scala/amf/aml/internal/parse/instances/DialectInstancePatchParser.scala
@@ -4,6 +4,7 @@ import amf.core.internal.parser.{Root, YMapOps}
 import amf.aml.client.scala.model.document.DialectInstancePatch
 import amf.aml.internal.validate.DialectValidations.DialectError
 import amf.core.internal.unsafe.PlatformSecrets
+import amf.core.internal.utils.UriUtils
 import org.yaml.model.YType
 
 class DialectInstancePatchParser(root: Root)(implicit override val ctx: DialectInstanceContext)
@@ -20,7 +21,7 @@ class DialectInstancePatchParser(root: Root)(implicit override val ctx: DialectI
   private def checkTarget(patch: DialectInstancePatch): DialectInstancePatch = {
     map.key("$target") match {
       case Some(entry) if entry.value.tagType == YType.Str =>
-        patch.withExtendsModel(platform.resolvePath(entry.value.as[String]))
+        patch.withExtendsModel(UriUtils.resolvePath(entry.value.as[String]))
 
       case Some(entry) =>
         ctx.eh.violation(DialectError, patch.id, "Patch $target must be a valid URL", entry.value.location)

diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/parse/instances/JsonPointerResolver.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/parse/instances/JsonPointerResolver.scala
@@ -6,6 +6,7 @@ import org.yaml.model.YMap
 import amf.core.internal.parser.domain.BaseSpecParser
 import amf.core.internal.parser.{Root, YMapOps}
 import amf.core.internal.unsafe.PlatformSecrets
+import amf.core.internal.utils.UriUtils
 
 /*
  * TODO: should be a class which is passed as parameter to the dialect instance parser. Most of all because of the resolvedPath(String) and basePath(String) methods.
@@ -51,9 +52,9 @@ object JsonPointerResolver extends NodeMappableHelper with PlatformSecrets {
       else basePath(base) + str
     if (fullPath.contains("#")) {
       val parts = fullPath.split("#")
-      platform.resolvePath(parts.head) + "#" + parts.last
+      UriUtils.resolvePath(parts.head) + "#" + parts.last
     } else {
-      platform.resolvePath(fullPath)
+      UriUtils.resolvePath(fullPath)
     }
   }
 

diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/utils/VocabulariesRegister.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/utils/VocabulariesRegister.scala
@@ -5,18 +5,17 @@ import amf.aml.client.platform.model.domain._
 import amf.aml.client.scala.model.{document, domain}
 import amf.aml.internal.metamodel.document._
 import amf.aml.internal.metamodel.domain._
-import amf.core.internal.convert.CoreRegister
+import amf.core.internal.convert.UniqueInitializer
 import amf.core.internal.metamodel.Obj
 import amf.core.internal.remote.Platform
 import amf.core.internal.unsafe.PlatformSecrets
 
-object VocabulariesRegister extends PlatformSecrets {
+object VocabulariesRegister extends UniqueInitializer with PlatformSecrets {
 
   // TODO ARM remove when APIMF-3000 is done
   def register(): Unit = register(platform)
 
-  def register(platform: Platform): Unit = {
-    CoreRegister.register(platform)
+  def register(platform: Platform): Unit = if (shouldInitialize) {
 
     val p: (Obj) => Boolean = (x: Obj) => x.isInstanceOf[DialectDomainElementModel]
     platform.registerWrapperPredicate(p) {

diff --git a/amf-aml/shared/src/test/scala/amf/testing/common/cycling/BuildCycleTestCommon.scala b/amf-aml/shared/src/test/scala/amf/testing/common/cycling/BuildCycleTestCommon.scala
@@ -2,11 +2,11 @@ package amf.testing.common.cycling
 
 import amf.aml.client.scala.AMLConfiguration
 import amf.core.client.scala.AMFGraphConfiguration
-import amf.core.io.FileAssertionTest
 import amf.core.client.scala.model.document.BaseUnit
-import amf.core.internal.remote.Syntax.Syntax
-import amf.core.internal.remote.{Hint, Spec}
 import amf.core.internal.parser.{AMFCompiler, CompilerContextBuilder}
+import amf.core.internal.remote.Spec
+import amf.core.internal.remote.Syntax.Syntax
+import amf.core.io.FileAssertionTest
 import amf.testing.common.utils.AMFRenderer
 
 import scala.concurrent.{ExecutionContext, Future}

diff --git a/amf-aml/shared/src/test/scala/amf/testing/common/jsonld/MultiJsonLDAsyncFunSuite.scala b/amf-aml/shared/src/test/scala/amf/testing/common/jsonld/MultiJsonLDAsyncFunSuite.scala
@@ -4,7 +4,8 @@ import amf.core.client.scala.config.RenderOptions
 import amf.core.internal.plugins.document.graph.{EmbeddedForm, FlattenedForm, JsonLdDocumentForm}
 import amf.testing.common.jsonld
 import org.scalactic.Fail
-import org.scalatest.{Assertion, AsyncFunSuite}
+import org.scalatest.Assertion
+import org.scalatest.funsuite.AsyncFunSuite
 
 import scala.concurrent.Future
 

diff --git a/amf-aml/shared/src/test/scala/amf/testing/common/utils/DialectInstanceTester.scala b/amf-aml/shared/src/test/scala/amf/testing/common/utils/DialectInstanceTester.scala
@@ -2,7 +2,6 @@ package amf.testing.common.utils
 
 import amf.core.client.scala.config.RenderOptions
 import amf.core.internal.remote.Syntax.Syntax
-import amf.core.internal.remote.{Hint, Spec}
 import amf.testing.common.cycling.FunSuiteCycleTests
 import org.scalatest.Assertion
 

diff --git a/amf-aml/shared/src/test/scala/amf/testing/common/utils/DialectInstanceValidation.scala b/amf-aml/shared/src/test/scala/amf/testing/common/utils/DialectInstanceValidation.scala
@@ -3,7 +3,7 @@ package amf.testing.common.utils
 import amf.aml.client.scala.AMLConfiguration
 import amf.core.client.scala.validation.AMFValidationReport
 import amf.core.internal.unsafe.PlatformSecrets
-import org.scalatest.AsyncFunSuite
+import org.scalatest.funsuite.AsyncFunSuite
 
 import scala.concurrent.Future
 

diff --git a/amf-aml/shared/src/test/scala/amf/testing/common/utils/DialectRegistrationHelper.scala b/amf-aml/shared/src/test/scala/amf/testing/common/utils/DialectRegistrationHelper.scala
@@ -6,7 +6,6 @@ import amf.aml.internal.transform.pipelines.DialectTransformationPipeline
 import amf.core.client.scala.errorhandling.DefaultErrorHandler
 import amf.core.client.scala.transform.TransformationPipelineRunner
 import amf.core.internal.parser.{AMFCompiler, CompilerContextBuilder}
-import amf.core.internal.remote.Aml
 import amf.core.internal.unsafe.PlatformBuilder.platform
 
 import scala.concurrent.{ExecutionContext, Future}

diff --git a/amf-aml/shared/src/test/scala/amf/testing/common/utils/DialectValidation.scala b/amf-aml/shared/src/test/scala/amf/testing/common/utils/DialectValidation.scala
@@ -1,13 +1,10 @@
 package amf.testing.common.utils
 
 import amf.aml.client.scala.AMLConfiguration
-import amf.core.client.scala.errorhandling.DefaultErrorHandler
-import amf.core.internal.validation.ValidationConfiguration
-import amf.core.internal.unsafe.PlatformSecrets
 import amf.core.client.scala.validation.AMFValidationReport
-import amf.core.internal.parser.{AMFCompiler, CompilerContextBuilder}
-import amf.aml.client.scala.model.document.Dialect
-import org.scalatest.{Assertion, AsyncFunSuite}
+import amf.core.internal.unsafe.PlatformSecrets
+import org.scalatest.Assertion
+import org.scalatest.funsuite.AsyncFunSuite
 
 import scala.concurrent.Future
 

diff --git a/amf-aml/shared/src/test/scala/amf/testing/common/utils/DomainElementCycleTests.scala b/amf-aml/shared/src/test/scala/amf/testing/common/utils/DomainElementCycleTests.scala
@@ -1,16 +1,15 @@
 package amf.testing.common.utils
 
 import amf.aml.client.scala.AMLConfiguration
-import amf.aml.client.scala.model.document.DialectInstanceUnit
-import amf.aml.internal.render.plugin.AMLDialectInstanceRenderingPlugin
 import amf.core.client.scala.model.document.BaseUnit
 import amf.core.client.scala.model.domain.DomainElement
 import amf.core.client.scala.parse.document.SyamlParsedDocument
 import amf.core.internal.plugins.syntax.SyamlSyntaxRenderPlugin
 import amf.core.internal.remote.Hint
 import amf.core.internal.remote.Mimes._
 import amf.core.io.FileAssertionTest
-import org.scalatest.{Assertion, AsyncFunSuite}
+import org.scalatest.Assertion
+import org.scalatest.funsuite.AsyncFunSuite
 import org.yaml.model.{YDocument, YNode}
 
 import java.io.StringWriter

diff --git a/amf-aml/shared/src/test/scala/amf/testing/common/utils/ReportComparator.scala b/amf-aml/shared/src/test/scala/amf/testing/common/utils/ReportComparator.scala
@@ -1,10 +1,11 @@
 package amf.testing.common.utils
 
-import amf.core.io.FileAssertionTest
-import amf.core.internal.unsafe.PlatformSecrets
 import amf.core.client.scala.validation.AMFValidationReport
+import amf.core.internal.unsafe.PlatformSecrets
+import amf.core.io.FileAssertionTest
 import amf.validation.internal.emitters.ValidationReportJSONLDEmitter
-import org.scalatest.{Assertion, Matchers}
+import org.scalatest.Assertion
+import org.scalatest.matchers.should.Matchers
 
 import scala.concurrent.{ExecutionContext, Future}
 

diff --git a/amf-aml/shared/src/test/scala/amf/testing/config/AMLConfigurationPluginTest.scala b/amf-aml/shared/src/test/scala/amf/testing/config/AMLConfigurationPluginTest.scala
@@ -5,7 +5,9 @@ import amf.aml.client.scala.model.domain.NodeMapping
 import amf.aml.internal.parse.plugin.AMLDialectInstanceParsingPlugin
 import amf.aml.internal.render.plugin.AMLDialectInstanceRenderingPlugin
 import amf.core.internal.resource.AMFResolvers.platform.fs
-import org.scalatest.{Assertion, AsyncFunSuite, Matchers}
+import org.scalatest.Assertion
+import org.scalatest.funsuite.AsyncFunSuite
+import org.scalatest.matchers.should.Matchers
 
 import scala.concurrent.{ExecutionContext, Future}
 

diff --git a/amf-aml/shared/src/test/scala/amf/testing/rdf/DialectRDFTest.scala b/amf-aml/shared/src/test/scala/amf/testing/rdf/DialectRDFTest.scala
@@ -2,8 +2,7 @@ package amf.testing.rdf
 
 import amf.aml.client.scala.AMLConfiguration
 import amf.core.client.scala.config.RenderOptions
-import amf.core.internal.remote.Syntax.Syntax
-import amf.core.internal.remote.{Amf, Aml, Syntax, VocabularyYamlHint}
+import amf.core.internal.remote.Syntax
 import amf.core.internal.unsafe.PlatformSecrets
 import amf.testing.common.cycling.FunSuiteRdfCycleTests
 import amf.testing.common.utils.AMLParsingHelper

diff --git a/amf-aml/shared/src/test/scala/amf/testing/render/ParsedDialectRenderTest.scala b/amf-aml/shared/src/test/scala/amf/testing/render/ParsedDialectRenderTest.scala
@@ -1,8 +1,6 @@
 package amf.testing.render
 
-import amf.core.client.scala.errorhandling.DefaultErrorHandler
-import amf.core.client.scala.errorhandling.UnhandledErrorHandler
-import amf.core.internal.remote.VocabularyYamlHint
+import amf.core.client.scala.errorhandling.{DefaultErrorHandler, UnhandledErrorHandler}
 import amf.core.internal.unsafe.PlatformSecrets
 import amf.testing.common.cycling.FunSuiteCycleTests
 

diff --git a/amf-aml/shared/src/test/scala/amf/testing/resolution/DialectProductionResolutionTest.scala b/amf-aml/shared/src/test/scala/amf/testing/resolution/DialectProductionResolutionTest.scala
@@ -1,9 +1,9 @@
 package amf.testing.resolution
 
 import amf.aml.client.scala.AMLConfiguration
-import amf.core.client.scala.model.document.BaseUnit
-import amf.core.internal.remote.{Aml, Syntax, VocabularyYamlHint}
 import amf.aml.internal.transform.pipelines.DefaultAMLTransformationPipeline
+import amf.core.client.scala.model.document.BaseUnit
+import amf.core.internal.remote.Syntax
 import amf.testing.common.cycling.FunSuiteCycleTests
 import amf.testing.common.utils.DialectInstanceTester
 

diff --git a/amf-aml/shared/src/test/scala/amf/testing/semantic/AppliedExtensionTest.scala b/amf-aml/shared/src/test/scala/amf/testing/semantic/AppliedExtensionTest.scala
@@ -1,19 +1,21 @@
 package amf.testing.semantic
 
-import amf.aml.client.scala.model.domain.DialectDomainElement
-import amf.aml.client.scala.model.document.DialectInstance
 import amf.aml.client.scala.AMLConfiguration
+import amf.aml.client.scala.model.document.DialectInstance
+import amf.aml.client.scala.model.domain.DialectDomainElement
 import amf.core.client.scala.errorhandling.UnhandledErrorHandler
 import amf.core.internal.annotations.LexicalInformation
 import amf.core.internal.parser.domain.Value
-import org.scalatest.{Assertion, AsyncFunSuite, Matchers}
+import org.scalatest.Assertion
+import org.scalatest.funsuite.AsyncFunSuite
+import org.scalatest.matchers.should.Matchers
 
 import scala.concurrent.{ExecutionContext, Future}
 
 class AppliedExtensionTest extends AsyncFunSuite with Matchers {
 
-  val basePath                           = "file://amf-aml/shared/src/test/resources/vocabularies2/semantic/"
-  override implicit val executionContext = ExecutionContext.Implicits.global
+  val basePath                                             = "file://amf-aml/shared/src/test/resources/vocabularies2/semantic/"
+  override implicit val executionContext: ExecutionContext = ExecutionContext.Implicits.global
 
   test("Applied extensions") {
     assertModel("dialect-extensions.yaml", "instance.yaml") { instance =>

diff --git a/amf-aml/shared/src/test/scala/amf/testing/semantic/JsonLdSemanticExtensionsParserTest.scala b/amf-aml/shared/src/test/scala/amf/testing/semantic/JsonLdSemanticExtensionsParserTest.scala
@@ -4,7 +4,8 @@ import amf.aml.client.scala.AMLConfiguration
 import amf.aml.client.scala.model.document.DialectInstance
 import amf.core.client.scala.config.RenderOptions
 import amf.core.client.scala.errorhandling.UnhandledErrorHandler
-import org.scalatest.{AsyncFunSuite, Matchers}
+import org.scalatest.funsuite.AsyncFunSuite
+import org.scalatest.matchers.should.Matchers
 
 import scala.concurrent.{ExecutionContext, Future}
 

diff --git a/amf-aml/shared/src/test/scala/amf/testing/semantic/JsonLdSemanticExtensionsRenderTest.scala b/amf-aml/shared/src/test/scala/amf/testing/semantic/JsonLdSemanticExtensionsRenderTest.scala
@@ -7,7 +7,6 @@ import amf.core.client.scala.model.document.BaseUnit
 import amf.core.internal.remote.Syntax.JsonLd
 import amf.testing.common.cycling.FunSuiteCycleTests
 import org.mulesoft.common.test.AsyncBeforeAndAfterEach
-import org.scalatest.{AsyncFunSuite, BeforeAndAfterEachTestData, Matchers}
 
 import scala.concurrent.Future
 

diff --git a/amf-aml/shared/src/test/scala/amf/testing/semantic/SemanticTransformationStageTest.scala b/amf-aml/shared/src/test/scala/amf/testing/semantic/SemanticTransformationStageTest.scala
@@ -4,7 +4,9 @@ import amf.aml.client.scala.AMLConfiguration
 import amf.aml.client.scala.model.document.DialectInstance
 import amf.aml.client.scala.model.domain.DialectDomainElement
 import amf.core.client.scala.errorhandling.UnhandledErrorHandler
-import org.scalatest.{Assertion, AsyncFunSuite, Matchers}
+import org.scalatest.Assertion
+import org.scalatest.funsuite.AsyncFunSuite
+import org.scalatest.matchers.should.Matchers
 
 import scala.concurrent.{ExecutionContext, Future}
 

diff --git a/amf-aml/shared/src/test/scala/amf/testing/unclassified/DialectForInstanceTest.scala b/amf-aml/shared/src/test/scala/amf/testing/unclassified/DialectForInstanceTest.scala
@@ -1,7 +1,9 @@
 package amf.testing.unclassified
 
 import amf.aml.client.scala.AMLConfiguration
-import org.scalatest.{Assertion, AsyncFunSuite, Matchers}
+import org.scalatest.Assertion
+import org.scalatest.funsuite.AsyncFunSuite
+import org.scalatest.matchers.should.Matchers
 
 import scala.concurrent.{ExecutionContext, Future}
 

diff --git a/amf-aml/shared/src/test/scala/amf/testing/unclassified/IteratorTest.scala b/amf-aml/shared/src/test/scala/amf/testing/unclassified/IteratorTest.scala
@@ -1,9 +1,8 @@
 package amf.testing.unclassified
 
 import amf.core.client.scala.model.domain.DomainElement
-import amf.core.internal.remote.VocabularyYamlHint
 import amf.testing.common.utils.DialectTests
-import org.scalatest.Matchers
+import org.scalatest.matchers.should.Matchers
 
 import scala.concurrent.ExecutionContext
 

diff --git a/amf-aml/shared/src/test/scala/amf/testing/unclassified/OOInterfaceTest.scala b/amf-aml/shared/src/test/scala/amf/testing/unclassified/OOInterfaceTest.scala
@@ -2,7 +2,8 @@ package amf.testing.unclassified
 
 import amf.aml.client.scala.AMLConfiguration
 import amf.aml.client.scala.model.domain.DialectDomainElement
-import org.scalatest.{AsyncFunSuite, Matchers}
+import org.scalatest.funsuite.AsyncFunSuite
+import org.scalatest.matchers.should.Matchers
 
 import scala.concurrent.ExecutionContext
 

diff --git a/amf-aml/shared/src/test/scala/amf/testing/unclassified/SemanticExtensionParserTest.scala b/amf-aml/shared/src/test/scala/amf/testing/unclassified/SemanticExtensionParserTest.scala
@@ -1,7 +1,9 @@
 package amf.testing.unclassified
 
 import amf.aml.client.scala.AMLConfiguration
-import org.scalatest.{Assertion, AsyncFunSuite, Matchers}
+import org.scalatest.Assertion
+import org.scalatest.funsuite.AsyncFunSuite
+import org.scalatest.matchers.should.Matchers
 
 import scala.concurrent.{ExecutionContext, Future}
 

diff --git a/amf-aml/shared/src/test/scala/amf/testing/validation/DialectDefinitionValidationTest.scala b/amf-aml/shared/src/test/scala/amf/testing/validation/DialectDefinitionValidationTest.scala
@@ -1,7 +1,8 @@
 package amf.testing.validation
 
 import amf.testing.common.utils.DialectValidation
-import org.scalatest.{AsyncFunSuite, Matchers}
+import org.scalatest.funsuite.AsyncFunSuite
+import org.scalatest.matchers.should.Matchers
 
 import scala.concurrent.ExecutionContext
 

diff --git a/...aml/shared/src/test/scala/amf/testing/validation/VocabularyDefinitionValidationTest.scala b/...aml/shared/src/test/scala/amf/testing/validation/VocabularyDefinitionValidationTest.scala
@@ -1,15 +1,13 @@
 package amf.testing.validation
 
 import amf.aml.client.scala.AMLConfiguration
-import amf.core.client.scala.errorhandling.DefaultErrorHandler
-import amf.core.internal.validation.ValidationConfiguration
-import amf.core.io.FileAssertionTest
-import amf.core.internal.unsafe.PlatformSecrets
 import amf.core.client.scala.validation.AMFValidationReport
-import amf.core.internal.parser.{AMFCompiler, CompilerContextBuilder}
+import amf.core.internal.unsafe.PlatformSecrets
+import amf.core.io.FileAssertionTest
 import amf.validation.internal.emitters.ValidationReportJSONLDEmitter
 import org.scalatest
-import org.scalatest.{AsyncFunSuite, Matchers}
+import org.scalatest.funsuite.AsyncFunSuite
+import org.scalatest.matchers.should.Matchers
 
 import scala.concurrent.{ExecutionContext, Future}
 

diff --git a/amf-rdf/shared/src/main/scala/amf/rdf/client/platform/RdfUnitConverter.scala b/amf-rdf/shared/src/main/scala/amf/rdf/client/platform/RdfUnitConverter.scala
@@ -20,6 +20,10 @@ object RdfUnitConverter extends RdfPlatformSecrets {
   }
 
   def toNativeRdfModel(unit: BaseUnit, renderOptions: RenderOptions = new RenderOptions()): RdfModel = {
-    framework.unitToRdfModel(unit, renderOptions)
+    toNativeRdfModel(unit, AMFGraphConfiguration.predefined(), renderOptions)
+  }
+
+  def toNativeRdfModel(unit: BaseUnit, config: AMFGraphConfiguration, renderOptions: RenderOptions): RdfModel = {
+    framework.unitToRdfModel(unit, config, renderOptions)
   }
 }