JBPM-4792 - Refactor DefinitionService (BPMN2DataServiceImpl) to avoi…

…d complexity with thread local closes #313
kiegroup · Oct 12, 2015 · 6555165 · 6555165
1 parent b321643
commit 6555165
Show file tree

Hide file tree

Showing 57 changed files with 730 additions and 2,440 deletions.
diff --git a/jbpm-bpmn2/src/main/java/org/jbpm/bpmn2/xml/AbstractNodeHandler.java b/jbpm-bpmn2/src/main/java/org/jbpm/bpmn2/xml/AbstractNodeHandler.java
@@ -140,6 +140,7 @@ public Object end(final String uri, final String localName,
         handleNode(node, element, uri, localName, parser);
         NodeContainer nodeContainer = (NodeContainer) parser.getParent();
         nodeContainer.addNode(node);
+        ((ProcessBuildData) parser.getData()).addNode(node);
         return node;
     }
 

diff --git a/jbpm-bpmn2/src/main/java/org/jbpm/bpmn2/xml/BoundaryEventHandler.java b/jbpm-bpmn2/src/main/java/org/jbpm/bpmn2/xml/BoundaryEventHandler.java
@@ -102,6 +102,7 @@ public Object end(final String uri, final String localName,
         }
         NodeContainer nodeContainer = (NodeContainer) parser.getParent();
         nodeContainer.addNode(node);
+        ((ProcessBuildData) parser.getData()).addNode(node);
         return node;
     }
 

diff --git a/jbpm-bpmn2/src/main/java/org/jbpm/bpmn2/xml/CallActivityHandler.java b/jbpm-bpmn2/src/main/java/org/jbpm/bpmn2/xml/CallActivityHandler.java
@@ -21,6 +21,7 @@
 
 import org.drools.compiler.compiler.xml.XmlDumper;
 import org.drools.core.xml.ExtensibleXmlParser;
+import org.jbpm.compiler.xml.ProcessBuildData;
 import org.jbpm.process.core.impl.DataTransformerRegistry;
 import org.jbpm.workflow.core.Node;
 import org.jbpm.workflow.core.NodeContainer;
@@ -134,6 +135,7 @@ public Object end(String uri, String localName, ExtensibleXmlParser parser) thro
 
         NodeContainer nodeContainer = (NodeContainer) parser.getParent();
         nodeContainer.addNode(node);
+        ((ProcessBuildData) parser.getData()).addNode(node);
         return node;
     }
 

diff --git a/jbpm-bpmn2/src/main/java/org/jbpm/bpmn2/xml/EndEventHandler.java b/jbpm-bpmn2/src/main/java/org/jbpm/bpmn2/xml/EndEventHandler.java
@@ -97,6 +97,7 @@ public Object end(final String uri, final String localName,
         }
         NodeContainer nodeContainer = (NodeContainer) parser.getParent();
         nodeContainer.addNode(node);
+        ((ProcessBuildData) parser.getData()).addNode(node);
         return node;
     }
 

diff --git a/jbpm-bpmn2/src/main/java/org/jbpm/bpmn2/xml/IntermediateCatchEventHandler.java b/jbpm-bpmn2/src/main/java/org/jbpm/bpmn2/xml/IntermediateCatchEventHandler.java
@@ -108,6 +108,7 @@ public Object end(final String uri, final String localName,
         }
         NodeContainer nodeContainer = (NodeContainer) parser.getParent();
         nodeContainer.addNode(node);
+        ((ProcessBuildData) parser.getData()).addNode(node);
         return node;
     }
 

diff --git a/jbpm-bpmn2/src/main/java/org/jbpm/bpmn2/xml/IntermediateThrowEventHandler.java b/jbpm-bpmn2/src/main/java/org/jbpm/bpmn2/xml/IntermediateThrowEventHandler.java
@@ -90,6 +90,7 @@ public Object end(final String uri, final String localName,
 				NodeContainer nodeContainer = (NodeContainer) parser
 						.getParent();
 				nodeContainer.addNode(linkNode);
+				((ProcessBuildData) parser.getData()).addNode(node);
 				// we break the while and stop the execution of this method.
 				return linkNode;
 			}

