Revert "Yingjianw/aurora jdbc (#658)" (#674)

This reverts commit a021467.

Co-authored-by: Yingjian Wu <[email protected]>

Author: yingjianwu98

.github/workflows/nebula-pr-functional-aurora-tests.yml

@@ -42,11 +42,10 @@ jobs:
           - name=$(date +"%Y-%m-%d") && cat ./metacat-functional-tests/build/logs/metacat/catalina.$name.log
           - name=$(date +"%Y-%m-%d") && cat ./metacat-functional-tests/build/logs/metacat/localhost.$name.log
           - cat ./metacat-functional-tests/build/logs/metacat/spring.log
+
       # Add a step to upload the test report using version v4
       - name: Upload Test Report
-        if: always()
         uses: actions/upload-artifact@v4
         with:
           name: test-report-functional
-          path: |
-            **/build/reports/functionalTest
+          path: /home/runner/work/metacat/metacat/metacat-metadata/build/reports/functionalTest

.github/workflows/nebula-pr-functional-crdb-tests.yml

@@ -42,11 +42,3 @@ jobs:
           - name=$(date +"%Y-%m-%d") && cat ./metacat-functional-tests/build/logs/metacat/catalina.$name.log
           - name=$(date +"%Y-%m-%d") && cat ./metacat-functional-tests/build/logs/metacat/localhost.$name.log
           - cat ./metacat-functional-tests/build/logs/metacat/spring.log
-      # Add a step to upload the test report
-      - name: Upload Test Report
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: test-report
-          path: |
-            **/build/reports/tests/test

.github/workflows/nebula-pr-functional-tests.yml

@@ -657,12 +657,5 @@ public interface Config {
      * @return True if it should be.
      */
     boolean isDefinitionMetadataSelectForUpdateEnabled();
-
-    /**
-     * Whether aurora data source is enabled.
-     *
-     * @return True if it is.
-     */
-    boolean isAuroraDataSourceEnabled();
 }
 

.github/workflows/nebula-pull-request.yml

@@ -713,9 +713,4 @@ public ParentChildRelationshipProperties getParentChildRelationshipProperties()
     public boolean isDefinitionMetadataSelectForUpdateEnabled() {
         return this.metacatProperties.getUsermetadata().isDefinitionMetadataSelectForUpdateEnabled();
     }
-
-    @Override
-    public boolean isAuroraDataSourceEnabled() {
-        return this.metacatProperties.getService().isAuroraDataSourceEnabled();
-    }
 }

metacat-common-server/src/main/java/com/netflix/metacat/common/server/properties/Config.java

@@ -82,16 +82,4 @@ public MetacatProperties(final Environment env) {
         this.env = env;
         this.parentChildRelationshipProperties = new ParentChildRelationshipProperties(env);
     }
-
-    /**
-     * Constructor for MetacatProperties.
-     *
-     * @param env Spring Environment
-     * @param isAuroraEnabled isAuroraEnabled
-     */
-    public MetacatProperties(final Environment env, final boolean isAuroraEnabled) {
-        this.env = env;
-        this.parentChildRelationshipProperties = new ParentChildRelationshipProperties(env);
-        this.getService().setAuroraDataSourceEnabled(isAuroraEnabled);
-    }
 }

metacat-common-server/src/main/java/com/netflix/metacat/common/server/properties/DefaultConfigImpl.java

@@ -37,7 +37,6 @@ public class ServiceProperties {
     private Tables tables = new Tables();
     private boolean listTableNamesByDefaultOnGetDatabase = true;
     private boolean listDatabaseNameByDefaultOnGetCatalog = true;
-    private boolean auroraDataSourceEnabled;
     private int listTableEntitiesPageSize = 1000;
     private int listTableNamesPageSize = 10000;
     private int listDatabaseEntitiesPageSize = 1000;

metacat-common-server/src/main/java/com/netflix/metacat/common/server/properties/MetacatProperties.java

@@ -15,7 +15,7 @@ import spock.lang.Specification
  */
 class MetacatApplicationEventMulticasterSpec extends Specification {
     def registry = Mock(Registry)
-    def bus = new MetacatApplicationEventMulticaster(registry, new MetacatProperties(null))
+    def bus = new MetacatApplicationEventMulticaster(registry, new MetacatProperties())
     def event = Mock(ApplicationEvent)
 
     def testPost() {

metacat-common-server/src/main/java/com/netflix/metacat/common/server/properties/ServiceProperties.java

@@ -15,7 +15,7 @@ import spock.lang.Specification
  */
 class MetacatEventBusSpec extends Specification {
     def registry = Mock(Registry)
-    def eventMulticaster = Spy(MetacatApplicationEventMulticaster, constructorArgs:[registry, new MetacatProperties(null)])
+    def eventMulticaster = Spy(MetacatApplicationEventMulticaster, constructorArgs:[registry, new MetacatProperties()])
     def bus = new MetacatEventBus(eventMulticaster, new NoopRegistry())
     def event = Mock(ApplicationEvent)