connman: minor fixes

finos · Nov 15, 2023 · 4522f34 · 4522f34
1 parent 1012c23
commit 4522f34
Show file tree

Hide file tree

Showing 10 changed files with 175 additions and 14 deletions.
diff --git a/docs/connection/new-connection-framework-metamodel.png b/docs/connection/new-connection-framework-metamodel.png
diff --git a/docs/connection/new-connection-framework.md b/docs/connection/new-connection-framework.md
diff --git a/...-tests/src/test/java/org/finos/legend/engine/connection/test/TestSnowflakeConnection.java b/...-tests/src/test/java/org/finos/legend/engine/connection/test/TestSnowflakeConnection.java
@@ -33,7 +33,7 @@
 
 public class TestSnowflakeConnection
 {
-    public static class WithKeyPair extends AbstractConnectionFactoryTest<java.sql.Connection>
+    public static class ForSnowflakeWithKeyPairFlow extends AbstractConnectionFactoryTest<java.sql.Connection>
     {
         private static final String CONNECTION_INTEGRATION_TEST__SNOWFLAKE_PK = "CONNECTION_INTEGRATION_TEST__SNOWFLAKE_PK";
         private static final String CONNECTION_INTEGRATION_TEST__SNOWFLAKE_PK_PASSPHRASE = "CONNECTION_INTEGRATION_TEST__SNOWFLAKE_PK_PASSPHRASE";

diff --git a/...g/finos/legend/engine/language/pure/compiler/toPureGraph/ConnectionCompilerExtension.java b/...g/finos/legend/engine/language/pure/compiler/toPureGraph/ConnectionCompilerExtension.java
@@ -41,6 +41,7 @@ public Iterable<? extends Processor<?>> getExtraProcessors()
                 Connection.class,
                 (element, context) ->
                 {
+                    // @HACKY: new-connection-framework
                     Root_meta_pure_metamodel_connection_Connection metamodel = new Root_meta_pure_metamodel_connection_Connection_Impl(element.name, null, context.pureModel.getClass("meta::pure::metamodel::connection::Connection"))._name(element.name);
                     connectionsIndex.put(context.pureModel.buildPackageString(element._package, element.name), metamodel);
                     metamodel._rawValue(element);

diff --git a/...in/java/org/finos/legend/engine/language/pure/grammar/from/ConnectionParseTreeWalker.java b/...in/java/org/finos/legend/engine/language/pure/grammar/from/ConnectionParseTreeWalker.java
@@ -57,7 +57,6 @@ private Connection visitElement(ConnectionParserGrammar.DatabaseConnectionElemen
                 text.append(fragment.getText());
             }
             String rawValueText = text.length() > 0 ? text.substring(0, text.length() - 2) : text.toString();
-            // prepare island grammar walker source information
             connection = PureProtocolObjectMapperFactory.getNewObjectMapper().readValue(rawValueText, Connection.class);
         }
         catch (Exception e)

diff --git a/.../org/finos/legend/engine/language/pure/grammar/to/ConnectionGrammarComposerExtension.java b/.../org/finos/legend/engine/language/pure/grammar/to/ConnectionGrammarComposerExtension.java
@@ -68,7 +68,7 @@ private static String renderElement(Connection element, PureGrammarComposerConte
         String value;
         try
         {
-            // This is very super hacky!
+            // @HACKY: new-connection-framework
             element.sourceInformation = null;
             ObjectMapper objectMapper = PureProtocolObjectMapperFactory.getNewObjectMapper();
             objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);

diff --git a/...-xt-connection-pure-metamodel/src/main/resources/core_connection_metamodel/metamodel.pure b/...-xt-connection-pure-metamodel/src/main/resources/core_connection_metamodel/metamodel.pure
@@ -14,5 +14,6 @@
 
 Class meta::pure::metamodel::connection::Connection extends PackageableElement
 {
+    // @HACKY: new-connection-framework
     rawValue: Any[1];
 }
diff --git a/legend-engine-xts-data-push/legend-engine-xt-data-push-server/pom.xml b/legend-engine-xts-data-push/legend-engine-xt-data-push-server/pom.xml
@@ -60,22 +60,22 @@
         </dependency>
         <dependency>
             <groupId>org.finos.legend.engine</groupId>
-            <artifactId>legend-engine-xt-relationalStore-protocol</artifactId>
+            <artifactId>legend-engine-language-pure-modelManager-sdlc</artifactId>
         </dependency>
         <dependency>
             <groupId>org.finos.legend.engine</groupId>
-            <artifactId>legend-engine-language-pure-modelManager-sdlc</artifactId>
+            <artifactId>legend-engine-protocol-pure</artifactId>
         </dependency>
         <dependency>
             <groupId>org.finos.legend.engine</groupId>
-            <artifactId>legend-engine-protocol-pure</artifactId>
+            <artifactId>legend-engine-xt-connection-protocol</artifactId>
         </dependency>
         <!-- ENGINE -->
 
         <!-- RUNTIME -->
         <dependency>
             <groupId>org.finos.legend.engine</groupId>
-            <artifactId>legend-engine-xt-connection-protocol</artifactId>
+            <artifactId>legend-engine-xt-relationalStore-protocol</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>

diff --git a/...engine-xt-data-push-server/src/main/java/org/finos/legend/engine/datapush/DataPusher.java b/...engine-xt-data-push-server/src/main/java/org/finos/legend/engine/datapush/DataPusher.java
@@ -14,10 +14,9 @@
 
 package org.finos.legend.engine.datapush;
 
-import org.finos.legend.connection.ConnectionFactory;
 import org.finos.legend.connection.Connection;
+import org.finos.legend.connection.ConnectionFactory;
 import org.finos.legend.engine.datapush.data.Data;
-import org.finos.legend.engine.protocol.pure.v1.packageableElement.connection.AuthenticationConfiguration;
 import org.finos.legend.engine.shared.core.identity.Identity;
 
 public abstract class DataPusher

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
@@ -134,11 +134,6 @@
             <groupId>org.finos.legend.engine</groupId>
             <artifactId>legend-engine-language-pure-dsl-generation</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.finos.legend.engine</groupId>
-            <artifactId>legend-engine-language-pure-dsl-generation</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>