1 files changed, 25 insertions, 23 deletions

diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/protocols/RequestImpl.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/protocols/RequestImpl.java
index 88dae874..07fc652a 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/protocols/RequestImpl.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/protocols/RequestImpl.java
@@ -28,13 +28,22 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.UUID;
+
 import javax.annotation.Nonnull;
 import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.lang.NonNull;
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+
 import at.gv.egiz.eaaf.core.api.IRequest;
-import at.gv.egiz.eaaf.core.api.data.EAAFConstants;
+import at.gv.egiz.eaaf.core.api.data.EaafConstants;
 import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
 import at.gv.egiz.eaaf.core.api.idp.IConfigurationWithSP;
-import at.gv.egiz.eaaf.core.api.idp.IspConfiguration;
+import at.gv.egiz.eaaf.core.api.idp.ISpConfiguration;
 import at.gv.egiz.eaaf.core.exceptions.EaafAuthenticationException;
 import at.gv.egiz.eaaf.core.exceptions.EaafException;
 import at.gv.egiz.eaaf.core.exceptions.EaafStorageException;
@@ -42,12 +51,6 @@ import at.gv.egiz.eaaf.core.impl.idp.auth.data.AuthProcessDataWrapper;
 import at.gv.egiz.eaaf.core.impl.utils.HttpUtils;
 import at.gv.egiz.eaaf.core.impl.utils.Random;
 import at.gv.egiz.eaaf.core.impl.utils.TransactionIdUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.lang.NonNull;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
 
 public abstract class RequestImpl implements IRequest, Serializable {
 
@@ -70,7 +73,7 @@ public abstract class RequestImpl implements IRequest, Serializable {
   private String requestedServiceProviderIdentifer;
   private String idpAuthUrl = null;
 
-  private IspConfiguration spConfiguration = null;
+  private ISpConfiguration spConfiguration = null;
 
   private boolean passiv = false;
   private boolean force = false;
@@ -89,11 +92,10 @@ public abstract class RequestImpl implements IRequest, Serializable {
 
   private final Map<String, Object> genericDataStorage = new HashMap<>();
 
-
   /**
    * Initialize this pendingRequest object.
    *
-   * @param req {@link HttpServletRequest}
+   * @param req        {@link HttpServletRequest}
    * @param authConfig {@link IConfiguration}
    * @throws EaafException
    *
@@ -107,10 +109,10 @@ public abstract class RequestImpl implements IRequest, Serializable {
   /**
    * Initialize this pendingRequest object.
    *
-   * @param req {@link HttpServletRequest}
-   * @param authConfig {@link IConfiguration}
-   * @param transactionId transactionId that should be used in this pendingRequest for logging. If
-   *        'null' a new one will be generated
+   * @param req           {@link HttpServletRequest}
+   * @param authConfig    {@link IConfiguration}
+   * @param transactionId transactionId that should be used in this pendingRequest
+   *                      for logging. If 'null' a new one will be generated
    *
    * @throws EaafException
    *
@@ -129,8 +131,9 @@ public abstract class RequestImpl implements IRequest, Serializable {
     TransactionIdUtils.setTransactionId(uniqueTransactionIdentifer);
 
     // initialize session object
-    genericDataStorage.put(EAAFConstants.AUTH_DATA_CREATED, new Date());
-    // genericDataStorage.put(EAAFConstants.VALUE_SESSIONID, Random.nextLongRandom());
+    genericDataStorage.put(EaafConstants.AUTH_DATA_CREATED, new Date());
+    // genericDataStorage.put(EAAFConstants.VALUE_SESSIONID,
+    // Random.nextLongRandom());
 
     // check if End-Point is valid
     final String authUrlString = HttpUtils.extractAuthUrlFromRequest(req);
@@ -140,19 +143,19 @@ public abstract class RequestImpl implements IRequest, Serializable {
 
     } catch (final MalformedURLException e) {
       log.error("IDP AuthenticationServiceURL Prefix is not a valid URL." + authUrlString, e);
-      throw new EaafAuthenticationException("errorId", new Object[] {authUrlString}, e);
+      throw new EaafAuthenticationException("errorId", new Object[] { authUrlString }, e);
 
     }
     this.idpAuthUrl = authConfig.validateIdpUrl(authReqUrl);
     if (this.idpAuthUrl == null) {
       log.warn(
           "Extract AuthenticationServiceURL: " + authReqUrl + " is NOT found in configuration.");
-      throw new EaafAuthenticationException("errorId", new Object[] {authUrlString});
+      throw new EaafAuthenticationException("errorId", new Object[] { authUrlString });
 
     }
 
     // set unique session identifier
-    final String uniqueID = (String) req.getAttribute(EAAFConstants.UNIQUESESSIONIDENTIFIER);
+    final String uniqueID = (String) req.getAttribute(EaafConstants.UNIQUESESSIONIDENTIFIER);
     if (StringUtils.isNotEmpty(uniqueID)) {
       this.uniqueSessionIdentifer = uniqueID;
     } else {
@@ -267,10 +270,9 @@ public abstract class RequestImpl implements IRequest, Serializable {
   }
 
   @Override
-  public final IspConfiguration getServiceProviderConfiguration() {
+  public final ISpConfiguration getServiceProviderConfiguration() {
     return this.spConfiguration;
 
-
   }
 
   @Override
@@ -291,7 +293,7 @@ public abstract class RequestImpl implements IRequest, Serializable {
 
   }
 
-  public void setOnlineApplicationConfiguration(final IspConfiguration spConfig) {
+  public void setOnlineApplicationConfiguration(final ISpConfiguration spConfig) {
     this.spConfiguration = spConfig;
 
   }