From 64acd5b3d21145988495a24c5dd09077edb2942e Mon Sep 17 00:00:00 2001 From: Pierre De Belen Date: Fri, 27 Dec 2024 16:42:14 -0500 Subject: [PATCH] Upgrade Dependencies (#858) --- .../entities/model/domain/stores/TestDatabase.json | 1 + .../finos/legend/sdlc/generation/file/FileGenerationMojo.java | 2 +- .../sdlc/generation/artifact/ArtifactGenerationFactory.java | 2 +- .../legend/sdlc/generation/file/FileGenerationFactory.java | 2 +- .../sdlc/generation/file/TestFileGenerationFactory.java | 2 +- .../legend/sdlc/generation/model/ModelGenerationMojo.java | 2 +- .../legend/sdlc/generation/model/ModelGenerationFactory.java | 2 +- .../service/TestServiceExecutionClassGenerator.java | 2 +- .../generation/service/TestServiceExecutionGenerator.java | 2 +- .../language/pure/compiler/toPureGraph/PureModelBuilder.java | 2 +- .../legend/sdlc/protocol/pure/v1/EntityToPureConverter.java | 2 +- .../legend/sdlc/protocol/pure/v1/PureEntitySerializer.java | 2 +- .../sdlc/protocol/pure/v1/PureModelContextDataBuilder.java | 2 +- .../legend/sdlc/protocol/pure/v1/PureToEntityConverter.java | 2 +- .../legend/sdlc/protocol/pure/v1/PureProtocolHelper.java | 2 +- .../sdlc/protocol/pure/v1/TestEntityToPureConverter.java | 2 +- .../legend/sdlc/protocol/TestProtocolToEntityConverter.java | 2 +- .../legend/sdlc/test/junit/AbstractTestClassGenerator.java | 2 +- .../org/finos/legend/sdlc/test/junit/JUnitTestGenerator.java | 2 +- .../finos/legend/sdlc/test/junit/TestableTestGenerator.java | 2 +- .../sdlc/test/junit/AbstractTestClassGeneratorTest.java | 2 +- .../legend/sdlc/test/junit/TestTestableTestGenerator.java | 2 +- .../legend/sdlc/test/junit/LegendSDLCTestSuiteBuilder.java | 2 +- .../legend/sdlc/test/junit/pure/v1/AbstractMappingTest.java | 2 +- .../legend/sdlc/test/junit/pure/v1/AbstractPureTest.java | 2 +- .../legend/sdlc/test/junit/pure/v1/AbstractServiceTest.java | 2 +- .../finos/legend/sdlc/test/junit/pure/v1/PureTestHelper.java | 2 +- pom.xml | 4 ++-- 28 files changed, 29 insertions(+), 28 deletions(-) diff --git a/legend-sdlc-entity-maven-plugin/src/test/resources/single-file-json-model/entities/model/domain/stores/TestDatabase.json b/legend-sdlc-entity-maven-plugin/src/test/resources/single-file-json-model/entities/model/domain/stores/TestDatabase.json index f2878cccf2..59c83bd6d8 100644 --- a/legend-sdlc-entity-maven-plugin/src/test/resources/single-file-json-model/entities/model/domain/stores/TestDatabase.json +++ b/legend-sdlc-entity-maven-plugin/src/test/resources/single-file-json-model/entities/model/domain/stores/TestDatabase.json @@ -21,6 +21,7 @@ "name" : "FirmTable", "primaryKey" : [ "id" ] } ], + "tabularFunctions" : [ ], "views" : [ ] } ], "stereotypes" : [ ] diff --git a/legend-sdlc-generation-file-maven-plugin/src/main/java/org/finos/legend/sdlc/generation/file/FileGenerationMojo.java b/legend-sdlc-generation-file-maven-plugin/src/main/java/org/finos/legend/sdlc/generation/file/FileGenerationMojo.java index ceb80c1b5e..d647fed156 100644 --- a/legend-sdlc-generation-file-maven-plugin/src/main/java/org/finos/legend/sdlc/generation/file/FileGenerationMojo.java +++ b/legend-sdlc-generation-file-maven-plugin/src/main/java/org/finos/legend/sdlc/generation/file/FileGenerationMojo.java @@ -35,7 +35,7 @@ import org.finos.legend.engine.protocol.pure.v1.model.context.AlloySDLC; import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData; import org.finos.legend.engine.protocol.pure.v1.model.context.SDLC; -import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement; +import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement; import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.fileGeneration.FileGenerationSpecification; import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.generationSpecification.GenerationSpecification; import org.finos.legend.engine.shared.core.ObjectMapperFactory; diff --git a/legend-sdlc-generation-file/src/main/java/org/finos/legend/sdlc/generation/artifact/ArtifactGenerationFactory.java b/legend-sdlc-generation-file/src/main/java/org/finos/legend/sdlc/generation/artifact/ArtifactGenerationFactory.java index 9fe5575318..abafd9a016 100644 --- a/legend-sdlc-generation-file/src/main/java/org/finos/legend/sdlc/generation/artifact/ArtifactGenerationFactory.java +++ b/legend-sdlc-generation-file/src/main/java/org/finos/legend/sdlc/generation/artifact/ArtifactGenerationFactory.java @@ -27,7 +27,7 @@ import org.finos.legend.engine.language.pure.dsl.generation.extension.ArtifactGenerationExtensionLoader; import org.finos.legend.engine.protocol.pure.PureClientVersions; import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData; -import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement; +import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement; import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.domain.Function; import org.finos.legend.sdlc.generation.file.GenerationOutput; import org.slf4j.Logger; diff --git a/legend-sdlc-generation-file/src/main/java/org/finos/legend/sdlc/generation/file/FileGenerationFactory.java b/legend-sdlc-generation-file/src/main/java/org/finos/legend/sdlc/generation/file/FileGenerationFactory.java index d8c3b3d865..223103fef8 100644 --- a/legend-sdlc-generation-file/src/main/java/org/finos/legend/sdlc/generation/file/FileGenerationFactory.java +++ b/legend-sdlc-generation-file/src/main/java/org/finos/legend/sdlc/generation/file/FileGenerationFactory.java @@ -21,7 +21,7 @@ import org.finos.legend.engine.language.pure.compiler.toPureGraph.PureModel; import org.finos.legend.engine.protocol.pure.v1.model.context.PackageableElementPointer; import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData; -import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement; +import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement; import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.fileGeneration.FileGenerationSpecification; import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.generationSpecification.GenerationSpecification; import org.finos.legend.engine.shared.core.deployment.DeploymentMode; diff --git a/legend-sdlc-generation-file/src/test/java/org/finos/legend/sdlc/generation/file/TestFileGenerationFactory.java b/legend-sdlc-generation-file/src/test/java/org/finos/legend/sdlc/generation/file/TestFileGenerationFactory.java index 9941a43fe0..16e2333091 100644 --- a/legend-sdlc-generation-file/src/test/java/org/finos/legend/sdlc/generation/file/TestFileGenerationFactory.java +++ b/legend-sdlc-generation-file/src/test/java/org/finos/legend/sdlc/generation/file/TestFileGenerationFactory.java @@ -21,7 +21,7 @@ import org.finos.legend.engine.language.pure.compiler.toPureGraph.PureModel; import org.finos.legend.engine.protocol.pure.v1.PureProtocolObjectMapperFactory; import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData; -import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement; +import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement; import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.fileGeneration.FileGenerationSpecification; import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.generationSpecification.GenerationSpecification; import org.finos.legend.engine.shared.core.deployment.DeploymentMode; diff --git a/legend-sdlc-generation-model-maven-plugin/src/main/java/org/finos/legend/sdlc/generation/model/ModelGenerationMojo.java b/legend-sdlc-generation-model-maven-plugin/src/main/java/org/finos/legend/sdlc/generation/model/ModelGenerationMojo.java index 2bbc408f2b..6f2f280470 100644 --- a/legend-sdlc-generation-model-maven-plugin/src/main/java/org/finos/legend/sdlc/generation/model/ModelGenerationMojo.java +++ b/legend-sdlc-generation-model-maven-plugin/src/main/java/org/finos/legend/sdlc/generation/model/ModelGenerationMojo.java @@ -27,7 +27,7 @@ import org.eclipse.collections.impl.utility.ListIterate; import org.finos.legend.engine.language.pure.compiler.toPureGraph.PureModel; import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData; -import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement; +import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement; import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.generationSpecification.GenerationSpecification; import org.finos.legend.sdlc.domain.model.entity.Entity; import org.finos.legend.sdlc.language.pure.compiler.toPureGraph.PureModelBuilder; diff --git a/legend-sdlc-generation-model/src/main/java/org/finos/legend/sdlc/generation/model/ModelGenerationFactory.java b/legend-sdlc-generation-model/src/main/java/org/finos/legend/sdlc/generation/model/ModelGenerationFactory.java index 3dc39af478..3e26375179 100644 --- a/legend-sdlc-generation-model/src/main/java/org/finos/legend/sdlc/generation/model/ModelGenerationFactory.java +++ b/legend-sdlc-generation-model/src/main/java/org/finos/legend/sdlc/generation/model/ModelGenerationFactory.java @@ -25,7 +25,7 @@ import org.finos.legend.engine.protocol.pure.v1.model.SourceInformation; import org.finos.legend.engine.protocol.pure.v1.model.context.EngineErrorType; import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData; -import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement; +import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement; import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.generationSpecification.GenerationSpecification; import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.generationSpecification.GenerationTreeNode; import org.finos.legend.engine.shared.core.deployment.DeploymentMode; diff --git a/legend-sdlc-generation-service/src/test/java/org/finos/legend/sdlc/generation/service/TestServiceExecutionClassGenerator.java b/legend-sdlc-generation-service/src/test/java/org/finos/legend/sdlc/generation/service/TestServiceExecutionClassGenerator.java index cd065678bb..0effb78202 100644 --- a/legend-sdlc-generation-service/src/test/java/org/finos/legend/sdlc/generation/service/TestServiceExecutionClassGenerator.java +++ b/legend-sdlc-generation-service/src/test/java/org/finos/legend/sdlc/generation/service/TestServiceExecutionClassGenerator.java @@ -27,7 +27,7 @@ import org.finos.legend.engine.language.pure.dsl.service.execution.ServiceRunnerInput; import org.finos.legend.engine.plan.platform.java.JavaSourceHelper; import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData; -import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement; +import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement; import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.service.PureExecution; import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.service.Service; import org.finos.legend.engine.protocol.pure.v1.model.type.PackageableType; diff --git a/legend-sdlc-generation-service/src/test/java/org/finos/legend/sdlc/generation/service/TestServiceExecutionGenerator.java b/legend-sdlc-generation-service/src/test/java/org/finos/legend/sdlc/generation/service/TestServiceExecutionGenerator.java index a6b92825ff..bbd3d89e81 100644 --- a/legend-sdlc-generation-service/src/test/java/org/finos/legend/sdlc/generation/service/TestServiceExecutionGenerator.java +++ b/legend-sdlc-generation-service/src/test/java/org/finos/legend/sdlc/generation/service/TestServiceExecutionGenerator.java @@ -33,7 +33,7 @@ import org.finos.legend.engine.plan.generation.extension.PlanGeneratorExtension; import org.finos.legend.engine.plan.platform.java.JavaSourceHelper; import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData; -import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement; +import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement; import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.domain.Multiplicity; import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.service.PureExecution; import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.service.Service; diff --git a/legend-sdlc-language-pure-compiler/src/main/java/org/finos/legend/sdlc/language/pure/compiler/toPureGraph/PureModelBuilder.java b/legend-sdlc-language-pure-compiler/src/main/java/org/finos/legend/sdlc/language/pure/compiler/toPureGraph/PureModelBuilder.java index e7a59c745e..badbe82f96 100644 --- a/legend-sdlc-language-pure-compiler/src/main/java/org/finos/legend/sdlc/language/pure/compiler/toPureGraph/PureModelBuilder.java +++ b/legend-sdlc-language-pure-compiler/src/main/java/org/finos/legend/sdlc/language/pure/compiler/toPureGraph/PureModelBuilder.java @@ -21,7 +21,7 @@ import org.finos.legend.engine.protocol.Protocol; import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData; import org.finos.legend.engine.protocol.pure.v1.model.context.SDLC; -import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement; +import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement; import org.finos.legend.engine.shared.core.deployment.DeploymentMode; import org.finos.legend.sdlc.domain.model.entity.Entity; import org.finos.legend.sdlc.protocol.pure.v1.EntityToPureConverter; diff --git a/legend-sdlc-protocol-pure/src/main/java/org/finos/legend/sdlc/protocol/pure/v1/EntityToPureConverter.java b/legend-sdlc-protocol-pure/src/main/java/org/finos/legend/sdlc/protocol/pure/v1/EntityToPureConverter.java index f13b3e0206..c32e035972 100644 --- a/legend-sdlc-protocol-pure/src/main/java/org/finos/legend/sdlc/protocol/pure/v1/EntityToPureConverter.java +++ b/legend-sdlc-protocol-pure/src/main/java/org/finos/legend/sdlc/protocol/pure/v1/EntityToPureConverter.java @@ -14,7 +14,7 @@ package org.finos.legend.sdlc.protocol.pure.v1; -import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement; +import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement; import org.finos.legend.engine.shared.core.ObjectMapperFactory; import org.finos.legend.sdlc.domain.model.entity.Entity; import org.finos.legend.sdlc.protocol.EntityToProtocolConverter; diff --git a/legend-sdlc-protocol-pure/src/main/java/org/finos/legend/sdlc/protocol/pure/v1/PureEntitySerializer.java b/legend-sdlc-protocol-pure/src/main/java/org/finos/legend/sdlc/protocol/pure/v1/PureEntitySerializer.java index 32fedda233..d94bab78e8 100644 --- a/legend-sdlc-protocol-pure/src/main/java/org/finos/legend/sdlc/protocol/pure/v1/PureEntitySerializer.java +++ b/legend-sdlc-protocol-pure/src/main/java/org/finos/legend/sdlc/protocol/pure/v1/PureEntitySerializer.java @@ -21,7 +21,7 @@ import org.finos.legend.engine.language.pure.grammar.to.PureGrammarComposer; import org.finos.legend.engine.language.pure.grammar.to.PureGrammarComposerContext; import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData; -import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement; +import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement; import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.section.ImportAwareCodeSection; import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.section.Section; import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.section.SectionIndex; diff --git a/legend-sdlc-protocol-pure/src/main/java/org/finos/legend/sdlc/protocol/pure/v1/PureModelContextDataBuilder.java b/legend-sdlc-protocol-pure/src/main/java/org/finos/legend/sdlc/protocol/pure/v1/PureModelContextDataBuilder.java index bfa4d44242..f2611504d2 100644 --- a/legend-sdlc-protocol-pure/src/main/java/org/finos/legend/sdlc/protocol/pure/v1/PureModelContextDataBuilder.java +++ b/legend-sdlc-protocol-pure/src/main/java/org/finos/legend/sdlc/protocol/pure/v1/PureModelContextDataBuilder.java @@ -21,7 +21,7 @@ import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData; import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextPointer; import org.finos.legend.engine.protocol.pure.v1.model.context.SDLC; -import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement; +import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement; import org.finos.legend.sdlc.domain.model.entity.Entity; import java.util.Optional; diff --git a/legend-sdlc-protocol-pure/src/main/java/org/finos/legend/sdlc/protocol/pure/v1/PureToEntityConverter.java b/legend-sdlc-protocol-pure/src/main/java/org/finos/legend/sdlc/protocol/pure/v1/PureToEntityConverter.java index d155f454f7..d3b0a8122e 100644 --- a/legend-sdlc-protocol-pure/src/main/java/org/finos/legend/sdlc/protocol/pure/v1/PureToEntityConverter.java +++ b/legend-sdlc-protocol-pure/src/main/java/org/finos/legend/sdlc/protocol/pure/v1/PureToEntityConverter.java @@ -20,7 +20,7 @@ import org.eclipse.collections.api.set.ImmutableSet; import org.finos.legend.engine.protocol.pure.v1.ProtocolToClassifierPathLoader; import org.finos.legend.engine.protocol.pure.v1.PureProtocolObjectMapperFactory; -import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement; +import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement; import org.finos.legend.sdlc.protocol.ProtocolToEntityConverter; import java.util.Map; diff --git a/legend-sdlc-protocol-pure/src/test/java/org/finos/legend/sdlc/protocol/pure/v1/PureProtocolHelper.java b/legend-sdlc-protocol-pure/src/test/java/org/finos/legend/sdlc/protocol/pure/v1/PureProtocolHelper.java index 7ea9d324da..bf92c34cd5 100644 --- a/legend-sdlc-protocol-pure/src/test/java/org/finos/legend/sdlc/protocol/pure/v1/PureProtocolHelper.java +++ b/legend-sdlc-protocol-pure/src/test/java/org/finos/legend/sdlc/protocol/pure/v1/PureProtocolHelper.java @@ -20,7 +20,7 @@ import org.finos.legend.engine.language.pure.grammar.to.PureGrammarComposer; import org.finos.legend.engine.language.pure.grammar.to.PureGrammarComposerContext; import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData; -import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement; +import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement; import org.finos.legend.engine.shared.core.api.grammar.RenderStyle; import org.junit.Assert; diff --git a/legend-sdlc-protocol-pure/src/test/java/org/finos/legend/sdlc/protocol/pure/v1/TestEntityToPureConverter.java b/legend-sdlc-protocol-pure/src/test/java/org/finos/legend/sdlc/protocol/pure/v1/TestEntityToPureConverter.java index 9aadfcd60b..752eaad34c 100644 --- a/legend-sdlc-protocol-pure/src/test/java/org/finos/legend/sdlc/protocol/pure/v1/TestEntityToPureConverter.java +++ b/legend-sdlc-protocol-pure/src/test/java/org/finos/legend/sdlc/protocol/pure/v1/TestEntityToPureConverter.java @@ -15,7 +15,7 @@ package org.finos.legend.sdlc.protocol.pure.v1; import java.util.stream.Collectors; -import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement; +import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement; import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.domain.Class; import org.finos.legend.sdlc.domain.model.TestTools; import org.finos.legend.sdlc.domain.model.entity.Entity; diff --git a/legend-sdlc-protocol/src/test/java/org/finos/legend/sdlc/protocol/TestProtocolToEntityConverter.java b/legend-sdlc-protocol/src/test/java/org/finos/legend/sdlc/protocol/TestProtocolToEntityConverter.java index 26503f8e94..e6555f7a1b 100644 --- a/legend-sdlc-protocol/src/test/java/org/finos/legend/sdlc/protocol/TestProtocolToEntityConverter.java +++ b/legend-sdlc-protocol/src/test/java/org/finos/legend/sdlc/protocol/TestProtocolToEntityConverter.java @@ -21,7 +21,7 @@ import java.util.stream.Collectors; import org.finos.legend.engine.protocol.pure.v1.PureProtocolObjectMapperFactory; import org.finos.legend.engine.protocol.pure.v1.model.context.PackageableElementPointer; -import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement; +import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement; import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.domain.Association; import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.domain.Class; import org.finos.legend.sdlc.domain.model.entity.Entity; diff --git a/legend-sdlc-test-generation/src/main/java/org/finos/legend/sdlc/test/junit/AbstractTestClassGenerator.java b/legend-sdlc-test-generation/src/main/java/org/finos/legend/sdlc/test/junit/AbstractTestClassGenerator.java index 0fb0102d6a..d1b9b83315 100644 --- a/legend-sdlc-test-generation/src/main/java/org/finos/legend/sdlc/test/junit/AbstractTestClassGenerator.java +++ b/legend-sdlc-test-generation/src/main/java/org/finos/legend/sdlc/test/junit/AbstractTestClassGenerator.java @@ -14,7 +14,7 @@ package org.finos.legend.sdlc.test.junit; -import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement; +import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement; import org.finos.legend.sdlc.generation.GeneratorTemplate; import org.finos.legend.sdlc.generation.JavaCodeGenerator; import org.finos.legend.sdlc.tools.entity.EntityPaths; diff --git a/legend-sdlc-test-generation/src/main/java/org/finos/legend/sdlc/test/junit/JUnitTestGenerator.java b/legend-sdlc-test-generation/src/main/java/org/finos/legend/sdlc/test/junit/JUnitTestGenerator.java index 5ca5206bea..f97e1b2660 100644 --- a/legend-sdlc-test-generation/src/main/java/org/finos/legend/sdlc/test/junit/JUnitTestGenerator.java +++ b/legend-sdlc-test-generation/src/main/java/org/finos/legend/sdlc/test/junit/JUnitTestGenerator.java @@ -15,7 +15,7 @@ package org.finos.legend.sdlc.test.junit; import org.eclipse.collections.api.factory.Lists; -import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement; +import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement; import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.mapping.Mapping; import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.service.Service; import org.finos.legend.engine.testable.extension.TestableRunnerExtensionLoader; diff --git a/legend-sdlc-test-generation/src/main/java/org/finos/legend/sdlc/test/junit/TestableTestGenerator.java b/legend-sdlc-test-generation/src/main/java/org/finos/legend/sdlc/test/junit/TestableTestGenerator.java index 52386ab7ee..e1d193249e 100644 --- a/legend-sdlc-test-generation/src/main/java/org/finos/legend/sdlc/test/junit/TestableTestGenerator.java +++ b/legend-sdlc-test-generation/src/main/java/org/finos/legend/sdlc/test/junit/TestableTestGenerator.java @@ -14,7 +14,7 @@ package org.finos.legend.sdlc.test.junit; -import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement; +import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement; import org.finos.legend.sdlc.generation.GeneratorTemplate; class TestableTestGenerator extends AbstractTestClassGenerator diff --git a/legend-sdlc-test-generation/src/test/java/org/finos/legend/sdlc/test/junit/AbstractTestClassGeneratorTest.java b/legend-sdlc-test-generation/src/test/java/org/finos/legend/sdlc/test/junit/AbstractTestClassGeneratorTest.java index fadf0b7395..d4ac0db607 100644 --- a/legend-sdlc-test-generation/src/test/java/org/finos/legend/sdlc/test/junit/AbstractTestClassGeneratorTest.java +++ b/legend-sdlc-test-generation/src/test/java/org/finos/legend/sdlc/test/junit/AbstractTestClassGeneratorTest.java @@ -14,7 +14,7 @@ package org.finos.legend.sdlc.test.junit; -import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement; +import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement; import org.finos.legend.sdlc.domain.model.entity.Entity; import org.finos.legend.sdlc.generation.GeneratedJavaCode; import org.finos.legend.sdlc.protocol.pure.v1.EntityToPureConverter; diff --git a/legend-sdlc-test-generation/src/test/java/org/finos/legend/sdlc/test/junit/TestTestableTestGenerator.java b/legend-sdlc-test-generation/src/test/java/org/finos/legend/sdlc/test/junit/TestTestableTestGenerator.java index 90f71563cf..ed8cda9123 100644 --- a/legend-sdlc-test-generation/src/test/java/org/finos/legend/sdlc/test/junit/TestTestableTestGenerator.java +++ b/legend-sdlc-test-generation/src/test/java/org/finos/legend/sdlc/test/junit/TestTestableTestGenerator.java @@ -14,7 +14,7 @@ package org.finos.legend.sdlc.test.junit; -import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement; +import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement; public class TestTestableTestGenerator extends AbstractTestClassGeneratorTest { diff --git a/legend-sdlc-test-utils/src/main/java/org/finos/legend/sdlc/test/junit/LegendSDLCTestSuiteBuilder.java b/legend-sdlc-test-utils/src/main/java/org/finos/legend/sdlc/test/junit/LegendSDLCTestSuiteBuilder.java index 648fd66c21..30184fcf3f 100644 --- a/legend-sdlc-test-utils/src/main/java/org/finos/legend/sdlc/test/junit/LegendSDLCTestSuiteBuilder.java +++ b/legend-sdlc-test-utils/src/main/java/org/finos/legend/sdlc/test/junit/LegendSDLCTestSuiteBuilder.java @@ -29,7 +29,7 @@ import org.finos.legend.engine.plan.generation.extension.PlanGeneratorExtension; import org.finos.legend.engine.plan.generation.transformers.PlanTransformer; import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData; -import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement; +import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement; import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.mapping.Mapping; import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.service.Service; import org.finos.legend.engine.pure.code.core.LegendPureCoreExtension; diff --git a/legend-sdlc-test-utils/src/main/java/org/finos/legend/sdlc/test/junit/pure/v1/AbstractMappingTest.java b/legend-sdlc-test-utils/src/main/java/org/finos/legend/sdlc/test/junit/pure/v1/AbstractMappingTest.java index cc46ac257a..5c8bfad71e 100644 --- a/legend-sdlc-test-utils/src/main/java/org/finos/legend/sdlc/test/junit/pure/v1/AbstractMappingTest.java +++ b/legend-sdlc-test-utils/src/main/java/org/finos/legend/sdlc/test/junit/pure/v1/AbstractMappingTest.java @@ -15,7 +15,7 @@ package org.finos.legend.sdlc.test.junit.pure.v1; import org.finos.legend.engine.plan.execution.PlanExecutor; -import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement; +import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement; import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.mapping.Mapping; import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.mapping.mappingTest.MappingTest_Legacy; import org.finos.legend.engine.test.runner.mapping.MappingTestRunner; diff --git a/legend-sdlc-test-utils/src/main/java/org/finos/legend/sdlc/test/junit/pure/v1/AbstractPureTest.java b/legend-sdlc-test-utils/src/main/java/org/finos/legend/sdlc/test/junit/pure/v1/AbstractPureTest.java index 2da8f7c44e..0f8b2a3fe2 100644 --- a/legend-sdlc-test-utils/src/main/java/org/finos/legend/sdlc/test/junit/pure/v1/AbstractPureTest.java +++ b/legend-sdlc-test-utils/src/main/java/org/finos/legend/sdlc/test/junit/pure/v1/AbstractPureTest.java @@ -19,7 +19,7 @@ import org.finos.legend.engine.language.pure.compiler.toPureGraph.PureModel; import org.finos.legend.engine.plan.generation.transformers.PlanTransformer; import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData; -import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement; +import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement; import org.finos.legend.pure.generated.Root_meta_pure_extension_Extension; import org.junit.BeforeClass; diff --git a/legend-sdlc-test-utils/src/main/java/org/finos/legend/sdlc/test/junit/pure/v1/AbstractServiceTest.java b/legend-sdlc-test-utils/src/main/java/org/finos/legend/sdlc/test/junit/pure/v1/AbstractServiceTest.java index b42c840264..f026adc7b9 100644 --- a/legend-sdlc-test-utils/src/main/java/org/finos/legend/sdlc/test/junit/pure/v1/AbstractServiceTest.java +++ b/legend-sdlc-test-utils/src/main/java/org/finos/legend/sdlc/test/junit/pure/v1/AbstractServiceTest.java @@ -15,7 +15,7 @@ package org.finos.legend.sdlc.test.junit.pure.v1; import org.finos.legend.engine.plan.execution.PlanExecutor; -import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement; +import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement; import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.service.Service; import org.finos.legend.engine.test.runner.service.ServiceTestRunner; import org.junit.Test; diff --git a/legend-sdlc-test-utils/src/main/java/org/finos/legend/sdlc/test/junit/pure/v1/PureTestHelper.java b/legend-sdlc-test-utils/src/main/java/org/finos/legend/sdlc/test/junit/pure/v1/PureTestHelper.java index 199d6001e7..4e75f27414 100644 --- a/legend-sdlc-test-utils/src/main/java/org/finos/legend/sdlc/test/junit/pure/v1/PureTestHelper.java +++ b/legend-sdlc-test-utils/src/main/java/org/finos/legend/sdlc/test/junit/pure/v1/PureTestHelper.java @@ -25,7 +25,7 @@ import org.finos.legend.engine.plan.generation.extension.PlanGeneratorExtension; import org.finos.legend.engine.plan.generation.transformers.PlanTransformer; import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData; -import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement; +import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement; import org.finos.legend.engine.pure.code.core.LegendPureCoreExtension; import org.finos.legend.pure.generated.Root_meta_pure_extension_Extension; import org.finos.legend.sdlc.language.pure.compiler.toPureGraph.PureModelBuilder; diff --git a/pom.xml b/pom.xml index e1c956c90a..0087effc71 100644 --- a/pom.xml +++ b/pom.xml @@ -70,8 +70,8 @@ [11,12),[17,18),[21,22) - 4.67.5 - 5.26.0 + 4.67.10 + 5.28.0 0.25.7