SHIBUI-522: refactoring REST controller for polymorphic filters endpo…

…ints
TIER · Jun 4, 2018 · cc439e1 · cc439e1
1 parent c05339a
commit cc439e1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/...ain/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataFiltersController.java b/...ain/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/...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
@@ -54,6 +54,7 @@ public EntityAttributesFilter() {
     public void intoTransientRepresentation() {
         this.attributeRelease = getAttributeReleaseListFromAttributeList(this.attributes);
         this.relyingPartyOverrides = getRelyingPartyOverridesRepresentationFromAttributeList(attributes);
+        setVersion(hashCode());
     }
 
     @PrePersist

diff --git a/...d/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/MetadataFilter.java b/...d/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/...u/internet2/tier/shibboleth/admin/ui/domain/PolymorphicFiltersJacksonHandlingTests.groovy b/...u/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)