fix typo and remove @deprecated flags

1 files changed, 5 insertions, 31 deletions

diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/AuthenticationData.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/AuthenticationData.java
index 05ea08b2..a6fe5ff0 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/AuthenticationData.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/AuthenticationData.java
@@ -23,22 +23,19 @@ import java.io.Serializable;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Date;
-import java.util.List;
 import java.util.Map;
 import java.util.TimeZone;
 
+import at.gv.egiz.eaaf.core.api.idp.IAuthData;
+import at.gv.egiz.eaaf.core.api.idp.auth.data.IIdentityLink;
+import at.gv.egiz.eaaf.core.exceptions.EaafStorageException;
+
 import org.apache.commons.collections4.map.HashedMap;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import at.gv.egiz.eaaf.core.api.idp.IAuthData;
-import at.gv.egiz.eaaf.core.api.idp.auth.data.IIdentityLink;
-import at.gv.egiz.eaaf.core.exceptions.EaafStorageException;
-import at.gv.egiz.eaaf.core.impl.data.Pair;
-
 /**
  * Service-Provider specific authentication data.
  *
@@ -72,12 +69,8 @@ public class AuthenticationData implements IAuthData, Serializable {
   private String encSourceId;
   private String encSourceIdType;
 
-  @Deprecated
   private String bpk;
-  @Deprecated
   private String bpkType;
-  @Deprecated
-  private List<Pair<String, String>> additionalBpks;
 
   private String ccc = null;
 
@@ -501,11 +494,7 @@ public class AuthenticationData implements IAuthData, Serializable {
     this.eidasLoa = eidasLoa;
   }
 
-  @Override
-  @Deprecated
-  public List<Pair<String, String>> getAdditionalbPKs() {
-    return this.additionalBpks;
-  }
+
 
   /**
    * Set the encrypted SourceId for current authenticated user.
@@ -525,21 +514,6 @@ public class AuthenticationData implements IAuthData, Serializable {
     this.encSourceIdType = encSourceIdType;
   }
 
-  /**
-   * Add an additional bPK Pair bPK/bPKType into authdata.
-   *
-   * @param bpk Pair bPK/bPKType
-   */
-  @Deprecated
-  public void addAdditionalBpkPair(final Pair<String, String> bpk) {
-    if (this.additionalBpks == null) {
-      this.additionalBpks = new ArrayList<>();
-
-    }
-
-    this.additionalBpks.add(bpk);
-  }
-
   private Date getDateCopyOrNull(Date in) {
     if (in != null) {
       return new Date(in.getTime());