#23 Also return false if id value in query params is null

Since the implementation of isNameEqual returns false, if the value in the map is null, we do this for id the same way to be consistent. Signed-off-by: Sven Strittmatter <[email protected]>
secureCodeBox · Jan 26, 2024 · 36b1e8b · 36b1e8b
1 parent cb75f1f
commit 36b1e8b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/main/java/io/securecodebox/persistence/defectdojo/model/QueryParamsComparator.java b/src/main/java/io/securecodebox/persistence/defectdojo/model/QueryParamsComparator.java
@@ -39,7 +39,10 @@ static boolean isIdEqual(HasId model, Map<String, Object> queryParams) {
       return false;
     }
 
-    // FIXME: Since th generic type for value is Object, possible NPE here!
+    if (isNull(queryParams.get(QUERY_PARAM_KEY_FOR_ID))) {
+      return false;
+    }
+
     return queryParams.get(QUERY_PARAM_KEY_FOR_ID).equals(model.getId());
   }
 

diff --git a/src/test/java/io/securecodebox/persistence/defectdojo/model/QueryParamsComparatorTest.java b/src/test/java/io/securecodebox/persistence/defectdojo/model/QueryParamsComparatorTest.java
@@ -50,7 +50,6 @@ void isIdEqual_falseIfQueryParamsDoesNotContainId() {
   }
 
   @Test
-  @Disabled("Unclear if this behaviour will break something.")
   void isIdEqual_falseIfQueryParamValueIsNull() {
     final var queryParams = new HashMap<String, Object>();
     queryParams.put(QueryParamsComparator.QUERY_PARAM_KEY_FOR_ID, null);