some code code-style modifications

active code-quality checks!

1 files changed, 15 insertions, 17 deletions

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;
 
-
   }
 
 }