Upgrade to latest Legend-pure. Clean modules. (#2704)

* Start splitting relational out. Extract external format from core Java binding * Continue modularization * Upgrade Pure * Fix Pure IDE Light POM * Fix POM * Clean External Format * reorg * split rest from execution-plan * Clean Config * Merge * Split config again * Merge * Set the proper Legend version
finos · Mar 16, 2024 · e768970 · e768970
1 parent 2346a00
commit e768970
Show file tree

Hide file tree

Showing 1,962 changed files with 9,960 additions and 2,223 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@
 **/dependency-reduced-pom.xml
 **/*.tokens
 **/*.patch
+**/*.DS_Store
 
 # VS Code ignores
 .vscode

diff --git a/.run/Server External.run.xml b/.run/Server External.run.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Server External" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="org.finos.legend.engine.server.Server" />
-    <module name="legend-engine-server" />
-    <option name="PROGRAM_PARAMETERS" value="server $PROJECT_DIR$/../../../deployment/legend-local/engine_config.json" />
+    <module name="legend-engine-server-rest" />
+    <option name="PROGRAM_PARAMETERS" value="server $USER_HOME$/deployment/legend-local/engine_config.json" />
     <extension name="coverage">
       <pattern>
         <option name="PATTERN" value="org.finos.legend.engine.server.*" />

diff --git a/...-code-compiled-core-configuration/pom.xml → ...iguration-contract-extension-pure/pom.xml b/...-code-compiled-core-configuration/pom.xml → ...iguration-contract-extension-pure/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright 2022 Goldman Sachs
+ Copyright 2021 Goldman Sachs
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -15,17 +15,15 @@
  limitations under the License.
 -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.finos.legend.engine</groupId>
-        <artifactId>legend-engine-config</artifactId>
+        <artifactId>legend-engine-configuration</artifactId>
         <version>4.40.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>legend-engine-pure-code-compiled-core-configuration</artifactId>
-    <packaging>jar</packaging>
-    <name>Legend Engine - Pure - Code - Core Configuration - PAR/JAVA</name>
+    <artifactId>legend-engine-configuration-contract-extension-pure</artifactId>
+    <name>Legend Engine - Configuration - Contract - Extension</name>
 
     <build>
         <plugins>
@@ -277,7 +275,7 @@
         </dependency>
         <dependency>
             <groupId>org.finos.legend.pure</groupId>
-            <artifactId>legend-pure-runtime-java-extension-dsl-mapping</artifactId>
+            <artifactId>legend-pure-runtime-java-extension-compiled-dsl-mapping</artifactId>
             <scope>runtime</scope>
         </dependency>
         <!-- PURE -->
@@ -293,12 +291,16 @@
         </dependency>
         <dependency>
             <groupId>org.finos.legend.engine</groupId>
-            <artifactId>legend-engine-pure-platform-dsl-mapping-java</artifactId>
+            <artifactId>legend-engine-pure-platform-dsl-store-java</artifactId>
         </dependency>
         <dependency>
             <groupId>org.finos.legend.engine</groupId>
             <artifactId>legend-engine-xt-javaPlatformBinding-pure</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.finos.legend.engine</groupId>
+            <artifactId>legend-engine-xt-javaPlatformBinding-externalFormat-pure</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.finos.legend.engine</groupId>
             <artifactId>legend-engine-xt-relationalStore-pure</artifactId>
@@ -349,7 +351,6 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
-
         <!-- TEST -->
     </dependencies>
-</project>
+</project>
diff --git a/...eConfigurationCodeRepositoryProvider.java → ...eConfigurationCodeRepositoryProvider.java b/...eConfigurationCodeRepositoryProvider.java → ...eConfigurationCodeRepositoryProvider.java
diff --git a/...esystem.repository.CodeRepositoryProvider → ...esystem.repository.CodeRepositoryProvider b/...esystem.repository.CodeRepositoryProvider → ...esystem.repository.CodeRepositoryProvider
diff --git a/...ources/core_configuration.definition.json → ...ources/core_configuration.definition.json b/...ources/core_configuration.definition.json → ...ources/core_configuration.definition.json
@@ -8,6 +8,7 @@
     "core_service",
     "core_external_language_java",
     "core_java_platform_binding",
+    "core_java_platform_binding_external_format",
     "core_relational",
     "core_relational_java_platform_binding",
     "core_servicestore",

diff --git a/...es/core_configuration/coreExtensions.pure → ...es/core_configuration/coreExtensions.pure b/...es/core_configuration/coreExtensions.pure → ...es/core_configuration/coreExtensions.pure
diff --git a/...de/core/Test_Pure_Core_Configuration.java → ...de/core/Test_Pure_Core_Configuration.java b/...de/core/Test_Pure_Core_Configuration.java → ...de/core/Test_Pure_Core_Configuration.java
diff --git a/...nd-engine-configuration/legend-engine-configuration-plan-generation-serialization/pom.xml b/...nd-engine-configuration/legend-engine-configuration-plan-generation-serialization/pom.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2021 Goldman Sachs
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.finos.legend.engine</groupId>
+        <artifactId>legend-engine-configuration</artifactId>
+        <version>4.40.4-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>legend-engine-configuration-plan-generation-serialization</artifactId>
+    <name>Legend Engine - Configuration - Plan Generation - Serialization</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.finos.legend.pure</groupId>
+            <artifactId>legend-pure-m3-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.finos.legend.engine</groupId>
+            <artifactId>legend-engine-protocol-pure</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.finos.legend.engine</groupId>
+            <artifactId>legend-engine-executionPlan-generation</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.finos.legend.engine</groupId>
+            <artifactId>legend-engine-pure-code-compiled-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.eclipse.collections</groupId>
+            <artifactId>eclipse-collections</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.collections</groupId>
+            <artifactId>eclipse-collections-api</artifactId>
+        </dependency>
+
+    </dependencies>
+</project>
diff --git a/...tension/LegendPlanGeneratorExtension.java → ...tension/LegendPlanGeneratorExtension.java b/...tension/LegendPlanGeneratorExtension.java → ...tension/LegendPlanGeneratorExtension.java
@@ -18,7 +18,6 @@
 import org.eclipse.collections.api.list.MutableList;
 import org.finos.legend.engine.plan.generation.transformers.LegendPlanTransformers;
 import org.finos.legend.engine.plan.generation.transformers.PlanTransformer;
-import org.finos.legend.engine.plan.generation.transformers.VersionPlanTransformer;
 
 public class LegendPlanGeneratorExtension implements PlanGeneratorExtension
 {

diff --git a/.../transformers/VersionPlanTransformer.java → ...ion/extension/VersionPlanTransformer.java b/.../transformers/VersionPlanTransformer.java → ...ion/extension/VersionPlanTransformer.java
@@ -12,9 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.finos.legend.engine.plan.generation.transformers;
+package org.finos.legend.engine.plan.generation.extension;
 
 import org.eclipse.collections.api.RichIterable;
+import org.finos.legend.engine.plan.generation.transformers.PlanTransformer;
 import org.finos.legend.engine.protocol.pure.PureClientVersions;
 import org.finos.legend.pure.generated.Root_meta_pure_executionPlan_ExecutionPlan;
 import org.finos.legend.pure.generated.Root_meta_pure_extension_Extension;

diff --git a/...neration.extension.PlanGeneratorExtension → ...neration.extension.PlanGeneratorExtension b/...neration.extension.PlanGeneratorExtension → ...neration.extension.PlanGeneratorExtension
diff --git a/legend-engine-config/legend-engine-configuration/pom.xml b/legend-engine-config/legend-engine-configuration/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright 2021 Goldman Sachs
+ Copyright 2022 Goldman Sachs
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -14,42 +14,20 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.finos.legend.engine</groupId>
         <artifactId>legend-engine-config</artifactId>
         <version>4.40.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
+
     <artifactId>legend-engine-configuration</artifactId>
+    <packaging>pom</packaging>
     <name>Legend Engine - Configuration</name>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.finos.legend.engine</groupId>
-            <artifactId>legend-engine-pure-code-compiled-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.finos.legend.pure</groupId>
-            <artifactId>legend-pure-m3-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.finos.legend.engine</groupId>
-            <artifactId>legend-engine-protocol-pure</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.finos.legend.engine</groupId>
-            <artifactId>legend-engine-executionPlan-generation</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.collections</groupId>
-            <artifactId>eclipse-collections-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.collections</groupId>
-            <artifactId>eclipse-collections</artifactId>
-        </dependency>
-    </dependencies>
-</project>
+    <modules>
+        <module>legend-engine-configuration-contract-extension-pure</module>
+        <module>legend-engine-configuration-plan-generation-serialization</module>
+    </modules>
+</project>
diff --git a/legend-engine-config/legend-engine-connection-integration-tests/pom.xml b/legend-engine-config/legend-engine-connection-integration-tests/pom.xml
diff --git a/legend-engine-config/legend-engine-extensions-collection-generation/pom.xml b/legend-engine-config/legend-engine-extensions-collection-generation/pom.xml
@@ -143,7 +143,7 @@
 
         <dependency>
             <groupId>org.finos.legend.engine</groupId>
-            <artifactId>legend-engine-pure-code-compiled-core-configuration</artifactId>
+            <artifactId>legend-engine-configuration-contract-extension-pure</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
@@ -154,13 +154,27 @@
             <groupId>org.finos.legend.engine</groupId>
             <artifactId>legend-engine-xt-javaPlatformBinding-pure</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.finos.legend.engine</groupId>
+            <artifactId>legend-engine-xt-javaPlatformBinding-externalFormat-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-external-shared-format-model</artifactId>
+            <artifactId>legend-engine-external-format-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.finos.legend.engine</groupId>
+            <artifactId>legend-engine-external-format-compiler</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.finos.legend.engine</groupId>
+            <artifactId>legend-engine-external-format-grammar</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <!-- ENGINE -->
 

diff --git a/...rc/test/java/org/finos/legend/engine/extensions/collection/generation/TestExtensions.java b/...rc/test/java/org/finos/legend/engine/extensions/collection/generation/TestExtensions.java
@@ -81,7 +81,6 @@
 import org.finos.legend.engine.language.sql.grammar.integration.SQLPureGrammarComposerExtension;
 import org.finos.legend.engine.language.stores.elasticsearch.v7.from.ElasticsearchGrammarParserExtension;
 import org.finos.legend.engine.protocol.bigqueryFunction.metamodel.BigQueryFunctionProtocolExtension;
-import org.finos.legend.engine.shared.core.identity.Identity;
 import org.finos.legend.engine.shared.core.identity.factory.*;
 import org.finos.legend.pure.code.core.ElasticsearchLegendPureCoreExtension;
 import org.finos.legend.engine.language.stores.elasticsearch.v7.to.ElasticsearchGrammarComposerExtension;
@@ -414,7 +413,7 @@ protected Iterable<? extends Class<? extends LegendPureCoreExtension>> getExpect
                 .with(CoreLegendPureCoreExtension.class)
                 .with(JSONLegendPureCoreExtension.class)
                 .with(RelationalLegendPureCoreExtension.class)
-                .with(BindingJavaBindingLegendPureCoreExtension.class)
+                .with(ExternalFormatJavaBindingLegendPureCoreExtension.class)
                 .with(M2MJavaBindingLegendPureCoreExtension.class)
                 .with(ServiceStoreJavaBindingLegendPureCoreExtension.class)
                 .with(ServiceStoreLegendPureCoreExtension.class)
@@ -530,6 +529,7 @@ protected Iterable<String> getExpectedCodeRepositories()
                 .with("core_text_metamodel")
                 .with("core_external_language_java")
                 .with("core_java_platform_binding")
+                .with("core_java_platform_binding_external_format")
                 .with("core_relational_java_platform_binding")
                 .with("core_servicestore_java_platform_binding")
                 .with("core_external_format_flatdata_java_platform_binding")