From 25bc0af217bbb8a2cc4d8b855f054d2c7f17a896 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Mon, 30 Sep 2019 11:21:33 -0400 Subject: [PATCH] Fix tests --- ...MetadataFilterEnversVersioningTests.groovy | 21 ------------------- .../filters/EntityAttributesFilter.java | 3 +++ 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataFilterEnversVersioningTests.groovy b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataFilterEnversVersioningTests.groovy index 366dc9c0d..6df7da461 100644 --- a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/MetadataFilterEnversVersioningTests.groovy +++ b/backend/src/enversTest/groovy/edu/internet2/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/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/EntityAttributesFilter.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/EntityAttributesFilter.java index 5d6d3132a..a3e0a6a93 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/EntityAttributesFilter.java +++ b/backend/src/main/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); }