to some more code quality tasks

2 files changed, 14 insertions, 15 deletions

diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/AbstractAuthenticationDataBuilder.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/AbstractAuthenticationDataBuilder.java
index 491fdf4a..b12658f5 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/AbstractAuthenticationDataBuilder.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/AbstractAuthenticationDataBuilder.java
@@ -190,17 +190,17 @@ public abstract class AbstractAuthenticationDataBuilder implements IAuthenticati
 
     // ####################################################
     // set QAA level
-    setQaaLevel(internalAuthData, authProcessData, pendingReq);
+    setQaaLevel(internalAuthData, authProcessData);
 
 
     // ####################################################
     // set isForeigner flag
-    setFlagForeigner(internalAuthData, authProcessData, pendingReq);
+    setFlagForeigner(internalAuthData, authProcessData);
 
 
     // ####################################################
     // set citizen country-code
-    setCitizenCountryCode(internalAuthData, authProcessData, pendingReq);
+    setCitizenCountryCode(internalAuthData, authProcessData);
 
 
     // set generic authProcessData to authdata
@@ -228,10 +228,9 @@ public abstract class AbstractAuthenticationDataBuilder implements IAuthenticati
    *
    * @param authData Current authentication data
    * @param authProcessData Authentication information holder from current pending request
-   * @param pendingReq Current pending request
    */
   private void setCitizenCountryCode(final AuthenticationData authData,
-      final IAuthProcessDataContainer authProcessData, final IRequest pendingReq) {
+      final IAuthProcessDataContainer authProcessData) {
     includedToGenericAuthData.remove(PVPAttributeDefinitions.EID_ISSUING_NATION_NAME);
     final String pvpCccAttr = authProcessData
         .getGenericDataFromSession(PVPAttributeDefinitions.EID_ISSUING_NATION_NAME, String.class);
@@ -241,7 +240,8 @@ public abstract class AbstractAuthenticationDataBuilder implements IAuthenticati
 
     } else {
       if (authData.isForeigner()) {
-        // TODO!!!!
+    	//TODO:
+        log.warn("Foreign citizen country NOT set yet!");
 
       } else {
         authData.setCiticenCountryCode(basicConfig.getBasicConfiguration(
@@ -261,8 +261,7 @@ public abstract class AbstractAuthenticationDataBuilder implements IAuthenticati
    * @param pendingReq current pending request
    */
   private void setQaaLevel(@NonNull final AuthenticationData authData,
-      @NonNull final IAuthProcessDataContainer authProcessData,
-      @NonNull final IRequest pendingReq) {
+      @NonNull final IAuthProcessDataContainer authProcessData) {
     includedToGenericAuthData.remove(PVPAttributeDefinitions.EID_CITIZEN_EIDAS_QAA_LEVEL_NAME);
     String currentLoA = null;
     if (StringUtils.isNotEmpty(authProcessData.getQAALevel())) {
@@ -295,7 +294,7 @@ public abstract class AbstractAuthenticationDataBuilder implements IAuthenticati
 
 
   private void setFlagForeigner(final AuthenticationData authData,
-      final IAuthProcessDataContainer authProcessData, final IRequest pendingReq) {
+      final IAuthProcessDataContainer authProcessData) {
     // TODO: change to new eIDAS-token attribute identifier
     if (authProcessData
         .getGenericDataFromSession(PVPAttributeDefinitions.EID_STORK_TOKEN_NAME) != null) {
@@ -424,17 +423,17 @@ public abstract class AbstractAuthenticationDataBuilder implements IAuthenticati
 
     // ####################################################
     // set QAA level
-    setQaaLevel(authData, authProcessData, pendingReq);
+    setQaaLevel(authData, authProcessData);
 
 
     // ####################################################
     // set isForeigner flag
-    setFlagForeigner(authData, authProcessData, pendingReq);
+    setFlagForeigner(authData, authProcessData);
 
 
     // ####################################################
     // set citizen country-code
-    setCitizenCountryCode(authData, authProcessData, pendingReq);
+    setCitizenCountryCode(authData, authProcessData);
 
 
     // ####################################################
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/BpkBuilder.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/BpkBuilder.java
index 765a6669..60c08253 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/BpkBuilder.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/BpkBuilder.java
@@ -170,8 +170,8 @@ public class BpkBuilder {
       bpk = baseId;
     }
 
-    if ((StringUtils.isEmpty(bpk) || StringUtils.isEmpty(sourceCountry)
-        || StringUtils.isEmpty(destinationCountry))) {
+    if (StringUtils.isEmpty(bpk) || StringUtils.isEmpty(sourceCountry)
+        || StringUtils.isEmpty(destinationCountry)) {
       throw new EaafBuilderException("builder.00",
           new Object[] {"eIDAS-ID",
               "Unvollständige Parameterangaben: identificationValue=" + bpk + ", Zielland="
@@ -199,7 +199,7 @@ public class BpkBuilder {
       throws EaafBuilderException {
     final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
     if (target.startsWith(EAAFConstants.URN_PREFIX_CDID)) {
-      target = target.substring((EAAFConstants.URN_PREFIX_CDID).length());
+      target = target.substring(EAAFConstants.URN_PREFIX_CDID.length());
     }
 
     final String input =