fix typo and remove @deprecated flags

4 files changed, 14 insertions, 47 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());
diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IAuthData.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IAuthData.java
index ed2c6316..ca946496 100644
--- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IAuthData.java
+++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IAuthData.java
@@ -20,10 +20,8 @@
 package at.gv.egiz.eaaf.core.api.idp;
 
 import java.util.Date;
-import java.util.List;
 
 import at.gv.egiz.eaaf.core.api.idp.auth.data.IIdentityLink;
-import at.gv.egiz.eaaf.core.impl.data.Pair;
 
 /**
  * Service-Provider specific authentication-data.
@@ -177,7 +175,6 @@ public interface IAuthData {
    *
    * @return
    */
-  @Deprecated
   String getBpk();
 
   /**
@@ -186,18 +183,9 @@ public interface IAuthData {
    *
    * @return Sector identifier with prefix
    */
-  @Deprecated
   String getBpkType();
 
   /**
-   * Get List of bPK/bPKType tuples for this service provider.
-   *
-   * @return List of Pairs bPK/bPKType
-   */
-  @Deprecated
-  List<Pair<String, String>> getAdditionalbPKs();
-
-  /**
    * Get baseId of this user.
    *
    * @return
diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/impl/data/Trible.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/impl/data/Triple.java
index 8fd3dd12..0ddb48aa 100644
--- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/impl/data/Trible.java
+++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/impl/data/Triple.java
@@ -19,12 +19,12 @@
 
 package at.gv.egiz.eaaf.core.impl.data;
 
-public class Trible<P1, P2, P3> {
+public class Triple<P1, P2, P3> {
   private final P1 first;
   private final P2 second;
   private final P3 third;
 
-  private Trible(final P1 newFirst, final P2 newSecond, final P3 newThird) {
+  private Triple(final P1 newFirst, final P2 newSecond, final P3 newThird) {
     this.first = newFirst;
     this.second = newSecond;
     this.third = newThird;
@@ -42,7 +42,7 @@ public class Trible<P1, P2, P3> {
     return this.third;
   }
 
-  public static <P1, P2, P3> Trible<P1, P2, P3> newInstance(final P1 newFirst, final P2 newSecond, final P3 newThird) {
-    return new Trible<>(newFirst, newSecond, newThird);
+  public static <P1, P2, P3> Triple<P1, P2, P3> newInstance(final P1 newFirst, final P2 newSecond, final P3 newThird) {
+    return new Triple<>(newFirst, newSecond, newThird);
   }
 }
diff --git a/eaaf_modules/eaaf_module_auth_sl20/src/main/java/at/gv/egiz/eaaf/modules/auth/sl20/utils/SL20Constants.java b/eaaf_modules/eaaf_module_auth_sl20/src/main/java/at/gv/egiz/eaaf/modules/auth/sl20/utils/SL20Constants.java
index d1793b0e..01316b9b 100644
--- a/eaaf_modules/eaaf_module_auth_sl20/src/main/java/at/gv/egiz/eaaf/modules/auth/sl20/utils/SL20Constants.java
+++ b/eaaf_modules/eaaf_module_auth_sl20/src/main/java/at/gv/egiz/eaaf/modules/auth/sl20/utils/SL20Constants.java
@@ -159,9 +159,12 @@ public class SL20Constants {
 
   public static final String SL20_COMMAND_PARAM_EID_CONSENTTEMPLATEID = "consentTemplateID";
   public static final String SL20_COMMAND_PARAM_EID_CONSENT = "consent";
+  @Deprecated
   public static final String SL20_COMMAND_PARAM_EID_CONSENT_RESULT_MDS = "MDS";
+  @Deprecated
   public static final String SL20_COMMAND_PARAM_EID_CONSENT_RESULT_VSZ = "vSZ";
   public static final String SL20_COMMAND_PARAM_EID_CONSENT_RESULT_SIGNEDCONSENT = "signedConsent";
+  public static final String SL20_COMMAND_PARAM_EID_CONSENT_RESULT_QCBIND = "qcBind";
 
   // qualified Signature comamnd
   // public static final String SL20_COMMAND_PARAM_QUALSIG_DATAURL =
@@ -255,4 +258,6 @@ public class SL20Constants {
   public static final String SL20_COMMAND_PARAM_AUTH_QRCODE_QRCODE = "qrCode";
   public static final String SL20_COMMAND_PARAM_AUTH_QRCODE_DATAURL = SL20_COMMAND_PARAM_GENERAL_DATAURL;
 
+
+
 }