1 files changed, 147 insertions, 128 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAGeneralConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAGeneralConfig.java
index c51513193..45a3dba1b 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAGeneralConfig.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAGeneralConfig.java
@@ -27,8 +27,6 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.log4j.Logger;
-
 import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.AuthComponentOA;
 import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.OnlineApplication;
 import at.gv.egovernment.moa.id.commons.validation.ValidationHelper;
@@ -36,130 +34,151 @@ import at.gv.egovernment.moa.id.configuration.Constants;
 import at.gv.egovernment.moa.id.configuration.auth.AuthenticatedUser;
 import at.gv.egovernment.moa.id.configuration.helper.LanguageHelper;
 import at.gv.egovernment.moa.util.MiscUtil;
-
-
-public class OAGeneralConfig implements IOnlineApplicationData{
-	private static final Logger log = Logger.getLogger(OAGeneralConfig.class);
-			
-	private boolean isActive = false;
-		
-	private String identifier = null;
-	private String friendlyName = null;
-	private boolean businessService = false;					
-	
-	
-	/* (non-Javadoc)
-	 * @see at.gv.egovernment.moa.id.configuration.data.oa.IOnlineApplicationData#getName()
-	 */
-	@Override
-	public String getName() {
-		return "OAGeneralInformation";
-	}
-	
-	/* (non-Javadoc)
-	 * @see at.gv.egovernment.moa.id.configuration.data.oa.IOnlineApplicationData#parse(at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication, javax.servlet.http.HttpServletRequest)
-	 */
-	@Override
-	public List<String> parse(OnlineApplication dbOAConfig, AuthenticatedUser authUser, HttpServletRequest request) {
-		isActive = dbOAConfig.isIsActive();
-		
-		friendlyName = dbOAConfig.getFriendlyName();				
-		identifier = dbOAConfig.getPublicURLPrefix();
-				
-		if (dbOAConfig.getType().equals(Constants.MOA_CONFIG_BUSINESSSERVICE))
-			businessService = true;
-		else 
-			businessService = false;
-		
-		return null;
-	}
-
-
-	/* (non-Javadoc)
-	 * @see at.gv.egovernment.moa.id.configuration.data.oa.IOnlineApplicationData#store(at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication, at.gv.egovernment.moa.id.configuration.auth.AuthenticatedUser, javax.servlet.http.HttpServletRequest)
-	 */
-	@Override
-	public String store(OnlineApplication dbOA, AuthenticatedUser authUser,
-			HttpServletRequest request) {
-        AuthComponentOA authoa = dbOA.getAuthComponentOA();
-        if (authoa == null) {
-            authoa = new AuthComponentOA();
-            dbOA.setAuthComponentOA(authoa);
-        }
-        
-        if (authUser.isAdmin()) dbOA.setIsActive(isActive());
-        
-        dbOA.setPublicURLPrefix(getIdentifier());
-        dbOA.setFriendlyName(getFriendlyName());
-
-        if (isBusinessService() || authUser.isOnlyBusinessService()) {
-            dbOA.setType(Constants.MOA_CONFIG_BUSINESSSERVICE);
-            
-        } else {
-        	dbOA.setType(null);
-        }
-                    
-        return null;
-		
-	}
-
-
-	/* (non-Javadoc)
-	 * @see at.gv.egovernment.moa.id.configuration.data.oa.IOnlineApplicationData#validate(at.gv.egovernment.moa.id.configuration.data.oa.OAGeneralConfig, at.gv.egovernment.moa.id.configuration.auth.AuthenticatedUser, javax.servlet.http.HttpServletRequest)
-	 */
-	@Override
-	public List<String> validate(OAGeneralConfig general,
-			AuthenticatedUser authUser, HttpServletRequest request) {
-		
-		List<String> errors = new ArrayList<String>();
-		String check;
-			
-		//check OA FriendlyName
-		check = getFriendlyName();
-		if (MiscUtil.isNotEmpty(check)) {
-			if (ValidationHelper.containsNotValidCharacter(check, false)) {
-				log.warn("OAFriendlyName contains potentail XSS characters: " + check);
-				errors.add(LanguageHelper.getErrorString("validation.general.oafriendlyname.valid", 
-						new Object[] {ValidationHelper.getNotValidCharacter(false)}, request ));
-			}
-		} else {
-			log.info("OA friendlyName is empty");
-			errors.add(LanguageHelper.getErrorString("validation.general.oafriendlyname.empty", request));
-		}
-		
-		return errors;
-		
-	}
-
-	public boolean isBusinessService() {
-		return businessService;
-	}
-
-	public void setBusinessService(boolean businessService) {
-		this.businessService = businessService;
-	}
-	
-	public String getIdentifier() {
-		return identifier;
-	}
-
-	public void setIdentifier(String identifier) {
-		this.identifier = identifier;
-	}
-
-	public String getFriendlyName() {
-		return friendlyName;
-	}
-
-	public void setFriendlyName(String friendlyName) {
-		this.friendlyName = friendlyName;
-	}
-
-	public boolean isActive() {
-		return isActive;
-	}
-
-	public void setActive(boolean isActive) {
-		this.isActive = isActive;
-	}	
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class OAGeneralConfig implements IOnlineApplicationData {
+
+  private boolean isActive = false;
+
+  private String identifier = null;
+  private String friendlyName = null;
+  private boolean businessService = false;
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see
+   * at.gv.egovernment.moa.id.configuration.data.oa.IOnlineApplicationData#getName
+   * ()
+   */
+  @Override
+  public String getName() {
+    return "OAGeneralInformation";
+  }
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see
+   * at.gv.egovernment.moa.id.configuration.data.oa.IOnlineApplicationData#parse(
+   * at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication,
+   * javax.servlet.http.HttpServletRequest)
+   */
+  @Override
+  public List<String> parse(OnlineApplication dbOAConfig, AuthenticatedUser authUser,
+      HttpServletRequest request) {
+    isActive = dbOAConfig.isIsActive();
+
+    friendlyName = dbOAConfig.getFriendlyName();
+    identifier = dbOAConfig.getPublicURLPrefix();
+
+    if (dbOAConfig.getType().equals(Constants.MOA_CONFIG_BUSINESSSERVICE)) {
+      businessService = true;
+    } else {
+      businessService = false;
+    }
+
+    return null;
+  }
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see
+   * at.gv.egovernment.moa.id.configuration.data.oa.IOnlineApplicationData#store(
+   * at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication,
+   * at.gv.egovernment.moa.id.configuration.auth.AuthenticatedUser,
+   * javax.servlet.http.HttpServletRequest)
+   */
+  @Override
+  public String store(OnlineApplication dbOA, AuthenticatedUser authUser,
+      HttpServletRequest request) {
+    AuthComponentOA authoa = dbOA.getAuthComponentOA();
+    if (authoa == null) {
+      authoa = new AuthComponentOA();
+      dbOA.setAuthComponentOA(authoa);
+    }
+
+    if (authUser.isAdmin()) {
+      dbOA.setIsActive(isActive());
+    }
+
+    dbOA.setPublicURLPrefix(getIdentifier());
+    dbOA.setFriendlyName(getFriendlyName());
+
+    if (isBusinessService() || authUser.isOnlyBusinessService()) {
+      dbOA.setType(Constants.MOA_CONFIG_BUSINESSSERVICE);
+
+    } else {
+      dbOA.setType(null);
+    }
+
+    return null;
+
+  }
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see at.gv.egovernment.moa.id.configuration.data.oa.IOnlineApplicationData#
+   * validate(at.gv.egovernment.moa.id.configuration.data.oa.OAGeneralConfig,
+   * at.gv.egovernment.moa.id.configuration.auth.AuthenticatedUser,
+   * javax.servlet.http.HttpServletRequest)
+   */
+  @Override
+  public List<String> validate(OAGeneralConfig general,
+      AuthenticatedUser authUser, HttpServletRequest request) {
+
+    final List<String> errors = new ArrayList<>();
+    String check;
+
+    // check OA FriendlyName
+    check = getFriendlyName();
+    if (MiscUtil.isNotEmpty(check)) {
+      if (ValidationHelper.containsNotValidCharacter(check, false)) {
+        log.warn("OAFriendlyName contains potentail XSS characters: " + check);
+        errors.add(LanguageHelper.getErrorString("validation.general.oafriendlyname.valid",
+            new Object[] { ValidationHelper.getNotValidCharacter(false) }, request));
+      }
+    } else {
+      log.info("OA friendlyName is empty");
+      errors.add(LanguageHelper.getErrorString("validation.general.oafriendlyname.empty", request));
+    }
+
+    return errors;
+
+  }
+
+  public boolean isBusinessService() {
+    return businessService;
+  }
+
+  public void setBusinessService(boolean businessService) {
+    this.businessService = businessService;
+  }
+
+  public String getIdentifier() {
+    return identifier;
+  }
+
+  public void setIdentifier(String identifier) {
+    this.identifier = identifier;
+  }
+
+  public String getFriendlyName() {
+    return friendlyName;
+  }
+
+  public void setFriendlyName(String friendlyName) {
+    this.friendlyName = friendlyName;
+  }
+
+  public boolean isActive() {
+    return isActive;
+  }
+
+  public void setActive(boolean isActive) {
+    this.isActive = isActive;
+  }
 }