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=0fcd073af1201c80fc460667dbf5c717a50a94fb;hb=f86db0937b395c7fa96fa4bf4a29cc2c676fe3f5;hp=277e4df0c93ab52a892f894343770ab4262a7e74;hpb=827cc6fa4bff1994f89cb8d925808def5600b5dc;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 277e4df0c..0fcd073af 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,5 +1,5 @@
 /*
- * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ * Copyright (C) 2007-2012 Argeo GmbH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.argeo.slc.core.execution;
 
 import java.util.Comparator;
@@ -35,12 +34,12 @@ import org.argeo.slc.execution.ExecutionSpec;
 import org.argeo.slc.execution.ExecutionSpecAttribute;
 import org.springframework.aop.scope.ScopedObject;
 import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 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;
 
 /**
@@ -59,6 +58,7 @@ public class DefaultExecutionFlowDescriptorConverter implements
 
 	private ApplicationContext applicationContext;
 
+	@SuppressWarnings("unused")
 	public Map<String, Object> convertValues(
 			ExecutionFlowDescriptor executionFlowDescriptor) {
 		Map<String, Object> values = executionFlowDescriptor.getValues();
@@ -74,7 +74,11 @@ public class DefaultExecutionFlowDescriptorConverter implements
 				ExecutionSpecAttribute attribute = executionSpec
 						.getAttributes().get(key);
 
-				if (attribute.getIsFrozen())
+				if (attribute == null)
+					throw new SlcException("No spec attribute defined for '"
+							+ key + "'");
+
+				if (attribute.getIsConstant())
 					continue values;
 
 				Object value = values.get(key);
@@ -130,6 +134,9 @@ public class DefaultExecutionFlowDescriptorConverter implements
 						throw new UnsupportedException("Ref value type",
 								refValue.getType());
 					}
+				} else {
+					// default is to take the value as is
+					convertedValues.put(key, value);
 				}
 			}
 		}
@@ -157,14 +164,19 @@ public class DefaultExecutionFlowDescriptorConverter implements
 		md.getExecutionFlows().addAll(set);
 	}
 
+	@SuppressWarnings("deprecation")
 	public ExecutionFlowDescriptor getExecutionFlowDescriptor(
 			ExecutionFlow executionFlow) {
-		Assert.notNull(executionFlow.getName());
+		if (executionFlow.getName() == null)
+			throw new SlcException("Flow name is null: " + executionFlow);
 		String name = executionFlow.getName();
 
 		ExecutionSpec executionSpec = executionFlow.getExecutionSpec();
-		Assert.notNull(executionSpec);
-		Assert.notNull(executionSpec.getName());
+		if (executionSpec == null)
+			throw new SlcException("Execution spec is null: " + executionFlow);
+		if (executionSpec.getName() == null)
+			throw new SlcException("Execution spec name is null: "
+					+ executionSpec);
 
 		Map<String, Object> values = new TreeMap<String, Object>();
 		for (String key : executionSpec.getAttributes().keySet()) {
@@ -184,7 +196,7 @@ public class DefaultExecutionFlowDescriptorConverter implements
 					// all necessary information is in the spec
 				}
 			} else if (attribute instanceof RefSpecAttribute) {
-				if (attribute.getIsFrozen()) {
+				if (attribute.getIsConstant()) {
 					values.put(key, new RefValue(REF_VALUE_INTERNAL));
 				} else
 					values.put(
@@ -206,8 +218,11 @@ public class DefaultExecutionFlowDescriptorConverter implements
 			efd.setPath("");
 
 		// Takes description from spring
-		BeanDefinition bd = getBeanFactory().getBeanDefinition(name);
-		efd.setDescription(bd.getDescription());
+		BeanFactory bf = getBeanFactory();
+		if (bf != null) {
+			BeanDefinition bd = getBeanFactory().getBeanDefinition(name);
+			efd.setDescription(bd.getDescription());
+		}
 		return efd;
 	}
 
@@ -217,7 +232,7 @@ public class DefaultExecutionFlowDescriptorConverter implements
 		RefValue refValue = new RefValue();
 		// FIXME: UI should be able to deal with other types
 		refValue.setType(REF_VALUE_TYPE_BEAN_NAME);
-		Class targetClass = rsa.getTargetClass();
+		Class<?> targetClass = rsa.getTargetClass();
 		String primitiveType = PrimitiveUtils.classAsType(targetClass);
 		if (primitiveType != null) {
 			if (executionFlow.isSetAsParameter(key)) {
@@ -258,9 +273,15 @@ public class DefaultExecutionFlowDescriptorConverter implements
 					}
 				}
 				if (ref == null) {
-					log.warn("Cannot define reference for ref spec attribute "
-							+ key + " in " + executionFlow + " (" + rsa + ")."
-							+ " If it is an inner bean consider put it frozen.");
+					if (log.isTraceEnabled())
+						log.trace("Cannot define reference for ref spec attribute "
+								+ key
+								+ " in "
+								+ executionFlow
+								+ " ("
+								+ rsa
+								+ ")."
+								+ " If it is an inner bean consider put it frozen.");
 					ref = REF_VALUE_INTERNAL;
 				} else {
 					if (log.isTraceEnabled())
@@ -275,7 +296,10 @@ public class DefaultExecutionFlowDescriptorConverter implements
 		}
 	}
 
+	/** @return can be null */
 	private ConfigurableListableBeanFactory getBeanFactory() {
+		if (applicationContext == null)
+			return null;
 		return ((ConfigurableApplicationContext) applicationContext)
 				.getBeanFactory();
 	}
@@ -288,6 +312,7 @@ public class DefaultExecutionFlowDescriptorConverter implements
 
 	private static class ExecutionFlowDescriptorComparator implements
 			Comparator<ExecutionFlowDescriptor> {
+		@SuppressWarnings("deprecation")
 		public int compare(ExecutionFlowDescriptor o1,
 				ExecutionFlowDescriptor o2) {
 			// TODO: write unit tests for this