some code code-style modifications

active code-quality checks!

1 files changed, 27 insertions, 25 deletions

diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/metadata/SimpleMetadataProvider.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/metadata/SimpleMetadataProvider.java
index 67dd1d35..d63950cb 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/metadata/SimpleMetadataProvider.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/metadata/SimpleMetadataProvider.java
@@ -22,11 +22,9 @@ package at.gv.egiz.eaaf.modules.pvp2.impl.metadata;
 import java.io.File;
 import java.net.MalformedURLException;
 import java.util.Timer;
+
 import javax.net.ssl.SSLHandshakeException;
-import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
-import at.gv.egiz.eaaf.core.impl.utils.FileUtils;
-import at.gv.egiz.eaaf.modules.pvp2.exception.SchemaValidationException;
-import at.gv.egiz.eaaf.modules.pvp2.exception.SignatureValidationException;
+
 import org.apache.commons.httpclient.HttpClient;
 import org.opensaml.saml2.metadata.provider.FilesystemMetadataProvider;
 import org.opensaml.saml2.metadata.provider.HTTPMetadataProvider;
@@ -37,6 +35,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
+import at.gv.egiz.eaaf.core.impl.utils.FileUtils;
+import at.gv.egiz.eaaf.modules.pvp2.exception.SchemaValidationException;
+import at.gv.egiz.eaaf.modules.pvp2.exception.SignatureValidationException;
+
 /**
  * Simple SAML2 metadata provider.
  *
@@ -50,23 +53,26 @@ public abstract class SimpleMetadataProvider implements MetadataProvider {
   private static final String URI_PREFIX_HTTPS = "https:";
   private static final String URI_PREFIX_FILE = "file:";
 
-
   @Autowired
   protected IConfiguration authConfig;
 
-
   /**
    * Create a single SAML2 metadata provider.
    *
-   * @param metadataLocation where the metadata should be loaded, but never null. If the location
-   *        starts with http(s):, than a http based metadata provider is used. If the location
-   *        starts with file:, than a filesystem based metadata provider is used
-   * @param filter Filters, which should be used to validate the metadata
-   * @param idForLogging Id, which is used for Logging
-   * @param timer {@link Timer} which is used to schedule metadata refresh operations
-   * @param httpClient Apache commons 3.x http client
+   * @param metadataLocation where the metadata should be loaded, but never null.
+   *                         If the location starts with http(s):, than a http
+   *                         based metadata provider is used. If the location
+   *                         starts with file:, than a filesystem based metadata
+   *                         provider is used
+   * @param filter           Filters, which should be used to validate the
+   *                         metadata
+   * @param idForLogging     Id, which is used for Logging
+   * @param timer            {@link Timer} which is used to schedule metadata
+   *                         refresh operations
+   * @param httpClient       Apache commons 3.x http client
    *
-   * @return SAML2 Metadata Provider, or null if the metadata provider can not initialized
+   * @return SAML2 Metadata Provider, or null if the metadata provider can not
+   *         initialized
    */
   protected MetadataProvider createNewSimpleMetadataProvider(final String metadataLocation,
       final MetadataFilter filter, final String idForLogging, final Timer timer,
@@ -100,7 +106,6 @@ public abstract class SimpleMetadataProvider implements MetadataProvider {
 
         }
 
-
       } catch (final MalformedURLException e) {
         log.warn("SAML2 metadata URL is invalid: " + metadataLocation, e);
 
@@ -113,14 +118,14 @@ public abstract class SimpleMetadataProvider implements MetadataProvider {
 
   }
 
-
   /**
    * Create a single SAML2 filesystem based metadata provider.
    *
    * @param metadataFile File, where the metadata should be loaded
-   * @param filter Filters, which should be used to validate the metadata
+   * @param filter       Filters, which should be used to validate the metadata
    * @param idForLogging Id, which is used for Logging
-   * @param timer {@link Timer} which is used to schedule metadata refresh operations
+   * @param timer        {@link Timer} which is used to schedule metadata refresh
+   *                     operations
    * @param pool
    *
    * @return SAML2 Metadata Provider
@@ -148,7 +153,6 @@ public abstract class SimpleMetadataProvider implements MetadataProvider {
       log.warn("Failed to load Metadata file for " + idForLogging + "[ " + "File: "
           + metadataFile.getAbsolutePath() + " Msg: " + e.getMessage() + " ]", e);
 
-
       log.warn("Can not initialize SAML2 metadata provider from filesystem: "
           + metadataFile.getAbsolutePath() + " Reason: " + e.getMessage(), e);
 
@@ -162,15 +166,14 @@ public abstract class SimpleMetadataProvider implements MetadataProvider {
 
   }
 
-
-
   /**
    * Create a single SAML2 HTTP metadata provider.
    *
-   * @param metadataUrl URL, where the metadata should be loaded
-   * @param filter Filters, which should be used to validate the metadata
+   * @param metadataUrl  URL, where the metadata should be loaded
+   * @param filter       Filters, which should be used to validate the metadata
    * @param idForLogging Id, which is used for Logging
-   * @param timer {@link Timer} which is used to schedule metadata refresh operations
+   * @param timer        {@link Timer} which is used to schedule metadata refresh
+   *                     operations
    * @param pool
    *
    * @return SAML2 Metadata Provider
@@ -220,7 +223,6 @@ public abstract class SimpleMetadataProvider implements MetadataProvider {
       // timer.cancel();
       // }
 
-
     }
 
     return null;