some code code-style modifications

active code-quality checks!

1 files changed, 45 insertions, 42 deletions

diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/metadata/AbstractChainingMetadataProvider.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/metadata/AbstractChainingMetadataProvider.java
index 8a6105bc..4a9bb89a 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/metadata/AbstractChainingMetadataProvider.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/metadata/AbstractChainingMetadataProvider.java
@@ -28,12 +28,9 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Timer;
+
 import javax.xml.namespace.QName;
-import at.gv.egiz.components.spring.api.IDestroyableObject;
-import at.gv.egiz.eaaf.core.api.IGarbageCollectorProcessing;
-import at.gv.egiz.eaaf.core.exceptions.EaafConfigurationException;
-import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPvpMetadataProvider;
-import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IRefreshableMetadataProvider;
+
 import org.apache.commons.lang3.StringUtils;
 import org.opensaml.saml2.metadata.EntitiesDescriptor;
 import org.opensaml.saml2.metadata.EntityDescriptor;
@@ -48,6 +45,12 @@ import org.opensaml.xml.XMLObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import at.gv.egiz.components.spring.api.IDestroyableObject;
+import at.gv.egiz.eaaf.core.api.IGarbageCollectorProcessing;
+import at.gv.egiz.eaaf.core.exceptions.EaafConfigurationException;
+import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPvpMetadataProvider;
+import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IRefreshableMetadataProvider;
+
 public abstract class AbstractChainingMetadataProvider extends SimpleMetadataProvider
     implements ObservableMetadataProvider, IGarbageCollectorProcessing,
     IRefreshableMetadataProvider, IDestroyableObject, IPvpMetadataProvider {
@@ -58,7 +61,6 @@ public abstract class AbstractChainingMetadataProvider extends SimpleMetadataPro
   private static Object mutex = new Object();
   private Timer timer = null;
 
-
   public AbstractChainingMetadataProvider() {
     internalProvider = new ChainingMetadataProvider();
 
@@ -72,12 +74,16 @@ public abstract class AbstractChainingMetadataProvider extends SimpleMetadataPro
   /*
    * (non-Javadoc)
    *
-   * @see at.gv.egovernment.moa.id.config.auth.IGarbageCollectorProcessing#runGarbageCollector()
+   * @see at.gv.egovernment.moa.id.config.auth.IGarbageCollectorProcessing#
+   * runGarbageCollector()
    */
   @Override
   public void runGarbageCollector() {
     synchronized (mutex) {
-      /* add new Metadataprovider or remove Metadataprovider which are not in use any more. */
+      /*
+       * add new Metadataprovider or remove Metadataprovider which are not in use any
+       * more.
+       */
       try {
         log.trace("Check consistence of PVP2X metadata");
         addAndRemoveMetadataProvider();
@@ -110,7 +116,6 @@ public abstract class AbstractChainingMetadataProvider extends SimpleMetadataPro
 
       }
 
-
       // reload metadata provider
       final String metadataUrl = getMetadataUrl(entityID);
       if (StringUtils.isNotEmpty(metadataUrl)) {
@@ -195,12 +200,11 @@ public abstract class AbstractChainingMetadataProvider extends SimpleMetadataPro
     }
   }
 
-
   /*
    * (non-Javadoc)
    *
-   * @see
-   * at.gv.egovernment.moa.id.protocols.pvp2x.metadata.IEAAFMetadataProvider#requireValidMetadata()
+   * @see at.gv.egovernment.moa.id.protocols.pvp2x.metadata.IEAAFMetadataProvider#
+   * requireValidMetadata()
    */
   @Override
   public boolean requireValidMetadata() {
@@ -210,9 +214,8 @@ public abstract class AbstractChainingMetadataProvider extends SimpleMetadataPro
   /*
    * (non-Javadoc)
    *
-   * @see
-   * at.gv.egovernment.moa.id.protocols.pvp2x.metadata.IEAAFMetadataProvider#setRequireValidMetadata
-   * (boolean)
+   * @see at.gv.egovernment.moa.id.protocols.pvp2x.metadata.IEAAFMetadataProvider#
+   * setRequireValidMetadata (boolean)
    */
   @Override
   public void setRequireValidMetadata(final boolean requireValidMetadata) {
@@ -222,8 +225,8 @@ public abstract class AbstractChainingMetadataProvider extends SimpleMetadataPro
   /*
    * (non-Javadoc)
    *
-   * @see
-   * at.gv.egovernment.moa.id.protocols.pvp2x.metadata.IEAAFMetadataProvider#getMetadataFilter()
+   * @see at.gv.egovernment.moa.id.protocols.pvp2x.metadata.IEAAFMetadataProvider#
+   * getMetadataFilter()
    */
   @Override
   public MetadataFilter getMetadataFilter() {
@@ -233,9 +236,8 @@ public abstract class AbstractChainingMetadataProvider extends SimpleMetadataPro
   /*
    * (non-Javadoc)
    *
-   * @see
-   * at.gv.egovernment.moa.id.protocols.pvp2x.metadata.IEAAFMetadataProvider#setMetadataFilter(org.
-   * opensaml.saml2.metadata.provider.MetadataFilter)
+   * @see at.gv.egovernment.moa.id.protocols.pvp2x.metadata.IEAAFMetadataProvider#
+   * setMetadataFilter(org. opensaml.saml2.metadata.provider.MetadataFilter)
    */
   @Override
   public void setMetadataFilter(final MetadataFilter newFilter) throws MetadataProviderException {
@@ -245,7 +247,8 @@ public abstract class AbstractChainingMetadataProvider extends SimpleMetadataPro
   /*
    * (non-Javadoc)
    *
-   * @see at.gv.egovernment.moa.id.protocols.pvp2x.metadata.IEAAFMetadataProvider#getMetadata()
+   * @see at.gv.egovernment.moa.id.protocols.pvp2x.metadata.IEAAFMetadataProvider#
+   * getMetadata()
    */
   @Override
   public XMLObject getMetadata() throws MetadataProviderException {
@@ -255,9 +258,8 @@ public abstract class AbstractChainingMetadataProvider extends SimpleMetadataPro
   /*
    * (non-Javadoc)
    *
-   * @see
-   * at.gv.egovernment.moa.id.protocols.pvp2x.metadata.IEAAFMetadataProvider#getEntitiesDescriptor(
-   * java.lang.String)
+   * @see at.gv.egovernment.moa.id.protocols.pvp2x.metadata.IEAAFMetadataProvider#
+   * getEntitiesDescriptor( java.lang.String)
    */
   @Override
   public EntitiesDescriptor getEntitiesDescriptor(final String entitiesID)
@@ -290,9 +292,8 @@ public abstract class AbstractChainingMetadataProvider extends SimpleMetadataPro
   /*
    * (non-Javadoc)
    *
-   * @see
-   * at.gv.egovernment.moa.id.protocols.pvp2x.metadata.IEAAFMetadataProvider#getEntityDescriptor(
-   * java.lang.String)
+   * @see at.gv.egovernment.moa.id.protocols.pvp2x.metadata.IEAAFMetadataProvider#
+   * getEntityDescriptor( java.lang.String)
    */
   @Override
   public EntityDescriptor getEntityDescriptor(final String entityID)
@@ -327,8 +328,8 @@ public abstract class AbstractChainingMetadataProvider extends SimpleMetadataPro
   /*
    * (non-Javadoc)
    *
-   * @see at.gv.egovernment.moa.id.protocols.pvp2x.metadata.IEAAFMetadataProvider#getRole(java.lang.
-   * String, javax.xml.namespace.QName)
+   * @see at.gv.egovernment.moa.id.protocols.pvp2x.metadata.IEAAFMetadataProvider#
+   * getRole(java.lang. String, javax.xml.namespace.QName)
    */
   @Override
   public List<RoleDescriptor> getRole(final String entityID, final QName roleName)
@@ -344,8 +345,8 @@ public abstract class AbstractChainingMetadataProvider extends SimpleMetadataPro
   /*
    * (non-Javadoc)
    *
-   * @see at.gv.egovernment.moa.id.protocols.pvp2x.metadata.IEAAFMetadataProvider#getRole(java.lang.
-   * String, javax.xml.namespace.QName, java.lang.String)
+   * @see at.gv.egovernment.moa.id.protocols.pvp2x.metadata.IEAAFMetadataProvider#
+   * getRole(java.lang. String, javax.xml.namespace.QName, java.lang.String)
    */
   @Override
   public RoleDescriptor getRole(final String entityID, final QName roleName,
@@ -361,14 +362,15 @@ public abstract class AbstractChainingMetadataProvider extends SimpleMetadataPro
   /*
    * (non-Javadoc)
    *
-   * @see org.opensaml.saml2.metadata.provider.ObservableMetadataProvider#getObservers()
+   * @see
+   * org.opensaml.saml2.metadata.provider.ObservableMetadataProvider#getObservers(
+   * )
    */
   @Override
   public List<Observer> getObservers() {
     return ((ChainingMetadataProvider) internalProvider).getObservers();
   }
 
-
   /**
    * Get the URL to metadata for a specific entityID.
    *
@@ -384,9 +386,9 @@ public abstract class AbstractChainingMetadataProvider extends SimpleMetadataPro
    * @param entityId EntityId
    * @return MetadataProvider
    * @throws EaafConfigurationException In case of an error
-   * @throws IOException  In case of an error
-   * @throws CertificateException  In case of an error
-   * @throws ConfigurationException  In case of an error
+   * @throws IOException                In case of an error
+   * @throws CertificateException       In case of an error
+   * @throws ConfigurationException     In case of an error
    */
   protected abstract MetadataProvider createNewMetadataProvider(String entityId)
       throws EaafConfigurationException, IOException, CertificateException;
@@ -399,7 +401,6 @@ public abstract class AbstractChainingMetadataProvider extends SimpleMetadataPro
   protected abstract List<String> getAllMetadataUrlsFromConfiguration()
       throws EaafConfigurationException;
 
-
   protected void emitChangeEvent() {
     if (getObservers() == null || getObservers().size() == 0) {
       return;
@@ -447,9 +448,10 @@ public abstract class AbstractChainingMetadataProvider extends SimpleMetadataPro
       final Map<String, HTTPMetadataProvider> loadedproviders = getAllActuallyLoadedProviders();
 
       /*
-       * TODO: maybe add metadata provider destroy after timeout. But could be a problem if one
-       * Metadataprovider load an EntitiesDescriptor with more the multiple EntityDescriptors. If
-       * one of this EntityDesciptors are expired the full EntitiesDescriptor is removed.
+       * TODO: maybe add metadata provider destroy after timeout. But could be a
+       * problem if one Metadataprovider load an EntitiesDescriptor with more the
+       * multiple EntityDescriptors. If one of this EntityDesciptors are expired the
+       * full EntitiesDescriptor is removed.
        *
        * Timeout requires a better solution in this case!
        */
@@ -464,7 +466,7 @@ public abstract class AbstractChainingMetadataProvider extends SimpleMetadataPro
           final String metadataurl = metadataUrlInterator.next();
           try {
             if (StringUtils.isNotEmpty(metadataurl)
-            	&& loadedproviders.containsKey(metadataurl)) {
+                && loadedproviders.containsKey(metadataurl)) {
               // SAML2 SP is actually loaded, to nothing
               providersinuse.put(metadataurl, loadedproviders.get(metadataurl));
               loadedproviders.remove(metadataurl);
@@ -477,7 +479,8 @@ public abstract class AbstractChainingMetadataProvider extends SimpleMetadataPro
         }
       }
 
-      // remove all actually loaded MetadataProviders with are not in ConfigurationDB any more
+      // remove all actually loaded MetadataProviders with are not in ConfigurationDB
+      // any more
       final Collection<HTTPMetadataProvider> notusedproviders = loadedproviders.values();
       for (final HTTPMetadataProvider provider : notusedproviders) {
         final String metadataurl = provider.getMetadataURI();