X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2FDefaultExecutionFlowDescriptorConverter.java;h=1ff50e0db9c0f1c7caf8d54f0993ba7458197798;hb=006e9a660a4edb4b3815f5a96e4366f80dbcc3ea;hp=baa9b86a1d9a1daec12d0a44fa9884206ff87800;hpb=b2531c398b51dde19d6ceb4952fc5bdcc4c9e1e2;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlowDescriptorConverter.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlowDescriptorConverter.java
index baa9b86a1..1ff50e0db 100644
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlowDescriptorConverter.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlowDescriptorConverter.java
@@ -1,8 +1,11 @@
 package org.argeo.slc.core.execution;
 
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.SortedSet;
 import java.util.TreeMap;
+import java.util.TreeSet;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -22,11 +25,15 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
 
 public class DefaultExecutionFlowDescriptorConverter implements
 		ExecutionFlowDescriptorConverter, ApplicationContextAware {
 	public final static String REF_VALUE_TYPE_BEAN_NAME = "beanName";
 
+	/** Workaround for https://www.spartadn.com/bugzilla/show_bug.cgi?id=206 */
+	private final static String REF_VALUE_INTERNAL = "[internal]";
+
 	private final static Log log = LogFactory
 			.getLog(DefaultExecutionFlowDescriptorConverter.class);
 
@@ -36,9 +43,20 @@ public class DefaultExecutionFlowDescriptorConverter implements
 			ExecutionFlowDescriptor executionFlowDescriptor) {
 		Map<String, Object> values = executionFlowDescriptor.getValues();
 		Map<String, Object> convertedValues = new HashMap<String, Object>();
+		ExecutionSpec executionSpec = executionFlowDescriptor
+				.getExecutionSpec();
+
+		if (executionSpec == null)
+			log.warn("Execution spec is null for " + executionFlowDescriptor);
+
+		if (values != null && executionSpec != null) {
+			values: for (String key : values.keySet()) {
+				ExecutionSpecAttribute attribute = executionSpec
+						.getAttributes().get(key);
+
+				if (attribute.getIsFrozen())
+					continue values;
 
-		if (values != null) {
-			for (String key : values.keySet()) {
 				Object value = values.get(key);
 				if (value instanceof PrimitiveValue) {
 					PrimitiveValue primitiveValue = (PrimitiveValue) value;
@@ -47,17 +65,19 @@ public class DefaultExecutionFlowDescriptorConverter implements
 				} else if (value instanceof RefValue) {
 					RefValue refValue = (RefValue) value;
 
-					if (REF_VALUE_TYPE_BEAN_NAME.equals(refValue.getType()))
-						if (refValue.getRef() != null) {
+					if (REF_VALUE_TYPE_BEAN_NAME.equals(refValue.getType())) {
+						String ref = refValue.getRef();
+						if (ref != null && !ref.equals(REF_VALUE_INTERNAL)) {
 							Object obj = applicationContext.getBean(refValue
 									.getRef());
 							convertedValues.put(key, obj);
 						} else {
 							log.warn("Cannot interpret " + refValue);
 						}
-					else
+					} else {
 						throw new UnsupportedException("Ref value type",
 								refValue.getType());
+					}
 				}
 			}
 		}
@@ -66,6 +86,8 @@ public class DefaultExecutionFlowDescriptorConverter implements
 
 	public void addFlowsToDescriptor(ExecutionModuleDescriptor md,
 			Map<String, ExecutionFlow> executionFlows) {
+		SortedSet<ExecutionFlowDescriptor> set = new TreeSet<ExecutionFlowDescriptor>(
+				new ExecutionFlowDescriptorComparator());
 		for (String name : executionFlows.keySet()) {
 			ExecutionFlow executionFlow = executionFlows.get(name);
 
@@ -95,8 +117,12 @@ public class DefaultExecutionFlowDescriptorConverter implements
 						// all necessary information is in the spec
 					}
 				} else if (attribute instanceof RefSpecAttribute) {
-					values.put(key, buildRefValue((RefSpecAttribute) attribute,
-							executionFlow, key));
+					if (attribute.getIsFrozen()) {
+						values.put(key, new RefValue(REF_VALUE_INTERNAL));
+					} else
+						values.put(key, buildRefValue(
+								(RefSpecAttribute) attribute, executionFlow,
+								key));
 				} else {
 					throw new SlcException("Unkown spec attribute type "
 							+ attribute.getClass());
@@ -108,6 +134,8 @@ public class DefaultExecutionFlowDescriptorConverter implements
 					values, executionSpec);
 			if (executionFlow.getPath() != null)
 				efd.setPath(executionFlow.getPath());
+			else
+				efd.setPath("");
 
 			// Takes description from spring
 			BeanDefinition bd = getBeanFactory().getBeanDefinition(name);
@@ -118,8 +146,10 @@ public class DefaultExecutionFlowDescriptorConverter implements
 				md.getExecutionSpecs().add(executionSpec);
 
 			// Add execution flow
-			md.getExecutionFlows().add(efd);
+			set.add(efd);
+			// md.getExecutionFlows().add(efd);
 		}
+		md.getExecutionFlows().addAll(set);
 	}
 
 	@SuppressWarnings(value = { "unchecked" })
@@ -158,12 +188,16 @@ public class DefaultExecutionFlowDescriptorConverter implements
 					}
 				}
 			}
-			if (ref == null)
+			if (ref == null) {
 				log.warn("Cannot define reference for ref spec attribute "
-						+ key + " in " + executionFlow + " (" + rsa + ")");
-			else if (log.isDebugEnabled())
-				log.debug(ref + " is the reference for ref spec attribute "
-						+ key + " in " + executionFlow + " (" + rsa + ")");
+						+ key + " in " + executionFlow + " (" + rsa + ")."
+						+ " If it is an inner bean consider put it frozen.");
+				ref = REF_VALUE_INTERNAL;
+			} else {
+				if (log.isDebugEnabled())
+					log.debug(ref + " is the reference for ref spec attribute "
+							+ key + " in " + executionFlow + " (" + rsa + ")");
+			}
 			refValue.setRef(ref);
 		}
 		return refValue;
@@ -180,4 +214,26 @@ public class DefaultExecutionFlowDescriptorConverter implements
 		this.applicationContext = applicationContext;
 	}
 
+	private static class ExecutionFlowDescriptorComparator implements
+			Comparator<ExecutionFlowDescriptor> {
+		public int compare(ExecutionFlowDescriptor o1,
+				ExecutionFlowDescriptor o2) {
+			if (StringUtils.hasText(o1.getPath())
+					&& StringUtils.hasText(o2.getPath())) {
+				return o1.getPath().compareTo(o2.getPath());
+			} else if (!StringUtils.hasText(o1.getPath())
+					&& StringUtils.hasText(o2.getPath())) {
+				return 1;
+			} else if (StringUtils.hasText(o1.getPath())
+					&& !StringUtils.hasText(o2.getPath())) {
+				return -1;
+			} else if (!StringUtils.hasText(o1.getPath())
+					&& !StringUtils.hasText(o2.getPath())) {
+				return o1.getName().compareTo(o2.getName());
+			} else {
+				return 0;
+			}
+		}
+
+	}
 }