1 files changed, 42 insertions, 47 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAFileUploadValidation.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAFileUploadValidation.java
index 2011a07f1..951b89753 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAFileUploadValidation.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAFileUploadValidation.java
@@ -27,67 +27,62 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.commons.io.IOUtils;
-import org.apache.log4j.Logger;
-
 import at.gv.egovernment.moa.id.commons.validation.ValidationHelper;
-import at.gv.egovernment.moa.id.configuration.data.oa.OAGeneralConfig;
 import at.gv.egovernment.moa.id.configuration.helper.LanguageHelper;
 import at.gv.egovernment.moa.util.Base64Utils;
 import at.gv.egovernment.moa.util.MiscUtil;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * @author tlenz
  *
  */
+@Slf4j
 public class OAFileUploadValidation {
 
-	private static final Logger log = Logger.getLogger(OASSOConfigValidation.class);
-	
-	public List<String> validate(List<String> fileName, List<File> files, 
-			String errorMsgPreFix, Map<String, byte[]> output, HttpServletRequest request) {
-		
-		List<String> errors = new ArrayList<String>();
-		
-		if (fileName != null) {
-			
-			if (fileName.size() > 1) {
-				log.info("Only one BKU-selecten template file can be stored");
-				errors.add(LanguageHelper.getErrorString(errorMsgPreFix + ".file.selected", request));
-			}
-			
-			for (int i=0; i<fileName.size(); i++) {
-				String filename = fileName.get(i);
-				
-				if (MiscUtil.isNotEmpty(filename)) {
-					if (ValidationHelper.containsNotValidCharacter(filename, false)) {
-						log.info("Filename is not valid");
-						errors.add(LanguageHelper.getErrorString(errorMsgPreFix + ".filename.valid", request));
-						
-					} else {
-						try {
-							File file = files.get(i);
-							InputStream stream = new FileInputStream(file);
-							output.put(filename, Base64Utils.encode(stream).getBytes("UTF-8"));
-							stream.close();
-							
-						} catch (IOException e) {
-							log.info("File with FileName "
-									+ filename +" can not be loaded." , e);
-							errors.add(LanguageHelper.getErrorString(errorMsgPreFix + ".file.valid", 
-									new Object[] {filename}, request ));
-						}	
-					}
-				}
-			}
-		}
-		
-		return errors;
-	}
+  public List<String> validate(List<String> fileName, List<File> files,
+      String errorMsgPreFix, Map<String, byte[]> output, HttpServletRequest request) {
+
+    final List<String> errors = new ArrayList<>();
+
+    if (fileName != null) {
+
+      if (fileName.size() > 1) {
+        log.info("Only one BKU-selecten template file can be stored");
+        errors.add(LanguageHelper.getErrorString(errorMsgPreFix + ".file.selected", request));
+      }
+
+      for (int i = 0; i < fileName.size(); i++) {
+        final String filename = fileName.get(i);
+
+        if (MiscUtil.isNotEmpty(filename)) {
+          if (ValidationHelper.containsNotValidCharacter(filename, false)) {
+            log.info("Filename is not valid");
+            errors.add(LanguageHelper.getErrorString(errorMsgPreFix + ".filename.valid", request));
+
+          } else {
+            try {
+              final File file = files.get(i);
+              final InputStream stream = new FileInputStream(file);
+              output.put(filename, Base64Utils.encode(stream).getBytes("UTF-8"));
+              stream.close();
+
+            } catch (final IOException e) {
+              log.info("File with FileName "
+                  + filename + " can not be loaded.", e);
+              errors.add(LanguageHelper.getErrorString(errorMsgPreFix + ".file.valid",
+                  new Object[] { filename }, request));
+            }
+          }
+        }
+      }
+    }
+
+    return errors;
+  }
 }