diff --git a/jbpm-bpmn2/src/main/java/org/jbpm/bpmn2/xml/PropertyHandler.java b/jbpm-bpmn2/src/main/java/org/jbpm/bpmn2/xml/PropertyHandler.java
@@ -92,6 +92,8 @@ public Object start(final String uri, final String localName,
 			}
 			variable.setMetaData("ItemSubjectRef", itemSubjectRef);
 			variables.add(variable);
+
+			((ProcessBuildData) parser.getData()).setMetaData("Variable", variable);
 			return variable;
 		}
 

diff --git a/jbpm-bpmn2/src/main/java/org/jbpm/bpmn2/xml/SubProcessHandler.java b/jbpm-bpmn2/src/main/java/org/jbpm/bpmn2/xml/SubProcessHandler.java
@@ -23,6 +23,7 @@
 import org.jbpm.bpmn2.core.Definitions;
 import org.jbpm.bpmn2.core.IntermediateLink;
 import org.jbpm.bpmn2.core.SequenceFlow;
+import org.jbpm.compiler.xml.ProcessBuildData;
 import org.jbpm.process.core.context.variable.VariableScope;
 import org.jbpm.workflow.core.Node;
 import org.jbpm.workflow.core.NodeContainer;
@@ -103,6 +104,7 @@ public Object end(final String uri, final String localName,
 
         NodeContainer nodeContainer = (NodeContainer) parser.getParent();
         nodeContainer.addNode(node);
+        ((ProcessBuildData) parser.getData()).addNode(node);
 
 		return node;
 	}

diff --git a/jbpm-bpmn2/src/main/java/org/jbpm/bpmn2/xml/TaskHandler.java b/jbpm-bpmn2/src/main/java/org/jbpm/bpmn2/xml/TaskHandler.java
@@ -16,13 +16,16 @@
 
 package org.jbpm.bpmn2.xml;
 
+import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
 import org.drools.core.process.core.Work;
 import org.drools.core.process.core.impl.WorkImpl;
 import org.drools.core.xml.ExtensibleXmlParser;
+import org.jbpm.bpmn2.core.ItemDefinition;
+import org.jbpm.compiler.xml.ProcessBuildData;
 import org.jbpm.process.core.impl.DataTransformerRegistry;
 import org.jbpm.workflow.core.Node;
 import org.jbpm.workflow.core.NodeContainer;
