[SHIBUI-1772]

update test (missed field) hashcode enhancement for request initiator
TIER · Apr 5, 2021 · 9f8f007 · 9f8f007
1 parent 70159e3
commit 9f8f007
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/RequestInitiator.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/RequestInitiator.java
@@ -12,10 +12,12 @@
 import javax.xml.namespace.QName;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
 
 @Entity
-@EqualsAndHashCode(callSuper = true, exclude = {"storageAttributeMap"})
+@EqualsAndHashCode(callSuper = true, onlyExplicitlyIncluded = true)
 public class RequestInitiator extends AbstractElementExtensibleXMLObject implements org.opensaml.saml.ext.saml2mdreqinit.RequestInitiator {
+    @EqualsAndHashCode.Include
     private String binding;
     @Override
     public String getBinding() {
@@ -27,6 +29,7 @@ public void setBinding(String binding) {
         this.binding = binding;
     }
 
+    @EqualsAndHashCode.Include
     private String location;
 
     @Override
@@ -39,6 +42,7 @@ public void setLocation(String location) {
         this.location = location;
     }
 
+    @EqualsAndHashCode.Include
     private String responseLocation;
 
     @Override
@@ -57,6 +61,11 @@ public void setResponseLocation(String location) {
     @Transient
     private AttributeMap attributeMap = new AttributeMap(this);
 
+    @EqualsAndHashCode.Include
+    private Set<Map.Entry<QName, String>> attributeMapEntrySet() {
+        return this.attributeMap.entrySet();
+    }
+
     @PrePersist
     void prePersist() {
         this.storageAttributeMap = this.attributeMap;

diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/VersioningTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/VersioningTests.groovy
@@ -15,9 +15,12 @@ class VersioningTests extends Specification{
 
     def "test that two loaded entity descriptors gets the same version when load from the same file"() {
         given:
+        def resourceId = "testme"
         def xmlBytes = this.class.getResource('/metadata/SHIBUI-1723-1.xml').bytes
         def ed1 = openSamlObjects.unmarshalFromXml(xmlBytes)
+        ed1.resourceId = resourceId
         def ed2 = openSamlObjects.unmarshalFromXml(xmlBytes)
+        ed2.resourceId = resourceId
 
         expect:
         ed1.hashCode() == ed2.hashCode()