Merge pull request #5 from jimmidyson/remove-json-marshal-steps

syndesisio · Jul 18, 2017 · 34f43bc · 34f43bc
2 parents 85ace24 + da754f6
commit 34f43bc
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 48 deletions.
diff --git a/runtime/src/main/java/io/syndesis/integration/runtime/SyndesisRouteBuilder.java b/runtime/src/main/java/io/syndesis/integration/runtime/SyndesisRouteBuilder.java
@@ -119,65 +119,55 @@ protected void configureRule(Flow flow, int syndesisIndex) throws MalformedURLEx
             name = "flow" + (syndesisIndex + 1);
             flow.setName(name);
         }
+
         RouteDefinition route = null;
         List<Step> steps = flow.getSteps();
-        int validSteps = 0;
-        if (steps != null) {
-            for (Step item : steps) {
-                if (item instanceof Function) {
-                    Function function = (Function) item;
-                    String functionName = function.getName();
-                    if (!Strings.isEmpty(functionName)) {
-                        if (route != null) {
-                            route.to("json:marshal");
-                        }
-                        String method = null;
-                        int idx = functionName.indexOf("::");
-                        if (idx > 0) {
-                            method = functionName.substring(idx + 2);
-                            functionName = functionName.substring(0, idx);
-                        }
-                        String uri = "class:" + functionName;
-                        if (method != null) {
-                            uri += "?method=" + method;
-                        }
-                        route = fromOrTo(route, name, uri, message);
 
-                        message.append(functionName);
-                        if (method != null) {
-                            message.append("." + method + "()");
-                        } else {
-                            message.append(".main()");
-                        }
-                        validSteps++;
+        if (steps == null || steps.isEmpty()) {
+            throw new IllegalStateException("No valid steps! Invalid flow " + flow);
+        }
+
+        for (Step item : steps) {
+            if (item instanceof Function) {
+                Function function = (Function) item;
+                String functionName = function.getName();
+                if (!Strings.isEmpty(functionName)) {
+                    String method = null;
+                    int idx = functionName.indexOf("::");
+                    if (idx > 0) {
+                        method = functionName.substring(idx + 2);
+                        functionName = functionName.substring(0, idx);
                     }
-                } else if (item instanceof Endpoint) {
-                    Endpoint invokeEndpoint = (Endpoint) item;
-                    String uri = invokeEndpoint.getUri();
-                    if (!Strings.isEmpty(uri)) {
-                        if (route != null) {
-                            route.to("json:marshal");
-                        }
-                        route = fromOrTo(route, name, uri, message);
-                        message.append(uri);
-                        validSteps++;
+                    String uri = "class:" + functionName;
+                    if (method != null) {
+                        uri += "?method=" + method;
                     }
-                } else {
-                    addStep(route, item);
-                    validSteps++;
+                    route = fromOrTo(route, name, uri, message);
+
+                    message.append(functionName);
+                    if (method != null) {
+                        message.append("." + method + "()");
+                    } else {
+                        message.append(".main()");
+                    }
+                }
+            } else if (item instanceof Endpoint) {
+                Endpoint invokeEndpoint = (Endpoint) item;
+                String uri = invokeEndpoint.getUri();
+                if (!Strings.isEmpty(uri)) {
+                    route = fromOrTo(route, name, uri, message);
+                    message.append(uri);
                 }
+            } else {
+                addStep(route, item);
             }
         }
-        if (route == null || validSteps == 0) {
-            throw new IllegalStateException("No valid steps! Invalid flow " + flow);
 
-        }
         if (flow.isLogResultEnabled()) {
             String chain = "log:" + name + "?showStreams=true";
             route.to(chain);
             message.append(" => ");
             message.append(chain);
-            validSteps++;
         }
         LOG.info(message.toString());
 

diff --git a/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/EndpointHandler.java b/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/EndpointHandler.java
@@ -32,7 +32,7 @@ public ProcessorDefinition handle(Endpoint step, ProcessorDefinition route, Synd
     String uri = step.getUri();
     if (!Strings.isEmpty(uri)) {
       uri = routeBuilder.convertEndpointURI(uri);
-      route = route.to("json:marshal").to(uri);
+      route = route.to(uri);
     }
     return route;
   }

diff --git a/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/FunctionHandler.java b/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/FunctionHandler.java
@@ -44,7 +44,7 @@ public ProcessorDefinition handle(Function step, ProcessorDefinition route, Synd
         uri += "?method=" + method;
       }
       uri = routeBuilder.convertEndpointURI(uri);
-      route = route.to("json:marshal").to(uri);
+      route = route.to(uri);
     }
     return route;
   }

diff --git a/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/SplitHandler.java b/runtime/src/main/java/io/syndesis/integration/runtime/stephandlers/SplitHandler.java
@@ -21,6 +21,7 @@
 import org.apache.camel.Expression;
 import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.model.SplitDefinition;
+import org.apache.camel.model.dataformat.JsonLibrary;
 
 @AutoService(StepHandler.class)
 public class SplitHandler implements StepHandler<Split> {
@@ -32,7 +33,7 @@ public boolean canHandle(Step step) {
   @Override
   public ProcessorDefinition handle(Split step, ProcessorDefinition route, SyndesisRouteBuilder routeBuilder) {
     Expression expression = routeBuilder.getMandatoryExpression(step, step.getExpression());
-    SplitDefinition split = route.split(expression);
+    ProcessorDefinition split = route.split(expression).marshal().json(JsonLibrary.Jackson);
     return routeBuilder.addSteps(split, step.getSteps());
   }
 }