From 4fa0cebed0438e0c00ce692424868c532490b95c Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Tue, 28 Jan 2020 16:23:39 +0100 Subject: fix typo and remove @deprecated flags --- .../eaaf/core/impl/idp/AuthenticationData.java | 36 +++------------- .../at/gv/egiz/eaaf/core/api/idp/IAuthData.java | 12 ------ .../at/gv/egiz/eaaf/core/impl/data/Trible.java | 48 ---------------------- .../at/gv/egiz/eaaf/core/impl/data/Triple.java | 48 ++++++++++++++++++++++ .../modules/auth/sl20/utils/SL20Constants.java | 5 +++ 5 files changed, 58 insertions(+), 91 deletions(-) delete mode 100644 eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/impl/data/Trible.java create mode 100644 eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/impl/data/Triple.java 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> additionalBpks; private String ccc = null; @@ -501,11 +494,7 @@ public class AuthenticationData implements IAuthData, Serializable { this.eidasLoa = eidasLoa; } - @Override - @Deprecated - public List> 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 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,17 +183,8 @@ 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> getAdditionalbPKs(); - /** * Get baseId of this user. * 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/Trible.java deleted file mode 100644 index 8fd3dd12..00000000 --- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/impl/data/Trible.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright 2017 Graz University of Technology EAAF-Core Components has been developed in a - * cooperation between EGIZ, A-SIT Plus, A-SIT, and Graz University of Technology. - * - * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by the European - * Commission - subsequent versions of the EUPL (the "Licence"); You may not use this work except in - * compliance with the Licence. You may obtain a copy of the Licence at: - * https://joinup.ec.europa.eu/news/understanding-eupl-v12 - * - * Unless required by applicable law or agreed to in writing, software distributed under the Licence - * is distributed on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the Licence for the specific language governing permissions and limitations under - * the Licence. - * - * This product combines work with different licenses. See the "NOTICE" text file for details on the - * various modules and licenses. The "NOTICE" text file is part of the distribution. Any derivative - * works that you distribute must include a readable copy of the "NOTICE" text file. -*/ - -package at.gv.egiz.eaaf.core.impl.data; - -public class Trible { - private final P1 first; - private final P2 second; - private final P3 third; - - private Trible(final P1 newFirst, final P2 newSecond, final P3 newThird) { - this.first = newFirst; - this.second = newSecond; - this.third = newThird; - } - - public P1 getFirst() { - return this.first; - } - - public P2 getSecond() { - return this.second; - } - - public P3 getThird() { - return this.third; - } - - public static Trible newInstance(final P1 newFirst, final P2 newSecond, final P3 newThird) { - return new Trible<>(newFirst, newSecond, newThird); - } -} diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/impl/data/Triple.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/impl/data/Triple.java new file mode 100644 index 00000000..0ddb48aa --- /dev/null +++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/impl/data/Triple.java @@ -0,0 +1,48 @@ +/* + * Copyright 2017 Graz University of Technology EAAF-Core Components has been developed in a + * cooperation between EGIZ, A-SIT Plus, A-SIT, and Graz University of Technology. + * + * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by the European + * Commission - subsequent versions of the EUPL (the "Licence"); You may not use this work except in + * compliance with the Licence. You may obtain a copy of the Licence at: + * https://joinup.ec.europa.eu/news/understanding-eupl-v12 + * + * Unless required by applicable law or agreed to in writing, software distributed under the Licence + * is distributed on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the Licence for the specific language governing permissions and limitations under + * the Licence. + * + * This product combines work with different licenses. See the "NOTICE" text file for details on the + * various modules and licenses. The "NOTICE" text file is part of the distribution. Any derivative + * works that you distribute must include a readable copy of the "NOTICE" text file. +*/ + +package at.gv.egiz.eaaf.core.impl.data; + +public class Triple { + private final P1 first; + private final P2 second; + private final P3 third; + + private Triple(final P1 newFirst, final P2 newSecond, final P3 newThird) { + this.first = newFirst; + this.second = newSecond; + this.third = newThird; + } + + public P1 getFirst() { + return this.first; + } + + public P2 getSecond() { + return this.second; + } + + public P3 getThird() { + return this.third; + } + + public static Triple 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; + + } -- cgit v1.2.3