some code code-style modifications

active code-quality checks!

10 files changed, 51 insertions, 44 deletions

diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/IPvo2BasicConfiguration.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/IPvo2BasicConfiguration.java
index 39c0baff..ec806f07 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/IPvo2BasicConfiguration.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/IPvo2BasicConfiguration.java
@@ -20,10 +20,12 @@
 package at.gv.egiz.eaaf.modules.pvp2.api;
 
 import java.util.List;
-import at.gv.egiz.eaaf.core.exceptions.EaafException;
+
 import org.opensaml.saml2.metadata.ContactPerson;
 import org.opensaml.saml2.metadata.Organization;
 
+import at.gv.egiz.eaaf.core.exceptions.EaafException;
+
 public interface IPvo2BasicConfiguration {
 
   String getIdpEntityId(String authUrl) throws EaafException;
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/binding/IDecoder.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/binding/IDecoder.java
index 677028a5..89e6a384 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/binding/IDecoder.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/binding/IDecoder.java
@@ -21,13 +21,14 @@ package at.gv.egiz.eaaf.modules.pvp2.api.binding;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import at.gv.egiz.eaaf.modules.pvp2.api.message.InboundMessageInterface;
-import at.gv.egiz.eaaf.modules.pvp2.exception.Pvp2Exception;
+
 import org.opensaml.common.binding.decoding.URIComparator;
 import org.opensaml.saml2.metadata.provider.MetadataProvider;
 import org.opensaml.ws.message.decoder.MessageDecodingException;
 import org.opensaml.xml.security.SecurityException;
 
+import at.gv.egiz.eaaf.modules.pvp2.api.message.InboundMessageInterface;
+import at.gv.egiz.eaaf.modules.pvp2.exception.Pvp2Exception;
 
 public interface IDecoder {
   InboundMessageInterface decode(HttpServletRequest req, HttpServletResponse resp,
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/binding/IEncoder.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/binding/IEncoder.java
index 9d8b0105..fcab5fd8 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/binding/IEncoder.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/binding/IEncoder.java
@@ -21,30 +21,32 @@ package at.gv.egiz.eaaf.modules.pvp2.api.binding;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import at.gv.egiz.eaaf.core.api.IRequest;
-import at.gv.egiz.eaaf.modules.pvp2.exception.Pvp2Exception;
+
 import org.opensaml.saml2.core.RequestAbstractType;
 import org.opensaml.saml2.core.StatusResponseType;
 import org.opensaml.ws.message.encoder.MessageEncodingException;
 import org.opensaml.xml.security.SecurityException;
 import org.opensaml.xml.security.credential.Credential;
 
+import at.gv.egiz.eaaf.core.api.IRequest;
+import at.gv.egiz.eaaf.modules.pvp2.exception.Pvp2Exception;
+
 public interface IEncoder {
 
   /**
    * SAML2 Request encoder.
    *
-   * @param req The http request
-   * @param resp The http response
-   * @param request The SAML2 request object
+   * @param req            The http request
+   * @param resp           The http response
+   * @param request        The SAML2 request object
    * @param targetLocation URL, where the request should be transmit
-   * @param relayState token for session handling
-   * @param credentials Credential to sign the request object
-   * @param pendingReq Internal MOA-ID request object that contains session-state informations but
-   *        never null
+   * @param relayState     token for session handling
+   * @param credentials    Credential to sign the request object
+   * @param pendingReq     Internal MOA-ID request object that contains
+   *                       session-state informations but never null
    * @throws MessageEncodingException In case of an error
-   * @throws SecurityException  In case of an error
-   * @throws Pvp2Exception  In case of an error
+   * @throws SecurityException        In case of an error
+   * @throws Pvp2Exception            In case of an error
    */
   void encodeRequest(HttpServletRequest req, HttpServletResponse resp,
       RequestAbstractType request, String targetLocation, String relayState, Credential credentials,
@@ -53,16 +55,16 @@ public interface IEncoder {
   /**
    * Encoder SAML Response.
    *
-   * @param req The http request
-   * @param resp The http response
-   * @param response The SAML2 repsonse object
+   * @param req            The http request
+   * @param resp           The http response
+   * @param response       The SAML2 repsonse object
    * @param targetLocation URL, where the request should be transmit
-   * @param relayState token for session handling
-   * @param credentials Credential to sign the response object
-   * @param pendingReq Internal MOA-ID request object that contains session-state informations but
-   *        never null
-   * @throws MessageEncodingException  In case of an error
-   * @throws SecurityException  In case of an error
+   * @param relayState     token for session handling
+   * @param credentials    Credential to sign the response object
+   * @param pendingReq     Internal MOA-ID request object that contains
+   *                       session-state informations but never null
+   * @throws MessageEncodingException In case of an error
+   * @throws SecurityException        In case of an error
    */
   void encodeRespone(HttpServletRequest req, HttpServletResponse resp,
       StatusResponseType response, String targetLocation, String relayState, Credential credentials,
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/metadata/IPvpMetadataBuilderConfiguration.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/metadata/IPvpMetadataBuilderConfiguration.java
index f06a1684..ab39fefb 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/metadata/IPvpMetadataBuilderConfiguration.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/metadata/IPvpMetadataBuilderConfiguration.java
@@ -21,13 +21,15 @@ package at.gv.egiz.eaaf.modules.pvp2.api.metadata;
 
 import java.util.Collection;
 import java.util.List;
-import at.gv.egiz.eaaf.modules.pvp2.exception.CredentialsNotAvailableException;
+
 import org.opensaml.saml2.core.Attribute;
 import org.opensaml.saml2.metadata.ContactPerson;
 import org.opensaml.saml2.metadata.Organization;
 import org.opensaml.saml2.metadata.RequestedAttribute;
 import org.opensaml.xml.security.credential.Credential;
 
+import at.gv.egiz.eaaf.modules.pvp2.exception.CredentialsNotAvailableException;
+
 /**
  * PVP Metadata builder configuration.
  *
@@ -36,9 +38,9 @@ import org.opensaml.xml.security.credential.Credential;
  */
 public interface IPvpMetadataBuilderConfiguration {
 
-
   /**
-   * Defines a unique name for this PVP Service-provider, which is used for logging.
+   * Defines a unique name for this PVP Service-provider, which is used for
+   * logging.
    *
    * @return
    */
@@ -73,8 +75,8 @@ public interface IPvpMetadataBuilderConfiguration {
   boolean buildSpSsoDescriptor();
 
   /**
-   * Set the PVP entityID for this SAML2 metadata. The entityID must be an URL and must be start
-   * with the public-URL prefix of the server.
+   * Set the PVP entityID for this SAML2 metadata. The entityID must be an URL and
+   * must be start with the public-URL prefix of the server.
    *
    * @return PVP entityID postfix as String
    */
@@ -101,7 +103,6 @@ public interface IPvpMetadataBuilderConfiguration {
    */
   Organization getOrgansiationInformation();
 
-
   /**
    * Set the credential for metadata signing.
    *
@@ -111,11 +112,12 @@ public interface IPvpMetadataBuilderConfiguration {
   Credential getMetadataSigningCredentials() throws CredentialsNotAvailableException;
 
   /**
-   * Set the credential for request/response signing IDP metadata: this credential is used for SAML2
-   * response signing SP metadata: this credential is used for SAML2 response signing.
+   * Set the credential for request/response signing IDP metadata: this credential
+   * is used for SAML2 response signing SP metadata: this credential is used for
+   * SAML2 response signing.
    *
    * @return Credentials
-   * @throws CredentialsNotAvailableException  In case of an error
+   * @throws CredentialsNotAvailableException In case of an error
    */
   Credential getRequestorResponseSigningCredentials()
       throws CredentialsNotAvailableException;
@@ -124,7 +126,7 @@ public interface IPvpMetadataBuilderConfiguration {
    * Set the credential for response encryption.
    *
    * @return Credentials
-   * @throws CredentialsNotAvailableException  In case of an error
+   * @throws CredentialsNotAvailableException In case of an error
    */
   Credential getEncryptionCredentials() throws CredentialsNotAvailableException;
 
@@ -191,7 +193,6 @@ public interface IPvpMetadataBuilderConfiguration {
    */
   String getSpSloSoapBindingUrl();
 
-
   /**
    * Set all SAML2 attributes which could be provided by this IDP.
    *
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/metadata/IPvpMetadataConfigurationFactory.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/metadata/IPvpMetadataConfigurationFactory.java
index 4207d860..0cf7e293 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/metadata/IPvpMetadataConfigurationFactory.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/metadata/IPvpMetadataConfigurationFactory.java
@@ -23,7 +23,6 @@ import at.gv.egiz.eaaf.modules.pvp2.impl.utils.AbstractCredentialProvider;
 
 public interface IPvpMetadataConfigurationFactory {
 
-
   IPvpMetadataBuilderConfiguration generateMetadataBuilderConfiguration(String authUrl,
       AbstractCredentialProvider pvpIdpCredentials);
 
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/metadata/IPvpMetadataProvider.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/metadata/IPvpMetadataProvider.java
index bc90ff3f..25b2d250 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/metadata/IPvpMetadataProvider.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/metadata/IPvpMetadataProvider.java
@@ -11,7 +11,7 @@
  * is distributed on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
  * or implied. See the Licence for the specific language governing permissions and limitations under
  * the Licence.
- * 
+ *
  * This product combines work with different licenses. See the "NOTICE" text file for details on the
  * various modules and licenses. The "NOTICE" text file is part of the distribution. Any derivative
  * works that you distribute must include a readable copy of the "NOTICE" text file.
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/reqattr/EaafRequestedAttribute.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/reqattr/EaafRequestedAttribute.java
index f44a545d..fe908869 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/reqattr/EaafRequestedAttribute.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/reqattr/EaafRequestedAttribute.java
@@ -20,13 +20,16 @@
 package at.gv.egiz.eaaf.modules.pvp2.api.reqattr;
 
 import java.util.List;
+
 import javax.xml.namespace.QName;
-import at.gv.egiz.eaaf.modules.pvp2.PvpConstants;
+
 import org.opensaml.common.SAMLObject;
 import org.opensaml.xml.AttributeExtensibleXMLObject;
 import org.opensaml.xml.XMLObject;
 import org.opensaml.xml.schema.XSBooleanValue;
 
+import at.gv.egiz.eaaf.modules.pvp2.PvpConstants;
+
 public interface EaafRequestedAttribute extends SAMLObject, AttributeExtensibleXMLObject,
     org.opensaml.saml2.metadata.RequestedAttribute {
 
@@ -36,7 +39,6 @@ public interface EaafRequestedAttribute extends SAMLObject, AttributeExtensibleX
   /** Local name of the XSI type. */
   String TYPE_LOCAL_NAME = "RequestedAttributeAbstractType";
 
-
   /** Default element name. */
   QName DEFAULT_ELEMENT_NAME =
       new QName(PvpConstants.EIDAT10_SAML_NS, DEF_LOCAL_NAME, PvpConstants.EIDAT10_PREFIX);
@@ -45,8 +47,6 @@ public interface EaafRequestedAttribute extends SAMLObject, AttributeExtensibleX
   QName TYPE_NAME =
       new QName(PvpConstants.EIDAT10_SAML_NS, TYPE_LOCAL_NAME, PvpConstants.EIDAT10_PREFIX);
 
-
-
   /** NAME_ATTRIB_NAME attribute name. */
   String NAME_ATTRIB_NAME = "Name";
 
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/reqattr/EaafRequestedAttributes.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/reqattr/EaafRequestedAttributes.java
index 98f118b0..4c168b31 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/reqattr/EaafRequestedAttributes.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/reqattr/EaafRequestedAttributes.java
@@ -11,7 +11,7 @@
  * is distributed on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
  * or implied. See the Licence for the specific language governing permissions and limitations under
  * the Licence.
- * 
+ *
  * This product combines work with different licenses. See the "NOTICE" text file for details on the
  * various modules and licenses. The "NOTICE" text file is part of the distribution. Any derivative
  * works that you distribute must include a readable copy of the "NOTICE" text file.
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/validation/IAuthnRequestValidator.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/validation/IAuthnRequestValidator.java
index 41dcd3b9..90195f1d 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/validation/IAuthnRequestValidator.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/validation/IAuthnRequestValidator.java
@@ -20,11 +20,13 @@
 package at.gv.egiz.eaaf.modules.pvp2.api.validation;
 
 import javax.servlet.http.HttpServletRequest;
-import at.gv.egiz.eaaf.core.api.IRequest;
-import at.gv.egiz.eaaf.core.exceptions.AuthnRequestValidatorException;
+
 import org.opensaml.saml2.core.AuthnRequest;
 import org.opensaml.saml2.metadata.SPSSODescriptor;
 
+import at.gv.egiz.eaaf.core.api.IRequest;
+import at.gv.egiz.eaaf.core.exceptions.AuthnRequestValidatorException;
+
 public interface IAuthnRequestValidator {
 
   void validate(HttpServletRequest httpReq, IRequest pendingReq, AuthnRequest authReq,
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/validation/ISamlValidator.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/validation/ISamlValidator.java
index 3cbe59da..3454e890 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/validation/ISamlValidator.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/api/validation/ISamlValidator.java
@@ -11,7 +11,7 @@
  * is distributed on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
  * or implied. See the Licence for the specific language governing permissions and limitations under
  * the Licence.
- * 
+ *
  * This product combines work with different licenses. See the "NOTICE" text file for details on the
  * various modules and licenses. The "NOTICE" text file is part of the distribution. Any derivative
  * works that you distribute must include a readable copy of the "NOTICE" text file.