Skip to content

Commit

Permalink
Work in progress
Browse files Browse the repository at this point in the history
  • Loading branch information
dima767 committed May 30, 2018
1 parent c4de070 commit fcd6b3c
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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<MetadataFilter> getAll(@PathVariable String metadataResolverId) {
// TODO: implement lookup based on metadataResolverId once we have more than one
return repository.findAll().iterator().next().getMetadataFilters();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down

0 comments on commit fcd6b3c

Please sign in to comment.