#23 Use native types as model's field types

Native types should be favored over boxed types for two reasons:

1. Boxed types introduce more verbose code.
2. Boxed types introduce possible NPE.

Since native types reduces code clutter because they have a default value
and they also can not be null, we switched to native type fields.

Signed-off-by: Sven Strittmatter <sven.strittmatter@iteratec.com>

Author: Weltraumschaf

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

@@ -18,7 +18,7 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public final class Endpoint implements Model {
   @JsonProperty
-  private Long id;// FIXME: Use native type here.
+  private long id;
 
   @JsonProperty
   private String protocol;
@@ -30,7 +30,7 @@ public final class Endpoint implements Model {
   private String fullyQualifiedDomainName;
 
   @JsonProperty
-  private Long port;// FIXME: Use native type here.
+  private long port;
 
   @JsonProperty
   private String path;
@@ -42,10 +42,10 @@ public final class Endpoint implements Model {
   private String fragment;
 
   @JsonProperty
-  private Long product;// FIXME: Use native type here.
+  private long product;
 
   @JsonProperty
-  private Boolean mitigated;// FIXME: Use native type here.
+  private boolean mitigated;
 
   @Override
   public boolean equalsQueryString(Map<String, Object> queryParams) {

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

@@ -28,7 +28,7 @@ public final class Engagement implements Model {
   private String name;
 
   @JsonProperty
-  private Long product;// FIXME: Use native type here.
+  private long product;
 
   @JsonProperty("target_start")
   private String targetStart;
@@ -37,7 +37,7 @@ public final class Engagement implements Model {
   private String targetEnd;
 
   @JsonProperty
-  private Long lead;// FIXME: Use native type here.
+  private long lead;
 
   @JsonProperty("engagement_type")
   @Builder.Default
@@ -63,13 +63,13 @@ public final class Engagement implements Model {
   private String repo;
 
   @JsonProperty("build_server")
-  private Long buildServer; // FIXME: Use native type here.
+  private long buildServer;
 
   @JsonProperty("source_code_management_server")
-  private Long scmServer; // FIXME: Use natvive type here.
+  private long scmServer;
 
   @JsonProperty("orchestration_engine")
-  private Long orchestrationEngine; // FIXME: Use natvive type here.
+  private long orchestrationEngine;
 
   @JsonProperty
   private String description;
@@ -78,20 +78,16 @@ public final class Engagement implements Model {
   private boolean deduplicationOnEngagement;
 
   @JsonProperty("threat_model")
-  @Builder.Default // FIXME: Use native type here.
-  private Boolean threatModel = false;
+  private boolean threatModel;
 
   @JsonProperty("api_test")
-  @Builder.Default // FIXME: Use native type here.
-  private Boolean apiTest = false;
+  private boolean apiTest;
 
   @JsonProperty("pen_test")
-  @Builder.Default // FIXME: Use native type here.
-  private Boolean penTest = false;
+  private boolean penTest;
 
   @JsonProperty("check_list")
-  @Builder.Default // FIXME: Use native type here.
-  private Boolean checkList = false;
+  private boolean checkList;
 
   @JsonProperty
   private String version;

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

@@ -23,7 +23,7 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public final class Finding implements Model {
     @JsonProperty
-    private Long id;// FIXME: Use native type here.
+    private long id;
 
     @JsonProperty
     @NonNull
@@ -43,7 +43,7 @@ public final class Finding implements Model {
 
     @JsonProperty
     @NonNull
-    private Long test;// FIXME: Use native type here.
+    private long test;
 
     @JsonProperty
     private String mitigation;
@@ -53,37 +53,30 @@ public final class Finding implements Model {
 
     @JsonProperty
     @NonNull
-    @Builder.Default
-    private Boolean active = true;// FIXME: Use native type here.
+    private boolean active;
 
     @JsonProperty
     @NonNull
-    @Builder.Default
-    private Boolean verified = true;// FIXME: Use native type here.
+    private boolean verified;
 
     @JsonProperty("risk_accepted")
     @NonNull
-    @Builder.Default
-    private Boolean riskAccepted = false;// FIXME: Use native type here.
+    private boolean riskAccepted;
 
     @JsonProperty("out_of_scope")
     @NonNull
-    @Builder.Default
-    private Boolean outOfScope = false;// FIXME: Use native type here.
+    private boolean outOfScope;
 
     @JsonProperty
     @NonNull
-    @Builder.Default
-    private Boolean duplicate = false;// FIXME: Use native type here.
+    private boolean duplicate;
 
     @JsonProperty("duplicate_finding")
-    @Builder.Default
-    private Long duplicateFinding = null;// FIXME: Use native type here.
+    private long duplicateFinding;
 
     @JsonProperty("false_p")
     @NonNull
-    @Builder.Default
-    private Boolean falsePositive = false;// FIXME: Use native type here.
+    private boolean falsePositive;
 
     @JsonProperty("component_name")
     private String componentName;

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

@@ -19,7 +19,7 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public final class Group implements Model {
     @JsonProperty
-    private Long id;// FIXME: Use native type here.
+    private long id;
 
     @JsonProperty
     @NonNull

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

@@ -18,16 +18,16 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public final class GroupMember implements Model {
     @JsonProperty
-    private Long id;// FIXME: Use native type here.
+    private long id;
 
     @JsonProperty("group_id")
-    private Long group;// FIXME: Use native type here.
+    private long group;
 
     @JsonProperty("user_id")
-    private Long user;// FIXME: Use native type here.
+    private long user;
 
     @JsonProperty
-    private Long role;// FIXME: Use native type here.
+    private long role;
 
     @Override
     public boolean equalsQueryString(Map<String, Object> queryParams) {

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

@@ -19,7 +19,7 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public final class Product implements Model {
   @JsonProperty
-  private Long id;// FIXME: Use native type here.
+  private long id;
 
   @JsonProperty
   private String name;
@@ -31,19 +31,19 @@ public final class Product implements Model {
   private String description;
 
   @JsonProperty("findings_count")
-  private Long findingsCount;// FIXME: Use native type here.
+  private long findingsCount;
 
   @JsonProperty("authorized_users")
   private List<String> authorizedUsers;
 
   @JsonProperty("prod_type")
-  private Long productType;// FIXME: Use native type here.
+  private long productType;
 
   @JsonProperty("enable_simple_risk_acceptance")
-  private Boolean enableSimpleRiskAcceptance;// FIXME: Use native type here.
+  private boolean enableSimpleRiskAcceptance;
 
   @JsonProperty("enable_full_risk_acceptance")
-  private Boolean enableFullRiskAcceptance;// FIXME: Use native type here.
+  private boolean enableFullRiskAcceptance;
 
   @JsonProperty("authorization_groups")
   private List<Long> authorizationGroups;

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

@@ -18,16 +18,16 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public final class ProductGroup implements Model {
     @JsonProperty
-    private Long id;// FIXME: Use native type here.
+    private long id;
 
     @JsonProperty
-    private Long product;// FIXME: Use native type here.
+    private long product;
 
     @JsonProperty
-    private Long group;// FIXME: Use native type here.
+    private long group;
 
     @JsonProperty
-    private Long role;// FIXME: Use native type here.
+    private long role;
 
     @Override
     public boolean equalsQueryString(Map<String, Object> queryParams) {

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

@@ -18,17 +18,17 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public final class ProductType implements Model {
   @JsonProperty
-  private Long id;// FIXME: Use native type here.
+  private long id;
 
   @JsonProperty
   @NonNull
   private String name;
 
   @JsonProperty("critical_product")
-  private Boolean criticalProduct;// FIXME: Use native type here.
+  private boolean criticalProduct;
 
   @JsonProperty("key_product")
-  private Boolean keyProduct;// FIXME: Use native type here.
+  private boolean keyProduct;
 
   @Override
   public boolean equalsQueryString(Map<String, Object> queryParams) {

src/main/java/io/securecodebox/persistence/defectdojo/model/Response.java

@@ -9,6 +9,7 @@
 
 import java.util.List;
 
+// TODO: Why we do not have as many annotations as the other models here?
 @Data
 public final class Response<T> {
   @JsonProperty

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

@@ -19,7 +19,7 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public final class RiskAcceptance implements Model {
   @JsonProperty
-  private Long id;// FIXME: Use native type here.
+  private long id;
 
   @JsonProperty
   private String recommendation;
@@ -54,7 +54,7 @@ public final class RiskAcceptance implements Model {
   private OffsetDateTime updatedAt;
 
   @JsonProperty
-  private Long owner;// FIXME: Use native type here.
+  private long owner;
 
   @Override
   public boolean equalsQueryString(Map<String, Object> queryParams) {

src/main/java/io/securecodebox/persistence/defectdojo/model/Test.java

@@ -20,7 +20,7 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public final class Test implements Model {
   @JsonProperty
-  private Long id;// FIXME: Use native type here.
+  private long id;
 
   @JsonProperty
   private String title;
@@ -39,16 +39,16 @@ public final class Test implements Model {
   private List<String> tags = new LinkedList<>();
 
   @JsonProperty("test_type")
-  private Long testType;// FIXME: Use native type here.
+  private long testType;
 
   @JsonProperty
-  private Long lead;// FIXME: Use native type here.
+  private long lead;
 
   @JsonProperty("percent_complete")
-  private Long percentComplete;// FIXME: Use native type here.
+  private long percentComplete;
 
   @JsonProperty
-  private Long engagement;// FIXME: Use native type here.
+  private long engagement;
 
   @JsonProperty
   private String version;
@@ -59,7 +59,7 @@ public final class Test implements Model {
    */
   @JsonProperty
   @Builder.Default
-  private Long environment = 1L;// FIXME: Use native type here.
+  private long environment = 1L;
 
   @Override
   public boolean equalsQueryString(Map<String, Object> queryParams) {

src/main/java/io/securecodebox/persistence/defectdojo/model/TestType.java

@@ -18,17 +18,17 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public final class TestType implements Model {
   @JsonProperty
-  private Long id;// FIXME: Use native type here.
+  private long id;
 
   @JsonProperty
   @NonNull
   private String name;
 
   @JsonProperty("static_tool")
-  private Boolean staticTool;// FIXME: Use native type here.
+  private boolean staticTool;
 
   @JsonProperty("dynamic_tool")
-  private Boolean dynamicTool;// FIXME: Use native type here.
+  private boolean dynamicTool;
 
 
   @Override

src/main/java/io/securecodebox/persistence/defectdojo/model/ToolConfig.java

@@ -18,7 +18,7 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public final class ToolConfig implements Model {
   @JsonProperty
-  private Long id;// FIXME: Use native type here.
+  private long id;
 
   @JsonProperty
   String url;
@@ -28,7 +28,7 @@ public final class ToolConfig implements Model {
   String name;
 
   @JsonProperty("tool_type")
-  private Long toolType;// FIXME: Use native type here.
+  private long toolType;
 
   @JsonProperty("configuration_url")
   String configUrl;

src/main/java/io/securecodebox/persistence/defectdojo/model/ToolType.java

@@ -18,7 +18,7 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public final class ToolType implements Model {
   @JsonProperty
-  private Long id;// FIXME: Use native type here.
+  private long id;
 
   @JsonProperty
   @NonNull

src/main/java/io/securecodebox/persistence/defectdojo/model/User.java

@@ -18,7 +18,7 @@
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public final class User implements Model {
   @JsonProperty
-  private Long id;// FIXME: Use native type here.
+  private long id;
 
   @JsonProperty
   @NonNull