1 files changed, 90 insertions, 85 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicAction.java
index 9bbbe3df0..a34a516df 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicAction.java
@@ -26,7 +26,6 @@ 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;
 
@@ -38,100 +37,106 @@ import at.gv.egovernment.moa.id.configuration.auth.AuthenticatedUser;
 import at.gv.egovernment.moa.id.configuration.config.ConfigurationProvider;
 import at.gv.egovernment.moa.id.configuration.exception.BasicActionException;
 import at.gv.egovernment.moa.id.configuration.helper.LanguageHelper;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * @author tlenz
  *
  */
+@Slf4j
 public class BasicAction extends ActionSupport implements ServletRequestAware,
-	ServletResponseAware {
-
-	private static final long serialVersionUID = 7478261301859056771L;
-	private static Logger log = Logger.getLogger(BasicAction.class);
-	
-	protected HttpServletRequest request;
-	protected HttpServletResponse response;
-	protected ConfigurationProvider configuration = null;
-	protected AuthenticatedUser authUser = null; 	
-	protected HttpSession session = null;
-    protected String formID;
-		
-    protected static boolean isMoaidMode = false;
-    
-    public BasicAction() {
-		try {
-			isMoaidMode = ConfigurationProvider.getInstance().isMOAIDMode();
-		} catch (ConfigurationException e) {
-			log.warn("Can NOT load configuration. Set 'moaidmode' to 'false'", e);
-		}
-	}
-    
-    
-	protected void populateBasicInformations() throws BasicActionException {
-		try {
-			configuration = ConfigurationProvider.getInstance();
-		
-			session = request.getSession();
-			Object authUserObj = session.getAttribute(Constants.SESSION_AUTH);
-			if (authUserObj instanceof AuthenticatedUser)
-				authUser = (AuthenticatedUser) authUserObj;
-			
-		} catch (ConfigurationException e) {
-			log.warn("An internal error occurs.", e);
-			addActionError(LanguageHelper.getErrorString("error.login.internal", request));
-			throw new BasicActionException(LanguageHelper.getErrorString("error.login.internal", request), e);
-			
-		}		
-	}
-	
-	public String getConfigToolVersion() {
-		return configuration.getConfigToolVersion();
-	}
-	
-	/**
-	 * @return the authUser
-	 */
-	public AuthenticatedUser getAuthUser() {
-		return authUser;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.apache.struts2.interceptor.ServletResponseAware#setServletResponse(javax.servlet.http.HttpServletResponse)
-	 */
-	@Override
-	public void setServletResponse(HttpServletResponse arg0) {
-		this.response = arg0;
-		
-	}
-
-	/* (non-Javadoc)
-	 * @see org.apache.struts2.interceptor.ServletRequestAware#setServletRequest(javax.servlet.http.HttpServletRequest)
-	 */
-	@Override
-	public void setServletRequest(HttpServletRequest arg0) {
-		this.request =  arg0;
-		
-	}
-	
-    /**
-     * @return the formID
-     */
-    public String getFormID() {
-        return formID;
+    ServletResponseAware {
+
+  private static final long serialVersionUID = 7478261301859056771L;
+
+  protected HttpServletRequest request;
+  protected HttpServletResponse response;
+  protected ConfigurationProvider configuration = null;
+  protected AuthenticatedUser authUser = null;
+  protected HttpSession session = null;
+  protected String formID;
+
+  protected static boolean isMoaidMode = false;
+
+  public BasicAction() {
+    try {
+      isMoaidMode = ConfigurationProvider.getInstance().isMOAIDMode();
+    } catch (final ConfigurationException e) {
+      log.warn("Can NOT load configuration. Set 'moaidmode' to 'false'", e);
     }
+  }
+
+  protected void populateBasicInformations() throws BasicActionException {
+    try {
+      configuration = ConfigurationProvider.getInstance();
+
+      session = request.getSession();
+      final Object authUserObj = session.getAttribute(Constants.SESSION_AUTH);
+      if (authUserObj instanceof AuthenticatedUser) {
+        authUser = (AuthenticatedUser) authUserObj;
+      }
+
+    } catch (final ConfigurationException e) {
+      log.warn("An internal error occurs.", e);
+      addActionError(LanguageHelper.getErrorString("error.login.internal", request));
+      throw new BasicActionException(LanguageHelper.getErrorString("error.login.internal", request), e);
 
-    /**
-     * @param formID the formID to set
-     */
-    public void setFormID(String formID) {
-        this.formID = formID;
     }
+  }
+
+  public String getConfigToolVersion() {
+    return configuration.getConfigToolVersion();
+  }
+
+  /**
+   * @return the authUser
+   */
+  public AuthenticatedUser getAuthUser() {
+    return authUser;
+  }
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see
+   * org.apache.struts2.interceptor.ServletResponseAware#setServletResponse(javax.
+   * servlet.http.HttpServletResponse)
+   */
+  @Override
+  public void setServletResponse(HttpServletResponse arg0) {
+    this.response = arg0;
+
+  }
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see
+   * org.apache.struts2.interceptor.ServletRequestAware#setServletRequest(javax.
+   * servlet.http.HttpServletRequest)
+   */
+  @Override
+  public void setServletRequest(HttpServletRequest arg0) {
+    this.request = arg0;
+
+  }
+
+  /**
+   * @return the formID
+   */
+  public String getFormID() {
+    return formID;
+  }
 
+  /**
+   * @param formID the formID to set
+   */
+  public void setFormID(String formID) {
+    this.formID = formID;
+  }
 
-	public static boolean isMoaidMode() {
-		return isMoaidMode;
-	}
-	
-    
+  public static boolean isMoaidMode() {
+    return isMoaidMode;
+  }
 
 }