Fixed additional PR comments.

Author: pravinbhat

pom.xml

@@ -48,21 +48,7 @@
       <artifactId>spark-sql_${scala.main.version}</artifactId>
       <version>${spark.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.spark</groupId>
-      <artifactId>spark-hive_${scala.main.version}</artifactId>
-      <version>${spark.version}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>log4j</groupId>
-          <artifactId>apache-log4j-extras</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
+
     <dependency>
       <groupId>com.datastax.spark</groupId>
       <artifactId>spark-cassandra-connector_${scala.main.version}</artifactId>
@@ -74,11 +60,6 @@
       <version>3.1.15</version>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-api</artifactId>
-      <version>2.19.0</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-core</artifactId>

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

@@ -8,7 +8,7 @@
 import datastax.astra.migrate.schema.ColumnInfo;
 import datastax.astra.migrate.schema.TableInfo;
 import datastax.astra.migrate.schema.TypeInfo;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.spark.SparkConf;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -91,19 +91,19 @@ protected AbstractJobSession(CqlSession sourceSession, CqlSession astraSession,
         }
         String maxWriteTimeStampFilterStr =
                 Util.getSparkPropOr(sc, "spark.origin.maxWriteTimeStampFilter", "0");
-        if (null != maxWriteTimeStampFilterStr && maxWriteTimeStampFilterStr.trim().length() > 1) {
+        if (StringUtils.isNotBlank(maxWriteTimeStampFilterStr)) {
             maxWriteTimeStampFilter = Long.parseLong(maxWriteTimeStampFilterStr);
         }
 
         String customWriteTimeStr =
                 Util.getSparkPropOr(sc, "spark.target.writeTime.fixedValue", "0");
-        if (null != customWriteTimeStr && customWriteTimeStr.trim().length() > 0 && StringUtils.isNumeric(customWriteTimeStr.trim())) {
+        if (StringUtils.isNotBlank(customWriteTimeStr) && StringUtils.isNumeric(customWriteTimeStr.trim())) {
             customWriteTime = Long.parseLong(customWriteTimeStr);
         }
 
         String incrWriteTimeStr =
                 Util.getSparkPropOr(sc, "spark.target.writeTime.incrementBy", "0");
-        if (null != incrWriteTimeStr && incrWriteTimeStr.trim().length() > 0 && StringUtils.isNumeric(incrWriteTimeStr.trim())) {
+        if (StringUtils.isNotBlank(incrWriteTimeStr) && StringUtils.isNumeric(incrWriteTimeStr.trim())) {
             incrementWriteTime = Long.parseLong(incrWriteTimeStr);
         }
 

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

@@ -1,7 +1,7 @@
 package datastax.astra.migrate;
 
 import com.datastax.oss.driver.api.core.ConsistencyLevel;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.spark.SparkConf;
 
 import java.io.BufferedReader;