diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataFiltersController.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataFiltersController.java index 305e42680..51ec71966 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataFiltersController.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataFiltersController.java @@ -103,7 +103,9 @@ public ResponseEntity update(@PathVariable String metadataResolverId, @Reques filter.setName(updatedFilter.getName()); filter.setFilterEnabled(updatedFilter.isFilterEnabled()); filter.setEntityAttributesFilterTarget(updatedFilter.getEntityAttributesFilterTarget()); - filter.setAttributes(updatedFilter.getAttributes()); + filter.setRelyingPartyOverrides(updatedFilter.getRelyingPartyOverrides()); + filter.setAttributeRelease(updatedFilter.getAttributeRelease()); + filter.intoTransientRepresentation(); MetadataResolver persistedMr = repository.save(metadataResolver); 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 eab278e1a..b2186d5ed 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 @@ -54,6 +54,7 @@ public EntityAttributesFilter() { public void intoTransientRepresentation() { this.attributeRelease = getAttributeReleaseListFromAttributeList(this.attributes); this.relyingPartyOverrides = getRelyingPartyOverridesRepresentationFromAttributeList(attributes); + setVersion(hashCode()); } @PrePersist diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/MetadataFilter.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/MetadataFilter.java index 3739eea82..aa5b063a4 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/MetadataFilter.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/MetadataFilter.java @@ -33,7 +33,8 @@ public class MetadataFilter extends AbstractAuditable { @JsonProperty("@type") - transient String type; + @Transient + String type; private String name; diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/PolymorphicFiltersJacksonHandlingTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/PolymorphicFiltersJacksonHandlingTests.groovy index f0d5ea937..c9cef2cb3 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/PolymorphicFiltersJacksonHandlingTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/domain/PolymorphicFiltersJacksonHandlingTests.groovy @@ -88,7 +88,7 @@ class PolymorphicFiltersJacksonHandlingTests extends Specification { def "List of filters with correct types"() { given: - def filters = [testObjectGenerator.entityRoleWhitelistFilter()] + def filters = testObjectGenerator.buildAllTypesOfFilterList(); when: def json = mapper.writeValueAsString(filters)