Upgrade legend-engine@4.69.0 and legend-pure@5.32.0 (#862)

finos · Jan 30, 2025 · 494a7a5 · 494a7a5
1 parent 274c44c
commit 494a7a5
Show file tree

Hide file tree

Showing 33 changed files with 63 additions and 75 deletions.
diff --git a/...-maven-plugin/src/main/java/org/finos/legend/sdlc/generation/file/FileGenerationMojo.java b/...-maven-plugin/src/main/java/org/finos/legend/sdlc/generation/file/FileGenerationMojo.java
@@ -32,10 +32,10 @@
 import org.finos.legend.engine.language.pure.dsl.generation.extension.ArtifactGenerationExtension;
 import org.finos.legend.engine.protocol.Protocol;
 import org.finos.legend.engine.protocol.pure.PureClientVersions;
+import org.finos.legend.engine.protocol.pure.m3.PackageableElement;
 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;
 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/...le/src/main/java/org/finos/legend/sdlc/generation/artifact/ArtifactGenerationFactory.java b/...le/src/main/java/org/finos/legend/sdlc/generation/artifact/ArtifactGenerationFactory.java
@@ -15,7 +15,6 @@
 
 package org.finos.legend.sdlc.generation.artifact;
 
-import java.util.Collections;
 import org.eclipse.collections.api.factory.Lists;
 import org.eclipse.collections.api.factory.Maps;
 import org.eclipse.collections.api.map.MutableMap;
@@ -26,13 +25,14 @@
 import org.finos.legend.engine.language.pure.dsl.generation.extension.ArtifactGenerationExtension;
 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.m3.PackageableElement;
+import org.finos.legend.engine.protocol.pure.m3.function.Function;
 import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData;
-import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement;
-import org.finos.legend.engine.protocol.pure.v1.model.domain.Function;
 import org.finos.legend.sdlc.generation.file.GenerationOutput;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Collections;
 import java.util.List;
 
 public class ArtifactGenerationFactory

diff --git a/...ation-file/src/main/java/org/finos/legend/sdlc/generation/file/FileGenerationFactory.java b/...ation-file/src/main/java/org/finos/legend/sdlc/generation/file/FileGenerationFactory.java
@@ -19,9 +19,9 @@
 import org.eclipse.collections.api.map.MutableMap;
 import org.eclipse.collections.impl.utility.LazyIterate;
 import org.finos.legend.engine.language.pure.compiler.toPureGraph.PureModel;
+import org.finos.legend.engine.protocol.pure.m3.PackageableElement;
 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;
 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/...n-file/src/test/java/org/finos/legend/sdlc/generation/file/TestFileGenerationFactory.java b/...n-file/src/test/java/org/finos/legend/sdlc/generation/file/TestFileGenerationFactory.java
@@ -19,9 +19,9 @@
 import org.eclipse.collections.api.map.MutableMap;
 import org.eclipse.collections.impl.utility.LazyIterate;
 import org.finos.legend.engine.language.pure.compiler.toPureGraph.PureModel;
+import org.finos.legend.engine.protocol.pure.m3.PackageableElement;
 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;
 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/...aven-plugin/src/main/java/org/finos/legend/sdlc/generation/model/ModelGenerationMojo.java b/...aven-plugin/src/main/java/org/finos/legend/sdlc/generation/model/ModelGenerationMojo.java
@@ -26,8 +26,8 @@
 import org.eclipse.collections.impl.utility.LazyIterate;
 import org.eclipse.collections.impl.utility.ListIterate;
 import org.finos.legend.engine.language.pure.compiler.toPureGraph.PureModel;
+import org.finos.legend.engine.protocol.pure.m3.PackageableElement;
 import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData;
-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/...on-model/src/main/java/org/finos/legend/sdlc/generation/model/ModelGenerationFactory.java b/...on-model/src/main/java/org/finos/legend/sdlc/generation/model/ModelGenerationFactory.java
@@ -22,10 +22,10 @@
 import org.finos.legend.engine.language.pure.compiler.toPureGraph.PureModel;
 import org.finos.legend.engine.language.pure.dsl.generation.compiler.toPureGraph.GenerationCompilerExtension;
 import org.finos.legend.engine.language.pure.dsl.generation.compiler.toPureGraph.HelperGenerationSpecificationBuilder;
+import org.finos.legend.engine.protocol.pure.m3.PackageableElement;
 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;
 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;
@@ -160,4 +160,3 @@ public PureModel getPureModel()
     }
 
 }
-
diff --git a/...odel/src/test/java/org/finos/legend/sdlc/generation/model/TestModelGenerationFactory.java b/...odel/src/test/java/org/finos/legend/sdlc/generation/model/TestModelGenerationFactory.java
@@ -15,9 +15,9 @@
 package org.finos.legend.sdlc.generation.model;
 
 import org.finos.legend.engine.language.pure.compiler.toPureGraph.PureModel;
