some code code-style modifications

active code-quality checks!

5 files changed, 19 insertions, 18 deletions

diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/EaafKeyStoreX509CredentialAdapter.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/EaafKeyStoreX509CredentialAdapter.java
index a6d2508d..92d8f4b9 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/EaafKeyStoreX509CredentialAdapter.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/EaafKeyStoreX509CredentialAdapter.java
@@ -20,8 +20,8 @@
 package at.gv.egiz.eaaf.modules.pvp2.impl.opensaml;
 
 import java.security.KeyStore;
-import org.opensaml.xml.security.x509.X509Credential;
 
+import org.opensaml.xml.security.x509.X509Credential;
 
 /**
  * OpenSAML2 KeyStore adapter.
@@ -35,8 +35,8 @@ public class EaafKeyStoreX509CredentialAdapter
   /**
    * Get an OpenSAML2 keystore.
    *
-   * @param store Java KeyStore
-   * @param alias Key alias
+   * @param store    Java KeyStore
+   * @param alias    Key alias
    * @param password key Password
    */
   public EaafKeyStoreX509CredentialAdapter(final KeyStore store, final String alias,
@@ -49,5 +49,4 @@ public class EaafKeyStoreX509CredentialAdapter
     return X509Credential.class;
   }
 
-
 }
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/HttpPostEncoderWithOwnTemplate.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/HttpPostEncoderWithOwnTemplate.java
index 957def02..404b4e8e 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/HttpPostEncoderWithOwnTemplate.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/HttpPostEncoderWithOwnTemplate.java
@@ -25,8 +25,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
-import at.gv.egiz.eaaf.core.api.gui.IVelocityGuiBuilderConfiguration;
-import at.gv.egiz.eaaf.core.api.gui.IVelocityGuiFormBuilder;
+
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
 import org.opensaml.common.binding.SAMLMessageContext;
