some code code-style modifications

active code-quality checks!

3 files changed, 35 insertions, 36 deletions

diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/validation/metadata/AbstractMetadataSignatureFilter.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/validation/metadata/AbstractMetadataSignatureFilter.java
index 40cbdeb0..d1eb66a3 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/validation/metadata/AbstractMetadataSignatureFilter.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/validation/metadata/AbstractMetadataSignatureFilter.java
@@ -22,9 +22,7 @@ package at.gv.egiz.eaaf.modules.pvp2.impl.validation.metadata;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import at.gv.egiz.eaaf.core.exceptions.EaafException;
-import at.gv.egiz.eaaf.modules.pvp2.exception.Pvp2MetadataException;
-import at.gv.egiz.eaaf.modules.pvp2.exception.SignatureValidationException;
+
 import org.opensaml.saml2.metadata.EntitiesDescriptor;
 import org.opensaml.saml2.metadata.EntityDescriptor;
 import org.opensaml.saml2.metadata.provider.MetadataFilter;
@@ -32,6 +30,10 @@ import org.opensaml.xml.XMLObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import at.gv.egiz.eaaf.core.exceptions.EaafException;
+import at.gv.egiz.eaaf.modules.pvp2.exception.Pvp2MetadataException;
+import at.gv.egiz.eaaf.modules.pvp2.exception.SignatureValidationException;
+
 public abstract class AbstractMetadataSignatureFilter implements MetadataFilter {
   private static final Logger log = LoggerFactory.getLogger(AbstractMetadataSignatureFilter.class);
 
@@ -42,28 +44,24 @@ public abstract class AbstractMetadataSignatureFilter implements MetadataFilter
         final EntitiesDescriptor entitiesDescriptor = (EntitiesDescriptor) metadata;
         if (entitiesDescriptor.getSignature() == null) {
           throw new Pvp2MetadataException("pvp2.26",
-              new Object[] {"Root element of metadata file has to be signed"});
+              new Object[] { "Root element of metadata file has to be signed" });
         }
         processEntitiesDescriptor(entitiesDescriptor);
 
-
         if (entitiesDescriptor.getEntityDescriptors().size() == 0) {
           throw new Pvp2MetadataException("pvp2.26",
-              new Object[] {"No valid entity in metadata " + entitiesDescriptor.getName()});
+              new Object[] { "No valid entity in metadata " + entitiesDescriptor.getName() });
         }
 
-
       } else if (metadata instanceof EntityDescriptor) {
         final EntityDescriptor entityDescriptor = (EntityDescriptor) metadata;
         processEntityDescriptorr(entityDescriptor);
 
       } else {
         throw new Pvp2MetadataException("pvp2.26",
-            new Object[] {"Invalid Metadata file Root element is unknown"});
+            new Object[] { "Invalid Metadata file Root element is unknown" });
       }
 
