From a4d179661754e04c882c1686e3c83f1b458717df Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Thu, 11 Apr 2019 16:52:19 +0200 Subject: refactoring of AuthData builder --- .../eaaf/core/impl/idp/AuthenticationData.java | 141 +++++++++++++++------ 1 file changed, 102 insertions(+), 39 deletions(-) (limited to 'eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/AuthenticationData.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 392ed9a9..a6bf247a 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 @@ -58,21 +58,27 @@ public class AuthenticationData implements IAuthData, Serializable { public static final String IDENTITY_LINK_DATE_FORMAT = "yyyy-MM-dd"; private boolean isBaseIDTransferRestrication = true; - private Map genericDataStorate = new HashedMap(); + private final Map genericDataStorate = new HashedMap(); private String issuer; private Date issueInstant; - private String identificationValue; - private String identificationType; - private IIdentityLink identityLink = null; + @Deprecated private String identificationValue; + @Deprecated private String identificationType; + @Deprecated private IIdentityLink identityLink = null; private String familyName; private String givenName; private Date dateOfBirth; - private String bPK; - private String bPKType; - private List> additionalBpks; + + private String encSourceId; + private String encSourceIdType; + + + + @Deprecated private String bPK; + @Deprecated private String bPKType; + @Deprecated private List> additionalBpks; private String ccc = null; @@ -86,7 +92,7 @@ public class AuthenticationData implements IAuthData, Serializable { private String sessionIndex = null; private String nameID = null; private String nameIDFormat = null; - + public AuthenticationData() { this.issueInstant = new Date(); @@ -102,7 +108,7 @@ public class AuthenticationData implements IAuthData, Serializable { * * @param authIssuer */ - public void setAuthenticationIssuer(String authIssuer) { + public void setAuthenticationIssuer(final String authIssuer) { this.issuer = authIssuer; } @@ -114,8 +120,9 @@ public class AuthenticationData implements IAuthData, Serializable { } - public String getAuthenticationIssueInstantString() { - SimpleDateFormat f = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'"); + @Override + public String getAuthenticationIssueInstantString() { + final SimpleDateFormat f = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'"); f.setTimeZone(TimeZone.getTimeZone("UTC")); return f.format(this.issueInstant); @@ -126,7 +133,7 @@ public class AuthenticationData implements IAuthData, Serializable { * * @param date */ - public void setAuthenticationIssueInstant(Date date) { + public void setAuthenticationIssueInstant(final Date date) { this.issueInstant = date; } @@ -136,6 +143,8 @@ public class AuthenticationData implements IAuthData, Serializable { } + @Override + @Deprecated public String getBPK() { return bPK; } @@ -144,17 +153,20 @@ public class AuthenticationData implements IAuthData, Serializable { * Sets the bPK. * @param bPK The bPK to set */ - public void setBPK(String bPK) { + @Deprecated + public void setBPK(final String bPK) { this.bPK = bPK; } + @Override public Date getDateOfBirth() { return this.dateOfBirth; } + @Override public String getFormatedDateOfBirth() { - DateFormat pvpDateFormat = new SimpleDateFormat(IDENTITY_LINK_DATE_FORMAT); + final DateFormat pvpDateFormat = new SimpleDateFormat(IDENTITY_LINK_DATE_FORMAT); if (getDateOfBirth() != null) return pvpDateFormat.format(getDateOfBirth()); else @@ -163,26 +175,42 @@ public class AuthenticationData implements IAuthData, Serializable { } + @Override public String getFamilyName() { return this.familyName; } + @Override public String getGivenName() { return this.givenName; } + @Override + public String getEncryptedSourceId() { + return this.encSourceId; + } + @Override + public String getEncryptedSourceIdType() { + return this.encSourceIdType; + } + + @Override + @Deprecated public String getIdentificationValue() { return identificationValue; } + @Override + @Deprecated public String getIdentificationType() { return identificationType; } @Override + @Deprecated public IIdentityLink getIdentityLink() { return identityLink; } @@ -190,7 +218,8 @@ public class AuthenticationData implements IAuthData, Serializable { /** * @param identityLink the identityLink to set */ - public void setIdentityLink(IIdentityLink identityLink) { + @Deprecated + public void setIdentityLink(final IIdentityLink identityLink) { this.identityLink = identityLink; } @@ -198,19 +227,19 @@ public class AuthenticationData implements IAuthData, Serializable { * Sets the dateOfBirth. * @param dateOfBirth The dateOfBirth to set */ - public void setDateOfBirth(Date dateOfBirth) { + public void setDateOfBirth(final Date dateOfBirth) { this.dateOfBirth = dateOfBirth; } - public void setDateOfBirth(String dateOfBirth) { + public void setDateOfBirth(final String dateOfBirth) { try { if (StringUtils.isNotEmpty(dateOfBirth)) { - DateFormat identityLinkFormat = new SimpleDateFormat(IDENTITY_LINK_DATE_FORMAT); + final DateFormat identityLinkFormat = new SimpleDateFormat(IDENTITY_LINK_DATE_FORMAT); this.dateOfBirth = identityLinkFormat.parse(dateOfBirth); } - } catch (ParseException e) { + } catch (final ParseException e) { log.warn("Parse dateOfBirht from IdentityLink FAILED", e); } @@ -220,7 +249,7 @@ public class AuthenticationData implements IAuthData, Serializable { * Sets the familyName. * @param familyName The familyName to set */ - public void setFamilyName(String familyName) { + public void setFamilyName(final String familyName) { this.familyName = familyName; } @@ -228,7 +257,7 @@ public class AuthenticationData implements IAuthData, Serializable { * Sets the givenName. * @param givenName The givenName to set */ - public void setGivenName(String givenName) { + public void setGivenName(final String givenName) { this.givenName = givenName; } @@ -236,7 +265,8 @@ public class AuthenticationData implements IAuthData, Serializable { * Sets the identificationValue. * @param identificationValue The identificationValue to set */ - public void setIdentificationValue(String identificationValue) { + @Deprecated + public void setIdentificationValue(final String identificationValue) { this.identificationValue = identificationValue; } @@ -244,11 +274,14 @@ public class AuthenticationData implements IAuthData, Serializable { * Sets the identificationType. * @param identificationType The identificationType to set */ - public void setIdentificationType(String identificationType) { + @Deprecated + public void setIdentificationType(final String identificationType) { this.identificationType = identificationType; } + @Override + @Deprecated public String getBPKType() { return bPKType; } @@ -258,16 +291,19 @@ public class AuthenticationData implements IAuthData, Serializable { * * @param bPKType */ - public void setBPKType(String bPKType) { + @Deprecated + public void setBPKType(final String bPKType) { this.bPKType = bPKType; } + @Override public String getEIDASQAALevel() { return this.eIDASLoA; } + @Override public boolean isForeigner() { return this.foreigner; } @@ -278,7 +314,7 @@ public class AuthenticationData implements IAuthData, Serializable { * * @param true if the user is a foreigner, otherwise false */ - public void setForeigner(boolean foreigner) { + public void setForeigner(final boolean foreigner) { this.foreigner = foreigner; } @@ -293,7 +329,7 @@ public class AuthenticationData implements IAuthData, Serializable { * * @param true if a SSO was used, otherwise false */ - public void setSsoSession(boolean ssoSession) { + public void setSsoSession(final boolean ssoSession) { this.ssoSession = ssoSession; } @@ -303,10 +339,11 @@ public class AuthenticationData implements IAuthData, Serializable { * * @param ccc Two letter country code */ - public void setCiticenCountryCode(String ccc) { + public void setCiticenCountryCode(final String ccc) { this.ccc = ccc; } + @Override public String getSessionIndex() { return sessionIndex; } @@ -314,7 +351,7 @@ public class AuthenticationData implements IAuthData, Serializable { /** * @param sessionIndex the sessionIndex to set */ - public void setSessionIndex(String sessionIndex) { + public void setSessionIndex(final String sessionIndex) { this.sessionIndex = sessionIndex; } @@ -327,13 +364,14 @@ public class AuthenticationData implements IAuthData, Serializable { /** * @param nameID the nameID to set */ - public void setNameID(String nameID) { + public void setNameID(final String nameID) { this.nameID = nameID; } /** * @return the nameIDFormat */ + @Override public String getNameIDFormat() { return nameIDFormat; } @@ -341,13 +379,14 @@ public class AuthenticationData implements IAuthData, Serializable { /** * @param nameIDFormat the nameIDFormat to set */ - public void setNameIDFormat(String nameIDFormat) { + public void setNameIDFormat(final String nameIDFormat) { this.nameIDFormat = nameIDFormat; } /** * @return the ssoSessionValidTo */ + @Override public Date getSsoSessionValidTo() { return ssoSessionValidTo; } @@ -355,7 +394,7 @@ public class AuthenticationData implements IAuthData, Serializable { /** * @param ssoSessionValidTo the ssoSessionValidTo to set */ - public void setSsoSessionValidTo(Date ssoSessionValidTo) { + public void setSsoSessionValidTo(final Date ssoSessionValidTo) { this.ssoSessionValidTo = ssoSessionValidTo; } @@ -371,7 +410,7 @@ public class AuthenticationData implements IAuthData, Serializable { /** * @param isBaseIDTransmittionAllowed the isBaseIDTransmittionAllowed to set */ - public void setBaseIDTransferRestrication(boolean isBaseIDTransferRestrication) { + public void setBaseIDTransferRestrication(final boolean isBaseIDTransferRestrication) { this.isBaseIDTransferRestrication = isBaseIDTransferRestrication; } @@ -382,19 +421,21 @@ public class AuthenticationData implements IAuthData, Serializable { * @param clazz The class type which is stored with this key * @return The data object or null if no data is found with this key */ - public T getGenericData(String key, final Class clazz) { + @Override + public T getGenericData(final String key, final Class clazz) { if (StringUtils.isNotEmpty(key)) { - Object data = genericDataStorate.get(key); + final Object data = genericDataStorate.get(key); if (data == null) return null; try { @SuppressWarnings("unchecked") + final T test = (T) data; return test; - } catch (Exception e) { + } catch (final Exception e) { log.warn("Generic authentication-data object can not be casted to requsted type", e); return null; @@ -414,7 +455,7 @@ public class AuthenticationData implements IAuthData, Serializable { * @param object Generic data-object which should be stored. This data-object had to be implement the 'java.io.Serializable' interface * @throws SessionDataStorageException Error message if the data-object can not stored to generic session-data storage */ - public void setGenericData(String key, Object object) throws EAAFStorageException { + public void setGenericData(final String key, final Object object) throws EAAFStorageException { if (StringUtils.isEmpty(key)) { log.info("Generic session-data can not be stored with a 'null' key"); throw new EAAFStorageException("Generic data can not be stored with a 'null' key", null); @@ -437,27 +478,49 @@ public class AuthenticationData implements IAuthData, Serializable { genericDataStorate.put(key, object); } - public void seteIDASLoA(String eIDASLoA) { + public void seteIDASLoA(final String eIDASLoA) { this.eIDASLoA = eIDASLoA; } @Override + @Deprecated public List> getAdditionalbPKs() { return this.additionalBpks; } + /** + * Set the encrypted SourceId for current authenticated user + * + * @param encSourceId + */ + public void setEncSourceId(final String encSourceId) { + this.encSourceId = encSourceId; + } + + /** + * Set the type identifier of the encrypted SourceId + * + * @param encSourceIdType + */ + public void setEncSourceIdType(final String encSourceIdType) { + this.encSourceIdType = encSourceIdType; + } + + + /** * Add an additional bPK Pair into authdata * * @param bPK Pair */ - public void addAdditionalbPKPair(Pair bPK) { + @Deprecated + public void addAdditionalbPKPair(final Pair bPK) { if (this.additionalBpks == null) { this.additionalBpks = new ArrayList>(); } this.additionalBpks.add(bPK); - } + } } -- cgit v1.2.3