From 0436de6184c1a95d463da52929e3bf60923d6e04 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Mon, 13 Dec 2021 09:23:09 +0100
Subject: update third-party libs and resolve API issues

---
 .../validation/oa/OASTORKConfigValidation.java     | 85 +++++++++++-----------
 1 file changed, 42 insertions(+), 43 deletions(-)

(limited to 'id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OASTORKConfigValidation.java')

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OASTORKConfigValidation.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OASTORKConfigValidation.java
index 00ccdca8c..a8836145a 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OASTORKConfigValidation.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OASTORKConfigValidation.java
@@ -28,60 +28,59 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.log4j.Logger;
-
 import at.gv.egovernment.moa.id.commons.MOAIDConstants;
 import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.AttributeProviderPlugin;
 import at.gv.egovernment.moa.id.commons.validation.ValidationHelper;
 import at.gv.egovernment.moa.id.configuration.data.oa.OASTORKConfig;
 import at.gv.egovernment.moa.id.configuration.helper.LanguageHelper;
 import at.gv.egovernment.moa.util.MiscUtil;
+import lombok.extern.slf4j.Slf4j;
 
+@Slf4j
 public class OASTORKConfigValidation {
 
-	private static final Logger log = Logger.getLogger(OASTORKConfigValidation.class);
+  public List<String> validate(OASTORKConfig oageneral, HttpServletRequest request) {
+
+    final List<String> errors = new ArrayList<>();
+
+    // check qaa
+    final String qaa = oageneral.getQaa();
+    if (MiscUtil.isNotEmpty(qaa) && !MOAIDConstants.ALLOWED_eIDAS_LOA.contains(qaa)) {
+      log.warn("eIDAS LoA is not allowed : " + qaa);
+      errors.add(LanguageHelper.getErrorString("validation.stork.qaa.outofrange",
+          new Object[] { qaa }, request));
+    }
+
+    if (oageneral.isVidpEnabled()) {
+      final Iterator<AttributeProviderPlugin> interator = oageneral.getAttributeProviderPlugins().iterator();
+      while (interator.hasNext()) {
+        final AttributeProviderPlugin current = interator.next();
+        if (MiscUtil.isEmpty(current.getUrl()) || !ValidationHelper.validateURL(current.getUrl())) {
+          log.info("AttributeProviderPlugin URL has no valid form.");
+          errors.add(LanguageHelper.getErrorString("validation.stork.ap.url.valid", request));
+        }
+        if (MiscUtil.isEmpty(current.getName())) {
+          log.info("AttributeProviderPlugin Name is empty.");
+          errors.add(LanguageHelper.getErrorString("validation.stork.ap.name.empty", request));
 
-	public List<String> validate(OASTORKConfig oageneral, HttpServletRequest request) {
+        } else {
+          if (!oageneral.getAvailableAttributeProviderPlugins().contains(current.getName())) {
+            log.info("AttributeProviderPlugin Name is not supported.");
+            errors.add(LanguageHelper.getErrorString("validation.stork.ap.name.valid", request));
+          }
+        }
 
-		List<String> errors = new ArrayList<String>();
+        if (MiscUtil.isEmpty(current.getAttributes()) || !current.getAttributes().matches(
+            "[a-zA-Z]+(, ?[a-zA-Z]+)*")) {
+          log.info("AttributeProviderPlugin attributes are empty or do not match csv format.");
+          errors.add(LanguageHelper.getErrorString("validation.stork.ap.attributes.valid", request));
+        }
+      }
 
-		// check qaa
-		String qaa = oageneral.getQaa();
-		if (MiscUtil.isNotEmpty(qaa) && !MOAIDConstants.ALLOWED_eIDAS_LOA.contains(qaa)) {
-			log.warn("eIDAS LoA is not allowed : " + qaa);
-			errors.add(LanguageHelper.getErrorString("validation.stork.qaa.outofrange",
-					new Object[] {qaa}, request ));
-		}
-		
-		if (oageneral.isVidpEnabled()) {		
-			Iterator<AttributeProviderPlugin> interator = oageneral.getAttributeProviderPlugins().iterator();				
-			while (interator.hasNext()) {
-				AttributeProviderPlugin current = interator.next();
-				if (MiscUtil.isEmpty(current.getUrl()) || !ValidationHelper.validateURL(current.getUrl())) {
-					log.info("AttributeProviderPlugin URL has no valid form.");
-					errors.add(LanguageHelper.getErrorString("validation.stork.ap.url.valid", request));
-				}
-				if (MiscUtil.isEmpty(current.getName())) {
-					log.info("AttributeProviderPlugin Name is empty.");
-					errors.add(LanguageHelper.getErrorString("validation.stork.ap.name.empty", request));
-					
-				} else {
-					if (!oageneral.getAvailableAttributeProviderPlugins().contains(current.getName())) {
-						log.info("AttributeProviderPlugin Name is not supported.");
-						errors.add(LanguageHelper.getErrorString("validation.stork.ap.name.valid", request));
-					}				
-				}
-				
-				if (MiscUtil.isEmpty(current.getAttributes()) || !current.getAttributes().matches("[a-zA-Z]+(, ?[a-zA-Z]+)*")) {
-					log.info("AttributeProviderPlugin attributes are empty or do not match csv format.");
-					errors.add(LanguageHelper.getErrorString("validation.stork.ap.attributes.valid", request));
-				}
-			}
-			
-		} else {
-			oageneral.setAttributeProviderPlugins(null);
-		}
+    } else {
+      oageneral.setAttributeProviderPlugins(null);
+    }
 
-		return errors;
-	}
+    return errors;
+  }
 }
-- 
cgit v1.2.3