-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
5 changed files
with
121 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 39 additions & 3 deletions
42
...er/shibboleth/admin/ui/service/DefaultMetadataResolversPositionOrderContainerService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,54 @@ | ||
| package edu.internet2.tier.shibboleth.admin.ui.service; | ||
|
|
||
| import com.google.common.collect.Lists; | ||
| import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver; | ||
| import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolversPositionOrderContainer; | ||
| import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository; | ||
| import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolversPositionOrderContainerRepository; | ||
| import org.springframework.transaction.annotation.Transactional; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.Optional; | ||
|
|
||
| import static java.util.stream.Collectors.toList; | ||
|
|
||
|
|
||
| public class DefaultMetadataResolversPositionOrderContainerService implements MetadataResolversPositionOrderContainerService { | ||
|
|
||
| @Override | ||
| public Optional<MetadataResolversPositionOrderContainer> getPositionOrderContainerIfExists() { | ||
| return Optional.empty(); | ||
| private MetadataResolversPositionOrderContainerRepository positionOrderContainerRepository; | ||
|
|
||
| private MetadataResolverRepository metadataResolverRepository; | ||
|
|
||
| public DefaultMetadataResolversPositionOrderContainerService(MetadataResolversPositionOrderContainerRepository positionOrderRepository, | ||
| MetadataResolverRepository metadataResolverRepository) { | ||
| this.positionOrderContainerRepository = positionOrderRepository; | ||
| this.metadataResolverRepository = metadataResolverRepository; | ||
| } | ||
|
|
||
| @Override | ||
| @Transactional | ||
| public void persistPositionOrderContainer(MetadataResolversPositionOrderContainer metadataResolversPositionOrderContainer) { | ||
| positionOrderContainerRepository.save(metadataResolversPositionOrderContainer); | ||
| } | ||
|
|
||
| @Override | ||
| @Transactional(readOnly = true) | ||
| public List<MetadataResolver> getAllMetadataResolversInDefinedOrderOrUnordered() { | ||
| Optional<MetadataResolversPositionOrderContainer> orderContainer = getPositionOrderContainerIfExists(); | ||
| if(orderContainer.isPresent()) { | ||
| return orderContainer.get().getResourceIds() | ||
| .stream() | ||
| .map(metadataResolverRepository::findByResourceId) | ||
| .collect(toList()); | ||
| } | ||
|
|
||
| return Lists.newArrayList(metadataResolverRepository.findAll()); | ||
| } | ||
|
|
||
| private Optional<MetadataResolversPositionOrderContainer> getPositionOrderContainerIfExists() { | ||
| return positionOrderContainerRepository.findAll().iterator().hasNext() | ||
| ? Optional.of(positionOrderContainerRepository.findAll().iterator().next()) | ||
| : Optional.empty(); | ||
| } | ||
| } |
12 changes: 8 additions & 4 deletions
12
...net2/tier/shibboleth/admin/ui/service/MetadataResolversPositionOrderContainerService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,21 @@ | ||
| package edu.internet2.tier.shibboleth.admin.ui.service; | ||
|
|
||
| import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver; | ||
| import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolversPositionOrderContainer; | ||
|
|
||
| import java.util.Optional; | ||
| import java.util.List; | ||
|
|
||
| /** | ||
| * Service interface for manipulation of instances of {@link MetadataResolversPositionOrderContainer}. | ||
| * Service interface for manipulation of instances of {@link MetadataResolversPositionOrderContainer} and | ||
| * encapsulate MetadataResolvers ordering logic. | ||
| * | ||
| * @author Dmitriy Kopylenko | ||
| */ | ||
| public interface MetadataResolversPositionOrderContainerService { | ||
|
|
||
| Optional<MetadataResolversPositionOrderContainer> getPositionOrderContainerIfExists(); | ||
|
|
||
| void persistPositionOrderContainer(MetadataResolversPositionOrderContainer metadataResolversPositionOrderContainer); | ||
|
|
||
| List<MetadataResolver> getAllMetadataResolversInDefinedOrderOrUnordered(); | ||
|
|
||
|
|
||
| } |
53 changes: 53 additions & 0 deletions
53
...er/shibboleth/admin/ui/service/MetadataResolversPositionOrderContainerServiceTests.groovy
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| package edu.internet2.tier.shibboleth.admin.ui.service | ||
|
|
||
| import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver | ||
| import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolversPositionOrderContainer | ||
| import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository | ||
| import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolversPositionOrderContainerRepository | ||
| import spock.lang.Specification | ||
| import spock.lang.Subject | ||
|
|
||
| /** | ||
| * @author Dmitriy Kopylenko | ||
| */ | ||
| class MetadataResolversPositionOrderContainerServiceTests extends Specification { | ||
|
|
||
| def "no order container has been provided and saved, so using unordered persisted resolvers"() { | ||
| given: | ||
| def resolverRepo = Mock(MetadataResolverRepository) | ||
| resolverRepo.findAll() >> [new MetadataResolver(resourceId: 'second'), new MetadataResolver(resourceId: 'first')] | ||
| def positionOrderRepo = Mock(MetadataResolversPositionOrderContainerRepository) | ||
| positionOrderRepo.findAll() >> [] | ||
| @Subject | ||
| def positionContainerSvc = new DefaultMetadataResolversPositionOrderContainerService(positionOrderRepo, resolverRepo) | ||
|
|
||
| when: | ||
| def unorderedResolvers = positionContainerSvc.getAllMetadataResolversInDefinedOrderOrUnordered() | ||
|
|
||
| then: | ||
| unorderedResolvers[0].resourceId == 'second' | ||
| unorderedResolvers[1].resourceId == 'first' | ||
|
|
||
| } | ||
|
|
||
| def "an order container has been provided and saved, so using resolvers with order defined in that position order container"() { | ||
| given: | ||
| def resolverRepo = Mock(MetadataResolverRepository) | ||
| resolverRepo.findAll() >> [new MetadataResolver(resourceId: 'second'), new MetadataResolver(resourceId: 'first')] | ||
| resolverRepo.findByResourceId('first') >> new MetadataResolver(resourceId: 'first') | ||
| resolverRepo.findByResourceId('second') >> new MetadataResolver(resourceId: 'second') | ||
| def positionOrderRepo = Mock(MetadataResolversPositionOrderContainerRepository) | ||
| positionOrderRepo.findAll() >> [new MetadataResolversPositionOrderContainer(resourceIds: ['first', 'second'])] | ||
| positionOrderRepo.findAll() >> [] | ||
| @Subject | ||
| def positionContainerSvc = new DefaultMetadataResolversPositionOrderContainerService(positionOrderRepo, resolverRepo) | ||
|
|
||
| when: | ||
| def orderedResolvers = positionContainerSvc.getAllMetadataResolversInDefinedOrderOrUnordered() | ||
|
|
||
| then: | ||
| orderedResolvers[0].resourceId == 'first' | ||
| orderedResolvers[1].resourceId == 'second' | ||
|
|
||
| } | ||
| } |