diff --git a/legend-engine-config/legend-engine-extensions-collection-generation/pom.xml b/legend-engine-config/legend-engine-extensions-collection-generation/pom.xml index 74a7252ac6b..5e51522a1e1 100644 --- a/legend-engine-config/legend-engine-extensions-collection-generation/pom.xml +++ b/legend-engine-config/legend-engine-extensions-collection-generation/pom.xml @@ -480,7 +480,7 @@ org.finos.legend.engine - legend-engine-xt-snowflakeApp-api + legend-engine-xt-snowflakeApp-generator diff --git a/legend-engine-config/legend-engine-extensions-collection-generation/src/test/java/org/finos/legend/engine/extensions/collection/generation/TestExtensions.java b/legend-engine-config/legend-engine-extensions-collection-generation/src/test/java/org/finos/legend/engine/extensions/collection/generation/TestExtensions.java index 672672554f7..38f93c3cddd 100644 --- a/legend-engine-config/legend-engine-extensions-collection-generation/src/test/java/org/finos/legend/engine/extensions/collection/generation/TestExtensions.java +++ b/legend-engine-config/legend-engine-extensions-collection-generation/src/test/java/org/finos/legend/engine/extensions/collection/generation/TestExtensions.java @@ -71,7 +71,7 @@ import org.finos.legend.engine.language.pure.grammar.to.DatabricksGrammarComposerExtension; import org.finos.legend.engine.language.pure.grammar.to.extension.PureGrammarComposerExtension; import org.finos.legend.engine.language.snowflakeApp.compiler.toPureGraph.SnowflakeAppCompilerExtension; -import org.finos.legend.engine.language.snowflakeApp.deployment.SnowflakeAppArtifactGenerationExtension; +import org.finos.legend.engine.language.snowflakeApp.generator.SnowflakeAppArtifactGenerationExtension; import org.finos.legend.engine.language.snowflakeApp.grammar.from.SnowflakeAppGrammarParserExtension; import org.finos.legend.engine.language.snowflakeApp.grammar.to.SnowflakeAppGrammarComposer; import org.finos.legend.engine.language.sql.grammar.integration.SQLGrammarParserExtension; diff --git a/legend-engine-config/legend-engine-server/pom.xml b/legend-engine-config/legend-engine-server/pom.xml index b2fac3d4e69..cbf93d9d009 100644 --- a/legend-engine-config/legend-engine-server/pom.xml +++ b/legend-engine-config/legend-engine-server/pom.xml @@ -333,6 +333,10 @@ org.finos.legend.engine legend-engine-xt-snowflakeApp-api + + org.finos.legend.engine + legend-engine-xt-snowflakeApp-generator + org.finos.legend.engine legend-engine-xt-hostedService-compiler 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 932921641d7..25b1837bafe 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 @@ -98,7 +98,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.deployment.SnowflakeAppDeploymentConfiguration; +import org.finos.legend.engine.language.snowflakeApp.generator.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-snowflakeApp/legend-engine-xt-snowflakeApp-api/pom.xml b/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-api/pom.xml index f85d6c2e610..743ec94d482 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 @@ -29,10 +29,6 @@ - - org.finos.legend.pure - legend-pure-m3-core - @@ -60,10 +56,6 @@ org.finos.legend.engine legend-engine-xt-relationalStore-executionPlan - - org.finos.legend.engine - legend-engine-executionPlan-generation - org.finos.legend.engine legend-engine-shared-core @@ -80,10 +72,6 @@ org.finos.legend.engine legend-engine-xt-functionActivator-api - - org.finos.legend.engine - legend-engine-xt-relationalStore-pure - org.finos.legend.engine legend-engine-xt-relationalStore-protocol @@ -92,11 +80,6 @@ org.finos.legend.engine legend-engine-executionPlan-execution - - org.finos.legend.engine - legend-engine-pure-platform-java - - org.finos.legend.engine legend-engine-xt-snowflakeApp-pure @@ -107,13 +90,7 @@ org.finos.legend.engine - legend-engine-xt-snowflakeApp-compiler - runtime - - - org.finos.legend.engine - legend-engine-xt-snowflakeApp-grammar - runtime + legend-engine-xt-snowflakeApp-generator org.finos.legend.engine @@ -188,10 +165,6 @@ jersey-common test - - org.finos.legend.engine - legend-engine-language-pure-dsl-generation - 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 9a830e5e85b..be91afe8b4d 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 @@ -24,12 +24,12 @@ 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.deployment.SnowflakeAppArtifact; -import org.finos.legend.engine.language.snowflakeApp.deployment.SnowflakeAppContent; -import org.finos.legend.engine.language.snowflakeApp.deployment.SnowflakeAppDeploymentConfiguration; -import org.finos.legend.engine.language.snowflakeApp.deployment.SnowflakeAppGenerator; -import org.finos.legend.engine.language.snowflakeApp.deployment.SnowflakeDeploymentManager; +import org.finos.legend.engine.language.snowflakeApp.generator.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.language.snowflakeApp.generator.SnowflakeAppGenerator; import org.finos.legend.engine.plan.execution.PlanExecutor; import org.finos.legend.engine.plan.execution.stores.relational.config.TemporaryTestDbConfiguration; import org.finos.legend.engine.plan.execution.stores.relational.connection.manager.ConnectionManagerSelector; @@ -39,32 +39,31 @@ import org.finos.legend.pure.generated.Root_meta_external_function_activator_FunctionActivator; import org.finos.legend.pure.generated.Root_meta_external_function_activator_snowflakeApp_SnowflakeApp; import org.finos.legend.pure.generated.Root_meta_pure_extension_Extension; -import org.pac4j.core.profile.CommonProfile; import java.util.List; public class SnowflakeAppService implements FunctionActivatorService { private ConnectionManagerSelector connectionManager; - private SnowflakeDeploymentManager snowflakeDeploymentManager; + private SnowflakeAppDeploymentManager snowflakeDeploymentManager; public SnowflakeAppService() { TemporaryTestDbConfiguration conf = new TemporaryTestDbConfiguration(); conf.port = Integer.parseInt(System.getProperty("h2ServerPort", "1234")); this.connectionManager = new ConnectionManagerSelector(conf, FastList.newList()); - this.snowflakeDeploymentManager = new SnowflakeDeploymentManager(new SnowflakeAppDeploymentTool(connectionManager)); + this.snowflakeDeploymentManager = new SnowflakeAppDeploymentManager(new SnowflakeAppDeploymentTool(connectionManager)); } public SnowflakeAppService(ConnectionManagerSelector connectionManager) { this.connectionManager = connectionManager; - this.snowflakeDeploymentManager = new SnowflakeDeploymentManager(new SnowflakeAppDeploymentTool(connectionManager)); + this.snowflakeDeploymentManager = new SnowflakeAppDeploymentManager(new SnowflakeAppDeploymentTool(connectionManager)); } public SnowflakeAppService(PlanExecutor executor) { - this.snowflakeDeploymentManager = new SnowflakeDeploymentManager(executor); + this.snowflakeDeploymentManager = new SnowflakeAppDeploymentManager(executor); } @Override diff --git a/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-api/src/main/java/org/finos/legend/engine/language/snowflakeApp/deployment/SnowflakeDeploymentManager.java b/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-api/src/main/java/org/finos/legend/engine/language/snowflakeApp/deployment/SnowflakeAppDeploymentManager.java similarity index 93% rename from legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-api/src/main/java/org/finos/legend/engine/language/snowflakeApp/deployment/SnowflakeDeploymentManager.java rename to legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-api/src/main/java/org/finos/legend/engine/language/snowflakeApp/deployment/SnowflakeAppDeploymentManager.java index c46427adaea..b7d86d2c4c1 100644 --- a/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-api/src/main/java/org/finos/legend/engine/language/snowflakeApp/deployment/SnowflakeDeploymentManager.java +++ b/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-api/src/main/java/org/finos/legend/engine/language/snowflakeApp/deployment/SnowflakeAppDeploymentManager.java @@ -21,13 +21,15 @@ import org.finos.legend.engine.functionActivator.deployment.DeploymentManager; import org.finos.legend.engine.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.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; import org.finos.legend.engine.plan.execution.stores.relational.plugin.RelationalStoreState; import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.store.relational.connection.DatabaseConnection; import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.store.relational.connection.RelationalDatabaseConnection; -import org.finos.legend.engine.language.snowflakeApp.deployment.SnowflakeAppDeploymentConfiguration; import org.finos.legend.engine.shared.core.identity.Identity; import org.finos.legend.pure.generated.Root_meta_pure_alloy_connections_alloy_authentication_SnowflakePublicAuthenticationStrategy; import org.finos.legend.pure.generated.Root_meta_pure_alloy_connections_alloy_specification_SnowflakeDatasourceSpecification; @@ -42,9 +44,9 @@ import java.util.Map; -public class SnowflakeDeploymentManager implements DeploymentManager +public class SnowflakeAppDeploymentManager implements DeploymentManager { - private static final Logger LOGGER = LoggerFactory.getLogger(SnowflakeDeploymentManager.class); + private static final Logger LOGGER = LoggerFactory.getLogger(SnowflakeAppDeploymentManager.class); private SnowflakeAppDeploymentTool snowflakeAppDeploymentTool; private PlanExecutor planExecutor; @@ -52,12 +54,12 @@ public class SnowflakeDeploymentManager implements DeploymentManager c instanceof RelationalStoreExecutor).getFirst().getStoreState()).getRelationalExecutor().getConnectionManager(); diff --git a/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-api/src/main/resources/META-INF/services/org.finos.legend.engine.language.pure.dsl.generation.extension.ArtifactGenerationExtension b/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-api/src/main/resources/META-INF/services/org.finos.legend.engine.language.pure.dsl.generation.extension.ArtifactGenerationExtension deleted file mode 100644 index cc58504ac24..00000000000 --- a/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-api/src/main/resources/META-INF/services/org.finos.legend.engine.language.pure.dsl.generation.extension.ArtifactGenerationExtension +++ /dev/null @@ -1 +0,0 @@ -org.finos.legend.engine.language.snowflakeApp.deployment.SnowflakeAppArtifactGenerationExtension 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 new file mode 100644 index 00000000000..6b5f0a6b96e --- /dev/null +++ b/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-generator/pom.xml @@ -0,0 +1,205 @@ + + + + + + org.finos.legend.engine + legend-engine-xts-snowflakeApp + 4.32.1-SNAPSHOT + + 4.0.0 + + legend-engine-xt-snowflakeApp-generator + jar + Legend Engine - XT - Snowflake App - Generator + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + dependency-analyze + + + + org.finos.legend.engine:legend-engine-xt-functionActivator-pure + org.finos.legend.engine:legend-engine-executionPlan-execution + + + + + + + + + + + org.finos.legend.pure + legend-pure-m3-core + + + + + + + + + + org.finos.legend.engine + legend-engine-language-pure-compiler + + + + + + + org.finos.legend.engine + legend-engine-pure-code-compiled-core + + + org.finos.legend.engine + legend-engine-pure-code-core-extension + + + + org.finos.legend.engine + legend-engine-executionPlan-generation + + + org.finos.legend.engine + legend-engine-shared-core + + + org.finos.legend.engine + legend-engine-xt-functionActivator-pure + + + org.finos.legend.engine + legend-engine-protocol-pure + + + org.finos.legend.engine + legend-engine-xt-functionActivator-api + + + org.finos.legend.engine + legend-engine-xt-relationalStore-pure + + + org.finos.legend.engine + legend-engine-xt-relationalStore-protocol + + + org.finos.legend.engine + legend-engine-executionPlan-execution + + + org.finos.legend.engine + legend-engine-pure-platform-java + + + + org.finos.legend.engine + legend-engine-xt-snowflakeApp-pure + + + org.finos.legend.engine + legend-engine-xt-snowflakeApp-protocol + + + org.finos.legend.engine + legend-engine-xt-snowflakeApp-compiler + runtime + + + org.finos.legend.engine + legend-engine-xt-snowflakeApp-grammar + runtime + + + org.finos.legend.engine + legend-engine-xt-relationalStore-snowflake-protocol + + + org.finos.legend.engine + legend-engine-xt-relationalStore-snowflake-pure + + + + + + + + + com.fasterxml.jackson.core + jackson-databind + + + + org.eclipse.collections + eclipse-collections-api + + + org.eclipse.collections + eclipse-collections + + + + + + org.slf4j + slf4j-api + + + + + + + + junit + junit + test + + + org.finos.legend.engine + legend-engine-xt-relationalStore-javaPlatformBinding-pure + test + + + org.finos.legend.engine + legend-engine-xt-relationalStore-grammar + test + + + org.finos.legend.engine + legend-engine-configuration + test + + + org.glassfish.jersey.core + jersey-common + test + + + org.finos.legend.engine + legend-engine-language-pure-dsl-generation + + + + diff --git a/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-api/src/main/java/org/finos/legend/engine/language/snowflakeApp/deployment/SnowflakeAppArtifact.java b/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-generator/src/main/java/org/finos/legend/engine/language/snowflakeApp/generator/SnowflakeAppArtifact.java similarity index 83% rename from legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-api/src/main/java/org/finos/legend/engine/language/snowflakeApp/deployment/SnowflakeAppArtifact.java rename to legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-generator/src/main/java/org/finos/legend/engine/language/snowflakeApp/generator/SnowflakeAppArtifact.java index b1080411d24..a2434df1c5c 100644 --- a/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-api/src/main/java/org/finos/legend/engine/language/snowflakeApp/deployment/SnowflakeAppArtifact.java +++ b/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-generator/src/main/java/org/finos/legend/engine/language/snowflakeApp/generator/SnowflakeAppArtifact.java @@ -12,11 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.finos.legend.engine.language.snowflakeApp.deployment; +package org.finos.legend.engine.language.snowflakeApp.generator; -import org.eclipse.collections.api.RichIterable; -import org.eclipse.collections.api.factory.Lists; -import org.eclipse.collections.api.list.MutableList; import org.finos.legend.engine.functionActivator.deployment.FunctionActivatorArtifact; public class SnowflakeAppArtifact extends FunctionActivatorArtifact diff --git a/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-api/src/main/java/org/finos/legend/engine/language/snowflakeApp/deployment/SnowflakeAppArtifactGenerationExtension.java b/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-generator/src/main/java/org/finos/legend/engine/language/snowflakeApp/generator/SnowflakeAppArtifactGenerationExtension.java similarity index 89% rename from legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-api/src/main/java/org/finos/legend/engine/language/snowflakeApp/deployment/SnowflakeAppArtifactGenerationExtension.java rename to legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-generator/src/main/java/org/finos/legend/engine/language/snowflakeApp/generator/SnowflakeAppArtifactGenerationExtension.java index c0d1f4aa5a2..b4f3fe98e60 100644 --- a/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-api/src/main/java/org/finos/legend/engine/language/snowflakeApp/deployment/SnowflakeAppArtifactGenerationExtension.java +++ b/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-generator/src/main/java/org/finos/legend/engine/language/snowflakeApp/generator/SnowflakeAppArtifactGenerationExtension.java @@ -13,7 +13,7 @@ // limitations under the License. -package org.finos.legend.engine.language.snowflakeApp.deployment; +package org.finos.legend.engine.language.snowflakeApp.generator; import com.fasterxml.jackson.databind.ObjectMapper; import org.eclipse.collections.api.RichIterable; @@ -22,9 +22,7 @@ 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; -import org.finos.legend.engine.protocol.pure.v1.model.context.AlloySDLC; import org.finos.legend.engine.protocol.pure.v1.model.context.PureModelContextData; -import org.finos.legend.engine.protocol.pure.v1.model.context.SDLC; import org.finos.legend.engine.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; @@ -39,7 +37,7 @@ public class SnowflakeAppArtifactGenerationExtension implements ArtifactGenerati private static final ObjectMapper mapper = ObjectMapperFactory.getNewStandardObjectMapperWithPureProtocolExtensionSupports(); private static final Logger LOGGER = org.slf4j.LoggerFactory.getLogger(SnowflakeAppArtifactGenerationExtension.class); private static final String ROOT_PATH = "snowflakeApp"; - private static final String FILE_NAME = "snowflakeArtifact.json"; + private static final String FILE_NAME = "snowflakeAppArtifact.json"; @Override public String getKey() @@ -50,8 +48,7 @@ public String getKey() @Override public boolean canGenerate(PackageableElement element) { - return false; - // return element instanceof Root_meta_external_function_activator_snowflakeApp_SnowflakeApp; + return element instanceof Root_meta_external_function_activator_snowflakeApp_SnowflakeApp; } diff --git a/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-api/src/main/java/org/finos/legend/engine/language/snowflakeApp/deployment/SnowflakeAppContent.java b/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-generator/src/main/java/org/finos/legend/engine/language/snowflakeApp/generator/SnowflakeAppContent.java similarity index 91% rename from legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-api/src/main/java/org/finos/legend/engine/language/snowflakeApp/deployment/SnowflakeAppContent.java rename to legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-generator/src/main/java/org/finos/legend/engine/language/snowflakeApp/generator/SnowflakeAppContent.java index d8e69ee9437..3411b0e06b2 100644 --- a/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-api/src/main/java/org/finos/legend/engine/language/snowflakeApp/deployment/SnowflakeAppContent.java +++ b/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-generator/src/main/java/org/finos/legend/engine/language/snowflakeApp/generator/SnowflakeAppContent.java @@ -12,14 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.finos.legend.engine.language.snowflakeApp.deployment; +package org.finos.legend.engine.language.snowflakeApp.generator; -import org.eclipse.collections.api.RichIterable; 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.pure.v1.model.context.AlloySDLC; -import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.store.relational.model.Database; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-api/src/main/java/org/finos/legend/engine/language/snowflakeApp/deployment/SnowflakeAppDeploymentConfiguration.java b/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-generator/src/main/java/org/finos/legend/engine/language/snowflakeApp/generator/SnowflakeAppDeploymentConfiguration.java similarity index 90% rename from legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-api/src/main/java/org/finos/legend/engine/language/snowflakeApp/deployment/SnowflakeAppDeploymentConfiguration.java rename to legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-generator/src/main/java/org/finos/legend/engine/language/snowflakeApp/generator/SnowflakeAppDeploymentConfiguration.java index 29e823eee5b..871fbeef7be 100644 --- a/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-api/src/main/java/org/finos/legend/engine/language/snowflakeApp/deployment/SnowflakeAppDeploymentConfiguration.java +++ b/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-generator/src/main/java/org/finos/legend/engine/language/snowflakeApp/generator/SnowflakeAppDeploymentConfiguration.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.snowflakeApp.deployment; +package org.finos.legend.engine.language.snowflakeApp.generator; import org.finos.legend.engine.functionActivator.deployment.FunctionActivatorDeploymentConfiguration; import org.finos.legend.engine.protocol.pure.v1.model.packageableElement.store.relational.connection.RelationalDatabaseConnection; public class SnowflakeAppDeploymentConfiguration extends FunctionActivatorDeploymentConfiguration { - RelationalDatabaseConnection connection; + public RelationalDatabaseConnection connection; public SnowflakeAppDeploymentConfiguration(RelationalDatabaseConnection connection) { diff --git a/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-api/src/main/java/org/finos/legend/engine/language/snowflakeApp/deployment/SnowflakeAppGenerator.java b/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-generator/src/main/java/org/finos/legend/engine/language/snowflakeApp/generator/SnowflakeAppGenerator.java similarity index 94% rename from legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-api/src/main/java/org/finos/legend/engine/language/snowflakeApp/deployment/SnowflakeAppGenerator.java rename to legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-generator/src/main/java/org/finos/legend/engine/language/snowflakeApp/generator/SnowflakeAppGenerator.java index 7c5ecce3fbe..506c28d28df 100644 --- a/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-api/src/main/java/org/finos/legend/engine/language/snowflakeApp/deployment/SnowflakeAppGenerator.java +++ b/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-generator/src/main/java/org/finos/legend/engine/language/snowflakeApp/generator/SnowflakeAppGenerator.java @@ -13,7 +13,7 @@ // limitations under the License. -package org.finos.legend.engine.language.snowflakeApp.deployment; +package org.finos.legend.engine.language.snowflakeApp.generator; import org.eclipse.collections.api.RichIterable; import org.eclipse.collections.api.block.function.Function; @@ -31,7 +31,6 @@ 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.metamodel.SnowflakeApp; -import org.finos.legend.engine.protocol.snowflakeApp.metamodel.SnowflakeAppDeploymentConfiguration; 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; @@ -61,8 +60,8 @@ public static SnowflakeAppArtifact generateArtifact(PureModel pureModel, Root_me .select(c -> c.getPath().equals(platform_pure_basics_meta_elementToPath.Root_meta_pure_functions_meta_elementToPath_PackageableElement_1__String_1_(activator, pureModel.getExecutionSupport()))) .getFirst(); connection = (RelationalDatabaseConnection) Lists.mutable.withAll(((PureModelContextData) inputModel).getElementsOfType(PackageableConnection.class)) - .select(c -> c.getPath().equals(((SnowflakeAppDeploymentConfiguration)protocolActivator.activationConfiguration).activationConnection.connection)).getFirst().connectionValue; - return new SnowflakeAppArtifact(content, new org.finos.legend.engine.language.snowflakeApp.deployment.SnowflakeAppDeploymentConfiguration(connection)); + .select(c -> c.getPath().equals(((org.finos.legend.engine.protocol.snowflakeApp.metamodel.SnowflakeAppDeploymentConfiguration)protocolActivator.activationConfiguration).activationConnection.connection)).getFirst().connectionValue; + return new SnowflakeAppArtifact(content, new SnowflakeAppDeploymentConfiguration(connection)); } return new SnowflakeAppArtifact(content); diff --git a/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-generator/src/main/resources/META-INF/services/org.finos.legend.engine.language.pure.dsl.generation.extension.ArtifactGenerationExtension b/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-generator/src/main/resources/META-INF/services/org.finos.legend.engine.language.pure.dsl.generation.extension.ArtifactGenerationExtension new file mode 100644 index 00000000000..550ecc294b9 --- /dev/null +++ b/legend-engine-xts-snowflakeApp/legend-engine-xt-snowflakeApp-generator/src/main/resources/META-INF/services/org.finos.legend.engine.language.pure.dsl.generation.extension.ArtifactGenerationExtension @@ -0,0 +1 @@ +org.finos.legend.engine.language.snowflakeApp.generator.SnowflakeAppArtifactGenerationExtension diff --git a/legend-engine-xts-snowflakeApp/pom.xml b/legend-engine-xts-snowflakeApp/pom.xml index 92a05d2beb7..851ef2f7b8a 100644 --- a/legend-engine-xts-snowflakeApp/pom.xml +++ b/legend-engine-xts-snowflakeApp/pom.xml @@ -34,5 +34,6 @@ legend-engine-xt-snowflakeApp-grammar legend-engine-xt-snowflakeApp-protocol legend-engine-xt-snowflakeApp-pure + legend-engine-xt-snowflakeApp-generator \ No newline at end of file diff --git a/pom.xml b/pom.xml index 306e50fa853..06c01b3a95e 100644 --- a/pom.xml +++ b/pom.xml @@ -637,7 +637,11 @@ legend-engine-xt-snowflakeApp-api ${project.version} - + + org.finos.legend.engine + legend-engine-xt-snowflakeApp-generator + ${project.version} + org.finos.legend.engine legend-engine-xt-authentication-pure