SHIBUI-522 WIP

TIER · Jun 2, 2018 · 2f05db0 · 2f05db0
1 parent 5b0116a
commit 2f05db0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 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
@@ -54,7 +54,6 @@ public ResponseEntity<?> getOne(@PathVariable String metadataResolverId, @PathVa
         // TODO: should we check that we found exactly one filter (as in the update method below)? If not, error?
         return ResponseEntity.ok(repository.findAll().iterator().next().getMetadataFilters().stream()
                 .filter(eaf -> eaf.getResourceId().equals(resourceId))
-                .map(eaf -> filterService.createRepresentationFromFilter((EntityAttributesFilter) eaf))
                 .collect(Collectors.toList()).get(0));
     }
 

diff --git a/...y/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataFiltersControllerTests.groovy b/...y/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataFiltersControllerTests.groovy
@@ -107,18 +107,16 @@ class MetadataFiltersControllerTests extends Specification {
     def "FilterController.getOne gets the desired filter"() {
         given:
         def metadataResolver = new MetadataResolver()
-        metadataResolver.setMetadataFilters(testObjectGenerator.buildAllTypesOfFilterList())
-        List<MetadataResolver> metadataResolverList = [metadataResolver]
-        1 * metadataResolverRepository.findAll() >> metadataResolverList
+        def expectedFilter = testObjectGenerator.entityAttributesFilter()
+        metadataResolver.metadataFilters = [expectedFilter]
+        1 * metadataResolverRepository.findAll() >> [metadataResolver]
 
-        def expectedFilter = filterService.createRepresentationFromFilter(
-                chooseRandomFilterFromList(metadataResolver.metadataFilters))
-        def expectedFilterId = expectedFilter.id
+        def expectedResourceId = expectedFilter.resourceId
         def expectedHttpResponseStatus = status().isOk()
         def expectedResponseContentType = APPLICATION_JSON_UTF8
 
         when:
-        def result = mockMvc.perform(get("/api/MetadataResolver/foo/Filter/$expectedFilterId"))
+        def result = mockMvc.perform(get("/api/MetadataResolver/foo/Filter/$expectedResourceId"))
 
         then:
         result.andExpect(expectedHttpResponseStatus)