Add Null Type Check

ollionorg · Feb 18, 2025 · 9817d72 · 9817d72
1 parent dc53894
commit 9817d72
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/...rc/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java b/...rc/main/java/com/google/cloud/teleport/v2/templates/dbutils/dml/CassandraTypeHandler.java
@@ -322,12 +322,16 @@ private static Object handleSpannerColumnType(
       String spannerType, String columnName, JSONObject valuesJson) {
     try {
       if (spannerType.contains("string")) {
-        return valuesJson.optString(columnName);
+        String value = valuesJson.optString(columnName);
+        return value.isEmpty() ? null : value;
       } else if (spannerType.contains("bytes")) {
         if (valuesJson.isNull(columnName)) {
           return null;
         }
         String hexEncodedString = valuesJson.optString(columnName);
+        if (hexEncodedString.isEmpty()) {
+          return null;
+        }
         return safeHandle(
             () -> {
               try {
@@ -360,10 +364,6 @@ private static Object handleSpannerColumnType(
   private static PreparedStatementValueObject<?> parseAndCastToCassandraType(
       String columnType, Object colValue) {
 
-    if (colValue == null) {
-      return PreparedStatementValueObject.create(columnType, NullClass.INSTANCE);
-    }
-
     if (columnType.startsWith("frozen<")) {
       return parseAndCastToCassandraType(extractInnerType(columnType), colValue);
     }