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=277e4df0c93ab52a892f894343770ab4262a7e74;hb=827cc6fa4bff1994f89cb8d925808def5600b5dc;hp=7a2ba74945e3d408d4cdb6bece19988f54b856d0;hpb=1fdb1b4e7b1d2b0cabb6483238301b857a6392fa;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 7a2ba7494..277e4df0c 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 @@ -43,6 +43,10 @@ import org.springframework.context.ConfigurableApplicationContext; import org.springframework.util.Assert; import org.springframework.util.StringUtils; +/** + * Performs conversion in both direction between data exchanged with the agent + * and the data in the application context. + */ public class DefaultExecutionFlowDescriptorConverter implements ExecutionFlowDescriptorConverter, ApplicationContextAware { public final static String REF_VALUE_TYPE_BEAN_NAME = "beanName"; @@ -139,55 +143,8 @@ public class DefaultExecutionFlowDescriptorConverter implements for (String name : executionFlows.keySet()) { ExecutionFlow executionFlow = executionFlows.get(name); - Assert.notNull(executionFlow.getName()); - Assert.state(name.equals(executionFlow.getName())); - - ExecutionSpec executionSpec = executionFlow.getExecutionSpec(); - Assert.notNull(executionSpec); - Assert.notNull(executionSpec.getName()); - - Map values = new TreeMap(); - for (String key : executionSpec.getAttributes().keySet()) { - ExecutionSpecAttribute attribute = executionSpec - .getAttributes().get(key); - - if (attribute instanceof PrimitiveSpecAttribute) { - if (executionFlow.isSetAsParameter(key)) { - Object value = executionFlow.getParameter(key); - PrimitiveValue primitiveValue = new PrimitiveValue(); - primitiveValue - .setType(((PrimitiveSpecAttribute) attribute) - .getType()); - primitiveValue.setValue(value); - values.put(key, primitiveValue); - } else { - // no need to add a primitive value if it is not set, - // all necessary information is in the spec - } - } else if (attribute instanceof RefSpecAttribute) { - 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()); - } - - } - - ExecutionFlowDescriptor efd = new ExecutionFlowDescriptor(name, - values, executionSpec); - if (executionFlow.getPath() != null) - efd.setPath(executionFlow.getPath()); - else - efd.setPath(""); - - // Takes description from spring - BeanDefinition bd = getBeanFactory().getBeanDefinition(name); - efd.setDescription(bd.getDescription()); + ExecutionFlowDescriptor efd = getExecutionFlowDescriptor(executionFlow); + ExecutionSpec executionSpec = efd.getExecutionSpec(); // Add execution spec if necessary if (!md.getExecutionSpecs().contains(executionSpec)) @@ -200,6 +157,60 @@ public class DefaultExecutionFlowDescriptorConverter implements md.getExecutionFlows().addAll(set); } + public ExecutionFlowDescriptor getExecutionFlowDescriptor( + ExecutionFlow executionFlow) { + Assert.notNull(executionFlow.getName()); + String name = executionFlow.getName(); + + ExecutionSpec executionSpec = executionFlow.getExecutionSpec(); + Assert.notNull(executionSpec); + Assert.notNull(executionSpec.getName()); + + Map values = new TreeMap(); + for (String key : executionSpec.getAttributes().keySet()) { + ExecutionSpecAttribute attribute = executionSpec.getAttributes() + .get(key); + + if (attribute instanceof PrimitiveSpecAttribute) { + if (executionFlow.isSetAsParameter(key)) { + Object value = executionFlow.getParameter(key); + PrimitiveValue primitiveValue = new PrimitiveValue(); + primitiveValue.setType(((PrimitiveSpecAttribute) attribute) + .getType()); + primitiveValue.setValue(value); + values.put(key, primitiveValue); + } else { + // no need to add a primitive value if it is not set, + // all necessary information is in the spec + } + } else if (attribute instanceof RefSpecAttribute) { + 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()); + } + + } + + ExecutionFlowDescriptor efd = new ExecutionFlowDescriptor(name, values, + executionSpec); + if (executionFlow.getPath() != null) + efd.setPath(executionFlow.getPath()); + else + efd.setPath(""); + + // Takes description from spring + BeanDefinition bd = getBeanFactory().getBeanDefinition(name); + efd.setDescription(bd.getDescription()); + return efd; + } + @SuppressWarnings(value = { "unchecked" }) protected RefValue buildRefValue(RefSpecAttribute rsa, ExecutionFlow executionFlow, String key) { @@ -221,8 +232,7 @@ public class DefaultExecutionFlowDescriptorConverter implements String ref = null; Object value = executionFlow.getParameter(key); if (applicationContext == null) { - log - .warn("No application context declared, cannot scan ref value."); + log.warn("No application context declared, cannot scan ref value."); ref = value.toString(); } else { @@ -248,19 +258,13 @@ 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."); + log.warn("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.isDebugEnabled()) - log.debug(ref + if (log.isTraceEnabled()) + log.trace(ref + " is the reference for ref spec attribute " + key + " in " + executionFlow + " (" + rsa + ")"); @@ -287,25 +291,46 @@ public class DefaultExecutionFlowDescriptorConverter implements public int compare(ExecutionFlowDescriptor o1, ExecutionFlowDescriptor o2) { // TODO: write unit tests for this - if (StringUtils.hasText(o1.getPath()) - && StringUtils.hasText(o2.getPath())) { - if (o1.getPath().equals(o2.getPath())) - return o1.getName().compareTo(o2.getName()); - else if (o1.getPath().startsWith(o2.getPath())) + + String name1 = o1.getName(); + String name2 = o2.getName(); + + String path1 = o1.getPath(); + String path2 = o2.getPath(); + + // Check whether name include path + int lastIndex1 = name1.lastIndexOf('/'); + // log.debug(name1+", "+lastIndex1); + if (!StringUtils.hasText(path1) && lastIndex1 >= 0) { + path1 = name1.substring(0, lastIndex1); + name1 = name1.substring(lastIndex1 + 1); + } + + int lastIndex2 = name2.lastIndexOf('/'); + if (!StringUtils.hasText(path2) && lastIndex2 >= 0) { + path2 = name2.substring(0, lastIndex2); + name2 = name2.substring(lastIndex2 + 1); + } + + // Perform the actual comparison + if (StringUtils.hasText(path1) && StringUtils.hasText(path2)) { + if (path1.equals(path2)) + return name1.compareTo(name2); + else if (path1.startsWith(path2)) return -1; - else if (o2.getPath().startsWith(o1.getPath())) + else if (path2.startsWith(path1)) return 1; else - return o1.getPath().compareTo(o2.getPath()); - } else if (!StringUtils.hasText(o1.getPath()) - && StringUtils.hasText(o2.getPath())) { + return path1.compareTo(path2); + } else if (!StringUtils.hasText(path1) + && StringUtils.hasText(path2)) { return 1; - } else if (StringUtils.hasText(o1.getPath()) - && !StringUtils.hasText(o2.getPath())) { + } else if (StringUtils.hasText(path1) + && !StringUtils.hasText(path2)) { return -1; - } else if (!StringUtils.hasText(o1.getPath()) - && !StringUtils.hasText(o2.getPath())) { - return o1.getName().compareTo(o2.getName()); + } else if (!StringUtils.hasText(path1) + && !StringUtils.hasText(path2)) { + return name1.compareTo(name2); } else { return 0; }