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

…ints
TIER · Jun 1, 2018 · 54e898a · 54e898a
1 parent 4b05a56
commit 54e898a
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 19 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
@@ -32,14 +32,14 @@
 
 @Entity
 @EqualsAndHashCode(callSuper = true, exclude={"attributeRelease", "relyingPartyOverrides"})
-@NoArgsConstructor
 @Getter
 @Setter
 @ToString
 public class EntityAttributesFilter extends MetadataFilter {
 
-    @JsonProperty("@type")
-    private final transient String type = "EntityAttributesFilter";
+    public EntityAttributesFilter() {
+        type = "EntityAttributes";
+    }
 
     @OneToOne(cascade = CascadeType.ALL)
     private EntityAttributesFilterTarget entityAttributesFilterTarget;

diff --git a/...java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/EntityRoleWhiteListFilter.java b/...java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/EntityRoleWhiteListFilter.java
@@ -1,11 +1,7 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain.filters;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonTypeName;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
-import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
 
@@ -19,14 +15,14 @@
 
 @Entity
 @EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
 @Getter
 @Setter
 @ToString
 public class EntityRoleWhiteListFilter extends MetadataFilter {
 
-    @JsonProperty("@type")
-    private final transient String type = "EntityRoleWhiteList";
+    public EntityRoleWhiteListFilter() {
+        type = "EntityRoleWhiteList";
+    }
 
     private Boolean removeRolelessEntityDescriptors = true;
 

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,6 +1,9 @@
 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;
@@ -21,16 +24,20 @@
  */
 @Entity
 @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
-@EqualsAndHashCode(callSuper = true, exclude={"version"})
+@EqualsAndHashCode(callSuper = true, exclude={"version", "type"})
 @NoArgsConstructor
 @Getter
 @Setter
 @ToString
-//@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type")
-/*@JsonSubTypes({@JsonSubTypes.Type(value=EntityRoleWhiteListFilter.class, name="EntityRoleWhiteList"),
-        @JsonSubTypes.Type(value=EntityAttributesFilter.class, name="EntityAttributesFilter")})*/
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.EXISTING_PROPERTY, property = "@type", visible = true)
+@JsonSubTypes({@JsonSubTypes.Type(value=EntityRoleWhiteListFilter.class, name="EntityRoleWhiteList"),
+       @JsonSubTypes.Type(value=EntityAttributesFilter.class, name="EntityAttributes")})
 public class MetadataFilter extends AbstractAuditable {
 
+    //@JsonTypeId
+    @JsonProperty("@type")
+    transient String type;
+
     private String name;
 
     @Column(unique=true)

diff --git a/...u/internet2/tier/shibboleth/admin/ui/domain/PolymorphicFiltersJacksonHandlingTests.groovy b/...u/internet2/tier/shibboleth/admin/ui/domain/PolymorphicFiltersJacksonHandlingTests.groovy
@@ -32,13 +32,13 @@ class PolymorphicFiltersJacksonHandlingTests extends Specification {
     def "Correct polymorphic serialization of EntityRoleWhiteListFilter"() {
         given:
         def givenFilterJson = """
-            {
-                "type" : "EntityRoleWhiteList",
+            {                                                
+                "@type" : "EntityRoleWhiteList",
                 "createdDate" : null,
                 "modifiedDate" : null,
                 "createdBy" : null,
                 "modifiedBy" : null,
-                "name" : "EntityRoleWhiteListFilter",
+                "name" : "EntityRoleWhiteList",
                 "resourceId" : "r1",
                 "filterEnabled" : false,
                 "version" : 0,

diff --git a/...st/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAFilterServiceImplTests.groovy b/...st/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAFilterServiceImplTests.groovy
@@ -63,7 +63,7 @@ class JPAFilterServiceImplTests extends Specification {
 
     def "createRepresentationFromFilter properly creates a representation from a filter"() {
         given:
-        def filter = testObjectGenerator.buildEntityAttributesFilter()
+        def filter = testObjectGenerator.buildFilter { testObjectGenerator.entityAttributesFilter() }
 
         when:
         def result = service.createRepresentationFromFilter(filter)

diff --git a/...nd/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy b/...nd/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy
@@ -44,6 +44,7 @@ class TestObjectGenerator {
 
     EntityRoleWhiteListFilter entityRoleWhitelistFilter() {
         new EntityRoleWhiteListFilter().with {
+            it.name = 'EntityRoleWhiteList'
             it.retainedRoles = ['role1', 'role2']
             it.removeRolelessEntityDescriptors = true
             it
@@ -52,6 +53,7 @@ class TestObjectGenerator {
 
     EntityAttributesFilter entityAttributesFilter() {
         new EntityAttributesFilter().with {
+            it.name = 'EntityAttributes'
             it.setEntityAttributesFilterTarget(buildEntityAttributesFilterTarget())
             it.setAttributes(buildAttributesList())
             it.intoTransientRepresentation()
@@ -61,7 +63,6 @@ class TestObjectGenerator {
 
     MetadataFilter buildFilter(Supplier<? extends MetadataFilter> filterSupplier) {
         MetadataFilter filter = filterSupplier.get()
-        filter.setName(generator.randomString(10))
         filter.setFilterEnabled(generator.randomBoolean())
         filter.setResourceId(generator.randomId())
         return filter