From 72eaf873e06eb2be07ebf3dcc315c1f2bb567da3 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Wed, 12 Sep 2018 11:38:54 -0400 Subject: [PATCH] SHIBUI-836: clean up --- .../admin/ui/ShibbolethUiApplication.java | 19 ------------ ...lverPropertyPlaceholderValuesReplacer.java | 17 ----------- ...ertyPlaceholderValuesResolvingService.java | 29 ------------------- 3 files changed, 65 deletions(-) delete mode 100644 backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolverPropertyPlaceholderValuesReplacer.java delete mode 100644 backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolverPropertyPlaceholderValuesResolvingService.java diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/ShibbolethUiApplication.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/ShibbolethUiApplication.java index aa19896ef..1fc74cf9d 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/ShibbolethUiApplication.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/ShibbolethUiApplication.java @@ -1,10 +1,7 @@ package edu.internet2.tier.shibboleth.admin.ui; import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository; -import edu.internet2.tier.shibboleth.admin.ui.service.TokenPlaceholderValueResolvingService; -import edu.internet2.tier.shibboleth.admin.util.TokenPlaceholderResolvers; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.domain.EntityScan; @@ -13,8 +10,6 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.context.annotation.Profile; import org.springframework.context.event.EventListener; -import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; -import org.springframework.core.env.PropertyResolver; import org.springframework.data.jpa.repository.config.EnableJpaAuditing; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.stereotype.Component; @@ -41,24 +36,10 @@ public static class MetadataResolversResourceIdEmitter { @Autowired MetadataResolverRepository metadataResolverRepository; - @Value("${idp.home}") - String idpHome; - - @Autowired - PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer; - - @Autowired - PropertyResolver propertyResolver; - @EventListener void showMetadataResolversResourceIds(ApplicationStartedEvent e) { metadataResolverRepository.findAll() .forEach(it -> System.out.println(String.format("MetadataResolver [%s: %s]", it.getName(), it.getResourceId()))); - - System.out.println("IDP HOME: " + idpHome); - String rawValue = "%{idp.home}/metadata/file.xml"; - String resolved = propertyResolver.resolvePlaceholders(rawValue.replace("%{", "${")); - TokenPlaceholderValueResolvingService service = TokenPlaceholderResolvers.placeholderResolverService(); } } diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolverPropertyPlaceholderValuesReplacer.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolverPropertyPlaceholderValuesReplacer.java deleted file mode 100644 index 10887e97f..000000000 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolverPropertyPlaceholderValuesReplacer.java +++ /dev/null @@ -1,17 +0,0 @@ -package edu.internet2.tier.shibboleth.admin.ui.domain.resolvers; - -/** - * An SPI to resolve and convert data for different types of {@link MetadataResolver}s from possible provided '%{}' placeholders - *

- * Typical usage is - multiple replacers for concrete type of resolvers are configured in Spring Application Context, - * aggregated by {@link MetadataResolverPropertyPlaceholderValuesResolvingService} facade and then that facade is injected into upstream consumers of it - * such as REST controllers, etc. - * - * @author Dmitriy Kopylenko - */ -public interface MetadataResolverPropertyPlaceholderValuesReplacer { - - boolean supports(T metadataResolver); - - void replacePlaceholderValuesIfResolvableOrFail(T metadataResolver); -} diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolverPropertyPlaceholderValuesResolvingService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolverPropertyPlaceholderValuesResolvingService.java deleted file mode 100644 index e7639cfde..000000000 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolverPropertyPlaceholderValuesResolvingService.java +++ /dev/null @@ -1,29 +0,0 @@ -package edu.internet2.tier.shibboleth.admin.ui.domain.resolvers; - -import java.util.ArrayList; -import java.util.List; - -/** - * A facade that aggregates {@link MetadataResolverPropertyPlaceholderValuesReplacer}s available to call just one of them supporting the type of a given resolver. - * If no {@link MetadataResolverPropertyPlaceholderValuesReplacer}s are configured, considers a noop. - * - * Uses chain-of-responsibility design pattern - * - * @author Dmitriy Kopylenko - */ -public class MetadataResolverPropertyPlaceholderValuesResolvingService { - - private List> replacers; - - public MetadataResolverPropertyPlaceholderValuesResolvingService(List> replacers) { - this.replacers = replacers != null ? replacers : new ArrayList<>(); - } - - public void replacePlacehoderValuesOrFail(T metadataResolver) { - this.replacers - .stream() - .filter(r -> r.supports(metadataResolver)) - .findFirst() - .ifPresent(r -> r.replacePlaceholderValuesIfResolvableOrFail(metadataResolver)); - } -}