diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/FilterController.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/EntityAttributesFilterController.java similarity index 97% rename from backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/FilterController.java rename to backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/EntityAttributesFilterController.java index c7af8c0c6..c2d59b303 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/FilterController.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/EntityAttributesFilterController.java @@ -28,9 +28,9 @@ @RestController @RequestMapping("/api/MetadataResolver/{metadataResolverId}") -public class FilterController { +public class EntityAttributesFilterController { - private static Logger LOGGER = LoggerFactory.getLogger(FilterController.class); + private static Logger LOGGER = LoggerFactory.getLogger(EntityAttributesFilterController.class); @Autowired private MetadataResolverRepository repository; diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/OtherFiltersController.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/OtherFiltersController.java new file mode 100644 index 000000000..d48a7a0e0 --- /dev/null +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/OtherFiltersController.java @@ -0,0 +1,37 @@ +package edu.internet2.tier.shibboleth.admin.ui.controller; + +import edu.internet2.tier.shibboleth.admin.ui.domain.filters.MetadataFilter; +import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository; +import edu.internet2.tier.shibboleth.admin.ui.service.FilterService; +import edu.internet2.tier.shibboleth.admin.ui.service.MetadataResolverService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/api/MetadataResolver/{metadataResolverId}") +public class OtherFiltersController { + + private static Logger LOGGER = LoggerFactory.getLogger(EntityAttributesFilterController.class); + + @Autowired + private MetadataResolverRepository repository; + + @Autowired + private FilterService filterService; + + @Autowired + private MetadataResolverService metadataResolverService; + + @GetMapping("/OtherFilters") + @Transactional(readOnly = true) + public Iterable getAll(@PathVariable String metadataResolverId) { + // TODO: implement lookup based on metadataResolverId once we have more than one + return repository.findAll().iterator().next().getMetadataFilters(); + } +} diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/FilterControllerTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/FilterControllerTests.groovy index 9d8a1f72c..eeba94020 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/FilterControllerTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/controller/FilterControllerTests.groovy @@ -61,7 +61,7 @@ class FilterControllerTests extends Specification { testObjectGenerator = new TestObjectGenerator(attributeUtility) mapper = new ObjectMapper() - controller = new FilterController ( + controller = new EntityAttributesFilterController ( repository: metadataResolverRepository, filterService: filterService, metadataResolverService: new MetadataResolverService() {