SHIBUI-522 WIP

TIER · Jun 1, 2018 · 5b0116a · 5b0116a
1 parent 54e898a
commit 5b0116a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 15 deletions.
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
@@ -1,17 +1,12 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain.filters;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import edu.internet2.tier.shibboleth.admin.ui.domain.Attribute;
 import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.RelyingPartyOverridesRepresentation;
-import edu.internet2.tier.shibboleth.admin.util.MDDCConstants;
-import edu.internet2.tier.shibboleth.admin.util.ModelRepresentationConversions;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
-import org.opensaml.core.xml.XMLObject;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;

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
@@ -1,9 +1,7 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain.filters;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeId;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import edu.internet2.tier.shibboleth.admin.ui.domain.AbstractAuditable;
 import lombok.EqualsAndHashCode;
@@ -34,7 +32,6 @@
        @JsonSubTypes.Type(value=EntityAttributesFilter.class, name="EntityAttributes")})
 public class MetadataFilter extends AbstractAuditable {
 
-    //@JsonTypeId
     @JsonProperty("@type")
     transient String type;
 

diff --git a/...y/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataFiltersControllerTests.groovy b/...y/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataFiltersControllerTests.groovy
@@ -131,7 +131,7 @@ class MetadataFiltersControllerTests extends Specification {
         given:
         controller.filterService = mockFilterService // so we can control ids
 
-        def randomFilter = testObjectGenerator.buildEntityAttributesFilter()
+        def randomFilter = testObjectGenerator.entityAttributesFilter()
         def metadataResolver = new MetadataResolver()
         metadataResolver.setResourceId(randomGenerator.randomId())
         metadataResolver.setMetadataFilters(testObjectGenerator.buildAllTypesOfFilterList())
@@ -166,8 +166,8 @@ class MetadataFiltersControllerTests extends Specification {
 
     def "FilterController.update updates the target filter as desired"() {
         given:
-        def randomFilter = testObjectGenerator.buildEntityAttributesFilter()
-        def updatedFilter = testObjectGenerator.buildEntityAttributesFilter()
+        def randomFilter = testObjectGenerator.entityAttributesFilter()
+        def updatedFilter = testObjectGenerator.entityAttributesFilter()
         updatedFilter.resourceId = randomFilter.resourceId
         def updatedFilterRepresentation = filterService.createRepresentationFromFilter(updatedFilter)
         updatedFilterRepresentation.setVersion(randomFilter.hashCode())
@@ -202,8 +202,8 @@ class MetadataFiltersControllerTests extends Specification {
 
     def "FilterController.update 409's if the version numbers don't match"() {
         given:
-        def randomFilter = testObjectGenerator.buildEntityAttributesFilter()
-        def updatedFilter = testObjectGenerator.buildEntityAttributesFilter()
+        def randomFilter = testObjectGenerator.entityAttributesFilter()
+        def updatedFilter = testObjectGenerator.entityAttributesFilter()
         updatedFilter.resourceId = randomFilter.resourceId
         def postedJsonBody = mapper.writeValueAsString(
                 filterService.createRepresentationFromFilter(updatedFilter))
@@ -227,7 +227,7 @@ class MetadataFiltersControllerTests extends Specification {
         result.andExpect(status().is(409))
     }
 
-    EntityAttributesFilter chooseRandomFilterFromList(List<EntityAttributesFilter> filters) {
+    EntityAttributesFilter chooseRandomFilterFromList(List<MetadataFilter> filters) {
         filters.get(randomGenerator.randomInt(0, filters.size() - 1))
     }
 }
diff --git a/...u/internet2/tier/shibboleth/admin/ui/domain/PolymorphicFiltersJacksonHandlingTests.groovy b/...u/internet2/tier/shibboleth/admin/ui/domain/PolymorphicFiltersJacksonHandlingTests.groovy
@@ -82,7 +82,6 @@ class PolymorphicFiltersJacksonHandlingTests extends Specification {
         println("Attributes from persistent filter -> $simulatedPersistentFilter.attributes")
         println("Attributes from PRE persistent filter -> $simulatedPrePersistentFilter.attributes")
 
-
         then:
         simulatedPersistentFilter.attributes.size() == simulatedPrePersistentFilter.attributes.size()
     }