Merge pull request #640 from aml-org/publish-6.4.7

W-14654425 Publish 6.4.7
aml-org · Jan 5, 2024 · 428077e · 428077e
2 parents a98359f + b2b89f3
commit 428077e
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 20 deletions.
diff --git a/amf-aml/shared/src/main/scala/amf/aml/client/scala/AMLConfiguration.scala b/amf-aml/shared/src/main/scala/amf/aml/client/scala/AMLConfiguration.scala
@@ -315,10 +315,10 @@ private class DialectReferencesCollector(implicit val ec: ExecutionContext) {
     val ctx      = new CompilerContextBuilder(url, platform, amfConfig.compilerConfiguration).build()
     val compiler = new AMFCompiler(ctx)
     for {
-      content                <- compiler.fetchContent()
-      eitherContentOrAst     <- Future.successful(compiler.parseSyntax(content))
-      root                   <- Future.successful(eitherContentOrAst.right.get) if eitherContentOrAst.isRight
-      plugin                 <- Future.successful(compiler.getDomainPluginFor(root))
+      content <- compiler.fetchContent()
+      eitherContentOrAst = compiler.parseSyntax(content)
+      root               = eitherContentOrAst.right.get if eitherContentOrAst.isRight
+      plugin             = compiler.getDomainPluginFor(root)
       documentWithReferences <- compiler.parseReferences(root, plugin.get) if plugin.isDefined
     } yield {
       documentWithReferences.references.toStream

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
@@ -25,8 +25,8 @@ trait DialectInstanceValidation
     val instancePath = s"$path/$instance"
     val client       = config.baseUnitClient()
     for {
-      dialectResult  <- client.parseDialect(s"$path/$dialect")
-      nextConfig     <- Future.successful(config.withDialect(dialectResult.dialect))
+      dialectResult <- client.parseDialect(s"$path/$dialect")
+      nextConfig = config.withDialect(dialectResult.dialect)
       instanceResult <- nextConfig.baseUnitClient().parseDialectInstance(instancePath)
       report <- {
         if (!instanceResult.conforms) Future.successful(AMFValidationReport.unknownProfile(instanceResult))

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
@@ -18,14 +18,12 @@ trait DialectRegistrationHelper {
     val context       = new CompilerContextBuilder(uri, platform, configuration.compilerConfiguration).build()
     for {
       baseUnit <- new AMFCompiler(context).build()
-      dialect  <- Future.successful { baseUnit.asInstanceOf[Dialect] }
-      resolved <- Future.successful(
-        TransformationPipelineRunner(DefaultErrorHandler(), configuration)
-          .run(dialect, DialectTransformationPipeline())
-          .asInstanceOf[Dialect]
-      )
-      dialectConfig <- Future.successful(configuration.withDialect(resolved))
-      result        <- fn(resolved, dialectConfig)
+      dialect = baseUnit.asInstanceOf[Dialect]
+      resolved = TransformationPipelineRunner(DefaultErrorHandler(), configuration)
+        .run(dialect, DialectTransformationPipeline())
+        .asInstanceOf[Dialect]
+      dialectConfig = configuration.withDialect(resolved)
+      result <- fn(resolved, dialectConfig)
     } yield {
       result
     }

diff --git a/amf-aml/shared/src/test/scala/amf/testing/jsonldcycle/ToAndFromJsonLDInstanceTest.scala b/amf-aml/shared/src/test/scala/amf/testing/jsonldcycle/ToAndFromJsonLDInstanceTest.scala
@@ -22,10 +22,10 @@ class ToAndFromJsonLDInstanceTest extends AsyncFunSuite with FileAssertionTest w
     for {
       c              <- AMLConfiguration.predefined().withDialect("file://" + current + "dialect.yaml")
       instanceResult <- c.baseUnitClient().parse("file://" + current + "instance.yaml").map(_.baseUnit)
-      jsonLD         <- Future.successful(c.baseUnitClient().render(instanceResult, Mimes.`application/ld+json`))
-      actual         <- writeTemporaryFile(current + "instance.yaml.jsonld")(jsonLD)
-      assertion      <- assertDifferences(actual, current + "instance.yaml.jsonld")
-      jsonLDParsed   <- c.baseUnitClient().parse("file://" + current + "instance.yaml.jsonld")
+      jsonLD = c.baseUnitClient().render(instanceResult, Mimes.`application/ld+json`)
+      actual       <- writeTemporaryFile(current + "instance.yaml.jsonld")(jsonLD)
+      assertion    <- assertDifferences(actual, current + "instance.yaml.jsonld")
+      jsonLDParsed <- c.baseUnitClient().parse("file://" + current + "instance.yaml.jsonld")
     } yield {
       assert(assertion == succeed)
       jsonLDParsed.baseUnit

diff --git a/build.sbt b/build.sbt
@@ -6,7 +6,7 @@ val ivyLocal = Resolver.file("ivy", file(Path.userHome.absolutePath + "/.ivy2/lo
 
 name := "amf-aml"
 
-ThisBuild / version      := "6.4.6"
+ThisBuild / version      := "6.4.7"
 ThisBuild / scalaVersion := "2.12.15"
 
 publish := {}
@@ -19,7 +19,7 @@ lazy val workspaceDirectory: File =
     case _       => Path.userHome / "mulesoft"
   }
 
-val amfCoreVersion = "5.4.6"
+val amfCoreVersion = "5.4.7"
 
 lazy val amfCoreJVMRef = ProjectRef(workspaceDirectory / "amf-core", "coreJVM")
 lazy val amfCoreJSRef  = ProjectRef(workspaceDirectory / "amf-core", "coreJS")