fix some possible problems with STORK configuration in config-GUI

1 files changed, 67 insertions, 32 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 504b598c0..d12c1342c 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
@@ -542,42 +542,77 @@ public class EditGeneralConfigAction extends BasicAction {
 			forcon.setURL(moaconfig.getSzrgwURL());
 		}
 		
-            ForeignIdentities foreign = dbauth.getForeignIdentities();
-			if (foreign != null) {
-				STORK stork = foreign.getSTORK();
-				if (stork == null) {
-					stork = new STORK();
-					foreign.setSTORK(stork);
-					
-				}
-
-                try {
-                log.error("QAAAA " + storkconfig.getDefaultQaa());
-				stork.setQualityAuthenticationAssuranceLevel(storkconfig.getDefaultQaa());
+        ForeignIdentities foreign = dbauth.getForeignIdentities();
+		if (foreign != null) {
+			STORK stork = foreign.getSTORK();
+			if (stork == null) {
+				stork = new STORK();
+				foreign.setSTORK(stork);
 				
-				if (storkconfig.getAttributes() != null)
-					stork.setAttributes(storkconfig.getAttributes());
-				
-				else
+			}
+
+            try {
+            	log.error("QAAAA " + storkconfig.getDefaultQaa());
+            	stork.setQualityAuthenticationAssuranceLevel(storkconfig.getDefaultQaa());
+			
+				if (storkconfig.getAttributes() != null) {
+					List<StorkAttribute> dbStorkAttr = stork.getAttributes();
+					if (dbStorkAttr == null) {
+						dbStorkAttr = new ArrayList<StorkAttribute>();
+						stork.setAttributes(dbStorkAttr);
+						
+					}
+					
+					for (StorkAttribute attr : storkconfig.getAttributes()) {
+						if (attr != null && MiscUtil.isNotEmpty(attr.getName()))
+							dbStorkAttr.add(attr);
+						
+						else
+							log.info("Remove null or empty STORK attribute");
+					}
+											
+				} else
 					stork.setAttributes((List<StorkAttribute>) (new ArrayList<StorkAttribute>()));
 				
-				if (storkconfig.getCpepslist() != null)
-
-					stork.setCPEPS(storkconfig.getCpepslist());
-				else
-					stork.setCPEPS((List<CPEPS>) (new ArrayList<CPEPS>()));
+				if (storkconfig.getCpepslist() != null) {
+					List<CPEPS> dbStorkCPEPS = stork.getCPEPS();
+					if (dbStorkCPEPS == null) {
+						dbStorkCPEPS = new ArrayList<CPEPS>();
+						stork.setCPEPS(dbStorkCPEPS);
+					}
+					
+					for (CPEPS cpeps : storkconfig.getCpepslist()) {
+						if (cpeps != null && MiscUtil.isNotEmpty(cpeps.getURL()) &&
+								MiscUtil.isNotEmpty(cpeps.getCountryCode())) {
+							
+							if (cpeps.getCountryCode().equals("CC") && 
+									cpeps.getURL().equals("http://"))
+								log.info("Remove dummy STORK CPEPS entry.");
+								
+							else							
+								dbStorkCPEPS.add(cpeps);
+							
+						} else
+							log.info("Remove null or emtpy STORK CPEPS configuration");
+					}
 				
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-
-                try{
-                   log.info("CPEPS LIST: " + storkconfig.getCpepslist().size() );
-                    log.trace("CPEPS 1:" + storkconfig.getCpepslist().get(0).getCountryCode() +storkconfig.getCpepslist().get(0).getURL());
-                }   catch (Exception ex) {
-                    log.info("CPEPS LIST is null");
-                }
-			}
+				} else
+					stork.setCPEPS((List<CPEPS>) (new ArrayList<CPEPS>()));
+			
+            } catch (Exception e) {
+                e.printStackTrace();
+                
+            }
+
+            try{
+               log.info("CPEPS LIST: " + storkconfig.getCpepslist().size() );
+               log.trace("CPEPS 1:" + storkconfig.getCpepslist().get(0).getCountryCode() +storkconfig.getCpepslist().get(0).getURL());
+               
+            }   catch (Exception ex) {
+                log.info("CPEPS LIST is null");
+                
+            }
+		}
 
 		if (MiscUtil.isNotEmpty(moaconfig.getMandateURL())) {
 			OnlineMandates dbmandate = dbauth.getOnlineMandates();