From e443168b481bb88fecbad73084147e7e8c882908 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Tue, 10 Dec 2019 07:39:27 +0100
Subject: refactoring to new EGIZ code requirements

---
 .../tasks/EvaluateCountrySelectionTask.java        | 75 +++++++++++-----------
 1 file changed, 39 insertions(+), 36 deletions(-)

(limited to 'connector/src/main/java/at/asitplus/eidas/specific/connector/processes/tasks/EvaluateCountrySelectionTask.java')

diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/processes/tasks/EvaluateCountrySelectionTask.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/processes/tasks/EvaluateCountrySelectionTask.java
index 9a91d407..727653b3 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/processes/tasks/EvaluateCountrySelectionTask.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/processes/tasks/EvaluateCountrySelectionTask.java
@@ -1,6 +1,6 @@
-/*******************************************************************************
+/*
  * Copyright 2018 A-SIT Plus GmbH
- * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ, 
+ * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ,
  * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
  *
  * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
@@ -19,7 +19,8 @@
  * 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.asitplus.eidas.specific.connector.processes.tasks;
 
 import java.util.Enumeration;
@@ -33,48 +34,50 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
-import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
+import at.asitplus.eidas.specific.connector.MsEidasNodeConstants;
 import at.gv.egiz.eaaf.core.api.data.EaafConstants;
 import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext;
 import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException;
 import at.gv.egiz.eaaf.core.impl.idp.controller.tasks.AbstractLocaleAuthServletTask;
 
 /**
+ * Evaluate the User's country selection.
+ * 
  * @author tlenz
  *
  */
 @Component("EvaluateCountrySelectionTask")
-public class EvaluateCountrySelectionTask extends AbstractLocaleAuthServletTask  {
-	private static final Logger log = LoggerFactory.getLogger(EvaluateCountrySelectionTask.class);
-	
-	
-	@Override
-	public void executeWithLocale(ExecutionContext executionContext, HttpServletRequest request, HttpServletResponse response)
-			throws TaskExecutionException {		
-		try {
-		 					 
-			// set parameter execution context			
-			Enumeration<String> reqParamNames = request.getParameterNames();
-			while(reqParamNames.hasMoreElements()) {
-				String paramName = reqParamNames.nextElement();
-				if (StringUtils.isNotEmpty(paramName) && 
-						!EaafConstants.PROCESS_ENGINE_PENDINGREQUESTID.equalsIgnoreCase(paramName)) {
-					for (String el : MSeIDASNodeConstants.COUNTRY_SELECTION_PARAM_WHITELIST) {
-						if (el.equalsIgnoreCase(paramName))
-							executionContext.put(paramName, 
-									StringEscapeUtils.escapeHtml(request.getParameter(paramName)));
-					}
-				}
-			}    	    			
-			
-			log.info("Country selection finished. Starting auth. process for country ... ");
-		
-	    	    			
-		} catch (Exception e) {
-			log.warn("EvaluateBKUSelectionTask has an internal error", e);
-			throw new TaskExecutionException(pendingReq, e.getMessage(), e);
-			
-		}
-	}
+public class EvaluateCountrySelectionTask extends AbstractLocaleAuthServletTask {
+  private static final Logger log = LoggerFactory.getLogger(EvaluateCountrySelectionTask.class);
+
+  @Override
+  public void executeWithLocale(ExecutionContext executionContext, HttpServletRequest request,
+      HttpServletResponse response)
+      throws TaskExecutionException {
+    try {
+
+      // set parameter execution context
+      final Enumeration<String> reqParamNames = request.getParameterNames();
+      while (reqParamNames.hasMoreElements()) {
+        final String paramName = reqParamNames.nextElement();
+        if (StringUtils.isNotEmpty(paramName) 
+            && !EaafConstants.PROCESS_ENGINE_PENDINGREQUESTID.equalsIgnoreCase(paramName)) {
+          for (final String el : MsEidasNodeConstants.COUNTRY_SELECTION_PARAM_WHITELIST) {
+            if (el.equalsIgnoreCase(paramName)) {
+              executionContext.put(paramName,
+                  StringEscapeUtils.escapeHtml(request.getParameter(paramName)));
+            }
+          }
+        }
+      }
+
+      log.info("Country selection finished. Starting auth. process for country ... ");
+
+    } catch (final Exception e) {
+      log.warn("EvaluateBKUSelectionTask has an internal error", e);
+      throw new TaskExecutionException(pendingReq, e.getMessage(), e);
+
+    }
+  }
 
 }
-- 
cgit v1.2.3