1 files changed, 8 insertions, 29 deletions

diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/builder/attributes/BpkAttributeBuilder.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/builder/attributes/BpkAttributeBuilder.java
index e18cc1a8..5cbfec01 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/builder/attributes/BpkAttributeBuilder.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/builder/attributes/BpkAttributeBuilder.java
@@ -19,27 +19,23 @@
 
 package at.gv.egiz.eaaf.core.impl.idp.builder.attributes;
 
-import javax.annotation.Nonnull;
-
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.util.Assert;
 
-import at.gv.egiz.eaaf.core.api.data.EaafConstants;
 import at.gv.egiz.eaaf.core.api.idp.IAttributeGenerator;
 import at.gv.egiz.eaaf.core.api.idp.IAuthData;
 import at.gv.egiz.eaaf.core.api.idp.IPvpAttributeBuilder;
 import at.gv.egiz.eaaf.core.api.idp.ISpConfiguration;
 import at.gv.egiz.eaaf.core.exceptions.AttributeBuilderException;
 import at.gv.egiz.eaaf.core.exceptions.UnavailableAttributeException;
+import at.gv.egiz.eaaf.core.impl.builder.BpkBuilder;
 
 @PvpMetadata
 public class BpkAttributeBuilder implements IPvpAttributeBuilder {
 
   private static final Logger log = LoggerFactory.getLogger(BpkAttributeBuilder.class);
-  public static final String DELIMITER_BPKTYPE_BPK = ":";
-
+  
   @Override
   public String getName() {
     return BPK_NAME;
@@ -60,12 +56,13 @@ public class BpkAttributeBuilder implements IPvpAttributeBuilder {
   }
 
   protected String getBpkForSP(final IAuthData authData) throws UnavailableAttributeException {
-    final String bpk = attrMaxSize(authData.getBpk());
-    final String type = removeBpkTypePrefix(authData.getBpkType());
-
-    if (StringUtils.isEmpty(bpk)) {
+    if (StringUtils.isEmpty(authData.getBpk()) || StringUtils.isEmpty(authData.getBpkType())) {
       throw new UnavailableAttributeException(BPK_NAME);
+      
     }
+    
+    final String bpk = attrMaxSize(authData.getBpk());
+    final String type = BpkBuilder.removeBpkTypePrefix(authData.getBpkType());
 
     return type + DELIMITER_BPKTYPE_BPK + bpk;
 
@@ -78,23 +75,5 @@ public class BpkAttributeBuilder implements IPvpAttributeBuilder {
     return attr;
 
   }
-
-  @Nonnull
-  protected String removeBpkTypePrefix(@Nonnull final String type) {
-    Assert.isTrue(type != null, "bPKType is 'NULL'");
-    if (type.startsWith(EaafConstants.URN_PREFIX_WBPK)) {
-      return type.substring(EaafConstants.URN_PREFIX_WBPK.length());
-      
-    } else if (type.startsWith(EaafConstants.URN_PREFIX_CDID)) {
-      return type.substring(EaafConstants.URN_PREFIX_CDID.length());
-      
-    } else if (type.startsWith(EaafConstants.URN_PREFIX_EIDAS)) {
-      return type.substring(EaafConstants.URN_PREFIX_EIDAS.length());
-      
-    } else {
-      return type;
-      
-    }
-
-  }
+  
 }