Two bugs identified during transfer runs

src/main/java/io/cdap/plugin/salesforce/plugin/source/batch/MapToRecordTransformer.java

@@ -22,6 +22,7 @@
 import io.cdap.plugin.salesforce.SalesforceSchemaUtil;
 import io.cdap.plugin.salesforce.SalesforceTransformUtil;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -78,7 +79,11 @@ private Object convertValue(String fieldName, Object value, Schema fieldSchema)
       case BOOLEAN:
         return Boolean.parseBoolean(castValue(value, fieldName, String.class));
       case INT:
-        return Integer.parseInt(castValue(value, fieldName, String.class));
+        // 'Number' field in 'Site' sObject is defined as INT in schema,
+        // however, the actual data is received as a Decimal (e.g., 0.0)
+        // Wrapping as BigDecimal to safely extract the int value and avoid cast exceptions.
+        String data = castValue(value, fieldName, String.class);
+        return new BigDecimal(data).intValue();
       case LONG:
         return Long.parseLong(castValue(value, fieldName, String.class));
       case FLOAT:

src/main/java/io/cdap/plugin/salesforce/plugin/source/batch/SoapRecordToMapTransformer.java

@@ -23,6 +23,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
@@ -53,6 +54,9 @@ public class SoapRecordToMapTransformer {
       Iterable<XmlObject> subValues = () -> child.getChildren(SUB_QUERY_FIELDS_PARENT);
 
       List<Map<String, String>> subQueryValues = StreamSupport.stream(subValues.spliterator(), false)
+          // Since null XmlObject instances were encountered in the customer transfer runs, a
+          // validation check is now applied to exclude them during processing.
+          .filter(Objects::nonNull)
         .map(subValue -> transformRowToMap(subValue, childSObjectDescriptor))
         .collect(Collectors.toList());
       result.put(childSObjectDescriptor.getName(), subQueryValues);

src/test/java/io/cdap/plugin/salesforce/plugin/source/batch/SalesforceBulkRecordReaderTest.java

@@ -562,4 +562,46 @@ public void testCaseSenstiveMultipleResults() throws Exception {
     assertRecordReaderOutputRecords(new String[] {csvString1, csvString2}, schema, expectedRecords);
   }
 
+  @Test
+  public void testCaseIntTypeWithDecimalDataInResults() throws Exception {
+    String csvString1 = "\"Id\",\"IsDeleted\",\"ExpectedRevenue\",\"TotalRevenue\"\n" +
+      "\"0061i000003XNcBAAW\",\"false\",\"1500.0\",\"1234.56\"\n";
+    String csvString2 = "\"Id\",\"IsDeleted\",\"ExpectedRevenue\",\"TotalRevenue\"\n" +
+      "\"0061i000003XNcCAAW\",\"false\",\"112500.0\",\"1234.56\"\n" +
+      "\"0061i000003XNcDAAW\",\"false\",\"220000.0\",\"1234.56\"\n";
+
+    Schema schema = Schema.recordOf("output",
+                                    Schema.Field.of("id", Schema.of(Schema.Type.STRING)),
+                                    Schema.Field.of("isDeleted", Schema.of(Schema.Type.BOOLEAN)),
+                                    Schema.Field.of("ExpectedRevenue", Schema.of(Schema.Type.INT)),
+                                    Schema.Field.of("TotalRevenue", Schema.of(Schema.Type.DOUBLE))
+    );
+
+    List<Map<String, Object>> expectedRecords = new ImmutableList.Builder<Map<String, Object>>()
+      .add(new ImmutableMap.Builder<String, Object>()
+             .put("id", "0061i000003XNcBAAW")
+             .put("isDeleted", false)
+             .put("ExpectedRevenue", 1500)
+             .put("TotalRevenue", 1234.56)
+             .build()
+      )
+      .add(new ImmutableMap.Builder<String, Object>()
+             .put("id", "0061i000003XNcCAAW")
+             .put("isDeleted", false)
+             .put("ExpectedRevenue", 112500)
+             .put("TotalRevenue", 1234.56)
+             .build()
+      )
+      .add(new ImmutableMap.Builder<String, Object>()
+             .put("id", "0061i000003XNcDAAW")
+             .put("isDeleted", false)
+             .put("ExpectedRevenue", 220000)
+             .put("TotalRevenue", 1234.56)
+             .build()
+      )
+      .build();
+
+    assertRecordReaderOutputRecords(new String[] {csvString1, csvString2}, schema, expectedRecords);
+  }
+
 }