Do not use path anymore in as-flow

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

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ExecutionAspect.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ExecutionAspect.java
index 0f091fcb8db2fb98eedfea434a3b717c81518f04..09e2afe5b66acfac0bef30becbdf9c5acde3ce24 100644 (file)
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ExecutionAspect.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ExecutionAspect.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.argeo.slc.core.execution;
 
 import org.apache.commons.logging.Log;
@@ -19,9 +35,10 @@ public class ExecutionAspect {
 
        @Around("flowExecution()")
        public void aroundFlow(ProceedingJoinPoint pjp) throws Throwable {
-               // IMPORTANT: Make sure that the execution context is called before the execution stack
+               // IMPORTANT: Make sure that the execution context is called before the
+               // execution stack
                executionContext.getUuid();
-               
+
                ExecutionFlow executionFlow = (ExecutionFlow) pjp.getTarget();
                executionStack.enterFlow(executionFlow);
                executionContext.setVariable(ExecutionContext.VAR_FLOW_ID,
@@ -31,12 +48,26 @@ public class ExecutionAspect {
 
                if (log.isDebugEnabled())
                        logStackEvent("=> ", executionFlow);
-               // Actually execute the flow
-               pjp.proceed();
-               if (log.isDebugEnabled())
-                       logStackEvent("<= ", executionFlow);
+               
+               try {
+                       // Actually execute the flow
+                       pjp.proceed();
+               } finally {
+                       if (log.isDebugEnabled())
+                               logStackEvent("<= ", executionFlow);
+       
+                       executionStack.leaveFlow(executionFlow);
+               }
+       }
 
-               executionStack.leaveFlow(executionFlow);
+       @Around("runnableExecution()")
+       public void aroundRunnable(ProceedingJoinPoint pjp) throws Throwable {
+               ExecutionFlow executionFlow = (ExecutionFlow) pjp.getTarget();
+               Runnable runnable = (Runnable) pjp.getArgs()[0];
+               if (log.isDebugEnabled())
+                       logRunnableExecution(executionFlow, runnable);
+               // Actually execute the runnable
+               pjp.proceed();
        }
 
        @Around("getVariable()")
@@ -55,6 +86,10 @@ public class ExecutionAspect {
        public void flowExecution() {
        }
 
+       @Pointcut("execution(void org.argeo.slc.execution.ExecutionFlow.doExecuteRunnable(..))")
+       public void runnableExecution() {
+       }
+
        @Pointcut("execution(* org.argeo.slc.execution.ExecutionContext.getVariable(..))")
        public void getVariable() {
        }
@@ -74,6 +109,13 @@ public class ExecutionAspect {
                                + stackSize);
        }
 
+       protected void logRunnableExecution(ExecutionFlow executionFlow,
+                       Runnable runnable) {
+               Integer stackSize = executionStack.getStackSize();
+               log.debug(depthSpaces(stackSize + 1)
+                               + runnable.getClass().getSimpleName() + " in " + executionFlow);
+       }
+
        private String depthSpaces(int depth) {
                StringBuffer buf = new StringBuffer(depth * 2);
                for (int i = 0; i < depth; i++)