refactor AbstractLocaleAuthTask to move userStopOperation into parent class

2 files changed, 42 insertions, 36 deletions

diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/modules/AbstractAuthServletTask.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/modules/AbstractAuthServletTask.java
index 32d1e66e..5b5d0aa8 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/modules/AbstractAuthServletTask.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/modules/AbstractAuthServletTask.java
@@ -31,9 +31,21 @@ import java.util.Map.Entry;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.FileItemFactory;
+import org.apache.commons.fileupload.FileUploadException;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.apache.commons.fileupload.servlet.ServletFileUpload;
+import org.apache.commons.lang3.ArrayUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.ResourceLoader;
+
 import at.gv.egiz.eaaf.core.api.IRequest;
 import at.gv.egiz.eaaf.core.api.IRequestStorage;
 import at.gv.egiz.eaaf.core.api.data.EaafConstants;
+import at.gv.egiz.eaaf.core.api.data.EaafEventCodes;
 import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
 import at.gv.egiz.eaaf.core.api.idp.auth.services.IProtocolAuthenticationService;
 import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext;
@@ -44,17 +56,6 @@ import at.gv.egiz.eaaf.core.impl.idp.controller.ProtocolFinalizationController;
 import at.gv.egiz.eaaf.core.impl.idp.process.springweb.AbstractTask;
 import at.gv.egiz.eaaf.core.impl.utils.DataUrlBuilder;
 
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileItemFactory;
-import org.apache.commons.fileupload.FileUploadException;
-import org.apache.commons.fileupload.disk.DiskFileItemFactory;
-import org.apache.commons.fileupload.servlet.ServletFileUpload;
-import org.apache.commons.lang3.ArrayUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.ResourceLoader;
-
 /**
  * Task based counterpart to {@link AuthServlet}, providing the same utility
  * methods (error handling, parameter parsing etc.).
@@ -155,6 +156,36 @@ public abstract class AbstractAuthServletTask extends AbstractTask {
   }
 
   /**
+   * Stopping the current authentication process by User decision.
+   * 
+   * @param executionContext Current execution context
+   * @param request Http request
+   * @param response Http response
+   * @throws TaskExecutionException In case of an error during process-stopping
+   */
+  protected void stopProcessFromUserDecision(final ExecutionContext executionContext,
+      final HttpServletRequest request, final HttpServletResponse response)
+      throws TaskExecutionException {
+    try {
+      revisionsLogger.logEvent(pendingReq, EaafEventCodes.PROCESS_STOPPED_BY_USER);
+      pendingReq.setAbortedByUser(true);
+      pendingReq.setAuthenticated(false);
+      performRedirectToProtocolFinialization(executionContext, pendingReq, request, response);
+
+      log.trace("Set process-cancelation flag");
+      executionContext.setCanceleProcessFlag();
+
+    } catch (final EaafException e) {
+      throw new TaskExecutionException(pendingReq, e.getMessage(), e);
+
+    } catch (final Exception e) {
+      log.warn("Stopping auth.process FAILED", e);
+      throw new TaskExecutionException(pendingReq, e.getMessage(), e);
+
+    }
+  }
+  
+  /**
    * Parses the request input stream for parameters, assuming parameters are
    * encoded UTF-8 (no standard exists how browsers should encode them).
    *
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/tasks/AbstractLocaleAuthServletTask.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/tasks/AbstractLocaleAuthServletTask.java
index dcd5a1d1..007c3e1d 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/tasks/AbstractLocaleAuthServletTask.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/tasks/AbstractLocaleAuthServletTask.java
@@ -11,9 +11,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import at.gv.egiz.eaaf.core.api.data.EaafConstants;
-import at.gv.egiz.eaaf.core.api.data.EaafEventCodes;
 import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext;
-import at.gv.egiz.eaaf.core.exceptions.EaafException;
 import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException;
 import at.gv.egiz.eaaf.core.impl.idp.auth.modules.AbstractAuthServletTask;
 
@@ -53,29 +51,6 @@ public abstract class AbstractLocaleAuthServletTask extends AbstractAuthServletT
 
   }
 
-  protected void stopProcessFromUserDecision(final ExecutionContext executionContext,
-      final HttpServletRequest request, final HttpServletResponse response)
-      throws TaskExecutionException {
-    try {
-      revisionsLogger.logEvent(pendingReq, EaafEventCodes.PROCESS_STOPPED_BY_USER);
-      pendingReq.setAbortedByUser(true);
-      pendingReq.setAuthenticated(false);
-      performRedirectToProtocolFinialization(executionContext, pendingReq, request, response);
-
-      log.trace("Set process-cancelation flag");
-      executionContext.setCanceleProcessFlag();
-
-    } catch (final EaafException e) {
-      throw new TaskExecutionException(pendingReq, e.getMessage(), e);
-
-    } catch (final Exception e) {
-      log.warn("Stopping auth.process FAILED", e);
-      throw new TaskExecutionException(pendingReq, e.getMessage(), e);
-
-    }
-
-  }
-
   protected boolean parseFlagFromHttpRequest(final HttpServletRequest httpReq,
       final String httpParamName, final boolean defaultValue) {
     final String flag = httpReq.getParameter(httpParamName);