Merge remote-tracking branch 'origin/issue/CDM-20' into issue/CDM-22a

Author: mieslep

src/main/java/datastax/astra/migrate/cql/features/AbstractFeature.java

@@ -59,47 +59,83 @@ public String getAsString(Enum<?> key) {
 
     @Override
     public String getString(Enum<?> key) {
-        return !isEnabled ? null : strings.get(key);
+        return !isEnabled ? null : getRawString(key);
+    }
+
+    protected String getRawString(Enum<?> key) {
+        return strings.get(key);
     }
 
     @Override
     public Boolean getBoolean(Enum<?> key) {
-        return !isEnabled ? null : booleans.get(key);
+        return !isEnabled ? null : getRawBoolean(key);
+    }
+
+    protected Boolean getRawBoolean(Enum<?> key) {
+        return booleans.get(key);
     }
 
     @Override
     public Number getNumber(Enum<?> key) {
-        return !isEnabled ? null : numbers.get(key);
+        return !isEnabled ? null : getRawNumber(key);
+    }
+
+    protected Number getRawNumber(Enum<?> key) {
+        return numbers.get(key);
     }
 
     @Override
     public Integer getInteger(Enum<?> key) {
-        return !isEnabled ? null : PropertyHelper.toInteger(numbers.get(key));
+        return !isEnabled ? null : getRawInteger(key);
+    }
+
+    protected Integer getRawInteger(Enum<?> key) {
+        return PropertyHelper.toInteger(getRawNumber(key));
     }
 
     @Override
     public MigrateDataType getMigrateDataType(Enum<?> key) {
-        return !isEnabled ? null : migrateDataTypes.get(key);
+        return !isEnabled ? null : getRawMigrateDataType(key);
+    }
+
+    protected MigrateDataType getRawMigrateDataType(Enum<?> key) {
+        return migrateDataTypes.get(key);
     }
 
     @Override
     public List<String> getStringList(Enum<?> key) {
-        return !isEnabled ? null : stringLists.get(key);
+        return !isEnabled ? null : getRawStringList(key);
+    }
+
+    protected List<String> getRawStringList(Enum<?> key) {
+        return stringLists.get(key);
     }
 
     @Override
     public List<Number> getNumberList(Enum<?> key) {
-        return !isEnabled ? null : numberLists.get(key);
+        return !isEnabled ? null : getRawNumberList(key);
+    }
+
+    protected List<Number> getRawNumberList(Enum<?> key) {
+        return numberLists.get(key);
     }
 
     @Override
     public List<Integer> getIntegerList(Enum<?> key) {
-        return !isEnabled ? null : PropertyHelper.toIntegerList(numberLists.get(key));
+        return !isEnabled ? null : getRawIntegerList(key);
+    }
+
+    protected List<Integer> getRawIntegerList(Enum<?> key) {
+        return PropertyHelper.toIntegerList(getRawNumberList(key));
     }
 
     @Override
     public List<MigrateDataType> getMigrateDataTypeList(Enum key) {
-        return !isEnabled ? null : migrateDataTypeLists.get(key);
+        return !isEnabled ? null : getRawMigrateDataTypeList(key);
+    }
+
+    protected List<MigrateDataType> getRawMigrateDataTypeList(Enum key) {
+        return migrateDataTypeLists.get(key);
     }
 
     protected void putString(Enum<?> key, String value) {

src/test/java/datastax/astra/migrate/cql/features/AbstractFeatureTest.java

@@ -150,7 +150,16 @@ public void valueSet_butDisabled() {
                 () -> assertEquals("", testFeature.getAsString(TestProperty.MIGRATE_DATA_TYPE)),
                 () -> assertEquals("", testFeature.getAsString(TestProperty.STRING_LIST)),
                 () -> assertEquals("", testFeature.getAsString(TestProperty.NUMBER_LIST)),
-                () -> assertEquals("", testFeature.getAsString(TestProperty.MIGRATE_DATA_TYPE_LIST))
+                () -> assertEquals("", testFeature.getAsString(TestProperty.MIGRATE_DATA_TYPE_LIST)),
+                () -> assertEquals("test", testFeature.getRawString(TestProperty.STRING)),
+                () -> assertEquals(Integer.MAX_VALUE, testFeature.getRawNumber(TestProperty.NUMBER)),
+                () -> assertEquals(Integer.MAX_VALUE, testFeature.getRawInteger(TestProperty.NUMBER)),
+                () -> assertTrue(testFeature.getRawBoolean(TestProperty.BOOLEAN)),
+                () -> assertEquals(new MigrateDataType("0"), testFeature.getRawMigrateDataType(TestProperty.MIGRATE_DATA_TYPE)),
+                () -> assertEquals(Arrays.asList("a","b","c"), testFeature.getRawStringList(TestProperty.STRING_LIST)),
+                () -> assertEquals(Arrays.asList(1,2,3), testFeature.getRawNumberList(TestProperty.NUMBER_LIST)),
+                () -> assertEquals(Arrays.asList(1,2,3), testFeature.getRawIntegerList(TestProperty.NUMBER_LIST)),
+                () -> assertEquals(Arrays.asList(new MigrateDataType("0"), new MigrateDataType("1"), new MigrateDataType("2")), testFeature.getRawMigrateDataTypeList(TestProperty.MIGRATE_DATA_TYPE_LIST))
         );
     }