+import org.finos.legend.engine.protocol.pure.m3.type.Class;
 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.domain.Class;
 import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.generationSpecification.GenerationSpecification;
 import org.finos.legend.engine.shared.core.operational.errorManagement.EngineException;
 import org.junit.Assert;

diff --git a/...rc/main/java/org/finos/legend/sdlc/generation/service/ServiceExecutionClassGenerator.java b/...rc/main/java/org/finos/legend/sdlc/generation/service/ServiceExecutionClassGenerator.java
@@ -21,13 +21,13 @@
 import org.eclipse.collections.api.list.MutableList;
 import org.eclipse.collections.api.set.MutableSet;
 import org.finos.legend.engine.plan.platform.java.JavaSourceHelper;
-import org.finos.legend.engine.protocol.pure.v1.model.domain.Multiplicity;
+import org.finos.legend.engine.protocol.pure.m3.multiplicity.Multiplicity;
+import org.finos.legend.engine.protocol.pure.m3.valuespecification.Variable;
 import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.service.Execution;
 import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.service.PureExecution;
 import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.service.PureMultiExecution;
 import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.service.Service;
 import org.finos.legend.engine.protocol.pure.v1.model.type.PackageableType;
-import org.finos.legend.engine.protocol.pure.v1.model.valueSpecification.Variable;
 import org.finos.legend.engine.protocol.pure.v1.model.valueSpecification.raw.Lambda;
 import org.finos.legend.sdlc.generation.GeneratorTemplate;
 import org.finos.legend.sdlc.tools.entity.EntityPaths;

diff --git a/...est/java/org/finos/legend/sdlc/generation/service/TestServiceExecutionClassGenerator.java b/...est/java/org/finos/legend/sdlc/generation/service/TestServiceExecutionClassGenerator.java
@@ -26,8 +26,8 @@
 import org.finos.legend.engine.language.pure.dsl.service.execution.ServiceRunner;
 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.m3.PackageableElement;
 import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData;
