Merge branch 'eIDAS_node_implementation_remote' into moapid-3.2-opb-redis

Conflicts:
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AbstractController.java
	id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/session/AssertionStore.java

1 files changed, 22 insertions, 4 deletions

diff --git a/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/MOAIDConfigurationValidator.java b/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/MOAIDConfigurationValidator.java
index 42ef0e1e6..2bb33a9d7 100644
--- a/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/MOAIDConfigurationValidator.java
+++ b/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/MOAIDConfigurationValidator.java
@@ -22,19 +22,19 @@
  */
 package at.gv.egovernment.moa.id.config.webgui.validation;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.ServiceLoader;
 import java.util.Map.Entry;
+import java.util.ServiceLoader;
 import java.util.Set;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import at.gv.egiz.components.configuration.api.Configuration;
 import at.gv.egovernment.moa.id.commons.config.MOAIDConfigurationConstants;
 import at.gv.egovernment.moa.id.commons.config.persistence.MOAIDConfiguration;
 import at.gv.egovernment.moa.id.commons.utils.KeyValueUtils;
@@ -243,10 +243,11 @@ public class MOAIDConfigurationValidator {
 				groupEl.getKey(), 
 				MOAIDConfigurationConstants.PREFIX_MOAID)); 
 		
-		//add or update key/value pairs from users with module or task specific information 
+		//add or update key/value pairs from users with module or task specific information
+		List<String> taskDelete = new ArrayList<String>();
 		Map<String, String> toBeAdded = module.postProcessing(
 				KeyValueUtils.removePrefixFromKeys(groupEl.getValue(), groupEl.getKey()), 
-				deleted, 
+				taskDelete, 
 				dbconfig);		
 		if (toBeAdded != null) {
 			toBeAdded = KeyValueUtils.makeKeysAbsolut(toBeAdded, groupEl.getKey(), MOAIDConfigurationConstants.PREFIX_MOAID);
@@ -261,6 +262,23 @@ public class MOAIDConfigurationValidator {
 			}
 		}
 		
+		//make delete elements absolute
+		if (!taskDelete.isEmpty()) {
+			Iterator<String> delInterator = taskDelete.iterator();
+			while (delInterator.hasNext()) {
+				String delKey = delInterator.next();
+				if (!delKey.startsWith(MOAIDConfigurationConstants.PREFIX_MOAID)) {
+					deleted.add(groupEl.getKey() + KeyValueUtils.KEY_DELIMITER + delKey );
+					
+				} else {
+					deleted.add(delKey);
+					
+				}
+				
+			}
+			
+		}
+		
 	}
 	
 	private void keyValueClassification(Iterator<Entry<String, String>> config, Map<String, Map<String,String>> result) {