[SHIBUI-704]

Cleaned up comments/TODOs. Swapped a println for a logger.
TIER · Nov 28, 2018 · 83d5198 · 83d5198
1 parent 6111e57
commit 83d5198
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
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
@@ -1,8 +1,9 @@
 package edu.internet2.tier.shibboleth.admin.ui;
 
-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.MetadataResolverService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -20,8 +21,6 @@
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
-
 @SpringBootApplication
 @ComponentScan(excludeFilters = @ComponentScan.Filter(type = FilterType.REGEX, pattern = "edu.internet2.tier.shibboleth.admin.ui.configuration.auto.*"))
 @EntityScan(basePackages = {"edu.internet2.tier.shibboleth.admin.ui.domain", "edu.internet2.tier.shibboleth.admin.ui.security.model"})
@@ -30,6 +29,8 @@
 @EnableWebSecurity
 public class ShibbolethUiApplication extends SpringBootServletInitializer {
 
+    private static final Logger logger = LoggerFactory.getLogger(ShibbolethUiApplication.class);
+
     @Override
     protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
         return builder.sources(ShibbolethUiApplication.class);
@@ -49,7 +50,7 @@ public static class MetadataResolversResourceIdEmitter {
         @EventListener
         public void showMetadataResolversResourceIds(ApplicationStartedEvent e) {
             metadataResolverRepository.findAll()
-                    .forEach(it -> System.out.println(String.format("MetadataResolver [%s: %s]", it.getName(), it.getResourceId())));
+                    .forEach(it -> logger.info(String.format("MetadataResolver [%s: %s]", it.getName(), it.getResourceId())));
         }
     }
 
@@ -67,9 +68,7 @@ public static class MetadataResolverInitializingApplicationStartupListener {
         public void initializeResolvers(ApplicationStartedEvent e) {
             metadataResolverRepository.findAll()
                     .forEach(it -> {
-                        System.out.println(String.format("Reloading filters for resolver [%s: %s]", it.getName(), it.getResourceId()));
-//                        List<MetadataFilter> filters = it.getMetadataFilters();
-//                        filters.forEach(System.out::println);
+                        logger.info(String.format("Reloading filters for resolver [%s: %s]", it.getName(), it.getResourceId()));
                         metadataResolverService.reloadFilters(it.getResourceId());
                     });
         }

diff --git a/...admin/ui/domain/resolvers/opensaml/OpenSamlFunctionDrivenDynamicHTTPMetadataResolver.java b/...admin/ui/domain/resolvers/opensaml/OpenSamlFunctionDrivenDynamicHTTPMetadataResolver.java
@@ -53,12 +53,13 @@ public OpenSamlFunctionDrivenDynamicHTTPMetadataResolver(ParserPool parserPool,
                 this.setRequestURLBuilder(new MetadataQueryProtocolRequestURLBuilder(sourceResolver.getMetadataRequestURLConstructionScheme().getContent()));
                 break;
             case TEMPLATE:
+                //TODO: address this later with a prebuilt configuration
                 TemplateScheme templateScheme = (TemplateScheme) sourceResolver.getMetadataRequestURLConstructionScheme();
                 this.setRequestURLBuilder(new TemplateRequestURLBuilder(
-                        new VelocityEngine(), // we may want to do something with this here: templateScheme.getVelocityEngine()
+                        new VelocityEngine(), //TODO: we may want to do something with this here: templateScheme.getVelocityEngine()
                         templateScheme.getContent(),
                         TemplateRequestURLBuilder.EncodingStyle.valueOf(templateScheme.getEncodingStyle().toString().toLowerCase()),
-                        null)); // this may need to be an actual Function, but all we have is a ref
+                        null)); //TODO: this may need to be an actual Function, but all we have is a ref
                 break;
             case REGEX:
                 RegexScheme regexScheme = (RegexScheme) sourceResolver.getMetadataRequestURLConstructionScheme();