Refactor Modules (#2440)

* rename method * Function activation cleanup * rollback file changes * Change spark keywords * Change spark keywords * Fix test * Add Primitive Type to Open APi Generator * Add byte * BigQuery Activator: Sandbox * refactor modules * refactor modules
finos · Nov 7, 2023 · 5737489 · 5737489
1 parent c63841b
commit 5737489
Show file tree

Hide file tree

Showing 23 changed files with 113 additions and 34 deletions.
diff --git a/legend-engine-config/legend-engine-server/pom.xml b/legend-engine-config/legend-engine-server/pom.xml
@@ -374,6 +374,10 @@
             <groupId>org.finos.legend.engine</groupId>
             <artifactId>legend-engine-xt-hostedService-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.finos.legend.engine</groupId>
+            <artifactId>legend-engine-xt-hostedService-generation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.finos.legend.engine</groupId>
             <artifactId>legend-engine-language-pure-dsl-service</artifactId>

diff --git a/...gine-config/legend-engine-server/src/main/java/org/finos/legend/engine/server/Server.java b/...gine-config/legend-engine-server/src/main/java/org/finos/legend/engine/server/Server.java
@@ -84,7 +84,7 @@
 import org.finos.legend.engine.functionActivator.api.FunctionActivatorAPI;
 import org.finos.legend.engine.generation.artifact.api.ArtifactGenerationExtensionApi;
 import org.finos.legend.engine.language.hostedService.api.HostedServiceService;
-import org.finos.legend.engine.language.hostedService.deployment.HostedServiceDeploymentConfiguration;
+import org.finos.legend.engine.language.hostedService.generation.deployment.HostedServiceDeploymentConfiguration;
 import org.finos.legend.engine.language.pure.compiler.api.Compile;
 import org.finos.legend.engine.language.pure.compiler.toPureGraph.PureModel;
 import org.finos.legend.engine.language.pure.grammar.api.grammarToJson.GrammarToJson;

diff --git a/legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-api/pom.xml b/legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-api/pom.xml
@@ -63,6 +63,10 @@
             <groupId>org.finos.legend.engine</groupId>
             <artifactId>legend-engine-xt-functionActivator-pure</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.finos.legend.engine</groupId>
+            <artifactId>legend-engine-xt-functionActivator-deployment</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.finos.legend.engine</groupId>
             <artifactId>legend-engine-protocol-pure</artifactId>

diff --git a/legend-engine-xts-functionActivator/legend-engine-xt-functionActivator-api/pom.xml b/legend-engine-xts-functionActivator/legend-engine-xt-functionActivator-api/pom.xml
@@ -126,6 +126,10 @@
             <groupId>org.finos.legend.engine</groupId>
             <artifactId>legend-engine-xt-functionActivator-protocol</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.finos.legend.engine</groupId>
+            <artifactId>legend-engine-xt-functionActivator-deployment</artifactId>
+        </dependency>
         <!-- TEST -->
     </dependencies>
 </project>
diff --git a/legend-engine-xts-functionActivator/legend-engine-xt-functionActivator-deployment/pom.xml b/legend-engine-xts-functionActivator/legend-engine-xt-functionActivator-deployment/pom.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2020 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-xts-functionActivator</artifactId>
+        <version>4.34.1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>legend-engine-xt-functionActivator-deployment</artifactId>
+    <packaging>jar</packaging>
+    <name>Legend Engine - XT - Function Activator - Deployment</name>
+
+    <dependencies>
+
+        <!-- ENGINE -->
+        <dependency>
+            <groupId>org.finos.legend.engine</groupId>
+            <artifactId>legend-engine-shared-core</artifactId>
+        </dependency>
+
+        <!-- ENGINE -->
+
+        <!-- TEST -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- TEST -->
+    </dependencies>
+</project>
diff --git a/...tivator/deployment/DeploymentManager.java → ...tivator/deployment/DeploymentManager.java b/...tivator/deployment/DeploymentManager.java → ...tivator/deployment/DeploymentManager.java
diff --git a/...ctivator/deployment/DeploymentResult.java → ...ctivator/deployment/DeploymentResult.java b/...ctivator/deployment/DeploymentResult.java → ...ctivator/deployment/DeploymentResult.java
diff --git a/...deployment/FunctionActivatorArtifact.java → ...deployment/FunctionActivatorArtifact.java b/...deployment/FunctionActivatorArtifact.java → ...deployment/FunctionActivatorArtifact.java
diff --git a/...tionActivatorDeploymentConfiguration.java → ...tionActivatorDeploymentConfiguration.java b/...tionActivatorDeploymentConfiguration.java → ...tionActivatorDeploymentConfiguration.java
diff --git a/...t/FunctionActivatorDeploymentContent.java → ...t/FunctionActivatorDeploymentContent.java b/...t/FunctionActivatorDeploymentContent.java → ...t/FunctionActivatorDeploymentContent.java
diff --git a/legend-engine-xts-functionActivator/pom.xml b/legend-engine-xts-functionActivator/pom.xml
@@ -30,6 +30,7 @@
 
     <modules>
         <module>legend-engine-xt-functionActivator-api</module>
+        <module>legend-engine-xt-functionActivator-deployment</module>
         <module>legend-engine-xt-functionActivator-protocol</module>
         <module>legend-engine-xt-functionActivator-pure</module>
     </modules>

diff --git a/legend-engine-xts-hostedService/legend-engine-xt-hostedService-api/pom.xml b/legend-engine-xts-hostedService/legend-engine-xt-hostedService-api/pom.xml
@@ -32,10 +32,6 @@
             <groupId>org.finos.legend.engine</groupId>
             <artifactId>legend-engine-shared-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.finos.legend.engine</groupId>
-            <artifactId>legend-engine-pure-code-core-extension</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.finos.legend.engine</groupId>
             <artifactId>legend-engine-language-pure-compiler</artifactId>
@@ -47,15 +43,15 @@
         </dependency>
         <dependency>
             <groupId>org.finos.legend.engine</groupId>
-            <artifactId>legend-engine-executionPlan-generation</artifactId>
+            <artifactId>legend-engine-pure-platform-java</artifactId>
         </dependency>
         <dependency>
             <groupId>org.finos.legend.engine</groupId>
-            <artifactId>legend-engine-pure-platform-java</artifactId>
+            <artifactId>legend-engine-xt-functionActivator-pure</artifactId>
         </dependency>
         <dependency>
             <groupId>org.finos.legend.engine</groupId>
-            <artifactId>legend-engine-xt-functionActivator-pure</artifactId>
+            <artifactId>legend-engine-xt-functionActivator-deployment</artifactId>
         </dependency>
         <dependency>
             <groupId>org.finos.legend.engine</groupId>
@@ -116,10 +112,6 @@
 <!--            <groupId>javax.ws.rs</groupId>-->
 <!--            <artifactId>javax.ws.rs-api</artifactId>-->
 <!--        </dependency>-->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
 
         <!-- ECLIPSE COLLECTIONS -->
         <dependency>
@@ -160,10 +152,6 @@
             <artifactId>jersey-common</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.finos.legend.engine</groupId>
-            <artifactId>legend-engine-language-pure-dsl-generation</artifactId>
-        </dependency>
         <!-- TEST -->
     </dependencies>
 </project>
diff --git a/...rc/main/java/org/finos/legend/engine/language/hostedService/api/HostedServiceService.java b/...rc/main/java/org/finos/legend/engine/language/hostedService/api/HostedServiceService.java
@@ -20,17 +20,15 @@
 import org.eclipse.collections.impl.factory.Lists;
 import org.finos.legend.engine.functionActivator.api.output.FunctionActivatorInfo;
 import org.finos.legend.engine.functionActivator.deployment.FunctionActivatorDeploymentConfiguration;
-import org.finos.legend.engine.language.hostedService.deployment.HostedServiceArtifact;
-import org.finos.legend.engine.language.hostedService.deployment.HostedServiceDeploymentConfiguration;
+import org.finos.legend.engine.language.hostedService.generation.deployment.HostedServiceArtifact;
+import org.finos.legend.engine.language.hostedService.generation.deployment.HostedServiceDeploymentConfiguration;
 import org.finos.legend.engine.language.hostedService.generation.model.GenerationInfoData;
-import org.finos.legend.engine.protocol.functionActivator.metamodel.DeploymentStage;
 import org.finos.legend.engine.functionActivator.service.FunctionActivatorError;
 import org.finos.legend.engine.functionActivator.service.FunctionActivatorService;
-import org.finos.legend.engine.language.hostedService.deployment.HostedServiceDeploymentManager;
-import org.finos.legend.engine.protocol.functionActivator.metamodel.DeploymentConfiguration;
+import org.finos.legend.engine.language.hostedService.generation.deployment.HostedServiceDeploymentManager;
 import org.finos.legend.engine.protocol.hostedService.metamodel.HostedService;
 //import org.finos.legend.engine.protocol.hostedService.metamodel.HostedServiceDeploymentConfiguration;
-import org.finos.legend.engine.language.hostedService.deployment.HostedServiceDeploymentResult;
+import org.finos.legend.engine.language.hostedService.generation.deployment.HostedServiceDeploymentResult;
 import org.finos.legend.engine.language.hostedService.generation.HostedServiceArtifactGenerator;
 import org.finos.legend.engine.language.pure.compiler.toPureGraph.PureModel;
 import org.finos.legend.engine.protocol.hostedService.metamodel.HostedServiceProtocolExtension;

diff --git a/legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/pom.xml b/legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/pom.xml
@@ -39,6 +39,10 @@
             <groupId>org.finos.legend.pure</groupId>
             <artifactId>legend-pure-m3-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.finos.legend.engine</groupId>
+            <artifactId>legend-engine-pure-code-core-extension</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.finos.legend.engine</groupId>
             <artifactId>legend-engine-language-pure-compiler</artifactId>
@@ -60,7 +64,10 @@
             <groupId>org.finos.legend.engine</groupId>
             <artifactId>legend-engine-shared-core</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>org.finos.legend.engine</groupId>
+            <artifactId>legend-engine-xt-functionActivator-deployment</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.finos.legend.engine</groupId>
             <artifactId>legend-engine-xt-hostedService-pure</artifactId>
@@ -102,8 +109,6 @@
             <artifactId>slf4j-api</artifactId>
         </dependency>
         <!-- LOG -->
-
-        <!-- TEST -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -124,6 +129,18 @@
             <artifactId>jersey-common</artifactId>
             <scope>test</scope>
         </dependency>
-        <!-- TEST -->
+        <dependency>
+            <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-language-pure-dsl-generation</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/...ice/deployment/HostedServiceArtifact.java → ...ion/deployment/HostedServiceArtifact.java b/...ice/deployment/HostedServiceArtifact.java → ...ion/deployment/HostedServiceArtifact.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.finos.legend.engine.language.hostedService.deployment;
+package org.finos.legend.engine.language.hostedService.generation.deployment;
 
 import org.finos.legend.engine.functionActivator.deployment.FunctionActivatorArtifact;
 import org.finos.legend.engine.language.hostedService.generation.model.GenerationInfo;

diff --git a/...edServiceArtifactGenerationExtension.java → ...edServiceArtifactGenerationExtension.java b/...edServiceArtifactGenerationExtension.java → ...edServiceArtifactGenerationExtension.java
@@ -13,7 +13,7 @@
 //  limitations under the License.
 
 
-package org.finos.legend.engine.language.hostedService.deployment;
+package org.finos.legend.engine.language.hostedService.generation.deployment;
 
 import org.eclipse.collections.api.RichIterable;
 import org.eclipse.collections.api.block.function.Function;

diff --git a/...vice/deployment/HostedServiceContent.java → ...tion/deployment/HostedServiceContent.java b/...vice/deployment/HostedServiceContent.java → ...tion/deployment/HostedServiceContent.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.finos.legend.engine.language.hostedService.deployment;
+package org.finos.legend.engine.language.hostedService.generation.deployment;
 
 import org.finos.legend.engine.functionActivator.deployment.FunctionActivatorDeploymentContent;
 import org.finos.legend.engine.language.hostedService.generation.model.GenerationInfo;

diff --git a/...HostedServiceDeploymentConfiguration.java → ...HostedServiceDeploymentConfiguration.java b/...HostedServiceDeploymentConfiguration.java → ...HostedServiceDeploymentConfiguration.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package org.finos.legend.engine.language.hostedService.deployment;
+package org.finos.legend.engine.language.hostedService.generation.deployment;
 
 import org.finos.legend.engine.functionActivator.deployment.FunctionActivatorDeploymentConfiguration;
 

diff --git a/...yment/HostedServiceDeploymentManager.java → ...yment/HostedServiceDeploymentManager.java b/...yment/HostedServiceDeploymentManager.java → ...yment/HostedServiceDeploymentManager.java
@@ -12,14 +12,14 @@
 //  See the License for the specific language governing permissions and
 //  limitations under the License.
 
-package org.finos.legend.engine.language.hostedService.deployment;
+package org.finos.legend.engine.language.hostedService.generation.deployment;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.finos.legend.engine.functionActivator.deployment.DeploymentManager;
 import org.finos.legend.engine.functionActivator.deployment.FunctionActivatorArtifact;
 import org.finos.legend.engine.shared.core.ObjectMapperFactory;
 import org.finos.legend.engine.shared.core.identity.Identity;
-import org.finos.legend.engine.language.hostedService.deployment.HostedServiceDeploymentConfiguration;
+
 import java.util.List;
 
 public class HostedServiceDeploymentManager implements  DeploymentManager<HostedServiceArtifact, HostedServiceDeploymentResult, HostedServiceDeploymentConfiguration>

diff --git a/...oyment/HostedServiceDeploymentResult.java → ...oyment/HostedServiceDeploymentResult.java b/...oyment/HostedServiceDeploymentResult.java → ...oyment/HostedServiceDeploymentResult.java
@@ -12,7 +12,7 @@
 //  See the License for the specific language governing permissions and
 //  limitations under the License.
 
-package org.finos.legend.engine.language.hostedService.deployment;
+package org.finos.legend.engine.language.hostedService.generation.deployment;
 
 import org.finos.legend.engine.functionActivator.deployment.DeploymentResult;
 

diff --git a/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-api/pom.xml b/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-api/pom.xml
@@ -64,6 +64,10 @@
             <groupId>org.finos.legend.engine</groupId>
             <artifactId>legend-engine-xt-functionActivator-pure</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.finos.legend.engine</groupId>
+            <artifactId>legend-engine-xt-functionActivator-deployment</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.finos.legend.engine</groupId>
             <artifactId>legend-engine-protocol-pure</artifactId>

diff --git a/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-generator/pom.xml b/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-generator/pom.xml
@@ -95,7 +95,7 @@
         </dependency>
         <dependency>
             <groupId>org.finos.legend.engine</groupId>
-            <artifactId>legend-engine-xt-functionActivator-api</artifactId>
+            <artifactId>legend-engine-xt-functionActivator-deployment</artifactId>
         </dependency>
         <dependency>
             <groupId>org.finos.legend.engine</groupId>

diff --git a/pom.xml b/pom.xml
@@ -580,6 +580,11 @@
                 <artifactId>legend-engine-xt-functionActivator-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.finos.legend.engine</groupId>
+                <artifactId>legend-engine-xt-functionActivator-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
 
 
             <!-- ENGINE -->