X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.support.simple%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2FExecutionParameterPostProcessor.java;h=1bdd4f29a6d46a984443be4b213e7100bffbfda6;hb=5ae9dc81ad1c3ddfa99a8456b0c5263dd483642d;hp=175ef778c68ce5cc502dd576616d57567eb82d1d;hpb=669315aa5d9016a1e5954e8ef172ba3f29d33087;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/ExecutionParameterPostProcessor.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/ExecutionParameterPostProcessor.java
index 175ef778c..1bdd4f29a 100644
--- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/ExecutionParameterPostProcessor.java
+++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/core/execution/ExecutionParameterPostProcessor.java
@@ -1,12 +1,8 @@
 package org.argeo.slc.core.execution;
 
 import java.beans.PropertyDescriptor;
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -40,8 +36,6 @@ public class ExecutionParameterPostProcessor extends
 
 	private InstantiationManager instantiationManager;
 	
-	private Map<String, PropertyValues> storedPvsMap = new HashMap<String, PropertyValues>();
-
 	public InstantiationManager getInstantiationManager() {
 		return instantiationManager;
 	}
@@ -73,67 +67,23 @@ public class ExecutionParameterPostProcessor extends
 			throws BeansException {
 
 		//TODO: resolve at execution only if scope is execution
-			
-		// if 
-		PropertyValues sourcePvs = pvs;
-		if(storedPvsMap.containsKey(beanName)) {
-			sourcePvs = storedPvsMap.get(beanName);
-			log.info("Use storedPvsMap for bean " + beanName);
-		}
-		
+		//TODO: deal with placeholders in RuntimeBeanReference and RuntimeBeanNameReference
+					
 		MutablePropertyValues newPvs = new MutablePropertyValues();
 		
 		boolean changesOccured = false;
 				
 		CustomPpc ppc = new CustomPpc(beanName);
 		
-		for(int i=0; i<sourcePvs.getPropertyValues().length; i++) {
-			
-			PropertyValue pv = pvs.getPropertyValues()[i];
-			
-			if (pv.getValue() instanceof TypedStringValue) {
-				TypedStringValue tsv = (TypedStringValue) pv.getValue();
-				String originalValue = tsv.getValue();
-				String convertedValue = ppc.resolveString(originalValue);
-				// add a new Property value to newPvs, identical to pv
-				// except for the value
-				newPvs.addPropertyValue(new PropertyValue(pv, new TypedStringValue(convertedValue)));
-				if (!convertedValue.equals(originalValue)) {
-					changesOccured = true;
-				}
-			}
-			else if (pv.getValue() instanceof String) {
-				String originalValue = pv.getValue().toString();			
-				String convertedValue = ppc.resolveString(originalValue);
-				newPvs.addPropertyValue(new PropertyValue(pv, convertedValue));
-				if (!convertedValue.equals(originalValue)) {
-					changesOccured = true;
-				}
-			}		
-			else if ((pv.getValue() instanceof ManagedMap)
-					||(pv.getValue() instanceof ManagedList)
-					||(pv.getValue() instanceof ManagedSet)){
-
-				Object convertedValue = ppc.resolveValue(pv.getValue());
-				newPvs.addPropertyValue(new PropertyValue(pv, convertedValue));
-				if(convertedValue != pv.getValue()) {
-					changesOccured = true;
-				}
-			}		
-			else {
-				newPvs.addPropertyValue(new PropertyValue(pv));
+		for(PropertyValue pv : pvs.getPropertyValues()) {
+			Object convertedValue = ppc.resolveValue(pv.getValue());
+			newPvs.addPropertyValue(new PropertyValue(pv, convertedValue));
+			if(convertedValue != pv.getValue()) {
+				changesOccured = true;
 			}
 		}
 		
-		if(changesOccured) {
-			storedPvsMap.put(beanName, pvs);
-			log.info("Add storedPvsMap for Bean " + beanName);
-			return newPvs;
-		}
-		else {
-			// no change, return pvs
-			return pvs;
-		}
+		return changesOccured ? newPvs : pvs;
 	}
 
 	public void setPlaceholderPrefix(String placeholderPrefix) {
@@ -181,7 +131,7 @@ public class ExecutionParameterPostProcessor extends
 				String convertedValue = resolveString(originalValue);
 				return convertedValue.equals(originalValue) ? value : convertedValue;
 			}		
-			else if (value instanceof Map) {
+			else if (value instanceof ManagedMap) {
 				Map mapVal = (Map) value;
 				
 				Map newContent = new ManagedMap();
@@ -200,7 +150,7 @@ public class ExecutionParameterPostProcessor extends
 				
 				return entriesModified ? newContent : value;
 			}
-			else if (value instanceof List) {
+			else if (value instanceof ManagedList) {
 				List listVal = (List) value;
 				List newContent = new ManagedList();
 				boolean valueModified = false;
@@ -215,7 +165,7 @@ public class ExecutionParameterPostProcessor extends
 				}			
 				return valueModified ? newContent : value;
 			}
-			else if (value instanceof Set) {
+			else if (value instanceof ManagedSet) {
 				Set setVal = (Set) value;
 				Set newContent = new ManagedSet();
 				boolean entriesModified = false;