SHIBUI-522: Polymorphic Jackson model refactoring wip

TIER · May 31, 2018 · c417380 · c417380
1 parent 2e56055
commit c417380
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 43 deletions.
diff --git a/...ler/EntityAttributesFilterController.java → ...controller/MetadataFiltersController.java b/...ler/EntityAttributesFilterController.java → ...controller/MetadataFiltersController.java
@@ -28,9 +28,9 @@
 
 @RestController
 @RequestMapping("/api/MetadataResolver/{metadataResolverId}")
-public class EntityAttributesFilterController {
+public class MetadataFiltersController {
 
-    private static Logger LOGGER = LoggerFactory.getLogger(EntityAttributesFilterController.class);
+    private static Logger LOGGER = LoggerFactory.getLogger(MetadataFiltersController.class);
 
     @Autowired
     private MetadataResolverRepository repository;

diff --git a/...c/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/OtherFiltersController.java b/...c/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/OtherFiltersController.java
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
@@ -63,7 +63,7 @@ public void fromTransientRepresentation() {
         List<org.opensaml.saml.saml2.core.Attribute> attributeList = new ArrayList<>();
         attributeList.addAll(getAttributeListFromAttributeReleaseList(this.attributeRelease));
         attributeList.addAll(getAttributeListFromRelyingPartyOverridesRepresentation(this.relyingPartyOverrides));
-        this.attributes =
-                (List<edu.internet2.tier.shibboleth.admin.ui.domain.Attribute>)(List<? extends org.opensaml.saml.saml2.core.Attribute>)attributeList;
+
+        this.attributes.addAll((List<edu.internet2.tier.shibboleth.admin.ui.domain.Attribute>)(List<? extends org.opensaml.saml.saml2.core.Attribute>)attributeList);
     }
 }
diff --git a/...ityAttributesFilterControllerTests.groovy → ...ler/MetadataFiltersControllerTests.groovy b/...ityAttributesFilterControllerTests.groovy → ...ler/MetadataFiltersControllerTests.groovy
@@ -36,7 +36,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 @ContextConfiguration(classes=[CoreShibUiConfiguration, SearchConfiguration, MetadataResolverConfiguration])
 @EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"])
 @EntityScan("edu.internet2.tier.shibboleth.admin.ui")
-class EntityAttributesFilterControllerTests extends Specification {
+class MetadataFiltersControllerTests extends Specification {
 
     @Autowired
     AttributeUtility attributeUtility
@@ -61,7 +61,7 @@ class EntityAttributesFilterControllerTests extends Specification {
         testObjectGenerator = new TestObjectGenerator(attributeUtility)
         mapper = new ObjectMapper()
 
-        controller = new EntityAttributesFilterController (
+        controller = new MetadataFiltersController (
                 repository: metadataResolverRepository,
                 filterService: filterService,
                 metadataResolverService: new MetadataResolverService() {