Bug/cdm 65 (#158)

* CDM-65 formatting names within writetime and ttl
* CDM-66 writetime function no longer called when custom writetime is provided

---------

Co-authored-by: Phil Miesle <[email protected]>

Author: mieslep

src/main/java/com/datastax/cdm/feature/WritetimeTTL.java

@@ -213,7 +213,7 @@ private void validateTTLColumns(CqlTable originTable) {
                 }
             }
 
-            newColumnNames.add("TTL(" + ttlName + ")");
+            newColumnNames.add("TTL(" + CqlTable.formatName(ttlName) + ")");
             newColumnDataTypes.add(DataTypes.INT);
         }
 
@@ -225,7 +225,7 @@ private void validateTTLColumns(CqlTable originTable) {
     }
 
     private void validateWritetimeColumns(CqlTable originTable) {
-        if (writetimeNames == null || writetimeNames.isEmpty()) {
+        if (writetimeNames == null || writetimeNames.isEmpty() || customWritetime > 0) {
             return;
         }
 
@@ -245,7 +245,7 @@ private void validateWritetimeColumns(CqlTable originTable) {
                 }
             }
 
-            newColumnNames.add("WRITETIME(" + writetimeName + ")");
+            newColumnNames.add("WRITETIME(" + CqlTable.formatName(writetimeName) + ")");
             newColumnDataTypes.add(DataTypes.BIGINT);
         }
 

src/test/java/com/datastax/cdm/feature/TTLAndWritetimeTest.java

@@ -13,8 +13,7 @@
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 
 public class TTLAndWritetimeTest extends CommonMocks {
 
@@ -385,6 +384,7 @@ public void validateEmptyTTLColumn() {
 
     @Test
     public void validateInvalidCustomWritetimeColumn() {
+        when(propertyHelper.getLong(KnownProperties.TRANSFORM_CUSTOM_WRITETIME)).thenReturn(0L);
         when(propertyHelper.getStringList(KnownProperties.ORIGIN_WRITETIME_NAMES)).thenReturn(Collections.singletonList("invalid"));
         when(originTable.indexOf("invalid")).thenReturn(-1);
         assertAll(
@@ -462,4 +462,24 @@ public void testZeroIncrementWithUnfrozenList() {
         assertTrue(feature.isEnabled());
     }
 
+    @Test
+    public void customWriteTime_withAutoWritetime() {
+        when(propertyHelper.getLong(KnownProperties.TRANSFORM_CUSTOM_WRITETIME)).thenReturn(12345L);
+        when(propertyHelper.getStringList(KnownProperties.ORIGIN_WRITETIME_NAMES)).thenReturn(null);
+        when(propertyHelper.getBoolean(KnownProperties.ORIGIN_WRITETIME_AUTO)).thenReturn(true);
+        when(propertyHelper.getLong(KnownProperties.FILTER_WRITETS_MIN)).thenReturn(null);
+        when(propertyHelper.getLong(KnownProperties.FILTER_WRITETS_MAX)).thenReturn(null);
+        when(propertyHelper.getStringList(KnownProperties.ORIGIN_TTL_NAMES)).thenReturn(null);
+        when(propertyHelper.getBoolean(KnownProperties.ORIGIN_TTL_AUTO)).thenReturn(false);
+
+        feature.loadProperties(propertyHelper);
+        feature.initializeAndValidate(originTable, targetTable);
+
+        assertAll(
+                () -> assertFalse(feature.hasWriteTimestampFilter(), "hasWriteTimestampFilter"),
+                () -> assertTrue(feature.hasWritetimeColumns(), "hasWritetimeColumns")
+        );
+
+        verify(originTable, times(0)).extendColumns(any(),any());
+    }
 }