BZ-1032619 - In Spring Camel integration the JSON batch execution of a

Jbpm process doesn't return the process id - JSON marshalling of StartProcessCommand was missing outIdentifier
apache · Nov 29, 2013 · 47a6171 · 47a6171
1 parent fbda40c
commit 47a6171
Showing 1 changed file with 21 additions and 5 deletions.
diff --git a/drools-core/src/main/java/org/drools/core/runtime/help/impl/XStreamJSon.java b/drools-core/src/main/java/org/drools/core/runtime/help/impl/XStreamJSon.java
@@ -1187,6 +1187,12 @@ public void marshal(Object object,
             writer.startNode( "process-id" );
             writer.setValue( cmd.getProcessId() );
             writer.endNode();
+
+            if ( cmd.getOutIdentifier() != null ) {
+                writer.startNode( "out-identifier" );
+                writer.setValue( cmd.getOutIdentifier() );
+                writer.endNode();
+            }
 
             for ( Entry<String, Object> entry : cmd.getParameters().entrySet() ) {
                 writeItem( new ParameterContainer( entry.getKey(),
@@ -1202,20 +1208,30 @@ public Object unmarshal(HierarchicalStreamReader reader,
             String processId = reader.getValue();
             reader.moveUp();
 
+            String outIdentifier = null;
             HashMap<String, Object> params = new HashMap<String, Object>();
             while ( reader.hasMoreChildren() ) {
                 reader.moveDown();
-                ParameterContainer parameterContainer = (ParameterContainer) readItem( reader,
-                                                                                       context,
-                                                                                       null );
-                params.put( parameterContainer.getIdentifier(),
-                            parameterContainer.getObject() );
+                if ( "parameters".equals( reader.getNodeName() ) ) {
+                    ParameterContainer parameterContainer = (ParameterContainer) readItem( reader,
+                                                                                           context,
+                                                                                           null );
+                    params.put( parameterContainer.getIdentifier(),
+                                parameterContainer.getObject() );
+                } else if ( "out-identifier".equals( reader.getNodeName() ) ) {
+                    outIdentifier = reader.getValue();
+                } else {
+                    throw new IllegalArgumentException( "start-process does not support the child element name=''" + reader.getNodeName() + "' value=" + reader.getValue() + "'" );
+                }
                 reader.moveUp();
             }
 
             StartProcessCommand cmd = new StartProcessCommand();
             cmd.setProcessId( processId );
             cmd.setParameters( params );
+            if ( outIdentifier != null ) {
+                cmd.setOutIdentifier( outIdentifier );
+            }
 
             return cmd;
         }