CDM-53 : fixing broken build, and incorporating review feedback

Author: mieslep

src/main/java/com/datastax/cdm/data/CqlData.java

@@ -69,7 +69,7 @@ public static boolean isFrozen(DataType dataType) {
         if (dataType instanceof ListType) return ((ListType) dataType).isFrozen();
         if (dataType instanceof SetType) return ((SetType) dataType).isFrozen();
         if (dataType instanceof MapType) return ((MapType) dataType).isFrozen();
-        if (dataType instanceof TupleType) return dataType.asCql(true, false).contains("frozen<");
+        if (dataType instanceof TupleType) return dataType.asCql(true, false).toLowerCase().contains("frozen<");
         return false;
     }
 

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

@@ -31,23 +31,23 @@ public class WritetimeTTL extends AbstractFeature  {
 
     @Override
     public boolean loadProperties(IPropertyHelper propertyHelper) {
+        this.autoTTLNames = propertyHelper.getBoolean(KnownProperties.ORIGIN_TTL_AUTO);
         this.ttlNames = getTTLNames(propertyHelper);
         if (null!=this.ttlNames && !this.ttlNames.isEmpty()) {
             logger.info("PARAM -- TTLCols: {}", ttlNames);
+            this.autoTTLNames = false;
         }
 
-        this.autoTTLNames = propertyHelper.getBoolean(KnownProperties.ORIGIN_TTL_AUTO);
+        this.autoWritetimeNames = propertyHelper.getBoolean(KnownProperties.ORIGIN_WRITETIME_AUTO);
         this.writetimeNames = getWritetimeNames(propertyHelper);
         if (null!=this.writetimeNames && !this.writetimeNames.isEmpty()) {
             logger.info("PARAM -- WriteTimestampCols: {}", writetimeNames);
-            this.autoTTLNames = false;
+            this.autoWritetimeNames = false;
         }
 
-        this.autoWritetimeNames = propertyHelper.getBoolean(KnownProperties.ORIGIN_WRITETIME_AUTO);
         this.customWritetime = getCustomWritetime(propertyHelper);
         if (this.customWritetime > 0) {
             logger.info("PARAM -- {}: {} datetime is {} ", KnownProperties.TRANSFORM_CUSTOM_WRITETIME, customWritetime, Instant.ofEpochMilli(customWritetime / 1000));
-            this.autoWritetimeNames = false;
         }
 
         this.writetimeIncrement = propertyHelper.getLong(KnownProperties.TRANSFORM_CUSTOM_WRITETIME_INCREMENT);
@@ -115,10 +115,12 @@ public boolean initializeAndValidate(CqlTable originTable, CqlTable targetTable)
 
         if (autoTTLNames) {
             this.ttlNames = originTable.getWritetimeTTLColumns();
+            logger.info("PARAM -- Automatic TTLCols: {}", ttlNames);
         }
 
         if (autoWritetimeNames) {
             this.writetimeNames = originTable.getWritetimeTTLColumns();
+            logger.info("PARAM -- Automatic WriteTimestampCols: {}", writetimeNames);
         }
 
         validateTTLColumns(originTable);