fix typo and remove @deprecated flags

2 files changed, 4 insertions, 16 deletions

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