From b3837acf85350c15f169d932992b49593372fa3c Mon Sep 17 00:00:00 2001 From: Mauricio Uyaguari Date: Thu, 16 Nov 2023 22:43:35 -0500 Subject: [PATCH] Revert "add missing extensions in legend extension collections (#2458)" (#2465) This reverts commit 9cb59982b93d8be9d2f1d2cb3672a7f68f9a76f6. --- .../pom.xml | 18 -------- .../collection/generation/TestExtensions.java | 41 ++----------------- 2 files changed, 4 insertions(+), 55 deletions(-) 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 90aade14ad0..e702972ddc2 100644 --- a/legend-engine-config/legend-engine-extensions-collection-generation/pom.xml +++ b/legend-engine-config/legend-engine-extensions-collection-generation/pom.xml @@ -140,14 +140,6 @@ org.finos.legend.engine legend-engine-protocol-pure - - org.finos.legend.engine - legend-engine-testable - - - org.finos.legend.engine - legend-engine-configuration - org.finos.legend.engine @@ -170,11 +162,6 @@ org.finos.legend.engine legend-engine-external-shared-format-model - - org.finos.legend.engine - legend-engine-test-runner-mapping - runtime - @@ -419,11 +406,6 @@ org.finos.legend.engine legend-engine-language-pure-dsl-service-pure - - org.finos.legend.engine - legend-engine-test-runner-service - runtime - 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 5ef7a1d10e0..84d174859f4 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 @@ -83,13 +83,7 @@ import org.finos.legend.engine.language.sql.grammar.integration.SQLGrammarParserExtension; 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.plan.generation.extension.LegendPlanGeneratorExtension; -import org.finos.legend.engine.plan.generation.extension.PlanGeneratorExtension; import org.finos.legend.engine.protocol.bigqueryFunction.metamodel.BigQueryFunctionProtocolExtension; -import org.finos.legend.engine.testable.extension.TestableRunnerExtension; -import org.finos.legend.engine.testable.mapping.extension.MappingTestableRunnerExtension; -import org.finos.legend.engine.testable.persistence.extension.PersistenceTestableRunnerExtension; -import org.finos.legend.engine.testable.service.extension.ServiceTestableRunnerExtension; import org.finos.legend.pure.code.core.ElasticsearchPureCoreExtension; import org.finos.legend.engine.language.stores.elasticsearch.v7.to.ElasticsearchGrammarComposerExtension; import org.finos.legend.engine.protocol.pure.v1.extension.PureProtocolExtension; @@ -144,7 +138,7 @@ public void testExpectedCompilerExtensionsArePresent() @Test public void testPlanGeneratorExtensionArePresent() { - assertHasExtensions(getExpectedPureExtensions(), PureCoreExtension.class); + assertHasExtensions(getExpectedPlanGeneratorExtensions(), PureCoreExtension.class); } @Test @@ -171,18 +165,6 @@ public void testExpectedEntitlementServiceExtensionsArePresent() assertHasExtensions(EntitlementServiceExtensionLoader.extensions(), getExpectedEntitlementServiceExtensions(), EntitlementServiceExtension.class); } - @Test - public void testExpectedPlanGeneratorExtension() - { - assertHasExtensions(getExpectedPlanGeneratorExtensions(), PlanGeneratorExtension.class); - } - - @Test - public void testExpectedTestableRunnerExtension() - { - assertHasExtensions(getExpectedTestableExtensions(), TestableRunnerExtension.class); - } - @Test public void testCodeRepositories() { @@ -317,22 +299,6 @@ protected Iterable> getExpected ; } - protected Iterable> getExpectedTestableExtensions() - { - // DO NOT DELETE ITEMS FROM THIS LIST (except when replacing them with something equivalent) - return Lists.mutable.>empty() - .with(ServiceTestableRunnerExtension.class) - .with(MappingTestableRunnerExtension.class) - .with(PersistenceTestableRunnerExtension.class); - } - - protected Iterable> getExpectedPlanGeneratorExtensions() - { - return Lists.mutable.>empty() - .with(LegendPlanGeneratorExtension.class); - - } - protected Iterable> getExpectedGenerationExtensions() { // DO NOT DELETE ITEMS FROM THIS LIST (except when replacing them with something equivalent) @@ -443,7 +409,7 @@ protected Iterable> getExpectedComp ; } - protected Iterable> getExpectedPureExtensions() + protected Iterable> getExpectedPlanGeneratorExtensions() { // DO NOT DELETE ITEMS FROM THIS LIST (except when replacing them with something equivalent) return Lists.mutable.>empty() @@ -463,7 +429,8 @@ protected Iterable> getExpectedPure .with(XMLJavaBindingPureCoreExtension.class) .with(ServicePureCoreExtension.class) .with(RelationalJavaBindingPureCoreExtension.class) - .with(ArrowPureCoreExtension.class); + .with(ArrowPureCoreExtension.class) + ; } protected Iterable>> getExpectedExternalFormatExtensions()