From 9cf6c8b403fd09edeb4b984c977b1f67116d14e1 Mon Sep 17 00:00:00 2001 From: Mohammed Ibrahim Date: Sun, 17 Mar 2024 17:13:12 -0400 Subject: [PATCH] Add missing Dependencies (#2703) * add serviceloader file * fix file path * Refactor ownership * Refactor ownership * Refactor ownership * Fix tests * Fix tests * uplift grammar * uplift grammar * fix tests * fix tests * fix tests * Add properties to result * Add properties to result * fix style * fix style * remove property * move property * Cleanup artifact generation * fix style * Fix dependencies * Cleanup grammar * Change artifact generation content * add quotes in transformer * fix parsing * add missing dependencies * fix extension tests * fix dependency * Add serviceloader file --- .../pom.xml | 20 +++++++++++++++++++ .../collection/generation/TestExtensions.java | 14 ++++++++++++- ...tion.extension.ArtifactGenerationExtension | 1 + .../pom.xml | 6 ++++++ 4 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/src/main/resources/META-INF/services/org.finos.legend.engine.language.pure.dsl.generation.extension.ArtifactGenerationExtension 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 2568252a51b..e10bff6e2cf 100644 --- a/legend-engine-config/legend-engine-extensions-collection-generation/pom.xml +++ b/legend-engine-config/legend-engine-extensions-collection-generation/pom.xml @@ -498,6 +498,26 @@ + + + org.finos.legend.engine + legend-engine-xt-hostedService-compiler + + + org.finos.legend.engine + legend-engine-xt-hostedService-grammar + + + org.finos.legend.engine + legend-engine-xt-hostedService-protocol + + + org.finos.legend.engine + legend-engine-xt-hostedService-generation + + + + org.finos.legend.engine 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 04e98636ba1..e8c1be13786 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 @@ -33,6 +33,10 @@ import org.finos.legend.engine.language.bigqueryFunction.grammar.to.BigQueryFunctionGrammarComposer; import org.finos.legend.engine.language.graphQL.grammar.integration.GraphQLGrammarParserExtension; import org.finos.legend.engine.language.graphQL.grammar.integration.GraphQLPureGrammarComposerExtension; +import org.finos.legend.engine.language.hostedService.compiler.toPureGraph.HostedServiceCompilerExtension; +import org.finos.legend.engine.language.hostedService.generation.deployment.HostedServiceArtifactGenerationExtension; +import org.finos.legend.engine.language.hostedService.grammar.from.HostedServiceGrammarParserExtension; +import org.finos.legend.engine.language.hostedService.grammar.to.HostedServiceGrammarComposer; import org.finos.legend.engine.language.pure.compiler.toPureGraph.PureModel; import org.finos.legend.engine.language.pure.compiler.toPureGraph.extension.CompilerExtension; import org.finos.legend.engine.language.pure.dsl.authentication.grammar.from.AuthenticationGrammarParserExtension; @@ -81,6 +85,8 @@ import org.finos.legend.engine.language.sql.grammar.integration.SQLPureGrammarComposerExtension; import org.finos.legend.engine.language.stores.elasticsearch.v7.from.ElasticsearchGrammarParserExtension; import org.finos.legend.engine.protocol.bigqueryFunction.metamodel.BigQueryFunctionProtocolExtension; +import org.finos.legend.engine.protocol.hostedService.metamodel.HostedServiceProtocolExtension; +import org.finos.legend.engine.shared.core.identity.Identity; import org.finos.legend.engine.shared.core.identity.factory.*; import org.finos.legend.pure.code.core.ElasticsearchLegendPureCoreExtension; import org.finos.legend.engine.language.stores.elasticsearch.v7.to.ElasticsearchGrammarComposerExtension; @@ -271,6 +277,7 @@ protected Iterable> getExpected .with(org.finos.legend.engine.protocol.pure.v1.CorePureProtocolExtension.class) .with(org.finos.legend.engine.protocol.pure.v1.DataSpaceProtocolExtension.class) .with(SnowflakeAppProtocolExtension.class) + .with(HostedServiceProtocolExtension.class) .with(BigQueryFunctionProtocolExtension.class) .with(org.finos.legend.engine.protocol.pure.v1.DiagramProtocolExtension.class) .with(org.finos.legend.engine.protocol.pure.v1.GenerationProtocolExtension.class) @@ -315,6 +322,7 @@ protected Iterable> getExp .with(CorePureGrammarParser.class) .with(DataSpaceParserExtension.class) .with(SnowflakeAppGrammarParserExtension.class) + .with(HostedServiceGrammarParserExtension.class) .with(BigQueryFunctionGrammarParserExtension.class) .with(DiagramParserExtension.class) .with(ExternalFormatGrammarParserExtension.class) @@ -342,6 +350,7 @@ protected Iterable> getE .with(CorePureGrammarComposer.class) .with(DataSpaceGrammarComposerExtension.class) .with(SnowflakeAppGrammarComposer.class) + .with(HostedServiceGrammarComposer.class) .with(BigQueryFunctionGrammarComposer.class) .with(DiagramGrammarComposerExtension.class) .with(ExternalFormatGrammarComposerExtension.class) @@ -374,6 +383,7 @@ protected Iterable> getExpectedComp return Lists.mutable.>empty() .with(org.finos.legend.engine.language.pure.compiler.toPureGraph.DiagramCompilerExtension.class) .with(SnowflakeAppCompilerExtension.class) + .with(HostedServiceCompilerExtension.class) .with(BigQueryFunctionCompilerExtension.class) .with(org.finos.legend.engine.language.pure.compiler.toPureGraph.DataSpaceCompilerExtension.class) .with(org.finos.legend.engine.language.pure.compiler.toPureGraph.TextCompilerExtension.class) @@ -461,7 +471,8 @@ protected Iterable> getEx .with(DataSpaceAnalyticsArtifactGenerationExtension.class) .with(SearchDocumentArtifactGenerationExtension.class) .with(OpenApiArtifactGenerationExtension.class) - .with(SnowflakeAppArtifactGenerationExtension.class); + .with(SnowflakeAppArtifactGenerationExtension.class) + .with(HostedServiceArtifactGenerationExtension.class); } protected Iterable> getExpectedEntitlementServiceExtensions() @@ -526,6 +537,7 @@ protected Iterable getExpectedCodeRepositories() .with("core_authentication") .with("core_snowflakeapp") .with("core_bigqueryfunction") + .with("core_hostedservice") .with("core_text_metamodel") .with("core_external_language_java") .with("core_java_platform_binding") diff --git a/legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/src/main/resources/META-INF/services/org.finos.legend.engine.language.pure.dsl.generation.extension.ArtifactGenerationExtension b/legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/src/main/resources/META-INF/services/org.finos.legend.engine.language.pure.dsl.generation.extension.ArtifactGenerationExtension new file mode 100644 index 00000000000..17e98b9ec4c --- /dev/null +++ b/legend-engine-xts-hostedService/legend-engine-xt-hostedService-generation/src/main/resources/META-INF/services/org.finos.legend.engine.language.pure.dsl.generation.extension.ArtifactGenerationExtension @@ -0,0 +1 @@ +org.finos.legend.engine.language.hostedService.generation.deployment.HostedServiceArtifactGenerationExtension \ No newline at end of file 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 01fd9ce6a38..2c4e2b14e28 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 @@ -39,6 +39,12 @@ org.finos.legend.engine legend-engine-xt-analytics-lineage-api + + + log4j + log4j + + org.finos.legend.engine