@@ -42,6 +45,10 @@
 public class TaskHandler extends AbstractNodeHandler {
 
 	private DataTransformerRegistry transformerRegistry = DataTransformerRegistry.get();
+	private Map<String, ItemDefinition> itemDefinitions; 
+
+	 Map<String, String> dataTypeInputs = new HashMap<String, String>();
+     Map<String, String> dataTypeOutputs = new HashMap<String, String>();
 
     protected Node createNode(Attributes attrs) {
         return new WorkItemNode();
@@ -54,6 +61,9 @@ public Class<?> generateNodeFor() {
     protected void handleNode(final Node node, final Element element, final String uri, 
             final String localName, final ExtensibleXmlParser parser) throws SAXException {
     	super.handleNode(node, element, uri, localName, parser);
+
+    	itemDefinitions = (Map<String, ItemDefinition>)((ProcessBuildData) parser.getData()).getMetaData("ItemDefinitions");
+
     	WorkItemNode workItemNode = (WorkItemNode) node;
         String name = getTaskName(element);
         Work work = new WorkImpl();
@@ -71,6 +81,8 @@ protected void handleNode(final Node node, final Element element, final String u
         	}
     		xmlNode = xmlNode.getNextSibling();
         }
+        workItemNode.setMetaData("DataInputs", new HashMap<String, String>(dataTypeInputs) );
+        workItemNode.setMetaData("DataOutputs", new HashMap<String, String>(dataTypeOutputs) );
         handleScript(workItemNode, element, "onEntry");
         handleScript(workItemNode, element, "onExit");
 
@@ -86,6 +98,51 @@ protected void handleNode(final Node node, final Element element, final String u
     protected String getTaskName(final Element element) {
         return element.getAttribute("taskName");
     }
+
+    protected void readIoSpecification(org.w3c.dom.Node xmlNode, Map<String, String> dataInputs, Map<String, String> dataOutputs) {
+
+        dataTypeInputs.clear();
+        dataTypeOutputs.clear();
+
+        org.w3c.dom.Node subNode = xmlNode.getFirstChild();
+        while (subNode instanceof Element) {
+            String subNodeName = subNode.getNodeName();
+            if ("dataInput".equals(subNodeName)) {
+                String id = ((Element) subNode).getAttribute("id");
+                String inputName = ((Element) subNode).getAttribute("name");
+                dataInputs.put(id, inputName);
+
+                String itemSubjectRef = ((Element) subNode).getAttribute("itemSubjectRef");                
+                if (itemSubjectRef == null || itemSubjectRef.isEmpty()) {
+                    String dataType = ((Element) subNode).getAttribute("dtype");
+                    if (dataType == null || dataType.isEmpty()) {
+                        dataType = "java.lang.String";
+                    }
+                    dataTypeInputs.put(inputName, dataType);
+                } else {
+                    dataTypeInputs.put(inputName, itemDefinitions.get(itemSubjectRef).getStructureRef());
+                }
+            }
+            if ("dataOutput".equals(subNodeName)) {
+                String id = ((Element) subNode).getAttribute("id");
+                String outputName = ((Element) subNode).getAttribute("name");
+                dataOutputs.put(id, outputName);
+
+                String itemSubjectRef = ((Element) subNode).getAttribute("itemSubjectRef");
+
+                if (itemSubjectRef == null || itemSubjectRef.isEmpty()) {
+                    String dataType = ((Element) subNode).getAttribute("dtype");
+                    if (dataType == null || dataType.isEmpty()) {
+                        dataType = "java.lang.String";
+                    }
+                    dataTypeOutputs.put(outputName, dataType);
+                } else {
+                    dataTypeOutputs.put(outputName, itemDefinitions.get(itemSubjectRef).getStructureRef());
+                }
+            }
+            subNode = subNode.getNextSibling();
+        }
+    }
 
     protected void readDataInputAssociation(org.w3c.dom.Node xmlNode, WorkItemNode workItemNode, Map<String, String> dataInputs) {
 		// sourceRef
@@ -232,6 +289,7 @@ public Object end(final String uri, final String localName,
 		}
 		NodeContainer nodeContainer = (NodeContainer) parser.getParent();
 		nodeContainer.addNode(node);
+		((ProcessBuildData) parser.getData()).addNode(node);
 
 		return node;
 	}

diff --git a/jbpm-flow-builder/src/main/java/org/jbpm/compiler/ProcessBuilderImpl.java b/jbpm-flow-builder/src/main/java/org/jbpm/compiler/ProcessBuilderImpl.java
@@ -286,6 +286,8 @@ public List<Process> addProcessFromXml(final Resource resource) throws IOExcepti
                 // stop null pointers
                 for (Process process : processes) {
                     buildProcess(process, resource);
+
+                    xmlReader.getProcessBuildData().onBuildComplete(process);
                 }
             } else {
                 // @TODO could we maybe add something a bit more informative about what is wrong with the XML ?

diff --git a/jbpm-flow-builder/src/main/java/org/jbpm/compiler/xml/ProcessBuildData.java b/jbpm-flow-builder/src/main/java/org/jbpm/compiler/xml/ProcessBuildData.java
@@ -22,21 +22,43 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.ServiceLoader;
 
-import org.kie.api.definition.process.Process;
 import org.jbpm.workflow.core.Node;
+import org.kie.api.definition.process.Process;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ProcessBuildData {
 
+    private static final Logger logger = LoggerFactory.getLogger(ProcessBuildData.class);
+
+    private static List<ProcessDataEventListenerProvider> providers = collectProviders();
+
     private List<Process> processes = new ArrayList<Process>();
     private Map<Long, Node> nodes = new HashMap<Long, Node>();
     private Map<String, Object> metaData = new HashMap<String, Object>();
+
+    private List<ProcessDataEventListener> listeners = new ArrayList<ProcessDataEventListener>();
+
+    public ProcessBuildData() {
+        if (providers != null) {
+            for (ProcessDataEventListenerProvider provider : providers) {
+                listeners.add(provider.newInstance());
+            }
+        }
+    }
 
     public List<Process> getProcesses() {
+        for (Process process : processes) {
+            onComplete(process);
+        }
+
         return processes;
     }
 
     public void addProcess(Process process) {
+        onProcess(process);
         this.processes.add(process);
     }
 
@@ -48,6 +70,7 @@ public Map<Long, Node> getNodes() {
         return nodes;
     }
     public boolean addNode(Node node) {
+        onNode(node);
         return( this.nodes.put( node.getId(), node ) != null );
     }               
 
@@ -60,6 +83,52 @@ public Object getMetaData(String name) {
     }
 
     public void setMetaData(String name, Object data) {
+        onMetaData(name, data);
         this.metaData.put(name, data);
     }
+
+    // listener support
+
+    protected void onNode(Node node) {
+        for (ProcessDataEventListener listener : listeners) {
+            listener.onNodeAdded(node);
+        }
+    }
+
+    protected void onProcess(Process process) {
+        for (ProcessDataEventListener listener : listeners) {
+            listener.onProcessAdded(process);
+        }
+    }
+
+    protected void onMetaData(String name, Object data) {
+        for (ProcessDataEventListener listener : listeners) {
+            listener.onMetaDataAdded(name, data);
+        }
+    }
+
+    protected void onComplete(Process process) {
+        for (ProcessDataEventListener listener : listeners) {
+            listener.onComplete(process);
+        }
+    }
+
+    public void onBuildComplete(Process process) {
+        for (ProcessDataEventListener listener : listeners) {
+            listener.onBuildComplete(process);
+        }
+    }
+
+    private static List<ProcessDataEventListenerProvider> collectProviders() {
+        ServiceLoader<ProcessDataEventListenerProvider> availableProviders = ServiceLoader.load(ProcessDataEventListenerProvider.class);
+        List<ProcessDataEventListenerProvider> collected = new ArrayList<ProcessDataEventListenerProvider>();
+        try {
+            for (ProcessDataEventListenerProvider provider : availableProviders) {
+                collected.add(provider);
+            }
+        } catch (Throwable e) {
+            logger.debug("Unable to collect process data event listeners due to {}", e.getMessage());
+        }
+        return collected;
+    }
 }
diff --git a/jbpm-flow-builder/src/main/java/org/jbpm/compiler/xml/ProcessDataEventListener.java b/jbpm-flow-builder/src/main/java/org/jbpm/compiler/xml/ProcessDataEventListener.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2015 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * 
+ *      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.jbpm.compiler.xml;
+
+import org.jbpm.workflow.core.Node;
+import org.kie.api.definition.process.Process;
+
+
+public interface ProcessDataEventListener {
+
+    void onNodeAdded(Node node);
+
+    void onProcessAdded(Process process);
+
+    void onMetaDataAdded(String name, Object data);
+
+    void onComplete(Process process);
+
+    void onBuildComplete(Process process);
+}
diff --git a/jbpm-flow-builder/src/main/java/org/jbpm/compiler/xml/ProcessDataEventListenerProvider.java b/jbpm-flow-builder/src/main/java/org/jbpm/compiler/xml/ProcessDataEventListenerProvider.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2015 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * 
+ *      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.jbpm.compiler.xml;
+
+public interface ProcessDataEventListenerProvider {
+
+    ProcessDataEventListener newInstance();
+
+}
diff --git a/jbpm-flow-builder/src/main/java/org/jbpm/compiler/xml/XmlProcessReader.java b/jbpm-flow-builder/src/main/java/org/jbpm/compiler/xml/XmlProcessReader.java
@@ -97,4 +97,8 @@ void setProcesses(final List<Process> processes) {
     public List<Process> getProcess() {
         return this.processes;
     }
+
+    public ProcessBuildData getProcessBuildData() {
+        return (ProcessBuildData) this.parser.getData();
+    }
 }