Improve execution core

[gpl/argeo-slc.git] / runtime / org.argeo.slc.core / src / main / java / org / argeo / slc / core / execution / DefaultExecutionFlow.java

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlow.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlow.java
index a25034e347a3e4dee381b9a2f0819102e91212f7..0c6864f440fccf7aab7fbd7b346c1eaf5a32c3b0 100644 (file)
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlow.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/DefaultExecutionFlow.java
@@ -5,6 +5,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.core.structure.tree.TreeSPath;
 import org.argeo.slc.core.structure.tree.TreeSRegistry;
@@ -13,12 +15,15 @@ import org.argeo.slc.execution.ExecutionSpec;
 import org.argeo.slc.execution.ExecutionSpecAttribute;
 import org.argeo.slc.structure.StructureAware;
 import org.argeo.slc.structure.StructureRegistry;
+import org.springframework.aop.scope.ScopedObject;
 import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.validation.MapBindingResult;
 
 public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean,
                BeanNameAware {
+       private final static Log log = LogFactory
+                       .getLog(DefaultExecutionFlow.class);
 
        private final ExecutionSpec executionSpec;
        private String name = null;
@@ -28,6 +33,8 @@ public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean,
        private String path;
        private StructureRegistry<TreeSPath> registry = new TreeSRegistry();
 
+       private Boolean failOnError = true;
+
        public DefaultExecutionFlow() {
                this.executionSpec = new DefaultExecutionSpec();
        }
@@ -83,23 +90,50 @@ public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean,
        }
 
        public void run() {
-               for (Runnable executable : executables) {
-                       executable.run();
+               try {
+                       for (Runnable executable : executables) {
+                               this.doExecuteRunnable(executable);
+                       }
+               } catch (RuntimeException e) {
+                       if (failOnError)
+                               throw e;
+                       else {
+                               log.error("Execution flow failed,"
+                                               + " but process did not fail"
+                                               + " because failOnError property"
+                                               + " is set to false: " + e);
+                               if (log.isTraceEnabled())
+                                       e.printStackTrace();
+                       }
                }
        }
 
+       public void doExecuteRunnable(Runnable runnable) {
+               runnable.run();
+       }
+
        @SuppressWarnings(value = { "unchecked" })
        public void afterPropertiesSet() throws Exception {
+               if (path == null) {
+                       if (name.charAt(0) == '/') {
+                               path = name.substring(0, name.lastIndexOf('/'));
+                       }
+               }
+
                if (path != null) {
                        for (Runnable executable : executables) {
-                               if (executable instanceof StructureAware) {
+                               if (executable instanceof StructureAware
+                                               && !(executable instanceof ScopedObject)) {
                                        ((StructureAware<TreeSPath>) executable).notifyCurrentPath(
                                                        registry, new TreeSPath(path));
                                } else if (executable instanceof DefaultExecutionFlow) {
                                        // so we don't need to have DefaultExecutionFlow
                                        // implementing StructureAware
+                                       // FIXME: probably has side effects
                                        DefaultExecutionFlow flow = (DefaultExecutionFlow) executable;
-                                       flow.setPath(path + '/' + flow.getName());
+                                       String newPath = path + '/' + flow.getName();
+                                       flow.setPath(newPath);
+                                       log.warn(newPath + " was forcibly set on " + flow);
                                }
                        }
                }
@@ -153,14 +187,21 @@ public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean,
                                                .getAttributes().get(key).getValue() != null);
        }
 
+       @Override
        public String toString() {
-               return new StringBuffer("Flow ").append(name).toString();
+               return new StringBuffer("Execution flow ").append(name).toString();
        }
 
+       @Override
        public boolean equals(Object obj) {
                return ((ExecutionFlow) obj).getName().equals(name);
        }
 
+       @Override
+       public int hashCode() {
+               return name.hashCode();
+       }
+
        public String getPath() {
                return path;
        }
@@ -173,4 +214,12 @@ public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean,
                this.registry = registry;
        }
 
+       public Boolean getFailOnError() {
+               return failOnError;
+       }
+
+       public void setFailOnError(Boolean failOnError) {
+               this.failOnError = failOnError;
+       }
+
 }