1 files changed, 56 insertions, 69 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/OpenAdminRequestsAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/OpenAdminRequestsAction.java
index 26d4e13ab..e1965e951 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/OpenAdminRequestsAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/OpenAdminRequestsAction.java
@@ -24,81 +24,68 @@ package at.gv.egovernment.moa.id.configuration.struts.action;
 
 import java.util.List;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
-import org.apache.log4j.Logger;
-import org.apache.struts2.interceptor.ServletRequestAware;
-import org.apache.struts2.interceptor.ServletResponseAware;
-
-import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.OnlineApplication;
 import at.gv.egovernment.moa.id.commons.db.dao.config.UserDatabase;
+import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.OnlineApplication;
 import at.gv.egovernment.moa.id.configuration.Constants;
 import at.gv.egovernment.moa.id.configuration.auth.AuthenticatedUser;
 import at.gv.egovernment.moa.id.configuration.data.OAListElement;
 import at.gv.egovernment.moa.id.configuration.exception.BasicActionException;
 import at.gv.egovernment.moa.id.configuration.helper.FormDataHelper;
+import lombok.extern.slf4j.Slf4j;
 
-import com.opensymphony.xwork2.ActionSupport;
-
+@Slf4j
 public class OpenAdminRequestsAction extends BasicAction {
-	
-	private static final Logger log = Logger.getLogger(OpenAdminRequestsAction.class);
-	
-	private static final long serialVersionUID = 1L;
-
-	private List<OAListElement> formOAs = null;
-	private List<AuthenticatedUser> userlist = null;
-	
-
-	public String init() {
-		
-		try {
-			populateBasicInformations();
-			
-		} catch (BasicActionException e) {
-			return Constants.STRUTS_ERROR;
-			
-		}
-		
-		if (authUser.isAdmin()) {
-			
-			List<OnlineApplication> dbOAs = configuration.getDbRead().getAllNewOnlineApplications();
-			if (dbOAs != null) {
-				formOAs = FormDataHelper.populateFormWithOAs(dbOAs);
-			}
-			
-			List<UserDatabase> dbUsers = configuration.getUserManagement().getAllNewUsers();
-			if (dbUsers != null){
-				userlist = FormDataHelper.addFormUsers(dbUsers);
-			}
-			
-			session.setAttribute(Constants.SESSION_RETURNAREA, 
-					Constants.STRUTS_RETURNAREA_VALUES.adminRequestsInit.name());
-
-			return Constants.STRUTS_SUCCESS;
-		} else {
-			log.info("Access to OpenAdminRequest area is not allowed for user with ID" + authUser.getUserID());
-			return Constants.STRUTS_NOTALLOWED;
-		}
-		
-	}
-	
-
-	/**
-	 * @return the formOAs
-	 */
-	public List<OAListElement> getFormOAs() {
-		return formOAs;
-	}
-
-
-	/**
-	 * @return the userlist
-	 */
-	public List<AuthenticatedUser> getUserlist() {
-		return userlist;
-	}
-		
+
+  private static final long serialVersionUID = 1L;
+
+  private List<OAListElement> formOAs = null;
+  private List<AuthenticatedUser> userlist = null;
+
+  public String init() {
+
+    try {
+      populateBasicInformations();
+
+    } catch (final BasicActionException e) {
+      return Constants.STRUTS_ERROR;
+
+    }
+
+    if (authUser.isAdmin()) {
+
+      final List<OnlineApplication> dbOAs = configuration.getDbRead().getAllNewOnlineApplications();
+      if (dbOAs != null) {
+        formOAs = FormDataHelper.populateFormWithOAs(dbOAs);
+      }
+
+      final List<UserDatabase> dbUsers = configuration.getUserManagement().getAllNewUsers();
+      if (dbUsers != null) {
+        userlist = FormDataHelper.addFormUsers(dbUsers);
+      }
+
+      session.setAttribute(Constants.SESSION_RETURNAREA,
+          Constants.STRUTS_RETURNAREA_VALUES.adminRequestsInit.name());
+
+      return Constants.STRUTS_SUCCESS;
+    } else {
+      log.info("Access to OpenAdminRequest area is not allowed for user with ID" + authUser.getUserID());
+      return Constants.STRUTS_NOTALLOWED;
+    }
+
+  }
+
+  /**
+   * @return the formOAs
+   */
+  public List<OAListElement> getFormOAs() {
+    return formOAs;
+  }
+
+  /**
+   * @return the userlist
+   */
+  public List<AuthenticatedUser> getUserlist() {
+    return userlist;
+  }
+
 }