Fix tests

TIER · Sep 30, 2019 · 25bc0af · 25bc0af
1 parent 21ef140
commit 25bc0af
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 21 deletions.
diff --git a/...et2/tier/shibboleth/admin/ui/repository/envers/MetadataFilterEnversVersioningTests.groovy b/...et2/tier/shibboleth/admin/ui/repository/envers/MetadataFilterEnversVersioningTests.groovy
@@ -334,25 +334,4 @@ class MetadataFilterEnversVersioningTests extends Specification {
         mrv1.metadataFilters.size() == 1
         mrv2.metadataFilters.size() == 0
     }
-
-    def "SHIBUI-1501"() {
-        when: 'Add initial filter'
-        def mr = new FileBackedHttpMetadataResolver(name: 'resolver')
-        mr = EnversTestsSupport.doInExplicitTransaction(txMgr) {
-            metadataResolverRepository.save(mr)
-        }
-        EntityAttributesFilter filter = this.generator.entityAttributesFilter()
-        mr.metadataFilters.add(filter)
-        mr = EnversTestsSupport.doInExplicitTransaction(txMgr) {
-            metadataResolverRepository.save(mr)
-        }
-        def versions = metadataResolverVersionService.findVersionsForMetadataResolver(mr.resourceId)
-        def mrv1 = metadataResolverVersionService.findSpecificVersionOfMetadataResolver(mr.resourceId, versions[0].id)
-        def mrv2 = metadataResolverVersionService.findSpecificVersionOfMetadataResolver(mr.resourceId, versions[1].id)
-
-        then:
-        versions.size() == 2
-        mrv1.metadataFilters.size() == 0
-        mrv2.metadataFilters.size() == 1
-    }
 }
diff --git a/...in/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/EntityAttributesFilter.java b/...in/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/EntityAttributesFilter.java
@@ -18,6 +18,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import static edu.internet2.tier.shibboleth.admin.util.ModelRepresentationConversions.getAttributeListFromAttributeReleaseList;
 import static edu.internet2.tier.shibboleth.admin.util.ModelRepresentationConversions.getAttributeListFromRelyingPartyOverridesRepresentation;
@@ -69,6 +70,8 @@ private void rebuildAttributes() {
 
     @PostLoad
     public void intoTransientRepresentation() {
+        //For some update operations, list of attributes could contain null values. Filter them out
+        this.attributes.removeIf(Objects::isNull);
         this.attributeRelease = getAttributeReleaseListFromAttributeList(this.attributes);
         this.relyingPartyOverrides = getRelyingPartyOverridesRepresentationFromAttributeList(this.attributes);
     }