From 7f1cc7386f7af6622c221c86f8873250433fa5d1 Mon Sep 17 00:00:00 2001 From: hghianni Date: Tue, 28 Jun 2022 13:52:15 -0300 Subject: [PATCH 1/7] Publish 6.1.0-SNAPSHOT --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 0bb005bd6..35d5ce007 100644 --- a/build.sbt +++ b/build.sbt @@ -7,7 +7,7 @@ val ivyLocal = Resolver.file("ivy", file(Path.userHome.absolutePath + "/.ivy2/lo name := "amf-aml" -ThisBuild / version := "6.0.10" +ThisBuild / version := "6.1.0-SNAPSHOT" ThisBuild / scalaVersion := "2.12.11" publish := {} @@ -34,7 +34,7 @@ lazy val workspaceDirectory: File = case _ => Path.userHome / "mulesoft" } -val amfCoreVersion = "5.0.10" +val amfCoreVersion = "5.1.0-SNAPSHOT" lazy val amfCoreJVMRef = ProjectRef(workspaceDirectory / "amf-core", "coreJVM") lazy val amfCoreJSRef = ProjectRef(workspaceDirectory / "amf-core", "coreJS") From 2af2907a82849cf38756deb4c3ed947bc28ab777 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hern=C3=A1n=20Najles?= <50325041+pope1838@users.noreply.github.com> Date: Wed, 6 Jul 2022 15:09:35 -0300 Subject: [PATCH 2/7] Minor fixes (#482) W-11062131: unify positions at scala-common --- .../parse/common/SyntaxErrorReporter.scala | 9 ++++---- .../instances/parser/IncludeNodeParser.scala | 4 ++-- .../instances/parser/LiteralValueParser.scala | 4 +--- .../emitters/common/ExternalEmitter.scala | 6 ++--- .../AnnotationMappingsEntryEmitter.scala | 12 +++++----- .../dialects/DialectDocumentsEmitters.scala | 16 +++++++------- .../emitters/dialects/DialectEmitter.scala | 16 +++++++------- .../dialects/DiscriminatorEmitter.scala | 8 +++---- .../dialects/DocumentsModelEmitter.scala | 12 +++++----- .../DocumentsModelOptionsEmitter.scala | 12 +++++----- .../ExtensionMappingsEntryEmitter.scala | 2 +- .../dialects/FieldEntryImplicit.scala | 2 +- .../dialects/FragmentMappingEmitter.scala | 10 ++++----- .../FragmentsDocumentModelEmitter.scala | 4 ++-- .../emitters/dialects/GroupPosition.scala | 4 ++-- .../LibraryDocumentModelEmitter.scala | 4 ++-- .../dialects/NodeMappingEmitter.scala | 4 ++-- .../dialects/NodeMappingsEntryEmitter.scala | 2 +- .../emitters/dialects/PosExtractor.scala | 4 ++-- .../dialects/PropertyMappingEmitter.scala | 4 ++-- .../dialects/RamlDialectLibraryEmitter.scala | 18 +++++++-------- .../emitters/dialects/ReferenceEmitter.scala | 6 ++--- .../emitters/dialects/ReferencesEmitter.scala | 6 ++--- .../dialects/RootDocumentModelEmitter.scala | 10 ++++----- .../instances/AmlEmittersHelper.scala | 4 ++-- .../CustomDomainPropertiesEmitter.scala | 1 - .../instances/DeclarationsGroupEmitter.scala | 18 +++++++-------- .../DialectDomainElementLinkEmitter.scala | 4 ++-- .../instances/DialectInstancesEmitter.scala | 14 ++++++------ .../instances/DialectNodeEmitter.scala | 4 ++-- .../instances/DialectObjectEntryEmitter.scala | 4 ++-- .../instances/ExternalLinkEmitter.scala | 6 ++--- .../instances/ObjectPairEmitter.scala | 4 ++-- .../emitters/instances/ReferenceEmitter.scala | 8 +++---- .../instances/ReferencesEmitter.scala | 6 ++--- .../vocabularies/VocabularyEmitter.scala | 22 +++++++++---------- .../semantic/AnnotationSchemaValidator.scala | 2 +- .../DialectInstanceAssertionTest.scala | 6 ++--- .../shacl/custom/CustomShaclValidator.scala | 2 ++ .../shacl/custom/ElementExtractor.scala | 6 ++--- .../custom/PropertyConstraintValidator.scala | 6 ++--- 41 files changed, 147 insertions(+), 149 deletions(-) diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/parse/common/SyntaxErrorReporter.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/parse/common/SyntaxErrorReporter.scala index 542ee83fb..83985d560 100644 --- a/amf-aml/shared/src/main/scala/amf/aml/internal/parse/common/SyntaxErrorReporter.scala +++ b/amf-aml/shared/src/main/scala/amf/aml/internal/parse/common/SyntaxErrorReporter.scala @@ -1,14 +1,13 @@ package amf.aml.internal.parse.common +import amf.aml.client.scala.model.domain.PropertyLikeMapping +import amf.aml.internal.metamodel.domain.PropertyMappingModel +import amf.aml.internal.validate.DialectValidations._ import amf.core.client.scala.parse.document.ParserContext import amf.core.internal.annotations.{LexicalInformation, SourceLocation} import amf.core.internal.parser.domain.Annotations import amf.core.internal.utils.AmfStrings -import amf.aml.internal.metamodel.domain.PropertyMappingModel -import amf.aml.client.scala.model.domain.{PropertyLikeMapping, PropertyMapping} -import amf.aml.internal.validate.DialectValidations._ import org.yaml.model.{YNode, YPart} -import amf.core.client.common.position.Range trait SyntaxErrorReporter { this: ParserContext => @@ -77,7 +76,7 @@ trait SyntaxErrorReporter { this: ParserContext => node, Some(property.nodePropertyMapping().value()), s"Cannot find expected range for property ${property.nodePropertyMapping().value()} (${property.name().value()}). Found '$found', expected '$expected'", - Some(new LexicalInformation(Range(valueNode.range))), + Some(new LexicalInformation(valueNode.range)), valueNode.sourceName.option ) diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/parse/instances/parser/IncludeNodeParser.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/parse/instances/parser/IncludeNodeParser.scala index 146963c04..6843324f0 100644 --- a/amf-aml/shared/src/main/scala/amf/aml/internal/parse/instances/parser/IncludeNodeParser.scala +++ b/amf-aml/shared/src/main/scala/amf/aml/internal/parse/instances/parser/IncludeNodeParser.scala @@ -3,7 +3,7 @@ package amf.aml.internal.parse.instances.parser import amf.aml.client.scala.model.domain.DialectDomainElement import amf.aml.internal.annotations.RefInclude import amf.aml.internal.parse.instances.{DialectInstanceContext, NodeMappableHelper} -import amf.core.internal.annotations.SourceAST +import amf.core.internal.annotations.SourceYPart import amf.core.internal.parser.domain.{Annotations, SearchScope} import org.yaml.model.{YNode, YScalar} @@ -36,7 +36,7 @@ object IncludeNodeParser extends NodeMappableHelper { .withId(id) // and the ID of the link at that position in the tree, not the ID of the linked element, tha goes in link-target linkedNode case (text: String, _) => - val loc = givenAnnotations.flatMap(_.find(classOf[SourceAST])).map(_.ast) match { + val loc = givenAnnotations.flatMap(_.find(classOf[SourceYPart])).map(_.ast) match { case Some(n) => n.location case _ => ast.location } diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/parse/instances/parser/LiteralValueParser.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/parse/instances/parser/LiteralValueParser.scala index c4ad2de75..753f7d211 100644 --- a/amf-aml/shared/src/main/scala/amf/aml/internal/parse/instances/parser/LiteralValueParser.scala +++ b/amf-aml/shared/src/main/scala/amf/aml/internal/parse/instances/parser/LiteralValueParser.scala @@ -2,14 +2,12 @@ package amf.aml.internal.parse.instances.parser import amf.aml.client.scala.model.domain.{DialectDomainElement, PropertyLikeMapping} import amf.aml.internal.validate.DialectValidations.{DialectError, InconsistentPropertyRangeValueSpecification} -import amf.core.client.common.position.Range import amf.core.client.scala.errorhandling.AMFErrorHandler import amf.core.client.scala.model.DataType import amf.core.client.scala.vocabulary.Namespace import amf.core.internal.annotations.LexicalInformation import amf.core.internal.parser.domain.Annotations -import amf.core.internal.plugins.syntax.{SYamlBasedErrorHandler, SyamlAMFErrorHandler} -import amf.core.internal.utils.AmfStrings +import amf.core.internal.plugins.syntax.SyamlAMFErrorHandler import org.mulesoft.common.time.SimpleDateTime import org.yaml.model.{YMapEntry, YNode, YScalar, YType} diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/common/ExternalEmitter.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/common/ExternalEmitter.scala index f09a587ed..3f994b3a9 100644 --- a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/common/ExternalEmitter.scala +++ b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/common/ExternalEmitter.scala @@ -1,12 +1,12 @@ package amf.aml.internal.render.emitters.common -import amf.core.client.common.position.Position -import amf.core.client.common.position.Position.ZERO +import amf.aml.client.scala.model.domain.External import amf.core.internal.annotations.LexicalInformation import amf.core.internal.render.BaseEmitters.MapEntryEmitter import amf.core.internal.render.SpecOrdering import amf.core.internal.render.emitters.EntryEmitter -import amf.aml.client.scala.model.domain.External +import org.mulesoft.common.client.lexical.Position +import org.mulesoft.common.client.lexical.Position.ZERO import org.yaml.model.YDocument case class ExternalEmitter(external: External, ordering: SpecOrdering) extends EntryEmitter { diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/AnnotationMappingsEntryEmitter.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/AnnotationMappingsEntryEmitter.scala index aa53807c0..438bba80c 100644 --- a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/AnnotationMappingsEntryEmitter.scala +++ b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/AnnotationMappingsEntryEmitter.scala @@ -1,13 +1,13 @@ package amf.aml.internal.render.emitters.dialects -import amf.core.client.common.position.Position -import amf.core.internal.render.BaseEmitters.{ArrayEmitter, pos, traverse} -import amf.core.internal.render.SpecOrdering -import amf.core.internal.render.emitters.EntryEmitter -import amf.aml.internal.render.emitters.instances.NodeMappableFinder -import amf.aml.internal.metamodel.domain.AnnotationMappingModel.Domain import amf.aml.client.scala.model.document.Dialect import amf.aml.client.scala.model.domain.AnnotationMapping +import amf.aml.internal.metamodel.domain.AnnotationMappingModel.Domain +import amf.aml.internal.render.emitters.instances.NodeMappableFinder +import amf.core.internal.render.BaseEmitters.{pos, traverse} +import amf.core.internal.render.SpecOrdering +import amf.core.internal.render.emitters.EntryEmitter +import org.mulesoft.common.client.lexical.Position import org.yaml.model.YDocument.EntryBuilder import org.yaml.model.YType diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/DialectDocumentsEmitters.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/DialectDocumentsEmitters.scala index 4753c16a2..e0050c47e 100644 --- a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/DialectDocumentsEmitters.scala +++ b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/DialectDocumentsEmitters.scala @@ -1,17 +1,17 @@ package amf.aml.internal.render.emitters.dialects +import amf.aml.client.scala.model.document.{Dialect, Vocabulary} +import amf.aml.client.scala.model.domain.{AnnotationMapping, NodeMappable, NodeMapping, UnionNodeMapping} +import amf.aml.internal.render.emitters.common.ExternalEmitter +import amf.aml.internal.render.emitters.instances.AmlEmittersHelper +import amf.core.client.scala.model.document.DeclaresModel import amf.core.internal.annotations.Aliases.{Alias, ImportLocation} import amf.core.internal.annotations.LexicalInformation import amf.core.internal.render.BaseEmitters.traverse -import amf.core.internal.render.emitters.EntryEmitter -import amf.core.client.scala.model.document.DeclaresModel -import amf.core.client.common.position.Position -import amf.core.client.common.position.Position.ZERO import amf.core.internal.render.SpecOrdering -import amf.aml.internal.render.emitters.common.ExternalEmitter -import amf.aml.internal.render.emitters.instances.AmlEmittersHelper -import amf.aml.client.scala.model.document.{Dialect, Vocabulary} -import amf.aml.client.scala.model.domain.{AnnotationMapping, NodeMappable, NodeMapping, UnionNodeMapping} +import amf.core.internal.render.emitters.EntryEmitter +import org.mulesoft.common.client.lexical.Position +import org.mulesoft.common.client.lexical.Position.ZERO import org.yaml.model.YDocument.EntryBuilder trait DialectDocumentsEmitters extends AmlEmittersHelper { diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/DialectEmitter.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/DialectEmitter.scala index 99157f7bf..5a1ca5b25 100644 --- a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/DialectEmitter.scala +++ b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/DialectEmitter.scala @@ -1,16 +1,16 @@ package amf.aml.internal.render.emitters.dialects -import amf.core.internal.annotations.Aliases.{Alias, FullUrl, ImportLocation} +import amf.aml.client.scala.model.document.Dialect +import amf.aml.internal.metamodel.document.DialectModel +import amf.aml.internal.render.emitters.dialects.FieldEntryImplicit._ +import amf.aml.internal.render.emitters.instances.NodeMappableFinder +import amf.core.internal.annotations.Aliases.{Alias, ImportLocation} import amf.core.internal.render.BaseEmitters._ +import amf.core.internal.render.SpecOrdering import amf.core.internal.render.SpecOrdering.Lexical import amf.core.internal.render.emitters.EntryEmitter -import amf.core.client.common.position.Position -import amf.core.client.common.position.Position.ZERO -import amf.core.internal.render.SpecOrdering -import amf.aml.internal.render.emitters.dialects.FieldEntryImplicit._ -import amf.aml.internal.render.emitters.instances.NodeMappableFinder -import amf.aml.internal.metamodel.document.DialectModel -import amf.aml.client.scala.model.document.Dialect +import org.mulesoft.common.client.lexical.Position +import org.mulesoft.common.client.lexical.Position.ZERO import org.yaml.model.YDocument import org.yaml.model.YDocument.EntryBuilder diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/DiscriminatorEmitter.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/DiscriminatorEmitter.scala index 6a58afda4..442e3981f 100644 --- a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/DiscriminatorEmitter.scala +++ b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/DiscriminatorEmitter.scala @@ -1,11 +1,11 @@ package amf.aml.internal.render.emitters.dialects +import amf.aml.client.scala.model.domain.NodeWithDiscriminator +import amf.aml.internal.metamodel.domain.NodeWithDiscriminatorModel +import amf.core.client.scala.model.domain.AmfScalar import amf.core.internal.render.BaseEmitters.MapEntryEmitter import amf.core.internal.render.emitters.EntryEmitter -import amf.core.client.scala.model.domain.AmfScalar -import amf.core.client.common.position.Position -import amf.aml.internal.metamodel.domain.NodeWithDiscriminatorModel -import amf.aml.client.scala.model.domain.NodeWithDiscriminator +import org.mulesoft.common.client.lexical.Position import org.yaml.model.YDocument.EntryBuilder import org.yaml.model.YType diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/DocumentsModelEmitter.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/DocumentsModelEmitter.scala index f250b387a..b2e56a4f7 100644 --- a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/DocumentsModelEmitter.scala +++ b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/DocumentsModelEmitter.scala @@ -1,15 +1,15 @@ package amf.aml.internal.render.emitters.dialects -import amf.core.client.common.position.Position -import amf.core.client.common.position.Position.ZERO +import amf.aml.client.scala.model.document.Dialect +import amf.aml.client.scala.model.domain.{DocumentsModel, PublicNodeMapping} +import amf.aml.internal.metamodel.domain.DocumentMappingModel +import amf.aml.internal.render.emitters.instances.NodeMappableFinder import amf.core.internal.annotations.LexicalInformation import amf.core.internal.render.BaseEmitters.traverse import amf.core.internal.render.SpecOrdering import amf.core.internal.render.emitters.EntryEmitter -import amf.aml.internal.render.emitters.instances.NodeMappableFinder -import amf.aml.internal.metamodel.domain.DocumentMappingModel -import amf.aml.client.scala.model.document.Dialect -import amf.aml.client.scala.model.domain.{DocumentsModel, PublicNodeMapping} +import org.mulesoft.common.client.lexical.Position +import org.mulesoft.common.client.lexical.Position.ZERO import org.yaml.model.YDocument.EntryBuilder case class DocumentsModelEmitter(dialect: Dialect, ordering: SpecOrdering, aliases: Map[String, (String, String)])( diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/DocumentsModelOptionsEmitter.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/DocumentsModelOptionsEmitter.scala index 44da8c38f..cf1f9acaa 100644 --- a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/DocumentsModelOptionsEmitter.scala +++ b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/DocumentsModelOptionsEmitter.scala @@ -1,13 +1,13 @@ package amf.aml.internal.render.emitters.dialects -import amf.core.internal.render.BaseEmitters.{MapEntryEmitter, pos, traverse} -import amf.core.internal.render.emitters.EntryEmitter -import amf.core.client.common.position.Position -import amf.core.client.common.position.Position.ZERO -import amf.core.internal.render.SpecOrdering -import amf.aml.internal.render.emitters.instances.NodeMappableFinder import amf.aml.client.scala.model.document.Dialect import amf.aml.client.scala.model.domain.DocumentsModel +import amf.aml.internal.render.emitters.instances.NodeMappableFinder +import amf.core.internal.render.BaseEmitters.{MapEntryEmitter, pos, traverse} +import amf.core.internal.render.SpecOrdering +import amf.core.internal.render.emitters.EntryEmitter +import org.mulesoft.common.client.lexical.Position +import org.mulesoft.common.client.lexical.Position.ZERO import org.yaml.model.YDocument.EntryBuilder import org.yaml.model.YType diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/ExtensionMappingsEntryEmitter.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/ExtensionMappingsEntryEmitter.scala index c276c4387..84708b3d1 100644 --- a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/ExtensionMappingsEntryEmitter.scala +++ b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/ExtensionMappingsEntryEmitter.scala @@ -3,11 +3,11 @@ package amf.aml.internal.render.emitters.dialects import amf.core.internal.render.BaseEmitters.{pos, traverse} import amf.core.internal.render.SpecOrdering import amf.core.internal.render.emitters.EntryEmitter -import amf.core.client.common.position.Position import amf.aml.internal.render.emitters.instances.NodeMappableFinder import amf.aml.internal.metamodel.domain.SemanticExtensionModel import amf.aml.client.scala.model.document.Dialect import amf.aml.client.scala.model.domain.SemanticExtension +import org.mulesoft.common.client.lexical.Position import org.yaml.model.YDocument.EntryBuilder import org.yaml.model.YType diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/FieldEntryImplicit.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/FieldEntryImplicit.scala index be7853f79..18f68d56a 100644 --- a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/FieldEntryImplicit.scala +++ b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/FieldEntryImplicit.scala @@ -1,8 +1,8 @@ package amf.aml.internal.render.emitters.dialects -import amf.core.client.common.position.Position import amf.core.internal.annotations.LexicalInformation import amf.core.internal.parser.domain.FieldEntry +import org.mulesoft.common.client.lexical.Position private object FieldEntryImplicit { implicit class FieldEntryWithPosition(entry: FieldEntry) { diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/FragmentMappingEmitter.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/FragmentMappingEmitter.scala index dcd1d18cf..1ac86d6b8 100644 --- a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/FragmentMappingEmitter.scala +++ b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/FragmentMappingEmitter.scala @@ -1,14 +1,14 @@ package amf.aml.internal.render.emitters.dialects -import amf.core.client.common.position.Position -import amf.core.client.common.position.Position.ZERO +import amf.aml.client.scala.model.document.Dialect +import amf.aml.client.scala.model.domain.DocumentMapping +import amf.aml.internal.render.emitters.instances.NodeMappableFinder import amf.core.internal.annotations.LexicalInformation import amf.core.internal.render.BaseEmitters.MapEntryEmitter import amf.core.internal.render.SpecOrdering import amf.core.internal.render.emitters.EntryEmitter -import amf.aml.internal.render.emitters.instances.NodeMappableFinder -import amf.aml.client.scala.model.document.Dialect -import amf.aml.client.scala.model.domain.DocumentMapping +import org.mulesoft.common.client.lexical.Position +import org.mulesoft.common.client.lexical.Position.ZERO import org.yaml.model.YDocument.EntryBuilder case class FragmentMappingEmitter( diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/FragmentsDocumentModelEmitter.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/FragmentsDocumentModelEmitter.scala index b175bad7e..4959dedd4 100644 --- a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/FragmentsDocumentModelEmitter.scala +++ b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/FragmentsDocumentModelEmitter.scala @@ -1,11 +1,11 @@ package amf.aml.internal.render.emitters.dialects -import amf.core.client.common.position.Position -import amf.core.client.common.position.Position.ZERO import amf.core.internal.render.SpecOrdering import amf.core.internal.render.emitters.EntryEmitter import amf.aml.internal.render.emitters.instances.NodeMappableFinder import amf.aml.client.scala.model.document.Dialect +import org.mulesoft.common.client.lexical.Position +import org.mulesoft.common.client.lexical.Position.ZERO import org.yaml.model.YDocument.EntryBuilder case class FragmentsDocumentModelEmitter( diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/GroupPosition.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/GroupPosition.scala index a1c8c2501..3b443a640 100644 --- a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/GroupPosition.scala +++ b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/GroupPosition.scala @@ -1,8 +1,8 @@ package amf.aml.internal.render.emitters.dialects -import amf.core.internal.annotations.LexicalInformation import amf.core.client.scala.model.domain.DomainElement -import amf.core.client.common.position.Position.ZERO +import amf.core.internal.annotations.LexicalInformation +import org.mulesoft.common.client.lexical.Position.ZERO trait GroupPosition { def groupPosition(elements: Seq[DomainElement]) = diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/LibraryDocumentModelEmitter.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/LibraryDocumentModelEmitter.scala index 4a3260224..8d634e4c6 100644 --- a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/LibraryDocumentModelEmitter.scala +++ b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/LibraryDocumentModelEmitter.scala @@ -1,7 +1,5 @@ package amf.aml.internal.render.emitters.dialects -import amf.core.client.common.position.Position -import amf.core.client.common.position.Position.ZERO import amf.core.internal.annotations.LexicalInformation import amf.core.internal.render.BaseEmitters.{MapEntryEmitter, traverse} import amf.core.internal.render.SpecOrdering @@ -9,6 +7,8 @@ import amf.core.internal.render.emitters.EntryEmitter import amf.aml.internal.render.emitters.instances.NodeMappableFinder import amf.aml.client.scala.model.document.Dialect import amf.aml.client.scala.model.domain.DocumentMapping +import org.mulesoft.common.client.lexical.Position +import org.mulesoft.common.client.lexical.Position.ZERO import org.yaml.model.YDocument.EntryBuilder case class LibraryDocumentModelEmitter( diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/NodeMappingEmitter.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/NodeMappingEmitter.scala index 0c1c2ef8c..d6b7ad85b 100644 --- a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/NodeMappingEmitter.scala +++ b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/NodeMappingEmitter.scala @@ -4,13 +4,13 @@ import amf.aml.client.scala.model.document.{Dialect, DialectFragment} import amf.aml.client.scala.model.domain._ import amf.aml.internal.metamodel.domain.{NodeMappableModel, UnionNodeMappingModel} import amf.aml.internal.render.emitters.instances.NodeMappableFinder -import amf.core.client.common.position.Position -import amf.core.client.common.position.Position.ZERO import amf.core.client.scala.model.domain.{AmfScalar, DomainElement, Linkable} import amf.core.internal.annotations.LexicalInformation import amf.core.internal.render.BaseEmitters.{MapEntryEmitter, ScalarEmitter, traverse} import amf.core.internal.render.SpecOrdering import amf.core.internal.render.emitters.EntryEmitter +import org.mulesoft.common.client.lexical.Position +import org.mulesoft.common.client.lexical.Position.ZERO import org.yaml.model.YDocument.EntryBuilder import org.yaml.model.YNode diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/NodeMappingsEntryEmitter.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/NodeMappingsEntryEmitter.scala index 19a59cb66..93f1df841 100644 --- a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/NodeMappingsEntryEmitter.scala +++ b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/NodeMappingsEntryEmitter.scala @@ -3,10 +3,10 @@ package amf.aml.internal.render.emitters.dialects import amf.aml.client.scala.model.document.Dialect import amf.aml.client.scala.model.domain.NodeMappable import amf.aml.internal.render.emitters.instances.NodeMappableFinder -import amf.core.client.common.position.Position import amf.core.internal.render.BaseEmitters.traverse import amf.core.internal.render.SpecOrdering import amf.core.internal.render.emitters.EntryEmitter +import org.mulesoft.common.client.lexical.Position import org.yaml.model.YDocument.EntryBuilder case class NodeMappingsEntryEmitter( diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/PosExtractor.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/PosExtractor.scala index d2518f9d7..655c10530 100644 --- a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/PosExtractor.scala +++ b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/PosExtractor.scala @@ -2,9 +2,9 @@ package amf.aml.internal.render.emitters.dialects import amf.core.internal.metamodel.Field import amf.core.client.scala.model.domain.DomainElement -import amf.core.client.common.position.Position -import amf.core.client.common.position.Position.ZERO import amf.aml.internal.render.emitters.dialects.FieldEntryImplicit._ +import org.mulesoft.common.client.lexical.Position +import org.mulesoft.common.client.lexical.Position.ZERO trait PosExtractor { def fieldPos(element: DomainElement, field: Field): Position = { diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/PropertyMappingEmitter.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/PropertyMappingEmitter.scala index b02b90450..acbdd1b72 100644 --- a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/PropertyMappingEmitter.scala +++ b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/PropertyMappingEmitter.scala @@ -4,8 +4,6 @@ import amf.aml.client.scala.model.document.Dialect import amf.aml.client.scala.model.domain.{PropertyLikeMapping, PropertyMapping} import amf.aml.internal.metamodel.domain.{PropertyLikeMappingModel, PropertyMappingModel} import amf.aml.internal.render.emitters.instances.NodeMappableFinder -import amf.core.client.common.position.Position -import amf.core.client.common.position.Position.ZERO import amf.core.client.scala.model.domain.AmfScalar import amf.core.client.scala.vocabulary.Namespace import amf.core.internal.annotations.LexicalInformation @@ -13,6 +11,8 @@ import amf.core.internal.parser.domain.{Annotations, FieldEntry} import amf.core.internal.render.BaseEmitters.{MapEntryEmitter, ScalarEmitter, pos, traverse} import amf.core.internal.render.SpecOrdering import amf.core.internal.render.emitters.EntryEmitter +import org.mulesoft.common.client.lexical.Position +import org.mulesoft.common.client.lexical.Position.ZERO import org.mulesoft.common.collections.FilterType import org.yaml.model.YDocument.EntryBuilder import org.yaml.model.YType diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/RamlDialectLibraryEmitter.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/RamlDialectLibraryEmitter.scala index 769267ecd..6578aaf97 100644 --- a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/RamlDialectLibraryEmitter.scala +++ b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/RamlDialectLibraryEmitter.scala @@ -1,18 +1,18 @@ package amf.aml.internal.render.emitters.dialects -import amf.core.internal.annotations.Aliases.{Alias, FullUrl, ImportLocation} -import amf.core.internal.render.BaseEmitters.{MapEntryEmitter, traverse} -import amf.core.internal.render.SpecOrdering.Lexical +import amf.aml.client.scala.model.document.{Dialect, DialectLibrary} +import amf.aml.internal.metamodel.document.DialectModel +import amf.aml.internal.render.emitters.dialects.FieldEntryImplicit.FieldEntryWithPosition +import amf.aml.internal.render.emitters.instances.NodeMappableFinder +import amf.core.internal.annotations.Aliases.{Alias, ImportLocation} +import amf.core.internal.render.BaseEmitters.MapEntryEmitter import amf.core.internal.render.SpecOrdering +import amf.core.internal.render.SpecOrdering.Lexical import amf.core.internal.render.emitters.EntryEmitter -import amf.core.client.common.position.Position -import amf.core.client.common.position.Position.ZERO -import amf.aml.internal.metamodel.document.DialectModel -import amf.aml.client.scala.model.document.{Dialect, DialectLibrary} +import org.mulesoft.common.client.lexical.Position +import org.mulesoft.common.client.lexical.Position.ZERO import org.yaml.model.YDocument import org.yaml.model.YDocument.EntryBuilder -import amf.aml.internal.render.emitters.dialects.FieldEntryImplicit.FieldEntryWithPosition -import amf.aml.internal.render.emitters.instances.NodeMappableFinder case class RamlDialectLibraryEmitter(library: DialectLibrary, document: DocumentCreator)(implicit val nodeMappableFinder: NodeMappableFinder diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/ReferenceEmitter.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/ReferenceEmitter.scala index b0e6ea706..9b11d7f9c 100644 --- a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/ReferenceEmitter.scala +++ b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/ReferenceEmitter.scala @@ -1,12 +1,12 @@ package amf.aml.internal.render.emitters.dialects -import amf.core.client.common.position.Position -import amf.core.client.common.position.Position.ZERO +import amf.aml.client.scala.model.document.Vocabulary import amf.core.client.scala.model.document.DeclaresModel import amf.core.internal.render.BaseEmitters.MapEntryEmitter import amf.core.internal.render.SpecOrdering import amf.core.internal.render.emitters.EntryEmitter -import amf.aml.client.scala.model.document.Vocabulary +import org.mulesoft.common.client.lexical.Position +import org.mulesoft.common.client.lexical.Position.ZERO import org.yaml.model.YDocument.EntryBuilder case class ReferenceEmitter(reference: DeclaresModel, ordering: SpecOrdering, aliases: Map[String, (String, String)]) diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/ReferencesEmitter.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/ReferencesEmitter.scala index c71ba380f..21a6cc95f 100644 --- a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/ReferencesEmitter.scala +++ b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/ReferencesEmitter.scala @@ -1,12 +1,12 @@ package amf.aml.internal.render.emitters.dialects -import amf.core.client.common.position.Position -import amf.core.client.common.position.Position.ZERO +import amf.aml.internal.annotations.AliasesLocation import amf.core.client.scala.model.document.{BaseUnit, DeclaresModel} import amf.core.internal.render.BaseEmitters.traverse import amf.core.internal.render.SpecOrdering import amf.core.internal.render.emitters.EntryEmitter -import amf.aml.internal.annotations.AliasesLocation +import org.mulesoft.common.client.lexical.Position +import org.mulesoft.common.client.lexical.Position.ZERO import org.yaml.model.YDocument.EntryBuilder case class ReferencesEmitter(baseUnit: BaseUnit, ordering: SpecOrdering, aliases: Map[String, (String, String)]) diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/RootDocumentModelEmitter.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/RootDocumentModelEmitter.scala index 1ea5880a1..ec1af22b8 100644 --- a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/RootDocumentModelEmitter.scala +++ b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/dialects/RootDocumentModelEmitter.scala @@ -1,14 +1,14 @@ package amf.aml.internal.render.emitters.dialects -import amf.core.client.common.position.Position -import amf.core.client.common.position.Position.ZERO +import amf.aml.client.scala.model.document.Dialect +import amf.aml.client.scala.model.domain.DocumentMapping +import amf.aml.internal.render.emitters.instances.NodeMappableFinder import amf.core.internal.annotations.LexicalInformation import amf.core.internal.render.BaseEmitters.{MapEntryEmitter, traverse} import amf.core.internal.render.SpecOrdering import amf.core.internal.render.emitters.EntryEmitter -import amf.aml.internal.render.emitters.instances.NodeMappableFinder -import amf.aml.client.scala.model.document.Dialect -import amf.aml.client.scala.model.domain.DocumentMapping +import org.mulesoft.common.client.lexical.Position +import org.mulesoft.common.client.lexical.Position.ZERO import org.yaml.model.YDocument.EntryBuilder case class RootDocumentModelEmitter(dialect: Dialect, ordering: SpecOrdering, aliases: Map[String, (String, String)])( diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/instances/AmlEmittersHelper.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/instances/AmlEmittersHelper.scala index 64f94d716..ceda75301 100644 --- a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/instances/AmlEmittersHelper.scala +++ b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/instances/AmlEmittersHelper.scala @@ -5,8 +5,6 @@ import amf.aml.client.scala.model.domain.NodeMappable.AnyNodeMappable import amf.aml.client.scala.model.domain.NodeMapping import amf.aml.internal.parse.plugin.AMLDialectInstanceParsingPlugin import amf.aml.internal.render.emitters.common.{ExternalEmitter, IdCounter} -import amf.core.client.common.position.Position -import amf.core.client.common.position.Position.ZERO import amf.core.client.scala.model.document.{BaseUnit, DeclaresModel} import amf.core.client.scala.model.domain.AmfObject import amf.core.client.scala.parse.document.ParserContext @@ -16,6 +14,8 @@ import amf.core.internal.render.BaseEmitters.traverse import amf.core.internal.render.SpecOrdering import amf.core.internal.render.emitters.EntryEmitter import amf.core.internal.utils.Regexes.Path +import org.mulesoft.common.client.lexical.Position +import org.mulesoft.common.client.lexical.Position.ZERO import org.mulesoft.common.collections.FilterType import org.mulesoft.common.core.CachedFunction import org.mulesoft.common.functional.MonadInstances.identityMonad diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/instances/CustomDomainPropertiesEmitter.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/instances/CustomDomainPropertiesEmitter.scala index be7debed2..23e450ae7 100644 --- a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/instances/CustomDomainPropertiesEmitter.scala +++ b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/instances/CustomDomainPropertiesEmitter.scala @@ -3,7 +3,6 @@ package amf.aml.internal.render.emitters.instances import amf.aml.client.scala.model.domain.DialectDomainElement import amf.aml.internal.registries.AMLRegistry import amf.aml.internal.semantic.SemanticExtensionsFacade -import amf.core.client.common.position.Position import amf.core.client.scala.config.RenderOptions import amf.core.client.scala.model.DataType import amf.core.client.scala.model.domain.extensions.DomainExtension diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/instances/DeclarationsGroupEmitter.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/instances/DeclarationsGroupEmitter.scala index 6c627285e..07bb2a598 100644 --- a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/instances/DeclarationsGroupEmitter.scala +++ b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/instances/DeclarationsGroupEmitter.scala @@ -1,17 +1,17 @@ package amf.aml.internal.render.emitters.instances -import amf.core.internal.annotations.LexicalInformation -import amf.core.internal.render.emitters.EntryEmitter -import amf.core.client.scala.config.RenderOptions -import amf.core.client.common.position.Position -import amf.core.client.common.position.Position.ZERO -import amf.core.internal.render.SpecOrdering import amf.aml.client.scala.model.document.{Dialect, DialectInstanceUnit} import amf.aml.client.scala.model.domain.{DialectDomainElement, NodeMappable, PublicNodeMapping, UnionNodeMapping} -import org.yaml.model.YDocument.EntryBuilder -import org.yaml.model.YNode -import amf.core.internal.utils.AmfStrings import amf.aml.internal.metamodel.domain.NodeMappableModel import amf.aml.internal.registries.AMLRegistry +import amf.core.client.scala.config.RenderOptions +import amf.core.internal.annotations.LexicalInformation +import amf.core.internal.render.SpecOrdering +import amf.core.internal.render.emitters.EntryEmitter +import amf.core.internal.utils.AmfStrings +import org.mulesoft.common.client.lexical.Position +import org.mulesoft.common.client.lexical.Position.ZERO +import org.yaml.model.YDocument.EntryBuilder +import org.yaml.model.YNode case class DeclarationsGroupEmitter( declared: Seq[DialectDomainElement], diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/instances/DialectDomainElementLinkEmitter.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/instances/DialectDomainElementLinkEmitter.scala index 56722ef00..560ad7ad4 100644 --- a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/instances/DialectDomainElementLinkEmitter.scala +++ b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/instances/DialectDomainElementLinkEmitter.scala @@ -3,12 +3,12 @@ package amf.aml.internal.render.emitters.instances import amf.aml.client.scala.model.document.DialectInstanceFragment import amf.aml.client.scala.model.domain.DialectDomainElement import amf.aml.internal.annotations.{JsonPointerRef, RefInclude} -import amf.core.client.common.position.Position -import amf.core.client.common.position.Position.ZERO import amf.core.client.scala.model.document.BaseUnit import amf.core.internal.annotations.{LexicalInformation, SourceNode} import amf.core.internal.render.BaseEmitters.TextScalarEmitter import amf.core.internal.render.emitters.PartEmitter +import org.mulesoft.common.client.lexical.Position +import org.mulesoft.common.client.lexical.Position.ZERO import org.yaml.model.YDocument.PartBuilder import org.yaml.model.{YNode, YType} diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/instances/DialectInstancesEmitter.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/instances/DialectInstancesEmitter.scala index f9dc765c4..44dc45a4a 100644 --- a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/instances/DialectInstancesEmitter.scala +++ b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/instances/DialectInstancesEmitter.scala @@ -1,16 +1,16 @@ package amf.aml.internal.render.emitters.instances -import amf.core.client.common.position.Position -import amf.core.internal.annotations.Aliases.{Alias, ImportLocation, RefId} -import amf.core.internal.render.BaseEmitters._ -import amf.core.client.scala.config.RenderOptions -import amf.core.client.scala.model.document.EncodesModel -import amf.core.internal.render.SpecOrdering -import amf.core.internal.render.SpecOrdering.Lexical import amf.aml.client.scala.model.document._ import amf.aml.client.scala.model.domain.NodeMappable.AnyNodeMappable import amf.aml.client.scala.model.domain._ import amf.aml.internal.registries.AMLRegistry +import amf.core.client.scala.config.RenderOptions +import amf.core.client.scala.model.document.EncodesModel +import amf.core.internal.annotations.Aliases.{Alias, ImportLocation} +import amf.core.internal.render.BaseEmitters._ +import amf.core.internal.render.SpecOrdering +import amf.core.internal.render.SpecOrdering.Lexical +import org.mulesoft.common.client.lexical.Position import org.yaml.model.YDocument import org.yaml.model.YDocument.PartBuilder diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/instances/DialectNodeEmitter.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/instances/DialectNodeEmitter.scala index 375d6ea86..470c6bb8c 100644 --- a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/instances/DialectNodeEmitter.scala +++ b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/instances/DialectNodeEmitter.scala @@ -4,8 +4,6 @@ import amf.aml.client.scala.model.domain._ import amf.aml.internal.annotations.{CustomBase, CustomId} import amf.aml.internal.metamodel.domain.{DialectDomainElementModel, NodeMappableModel} import amf.aml.internal.registries.AMLRegistry -import amf.core.client.common.position.Position -import amf.core.client.common.position.Position.ZERO import amf.core.client.scala.config.RenderOptions import amf.core.client.scala.model.document.{BaseUnit, DeclaresModel} import amf.core.internal.annotations.Aliases.{Alias, ImportLocation, RefId} @@ -15,6 +13,8 @@ import amf.core.internal.metamodel.domain.DomainElementModel import amf.core.internal.render.BaseEmitters._ import amf.core.internal.render.SpecOrdering import amf.core.internal.render.emitters.{EntryEmitter, PartEmitter} +import org.mulesoft.common.client.lexical.Position +import org.mulesoft.common.client.lexical.Position.ZERO import org.yaml.model.YDocument.PartBuilder import scala.language.existentials diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/instances/DialectObjectEntryEmitter.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/instances/DialectObjectEntryEmitter.scala index 9236a819c..a53378fba 100644 --- a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/instances/DialectObjectEntryEmitter.scala +++ b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/instances/DialectObjectEntryEmitter.scala @@ -4,8 +4,6 @@ import amf.aml.client.scala.model.document.Dialect import amf.aml.client.scala.model.domain.{DialectDomainElement, NodeMapping, PropertyLikeMapping, PropertyMapping} import amf.aml.internal.metamodel.domain.PropertyLikeMappingModel import amf.aml.internal.registries.AMLRegistry -import amf.core.client.common.position.Position -import amf.core.client.common.position.Position.ZERO import amf.core.client.scala.config.RenderOptions import amf.core.client.scala.model.document.BaseUnit import amf.core.client.scala.model.domain.{AmfArray, AmfElement} @@ -14,6 +12,8 @@ import amf.core.internal.parser.domain.Annotations import amf.core.internal.render.BaseEmitters.EntryPartEmitter import amf.core.internal.render.SpecOrdering import amf.core.internal.render.emitters.EntryEmitter +import org.mulesoft.common.client.lexical.Position +import org.mulesoft.common.client.lexical.Position.ZERO import org.yaml.model.YDocument.EntryBuilder private case class DialectObjectEntryEmitter[M <: PropertyLikeMappingModel]( diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/instances/ExternalLinkEmitter.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/instances/ExternalLinkEmitter.scala index 1192c067e..e8cc3e03e 100644 --- a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/instances/ExternalLinkEmitter.scala +++ b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/instances/ExternalLinkEmitter.scala @@ -1,12 +1,10 @@ package amf.aml.internal.render.emitters.instances import amf.aml.client.scala.model.document.Dialect -import amf.aml.client.scala.model.domain.{DialectDomainElement, NodeMapping, PropertyLikeMapping, PropertyMapping} +import amf.aml.client.scala.model.domain.{DialectDomainElement, NodeMapping, PropertyLikeMapping} import amf.aml.internal.annotations.{CustomBase, CustomId} import amf.aml.internal.metamodel.domain.PropertyLikeMappingModel import amf.aml.internal.registries.AMLRegistry -import amf.core.client.common.position.Position -import amf.core.client.common.position.Position.ZERO import amf.core.client.scala.config.RenderOptions import amf.core.client.scala.model.document.BaseUnit import amf.core.client.scala.model.domain.{AmfArray, AmfElement} @@ -14,6 +12,8 @@ import amf.core.internal.annotations.LexicalInformation import amf.core.internal.parser.domain.Annotations import amf.core.internal.render.SpecOrdering import amf.core.internal.render.emitters.EntryEmitter +import org.mulesoft.common.client.lexical.Position +import org.mulesoft.common.client.lexical.Position.ZERO import org.yaml.model.YDocument import org.yaml.model.YDocument.PartBuilder diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/instances/ObjectPairEmitter.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/instances/ObjectPairEmitter.scala index 8335d5cdc..91b48d9ed 100644 --- a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/instances/ObjectPairEmitter.scala +++ b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/instances/ObjectPairEmitter.scala @@ -1,13 +1,13 @@ package amf.aml.internal.render.emitters.instances import amf.aml.client.scala.model.domain.{DialectDomainElement, PropertyMapping} -import amf.core.client.common.position.Position -import amf.core.client.common.position.Position.ZERO import amf.core.client.scala.model.domain.{AmfArray, AmfElement, AmfScalar} import amf.core.internal.annotations.LexicalInformation import amf.core.internal.parser.domain.Annotations import amf.core.internal.render.BaseEmitters.MapEntryEmitter import amf.core.internal.render.emitters.EntryEmitter +import org.mulesoft.common.client.lexical.Position +import org.mulesoft.common.client.lexical.Position.ZERO import org.yaml.model.YDocument case class ObjectPairEmitter( diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/instances/ReferenceEmitter.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/instances/ReferenceEmitter.scala index 0d1739bfd..6bcfbf269 100644 --- a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/instances/ReferenceEmitter.scala +++ b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/instances/ReferenceEmitter.scala @@ -1,10 +1,10 @@ package amf.aml.internal.render.emitters.instances -import amf.core.internal.render.BaseEmitters.MapEntryEmitter -import amf.core.internal.render.emitters.EntryEmitter import amf.core.client.scala.model.document.BaseUnit -import amf.core.client.common.position.Position -import amf.core.client.common.position.Position.ZERO +import amf.core.internal.render.BaseEmitters.MapEntryEmitter import amf.core.internal.render.SpecOrdering +import amf.core.internal.render.emitters.EntryEmitter +import org.mulesoft.common.client.lexical.Position +import org.mulesoft.common.client.lexical.Position.ZERO import org.yaml.model.YDocument.EntryBuilder case class ReferenceEmitter(reference: BaseUnit, ordering: SpecOrdering, aliases: Map[String, (String, String)]) diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/instances/ReferencesEmitter.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/instances/ReferencesEmitter.scala index 4550bee05..a4a538d7e 100644 --- a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/instances/ReferencesEmitter.scala +++ b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/instances/ReferencesEmitter.scala @@ -1,12 +1,12 @@ package amf.aml.internal.render.emitters.instances -import amf.core.client.common.position.Position -import amf.core.client.common.position.Position.ZERO +import amf.aml.internal.annotations.AliasesLocation import amf.core.client.scala.model.document.{BaseUnit, DeclaresModel} import amf.core.internal.render.BaseEmitters.traverse import amf.core.internal.render.SpecOrdering import amf.core.internal.render.emitters.EntryEmitter -import amf.aml.internal.annotations.AliasesLocation +import org.mulesoft.common.client.lexical.Position +import org.mulesoft.common.client.lexical.Position.ZERO import org.yaml.model.YDocument.EntryBuilder case class ReferencesEmitter(baseUnit: BaseUnit, ordering: SpecOrdering, aliases: Map[String, (String, String)]) diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/vocabularies/VocabularyEmitter.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/vocabularies/VocabularyEmitter.scala index 2ec9fa3d7..1ff819473 100644 --- a/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/vocabularies/VocabularyEmitter.scala +++ b/amf-aml/shared/src/main/scala/amf/aml/internal/render/emitters/vocabularies/VocabularyEmitter.scala @@ -1,20 +1,20 @@ package amf.aml.internal.render.emitters.vocabularies -import amf.core.internal.annotations.LexicalInformation -import amf.core.internal.render.BaseEmitters._ -import amf.core.internal.render.emitters.EntryEmitter +import amf.aml.client.scala.model.document.Vocabulary +import amf.aml.client.scala.model.domain.{ClassTerm, PropertyTerm, VocabularyReference} +import amf.aml.internal.metamodel.document.VocabularyModel +import amf.aml.internal.metamodel.domain.{ClassTermModel, ObjectPropertyTermModel} +import amf.aml.internal.render.emitters.common.ExternalEmitter +import amf.aml.internal.render.emitters.dialects.DocumentCreator import amf.core.client.scala.model.document.BaseUnit -import amf.core.client.common.position.Position -import amf.core.client.common.position.Position.ZERO import amf.core.client.scala.vocabulary.Namespace +import amf.core.internal.annotations.LexicalInformation import amf.core.internal.remote.Raml10 +import amf.core.internal.render.BaseEmitters._ import amf.core.internal.render.SpecOrdering -import amf.aml.internal.render.emitters.common.ExternalEmitter -import amf.aml.internal.metamodel.document.VocabularyModel -import amf.aml.internal.metamodel.domain.{ClassTermModel, ObjectPropertyTermModel} -import amf.aml.client.scala.model.document.Vocabulary -import amf.aml.client.scala.model.domain.{ClassTerm, PropertyTerm, VocabularyReference} -import amf.aml.internal.render.emitters.dialects.DocumentCreator +import amf.core.internal.render.emitters.EntryEmitter +import org.mulesoft.common.client.lexical.Position +import org.mulesoft.common.client.lexical.Position.ZERO import org.yaml.model.YDocument.EntryBuilder import org.yaml.model.{YDocument, YType} diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/semantic/AnnotationSchemaValidator.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/semantic/AnnotationSchemaValidator.scala index 436fdb53b..6f1ffe0e8 100644 --- a/amf-aml/shared/src/main/scala/amf/aml/internal/semantic/AnnotationSchemaValidator.scala +++ b/amf-aml/shared/src/main/scala/amf/aml/internal/semantic/AnnotationSchemaValidator.scala @@ -3,7 +3,7 @@ package amf.aml.internal.semantic import amf.core.client.scala.errorhandling.AMFErrorHandler import amf.core.client.scala.model.domain.extensions.CustomDomainProperty import amf.core.internal.annotations.SourceAST -import org.mulesoft.lexer.SourceLocation +import org.mulesoft.common.client.lexical.SourceLocation import org.yaml.model.YNode trait AnnotationSchemaValidator { diff --git a/amf-aml/shared/src/test/scala/amf/testing/parsing/DialectInstanceAssertionTest.scala b/amf-aml/shared/src/test/scala/amf/testing/parsing/DialectInstanceAssertionTest.scala index ceeadff5e..7b7d6687a 100644 --- a/amf-aml/shared/src/test/scala/amf/testing/parsing/DialectInstanceAssertionTest.scala +++ b/amf-aml/shared/src/test/scala/amf/testing/parsing/DialectInstanceAssertionTest.scala @@ -1,9 +1,9 @@ package amf.testing.parsing import amf.aml.client.scala.model.document.DialectInstance -import amf.core.client.common.position.Range import amf.aml.client.scala.{AMLConfiguration, AMLDialectInstanceResult} import amf.core.client.scala.model.domain.AmfArray +import org.mulesoft.common.client.lexical.PositionRange import org.scalatest.funsuite.AsyncFunSuite import org.scalatest.matchers.should.Matchers @@ -35,7 +35,7 @@ class DialectInstanceAssertionTest extends AsyncFunSuite with Matchers { val instance = s"$basePath/rest-connector/instance.yaml" parseDialectInstance(dialect, instance) flatMap { result => val lexical = getDialectInstanceFirstValue(result.dialectInstance).annotations.lexical() - lexical shouldEqual Range((3, 2), (6, 0)) + lexical shouldEqual PositionRange((3, 2), (6, 0)) } } @@ -45,7 +45,7 @@ class DialectInstanceAssertionTest extends AsyncFunSuite with Matchers { val instance = s"$basePath/rest-connector/instance.yaml" parseDialectInstance(dialectUnion, instance) flatMap { result => val lexical = getDialectInstanceFirstValue(result.dialectInstance).annotations.lexical() - lexical shouldEqual Range((3, 2), (6, 0)) + lexical shouldEqual PositionRange((3, 2), (6, 0)) } } diff --git a/amf-validation/shared/src/main/scala/amf/validation/internal/shacl/custom/CustomShaclValidator.scala b/amf-validation/shared/src/main/scala/amf/validation/internal/shacl/custom/CustomShaclValidator.scala index 3d9dedbf1..17a12a1a6 100644 --- a/amf-validation/shared/src/main/scala/amf/validation/internal/shacl/custom/CustomShaclValidator.scala +++ b/amf-validation/shared/src/main/scala/amf/validation/internal/shacl/custom/CustomShaclValidator.scala @@ -5,6 +5,7 @@ import amf.core.client.scala.model.DataType import amf.core.client.scala.model.document.BaseUnit import amf.core.client.scala.model.domain._ import amf.core.client.scala.vocabulary.Namespace +import amf.core.internal.annotations.{SourceAST, SourceYPart} import amf.core.internal.metamodel.Field import amf.core.internal.parser.domain.Annotations import amf.core.internal.utils._ @@ -15,6 +16,7 @@ import amf.validation.internal.shacl.custom.CustomShaclValidator.{ ValidationInfo } import org.mulesoft.common.time.SimpleDateTime +import org.yaml.model.YScalar import java.net.URISyntaxException diff --git a/amf-validation/shared/src/main/scala/amf/validation/internal/shacl/custom/ElementExtractor.scala b/amf-validation/shared/src/main/scala/amf/validation/internal/shacl/custom/ElementExtractor.scala index 136ff212b..ebeb96e4d 100644 --- a/amf-validation/shared/src/main/scala/amf/validation/internal/shacl/custom/ElementExtractor.scala +++ b/amf-validation/shared/src/main/scala/amf/validation/internal/shacl/custom/ElementExtractor.scala @@ -1,7 +1,7 @@ package amf.validation.internal.shacl.custom import amf.core.client.scala.model.domain.{AmfArray, AmfElement, AmfScalar, DomainElement} -import amf.core.internal.annotations.SourceAST +import amf.core.internal.annotations.{SourceAST, SourceYPart} import amf.core.internal.validation.core.PropertyConstraint import org.yaml.model.YScalar @@ -46,8 +46,8 @@ object DefaultElementExtractor extends ElementExtractor { } private def amfScalarToScala(scalar: AmfScalar): Any = { - scalar.annotations.find(classOf[SourceAST]) match { - case Some(ast: SourceAST) => + scalar.annotations.find(classOf[SourceYPart]) match { + case Some(ast: SourceYPart) => ast.ast match { case yscalar: YScalar => yscalar.value case _ => scalar.value diff --git a/amf-validation/shared/src/main/scala/amf/validation/internal/shacl/custom/PropertyConstraintValidator.scala b/amf-validation/shared/src/main/scala/amf/validation/internal/shacl/custom/PropertyConstraintValidator.scala index 0b66f47fd..2606c9bd7 100644 --- a/amf-validation/shared/src/main/scala/amf/validation/internal/shacl/custom/PropertyConstraintValidator.scala +++ b/amf-validation/shared/src/main/scala/amf/validation/internal/shacl/custom/PropertyConstraintValidator.scala @@ -1,7 +1,7 @@ package amf.validation.internal.shacl.custom import amf.core.client.scala.model.domain.{AmfElement, AmfObject, AmfScalar} -import amf.core.internal.annotations.SourceAST +import amf.core.internal.annotations.{SourceAST, SourceYPart} import amf.core.internal.parser.domain.Annotations import amf.core.internal.validation.core.{PropertyConstraint, ValidationSpecification} import org.yaml.model.YScalar @@ -33,12 +33,12 @@ object PropertyConstraintValidator { def amfScalarToScala(scalar: AmfScalar): Any = { scalar.annotations.find(classOf[SourceAST]) match { - case Some(ast: SourceAST) => + case Some(ast: SourceYPart) => ast.ast match { case yscalar: YScalar => yscalar.value case _ => scalar.value } - + case Some(_) => scalar.value case None => scalar.value } From 7a511247e695f359f05d0ea741d4428c1ca009c1 Mon Sep 17 00:00:00 2001 From: arielmirra Date: Tue, 12 Jul 2022 11:56:20 -0300 Subject: [PATCH 3/7] W-11047651: add message to report key when filtering duplicates --- .../internal/shacl/custom/CustomValidationReport.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amf-validation/shared/src/main/scala/amf/validation/internal/shacl/custom/CustomValidationReport.scala b/amf-validation/shared/src/main/scala/amf/validation/internal/shacl/custom/CustomValidationReport.scala index cd18cc5a9..69c5a6395 100644 --- a/amf-validation/shared/src/main/scala/amf/validation/internal/shacl/custom/CustomValidationReport.scala +++ b/amf-validation/shared/src/main/scala/amf/validation/internal/shacl/custom/CustomValidationReport.scala @@ -44,7 +44,7 @@ class ReportBuilder(messageStyle: MessageStyle) { } private def registerResult(result: ValidationResult): Unit = { - val key = result.sourceShape + result.sourceConstraintComponent + result.focusNode + val key = result.sourceShape + result.sourceConstraintComponent + result.focusNode + result.message.getOrElse("") if (!duplicates.contains(key)) { duplicates += key results.append(result) From 63d884b38a83e91ea27bfed81229036abf2872ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hern=C3=A1n=20Najles?= <50325041+pope1838@users.noreply.github.com> Date: Mon, 18 Jul 2022 11:05:07 -0300 Subject: [PATCH 4/7] Implement new register parse plugin at configuration (#542) --- .../src/main/scala/amf/aml/client/scala/AMLConfiguration.scala | 3 +++ 1 file changed, 3 insertions(+) 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 index eee2b81d1..b2476a2d0 100644 --- 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 @@ -132,6 +132,9 @@ class AMLConfiguration private[amf] ( override def withPlugin(amfPlugin: AMFPlugin[_]): AMLConfiguration = super._withPlugin(amfPlugin) + override def withRootParsePlugin(amfParsePlugin: AMFParsePlugin): AMLConfiguration = + super._withRootParsePlugin(amfParsePlugin) + override def withReferenceParsePlugin(amfPlugin: AMFParsePlugin): AMLConfiguration = super._withReferenceParsePlugin(amfPlugin) From 9d4ef4481518cb8f0cd3cd7ff6e4db1349a52066 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hern=C3=A1n=20Najles?= <50325041+pope1838@users.noreply.github.com> Date: Tue, 19 Jul 2022 12:31:05 -0300 Subject: [PATCH 5/7] Overryde copy method at aml registry (#543) --- .../main/scala/amf/aml/internal/registries/AMLRegistry.scala | 3 +++ 1 file changed, 3 insertions(+) diff --git a/amf-aml/shared/src/main/scala/amf/aml/internal/registries/AMLRegistry.scala b/amf-aml/shared/src/main/scala/amf/aml/internal/registries/AMLRegistry.scala index 9469ed1a1..269983eb1 100644 --- a/amf-aml/shared/src/main/scala/amf/aml/internal/registries/AMLRegistry.scala +++ b/amf-aml/shared/src/main/scala/amf/aml/internal/registries/AMLRegistry.scala @@ -54,6 +54,9 @@ private[amf] class AMLRegistry( override def withPlugins(amfPlugins: List[AMFPlugin[_]]): AMLRegistry = copy(plugins = plugins.withPlugins(amfPlugins)) + override def withRootParsePlugin(aMFParsePlugin: AMFParsePlugin): AMLRegistry = + copy(plugins = plugins.withRootParsePlugin(aMFParsePlugin)) + override def withFallback(plugin: DomainParsingFallback): AMLRegistry = copy(plugins = plugins.withFallback(plugin)) override def withConstraints(profile: ValidationProfile): AMLRegistry = { From 79b20cf904032f6b9f1a6cb6f970ec1f3db6b2a9 Mon Sep 17 00:00:00 2001 From: Loose Date: Fri, 22 Jul 2022 16:11:54 -0300 Subject: [PATCH 6/7] Publish 6.0.11-RC.0 --- Jenkinsfile | 1 + build.sbt | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f0d137378..431e919f5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -41,6 +41,7 @@ pipeline { anyOf { branch 'master' branch 'develop' + branch 'release/*' } } steps { diff --git a/build.sbt b/build.sbt index 35d5ce007..e38774e52 100644 --- a/build.sbt +++ b/build.sbt @@ -7,7 +7,7 @@ val ivyLocal = Resolver.file("ivy", file(Path.userHome.absolutePath + "/.ivy2/lo name := "amf-aml" -ThisBuild / version := "6.1.0-SNAPSHOT" +ThisBuild / version := "6.0.11-RC.0" ThisBuild / scalaVersion := "2.12.11" publish := {} @@ -34,7 +34,7 @@ lazy val workspaceDirectory: File = case _ => Path.userHome / "mulesoft" } -val amfCoreVersion = "5.1.0-SNAPSHOT" +val amfCoreVersion = "5.0.11-RC.0" lazy val amfCoreJVMRef = ProjectRef(workspaceDirectory / "amf-core", "coreJVM") lazy val amfCoreJSRef = ProjectRef(workspaceDirectory / "amf-core", "coreJS") From 74237c39af1525235c33c17a3afc3e7ee4fcc1c7 Mon Sep 17 00:00:00 2001 From: Loose Date: Tue, 26 Jul 2022 18:11:44 -0300 Subject: [PATCH 7/7] Publish 6.0.11 --- Jenkinsfile | 1 - build.sbt | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 431e919f5..f0d137378 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -41,7 +41,6 @@ pipeline { anyOf { branch 'master' branch 'develop' - branch 'release/*' } } steps { diff --git a/build.sbt b/build.sbt index e38774e52..082e9739b 100644 --- a/build.sbt +++ b/build.sbt @@ -7,7 +7,7 @@ val ivyLocal = Resolver.file("ivy", file(Path.userHome.absolutePath + "/.ivy2/lo name := "amf-aml" -ThisBuild / version := "6.0.11-RC.0" +ThisBuild / version := "6.0.11" ThisBuild / scalaVersion := "2.12.11" publish := {} @@ -34,7 +34,7 @@ lazy val workspaceDirectory: File = case _ => Path.userHome / "mulesoft" } -val amfCoreVersion = "5.0.11-RC.0" +val amfCoreVersion = "5.0.11" lazy val amfCoreJVMRef = ProjectRef(workspaceDirectory / "amf-core", "coreJVM") lazy val amfCoreJSRef = ProjectRef(workspaceDirectory / "amf-core", "coreJS")