1 files changed, 32 insertions, 36 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 7317e7ba..391bbfac 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
@@ -39,14 +39,13 @@ import org.opensaml.saml.saml2.metadata.Extensions;
 import org.opensaml.saml.saml2.metadata.RequestedAttribute;
 import org.opensaml.saml.saml2.metadata.SPSSODescriptor;
 import org.opensaml.saml.saml2.metadata.ServiceName;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import at.gv.egiz.eaaf.core.impl.data.Triple;
 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 lombok.extern.slf4j.Slf4j;
 
 /**
  * Metadata filter that inject requested attributes based on Metadata
@@ -55,8 +54,8 @@ import at.gv.egiz.eaaf.modules.pvp2.impl.utils.Saml2Utils;
  * @author tlenz
  *
  */
+@Slf4j
 public class PvpEntityCategoryFilter implements MetadataFilter {
-  private static final Logger log = LoggerFactory.getLogger(PvpEntityCategoryFilter.class);
 
   private boolean isUsed = false;
 
@@ -71,6 +70,11 @@ public class PvpEntityCategoryFilter implements MetadataFilter {
     this.isUsed = isUsed;
   }
 
+  @Override
+  public String getType() {
+    return PvpEntityCategoryFilter.class.getSimpleName();
+  }
+
   /*
    * (non-Javadoc)
    *
@@ -79,8 +83,8 @@ public class PvpEntityCategoryFilter implements MetadataFilter {
    * .XMLObject)
    */
   @Override
-  public XMLObject filter(@Nullable final XMLObject metadata, 
-      @Nonnull final MetadataFilterContext context)  throws FilterException {
+  public XMLObject filter(@Nullable final XMLObject metadata,
+      @Nonnull final MetadataFilterContext context) throws FilterException {
 
     if (isUsed) {
       log.trace("Map PVP EntityCategory to single PVP Attributes ... ");
@@ -131,46 +135,38 @@ public class PvpEntityCategoryFilter implements MetadataFilter {
           log.trace("Find ExtensionElement: " + el.getElementQName().toString());
           if (el instanceof EntityAttributes) {
             final EntityAttributes entityAttrElem = (EntityAttributes) el;
-            if (entityAttrElem.getAttributes() != null) {
-              log.trace("Find EntityAttributes. Start attribute processing ...");
-              for (final Attribute entityAttr : entityAttrElem.getAttributes()) {
-                if (entityAttr.getName().equals(PvpConstants.ENTITY_CATEGORY_ATTRIBITE)) {
-                  if (!entityAttr.getAttributeValues().isEmpty()) {
-                    final String entityAttrValue =
-                        entityAttr.getAttributeValues().get(0).getDOM().getTextContent();
-                    if (PvpConstants.EGOVTOKEN.equals(entityAttrValue)) {
-                      log.debug(
-                          "Find 'EGOVTOKEN' EntityAttribute. Adding single pvp attributes ... ");
-                      addAttributesToEntityDescriptor(metadata,
-                          buildAttributeList(PvpConstants.EGOVTOKEN_PVP_ATTRIBUTES),
-                          entityAttrValue);
-
-                    } else if (PvpConstants.CITIZENTOKEN.equals(entityAttrValue)) {
-                      log.debug(
-                          "Find 'CITIZENTOKEN' EntityAttribute. Adding single pvp attributes ... ");
-                      addAttributesToEntityDescriptor(metadata,
-                          buildAttributeList(PvpConstants.CITIZENTOKEN_PVP_ATTRIBUTES),
-                          entityAttrValue);
-
-                    } else {
-                      log.info("EntityAttributeValue: " + entityAttrValue + " is UNKNOWN!");
-                    }
+            log.trace("Find EntityAttributes. Start attribute processing ...");
+            for (final Attribute entityAttr : entityAttrElem.getAttributes()) {
+              if (entityAttr.getName().equals(PvpConstants.ENTITY_CATEGORY_ATTRIBITE)) {
+                if (!entityAttr.getAttributeValues().isEmpty()) {
+                  final String entityAttrValue =
+                      entityAttr.getAttributeValues().get(0).getDOM().getTextContent();
+                  if (PvpConstants.EGOVTOKEN.equals(entityAttrValue)) {
+                    log.debug(
+                        "Find 'EGOVTOKEN' EntityAttribute. Adding single pvp attributes ... ");
+                    addAttributesToEntityDescriptor(metadata,
+                        buildAttributeList(PvpConstants.EGOVTOKEN_PVP_ATTRIBUTES),
+                        entityAttrValue);
+
+                  } else if (PvpConstants.CITIZENTOKEN.equals(entityAttrValue)) {
+                    log.debug(
+                        "Find 'CITIZENTOKEN' EntityAttribute. Adding single pvp attributes ... ");
+                    addAttributesToEntityDescriptor(metadata,
+                        buildAttributeList(PvpConstants.CITIZENTOKEN_PVP_ATTRIBUTES),
+                        entityAttrValue);
 
                   } else {
-                    log.info("EntityAttribute: No attribute value");
+                    log.info("EntityAttributeValue: " + entityAttrValue + " is UNKNOWN!");
                   }
 
                 } else {
-                  log.info("EntityAttribute: " + entityAttr.getName() + " is NOT supported");
+                  log.info("EntityAttribute: No attribute value");
                 }
 
+              } else {
+                log.info("EntityAttribute: " + entityAttr.getName() + " is NOT supported");
               }
-
-            } else {
-              log.info(
-                  "Can NOT resolve EntityAttributes! Reason: Only EntityAttributes are supported!");
             }
-
           }
         }