-
-
       log.info("Metadata signature policy check done OK");
     } catch (final EaafException e) {
       log.warn("Metadata signature policy check FAILED.", e);
@@ -76,7 +74,8 @@ public abstract class AbstractMetadataSignatureFilter implements MetadataFilter
    * Signature verification of a SAML2 EntityDescriptor element.
    *
    * @param desc EntityDescriptor
-   * @throws Pvp2MetadataException if the signature is not valid or can not verified
+   * @throws Pvp2MetadataException if the signature is not valid or can not
+   *                               verified
    */
   protected abstract void verify(EntityDescriptor desc) throws Pvp2MetadataException;
 
@@ -84,7 +83,8 @@ public abstract class AbstractMetadataSignatureFilter implements MetadataFilter
    * Signature verification of a SAML2 EntitiesDescriptor element.
    *
    * @param desc EntitiesDescriptor
-   * @throws Pvp2MetadataException if the signature is not valid or can not verified
+   * @throws Pvp2MetadataException if the signature is not valid or can not
+   *                               verified
    */
   protected abstract void verify(EntitiesDescriptor desc) throws Pvp2MetadataException;
 
@@ -92,13 +92,12 @@ public abstract class AbstractMetadataSignatureFilter implements MetadataFilter
    * Verify a EntityDescriptor element of an EntitiesDescriptor.
    *
    * @param entity EntityDescriptor to verify
-   * @param desc Full EntitiesDescriptor that contains the EntityDescriptor
+   * @param desc   Full EntitiesDescriptor that contains the EntityDescriptor
    * @throws Pvp2MetadataException In case of an verification error
    */
   protected abstract void verify(EntityDescriptor entity, EntitiesDescriptor desc)
       throws Pvp2MetadataException;
 
-
   private void processEntityDescriptorr(final EntityDescriptor desc) throws EaafException {
     verify(desc);
 
@@ -130,7 +129,6 @@ public abstract class AbstractMetadataSignatureFilter implements MetadataFilter
         verifiedEntIT.add(entity);
         log.debug("Metadata for entityID: " + entity.getEntityID() + " valid");
 
-
       } catch (final Exception e) {
         // remove entity of signature can not be verified.
         log.info("Entity " + entity.getEntityID() + " is removed from metadata " + desc.getName()
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/validation/metadata/PvpEntityCategoryFilter.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/validation/metadata/PvpEntityCategoryFilter.java
index 2d81b1f8..797335d8 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/validation/metadata/PvpEntityCategoryFilter.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/validation/metadata/PvpEntityCategoryFilter.java
@@ -21,11 +21,7 @@ package at.gv.egiz.eaaf.modules.pvp2.impl.validation.metadata;
 
 import java.util.ArrayList;
 import java.util.List;
-import at.gv.egiz.eaaf.core.impl.data.Trible;
-import at.gv.egiz.eaaf.modules.pvp2.PvpConstants;
-import at.gv.egiz.eaaf.modules.pvp2.exception.Pvp2MetadataException;
-import at.gv.egiz.eaaf.modules.pvp2.impl.builder.PvpAttributeBuilder;
-import at.gv.egiz.eaaf.modules.pvp2.impl.utils.Saml2Utils;
+
 import org.opensaml.common.xml.SAMLConstants;
 import org.opensaml.saml2.common.Extensions;
 import org.opensaml.saml2.core.Attribute;
@@ -43,8 +39,15 @@ import org.opensaml.xml.XMLObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import at.gv.egiz.eaaf.core.impl.data.Trible;
+import at.gv.egiz.eaaf.modules.pvp2.PvpConstants;
+import at.gv.egiz.eaaf.modules.pvp2.exception.Pvp2MetadataException;
+import at.gv.egiz.eaaf.modules.pvp2.impl.builder.PvpAttributeBuilder;
+import at.gv.egiz.eaaf.modules.pvp2.impl.utils.Saml2Utils;
+
 /**
- * Metadata filter that inject requested attributes based on Metadata EntityCategories.
+ * Metadata filter that inject requested attributes based on Metadata
+ * EntityCategories.
  *
  * @author tlenz
  *
@@ -57,18 +60,20 @@ public class PvpEntityCategoryFilter implements MetadataFilter {
   /**
    * Filter to map PVP EntityCategories into a set of single PVP attributes.
    *
-   * @param isUsed if true PVP EntityCategories are mapped, otherwise they are ignored
+   * @param isUsed if true PVP EntityCategories are mapped, otherwise they are
+   *               ignored
    *
    */
   public PvpEntityCategoryFilter(final boolean isUsed) {
     this.isUsed = isUsed;
   }
 
-
   /*
    * (non-Javadoc)
    *
-   * @see org.opensaml.saml2.metadata.provider.MetadataFilter#doFilter(org.opensaml.xml.XMLObject)
+   * @see
+   * org.opensaml.saml2.metadata.provider.MetadataFilter#doFilter(org.opensaml.xml
+   * .XMLObject)
    */
   @Override
   public void doFilter(final XMLObject metadata) throws FilterException {
@@ -91,14 +96,11 @@ public class PvpEntityCategoryFilter implements MetadataFilter {
           log.trace("Find EntityDescriptor");
           resolveEntityCategoriesToAttributes((EntityDescriptor) metadata);
 
-
         } else {
           throw new Pvp2MetadataException("pvp2.26", new Object[] {
-              "Invalid Metadata file Root element is no Entities- or EntityDescriptor"});
+              "Invalid Metadata file Root element is no Entities- or EntityDescriptor" });
         }
 
-
-
       } catch (final Exception e) {
         log.warn("SAML2 Metadata processing FAILED: Can not resolve EntityCategories for metadata: "
             + entityId, e);
@@ -136,7 +138,6 @@ public class PvpEntityCategoryFilter implements MetadataFilter {
                           buildAttributeList(PvpConstants.EGOVTOKEN_PVP_ATTRIBUTES),
                           entityAttrValue);
 
-
                     } else if (PvpConstants.CITIZENTOKEN.equals(entityAttrValue)) {
                       log.debug(
                           "Find 'CITIZENTOKEN' EntityAttribute. Adding single pvp attributes ... ");
@@ -176,7 +177,6 @@ public class PvpEntityCategoryFilter implements MetadataFilter {
 
   }
 
-
   private void addAttributesToEntityDescriptor(final EntityDescriptor metadata,
       final List<RequestedAttribute> attrList, final String entityAttr) {
     final SPSSODescriptor spSsoDesc = metadata.getSPSSODescriptor(SAMLConstants.SAML20P_NS);
@@ -212,7 +212,6 @@ public class PvpEntityCategoryFilter implements MetadataFilter {
             currentlyReqAttr.add(reqAttr.getName());
           }
 
-
           // check against EntityAttribute List
           for (final RequestedAttribute entityAttrListEl : attrList) {
             if (!currentlyReqAttr.contains(entityAttrListEl.getName())) {
@@ -245,7 +244,6 @@ public class PvpEntityCategoryFilter implements MetadataFilter {
 
     return requestedAttributes;
 
-
   }
 
 }
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/validation/metadata/SchemaValidationFilter.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/validation/metadata/SchemaValidationFilter.java
index 3ff78ca8..6dcc3234 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/validation/metadata/SchemaValidationFilter.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/validation/metadata/SchemaValidationFilter.java
@@ -22,7 +22,7 @@ package at.gv.egiz.eaaf.modules.pvp2.impl.validation.metadata;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.validation.Schema;
 import javax.xml.validation.Validator;
-import at.gv.egiz.eaaf.modules.pvp2.exception.SchemaValidationException;
+
 import org.opensaml.common.xml.SAMLSchemaBuilder;
 import org.opensaml.saml2.metadata.provider.FilterException;
 import org.opensaml.saml2.metadata.provider.MetadataFilter;
@@ -31,6 +31,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xml.sax.SAXException;
 
+import at.gv.egiz.eaaf.modules.pvp2.exception.SchemaValidationException;
+
 public class SchemaValidationFilter implements MetadataFilter {
   private static final Logger log = LoggerFactory.getLogger(SchemaValidationFilter.class);
   private boolean isActive = true;
@@ -43,11 +45,12 @@ public class SchemaValidationFilter implements MetadataFilter {
     this.isActive = useSchemaValidation;
   }
 
-
   /*
    * (non-Javadoc)
    *
-   * @see org.opensaml.saml2.metadata.provider.MetadataFilter#doFilter(org.opensaml.xml.XMLObject)
+   * @see
+   * org.opensaml.saml2.metadata.provider.MetadataFilter#doFilter(org.opensaml.xml
+   * .XMLObject)
    */
   @Override
   public void doFilter(final XMLObject arg0) throws FilterException {
@@ -84,7 +87,7 @@ public class SchemaValidationFilter implements MetadataFilter {
       }
 
       throw new FilterException(new SchemaValidationException("pvp2.26",
-          new Object[] {"Metadata Schema validation FAILED with message: " + errString}));
+          new Object[] { "Metadata Schema validation FAILED with message: " + errString }));
 
     } else {
       log.info("Metadata Schema validation check is DEACTIVATED!");