Tidying up from various merges

Author: mieslep

SIT/test.sh

@@ -151,4 +151,3 @@ echo
 echo "=========================================================="
 echo " Phase ${PHASE} Complete"
 echo "=========================================================="
-

src/main/java/datastax/astra/migrate/AbstractJobSession.java

@@ -29,7 +29,8 @@ protected AbstractJobSession(CqlSession originSession, CqlSession targetSession,
         printStatsAfter = propertyHelper.getInteger(KnownProperties.SPARK_STATS_AFTER);
         if (!propertyHelper.meetsMinimum(KnownProperties.SPARK_STATS_AFTER, printStatsAfter, 1)) {
             logger.warn(KnownProperties.SPARK_STATS_AFTER +" must be greater than 0.  Setting to default value of " + KnownProperties.getDefaultAsString(KnownProperties.SPARK_STATS_AFTER));
-            propertyHelper.setProperty(KnownProperties.SPARK_STATS_AFTER, KnownProperties.getDefaultAsString(KnownProperties.SPARK_STATS_AFTER));
+            propertyHelper.setProperty(KnownProperties.SPARK_STATS_AFTER, KnownProperties.getDefault(KnownProperties.SPARK_STATS_AFTER));
+            printStatsAfter = propertyHelper.getInteger(KnownProperties.SPARK_STATS_AFTER);
         }
 
         readLimiter = RateLimiter.create(propertyHelper.getInteger(KnownProperties.SPARK_LIMIT_READ));

src/main/java/datastax/astra/migrate/CopyPKJobSession.java

@@ -21,8 +21,8 @@ public class CopyPKJobSession extends AbstractJobSession {
     protected AtomicLong missingCounter = new AtomicLong(0);
     protected AtomicLong writeCounter = new AtomicLong(0);
 
-    protected CopyPKJobSession(CqlSession originSessionSession, CqlSession targetSession, SparkConf sc) {
-        super(originSessionSession, targetSession, sc, true);
+    protected CopyPKJobSession(CqlSession originSession, CqlSession targetSession, SparkConf sc) {
+        super(originSession, targetSession, sc, true);
     }
 
     public static CopyPKJobSession getInstance(CqlSession originSession, CqlSession targetSession, SparkConf sc) {

src/main/java/datastax/astra/migrate/MigrateDataType.java

@@ -20,8 +20,6 @@ public class MigrateDataType {
     private static int minType = 0;
     private static int maxType = 19;
 
-    private static final List<Class> COLLECTION_TYPES = Arrays.asList(List.class, Set.class, Map.class);
-
     public MigrateDataType(String dataType) {
         dataTypeString = dataType;
         if (dataType.contains("%")) {
@@ -40,32 +38,6 @@ public MigrateDataType(String dataType) {
         }
         this.typeClass = getType(this.type);
 
-        if (this.type >= minType && this.type <= maxType) {
-            isValid = true;
-            for (Object o : subTypes) {
-                if (null == o || Object.class == o) {
-                    isValid = false;
-                }
-            }
-        }
-        else {
-            isValid = false;
-        }
-        this.typeClass = getType(this.type);
-
-        if (this.type >= minType && this.type <= maxType) {
-            isValid = true;
-            for (Object o : subTypes) {
-                if (null == o || Object.class == o) {
-                    isValid = false;
-                }
-            }
-        }
-        else {
-            isValid = false;
-        }
-        this.typeClass = getType(this.type);
-
         if (this.type >= minType && this.type <= maxType) {
             isValid = true;
             for (Object o : subTypes) {
@@ -148,10 +120,6 @@ private Class getType(int type) {
         return Object.class;
     }
 
-    public boolean isCollection() {
-        return COLLECTION_TYPES.contains(typeClass);
-    }
-
     public Class getType() {
         return this.typeClass;
     }