diff --git a/src/main/java/com/checkmarx/ast/scan/Scan.java b/src/main/java/com/checkmarx/ast/scan/Scan.java index 2f22f710..507610c4 100644 --- a/src/main/java/com/checkmarx/ast/scan/Scan.java +++ b/src/main/java/com/checkmarx/ast/scan/Scan.java @@ -29,7 +29,7 @@ public class Scan extends CxBaseObject { String branch; @JsonCreator - public Scan(@JsonProperty("ID") String id, @JsonProperty("ProjectID") String projectId, + public Scan(@JsonProperty(value = "ID", required = true) String id, @JsonProperty(value = "ProjectID", required = true) String projectId, @JsonProperty("Status") String status, @JsonProperty("CreatedAt") String createdAt, @JsonProperty("UpdatedAt") String updatedAt, @JsonProperty("Tags") Map tags, @JsonProperty("Initiator") String initiator, @JsonProperty("Origin") String origin, diff --git a/src/main/java/com/checkmarx/ast/wrapper/CxBaseObject.java b/src/main/java/com/checkmarx/ast/wrapper/CxBaseObject.java index f9911c14..c8ca10d8 100644 --- a/src/main/java/com/checkmarx/ast/wrapper/CxBaseObject.java +++ b/src/main/java/com/checkmarx/ast/wrapper/CxBaseObject.java @@ -6,8 +6,11 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JavaType; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.MapperFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.json.JsonMapper; import lombok.Data; import org.apache.commons.lang3.StringUtils; @@ -39,9 +42,12 @@ public static T parse(String line, JavaType type) { T result = null; if (!StringUtils.isBlank(line) && isValidJSON(line)) { try { - result = new ObjectMapper().readValue(line, type); + ObjectMapper mapper = JsonMapper.builder() + .configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true) + .build(); + result = mapper.readValue(line, type); } catch (JsonProcessingException e) { - e.printStackTrace(); + //e.printStackTrace(); } } return result; diff --git a/src/main/java/com/checkmarx/ast/wrapper/Execution.java b/src/main/java/com/checkmarx/ast/wrapper/Execution.java index 4ad8d782..08bab2be 100644 --- a/src/main/java/com/checkmarx/ast/wrapper/Execution.java +++ b/src/main/java/com/checkmarx/ast/wrapper/Execution.java @@ -49,9 +49,7 @@ static T executeCommand(List arguments, stringBuilder.append(line).append(LINE_SEPARATOR); T parsedLine = lineParser.apply(line); if (parsedLine != null) { - if (areAllFieldsNotNull(parsedLine)) { - executionResult = parsedLine; - } + executionResult = parsedLine; } } process.waitFor(); @@ -62,19 +60,6 @@ static T executeCommand(List arguments, } } - private static boolean areAllFieldsNotNull(Object obj) { - for (Field field : obj.getClass().getDeclaredFields()) { - field.setAccessible(true); - try { - if (field.get(obj) == null) { - return false; - } - } catch (IllegalAccessException e) { - return false; - } - } - return true; - } static String executeCommand(List arguments, Logger logger, String directory,