move PureModelContextDataGenerator to compiler (#2709)

finos · Mar 19, 2024 · 6b443d5 · 6b443d5
1 parent 0288681
commit 6b443d5
Show file tree

Hide file tree

Showing 22 changed files with 12 additions and 99 deletions.
diff --git a/...e-core-base/legend-engine-core-language-pure/legend-engine-language-pure-compiler/pom.xml b/...e-core-base/legend-engine-core-language-pure/legend-engine-language-pure-compiler/pom.xml
@@ -179,7 +179,6 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <scope>runtime</scope>
         </dependency>
         <!-- JACKSON -->
 

diff --git a/...mports/PureModelContextDataGenerator.java → ...eGraph/PureModelContextDataGenerator.java b/...mports/PureModelContextDataGenerator.java → ...eGraph/PureModelContextDataGenerator.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.finos.legend.engine.external.shared.format.imports;
+package org.finos.legend.engine.language.pure.compiler.fromPureGraph;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.eclipse.collections.api.RichIterable;

diff --git a/...lytics/legend-engine-xts-analytics-binding/legend-engine-xt-analytics-binding-api/pom.xml b/...lytics/legend-engine-xts-analytics-binding/legend-engine-xt-analytics-binding-api/pom.xml
@@ -29,10 +29,6 @@
 
     <dependencies>
         <!-- ENGINE -->
-        <dependency>
-            <groupId>org.finos.legend.engine</groupId>
-            <artifactId>legend-engine-external-shared</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.finos.legend.engine</groupId>
             <artifactId>legend-engine-language-pure-modelManager</artifactId>

diff --git a/...ics-binding-api/src/main/java/org/finos/legend/engine/api/analytics/BindingAnalytics.java b/...ics-binding-api/src/main/java/org/finos/legend/engine/api/analytics/BindingAnalytics.java
@@ -24,7 +24,7 @@
 import org.eclipse.collections.api.list.MutableList;
 import org.eclipse.collections.impl.factory.Lists;
 import org.finos.legend.engine.api.analytics.model.BindingModelCoverageAnalysisInput;
-import org.finos.legend.engine.external.shared.format.imports.PureModelContextDataGenerator;
+import org.finos.legend.engine.language.pure.compiler.fromPureGraph.PureModelContextDataGenerator;
 import org.finos.legend.engine.language.pure.compiler.toPureGraph.PureModel;
 import org.finos.legend.engine.language.pure.modelManager.ModelManager;
 import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData;

diff --git a/legend-engine-xts-analytics/legend-engine-xts-analytics-binding/pom.xml b/legend-engine-xts-analytics/legend-engine-xts-analytics-binding/pom.xml
@@ -24,7 +24,7 @@
 
     <artifactId>legend-engine-xts-analytics-binding</artifactId>
     <packaging>pom</packaging>
-    <name>Legend Engine - XTS - Analytics</name>
+    <name>Legend Engine - XTS - Analytics - Binding</name>
 
     <modules>
         <module>legend-engine-xt-analytics-binding-pure</module>

diff --git a/...-analytics/legend-engine-xts-analytics-class/legend-engine-xt-analytics-class-api/pom.xml b/...-analytics/legend-engine-xts-analytics-class/legend-engine-xt-analytics-class-api/pom.xml
@@ -36,10 +36,6 @@
         <!-- PURE -->
 
         <!-- ENGINE -->
-        <dependency>
-            <groupId>org.finos.legend.engine</groupId>
-            <artifactId>legend-engine-external-shared</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.finos.legend.engine</groupId>
             <artifactId>legend-engine-language-pure-modelManager</artifactId>

diff --git a/...alytics-class-api/src/main/java/org/finos/legend/engine/api/analytics/ClassAnalytics.java b/...alytics-class-api/src/main/java/org/finos/legend/engine/api/analytics/ClassAnalytics.java
@@ -24,7 +24,7 @@
 import org.eclipse.collections.api.list.MutableList;
 import org.eclipse.collections.impl.factory.Lists;
 import org.finos.legend.engine.api.analytics.model.ClassModelCoverageAnalysisInput;
-import org.finos.legend.engine.external.shared.format.imports.PureModelContextDataGenerator;
+import org.finos.legend.engine.language.pure.compiler.fromPureGraph.PureModelContextDataGenerator;
 import org.finos.legend.engine.language.pure.compiler.toPureGraph.PureModel;
 import org.finos.legend.engine.language.pure.modelManager.ModelManager;
 import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData;

diff --git a/legend-engine-xts-analytics/legend-engine-xts-analytics-class/pom.xml b/legend-engine-xts-analytics/legend-engine-xts-analytics-class/pom.xml
@@ -24,7 +24,7 @@
 
     <artifactId>legend-engine-xts-analytics-class</artifactId>
     <packaging>pom</packaging>
-    <name>Legend Engine - XTS - Analytics</name>
+    <name>Legend Engine - XTS - Analytics - Class</name>
 
     <modules>
         <module>legend-engine-xt-analytics-class-pure</module>

diff --git a/...tics/legend-engine-xts-analytics-function/legend-engine-xt-analytics-function-api/pom.xml b/...tics/legend-engine-xts-analytics-function/legend-engine-xt-analytics-function-api/pom.xml
@@ -36,10 +36,6 @@
         <!-- PURE -->
 
         <!-- ENGINE -->
-        <dependency>
-            <groupId>org.finos.legend.engine</groupId>
-            <artifactId>legend-engine-external-shared</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.finos.legend.engine</groupId>
             <artifactId>legend-engine-language-pure-modelManager</artifactId>

diff --git a/...s-function-api/src/main/java/org/finos/legend/engine/api/analytics/FunctionAnalytics.java b/...s-function-api/src/main/java/org/finos/legend/engine/api/analytics/FunctionAnalytics.java
@@ -23,7 +23,7 @@
 import org.eclipse.collections.api.list.MutableList;
 import org.eclipse.collections.impl.factory.Lists;
 import org.finos.legend.engine.api.analytics.model.FunctionModelCoverageAnalysisInput;
-import org.finos.legend.engine.external.shared.format.imports.PureModelContextDataGenerator;
+import org.finos.legend.engine.language.pure.compiler.fromPureGraph.PureModelContextDataGenerator;
 import org.finos.legend.engine.language.pure.compiler.toPureGraph.PureModel;
 import org.finos.legend.engine.language.pure.modelManager.ModelManager;
 import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData;

diff --git a/legend-engine-xts-analytics/legend-engine-xts-analytics-function/pom.xml b/legend-engine-xts-analytics/legend-engine-xts-analytics-function/pom.xml
@@ -24,7 +24,7 @@
 
     <artifactId>legend-engine-xts-analytics-function</artifactId>
     <packaging>pom</packaging>
-    <name>Legend Engine - XTS - Analytics</name>
+    <name>Legend Engine - XTS - Analytics - Function</name>
 
     <modules>
         <module>legend-engine-xt-analytics-function-pure</module>

diff --git a/legend-engine-xts-analytics/legend-engine-xts-analytics-lineage/pom.xml b/legend-engine-xts-analytics/legend-engine-xts-analytics-lineage/pom.xml
@@ -24,7 +24,7 @@
 
     <artifactId>legend-engine-xts-analytics-lineage</artifactId>
     <packaging>pom</packaging>
-    <name>Legend Engine - XTS - Analytics</name>
+    <name>Legend Engine - XTS - Analytics - Lineage</name>
 
     <modules>
         <module>legend-engine-xt-analytics-lineage-api</module>

diff --git a/...lytics/legend-engine-xts-analytics-mapping/legend-engine-xt-analytics-mapping-api/pom.xml b/...lytics/legend-engine-xts-analytics-mapping/legend-engine-xt-analytics-mapping-api/pom.xml
@@ -50,10 +50,6 @@
             <groupId>org.finos.legend.engine</groupId>
             <artifactId>legend-engine-xt-analytics-mapping-pure</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.finos.legend.engine</groupId>
-            <artifactId>legend-engine-external-shared</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.finos.legend.engine</groupId>
             <artifactId>legend-engine-language-pure-grammar</artifactId>

diff --git a/...ics-mapping-api/src/main/java/org/finos/legend/engine/api/analytics/MappingAnalytics.java b/...ics-mapping-api/src/main/java/org/finos/legend/engine/api/analytics/MappingAnalytics.java
@@ -26,7 +26,7 @@
 import org.finos.legend.engine.api.analytics.model.MappingModelCoverageAnalysisInput;
 import org.finos.legend.engine.api.analytics.model.MappingRuntimeCompatibilityAnalysisInput;
 import org.finos.legend.engine.api.analytics.model.MappingRuntimeCompatibilityAnalysisResult;
-import org.finos.legend.engine.external.shared.format.imports.PureModelContextDataGenerator;
+import org.finos.legend.engine.language.pure.compiler.fromPureGraph.PureModelContextDataGenerator;
 import org.finos.legend.engine.language.pure.compiler.toPureGraph.HelperModelBuilder;
 import org.finos.legend.engine.language.pure.compiler.toPureGraph.HelperRuntimeBuilder;
 import org.finos.legend.engine.language.pure.compiler.toPureGraph.PureModel;

diff --git a/legend-engine-xts-analytics/legend-engine-xts-analytics-mapping/pom.xml b/legend-engine-xts-analytics/legend-engine-xts-analytics-mapping/pom.xml
@@ -24,7 +24,7 @@
 
     <artifactId>legend-engine-xts-analytics-mapping</artifactId>
     <packaging>pom</packaging>
-    <name>Legend Engine - XTS - Analytics</name>
+    <name>Legend Engine - XTS - Analytics - Mapping</name>
 
     <modules>
         <module>legend-engine-xt-analytics-mapping-api</module>

diff --git a/legend-engine-xts-data-space/legend-engine-xt-data-space-generation/pom.xml b/legend-engine-xts-data-space/legend-engine-xt-data-space-generation/pom.xml
@@ -99,10 +99,6 @@
             <groupId>org.finos.legend.engine</groupId>
             <artifactId>legend-engine-language-pure-dsl-generation</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.finos.legend.engine</groupId>
-            <artifactId>legend-engine-external-shared</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.finos.legend.engine</groupId>
             <artifactId>legend-engine-xt-analytics-mapping-protocol</artifactId>

diff --git a/.../src/main/java/org/finos/legend/engine/generation/analytics/DataSpaceAnalyticsHelper.java b/.../src/main/java/org/finos/legend/engine/generation/analytics/DataSpaceAnalyticsHelper.java
@@ -23,7 +23,7 @@
 import org.finos.legend.engine.entitlement.services.EntitlementModelObjectMapperFactory;
 import org.finos.legend.engine.entitlement.services.EntitlementServiceExtension;
 import org.finos.legend.engine.entitlement.services.EntitlementServiceExtensionLoader;
-import org.finos.legend.engine.external.shared.format.imports.PureModelContextDataGenerator;
+import org.finos.legend.engine.language.pure.compiler.fromPureGraph.PureModelContextDataGenerator;
 import org.finos.legend.engine.generation.analytics.model.*;
 import org.finos.legend.engine.language.pure.compiler.toPureGraph.HelperModelBuilder;
 import org.finos.legend.engine.language.pure.compiler.toPureGraph.HelperValueSpecificationBuilder;

diff --git a/legend-engine-xts-diagram/legend-engine-xt-diagram-api/pom.xml b/legend-engine-xts-diagram/legend-engine-xt-diagram-api/pom.xml
@@ -56,10 +56,6 @@
             <groupId>org.finos.legend.engine</groupId>
             <artifactId>legend-engine-language-pure-modelManager</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.finos.legend.engine</groupId>
-            <artifactId>legend-engine-external-shared</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.finos.legend.engine</groupId>
             <artifactId>legend-engine-xt-diagram-compiler</artifactId>

diff --git a/...-xt-diagram-api/src/main/java/org/finos/legend/engine/api/analytics/DiagramAnalytics.java b/...-xt-diagram-api/src/main/java/org/finos/legend/engine/api/analytics/DiagramAnalytics.java
@@ -23,13 +23,11 @@
 import org.eclipse.collections.api.RichIterable;
 import org.eclipse.collections.api.list.MutableList;
 import org.eclipse.collections.impl.factory.Lists;
-import org.eclipse.collections.impl.utility.ListIterate;
 import org.finos.legend.engine.api.analytics.model.DiagramModelCoverageAnalysisInput;
-import org.finos.legend.engine.external.shared.format.imports.PureModelContextDataGenerator;
+import org.finos.legend.engine.language.pure.compiler.fromPureGraph.PureModelContextDataGenerator;
 import org.finos.legend.engine.language.pure.compiler.toPureGraph.PureModel;
 import org.finos.legend.engine.language.pure.modelManager.ModelManager;
 import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData;
-import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.domain.Enumeration;
 import org.finos.legend.engine.shared.core.ObjectMapperFactory;
 import org.finos.legend.engine.shared.core.api.result.ManageConstantResult;
 import org.finos.legend.engine.shared.core.identity.Identity;

diff --git a/legend-engine-xts-generation/legend-engine-external-shared/pom.xml b/legend-engine-xts-generation/legend-engine-external-shared/pom.xml
@@ -49,10 +49,6 @@
             <artifactId>legend-engine-language-pure-dsl-generation-pure</artifactId>
         </dependency>
         <!--    Depends on legend-engine-pure-code-compiled-core for protocol transformation   -->
-        <dependency>
-            <groupId>org.finos.legend.engine</groupId>
-            <artifactId>legend-engine-pure-code-compiled-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.finos.legend.engine</groupId>
             <artifactId>legend-engine-protocol-pure</artifactId>
@@ -83,10 +79,6 @@
         <!-- ANNOTATIONS -->
 
         <!-- JACKSON -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
@@ -98,10 +90,6 @@
             <groupId>org.eclipse.collections</groupId>
             <artifactId>eclipse-collections-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.collections</groupId>
-            <artifactId>eclipse-collections</artifactId>
-        </dependency>
         <!-- ECLIPSE COLLECTIONS -->
     </dependencies>
 </project>
diff --git a/...c/main/java/org/finos/legend/engine/external/shared/format/imports/FileImportContent.java b/...c/main/java/org/finos/legend/engine/external/shared/format/imports/FileImportContent.java
diff --git a/...g/finos/legend/engine/external/shared/format/imports/PureModelContextGenerationInput.java b/...g/finos/legend/engine/external/shared/format/imports/PureModelContextGenerationInput.java