Groovy-fy

TIER · Jun 7, 2018 · 1a9adf5 · 1a9adf5
1 parent 1ef2371
commit 1a9adf5
Showing 1 changed file with 33 additions and 35 deletions.
diff --git a/...oovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy b/...oovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy
@@ -1,28 +1,28 @@
 package edu.internet2.tier.shibboleth.admin.ui.service;
 
-import com.google.common.base.Predicate;
-import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFilter;
+import com.google.common.base.Predicate
+import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFilter
 import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFilterTarget
-import edu.internet2.tier.shibboleth.admin.ui.opensaml.OpenSamlObjects;
+import edu.internet2.tier.shibboleth.admin.ui.opensaml.OpenSamlObjects
 import edu.internet2.tier.shibboleth.admin.ui.repository.MetadataResolverRepository
+import groovy.util.logging.Slf4j
 import groovy.xml.DOMBuilder
-import groovy.xml.MarkupBuilder;
-import net.shibboleth.utilities.java.support.resolver.ResolverException;
-import org.opensaml.saml.common.profile.logic.EntityIdPredicate;
-import org.opensaml.saml.metadata.resolver.ChainingMetadataResolver;
-import org.opensaml.saml.metadata.resolver.MetadataResolver;
-import org.opensaml.saml.metadata.resolver.RefreshableMetadataResolver;
-import org.opensaml.saml.metadata.resolver.filter.MetadataFilter;
-import org.opensaml.saml.metadata.resolver.filter.MetadataFilterChain;
-import org.opensaml.saml.saml2.core.Attribute;
-import org.opensaml.saml.saml2.metadata.EntityDescriptor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import groovy.xml.MarkupBuilder
+import net.shibboleth.utilities.java.support.resolver.ResolverException
+import org.opensaml.saml.common.profile.logic.EntityIdPredicate
+import org.opensaml.saml.metadata.resolver.ChainingMetadataResolver
+import org.opensaml.saml.metadata.resolver.MetadataResolver
+import org.opensaml.saml.metadata.resolver.RefreshableMetadataResolver
+import org.opensaml.saml.metadata.resolver.filter.MetadataFilter
+import org.opensaml.saml.metadata.resolver.filter.MetadataFilterChain
+import org.opensaml.saml.saml2.core.Attribute
+import org.opensaml.saml.saml2.metadata.EntityDescriptor
+
 import org.springframework.beans.factory.annotation.Autowired;
-import org.w3c.dom.Document;
+import org.w3c.dom.Document
 
-public class JPAMetadataResolverServiceImpl implements MetadataResolverService {
-    private static final Logger logger = LoggerFactory.getLogger(JPAMetadataResolverServiceImpl.class);
+@Slf4j
+class JPAMetadataResolverServiceImpl implements MetadataResolverService {
 
     @Autowired
     private MetadataResolver metadataResolver
@@ -35,49 +35,47 @@ public class JPAMetadataResolverServiceImpl implements MetadataResolverService {
 
     // TODO: enhance
     @Override
-    public void reloadFilters(String metadataResolverName) {
-        ChainingMetadataResolver chainingMetadataResolver = (ChainingMetadataResolver)metadataResolver;
-
-        // MetadataResolver targetMetadataResolver = chainingMetadataResolver.getResolvers().stream().filter(r -> r.getId().equals(metadataResolverName)).findFirst().get();
+    void reloadFilters(String metadataResolverName) {
+        ChainingMetadataResolver chainingMetadataResolver = (ChainingMetadataResolver)metadataResolver
         MetadataResolver targetMetadataResolver = chainingMetadataResolver.getResolvers().find { it.id == metadataResolverName }
-        edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver jpaMetadataResolver = metadataResolverRepository.findByName(metadataResolverName);
+        edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver jpaMetadataResolver = metadataResolverRepository.findByName(metadataResolverName)
 
         if (targetMetadataResolver && targetMetadataResolver.getMetadataFilter() instanceof MetadataFilterChain) {
-            MetadataFilterChain metadataFilterChain = (MetadataFilterChain)targetMetadataResolver.getMetadataFilter();
+            MetadataFilterChain metadataFilterChain = (MetadataFilterChain)targetMetadataResolver.getMetadataFilter()
 
-            List<MetadataFilter> metadataFilters = new ArrayList<>();
+            List<MetadataFilter> metadataFilters = new ArrayList<>()
 
             for (edu.internet2.tier.shibboleth.admin.ui.domain.filters.MetadataFilter metadataFilter : jpaMetadataResolver.getMetadataFilters()) {
                 if (metadataFilter instanceof EntityAttributesFilter) {
-                    EntityAttributesFilter entityAttributesFilter = (EntityAttributesFilter) metadataFilter;
+                    EntityAttributesFilter entityAttributesFilter = (EntityAttributesFilter) metadataFilter
 
-                    org.opensaml.saml.metadata.resolver.filter.impl.EntityAttributesFilter target = new org.opensaml.saml.metadata.resolver.filter.impl.EntityAttributesFilter();
-                    Map<Predicate<EntityDescriptor>, Collection<Attribute>> rules = new HashMap<>();
+                    org.opensaml.saml.metadata.resolver.filter.impl.EntityAttributesFilter target = new org.opensaml.saml.metadata.resolver.filter.impl.EntityAttributesFilter()
+                    Map<Predicate<EntityDescriptor>, Collection<Attribute>> rules = new HashMap<>()
                     if (entityAttributesFilter.getEntityAttributesFilterTarget().getEntityAttributesFilterTargetType() == EntityAttributesFilterTarget.EntityAttributesFilterTargetType.ENTITY) {
                         rules.put(
                                 new EntityIdPredicate(entityAttributesFilter.getEntityAttributesFilterTarget().getValue()),
                                 (List<Attribute>)(List<? extends Attribute>)entityAttributesFilter.getAttributes()
-                        );
+                        )
                     }
-                    target.setRules(rules);
-                    metadataFilters.add(target);
+                    target.setRules(rules)
+                    metadataFilters.add(target)
                 }
             }
-            metadataFilterChain.setFilters(metadataFilters);
+            metadataFilterChain.setFilters(metadataFilters)
         }
 
         if (metadataResolver instanceof RefreshableMetadataResolver) {
             try {
-                ((RefreshableMetadataResolver)metadataResolver).refresh();
+                ((RefreshableMetadataResolver)metadataResolver).refresh()
             } catch (ResolverException e) {
-                logger.warn("error refreshing metadataResolver " + metadataResolverName, e);
+                log.warn("error refreshing metadataResolver " + metadataResolverName, e)
             }
         }
     }
 
     // TODO: enhance
     @Override
-    public Document generateConfiguration() {
+    Document generateConfiguration() {
         // TODO: this can probably be a better writer
         new StringWriter().withCloseable { writer ->
             def xml = new MarkupBuilder(writer)