CDM-22 switching to isEnabled() wrapper

Author: mieslep

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);
         }
 
@@ -192,14 +192,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 ?";