WW-5370 Adds proper logic to handle null

apache · Dec 12, 2023 · 102e040 · 102e040
1 parent 4eaab8a
commit 102e040
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/HttpParameters.java b/core/src/main/java/org/apache/struts2/dispatcher/HttpParameters.java
@@ -111,11 +111,11 @@ public boolean containsValue(Object value) {
 
     @Override
     public Parameter get(Object key) {
-        if (key != null) {
-            return parameters.get(String.valueOf(key));
-        } else {
-            return null;
+        if (key == null) {
+            return new Parameter.Empty("null");
         }
+        Parameter val = parameters.get(key.toString());
+        return val != null ? val : new Parameter.Empty(key.toString());
     }
 
     @Override

diff --git a/core/src/main/java/org/apache/struts2/dispatcher/Parameter.java b/core/src/main/java/org/apache/struts2/dispatcher/Parameter.java
@@ -166,6 +166,19 @@ public String toString() {
                     "name='" + name + '\'' +
                     '}';
         }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (!(o instanceof Empty)) return false;
+            Empty empty = (Empty) o;
+            return Objects.equals(name, empty.name);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(name);
+        }
     }
 
 }
diff --git a/core/src/test/java/org/apache/struts2/dispatcher/HttpParametersTest.java b/core/src/test/java/org/apache/struts2/dispatcher/HttpParametersTest.java
@@ -24,7 +24,6 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 public class HttpParametersTest {
@@ -51,7 +50,7 @@ public void shouldRemoveBeCaseInsensitive() {
 
         // then
         assertFalse(params.remove("Param1").contains("param1"));
-        assertNull(params.get("param1"));
+        assertEquals(new Parameter.Empty("param1"), params.get("param1"));
     }
 
     @Test