Merge branch 'issue/CDM-22' into issue/CDM-23

Author: mieslep

.github/workflows/docker-publish.yml

@@ -1,18 +1,6 @@
 name: Build and publish to docker repo
 
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - main
-    paths:
-      - 'src/**'
-      - 'pom.xml'
-      - 'Dockerfile'
-      - 'LICENSE.md'
-    tags:
-      - '*.*.*'
-      - '*.*.*-*'
+on: workflow_dispatch
 
 jobs:
   build_and_publish:
@@ -50,4 +38,4 @@ jobs:
           context: .
           push: true
           tags: ${{ steps.meta.outputs.tags }}
-          platforms: linux/amd64
+          platforms: linux/amd64

src/main/java/datastax/astra/migrate/cql/CqlHelper.java

@@ -66,7 +66,7 @@ public boolean initialize() {
         for (Featureset f : Featureset.values()) {
             if (f.toString().startsWith("TEST_")) continue; // Skip test features
             Feature feature = getFeature(f);
-            if (null!=feature && feature.isEnabled())
+            if (isFeatureEnabled(f))
                 feature.alterProperties(this.propertyHelper);
         }
 
@@ -211,14 +211,14 @@ private String cqlTargetInsert() {
                 }
             }
 
-            if (featureMap.get(Featureset.CONSTANT_COLUMNS).isEnabled()) {
+            if (isFeatureEnabled(Featureset.CONSTANT_COLUMNS)) {
                 insertBinds += "," + featureMap.get(Featureset.CONSTANT_COLUMNS).getAsString(ConstantColumns.Property.COLUMN_VALUES);
             }
 
             targetInsertQuery = "INSERT INTO " +
                     getTargetKeyspaceTable() +
                     " (" + propertyHelper.getAsString(KnownProperties.TARGET_COLUMN_NAMES) +
-                    ((featureMap.get(Featureset.CONSTANT_COLUMNS).isEnabled()) ? "," + featureMap.get(Featureset.CONSTANT_COLUMNS).getAsString(ConstantColumns.Property.COLUMN_NAMES) : "") +
+                    (isFeatureEnabled(Featureset.CONSTANT_COLUMNS) ? "," + featureMap.get(Featureset.CONSTANT_COLUMNS).getAsString(ConstantColumns.Property.COLUMN_NAMES) : "") +
                     ") VALUES (" + insertBinds + ")";
             if (null != getTtlCols() && !getTtlCols().isEmpty()) {
                 targetInsertQuery += " USING TTL ?";
@@ -536,4 +536,11 @@ private boolean isTargetPrimaryKeyColumn(String colName) {
     public Feature getFeature(Featureset featureEnum) {
         return featureMap.get(featureEnum);
     }
+
+    public Boolean isFeatureEnabled(Featureset featureEnum) {
+        if (!featureMap.containsKey(featureEnum)) {
+            return false;
+        }
+        return featureMap.get(featureEnum).isEnabled();
+    }
 }

src/test/java/datastax/astra/migrate/CqlHelperTest.java

@@ -1,15 +1,15 @@
 package datastax.astra.migrate;
 
 import datastax.astra.migrate.cql.CqlHelper;
+import datastax.astra.migrate.cql.features.Featureset;
 import datastax.astra.migrate.properties.KnownProperties;
 import datastax.astra.migrate.properties.PropertyHelper;
 import org.apache.spark.SparkConf;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertAll;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class CqlHelperTest {
 
@@ -54,4 +54,10 @@ public void smokeTest() {
         );
     }
 
+    @Test
+    public void featureHelper_disabledWhenNull() {
+        propertyHelper.initializeSparkConf(sparkConf);
+        cqlHelper.initialize();
+        assertFalse(cqlHelper.isFeatureEnabled(Featureset.TEST_UNIMPLEMENTED_FEATURE));
+    }
 }