This is an automated email from the ASF dual-hosted git repository.
dashorst pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git
The following commit(s) were added to refs/heads/master by this push:
new 66dbf3e33d Make PageParameters hashes independent of named parameter
order
66dbf3e33d is described below
commit 66dbf3e33da829e5c515bb2adc1e9b5d417fb847
Author: Swarneil1905 <[email protected]>
AuthorDate: Sun Nov 8 12:53:54 2026 -0600
Make PageParameters hashes independent of named parameter order
Equal PageParameters could have different hashes when named parameters were
reordered, causing HashMap lookups to fail. Sum named pair hashes, including
duplicates, while retaining indexed parameter and fragment hashing. Add
regression tests for reordered pairs, duplicates, empty parameters, and map
lookups.
GitHub issue #1866.
---
.../request/mapper/parameter/PageParameters.java | 11 +++++-
.../mapper/parameter/PageParametersTest.java | 44 ++++++++++++++++++++++
2 files changed, 54 insertions(+), 1 deletion(-)
diff --git
a/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java
b/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java
index 59e05a6156..8dcedddb1c 100644
---
a/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java
+++
b/wicket-request/src/main/java/org/apache/wicket/request/mapper/parameter/PageParameters.java
@@ -513,10 +513,19 @@ public class PageParameters implements IClusterable,
IIndexedParameters, INamedP
@Override
public int hashCode()
{
+ int namedParametersHashCode = 0;
+ if (namedParameters != null)
+ {
+ for (NamedPair pair : namedParameters)
+ {
+ namedParametersHashCode += pair.hashCode();
+ }
+ }
+
final int prime = 31;
int result = 1;
result = prime * result + ((indexedParameters == null) ? 0 :
indexedParameters.hashCode());
- result = prime * result + ((namedParameters == null) ? 0 :
namedParameters.hashCode());
+ result = prime * result + namedParametersHashCode;
result = prime * result + ((fragment == null) ? 0 :
fragment.hashCode());
return result;
}
diff --git
a/wicket-request/src/test/java/org/apache/wicket/request/mapper/parameter/PageParametersTest.java
b/wicket-request/src/test/java/org/apache/wicket/request/mapper/parameter/PageParametersTest.java
index f302f366e1..f9924a38a0 100644
---
a/wicket-request/src/test/java/org/apache/wicket/request/mapper/parameter/PageParametersTest.java
+++
b/wicket-request/src/test/java/org/apache/wicket/request/mapper/parameter/PageParametersTest.java
@@ -21,7 +21,9 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import org.apache.wicket.util.string.StringValue;
import org.junit.jupiter.api.Test;
@@ -334,6 +336,48 @@ class PageParametersTest
PageParameters p2 = new PageParameters().add("c", "d").add("a",
"b");
assertEquals(p2, p1);
+ assertEquals(p2.hashCode(), p1.hashCode());
+ }
+
+ @Test
+ void hashCodeWithReorderedDuplicateNamedParameters()
+ {
+ PageParameters p1 = new PageParameters().add("a", "1").add("a",
"2").add("a", "1");
+ PageParameters p2 = new PageParameters().add("a", "1").add("a",
"1").add("a", "2");
+
+ assertEquals(p1, p2);
+ assertEquals(p1.hashCode(), p2.hashCode());
+ assertNotEquals(p1, new PageParameters().add("a", "1").add("a",
"2"));
+ }
+
+ @Test
+ void hashMapLookupWithReorderedNamedParameters()
+ {
+ PageParameters p1 = new PageParameters().set(0,
"page").add("a", "1").add("b", "2");
+ PageParameters p2 = new PageParameters().set(0,
"page").add("b", "2").add("a", "1");
+ p1.setFragment("section");
+ p2.setFragment("section");
+ Map<PageParameters, String> pages = new HashMap<>();
+ pages.put(p1, "value");
+
+ assertEquals("value", pages.get(p2));
+ pages.put(p2, "replacement");
+ assertEquals(1, pages.size());
+ assertEquals("replacement", pages.get(p1));
+ }
+
+ @Test
+ void hashCodeWithNoNamedParameters()
+ {
+ PageParameters p1 = new PageParameters();
+ PageParameters p2 = new PageParameters();
+ assertEquals(p1, p2);
+ assertEquals(p1.hashCode(), p2.hashCode());
+
+ p1.add("a", "1").remove("a");
+ p2.add("b", "2").remove("b");
+ assertEquals(p1, p2);
+ assertEquals(p1.hashCode(), p2.hashCode());
}
/**