Skip to content

Commit 0bcbca2

Browse files
author
Mithilesh Pawar
authored
* Updated exec-maven-plugin from 1.2.1 to 3.0.0 (#70)
* * Updated exec-maven-plugin from 1.2.1 to 3.0.0 * Updated jackson-databind from 2.11.4 to 2.13.1 * Changed the name of the AST project for tests. * Resolved sonar violations * Imports organized.
1 parent e10b2b6 commit 0bcbca2

File tree

19 files changed

+132
-151
lines changed

19 files changed

+132
-151
lines changed

‎pom.xml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,7 @@
3333
<dependency>
3434
<groupId>com.fasterxml.jackson.core</groupId>
3535
<artifactId>jackson-databind</artifactId>
36-
<version>2.11.4</version>
37-
</dependency>
38-
<dependency>
39-
<groupId>info.cukes</groupId>
40-
<artifactId>cucumber-junit</artifactId>
41-
<version>1.2.6</version>
42-
<scope>test</scope>
36+
<version>2.13.1</version>
4337
</dependency>
4438
<dependency>
4539
<groupId>org.projectlombok</groupId>
@@ -74,7 +68,7 @@
7468
<plugin>
7569
<groupId>org.codehaus.mojo</groupId>
7670
<artifactId>exec-maven-plugin</artifactId>
77-
<version>1.2.1</version>
71+
<version>3.0.0</version>
7872
<executions>
7973
<execution>
8074
<goals>

‎src/main/java/com/checkmarx/ast/predicate/Predicate.java‎

Lines changed: 31 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
55
import com.fasterxml.jackson.annotation.JsonInclude;
66
import com.fasterxml.jackson.annotation.JsonProperty;
7-
import com.fasterxml.jackson.core.JsonParser;
8-
import com.fasterxml.jackson.core.JsonProcessingException;
97
import com.fasterxml.jackson.databind.JavaType;
108
import com.fasterxml.jackson.databind.ObjectMapper;
119
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@@ -22,31 +20,31 @@
2220
@JsonIgnoreProperties(ignoreUnknown = true)
2321
public class Predicate {
2422

25-
String ID;
26-
String SimilarityID;
27-
String ProjectID;
28-
String State;
29-
String Severity;
30-
String Comment;
31-
String CreatedBy;
32-
String CreatedAt;
33-
String UpdatedAt;
23+
String id;
24+
String similarityId;
25+
String projectId;
26+
String state;
27+
String severity;
28+
String comment;
29+
String createdBy;
30+
String createdAt;
31+
String updatedAt;
3432

3533
@JsonCreator
36-
public Predicate(@JsonProperty("ID") String id, @JsonProperty("SimilarityID") String similarityID,
37-
@JsonProperty("ProjectID") String projectID, @JsonProperty("State") String state,
34+
public Predicate(@JsonProperty("ID") String id, @JsonProperty("SimilarityID") String similarityId,
35+
@JsonProperty("ProjectID") String projectId, @JsonProperty("State") String state,
3836
@JsonProperty("Severity") String severity, @JsonProperty("Comment") String comment,
39-
@JsonProperty("CreatedBy") String createdBy, @JsonProperty("CreatedAt") String CreatedAt,
40-
@JsonProperty("UpdatedAt") String UpdatedAt) {
41-
this.ID = id;
42-
this.SimilarityID = similarityID;
43-
this.ProjectID = projectID;
44-
this.State = state;
45-
this.Severity = severity;
46-
this.Comment = comment;
47-
this.CreatedBy = createdBy;
48-
this.CreatedAt = CreatedAt;
49-
this.UpdatedAt = UpdatedAt;
37+
@JsonProperty("CreatedBy") String createdBy, @JsonProperty("CreatedAt") String createdAt,
38+
@JsonProperty("UpdatedAt") String updatedAt) {
39+
this.id = id;
40+
this.similarityId = similarityId;
41+
this.projectId = projectId;
42+
this.state = state;
43+
this.severity = severity;
44+
this.comment = comment;
45+
this.createdBy = createdBy;
46+
this.createdAt = createdAt;
47+
this.updatedAt = updatedAt;
5048
}
5149

5250
public static <T> T fromLine(String line) {
@@ -59,27 +57,25 @@ public static <T> List<T> listFromLine(String line) {
5957

6058
protected static <T> T parse(String line, JavaType type) {
6159
T result = null;
62-
if (!StringUtils.isBlank(line) && isValidJSON(line)) {
63-
try {
60+
try {
61+
if (!StringUtils.isBlank(line) && isValidJSON(line)) {
6462
result = new ObjectMapper().readValue(line, type);
65-
} catch (JsonProcessingException ignored) {
6663

6764
}
65+
} catch (IOException e) {
66+
e.printStackTrace();
6867
}
6968
return result;
7069
}
7170

7271
private static boolean isValidJSON(final String json) {
73-
boolean valid = false;
7472
try {
75-
final JsonParser parser = new ObjectMapper().createParser(json);
76-
//noinspection StatementWithEmptyBody
77-
while (parser.nextToken() != null) {
78-
}
79-
valid = true;
80-
} catch (IOException ignored) {
73+
final ObjectMapper mapper = new ObjectMapper();
74+
mapper.readTree(json);
75+
return true;
76+
} catch (IOException e) {
77+
return false;
8178
}
82-
return valid;
8379
}
8480

8581
}

‎src/main/java/com/checkmarx/ast/project/Project.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,19 @@
2020
@JsonIgnoreProperties(ignoreUnknown = true)
2121
public class Project extends CxBaseObject {
2222

23-
String Name;
24-
List<String> Groups;
23+
String name;
24+
List<String> groups;
2525

2626
@JsonCreator
27-
public Project(@JsonProperty("ID") String ID,
28-
@JsonProperty("Name") String Name,
29-
@JsonProperty("CreatedAt") String CreatedAt,
30-
@JsonProperty("UpdatedAt") String UpdatedAt,
31-
@JsonProperty("Tags") Map<String, String> Tags,
32-
@JsonProperty("Groups") List<String> Groups) {
33-
super(ID, CreatedAt, UpdatedAt, Tags);
34-
this.Name = Name;
35-
this.Groups = Groups;
27+
public Project(@JsonProperty("ID") String id,
28+
@JsonProperty("Name") String name,
29+
@JsonProperty("CreatedAt") String createdAt,
30+
@JsonProperty("UpdatedAt") String updatedAt,
31+
@JsonProperty("Tags") Map<String, String> tags,
32+
@JsonProperty("Groups") List<String> groups) {
33+
super(id, createdAt, updatedAt, tags);
34+
this.name = name;
35+
this.groups = groups;
3636
}
3737

3838
public static <T> T fromLine(String line) {

‎src/main/java/com/checkmarx/ast/results/result/Comments.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.fasterxml.jackson.annotation.JsonInclude;
55
import com.fasterxml.jackson.annotation.JsonProperty;
66
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
7-
import lombok.*;
7+
import lombok.Value;
88

99
@Value
1010
@JsonDeserialize()

‎src/main/java/com/checkmarx/ast/results/result/Data.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.fasterxml.jackson.annotation.JsonInclude;
55
import com.fasterxml.jackson.annotation.JsonProperty;
66
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
7-
import lombok.*;
7+
import lombok.Value;
88

99
import java.util.List;
1010

‎src/main/java/com/checkmarx/ast/results/result/Node.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.fasterxml.jackson.annotation.JsonInclude;
55
import com.fasterxml.jackson.annotation.JsonProperty;
66
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
7-
import lombok.*;
7+
import lombok.Value;
88

99
@Value
1010
@JsonDeserialize()

‎src/main/java/com/checkmarx/ast/results/result/PackageData.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.fasterxml.jackson.annotation.JsonInclude;
55
import com.fasterxml.jackson.annotation.JsonProperty;
66
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
7-
import lombok.*;
7+
import lombok.Value;
88

99
@Value
1010
@JsonDeserialize()

‎src/main/java/com/checkmarx/ast/scan/Scan.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,24 @@
2222
@JsonIgnoreProperties(ignoreUnknown = true)
2323
public class Scan extends CxBaseObject {
2424

25-
String ProjectID;
26-
String Status;
27-
String Initiator;
28-
String Origin;
29-
String Branch;
25+
String projectId;
26+
String status;
27+
String initiator;
28+
String origin;
29+
String branch;
3030

3131
@JsonCreator
32-
public Scan(@JsonProperty("ID") String ID, @JsonProperty("ProjectID") String ProjectID,
33-
@JsonProperty("Status") String Status, @JsonProperty("CreatedAt") String CreatedAt,
34-
@JsonProperty("UpdatedAt") String UpdatedAt, @JsonProperty("Tags") Map<String, String> Tags,
35-
@JsonProperty("Initiator") String Initiator, @JsonProperty("Origin") String Origin,
36-
@JsonProperty("Branch") String Branch) {
37-
super(ID, CreatedAt, UpdatedAt, Tags);
38-
this.ProjectID = ProjectID;
39-
this.Status = Status;
40-
this.Initiator = Initiator;
41-
this.Origin = Origin;
42-
this.Branch = Branch;
32+
public Scan(@JsonProperty("ID") String id, @JsonProperty("ProjectID") String projectId,
33+
@JsonProperty("Status") String status, @JsonProperty("CreatedAt") String createdAt,
34+
@JsonProperty("UpdatedAt") String updatedAt, @JsonProperty("Tags") Map<String, String> tags,
35+
@JsonProperty("Initiator") String initiator, @JsonProperty("Origin") String origin,
36+
@JsonProperty("Branch") String branch) {
37+
super(id, createdAt, updatedAt, tags);
38+
this.projectId = projectId;
39+
this.status = status;
40+
this.initiator = initiator;
41+
this.origin = origin;
42+
this.branch = branch;
4343
}
4444

4545
public static <T> T fromLine(String line) {

‎src/main/java/com/checkmarx/ast/wrapper/CxBaseObject.java‎

Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
55
import com.fasterxml.jackson.annotation.JsonInclude;
66
import com.fasterxml.jackson.annotation.JsonProperty;
7-
import com.fasterxml.jackson.core.JsonParser;
87
import com.fasterxml.jackson.core.JsonProcessingException;
98
import com.fasterxml.jackson.databind.JavaType;
109
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -20,44 +19,41 @@
2019
@JsonInclude(JsonInclude.Include.NON_NULL)
2120
@JsonIgnoreProperties(ignoreUnknown = true)
2221
public abstract class CxBaseObject {
23-
String ID;
24-
String CreatedAt;
25-
String UpdatedAt;
26-
Map<String, String> Tags;
22+
String id;
23+
String createdAt;
24+
String updatedAt;
25+
Map<String, String> tags;
2726

2827
@JsonCreator
29-
public CxBaseObject(@JsonProperty("ID") String ID,
30-
@JsonProperty("CreatedAt") String createdAt,
31-
@JsonProperty("UpdatedAt") String updatedAt,
32-
@JsonProperty("Tags") Map<String, String> tags) {
33-
this.ID = ID;
34-
this.CreatedAt = createdAt;
35-
this.UpdatedAt = updatedAt;
36-
this.Tags = tags;
28+
protected CxBaseObject(@JsonProperty("ID") String id,
29+
@JsonProperty("CreatedAt") String createdAt,
30+
@JsonProperty("UpdatedAt") String updatedAt,
31+
@JsonProperty("Tags") Map<String, String> tags) {
32+
this.id = id;
33+
this.createdAt = createdAt;
34+
this.updatedAt = updatedAt;
35+
this.tags = tags;
3736
}
3837

3938
protected static <T> T parse(String line, JavaType type) {
4039
T result = null;
4140
if (!StringUtils.isBlank(line) && isValidJSON(line)) {
4241
try {
4342
result = new ObjectMapper().readValue(line, type);
44-
} catch (JsonProcessingException ignored) {
45-
43+
} catch (JsonProcessingException e) {
44+
e.printStackTrace();
4645
}
4746
}
4847
return result;
4948
}
5049

5150
private static boolean isValidJSON(final String json) {
52-
boolean valid = false;
5351
try {
54-
final JsonParser parser = new ObjectMapper().createParser(json);
55-
//noinspection StatementWithEmptyBody
56-
while (parser.nextToken() != null) {
57-
}
58-
valid = true;
59-
} catch (IOException ignored) {
52+
final ObjectMapper mapper = new ObjectMapper();
53+
mapper.readTree(json);
54+
return true;
55+
} catch (IOException e) {
56+
return false;
6057
}
61-
return valid;
6258
}
6359
}

‎src/main/java/com/checkmarx/ast/wrapper/CxConfig.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ public InvalidCLIConfigException(String message) {
8181

8282
@SuppressWarnings("ALL")
8383
public static class CxConfigBuilder {
84-
private List<String> additionalParameters;
8584

8685
public CxConfigBuilder additionalParameters(String additionalParameters) {
8786
this.additionalParameters = parseAdditionalParameters(additionalParameters);

0 commit comments

Comments
 (0)