-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;
@@ -47,6 +47,11 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import javax.tools.DiagnosticCollector;
+import javax.tools.JavaCompiler;
+import javax.tools.JavaFileObject;
+import javax.tools.SimpleJavaFileObject;
+import javax.tools.ToolProvider;
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -64,11 +69,6 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import javax.tools.DiagnosticCollector;
-import javax.tools.JavaCompiler;
-import javax.tools.JavaFileObject;
-import javax.tools.SimpleJavaFileObject;
-import javax.tools.ToolProvider;
 
 public class TestServiceExecutionClassGenerator
 {

diff --git a/...src/test/java/org/finos/legend/sdlc/generation/service/TestServiceExecutionGenerator.java b/...src/test/java/org/finos/legend/sdlc/generation/service/TestServiceExecutionGenerator.java
@@ -32,9 +32,9 @@
 import org.finos.legend.engine.plan.execution.result.serialization.SerializationFormat;
 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.m3.PackageableElement;
+import org.finos.legend.engine.protocol.pure.m3.multiplicity.Multiplicity;
 import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData;
-import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement;
-import org.finos.legend.engine.protocol.pure.v1.model.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;
 import org.finos.legend.engine.protocol.pure.v1.model.type.PackageableType;
@@ -54,6 +54,11 @@
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
+import javax.tools.DiagnosticCollector;
+import javax.tools.JavaCompiler;
+import javax.tools.JavaFileObject;
+import javax.tools.SimpleJavaFileObject;
+import javax.tools.ToolProvider;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -83,11 +88,6 @@
 import java.util.Spliterators;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
-import javax.tools.DiagnosticCollector;
-import javax.tools.JavaCompiler;
-import javax.tools.JavaFileObject;
-import javax.tools.SimpleJavaFileObject;
-import javax.tools.ToolProvider;
 
 public class TestServiceExecutionGenerator
 {

diff --git a/.../main/java/org/finos/legend/sdlc/language/pure/compiler/toPureGraph/PureModelBuilder.java b/.../main/java/org/finos/legend/sdlc/language/pure/compiler/toPureGraph/PureModelBuilder.java
@@ -19,9 +19,9 @@
 import org.finos.legend.engine.language.pure.compiler.toPureGraph.extension.CompilerExtension;
 import org.finos.legend.engine.language.pure.compiler.toPureGraph.extension.CompilerExtensions;
 import org.finos.legend.engine.protocol.Protocol;
+import org.finos.legend.engine.protocol.pure.m3.PackageableElement;
 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;
 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/...t/java/org/finos/legend/sdlc/language/pure/compiler/toPureGraph/TestPureModelBuilder.java b/...t/java/org/finos/legend/sdlc/language/pure/compiler/toPureGraph/TestPureModelBuilder.java
@@ -16,8 +16,8 @@
 
 import org.eclipse.collections.api.factory.Sets;
 import org.finos.legend.engine.language.pure.compiler.toPureGraph.PureModel;
+import org.finos.legend.engine.protocol.pure.m3.type.Class;
 import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData;
-import org.finos.legend.engine.protocol.pure.v1.model.domain.Class;
 import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.mapping.Mapping;
 import org.finos.legend.pure.generated.core_pure_serialization_toPureGrammar;
 import org.finos.legend.sdlc.protocol.pure.v1.PureProtocolHelper;

diff --git a/...ocol-pure/src/main/java/org/finos/legend/sdlc/protocol/pure/v1/EntityToPureConverter.java b/...ocol-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;
+import org.finos.legend.engine.protocol.pure.m3.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/...tocol-pure/src/main/java/org/finos/legend/sdlc/protocol/pure/v1/PureEntitySerializer.java b/...tocol-pure/src/main/java/org/finos/legend/sdlc/protocol/pure/v1/PureEntitySerializer.java
@@ -20,8 +20,8 @@
 import org.finos.legend.engine.language.pure.grammar.from.PureGrammarParser;
 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.m3.PackageableElement;
 import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData;
-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/...ure/src/main/java/org/finos/legend/sdlc/protocol/pure/v1/PureModelContextDataBuilder.java b/...ure/src/main/java/org/finos/legend/sdlc/protocol/pure/v1/PureModelContextDataBuilder.java
@@ -18,10 +18,10 @@
 import org.eclipse.collections.api.list.MutableList;
 import org.eclipse.collections.impl.utility.ArrayIterate;
 import org.finos.legend.engine.protocol.Protocol;
+import org.finos.legend.engine.protocol.pure.m3.PackageableElement;
 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;
 import org.finos.legend.sdlc.domain.model.entity.Entity;
 
 import java.util.Optional;

diff --git a/...ocol-pure/src/main/java/org/finos/legend/sdlc/protocol/pure/v1/PureToEntityConverter.java b/...ocol-pure/src/main/java/org/finos/legend/sdlc/protocol/pure/v1/PureToEntityConverter.java
@@ -18,9 +18,9 @@
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import org.eclipse.collections.api.factory.Sets;
 import org.eclipse.collections.api.set.ImmutableSet;
+import org.finos.legend.engine.protocol.pure.m3.PackageableElement;
 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;
 import org.finos.legend.sdlc.protocol.ProtocolToEntityConverter;
 
 import java.util.Map;
@@ -53,4 +53,3 @@ boolean isSupportedClassifier(String classifierPath)
         return this.supportedClassifiers.contains(classifierPath);
     }
 }
-
diff --git a/...rotocol-pure/src/test/java/org/finos/legend/sdlc/protocol/pure/v1/PureProtocolHelper.java b/...rotocol-pure/src/test/java/org/finos/legend/sdlc/protocol/pure/v1/PureProtocolHelper.java
@@ -19,8 +19,8 @@
 import org.eclipse.collections.impl.utility.Iterate;
 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.m3.PackageableElement;
 import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData;
-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/...-pure/src/test/java/org/finos/legend/sdlc/protocol/pure/v1/TestEntityToPureConverter.java b/...-pure/src/test/java/org/finos/legend/sdlc/protocol/pure/v1/TestEntityToPureConverter.java
@@ -14,16 +14,16 @@
 
 package org.finos.legend.sdlc.protocol.pure.v1;
 
