Remove flow path

[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 bf1cf99a5f5efc8e3b3da117407ce58c831b0537..9f2c9dbeabb5bf4c9717635f080f3ee1816153fa 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ * Copyright (C) 2007-2012 Mathieu Baudier
  *
  * 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.ArrayList;
@@ -24,20 +23,14 @@ 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;
 import org.argeo.slc.execution.ExecutionFlow;
 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 {
+/** Default implementation of an execution flow. */
+public class DefaultExecutionFlow implements ExecutionFlow, BeanNameAware {
        private final static Log log = LogFactory
                        .getLog(DefaultExecutionFlow.class);
 
@@ -46,9 +39,6 @@ public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean,
        private Map<String, Object> parameters = new HashMap<String, Object>();
        private List<Runnable> executables = new ArrayList<Runnable>();
 
-       private String path;
-       private StructureRegistry<TreeSPath> registry = new TreeSRegistry();
-
        private Boolean failOnError = true;
 
        public DefaultExecutionFlow() {
@@ -83,13 +73,13 @@ public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean,
                        ExecutionSpecAttribute attr = executionSpec.getAttributes()
                                        .get(key);
 
-                       if (attr.getIsParameter() && !isSetAsParameter(key)) {
-                               errors.rejectValue(key, "Parameter not set");
+                       if (attr.getIsImmutable() && !isSetAsParameter(key)) {
+                               errors.rejectValue(key, "Immutable but not set");
                                break;
                        }
 
-                       if (attr.getIsFrozen() && !isSetAsParameter(key)) {
-                               errors.rejectValue(key, "Frozen but not set as parameter");
+                       if (attr.getIsConstant() && !isSetAsParameter(key)) {
+                               errors.rejectValue(key, "Constant but not set as parameter");
                                break;
                        }
 
@@ -108,9 +98,23 @@ public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean,
        public void run() {
                try {
                        for (Runnable executable : executables) {
+                               if (Thread.interrupted()) {
+                                       log.error("Flow '" + getName() + "' killed before '"
+                                                       + executable + "'");
+                                       Thread.currentThread().interrupt();
+                                       return;
+                                       // throw new ThreadDeath();
+                               }
                                this.doExecuteRunnable(executable);
                        }
                } catch (RuntimeException e) {
+                       if (Thread.interrupted()) {
+                               log.error("Flow '" + getName()
+                                               + "' killed while receiving an unrelated exception", e);
+                               Thread.currentThread().interrupt();
+                               return;
+                               // throw new ThreadDeath();
+                       }
                        if (failOnError)
                                throw e;
                        else {
@@ -128,33 +132,6 @@ public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean,
                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
-                                               && !(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;
-                                       String newPath = path + '/' + flow.getName();
-                                       flow.setPath(newPath);
-                                       log.warn(newPath + " was forcibly set on " + flow);
-                               }
-                       }
-               }
-       }
-
        public void setBeanName(String name) {
                this.name = name;
        }
@@ -218,16 +195,9 @@ public class DefaultExecutionFlow implements ExecutionFlow, InitializingBean,
                return name.hashCode();
        }
 
-       public String getPath() {
-               return path;
-       }
-
+       /** @deprecated does nothing */
+       @Deprecated
        public void setPath(String path) {
-               this.path = path;
-       }
-
-       public void setRegistry(StructureRegistry<TreeSPath> registry) {
-               this.registry = registry;
        }
 
        public Boolean getFailOnError() {