From f5cfc42a011035ba8a5fae28953d7748641577c6 Mon Sep 17 00:00:00 2001 From: Mohammed Ibrahim Date: Fri, 10 Nov 2023 08:45:38 -0500 Subject: [PATCH] Move Protocol files (#2450) --- .../legend-engine-server/pom.xml | 4 +- .../finos/legend/engine/server/Server.java | 4 +- .../pom.xml | 8 ++-- .../api/BigQueryFunctionService.java | 6 ++- .../BigQueryFunctionDeploymentManager.java | 8 ++-- .../deployment/BigQueryFunctionGenerator.java | 1 + .../pom.xml | 4 ++ .../deployment/BigQueryFunctionArtifact.java | 4 +- .../deployment/BigQueryFunctionContent.java | 4 +- ...gQueryFunctionDeploymentConfiguration.java | 14 ++++++- .../BigQueryFunctionDeploymentResult.java | 4 +- .../BigQueryFunctionProtocolExtension.java | 14 +++++++ .../pom.xml | 5 +-- .../api/FunctionActivatorAPI.java | 4 +- .../service/FunctionActivatorService.java | 7 ++-- .../pom.xml | 4 ++ .../deployment/DeploymentManager.java | 4 +- .../deployment/DeploymentResult.java | 2 +- .../deployment/FunctionActivatorArtifact.java | 2 +- ...ctionActivatorDeploymentConfiguration.java | 2 +- .../FunctionActivatorDeploymentContent.java | 2 +- .../pom.xml | 6 +-- .../api/HostedServiceService.java | 11 +++--- .../pom.xml | 37 ++++++++++--------- .../HostedServiceArtifactGenerator.java | 5 +-- ...tedServiceArtifactGenerationExtension.java | 2 +- .../HostedServiceDeploymentManager.java | 5 ++- .../pom.xml | 9 ++++- .../deployment/HostedServiceArtifact.java | 7 ++-- .../deployment/HostedServiceContent.java | 6 +-- .../HostedServiceDeploymentConfiguration.java | 4 +- .../HostedServiceDeploymentResult.java | 4 +- .../deployment}/model/GenerationInfo.java | 2 +- .../deployment}/model/GenerationInfoData.java | 4 +- .../model/lineage/CompositeLineage.java | 2 +- .../deployment}/model/lineage/Lineage.java | 2 +- .../model/lineage/SingleLineage.java | 2 +- .../HostedServiceProtocolExtension.java | 14 +++++++ .../legend-engine-xt-snowflakeApp-api/pom.xml | 4 ++ .../snowflakeApp/api/SnowflakeAppService.java | 9 +++-- .../SnowflakeAppDeploymentManager.java | 8 ++-- .../deployment/SnowflakeDeploymentResult.java | 2 +- .../pom.xml | 4 -- ...owflakeAppArtifactGenerationExtension.java | 1 + .../generator/SnowflakeAppGenerator.java | 3 ++ .../pom.xml | 4 ++ .../deployment}/SnowflakeAppArtifact.java | 4 +- .../deployment}/SnowflakeAppContent.java | 4 +- .../SnowflakeAppDeploymentConfiguration.java | 9 ++++- .../SnowflakeAppProtocolExtension.java | 14 +++++++ 50 files changed, 192 insertions(+), 103 deletions(-) rename legend-engine-xts-bigqueryFunction/{legend-engine-xt-bigqueryFunction-api/src/main/java/org/finos/legend/engine/language => legend-engine-xt-bigqueryFunction-protocol/src/main/java/org/finos/legend/engine/protocol}/bigqueryFunction/deployment/BigQueryFunctionArtifact.java (87%) rename legend-engine-xts-bigqueryFunction/{legend-engine-xt-bigqueryFunction-api/src/main/java/org/finos/legend/engine/language => legend-engine-xt-bigqueryFunction-protocol/src/main/java/org/finos/legend/engine/protocol}/bigqueryFunction/deployment/BigQueryFunctionContent.java (85%) rename legend-engine-xts-bigqueryFunction/{legend-engine-xt-bigqueryFunction-api/src/main/java/org/finos/legend/engine/language => legend-engine-xt-bigqueryFunction-protocol/src/main/java/org/finos/legend/engine/protocol}/bigqueryFunction/deployment/BigQueryFunctionDeploymentConfiguration.java (68%) rename legend-engine-xts-bigqueryFunction/{legend-engine-xt-bigqueryFunction-api/src/main/java/org/finos/legend/engine/language => legend-engine-xt-bigqueryFunction-protocol/src/main/java/org/finos/legend/engine/protocol}/bigqueryFunction/deployment/BigQueryFunctionDeploymentResult.java (87%) rename legend-engine-xts-functionActivator/{legend-engine-xt-functionActivator-deployment/src/main/java/org/finos/legend/engine => legend-engine-xt-functionActivator-protocol/src/main/java/org/finos/legend/engine/protocol}/functionActivator/deployment/DeploymentResult.java (90%) rename legend-engine-xts-functionActivator/{legend-engine-xt-functionActivator-deployment/src/main/java/org/finos/legend/engine => legend-engine-xt-functionActivator-protocol/src/main/java/org/finos/legend/engine/protocol}/functionActivator/deployment/FunctionActivatorArtifact.java (91%) rename legend-engine-xts-functionActivator/{legend-engine-xt-functionActivator-deployment/src/main/java/org/finos/legend/engine => legend-engine-xt-functionActivator-protocol/src/main/java/org/finos/legend/engine/protocol}/functionActivator/deployment/FunctionActivatorDeploymentConfiguration.java (90%) rename legend-engine-xts-functionActivator/{legend-engine-xt-functionActivator-deployment/src/main/java/org/finos/legend/engine => legend-engine-xt-functionActivator-protocol/src/main/java/org/finos/legend/engine/protocol}/functionActivator/deployment/FunctionActivatorDeploymentContent.java (90%) rename legend-engine-xts-hostedService/{legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation => legend-engine-xt-hostedService-protocol/src/main/java/org/finos/legend/engine/protocol/hostedService}/deployment/HostedServiceArtifact.java (77%) rename legend-engine-xts-hostedService/{legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation => legend-engine-xt-hostedService-protocol/src/main/java/org/finos/legend/engine/protocol/hostedService}/deployment/HostedServiceContent.java (82%) rename legend-engine-xts-hostedService/{legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation => legend-engine-xt-hostedService-protocol/src/main/java/org/finos/legend/engine/protocol/hostedService}/deployment/HostedServiceDeploymentConfiguration.java (79%) rename legend-engine-xts-hostedService/{legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation => legend-engine-xt-hostedService-protocol/src/main/java/org/finos/legend/engine/protocol/hostedService}/deployment/HostedServiceDeploymentResult.java (81%) rename legend-engine-xts-hostedService/{legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation => legend-engine-xt-hostedService-protocol/src/main/java/org/finos/legend/engine/protocol/hostedService/deployment}/model/GenerationInfo.java (92%) rename legend-engine-xts-hostedService/{legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation => legend-engine-xt-hostedService-protocol/src/main/java/org/finos/legend/engine/protocol/hostedService/deployment}/model/GenerationInfoData.java (88%) rename legend-engine-xts-hostedService/{legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation => legend-engine-xt-hostedService-protocol/src/main/java/org/finos/legend/engine/protocol/hostedService/deployment}/model/lineage/CompositeLineage.java (92%) rename legend-engine-xts-hostedService/{legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation => legend-engine-xt-hostedService-protocol/src/main/java/org/finos/legend/engine/protocol/hostedService/deployment}/model/lineage/Lineage.java (92%) rename legend-engine-xts-hostedService/{legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation => legend-engine-xt-hostedService-protocol/src/main/java/org/finos/legend/engine/protocol/hostedService/deployment}/model/lineage/SingleLineage.java (97%) rename legend-engine-xts-snowflakeApp/{legend-engine-xt-snowflakeApp-generator/src/main/java/org/finos/legend/engine/language/snowflakeApp/generator => legend-engine-xt-snowflakeApp-protocol/src/main/java/org/finos/legend/engine/protocol/snowflakeApp/deployment}/SnowflakeAppArtifact.java (86%) rename legend-engine-xts-snowflakeApp/{legend-engine-xt-snowflakeApp-generator/src/main/java/org/finos/legend/engine/language/snowflakeApp/generator => legend-engine-xt-snowflakeApp-protocol/src/main/java/org/finos/legend/engine/protocol/snowflakeApp/deployment}/SnowflakeAppContent.java (93%) rename legend-engine-xts-snowflakeApp/{legend-engine-xt-snowflakeApp-generator/src/main/java/org/finos/legend/engine/language/snowflakeApp/generator => legend-engine-xt-snowflakeApp-protocol/src/main/java/org/finos/legend/engine/protocol/snowflakeApp/deployment}/SnowflakeAppDeploymentConfiguration.java (79%) diff --git a/legend-engine-config/legend-engine-server/pom.xml b/legend-engine-config/legend-engine-server/pom.xml index e8613c76ccb..7a44d339a57 100644 --- a/legend-engine-config/legend-engine-server/pom.xml +++ b/legend-engine-config/legend-engine-server/pom.xml @@ -343,7 +343,7 @@ org.finos.legend.engine - legend-engine-xt-snowflakeApp-generator + legend-engine-xt-snowflakeApp-protocol org.finos.legend.engine @@ -376,7 +376,7 @@ org.finos.legend.engine - legend-engine-xt-hostedService-generation + legend-engine-xt-hostedService-protocol org.finos.legend.engine diff --git a/legend-engine-config/legend-engine-server/src/main/java/org/finos/legend/engine/server/Server.java b/legend-engine-config/legend-engine-server/src/main/java/org/finos/legend/engine/server/Server.java index a94d9792f60..5e185307baa 100644 --- a/legend-engine-config/legend-engine-server/src/main/java/org/finos/legend/engine/server/Server.java +++ b/legend-engine-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.generation.deployment.HostedServiceDeploymentConfiguration; +import org.finos.legend.engine.protocol.hostedService.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; @@ -99,7 +99,7 @@ import org.finos.legend.engine.language.pure.modelManager.sdlc.SDLCLoader; import org.finos.legend.engine.language.pure.relational.api.relationalElement.RelationalElementAPI; import org.finos.legend.engine.language.snowflakeApp.api.SnowflakeAppService; -import org.finos.legend.engine.language.snowflakeApp.generator.SnowflakeAppDeploymentConfiguration; +import org.finos.legend.engine.protocol.snowflakeApp.deployment.SnowflakeAppDeploymentConfiguration; import org.finos.legend.engine.plan.execution.PlanExecutor; import org.finos.legend.engine.plan.execution.api.ExecutePlanLegacy; import org.finos.legend.engine.plan.execution.api.ExecutePlanStrategic; 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 index 11414e00550..08cdce100a8 100644 --- a/legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-api/pom.xml +++ b/legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-api/pom.xml @@ -67,6 +67,10 @@ org.finos.legend.engine legend-engine-xt-functionActivator-deployment + + org.finos.legend.engine + legend-engine-xt-functionActivator-protocol + org.finos.legend.engine legend-engine-protocol-pure @@ -83,10 +87,6 @@ org.finos.legend.engine legend-engine-xt-relationalStore-bigquery-pure - - org.finos.legend.engine - legend-engine-xt-relationalStore-protocol - org.finos.legend.engine diff --git a/legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-api/src/main/java/org/finos/legend/engine/language/bigqueryFunction/api/BigQueryFunctionService.java b/legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-api/src/main/java/org/finos/legend/engine/language/bigqueryFunction/api/BigQueryFunctionService.java index 56f786ad33d..2d703545042 100644 --- a/legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-api/src/main/java/org/finos/legend/engine/language/bigqueryFunction/api/BigQueryFunctionService.java +++ b/legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-api/src/main/java/org/finos/legend/engine/language/bigqueryFunction/api/BigQueryFunctionService.java @@ -19,7 +19,11 @@ import org.eclipse.collections.api.list.MutableList; 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.protocol.bigqueryFunction.deployment.BigQueryFunctionArtifact; +import org.finos.legend.engine.protocol.bigqueryFunction.deployment.BigQueryFunctionContent; +import org.finos.legend.engine.protocol.bigqueryFunction.deployment.BigQueryFunctionDeploymentConfiguration; +import org.finos.legend.engine.protocol.bigqueryFunction.deployment.BigQueryFunctionDeploymentResult; +import org.finos.legend.engine.protocol.functionActivator.deployment.FunctionActivatorDeploymentConfiguration; import org.finos.legend.engine.functionActivator.service.FunctionActivatorError; import org.finos.legend.engine.functionActivator.service.FunctionActivatorService; import org.finos.legend.engine.language.bigqueryFunction.deployment.*; diff --git a/legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-api/src/main/java/org/finos/legend/engine/language/bigqueryFunction/deployment/BigQueryFunctionDeploymentManager.java b/legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-api/src/main/java/org/finos/legend/engine/language/bigqueryFunction/deployment/BigQueryFunctionDeploymentManager.java index bcd5834edb7..7f8af0d9566 100644 --- a/legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-api/src/main/java/org/finos/legend/engine/language/bigqueryFunction/deployment/BigQueryFunctionDeploymentManager.java +++ b/legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-api/src/main/java/org/finos/legend/engine/language/bigqueryFunction/deployment/BigQueryFunctionDeploymentManager.java @@ -19,14 +19,16 @@ import com.google.cloud.bigquery.RoutineId; import com.google.cloud.bigquery.RoutineInfo; import org.eclipse.collections.api.factory.Lists; -import org.eclipse.collections.api.list.MutableList; import org.eclipse.collections.impl.utility.Iterate; import org.finos.legend.engine.functionActivator.deployment.DeploymentManager; -import org.finos.legend.engine.functionActivator.deployment.FunctionActivatorArtifact; +import org.finos.legend.engine.protocol.bigqueryFunction.deployment.BigQueryFunctionArtifact; +import org.finos.legend.engine.protocol.bigqueryFunction.deployment.BigQueryFunctionContent; +import org.finos.legend.engine.protocol.bigqueryFunction.deployment.BigQueryFunctionDeploymentConfiguration; +import org.finos.legend.engine.protocol.bigqueryFunction.deployment.BigQueryFunctionDeploymentResult; +import org.finos.legend.engine.protocol.functionActivator.deployment.FunctionActivatorArtifact; import org.finos.legend.engine.shared.core.identity.Identity; import org.finos.legend.pure.generated.Root_meta_external_function_activator_bigQueryFunction_BigQueryFunctionDeploymentConfiguration; import org.finos.legend.pure.generated.Root_meta_pure_alloy_connections_alloy_specification_BigQueryDatasourceSpecification; -import org.pac4j.core.profile.CommonProfile; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-api/src/main/java/org/finos/legend/engine/language/bigqueryFunction/deployment/BigQueryFunctionGenerator.java b/legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-api/src/main/java/org/finos/legend/engine/language/bigqueryFunction/deployment/BigQueryFunctionGenerator.java index 3e917dcd558..aecad31fe04 100644 --- a/legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-api/src/main/java/org/finos/legend/engine/language/bigqueryFunction/deployment/BigQueryFunctionGenerator.java +++ b/legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-api/src/main/java/org/finos/legend/engine/language/bigqueryFunction/deployment/BigQueryFunctionGenerator.java @@ -22,6 +22,7 @@ import org.finos.legend.engine.language.pure.compiler.toPureGraph.PureModel; import org.finos.legend.engine.plan.generation.PlanGenerator; import org.finos.legend.engine.plan.platform.PlanPlatform; +import org.finos.legend.engine.protocol.bigqueryFunction.deployment.BigQueryFunctionArtifact; import org.finos.legend.pure.generated.*; import org.finos.legend.pure.m3.coreinstance.meta.pure.metamodel.function.FunctionDefinition; import org.finos.legend.pure.m3.coreinstance.meta.pure.metamodel.function.PackageableFunction; diff --git a/legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-protocol/pom.xml b/legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-protocol/pom.xml index 5f35b684f09..54d25ad1fb5 100644 --- a/legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-protocol/pom.xml +++ b/legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-protocol/pom.xml @@ -42,5 +42,9 @@ org.eclipse.collections eclipse-collections-api + + org.finos.legend.engine + legend-engine-xt-relationalStore-protocol + \ No newline at end of file diff --git a/legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-api/src/main/java/org/finos/legend/engine/language/bigqueryFunction/deployment/BigQueryFunctionArtifact.java b/legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-protocol/src/main/java/org/finos/legend/engine/protocol/bigqueryFunction/deployment/BigQueryFunctionArtifact.java similarity index 87% rename from legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-api/src/main/java/org/finos/legend/engine/language/bigqueryFunction/deployment/BigQueryFunctionArtifact.java rename to legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-protocol/src/main/java/org/finos/legend/engine/protocol/bigqueryFunction/deployment/BigQueryFunctionArtifact.java index ef867daac1e..236d48af71d 100644 --- a/legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-api/src/main/java/org/finos/legend/engine/language/bigqueryFunction/deployment/BigQueryFunctionArtifact.java +++ b/legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-protocol/src/main/java/org/finos/legend/engine/protocol/bigqueryFunction/deployment/BigQueryFunctionArtifact.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.finos.legend.engine.language.bigqueryFunction.deployment; +package org.finos.legend.engine.protocol.bigqueryFunction.deployment; import org.eclipse.collections.api.list.MutableList; -import org.finos.legend.engine.functionActivator.deployment.FunctionActivatorArtifact; +import org.finos.legend.engine.protocol.functionActivator.deployment.FunctionActivatorArtifact; public class BigQueryFunctionArtifact extends FunctionActivatorArtifact { diff --git a/legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-api/src/main/java/org/finos/legend/engine/language/bigqueryFunction/deployment/BigQueryFunctionContent.java b/legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-protocol/src/main/java/org/finos/legend/engine/protocol/bigqueryFunction/deployment/BigQueryFunctionContent.java similarity index 85% rename from legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-api/src/main/java/org/finos/legend/engine/language/bigqueryFunction/deployment/BigQueryFunctionContent.java rename to legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-protocol/src/main/java/org/finos/legend/engine/protocol/bigqueryFunction/deployment/BigQueryFunctionContent.java index 13c8aa1aa4c..48b09329cbe 100644 --- a/legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-api/src/main/java/org/finos/legend/engine/language/bigqueryFunction/deployment/BigQueryFunctionContent.java +++ b/legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-protocol/src/main/java/org/finos/legend/engine/protocol/bigqueryFunction/deployment/BigQueryFunctionContent.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.finos.legend.engine.language.bigqueryFunction.deployment; +package org.finos.legend.engine.protocol.bigqueryFunction.deployment; import org.eclipse.collections.api.list.MutableList; -import org.finos.legend.engine.functionActivator.deployment.FunctionActivatorDeploymentContent; +import org.finos.legend.engine.protocol.functionActivator.deployment.FunctionActivatorDeploymentContent; public class BigQueryFunctionContent extends FunctionActivatorDeploymentContent { diff --git a/legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-api/src/main/java/org/finos/legend/engine/language/bigqueryFunction/deployment/BigQueryFunctionDeploymentConfiguration.java b/legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-protocol/src/main/java/org/finos/legend/engine/protocol/bigqueryFunction/deployment/BigQueryFunctionDeploymentConfiguration.java similarity index 68% rename from legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-api/src/main/java/org/finos/legend/engine/language/bigqueryFunction/deployment/BigQueryFunctionDeploymentConfiguration.java rename to legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-protocol/src/main/java/org/finos/legend/engine/protocol/bigqueryFunction/deployment/BigQueryFunctionDeploymentConfiguration.java index 8ca43c04e1c..f8383226996 100644 --- a/legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-api/src/main/java/org/finos/legend/engine/language/bigqueryFunction/deployment/BigQueryFunctionDeploymentConfiguration.java +++ b/legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-protocol/src/main/java/org/finos/legend/engine/protocol/bigqueryFunction/deployment/BigQueryFunctionDeploymentConfiguration.java @@ -12,12 +12,22 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.finos.legend.engine.language.bigqueryFunction.deployment; +package org.finos.legend.engine.protocol.bigqueryFunction.deployment; -import org.finos.legend.engine.functionActivator.deployment.FunctionActivatorDeploymentConfiguration; +import org.finos.legend.engine.protocol.functionActivator.deployment.FunctionActivatorDeploymentConfiguration; import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.store.relational.connection.RelationalDatabaseConnection; public class BigQueryFunctionDeploymentConfiguration extends FunctionActivatorDeploymentConfiguration { RelationalDatabaseConnection connection; + + public BigQueryFunctionDeploymentConfiguration() + { + //jackson + } + + public BigQueryFunctionDeploymentConfiguration(RelationalDatabaseConnection connection) + { + this.connection = connection; + } } diff --git a/legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-api/src/main/java/org/finos/legend/engine/language/bigqueryFunction/deployment/BigQueryFunctionDeploymentResult.java b/legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-protocol/src/main/java/org/finos/legend/engine/protocol/bigqueryFunction/deployment/BigQueryFunctionDeploymentResult.java similarity index 87% rename from legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-api/src/main/java/org/finos/legend/engine/language/bigqueryFunction/deployment/BigQueryFunctionDeploymentResult.java rename to legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-protocol/src/main/java/org/finos/legend/engine/protocol/bigqueryFunction/deployment/BigQueryFunctionDeploymentResult.java index fcc83a9693d..9093ae4c4f2 100644 --- a/legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-api/src/main/java/org/finos/legend/engine/language/bigqueryFunction/deployment/BigQueryFunctionDeploymentResult.java +++ b/legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-protocol/src/main/java/org/finos/legend/engine/protocol/bigqueryFunction/deployment/BigQueryFunctionDeploymentResult.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.finos.legend.engine.language.bigqueryFunction.deployment; +package org.finos.legend.engine.protocol.bigqueryFunction.deployment; import org.eclipse.collections.api.list.MutableList; -import org.finos.legend.engine.functionActivator.deployment.DeploymentResult; +import org.finos.legend.engine.protocol.functionActivator.deployment.DeploymentResult; public class BigQueryFunctionDeploymentResult extends DeploymentResult { diff --git a/legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-protocol/src/main/java/org/finos/legend/engine/protocol/bigqueryFunction/metamodel/BigQueryFunctionProtocolExtension.java b/legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-protocol/src/main/java/org/finos/legend/engine/protocol/bigqueryFunction/metamodel/BigQueryFunctionProtocolExtension.java index b1ea493736d..56e3b30ab3f 100644 --- a/legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-protocol/src/main/java/org/finos/legend/engine/protocol/bigqueryFunction/metamodel/BigQueryFunctionProtocolExtension.java +++ b/legend-engine-xts-bigqueryFunction/legend-engine-xt-bigqueryFunction-protocol/src/main/java/org/finos/legend/engine/protocol/bigqueryFunction/metamodel/BigQueryFunctionProtocolExtension.java @@ -17,6 +17,11 @@ import org.eclipse.collections.api.block.function.Function0; import org.eclipse.collections.api.factory.Lists; import org.eclipse.collections.api.factory.Maps; +import org.finos.legend.engine.protocol.bigqueryFunction.deployment.BigQueryFunctionArtifact; +import org.finos.legend.engine.protocol.bigqueryFunction.deployment.BigQueryFunctionContent; +import org.finos.legend.engine.protocol.functionActivator.deployment.FunctionActivatorArtifact; +import org.finos.legend.engine.protocol.functionActivator.deployment.FunctionActivatorDeploymentConfiguration; +import org.finos.legend.engine.protocol.functionActivator.deployment.FunctionActivatorDeploymentContent; import org.finos.legend.engine.protocol.pure.v1.extension.ProtocolSubTypeInfo; import org.finos.legend.engine.protocol.pure.v1.extension.PureProtocolExtension; import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement; @@ -37,6 +42,15 @@ public List>>> getExtraProtocolSubTypeInfo .build(), ProtocolSubTypeInfo.newBuilder(PackageableElement.class) .withSubtype(BigQueryFunctionDeploymentConfiguration.class, packageJSONType + "Config") + .build(), + ProtocolSubTypeInfo.newBuilder(FunctionActivatorDeploymentConfiguration.class) + .withSubtype(org.finos.legend.engine.protocol.bigqueryFunction.deployment.BigQueryFunctionDeploymentConfiguration.class, "bigQueryFunctionDeploymentConfig") + .build(), + ProtocolSubTypeInfo.newBuilder(FunctionActivatorArtifact.class) + .withSubtype(BigQueryFunctionArtifact.class, "bigQueryFunctionArtifact") + .build(), + ProtocolSubTypeInfo.newBuilder(FunctionActivatorDeploymentContent.class) + .withSubtype(BigQueryFunctionContent.class, "bigQueryFunctionDeploymentContent") .build() )); } 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 index 0726f908081..240387e13aa 100644 --- 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,10 +126,7 @@ org.finos.legend.engine legend-engine-xt-functionActivator-protocol - - org.finos.legend.engine - legend-engine-xt-functionActivator-deployment - + diff --git a/legend-engine-xts-functionActivator/legend-engine-xt-functionActivator-api/src/main/java/org/finos/legend/engine/functionActivator/api/FunctionActivatorAPI.java b/legend-engine-xts-functionActivator/legend-engine-xt-functionActivator-api/src/main/java/org/finos/legend/engine/functionActivator/api/FunctionActivatorAPI.java index 40ecb290423..922b8069b00 100644 --- a/legend-engine-xts-functionActivator/legend-engine-xt-functionActivator-api/src/main/java/org/finos/legend/engine/functionActivator/api/FunctionActivatorAPI.java +++ b/legend-engine-xts-functionActivator/legend-engine-xt-functionActivator-api/src/main/java/org/finos/legend/engine/functionActivator/api/FunctionActivatorAPI.java @@ -24,14 +24,14 @@ import org.eclipse.collections.api.list.MutableList; import org.finos.legend.engine.functionActivator.api.input.FunctionActivatorInput; import org.finos.legend.engine.functionActivator.api.output.FunctionActivatorInfo; -import org.finos.legend.engine.functionActivator.deployment.FunctionActivatorDeploymentConfiguration; +import org.finos.legend.engine.protocol.functionActivator.deployment.FunctionActivatorDeploymentConfiguration; import org.finos.legend.engine.functionActivator.service.FunctionActivatorLoader; import org.finos.legend.engine.functionActivator.service.FunctionActivatorService; import org.finos.legend.engine.language.pure.compiler.Compiler; 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.functionActivator.metamodel.DeploymentConfiguration; -import org.finos.legend.engine.functionActivator.deployment.DeploymentResult; +import org.finos.legend.engine.protocol.functionActivator.deployment.DeploymentResult; import org.finos.legend.engine.protocol.pure.PureClientVersions; import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData; import org.finos.legend.engine.shared.core.ObjectMapperFactory; diff --git a/legend-engine-xts-functionActivator/legend-engine-xt-functionActivator-api/src/main/java/org/finos/legend/engine/functionActivator/service/FunctionActivatorService.java b/legend-engine-xts-functionActivator/legend-engine-xt-functionActivator-api/src/main/java/org/finos/legend/engine/functionActivator/service/FunctionActivatorService.java index 18c4382583a..537095a0c46 100644 --- a/legend-engine-xts-functionActivator/legend-engine-xt-functionActivator-api/src/main/java/org/finos/legend/engine/functionActivator/service/FunctionActivatorService.java +++ b/legend-engine-xts-functionActivator/legend-engine-xt-functionActivator-api/src/main/java/org/finos/legend/engine/functionActivator/service/FunctionActivatorService.java @@ -18,11 +18,10 @@ import org.eclipse.collections.api.block.function.Function; import org.eclipse.collections.api.list.MutableList; import org.finos.legend.engine.functionActivator.api.output.FunctionActivatorInfo; -import org.finos.legend.engine.functionActivator.deployment.FunctionActivatorArtifact; -import org.finos.legend.engine.functionActivator.deployment.FunctionActivatorDeploymentConfiguration; +import org.finos.legend.engine.protocol.functionActivator.deployment.FunctionActivatorArtifact; +import org.finos.legend.engine.protocol.functionActivator.deployment.FunctionActivatorDeploymentConfiguration; import org.finos.legend.engine.language.pure.compiler.toPureGraph.PureModel; -import org.finos.legend.engine.protocol.functionActivator.metamodel.DeploymentConfiguration; -import org.finos.legend.engine.functionActivator.deployment.DeploymentResult; +import org.finos.legend.engine.protocol.functionActivator.deployment.DeploymentResult; import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContext; import org.finos.legend.engine.shared.core.identity.Identity; import org.finos.legend.pure.generated.Root_meta_external_function_activator_FunctionActivator; 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 index ab1c8fd330a..34e3298e70a 100644 --- a/legend-engine-xts-functionActivator/legend-engine-xt-functionActivator-deployment/pom.xml +++ b/legend-engine-xts-functionActivator/legend-engine-xt-functionActivator-deployment/pom.xml @@ -48,6 +48,10 @@ log4j test + + org.finos.legend.engine + legend-engine-xt-functionActivator-protocol + diff --git a/legend-engine-xts-functionActivator/legend-engine-xt-functionActivator-deployment/src/main/java/org/finos/legend/engine/functionActivator/deployment/DeploymentManager.java b/legend-engine-xts-functionActivator/legend-engine-xt-functionActivator-deployment/src/main/java/org/finos/legend/engine/functionActivator/deployment/DeploymentManager.java index 0c65b451b9c..713b3b97a96 100644 --- a/legend-engine-xts-functionActivator/legend-engine-xt-functionActivator-deployment/src/main/java/org/finos/legend/engine/functionActivator/deployment/DeploymentManager.java +++ b/legend-engine-xts-functionActivator/legend-engine-xt-functionActivator-deployment/src/main/java/org/finos/legend/engine/functionActivator/deployment/DeploymentManager.java @@ -14,6 +14,9 @@ package org.finos.legend.engine.functionActivator.deployment; +import org.finos.legend.engine.protocol.functionActivator.deployment.DeploymentResult; +import org.finos.legend.engine.protocol.functionActivator.deployment.FunctionActivatorArtifact; +import org.finos.legend.engine.protocol.functionActivator.deployment.FunctionActivatorDeploymentConfiguration; import org.finos.legend.engine.shared.core.identity.Identity; import java.util.List; @@ -25,6 +28,5 @@ public interface DeploymentManager availableRuntimeConfigurations); - public boolean canDeploy(FunctionActivatorArtifact activatorArtifact); } diff --git a/legend-engine-xts-functionActivator/legend-engine-xt-functionActivator-deployment/src/main/java/org/finos/legend/engine/functionActivator/deployment/DeploymentResult.java b/legend-engine-xts-functionActivator/legend-engine-xt-functionActivator-protocol/src/main/java/org/finos/legend/engine/protocol/functionActivator/deployment/DeploymentResult.java similarity index 90% rename from legend-engine-xts-functionActivator/legend-engine-xt-functionActivator-deployment/src/main/java/org/finos/legend/engine/functionActivator/deployment/DeploymentResult.java rename to legend-engine-xts-functionActivator/legend-engine-xt-functionActivator-protocol/src/main/java/org/finos/legend/engine/protocol/functionActivator/deployment/DeploymentResult.java index 4f487838f45..f63aa8f8b95 100644 --- a/legend-engine-xts-functionActivator/legend-engine-xt-functionActivator-deployment/src/main/java/org/finos/legend/engine/functionActivator/deployment/DeploymentResult.java +++ b/legend-engine-xts-functionActivator/legend-engine-xt-functionActivator-protocol/src/main/java/org/finos/legend/engine/protocol/functionActivator/deployment/DeploymentResult.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.finos.legend.engine.functionActivator.deployment; +package org.finos.legend.engine.protocol.functionActivator.deployment; public class DeploymentResult { diff --git a/legend-engine-xts-functionActivator/legend-engine-xt-functionActivator-deployment/src/main/java/org/finos/legend/engine/functionActivator/deployment/FunctionActivatorArtifact.java b/legend-engine-xts-functionActivator/legend-engine-xt-functionActivator-protocol/src/main/java/org/finos/legend/engine/protocol/functionActivator/deployment/FunctionActivatorArtifact.java similarity index 91% rename from legend-engine-xts-functionActivator/legend-engine-xt-functionActivator-deployment/src/main/java/org/finos/legend/engine/functionActivator/deployment/FunctionActivatorArtifact.java rename to legend-engine-xts-functionActivator/legend-engine-xt-functionActivator-protocol/src/main/java/org/finos/legend/engine/protocol/functionActivator/deployment/FunctionActivatorArtifact.java index 5a29cfb0043..c0c30077ad3 100644 --- a/legend-engine-xts-functionActivator/legend-engine-xt-functionActivator-deployment/src/main/java/org/finos/legend/engine/functionActivator/deployment/FunctionActivatorArtifact.java +++ b/legend-engine-xts-functionActivator/legend-engine-xt-functionActivator-protocol/src/main/java/org/finos/legend/engine/protocol/functionActivator/deployment/FunctionActivatorArtifact.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.finos.legend.engine.functionActivator.deployment; +package org.finos.legend.engine.protocol.functionActivator.deployment; public class FunctionActivatorArtifact { diff --git a/legend-engine-xts-functionActivator/legend-engine-xt-functionActivator-deployment/src/main/java/org/finos/legend/engine/functionActivator/deployment/FunctionActivatorDeploymentConfiguration.java b/legend-engine-xts-functionActivator/legend-engine-xt-functionActivator-protocol/src/main/java/org/finos/legend/engine/protocol/functionActivator/deployment/FunctionActivatorDeploymentConfiguration.java similarity index 90% rename from legend-engine-xts-functionActivator/legend-engine-xt-functionActivator-deployment/src/main/java/org/finos/legend/engine/functionActivator/deployment/FunctionActivatorDeploymentConfiguration.java rename to legend-engine-xts-functionActivator/legend-engine-xt-functionActivator-protocol/src/main/java/org/finos/legend/engine/protocol/functionActivator/deployment/FunctionActivatorDeploymentConfiguration.java index 963ec5e2587..054a220269e 100644 --- a/legend-engine-xts-functionActivator/legend-engine-xt-functionActivator-deployment/src/main/java/org/finos/legend/engine/functionActivator/deployment/FunctionActivatorDeploymentConfiguration.java +++ b/legend-engine-xts-functionActivator/legend-engine-xt-functionActivator-protocol/src/main/java/org/finos/legend/engine/protocol/functionActivator/deployment/FunctionActivatorDeploymentConfiguration.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.finos.legend.engine.functionActivator.deployment; +package org.finos.legend.engine.protocol.functionActivator.deployment; public class FunctionActivatorDeploymentConfiguration { diff --git a/legend-engine-xts-functionActivator/legend-engine-xt-functionActivator-deployment/src/main/java/org/finos/legend/engine/functionActivator/deployment/FunctionActivatorDeploymentContent.java b/legend-engine-xts-functionActivator/legend-engine-xt-functionActivator-protocol/src/main/java/org/finos/legend/engine/protocol/functionActivator/deployment/FunctionActivatorDeploymentContent.java similarity index 90% rename from legend-engine-xts-functionActivator/legend-engine-xt-functionActivator-deployment/src/main/java/org/finos/legend/engine/functionActivator/deployment/FunctionActivatorDeploymentContent.java rename to legend-engine-xts-functionActivator/legend-engine-xt-functionActivator-protocol/src/main/java/org/finos/legend/engine/protocol/functionActivator/deployment/FunctionActivatorDeploymentContent.java index 47ecf7745ee..5f3cad42ffe 100644 --- a/legend-engine-xts-functionActivator/legend-engine-xt-functionActivator-deployment/src/main/java/org/finos/legend/engine/functionActivator/deployment/FunctionActivatorDeploymentContent.java +++ b/legend-engine-xts-functionActivator/legend-engine-xt-functionActivator-protocol/src/main/java/org/finos/legend/engine/protocol/functionActivator/deployment/FunctionActivatorDeploymentContent.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.finos.legend.engine.functionActivator.deployment; +package org.finos.legend.engine.protocol.functionActivator.deployment; public class FunctionActivatorDeploymentContent { 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 index d3f99c68a23..6258dcb393c 100644 --- a/legend-engine-xts-hostedService/legend-engine-xt-hostedService-api/pom.xml +++ b/legend-engine-xts-hostedService/legend-engine-xt-hostedService-api/pom.xml @@ -51,15 +51,15 @@ org.finos.legend.engine - legend-engine-xt-functionActivator-deployment + legend-engine-protocol-pure org.finos.legend.engine - legend-engine-protocol-pure + legend-engine-xt-functionActivator-api org.finos.legend.engine - legend-engine-xt-functionActivator-api + legend-engine-xt-functionActivator-protocol org.finos.legend.engine diff --git a/legend-engine-xts-hostedService/legend-engine-xt-hostedService-api/src/main/java/org/finos/legend/engine/language/hostedService/api/HostedServiceService.java b/legend-engine-xts-hostedService/legend-engine-xt-hostedService-api/src/main/java/org/finos/legend/engine/language/hostedService/api/HostedServiceService.java index 0d12900792c..b6ed4f1372e 100644 --- a/legend-engine-xts-hostedService/legend-engine-xt-hostedService-api/src/main/java/org/finos/legend/engine/language/hostedService/api/HostedServiceService.java +++ b/legend-engine-xts-hostedService/legend-engine-xt-hostedService-api/src/main/java/org/finos/legend/engine/language/hostedService/api/HostedServiceService.java @@ -19,16 +19,15 @@ import org.eclipse.collections.api.list.MutableList; 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.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.deployment.FunctionActivatorDeploymentConfiguration; +import org.finos.legend.engine.protocol.hostedService.deployment.HostedServiceArtifact; +import org.finos.legend.engine.protocol.hostedService.deployment.HostedServiceDeploymentConfiguration; import org.finos.legend.engine.functionActivator.service.FunctionActivatorError; import org.finos.legend.engine.functionActivator.service.FunctionActivatorService; import org.finos.legend.engine.language.hostedService.generation.deployment.HostedServiceDeploymentManager; +import org.finos.legend.engine.protocol.hostedService.deployment.model.GenerationInfoData; 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.generation.deployment.HostedServiceDeploymentResult; +import org.finos.legend.engine.protocol.hostedService.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 index 5b9f42787c0..872e48aa61e 100644 --- a/legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/pom.xml +++ b/legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/pom.xml @@ -29,10 +29,7 @@ - - com.fasterxml.jackson.core - jackson-annotations - + @@ -52,10 +49,10 @@ org.finos.legend.engine legend-engine-pure-code-compiled-core - - org.finos.legend.engine - legend-engine-protocol - + + + + org.finos.legend.engine legend-engine-protocol-pure @@ -70,27 +67,31 @@ org.finos.legend.engine - legend-engine-xt-hostedService-pure + legend-engine-xt-functionActivator-protocol - org.finos.legend.engine - legend-engine-xt-hostedService-compiler - runtime + legend-engine-xt-hostedService-pure + + + + + + + + + org.finos.legend.engine - legend-engine-xt-hostedService-grammar - runtime + legend-engine-xt-hostedService-protocol + org.finos.legend.engine legend-engine-executionPlan-generation - - org.finos.legend.engine - legend-engine-xt-analytics-lineage-api - + diff --git a/legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation/HostedServiceArtifactGenerator.java b/legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation/HostedServiceArtifactGenerator.java index ea11cb1dc9e..8056699e762 100644 --- a/legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation/HostedServiceArtifactGenerator.java +++ b/legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation/HostedServiceArtifactGenerator.java @@ -20,13 +20,12 @@ import org.eclipse.collections.api.factory.Maps; import org.finos.legend.engine.language.hostedService.generation.control.HostedServiceOwnerValidationService; import org.finos.legend.engine.language.hostedService.generation.control.HostedServiceOwnerValidator; -import org.finos.legend.engine.language.hostedService.generation.model.GenerationInfoData; +import org.finos.legend.engine.protocol.hostedService.deployment.model.GenerationInfoData; import org.finos.legend.engine.language.pure.compiler.toPureGraph.PureModel; import org.finos.legend.engine.plan.generation.PlanGenerator; import org.finos.legend.engine.plan.generation.transformers.LegendPlanTransformers; import org.finos.legend.engine.plan.platform.PlanPlatform; -import org.finos.legend.engine.language.hostedService.generation.model.lineage.Lineage; -import org.finos.legend.engine.protocol.pure.PureClientVersions; +import org.finos.legend.engine.protocol.hostedService.deployment.model.lineage.Lineage; import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContext; import org.finos.legend.engine.protocol.pure.v1.model.executionPlan.CompositeExecutionPlan; import org.finos.legend.engine.protocol.pure.v1.model.executionPlan.ExecutionPlan; diff --git a/legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation/deployment/HostedServiceArtifactGenerationExtension.java b/legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation/deployment/HostedServiceArtifactGenerationExtension.java index 3d63ea27f6d..c8217da065b 100644 --- a/legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation/deployment/HostedServiceArtifactGenerationExtension.java +++ b/legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation/deployment/HostedServiceArtifactGenerationExtension.java @@ -20,7 +20,7 @@ import org.eclipse.collections.api.factory.Lists; import org.eclipse.collections.api.list.MutableList; import org.finos.legend.engine.language.hostedService.generation.HostedServiceArtifactGenerator; -import org.finos.legend.engine.language.hostedService.generation.model.GenerationInfoData; +import org.finos.legend.engine.protocol.hostedService.deployment.model.GenerationInfoData; import org.finos.legend.engine.language.pure.compiler.toPureGraph.PureModel; import org.finos.legend.engine.language.pure.dsl.generation.extension.Artifact; import org.finos.legend.engine.language.pure.dsl.generation.extension.ArtifactGenerationExtension; diff --git a/legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation/deployment/HostedServiceDeploymentManager.java b/legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation/deployment/HostedServiceDeploymentManager.java index aebc9369996..2d95cb87283 100644 --- a/legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation/deployment/HostedServiceDeploymentManager.java +++ b/legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation/deployment/HostedServiceDeploymentManager.java @@ -16,7 +16,10 @@ 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.protocol.functionActivator.deployment.FunctionActivatorArtifact; +import org.finos.legend.engine.protocol.hostedService.deployment.HostedServiceArtifact; +import org.finos.legend.engine.protocol.hostedService.deployment.HostedServiceDeploymentConfiguration; +import org.finos.legend.engine.protocol.hostedService.deployment.HostedServiceDeploymentResult; import org.finos.legend.engine.shared.core.ObjectMapperFactory; import org.finos.legend.engine.shared.core.identity.Identity; diff --git a/legend-engine-xts-hostedService/legend-engine-xt-hostedService-protocol/pom.xml b/legend-engine-xts-hostedService/legend-engine-xt-hostedService-protocol/pom.xml index fd891f657a0..662aca83e73 100644 --- a/legend-engine-xts-hostedService/legend-engine-xt-hostedService-protocol/pom.xml +++ b/legend-engine-xts-hostedService/legend-engine-xt-hostedService-protocol/pom.xml @@ -35,7 +35,14 @@ org.finos.legend.engine legend-engine-xt-functionActivator-protocol - ${project.version} + + + org.finos.legend.engine + legend-engine-xt-analytics-lineage-api + + + org.finos.legend.engine + legend-engine-protocol diff --git a/legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation/deployment/HostedServiceArtifact.java b/legend-engine-xts-hostedService/legend-engine-xt-hostedService-protocol/src/main/java/org/finos/legend/engine/protocol/hostedService/deployment/HostedServiceArtifact.java similarity index 77% rename from legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation/deployment/HostedServiceArtifact.java rename to legend-engine-xts-hostedService/legend-engine-xt-hostedService-protocol/src/main/java/org/finos/legend/engine/protocol/hostedService/deployment/HostedServiceArtifact.java index 579c8db18ea..6d02619b4f6 100644 --- a/legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation/deployment/HostedServiceArtifact.java +++ b/legend-engine-xts-hostedService/legend-engine-xt-hostedService-protocol/src/main/java/org/finos/legend/engine/protocol/hostedService/deployment/HostedServiceArtifact.java @@ -12,10 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.finos.legend.engine.language.hostedService.generation.deployment; +package org.finos.legend.engine.protocol.hostedService.deployment; -import org.finos.legend.engine.functionActivator.deployment.FunctionActivatorArtifact; -import org.finos.legend.engine.language.hostedService.generation.model.GenerationInfo; +//import org.finos.legend.engine.functionActivator.deployment.FunctionActivatorArtifact; +import org.finos.legend.engine.protocol.functionActivator.deployment.FunctionActivatorArtifact; +import org.finos.legend.engine.protocol.hostedService.deployment.model.GenerationInfo; import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData; public class HostedServiceArtifact extends FunctionActivatorArtifact diff --git a/legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation/deployment/HostedServiceContent.java b/legend-engine-xts-hostedService/legend-engine-xt-hostedService-protocol/src/main/java/org/finos/legend/engine/protocol/hostedService/deployment/HostedServiceContent.java similarity index 82% rename from legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation/deployment/HostedServiceContent.java rename to legend-engine-xts-hostedService/legend-engine-xt-hostedService-protocol/src/main/java/org/finos/legend/engine/protocol/hostedService/deployment/HostedServiceContent.java index 4f11777b516..6a753ecef9c 100644 --- a/legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation/deployment/HostedServiceContent.java +++ b/legend-engine-xts-hostedService/legend-engine-xt-hostedService-protocol/src/main/java/org/finos/legend/engine/protocol/hostedService/deployment/HostedServiceContent.java @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.finos.legend.engine.language.hostedService.generation.deployment; +package org.finos.legend.engine.protocol.hostedService.deployment; -import org.finos.legend.engine.functionActivator.deployment.FunctionActivatorDeploymentContent; -import org.finos.legend.engine.language.hostedService.generation.model.GenerationInfo; +import org.finos.legend.engine.protocol.hostedService.deployment.model.GenerationInfo; +import org.finos.legend.engine.protocol.functionActivator.deployment.FunctionActivatorDeploymentContent; import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData; public class HostedServiceContent extends FunctionActivatorDeploymentContent diff --git a/legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation/deployment/HostedServiceDeploymentConfiguration.java b/legend-engine-xts-hostedService/legend-engine-xt-hostedService-protocol/src/main/java/org/finos/legend/engine/protocol/hostedService/deployment/HostedServiceDeploymentConfiguration.java similarity index 79% rename from legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation/deployment/HostedServiceDeploymentConfiguration.java rename to legend-engine-xts-hostedService/legend-engine-xt-hostedService-protocol/src/main/java/org/finos/legend/engine/protocol/hostedService/deployment/HostedServiceDeploymentConfiguration.java index bf5b904c9b6..91f156d3408 100644 --- a/legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation/deployment/HostedServiceDeploymentConfiguration.java +++ b/legend-engine-xts-hostedService/legend-engine-xt-hostedService-protocol/src/main/java/org/finos/legend/engine/protocol/hostedService/deployment/HostedServiceDeploymentConfiguration.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.finos.legend.engine.language.hostedService.generation.deployment; +package org.finos.legend.engine.protocol.hostedService.deployment; -import org.finos.legend.engine.functionActivator.deployment.FunctionActivatorDeploymentConfiguration; +import org.finos.legend.engine.protocol.functionActivator.deployment.FunctionActivatorDeploymentConfiguration; public class HostedServiceDeploymentConfiguration extends FunctionActivatorDeploymentConfiguration { diff --git a/legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation/deployment/HostedServiceDeploymentResult.java b/legend-engine-xts-hostedService/legend-engine-xt-hostedService-protocol/src/main/java/org/finos/legend/engine/protocol/hostedService/deployment/HostedServiceDeploymentResult.java similarity index 81% rename from legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation/deployment/HostedServiceDeploymentResult.java rename to legend-engine-xts-hostedService/legend-engine-xt-hostedService-protocol/src/main/java/org/finos/legend/engine/protocol/hostedService/deployment/HostedServiceDeploymentResult.java index 87ab19404e6..3ab1600de5e 100644 --- a/legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation/deployment/HostedServiceDeploymentResult.java +++ b/legend-engine-xts-hostedService/legend-engine-xt-hostedService-protocol/src/main/java/org/finos/legend/engine/protocol/hostedService/deployment/HostedServiceDeploymentResult.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.finos.legend.engine.language.hostedService.generation.deployment; +package org.finos.legend.engine.protocol.hostedService.deployment; -import org.finos.legend.engine.functionActivator.deployment.DeploymentResult; +import org.finos.legend.engine.protocol.functionActivator.deployment.DeploymentResult; public class HostedServiceDeploymentResult extends DeploymentResult { diff --git a/legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation/model/GenerationInfo.java b/legend-engine-xts-hostedService/legend-engine-xt-hostedService-protocol/src/main/java/org/finos/legend/engine/protocol/hostedService/deployment/model/GenerationInfo.java similarity index 92% rename from legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation/model/GenerationInfo.java rename to legend-engine-xts-hostedService/legend-engine-xt-hostedService-protocol/src/main/java/org/finos/legend/engine/protocol/hostedService/deployment/model/GenerationInfo.java index 642a287efe7..71b35a1b7ca 100644 --- a/legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation/model/GenerationInfo.java +++ b/legend-engine-xts-hostedService/legend-engine-xt-hostedService-protocol/src/main/java/org/finos/legend/engine/protocol/hostedService/deployment/model/GenerationInfo.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.generation.model; +package org.finos.legend.engine.protocol.hostedService.deployment.model; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation/model/GenerationInfoData.java b/legend-engine-xts-hostedService/legend-engine-xt-hostedService-protocol/src/main/java/org/finos/legend/engine/protocol/hostedService/deployment/model/GenerationInfoData.java similarity index 88% rename from legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation/model/GenerationInfoData.java rename to legend-engine-xts-hostedService/legend-engine-xt-hostedService-protocol/src/main/java/org/finos/legend/engine/protocol/hostedService/deployment/model/GenerationInfoData.java index ebee8649f10..39c3b489fc8 100644 --- a/legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation/model/GenerationInfoData.java +++ b/legend-engine-xts-hostedService/legend-engine-xt-hostedService-protocol/src/main/java/org/finos/legend/engine/protocol/hostedService/deployment/model/GenerationInfoData.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.finos.legend.engine.language.hostedService.generation.model; +package org.finos.legend.engine.protocol.hostedService.deployment.model; -import org.finos.legend.engine.language.hostedService.generation.model.lineage.Lineage; +import org.finos.legend.engine.protocol.hostedService.deployment.model.lineage.Lineage; import org.finos.legend.engine.protocol.pure.v1.model.executionPlan.ExecutionPlan; public class GenerationInfoData extends GenerationInfo diff --git a/legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation/model/lineage/CompositeLineage.java b/legend-engine-xts-hostedService/legend-engine-xt-hostedService-protocol/src/main/java/org/finos/legend/engine/protocol/hostedService/deployment/model/lineage/CompositeLineage.java similarity index 92% rename from legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation/model/lineage/CompositeLineage.java rename to legend-engine-xts-hostedService/legend-engine-xt-hostedService-protocol/src/main/java/org/finos/legend/engine/protocol/hostedService/deployment/model/lineage/CompositeLineage.java index b58d93e6044..138f94ce329 100644 --- a/legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation/model/lineage/CompositeLineage.java +++ b/legend-engine-xts-hostedService/legend-engine-xt-hostedService-protocol/src/main/java/org/finos/legend/engine/protocol/hostedService/deployment/model/lineage/CompositeLineage.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.generation.model.lineage; +package org.finos.legend.engine.protocol.hostedService.deployment.model.lineage; import org.eclipse.collections.api.factory.Maps; diff --git a/legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation/model/lineage/Lineage.java b/legend-engine-xts-hostedService/legend-engine-xt-hostedService-protocol/src/main/java/org/finos/legend/engine/protocol/hostedService/deployment/model/lineage/Lineage.java similarity index 92% rename from legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation/model/lineage/Lineage.java rename to legend-engine-xts-hostedService/legend-engine-xt-hostedService-protocol/src/main/java/org/finos/legend/engine/protocol/hostedService/deployment/model/lineage/Lineage.java index 5b1e67464a3..74875d948df 100644 --- a/legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation/model/lineage/Lineage.java +++ b/legend-engine-xts-hostedService/legend-engine-xt-hostedService-protocol/src/main/java/org/finos/legend/engine/protocol/hostedService/deployment/model/lineage/Lineage.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.generation.model.lineage; +package org.finos.legend.engine.protocol.hostedService.deployment.model.lineage; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation/model/lineage/SingleLineage.java b/legend-engine-xts-hostedService/legend-engine-xt-hostedService-protocol/src/main/java/org/finos/legend/engine/protocol/hostedService/deployment/model/lineage/SingleLineage.java similarity index 97% rename from legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation/model/lineage/SingleLineage.java rename to legend-engine-xts-hostedService/legend-engine-xt-hostedService-protocol/src/main/java/org/finos/legend/engine/protocol/hostedService/deployment/model/lineage/SingleLineage.java index 131e3f772cf..b2315f6adfe 100644 --- a/legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/src/main/java/org/finos/legend/engine/language/hostedService/generation/model/lineage/SingleLineage.java +++ b/legend-engine-xts-hostedService/legend-engine-xt-hostedService-protocol/src/main/java/org/finos/legend/engine/protocol/hostedService/deployment/model/lineage/SingleLineage.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.generation.model.lineage; +package org.finos.legend.engine.protocol.hostedService.deployment.model.lineage; import com.fasterxml.jackson.annotation.JsonFormat; import org.eclipse.collections.api.factory.Lists; diff --git a/legend-engine-xts-hostedService/legend-engine-xt-hostedService-protocol/src/main/java/org/finos/legend/engine/protocol/hostedService/metamodel/HostedServiceProtocolExtension.java b/legend-engine-xts-hostedService/legend-engine-xt-hostedService-protocol/src/main/java/org/finos/legend/engine/protocol/hostedService/metamodel/HostedServiceProtocolExtension.java index b4c59da89af..7185ae8d9be 100644 --- a/legend-engine-xts-hostedService/legend-engine-xt-hostedService-protocol/src/main/java/org/finos/legend/engine/protocol/hostedService/metamodel/HostedServiceProtocolExtension.java +++ b/legend-engine-xts-hostedService/legend-engine-xt-hostedService-protocol/src/main/java/org/finos/legend/engine/protocol/hostedService/metamodel/HostedServiceProtocolExtension.java @@ -17,7 +17,12 @@ import org.eclipse.collections.api.block.function.Function0; import org.eclipse.collections.api.factory.Lists; import org.eclipse.collections.api.factory.Maps; +import org.finos.legend.engine.protocol.functionActivator.deployment.FunctionActivatorArtifact; +import org.finos.legend.engine.protocol.functionActivator.deployment.FunctionActivatorDeploymentConfiguration; +import org.finos.legend.engine.protocol.functionActivator.deployment.FunctionActivatorDeploymentContent; import org.finos.legend.engine.protocol.functionActivator.metamodel.DeploymentConfiguration; +import org.finos.legend.engine.protocol.hostedService.deployment.HostedServiceArtifact; +import org.finos.legend.engine.protocol.hostedService.deployment.HostedServiceContent; import org.finos.legend.engine.protocol.hostedService.metamodel.control.Deployment; import org.finos.legend.engine.protocol.hostedService.metamodel.control.Ownership; import org.finos.legend.engine.protocol.hostedService.metamodel.control.UserList; @@ -45,6 +50,15 @@ public List>>> getExtraProtocolSubTypeInfo .build(), ProtocolSubTypeInfo.newBuilder(DeploymentConfiguration.class) .withSubtype(HostedServiceDeploymentConfiguration.class, "hostedServiceDeploymentConfiguration") + .build(), + ProtocolSubTypeInfo.newBuilder(FunctionActivatorDeploymentConfiguration.class) + .withSubtype(org.finos.legend.engine.protocol.hostedService.deployment.HostedServiceDeploymentConfiguration.class, "hostedServiceDeploymentConfig") + .build(), + ProtocolSubTypeInfo.newBuilder(FunctionActivatorArtifact.class) + .withSubtype(HostedServiceArtifact.class, "hostedServiceArtifact") + .build(), + ProtocolSubTypeInfo.newBuilder(FunctionActivatorDeploymentContent.class) + .withSubtype(HostedServiceContent.class, "hostedServiceDeploymentContent") .build() )); } 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 index 4ede2f2f3f7..485d759d753 100644 --- a/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-api/pom.xml +++ b/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-api/pom.xml @@ -68,6 +68,10 @@ org.finos.legend.engine legend-engine-xt-functionActivator-deployment + + org.finos.legend.engine + legend-engine-xt-functionActivator-protocol + org.finos.legend.engine legend-engine-protocol-pure diff --git a/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-api/src/main/java/org/finos/legend/engine/language/snowflakeApp/api/SnowflakeAppService.java b/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-api/src/main/java/org/finos/legend/engine/language/snowflakeApp/api/SnowflakeAppService.java index be91afe8b4d..eb47cf58e50 100644 --- a/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-api/src/main/java/org/finos/legend/engine/language/snowflakeApp/api/SnowflakeAppService.java +++ b/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-api/src/main/java/org/finos/legend/engine/language/snowflakeApp/api/SnowflakeAppService.java @@ -14,21 +14,22 @@ package org.finos.legend.engine.language.snowflakeApp.api; +import com.fasterxml.jackson.databind.jsontype.NamedType; import org.eclipse.collections.api.RichIterable; import org.eclipse.collections.api.block.function.Function; import org.eclipse.collections.api.list.MutableList; import org.eclipse.collections.impl.factory.Lists; import org.eclipse.collections.impl.list.mutable.FastList; import org.finos.legend.engine.functionActivator.api.output.FunctionActivatorInfo; -import org.finos.legend.engine.functionActivator.deployment.FunctionActivatorDeploymentConfiguration; +import org.finos.legend.engine.protocol.functionActivator.deployment.FunctionActivatorDeploymentConfiguration; import org.finos.legend.engine.functionActivator.service.FunctionActivatorError; import org.finos.legend.engine.functionActivator.service.FunctionActivatorService; import org.finos.legend.engine.language.pure.compiler.toPureGraph.PureModel; -import org.finos.legend.engine.language.snowflakeApp.generator.SnowflakeAppArtifact; +import org.finos.legend.engine.protocol.snowflakeApp.deployment.SnowflakeAppArtifact; import org.finos.legend.engine.language.snowflakeApp.deployment.SnowflakeAppDeploymentManager; import org.finos.legend.engine.language.snowflakeApp.deployment.SnowflakeDeploymentResult; -import org.finos.legend.engine.language.snowflakeApp.generator.SnowflakeAppContent; -import org.finos.legend.engine.language.snowflakeApp.generator.SnowflakeAppDeploymentConfiguration; +import org.finos.legend.engine.protocol.snowflakeApp.deployment.SnowflakeAppContent; +import org.finos.legend.engine.protocol.snowflakeApp.deployment.SnowflakeAppDeploymentConfiguration; import org.finos.legend.engine.language.snowflakeApp.generator.SnowflakeAppGenerator; import org.finos.legend.engine.plan.execution.PlanExecutor; import org.finos.legend.engine.plan.execution.stores.relational.config.TemporaryTestDbConfiguration; diff --git a/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-api/src/main/java/org/finos/legend/engine/language/snowflakeApp/deployment/SnowflakeAppDeploymentManager.java b/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-api/src/main/java/org/finos/legend/engine/language/snowflakeApp/deployment/SnowflakeAppDeploymentManager.java index b7d86d2c4c1..7c5d96bac04 100644 --- a/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-api/src/main/java/org/finos/legend/engine/language/snowflakeApp/deployment/SnowflakeAppDeploymentManager.java +++ b/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-api/src/main/java/org/finos/legend/engine/language/snowflakeApp/deployment/SnowflakeAppDeploymentManager.java @@ -19,11 +19,11 @@ import org.eclipse.collections.api.list.MutableList; import org.eclipse.collections.impl.factory.Lists; import org.finos.legend.engine.functionActivator.deployment.DeploymentManager; -import org.finos.legend.engine.functionActivator.deployment.FunctionActivatorArtifact; +import org.finos.legend.engine.protocol.functionActivator.deployment.FunctionActivatorArtifact; import org.finos.legend.engine.language.snowflakeApp.api.SnowflakeAppDeploymentTool; -import org.finos.legend.engine.language.snowflakeApp.generator.SnowflakeAppArtifact; -import org.finos.legend.engine.language.snowflakeApp.generator.SnowflakeAppDeploymentConfiguration; -import org.finos.legend.engine.language.snowflakeApp.generator.SnowflakeAppContent; +import org.finos.legend.engine.protocol.snowflakeApp.deployment.SnowflakeAppArtifact; +import org.finos.legend.engine.protocol.snowflakeApp.deployment.SnowflakeAppDeploymentConfiguration; +import org.finos.legend.engine.protocol.snowflakeApp.deployment.SnowflakeAppContent; import org.finos.legend.engine.plan.execution.PlanExecutor; import org.finos.legend.engine.plan.execution.stores.relational.connection.manager.ConnectionManagerSelector; import org.finos.legend.engine.plan.execution.stores.relational.plugin.RelationalStoreExecutor; diff --git a/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-api/src/main/java/org/finos/legend/engine/language/snowflakeApp/deployment/SnowflakeDeploymentResult.java b/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-api/src/main/java/org/finos/legend/engine/language/snowflakeApp/deployment/SnowflakeDeploymentResult.java index cfc0a154fee..8bfc1a49de6 100644 --- a/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-api/src/main/java/org/finos/legend/engine/language/snowflakeApp/deployment/SnowflakeDeploymentResult.java +++ b/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-api/src/main/java/org/finos/legend/engine/language/snowflakeApp/deployment/SnowflakeDeploymentResult.java @@ -15,7 +15,7 @@ package org.finos.legend.engine.language.snowflakeApp.deployment; import org.eclipse.collections.api.list.MutableList; -import org.finos.legend.engine.functionActivator.deployment.DeploymentResult; +import org.finos.legend.engine.protocol.functionActivator.deployment.DeploymentResult; public class SnowflakeDeploymentResult extends DeploymentResult { 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 index aca525d0810..173e1fce8bc 100644 --- a/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-generator/pom.xml +++ b/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-generator/pom.xml @@ -93,10 +93,6 @@ org.finos.legend.engine legend-engine-protocol-pure - - org.finos.legend.engine - legend-engine-xt-functionActivator-deployment - org.finos.legend.engine legend-engine-xt-relationalStore-pure diff --git a/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-generator/src/main/java/org/finos/legend/engine/language/snowflakeApp/generator/SnowflakeAppArtifactGenerationExtension.java b/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-generator/src/main/java/org/finos/legend/engine/language/snowflakeApp/generator/SnowflakeAppArtifactGenerationExtension.java index b4f3fe98e60..82a89baa5e8 100644 --- a/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-generator/src/main/java/org/finos/legend/engine/language/snowflakeApp/generator/SnowflakeAppArtifactGenerationExtension.java +++ b/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-generator/src/main/java/org/finos/legend/engine/language/snowflakeApp/generator/SnowflakeAppArtifactGenerationExtension.java @@ -23,6 +23,7 @@ import org.finos.legend.engine.language.pure.dsl.generation.extension.Artifact; import org.finos.legend.engine.language.pure.dsl.generation.extension.ArtifactGenerationExtension; import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData; +import org.finos.legend.engine.protocol.snowflakeApp.deployment.SnowflakeAppArtifact; import org.finos.legend.engine.pure.code.core.PureCoreExtensionLoader; import org.finos.legend.engine.shared.core.ObjectMapperFactory; import org.finos.legend.pure.generated.Root_meta_external_function_activator_snowflakeApp_SnowflakeApp; diff --git a/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-generator/src/main/java/org/finos/legend/engine/language/snowflakeApp/generator/SnowflakeAppGenerator.java b/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-generator/src/main/java/org/finos/legend/engine/language/snowflakeApp/generator/SnowflakeAppGenerator.java index 506c28d28df..6d795e79908 100644 --- a/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-generator/src/main/java/org/finos/legend/engine/language/snowflakeApp/generator/SnowflakeAppGenerator.java +++ b/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-generator/src/main/java/org/finos/legend/engine/language/snowflakeApp/generator/SnowflakeAppGenerator.java @@ -30,6 +30,9 @@ import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.store.relational.connection.RelationalDatabaseConnection; import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.store.relational.connection.authentication.SnowflakePublicAuthenticationStrategy; import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.store.relational.connection.specification.SnowflakeDatasourceSpecification; +import org.finos.legend.engine.protocol.snowflakeApp.deployment.SnowflakeAppArtifact; +import org.finos.legend.engine.protocol.snowflakeApp.deployment.SnowflakeAppContent; +import org.finos.legend.engine.protocol.snowflakeApp.deployment.SnowflakeAppDeploymentConfiguration; import org.finos.legend.engine.protocol.snowflakeApp.metamodel.SnowflakeApp; import org.finos.legend.pure.generated.*; import org.finos.legend.pure.m3.coreinstance.meta.pure.metamodel.function.FunctionDefinition; diff --git a/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-protocol/pom.xml b/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-protocol/pom.xml index ad62a0642e1..e3f6f71a37c 100644 --- a/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-protocol/pom.xml +++ b/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-protocol/pom.xml @@ -50,6 +50,10 @@ junit test + + org.finos.legend.engine + legend-engine-xt-relationalStore-protocol + diff --git a/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-generator/src/main/java/org/finos/legend/engine/language/snowflakeApp/generator/SnowflakeAppArtifact.java b/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-protocol/src/main/java/org/finos/legend/engine/protocol/snowflakeApp/deployment/SnowflakeAppArtifact.java similarity index 86% rename from legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-generator/src/main/java/org/finos/legend/engine/language/snowflakeApp/generator/SnowflakeAppArtifact.java rename to legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-protocol/src/main/java/org/finos/legend/engine/protocol/snowflakeApp/deployment/SnowflakeAppArtifact.java index a2434df1c5c..3115f9b154c 100644 --- a/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-generator/src/main/java/org/finos/legend/engine/language/snowflakeApp/generator/SnowflakeAppArtifact.java +++ b/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-protocol/src/main/java/org/finos/legend/engine/protocol/snowflakeApp/deployment/SnowflakeAppArtifact.java @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.finos.legend.engine.language.snowflakeApp.generator; +package org.finos.legend.engine.protocol.snowflakeApp.deployment; -import org.finos.legend.engine.functionActivator.deployment.FunctionActivatorArtifact; +import org.finos.legend.engine.protocol.functionActivator.deployment.FunctionActivatorArtifact; public class SnowflakeAppArtifact extends FunctionActivatorArtifact { diff --git a/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-generator/src/main/java/org/finos/legend/engine/language/snowflakeApp/generator/SnowflakeAppContent.java b/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-protocol/src/main/java/org/finos/legend/engine/protocol/snowflakeApp/deployment/SnowflakeAppContent.java similarity index 93% rename from legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-generator/src/main/java/org/finos/legend/engine/language/snowflakeApp/generator/SnowflakeAppContent.java rename to legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-protocol/src/main/java/org/finos/legend/engine/protocol/snowflakeApp/deployment/SnowflakeAppContent.java index 6c2624b0e20..714aa956a3a 100644 --- a/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-generator/src/main/java/org/finos/legend/engine/language/snowflakeApp/generator/SnowflakeAppContent.java +++ b/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-protocol/src/main/java/org/finos/legend/engine/protocol/snowflakeApp/deployment/SnowflakeAppContent.java @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.finos.legend.engine.language.snowflakeApp.generator; +package org.finos.legend.engine.protocol.snowflakeApp.deployment; import org.eclipse.collections.api.factory.Lists; import org.eclipse.collections.api.list.MutableList; -import org.finos.legend.engine.functionActivator.deployment.FunctionActivatorDeploymentContent; +import org.finos.legend.engine.protocol.functionActivator.deployment.FunctionActivatorDeploymentContent; import org.finos.legend.engine.protocol.pure.v1.model.context.AlloySDLC; import java.text.SimpleDateFormat; diff --git a/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-generator/src/main/java/org/finos/legend/engine/language/snowflakeApp/generator/SnowflakeAppDeploymentConfiguration.java b/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-protocol/src/main/java/org/finos/legend/engine/protocol/snowflakeApp/deployment/SnowflakeAppDeploymentConfiguration.java similarity index 79% rename from legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-generator/src/main/java/org/finos/legend/engine/language/snowflakeApp/generator/SnowflakeAppDeploymentConfiguration.java rename to legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-protocol/src/main/java/org/finos/legend/engine/protocol/snowflakeApp/deployment/SnowflakeAppDeploymentConfiguration.java index 871fbeef7be..01e07879f29 100644 --- a/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-generator/src/main/java/org/finos/legend/engine/language/snowflakeApp/generator/SnowflakeAppDeploymentConfiguration.java +++ b/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-protocol/src/main/java/org/finos/legend/engine/protocol/snowflakeApp/deployment/SnowflakeAppDeploymentConfiguration.java @@ -12,15 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.finos.legend.engine.language.snowflakeApp.generator; +package org.finos.legend.engine.protocol.snowflakeApp.deployment; -import org.finos.legend.engine.functionActivator.deployment.FunctionActivatorDeploymentConfiguration; +import org.finos.legend.engine.protocol.functionActivator.deployment.FunctionActivatorDeploymentConfiguration; import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.store.relational.connection.RelationalDatabaseConnection; public class SnowflakeAppDeploymentConfiguration extends FunctionActivatorDeploymentConfiguration { public RelationalDatabaseConnection connection; + public SnowflakeAppDeploymentConfiguration() + { + //jackson + } + public SnowflakeAppDeploymentConfiguration(RelationalDatabaseConnection connection) { this.connection = connection; diff --git a/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-protocol/src/main/java/org/finos/legend/engine/protocol/snowflakeApp/metamodel/SnowflakeAppProtocolExtension.java b/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-protocol/src/main/java/org/finos/legend/engine/protocol/snowflakeApp/metamodel/SnowflakeAppProtocolExtension.java index f838fd8372b..4e0f3fd3e83 100644 --- a/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-protocol/src/main/java/org/finos/legend/engine/protocol/snowflakeApp/metamodel/SnowflakeAppProtocolExtension.java +++ b/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-protocol/src/main/java/org/finos/legend/engine/protocol/snowflakeApp/metamodel/SnowflakeAppProtocolExtension.java @@ -17,10 +17,15 @@ import org.eclipse.collections.api.block.function.Function0; import org.eclipse.collections.api.factory.Lists; import org.eclipse.collections.api.factory.Maps; +import org.finos.legend.engine.protocol.functionActivator.deployment.FunctionActivatorArtifact; +import org.finos.legend.engine.protocol.functionActivator.deployment.FunctionActivatorDeploymentConfiguration; +import org.finos.legend.engine.protocol.functionActivator.deployment.FunctionActivatorDeploymentContent; import org.finos.legend.engine.protocol.functionActivator.metamodel.DeploymentConfiguration; import org.finos.legend.engine.protocol.pure.v1.extension.ProtocolSubTypeInfo; import org.finos.legend.engine.protocol.pure.v1.extension.PureProtocolExtension; import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.PackageableElement; +import org.finos.legend.engine.protocol.snowflakeApp.deployment.SnowflakeAppArtifact; +import org.finos.legend.engine.protocol.snowflakeApp.deployment.SnowflakeAppContent; import java.util.List; import java.util.Map; @@ -38,6 +43,15 @@ public List>>> getExtraProtocolSubTypeInfo .build(), ProtocolSubTypeInfo.newBuilder(DeploymentConfiguration.class) .withSubtype(SnowflakeAppDeploymentConfiguration.class, "snowflakeDeploymentConfiguration") + .build(), + ProtocolSubTypeInfo.newBuilder(FunctionActivatorDeploymentConfiguration.class) + .withSubtype(org.finos.legend.engine.protocol.snowflakeApp.deployment.SnowflakeAppDeploymentConfiguration.class, "snowflakeDeploymentConfig") + .build(), + ProtocolSubTypeInfo.newBuilder(FunctionActivatorArtifact.class) + .withSubtype(SnowflakeAppArtifact.class, "snowflakeArtifact") + .build(), + ProtocolSubTypeInfo.newBuilder(FunctionActivatorDeploymentContent.class) + .withSubtype(SnowflakeAppContent.class, "snowflakeDeploymentContent") .build() )); }