update ConfigTool to support more than one ELGA mandate-service

1 files changed, 52 insertions, 2 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
index 5e348f91b..74a19dd0b 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
@@ -539,7 +539,22 @@ public class EditGeneralConfigAction extends BasicAction {
 				forcon = new ConnectionParameterClientAuthType();
 				dbforeign.setConnectionParameter(forcon);
 			}
-			forcon.setURL(moaconfig.getSzrgwURL());
+			
+			if (KeyValueUtils.isCSVValueString(moaconfig.getSzrgwURL()))
+				forcon.setURL(KeyValueUtils.normalizeCSVValueString(moaconfig.getSzrgwURL()));
+				
+			else {
+				if (moaconfig.getSzrgwURL().contains(KeyValueUtils.CSV_DELIMITER))
+					forcon.setURL(
+							moaconfig.getSzrgwURL().trim().substring(0, 
+									moaconfig.getSzrgwURL().indexOf(KeyValueUtils.CSV_DELIMITER)));
+					
+				else
+					forcon.setURL(
+							StringUtils.chomp(moaconfig.getSzrgwURL().trim()));
+				
+			}
+		
 		}
 		
         ForeignIdentities foreign = dbauth.getForeignIdentities();
@@ -608,6 +623,7 @@ public class EditGeneralConfigAction extends BasicAction {
             }
 		}
 
+		//write MIS Mandate-Service URLs
 		if (MiscUtil.isNotEmpty(moaconfig.getMandateURL())) {
 			OnlineMandates dbmandate = dbauth.getOnlineMandates();
 			if (dbmandate == null) {
@@ -620,9 +636,43 @@ public class EditGeneralConfigAction extends BasicAction {
 				dbmandateconnection = new ConnectionParameterClientAuthType();
 				dbmandate.setConnectionParameter(dbmandateconnection);
 			}
-			dbmandateconnection.setURL(moaconfig.getMandateURL());
+			
+			if (KeyValueUtils.isCSVValueString(moaconfig.getMandateURL()))
+				dbmandateconnection.setURL(KeyValueUtils.normalizeCSVValueString(moaconfig.getMandateURL()));
+				
+			else {
+				if (moaconfig.getMandateURL().contains(KeyValueUtils.CSV_DELIMITER))
+					dbmandateconnection.setURL(
+							moaconfig.getMandateURL().trim().substring(0, 
+									moaconfig.getMandateURL().indexOf(KeyValueUtils.CSV_DELIMITER)));
+					
+				else
+					dbmandateconnection.setURL(
+							StringUtils.chomp(moaconfig.getMandateURL().trim()));
+				
+			}						
+		}
+		
+		//write ELGA Mandate-Service URLs
+		if (MiscUtil.isNotEmpty(moaconfig.getElgaMandateServiceURL())) {			
+			if (KeyValueUtils.isCSVValueString(moaconfig.getElgaMandateServiceURL()))
+				dbconfig.setElgaMandateServiceURLs(KeyValueUtils.normalizeCSVValueString(moaconfig.getElgaMandateServiceURL()));
+				
+			else {
+				if (moaconfig.getElgaMandateServiceURL().contains(KeyValueUtils.CSV_DELIMITER))
+					dbconfig.setElgaMandateServiceURLs(
+							moaconfig.getElgaMandateServiceURL().trim().substring(0, 
+									moaconfig.getElgaMandateServiceURL().indexOf(KeyValueUtils.CSV_DELIMITER)));
+					
+				else
+					dbconfig.setElgaMandateServiceURLs(
+							StringUtils.chomp(moaconfig.getElgaMandateServiceURL().trim()));
+				
+			}						
 		}
 		
+		
+		
 		MOASP dbmoasp = dbauth.getMOASP();
 		if (dbmoasp == null) {
 			dbmoasp = new MOASP();