Skip to content

Commit 1c0be92

Browse files
WeltraumschafWeltraumschaf
committed
Revert "#23 Use native types as model's field types"
This reverts commit 49ca35d. DefectDojo does not expect id properties in POST request, but instead of ignoring them it is required toset them to null. This is only possible with boxed types. Signed-off-by: Sven Strittmatter <[email protected]>
1 parent 2cafc75 commit 1c0be92

30 files changed

+433
-375
lines changed

‎src/main/java/io/securecodebox/persistence/defectdojo/model/Endpoint.java‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,17 @@
1717
@EqualsAndHashCode
1818
@JsonInclude(JsonInclude.Include.NON_NULL)
1919
public final class Endpoint implements Model, HasId {
20+
/**
21+
* Uniq id of model type
22+
* <p>
23+
* May be {@code null} for newly created objects because in DefectDojo's Open API specification i.
24+
* It is mandatory to use a boxed object type instead of a native type. A native type would result in 0 by
25+
* default which is a valid id for DefectDojo. Thus creating this type via POST request would try to create
26+
* one with id 0. Instead the id must be {@code null}, so that DefectDojo uses a newly generated uniq id.
27+
* </p>
28+
*/
2029
@JsonProperty
21-
private long id;
30+
private Long id;
2231

2332
@JsonProperty
2433
private String protocol;
@@ -30,7 +39,7 @@ public final class Endpoint implements Model, HasId {
3039
private String fullyQualifiedDomainName;
3140

3241
@JsonProperty
33-
private long port;
42+
private Long port;// FIXME: Use native type here.
3443

3544
@JsonProperty
3645
private String path;
@@ -42,10 +51,10 @@ public final class Endpoint implements Model, HasId {
4251
private String fragment;
4352

4453
@JsonProperty
45-
private long product;
54+
private Long product;// FIXME: Use native type here.
4655

4756
@JsonProperty
48-
private boolean mitigated;
57+
private Boolean mitigated;// FIXME: Use native type here.
4958

5059
@Override
5160
public boolean equalsQueryString(Map<String, Object> queryParams) {

‎src/main/java/io/securecodebox/persistence/defectdojo/model/Engagement.java‎

Lines changed: 27 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,27 @@
1919
@EqualsAndHashCode
2020
@JsonInclude(JsonInclude.Include.NON_NULL)
2121
public final class Engagement implements Model, HasId, HasName {
22-
@JsonProperty("branch_tag")
23-
@Builder.Default
24-
private String branch = "";
25-
22+
/**
23+
* Uniq id of model type
24+
* <p>
25+
* May be {@code null} for newly created objects because in DefectDojo's Open API specification i.
26+
* It is mandatory to use a boxed object type instead of a native type. A native type would result in 0 by
27+
* default which is a valid id for DefectDojo. Thus creating this type via POST request would try to create
28+
* one with id 0. Instead the id must be {@code null}, so that DefectDojo uses a newly generated uniq id.
29+
* </p>
30+
*/
2631
@JsonProperty
27-
private long id;
32+
private Long id;
2833

2934
@JsonProperty
3035
private String name;
3136

37+
@JsonProperty("branch_tag")
38+
@Builder.Default
39+
private String branch = "";
40+
3241
@JsonProperty
33-
private long product;
42+
private Long product;// FIXME: Use native type here.
3443

3544
@JsonProperty("target_start")
3645
private String targetStart;
@@ -39,7 +48,7 @@ public final class Engagement implements Model, HasId, HasName {
3948
private String targetEnd;
4049

4150
@JsonProperty
42-
private long lead;
51+
private Long lead;// FIXME: Use native type here.
4352

4453
@JsonProperty("engagement_type")
4554
@Builder.Default
@@ -66,13 +75,13 @@ public final class Engagement implements Model, HasId, HasName {
6675
private String repo;
6776

6877
@JsonProperty("build_server")
69-
private long buildServer;
78+
private Long buildServer; // FIXME: Use native type here.
7079

7180
@JsonProperty("source_code_management_server")
72-
private long scmServer;
81+
private Long scmServer; // FIXME: Use natvive type here.
7382

7483
@JsonProperty("orchestration_engine")
75-
private long orchestrationEngine;
84+
private Long orchestrationEngine; // FIXME: Use natvive type here.
7685

7786
@JsonProperty
7887
@Builder.Default
@@ -82,16 +91,20 @@ public final class Engagement implements Model, HasId, HasName {
8291
private boolean deduplicationOnEngagement;
8392

8493
@JsonProperty("threat_model")
85-
private boolean threatModel;
94+
@Builder.Default // FIXME: Use native type here.
95+
private Boolean threatModel = false;
8696

8797
@JsonProperty("api_test")
88-
private boolean apiTest;
98+
@Builder.Default // FIXME: Use native type here.
99+
private Boolean apiTest = false;
89100

90101
@JsonProperty("pen_test")
91-
private boolean penTest;
102+
@Builder.Default // FIXME: Use native type here.
103+
private Boolean penTest = false;
92104

93105
@JsonProperty("check_list")
94-
private boolean checkList;
106+
@Builder.Default // FIXME: Use native type here.
107+
private Boolean checkList = false;
95108

96109
@JsonProperty
97110
@Builder.Default

‎src/main/java/io/securecodebox/persistence/defectdojo/model/Finding.java‎

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,17 @@
2323
@EqualsAndHashCode
2424
@JsonInclude(JsonInclude.Include.NON_NULL)
2525
public final class Finding implements Model, HasId {
26+
/**
27+
* Uniq id of model type
28+
* <p>
29+
* May be {@code null} for newly created objects because in DefectDojo's Open API specification i.
30+
* It is mandatory to use a boxed object type instead of a native type. A native type would result in 0 by
31+
* default which is a valid id for DefectDojo. Thus creating this type via POST request would try to create
32+
* one with id 0. Instead the id must be {@code null}, so that DefectDojo uses a newly generated uniq id.
33+
* </p>
34+
*/
2635
@JsonProperty
27-
private long id;
36+
private Long id;
2837

2938
@JsonProperty
3039
@NonNull
@@ -44,7 +53,7 @@ public final class Finding implements Model, HasId {
4453

4554
@JsonProperty
4655
@NonNull
47-
private long test;
56+
private Long test;// FIXME: Use native type here.
4857

4958
@JsonProperty
5059
private String mitigation;
@@ -54,30 +63,37 @@ public final class Finding implements Model, HasId {
5463

5564
@JsonProperty
5665
@NonNull
57-
private boolean active;
66+
@Builder.Default
67+
private Boolean active = true;// FIXME: Use native type here.
5868

5969
@JsonProperty
6070
@NonNull
61-
private boolean verified;
71+
@Builder.Default
72+
private Boolean verified = true;// FIXME: Use native type here.
6273

6374
@JsonProperty("risk_accepted")
6475
@NonNull
65-
private boolean riskAccepted;
76+
@Builder.Default
77+
private Boolean riskAccepted = false;// FIXME: Use native type here.
6678

6779
@JsonProperty("out_of_scope")
6880
@NonNull
69-
private boolean outOfScope;
81+
@Builder.Default
82+
private Boolean outOfScope = false;// FIXME: Use native type here.
7083

7184
@JsonProperty
7285
@NonNull
73-
private boolean duplicate;
86+
@Builder.Default
87+
private Boolean duplicate = false;// FIXME: Use native type here.
7488

7589
@JsonProperty("duplicate_finding")
76-
private long duplicateFinding;
90+
@Builder.Default
91+
private Long duplicateFinding = null;// FIXME: Use native type here.
7792

7893
@JsonProperty("false_p")
7994
@NonNull
80-
private boolean falsePositive;
95+
@Builder.Default
96+
private Boolean falsePositive = false;// FIXME: Use native type here.
8197

8298
@JsonProperty("component_name")
8399
private String componentName;

‎src/main/java/io/securecodebox/persistence/defectdojo/model/Group.java‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,17 @@
1818
@EqualsAndHashCode
1919
@JsonInclude(JsonInclude.Include.NON_NULL)
2020
public final class Group implements Model, HasId, HasName {
21+
/**
22+
* Uniq id of model type
23+
* <p>
24+
* May be {@code null} for newly created objects because in DefectDojo's Open API specification i.
25+
* It is mandatory to use a boxed object type instead of a native type. A native type would result in 0 by
26+
* default which is a valid id for DefectDojo. Thus creating this type via POST request would try to create
27+
* one with id 0. Instead the id must be {@code null}, so that DefectDojo uses a newly generated uniq id.
28+
* </p>
29+
*/
2130
@JsonProperty
22-
private long id;
31+
private Long id;
2332

2433
@JsonProperty
2534
@NonNull

‎src/main/java/io/securecodebox/persistence/defectdojo/model/GroupMember.java‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,26 @@
1717
@EqualsAndHashCode
1818
@JsonInclude(JsonInclude.Include.NON_NULL)
1919
public final class GroupMember implements Model {
20+
/**
21+
* Uniq id of model type
22+
* <p>
23+
* May be {@code null} for newly created objects because in DefectDojo's Open API specification i.
24+
* It is mandatory to use a boxed object type instead of a native type. A native type would result in 0 by
25+
* default which is a valid id for DefectDojo. Thus creating this type via POST request would try to create
26+
* one with id 0. Instead the id must be {@code null}, so that DefectDojo uses a newly generated uniq id.
27+
* </p>
28+
*/
2029
@JsonProperty
21-
private long id;
30+
private Long id;
2231

2332
@JsonProperty
24-
private long group;
33+
private Long group;// FIXME: Use native type here.
2534

2635
@JsonProperty
27-
private long user;
36+
private Long user;// FIXME: Use native type here.
2837

2938
@JsonProperty
30-
private long role;
39+
private Long role;// FIXME: Use native type here.
3140

3241
@Override
3342
public boolean equalsQueryString(Map<String, Object> queryParams) {

‎src/main/java/io/securecodebox/persistence/defectdojo/model/HasId.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* </p>
1313
*/
1414
interface HasId {
15-
long getId();
15+
Long getId();
1616

17-
void setId(long id);
17+
void setId(Long id);
1818
}

‎src/main/java/io/securecodebox/persistence/defectdojo/model/Product.java‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,17 @@
1919
@EqualsAndHashCode
2020
@JsonInclude(JsonInclude.Include.NON_NULL)
2121
public final class Product implements Model, HasId, HasName {
22+
/**
23+
* Uniq id of model type
24+
* <p>
25+
* May be {@code null} for newly created objects because in DefectDojo's Open API specification i.
26+
* It is mandatory to use a boxed object type instead of a native type. A native type would result in 0 by
27+
* default which is a valid id for DefectDojo. Thus creating this type via POST request would try to create
28+
* one with id 0. Instead the id must be {@code null}, so that DefectDojo uses a newly generated uniq id.
29+
* </p>
30+
*/
2231
@JsonProperty
23-
private long id;
32+
private Long id;
2433

2534
@JsonProperty
2635
private String name;
@@ -32,19 +41,19 @@ public final class Product implements Model, HasId, HasName {
3241
private String description;
3342

3443
@JsonProperty("findings_count")
35-
private long findingsCount;
44+
private Long findingsCount;// FIXME: Use native type here.
3645

3746
@JsonProperty("authorized_users")
3847
private List<String> authorizedUsers;
3948

4049
@JsonProperty("prod_type")
41-
private long productType;
42-
50+
private Long productType;// FIXME: Use native type here.
51+
4352
@JsonProperty("enable_simple_risk_acceptance")
44-
private boolean enableSimpleRiskAcceptance;
45-
53+
private Boolean enableSimpleRiskAcceptance;// FIXME: Use native type here.
54+
4655
@JsonProperty("enable_full_risk_acceptance")
47-
private boolean enableFullRiskAcceptance;
56+
private Boolean enableFullRiskAcceptance;// FIXME: Use native type here.
4857

4958
@JsonProperty("authorization_groups")
5059
@Builder.Default

‎src/main/java/io/securecodebox/persistence/defectdojo/model/ProductGroup.java‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,26 @@
1717
@EqualsAndHashCode
1818
@JsonInclude(JsonInclude.Include.NON_NULL)
1919
public final class ProductGroup implements Model {
20+
/**
21+
* Uniq id of model type
22+
* <p>
23+
* May be {@code null} for newly created objects because in DefectDojo's Open API specification i.
24+
* It is mandatory to use a boxed object type instead of a native type. A native type would result in 0 by
25+
* default which is a valid id for DefectDojo. Thus creating this type via POST request would try to create
26+
* one with id 0. Instead the id must be {@code null}, so that DefectDojo uses a newly generated uniq id.
27+
* </p>
28+
*/
2029
@JsonProperty
21-
private long id;
30+
private Long id;
2231

2332
@JsonProperty
24-
private long product;
33+
private Long product;// FIXME: Use native type here.
2534

2635
@JsonProperty
27-
private long group;
36+
private Long group;// FIXME: Use native type here.
2837

2938
@JsonProperty
30-
private long role;
39+
private Long role;// FIXME: Use native type here.
3140

3241
@Override
3342
public boolean equalsQueryString(Map<String, Object> queryParams) {

‎src/main/java/io/securecodebox/persistence/defectdojo/model/ProductType.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@
1818
@JsonInclude(JsonInclude.Include.NON_NULL)
1919
public final class ProductType implements Model, HasId, HasName {
2020
@JsonProperty
21-
private long id;
21+
private Long id;// FIXME: Use native type here.
2222

2323
@JsonProperty
2424
@NonNull
2525
private String name;
2626

2727
@JsonProperty("critical_product")
28-
private boolean criticalProduct;
28+
private Boolean criticalProduct;// FIXME: Use native type here.
2929

3030
@JsonProperty("key_product")
31-
private boolean keyProduct;
31+
private Boolean keyProduct;// FIXME: Use native type here.
3232

3333
@Override
3434
public boolean equalsQueryString(Map<String, Object> queryParams) {

‎src/main/java/io/securecodebox/persistence/defectdojo/model/RiskAcceptance.java‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,17 @@
1818
@EqualsAndHashCode
1919
@JsonInclude(JsonInclude.Include.NON_NULL)
2020
public final class RiskAcceptance implements Model, HasId {
21+
/**
22+
* Uniq id of model type
23+
* <p>
24+
* May be {@code null} for newly created objects because in DefectDojo's Open API specification i.
25+
* It is mandatory to use a boxed object type instead of a native type. A native type would result in 0 by
26+
* default which is a valid id for DefectDojo. Thus creating this type via POST request would try to create
27+
* one with id 0. Instead the id must be {@code null}, so that DefectDojo uses a newly generated uniq id.
28+
* </p>
29+
*/
2130
@JsonProperty
22-
private long id;
31+
private Long id;
2332

2433
@JsonProperty
2534
private String recommendation;
@@ -54,7 +63,7 @@ public final class RiskAcceptance implements Model, HasId {
5463
private OffsetDateTime updatedAt;
5564

5665
@JsonProperty
57-
private long owner;
66+
private Long owner;// FIXME: Use native type here.
5867

5968
@Override
6069
public boolean equalsQueryString(Map<String, Object> queryParams) {

0 commit comments

Comments
 (0)