-import java.util.stream.Collectors;
-import org.finos.legend.engine.protocol.pure.v1.model.PackageableElement;
-import org.finos.legend.engine.protocol.pure.v1.model.domain.Class;
+import org.finos.legend.engine.protocol.pure.m3.PackageableElement;
+import org.finos.legend.engine.protocol.pure.m3.type.Class;
 import org.finos.legend.sdlc.domain.model.TestTools;
 import org.finos.legend.sdlc.domain.model.entity.Entity;
 import org.junit.Assert;
 import org.junit.Test;
 
 import java.util.Collections;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 public class TestEntityToPureConverter
 {

diff --git a/...src/test/java/org/finos/legend/sdlc/protocol/pure/v1/TestPureModelContextDataBuilder.java b/...src/test/java/org/finos/legend/sdlc/protocol/pure/v1/TestPureModelContextDataBuilder.java
@@ -17,9 +17,9 @@
 import org.eclipse.collections.api.factory.Lists;
 import org.eclipse.collections.api.factory.Sets;
 import org.finos.legend.engine.protocol.Protocol;
+import org.finos.legend.engine.protocol.pure.m3.type.Class;
 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.domain.Class;
 import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.mapping.Mapping;
 import org.finos.legend.sdlc.serialization.EntityLoader;
 import org.junit.Assert;

diff --git a/...-pure/src/test/java/org/finos/legend/sdlc/protocol/pure/v1/TestPureToEntityConverter.java b/...-pure/src/test/java/org/finos/legend/sdlc/protocol/pure/v1/TestPureToEntityConverter.java
@@ -14,12 +14,12 @@
 
 package org.finos.legend.sdlc.protocol.pure.v1;
 
+import org.finos.legend.engine.protocol.pure.m3.type.Class;
 import org.finos.legend.engine.protocol.pure.v1.model.context.PackageableElementPointer;
 import org.finos.legend.sdlc.domain.model.entity.Entity;
+import org.finos.legend.sdlc.protocol.TestProtocolToEntityConverter;
 import org.junit.Assert;
 import org.junit.Test;
-import org.finos.legend.engine.protocol.pure.v1.model.domain.Class;
-import org.finos.legend.sdlc.protocol.TestProtocolToEntityConverter;
 
 import java.util.Collections;
 import java.util.Optional;
@@ -51,4 +51,3 @@ public void testToEntityIfPossible()
         TestProtocolToEntityConverter.assertEntityEqualsClass(cls, entity.get());
     }
 }
-
diff --git a/...-protocol/src/test/java/org/finos/legend/sdlc/protocol/TestEntityToProtocolConverter.java b/...-protocol/src/test/java/org/finos/legend/sdlc/protocol/TestEntityToProtocolConverter.java
@@ -14,8 +14,8 @@
 
 package org.finos.legend.sdlc.protocol;
 
+import org.finos.legend.engine.protocol.pure.m3.type.Class;
 import org.finos.legend.engine.protocol.pure.v1.PureProtocolObjectMapperFactory;
-import org.finos.legend.engine.protocol.pure.v1.model.domain.Class;
 import org.finos.legend.sdlc.domain.model.TestTools;
 import org.finos.legend.sdlc.domain.model.entity.Entity;
 import org.junit.Assert;

diff --git a/...-protocol/src/test/java/org/finos/legend/sdlc/protocol/TestProtocolToEntityConverter.java b/...-protocol/src/test/java/org/finos/legend/sdlc/protocol/TestProtocolToEntityConverter.java
@@ -15,21 +15,20 @@
 package org.finos.legend.sdlc.protocol;
 
 import com.fasterxml.jackson.databind.json.JsonMapper;
-
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.stream.Collectors;
+import org.finos.legend.engine.protocol.pure.m3.PackageableElement;
+import org.finos.legend.engine.protocol.pure.m3.relationship.Association;
+import org.finos.legend.engine.protocol.pure.m3.type.Class;
 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;
-import org.finos.legend.engine.protocol.pure.v1.model.domain.Association;
-import org.finos.legend.engine.protocol.pure.v1.model.domain.Class;
 import org.finos.legend.sdlc.domain.model.entity.Entity;
 import org.junit.Assert;
 import org.junit.Test;
 
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Map;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 public class TestProtocolToEntityConverter
 {
@@ -46,15 +45,8 @@ public void testToEntity()
         Entity entity = converter.toEntity(cls);
         assertEntityEqualsClass(cls, entity);
 
-        try
-        {
-            converter.toEntity(new Association());
-            Assert.fail();
-        }
-        catch (IllegalArgumentException e)
-        {
-            Assert.assertEquals("Could not convert instance of " + Association.class.getName() + " to Entity: no appropriate classifier found", e.getMessage());
-        }
+        IllegalArgumentException e = Assert.assertThrows(IllegalArgumentException.class, () -> converter.toEntity(new Association()));
+        Assert.assertEquals("Could not convert instance of " + Association.class.getName() + " to Entity: no appropriate classifier found", e.getMessage());
     }
 
     @Test
@@ -94,7 +86,7 @@ protected String getEntityPath(PackageableElement element)
         }
     }
 
-    public static void assertEntityEqualsClass(org.finos.legend.engine.protocol.pure.v1.model.domain.Class cls, Entity entity)
+    public static void assertEntityEqualsClass(Class cls, Entity entity)
     {
         Assert.assertNotNull(entity);
         Assert.assertEquals(CLASS_CLASSIFIER_PATH, entity.getClassifierPath());
@@ -106,4 +98,3 @@ public static void assertEntityEqualsClass(org.finos.legend.engine.protocol.pure
         Assert.assertEquals(cls.superTypes.stream().map(x -> x.path).collect(Collectors.toList()),  ((ArrayList<Map<String, ?>>) entity.getContent().get("superTypes")).stream().map(e -> e.get("path")).collect(Collectors.toList()));
     }
 }
-