update ConfigTool to support more than one ELGA mandate-service

1 files changed, 29 insertions, 9 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/MOAConfigValidator.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/MOAConfigValidator.java
index 617e9cf51..cb546c5a8 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/MOAConfigValidator.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/MOAConfigValidator.java
@@ -162,10 +162,26 @@ public class MOAConfigValidator {
 //		}
 				
 		check = form.getMandateURL();
-		if (MiscUtil.isNotEmpty(check)) {
-			if (!ValidationHelper.validateURL(check)) {
-				log.info("Not valid Online-Mandate Service URL");
-				errors.add(LanguageHelper.getErrorString("validation.general.mandateservice.valid", request));
+		if (MiscUtil.isNotEmpty(check)) {			
+			String[] misURLs = check.split(",");
+			for (String el : misURLs) {			
+				if (MiscUtil.isNotEmpty(el) && !ValidationHelper.validateURL(StringUtils.chomp(el.trim()))) {
+					log.info("Not valid Online-Mandate Service URL");
+					errors.add(LanguageHelper.getErrorString("validation.general.mandateservice.valid", 
+							new Object[]{el}, request));
+				}
+			}
+		}
+		
+		check = form.getElgaMandateServiceURL();
+		if (MiscUtil.isNotEmpty(check)) {			
+			String[] elgaServiceURLs = check.split(",");
+			for (String el : elgaServiceURLs) {			
+				if (MiscUtil.isNotEmpty(el) && !ValidationHelper.validateURL(StringUtils.chomp(el.trim()))) {
+					log.info("Not valid Online-Mandate Service URL");
+					errors.add(LanguageHelper.getErrorString("validation.general.elga.mandateservice.valid", 
+							new Object[]{el}, request));
+				}
 			}
 		}
 		
@@ -392,13 +408,17 @@ public class MOAConfigValidator {
 		}
 		
 		check = form.getSzrgwURL();
-		if (MiscUtil.isNotEmpty(check)) {
-			if (!ValidationHelper.validateURL(check)) {
-				log.info("SZRGW URL is not valid");
-				errors.add(LanguageHelper.getErrorString("validation.general.szrgw.url.valid", request));
+		if (MiscUtil.isNotEmpty(check)) {			
+			String[] szrGWServiceURLs = check.split(",");
+			for (String el : szrGWServiceURLs) {			
+				if (MiscUtil.isNotEmpty(el) && !ValidationHelper.validateURL(StringUtils.chomp(el.trim()))) {
+					log.info("Not valid Online-Mandate Service URL");
+					errors.add(LanguageHelper.getErrorString("validation.general.szrgw.url.valid", 
+							new Object[]{el}, request));
+				}
 			}
 		}
-		
+			
 		check = form.getTrustedCACerts();
 		if (MiscUtil.isEmpty(check)) {
 			log.info("Empty TrustCACerts Directory");