@@ -37,6 +36,9 @@ import org.opensaml.ws.transport.http.HTTPTransportUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import at.gv.egiz.eaaf.core.api.gui.IVelocityGuiBuilderConfiguration;
+import at.gv.egiz.eaaf.core.api.gui.IVelocityGuiFormBuilder;
+
 /**
  * OpenSAML2 Post-Binding encoder that uses dynamic loaded templates.
  *
@@ -46,7 +48,6 @@ import org.slf4j.LoggerFactory;
 public class HttpPostEncoderWithOwnTemplate extends HTTPPostEncoder {
   private static final Logger log = LoggerFactory.getLogger(HttpPostEncoderWithOwnTemplate.class);
 
-
   private final VelocityEngine velocityEngine;
   private final IVelocityGuiBuilderConfiguration guiConfig;
   private final IVelocityGuiFormBuilder guiBuilder;
@@ -54,9 +55,9 @@ public class HttpPostEncoderWithOwnTemplate extends HTTPPostEncoder {
   /**
    * Own Post-Binding encoder.
    *
-   * @param guiConfig GUI configuration
+   * @param guiConfig  GUI configuration
    * @param guiBuilder GUI builder implementation
-   * @param engine velocity engine
+   * @param engine     velocity engine
    */
   public HttpPostEncoderWithOwnTemplate(final IVelocityGuiBuilderConfiguration guiConfig,
       final IVelocityGuiFormBuilder guiBuilder, final VelocityEngine engine) {
@@ -68,12 +69,14 @@ public class HttpPostEncoderWithOwnTemplate extends HTTPPostEncoder {
   }
 
   /**
-   * Base64 and POST encodes the outbound message and writes it to the outbound transport.
+   * Base64 and POST encodes the outbound message and writes it to the outbound
+   * transport.
    *
    * @param messageContext current message context
-   * @param endpointUrl endpoint URL to which to encode message
+   * @param endpointUrl    endpoint URL to which to encode message
    *
-   * @throws MessageEncodingException thrown if there is a problem encoding the message
+   * @throws MessageEncodingException thrown if there is a problem encoding the
+   *                                  message
    */
   @Override
   protected void postEncode(final SAMLMessageContext messageContext, final String endpointUrl)
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/StringRedirectDeflateEncoder.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/StringRedirectDeflateEncoder.java
index 2def1446..8838daec 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/StringRedirectDeflateEncoder.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/StringRedirectDeflateEncoder.java
@@ -19,7 +19,6 @@
 
 package at.gv.egiz.eaaf.modules.pvp2.impl.opensaml;
 
-import at.gv.egiz.eaaf.modules.pvp2.impl.opensaml.initialize.EaafDefaultSaml2Bootstrap;
 import org.opensaml.common.binding.SAMLMessageContext;
 import org.opensaml.saml2.binding.encoding.HTTPRedirectDeflateEncoder;
 import org.opensaml.ws.message.MessageContext;
@@ -27,6 +26,8 @@ import org.opensaml.ws.message.encoder.MessageEncodingException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import at.gv.egiz.eaaf.modules.pvp2.impl.opensaml.initialize.EaafDefaultSaml2Bootstrap;
+
 /**
  * Create deflate encoded SAML2 redirect-binding informations.
  *
@@ -71,5 +72,4 @@ public class StringRedirectDeflateEncoder extends HTTPRedirectDeflateEncoder {
     return redirectUrl;
   }
 
-
 }
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/initialize/EaafDefaultSaml2Bootstrap.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/initialize/EaafDefaultSaml2Bootstrap.java
index 9db8e5e7..9625b591 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/initialize/EaafDefaultSaml2Bootstrap.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/initialize/EaafDefaultSaml2Bootstrap.java
@@ -19,6 +19,9 @@
 
 package at.gv.egiz.eaaf.modules.pvp2.impl.opensaml.initialize;
 
+import org.opensaml.DefaultBootstrap;
+import org.opensaml.xml.ConfigurationException;
+
 import at.gv.egiz.eaaf.modules.pvp2.api.reqattr.EaafRequestedAttribute;
 import at.gv.egiz.eaaf.modules.pvp2.api.reqattr.EaafRequestedAttributes;
 import at.gv.egiz.eaaf.modules.pvp2.impl.builder.reqattr.EaafRequestedAttributeBuilder;
@@ -27,8 +30,6 @@ import at.gv.egiz.eaaf.modules.pvp2.impl.builder.reqattr.EaafRequestedAttributeU
 import at.gv.egiz.eaaf.modules.pvp2.impl.builder.reqattr.EaafRequestedAttributesBuilder;
 import at.gv.egiz.eaaf.modules.pvp2.impl.builder.reqattr.EaafRequestedAttributesMarshaller;
 import at.gv.egiz.eaaf.modules.pvp2.impl.builder.reqattr.EaafRequestedAttributesUnmarshaller;
-import org.opensaml.DefaultBootstrap;
-import org.opensaml.xml.ConfigurationException;
 
 /**
  * EAAF specific OpenSAML Initializer.
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/initialize/EaafDefaultSecurityConfigurationBootstrap.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/initialize/EaafDefaultSecurityConfigurationBootstrap.java
index a1a7e9d2..f3e50e4e 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/initialize/EaafDefaultSecurityConfigurationBootstrap.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/opensaml/initialize/EaafDefaultSecurityConfigurationBootstrap.java
@@ -84,7 +84,6 @@ public class EaafDefaultSecurityConfigurationBootstrap
     // use SHA256 instead of SHA1
     config.registerSignatureAlgorithmURI("AES", SignatureConstants.ALGO_ID_MAC_HMAC_SHA256);
 
-
     config.registerSignatureAlgorithmURI("DESede", SignatureConstants.ALGO_ID_MAC_HMAC_SHA256);
 
     config.setSignatureCanonicalizationAlgorithm("http://www.w3.org/2001/10/xml-exc-c14n#");
@@ -112,7 +111,6 @@ public class EaafDefaultSecurityConfigurationBootstrap
     config.registerDataEncryptionAlgorithmURI("AES", Integer.valueOf(256),
         EncryptionConstants.ALGO_ID_BLOCKCIPHER_AES256_GCM);
 
-
     config.registerDataEncryptionAlgorithmURI("DESede", Integer.valueOf(168),
         "http://www.w3.org/2001/04/xmlenc#tripledes-cbc");
     config.registerDataEncryptionAlgorithmURI("DESede", Integer.valueOf(192),