#23 Add missing tests for model's equalsQueryString()

Also add missing null check in implementation.

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

Author: Weltraumschaf

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

@@ -49,6 +49,10 @@ public final class Endpoint implements Model {
 
   @Override
   public boolean equalsQueryString(Map<String, Object> queryParams) {
+    if (queryParams == null) {
+      return false;
+    }
+
     return queryParams.containsKey("id") && queryParams.get("id").equals(this.id);
   }
 }

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

@@ -97,9 +97,11 @@ public boolean equalsQueryString(Map<String, Object> queryParams) {
     if (queryParams == null) {
       return false;
     }
+
     if (queryParams.containsKey("id") && queryParams.get("id") != null && queryParams.get("id").equals(this.id)) {
       return true;
     }
+
     if (queryParams.containsKey("name") && queryParams.get("name") != null && queryParams.get("name").equals(this.name)) {
       return true;
     }

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

@@ -121,6 +121,10 @@ public String getNumericalSeverity() {
 
   @Override
   public boolean equalsQueryString(Map<String, Object> queryParams) {
+    if (queryParams == null) {
+      return false;
+    }
+
     return queryParams.containsKey("id") && queryParams.get("id").equals(this.id);
   }
 

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

@@ -36,12 +36,18 @@ public final class Group implements Model {
 
   @Override
   public boolean equalsQueryString(Map<String, Object> queryParams) {
+    if (queryParams == null) {
+      return false;
+    }
+
     if (queryParams.containsKey("id") && queryParams.get("id").equals(this.id)) {
       return true;
     }
+
     if (queryParams.containsKey("name") && queryParams.get("name").equals(this.name)) {
       return true;
     }
+
     return false;
   }
 }

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

@@ -53,9 +53,14 @@ public final class Product implements Model {
 
   @Override
   public boolean equalsQueryString(Map<String, Object> queryParams) {
+    if (queryParams == null) {
+      return false;
+    }
+
     if (queryParams.containsKey("id") && queryParams.get("id").equals(this.id)) {
       return true;
     }
+
     if (queryParams.containsKey("name") && queryParams.get("name").equals(this.name)) {
       return true;
     }

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

@@ -32,9 +32,14 @@ public final class ProductType implements Model {
 
   @Override
   public boolean equalsQueryString(Map<String, Object> queryParams) {
+    if (queryParams == null) {
+      return false;
+    }
+
     if (queryParams.containsKey("id") && queryParams.get("id").equals(this.id)) {
       return true;
     }
+
     if (queryParams.containsKey("name") && queryParams.get("name").equals(this.name)) {
       return true;
     }

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

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

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

@@ -58,6 +58,10 @@ public final class RiskAcceptance implements Model {
 
   @Override
   public boolean equalsQueryString(Map<String, Object> queryParams) {
+    if (queryParams == null) {
+      return false;
+    }
+
     return queryParams.containsKey("id") && queryParams.get("id").equals(this.id);
   }
 }

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

@@ -7,6 +7,7 @@
 import lombok.Data;
 
 // TODO: Why we do not have as many annotations as the other models here?
+// TODO: Why does this class does not implement Model?
 @Data
 public final class ScanFile {
   /**

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

@@ -63,12 +63,18 @@ public final class Test implements Model {
 
   @Override
   public boolean equalsQueryString(Map<String, Object> queryParams) {
+    if (queryParams == null) {
+      return false;
+    }
+
     if (queryParams.containsKey("id") && queryParams.get("id").equals(this.id)) {
       return true;
     }
+
     if (queryParams.containsKey("title") && queryParams.get("title").equals(this.title)) {
       return true;
     }
+
     if (queryParams.containsKey("engagement") && queryParams.get("engagement").equals(this.engagement)) {
       return true;
     }