Repository: camel
Updated Branches:
  refs/heads/camel-2.14.x b63525df0 -> 7ebecc46f
  refs/heads/master db5e6be5a -> a09587b3b


complete the support of user-supplied DataConverter


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a09587b3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a09587b3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a09587b3

Branch: refs/heads/master
Commit: a09587b3bc2ca7f148f06ec4eb79076b0ed0498f
Parents: db5e6be
Author: Steven Marcus <[email protected]>
Authored: Wed Feb 18 20:06:31 2015 +1100
Committer: Claus Ibsen <[email protected]>
Committed: Wed Feb 18 10:16:40 2015 +0100

----------------------------------------------------------------------
 .../camel/component/aws/swf/CamelSWFActivityClient.java      | 2 +-
 .../camel/component/aws/swf/CamelSWFWorkflowClient.java      | 2 +-
 .../camel/component/aws/swf/CamelWorkflowDefinition.java     | 5 ++---
 .../component/aws/swf/CamelWorkflowDefinitionFactory.java    | 8 +++++---
 .../aws/swf/CamelWorkflowDefinitionFactoryFactory.java       | 7 +++++--
 5 files changed, 14 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/a09587b3/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelSWFActivityClient.java
----------------------------------------------------------------------
diff --git 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelSWFActivityClient.java
 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelSWFActivityClient.java
index df30288..32ec5e8 100644
--- 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelSWFActivityClient.java
+++ 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelSWFActivityClient.java
@@ -60,7 +60,7 @@ public class CamelSWFActivityClient {
     }
 
     DynamicActivitiesClient getDynamicActivitiesClient() {
-        return new DynamicActivitiesClientImpl();
+        return new DynamicActivitiesClientImpl(null, 
configuration.getDataConverter());
     }
 
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/a09587b3/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelSWFWorkflowClient.java
----------------------------------------------------------------------
diff --git 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelSWFWorkflowClient.java
 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelSWFWorkflowClient.java
index 6cb3cb0..23d3d6b 100644
--- 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelSWFWorkflowClient.java
+++ 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelSWFWorkflowClient.java
@@ -103,7 +103,7 @@ public class CamelSWFWorkflowClient {
         WorkflowExecution workflowExecution = new WorkflowExecution();
         workflowExecution.setWorkflowId(workflowId != null ? workflowId : 
genericClient.generateUniqueId());
         workflowExecution.setRunId(runId);
-        return new DynamicWorkflowClientExternalImpl(workflowExecution, null, 
endpoint.getStartWorkflowOptions(), null, genericClient);
+        return new DynamicWorkflowClientExternalImpl(workflowExecution, null, 
endpoint.getStartWorkflowOptions(), configuration.getDataConverter(), 
genericClient);
     }
 
     private Object[] toArray(Object input) {

http://git-wip-us.apache.org/repos/asf/camel/blob/a09587b3/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelWorkflowDefinition.java
----------------------------------------------------------------------
diff --git 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelWorkflowDefinition.java
 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelWorkflowDefinition.java
index c9848e1..5c724f2 100644
--- 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelWorkflowDefinition.java
+++ 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelWorkflowDefinition.java
@@ -24,7 +24,6 @@ import 
com.amazonaws.services.simpleworkflow.flow.DataConverterException;
 import com.amazonaws.services.simpleworkflow.flow.DecisionContext;
 import com.amazonaws.services.simpleworkflow.flow.DecisionContextProvider;
 import com.amazonaws.services.simpleworkflow.flow.DecisionContextProviderImpl;
-import com.amazonaws.services.simpleworkflow.flow.JsonDataConverter;
 import com.amazonaws.services.simpleworkflow.flow.WorkflowClock;
 import com.amazonaws.services.simpleworkflow.flow.WorkflowException;
 import 
com.amazonaws.services.simpleworkflow.flow.common.WorkflowExecutionUtils;
@@ -40,12 +39,12 @@ public class CamelWorkflowDefinition extends 
WorkflowDefinition {
 
     private SWFWorkflowConsumer swfWorkflowConsumer;
     private DecisionContext decisionContext;
-    private JsonDataConverter dataConverter;
+    private DataConverter dataConverter;
 
     private final DecisionContextProvider contextProvider = new 
DecisionContextProviderImpl();
     private final WorkflowClock workflowClock = 
contextProvider.getDecisionContext().getWorkflowClock();
 
-    public CamelWorkflowDefinition(SWFWorkflowConsumer swfWorkflowConsumer, 
DecisionContext decisionContext, JsonDataConverter dataConverter) {
+    public CamelWorkflowDefinition(SWFWorkflowConsumer swfWorkflowConsumer, 
DecisionContext decisionContext, DataConverter dataConverter) {
         this.swfWorkflowConsumer = swfWorkflowConsumer;
         this.decisionContext = decisionContext;
         this.dataConverter = dataConverter;

http://git-wip-us.apache.org/repos/asf/camel/blob/a09587b3/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelWorkflowDefinitionFactory.java
----------------------------------------------------------------------
diff --git 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelWorkflowDefinitionFactory.java
 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelWorkflowDefinitionFactory.java
index 84fe62f..8d8a871 100644
--- 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelWorkflowDefinitionFactory.java
+++ 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelWorkflowDefinitionFactory.java
@@ -16,8 +16,8 @@
  */
 package org.apache.camel.component.aws.swf;
 
+import com.amazonaws.services.simpleworkflow.flow.DataConverter;
 import com.amazonaws.services.simpleworkflow.flow.DecisionContext;
-import com.amazonaws.services.simpleworkflow.flow.JsonDataConverter;
 import 
com.amazonaws.services.simpleworkflow.flow.WorkflowTypeRegistrationOptions;
 import com.amazonaws.services.simpleworkflow.flow.generic.WorkflowDefinition;
 import 
com.amazonaws.services.simpleworkflow.flow.generic.WorkflowDefinitionFactory;
@@ -28,11 +28,13 @@ public class CamelWorkflowDefinitionFactory extends 
WorkflowDefinitionFactory {
     private SWFWorkflowConsumer swfWorkflowConsumer;
     private WorkflowType workflowType;
     private WorkflowTypeRegistrationOptions registrationOptions;
+    private DataConverter dataConverter;
 
-    public CamelWorkflowDefinitionFactory(SWFWorkflowConsumer 
swfWorkflowConsumer, WorkflowType workflowType, WorkflowTypeRegistrationOptions 
registrationOptions) {
+    public CamelWorkflowDefinitionFactory(SWFWorkflowConsumer 
swfWorkflowConsumer, WorkflowType workflowType, WorkflowTypeRegistrationOptions 
registrationOptions, DataConverter dataConverter) {
         this.swfWorkflowConsumer = swfWorkflowConsumer;
         this.workflowType = workflowType;
         this.registrationOptions = registrationOptions;
+        this.dataConverter = dataConverter;
     }
 
     @Override
@@ -43,7 +45,7 @@ public class CamelWorkflowDefinitionFactory extends 
WorkflowDefinitionFactory {
     @Override
     public WorkflowDefinition getWorkflowDefinition(DecisionContext context) 
throws Exception {
         CurrentDecisionContext.set(context);
-        return new CamelWorkflowDefinition(swfWorkflowConsumer, context, new 
JsonDataConverter());
+        return new CamelWorkflowDefinition(swfWorkflowConsumer, context, 
dataConverter);
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/camel/blob/a09587b3/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelWorkflowDefinitionFactoryFactory.java
----------------------------------------------------------------------
diff --git 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelWorkflowDefinitionFactoryFactory.java
 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelWorkflowDefinitionFactoryFactory.java
index d3cdecc..ae4d779 100644
--- 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelWorkflowDefinitionFactoryFactory.java
+++ 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/swf/CamelWorkflowDefinitionFactoryFactory.java
@@ -18,6 +18,8 @@ package org.apache.camel.component.aws.swf;
 
 import java.util.ArrayList;
 
+import com.amazonaws.services.simpleworkflow.flow.DataConverter;
+import com.amazonaws.services.simpleworkflow.flow.JsonDataConverter;
 import 
com.amazonaws.services.simpleworkflow.flow.WorkflowTypeRegistrationOptions;
 import 
com.amazonaws.services.simpleworkflow.flow.generic.WorkflowDefinitionFactory;
 import 
com.amazonaws.services.simpleworkflow.flow.generic.WorkflowDefinitionFactoryFactory;
@@ -36,8 +38,9 @@ public class CamelWorkflowDefinitionFactoryFactory extends 
WorkflowDefinitionFac
     public WorkflowDefinitionFactory getWorkflowDefinitionFactory(WorkflowType 
workflowType) {
         WorkflowTypeRegistrationOptions registrationOptions = 
configuration.getWorkflowTypeRegistrationOptions() != null
                 ? configuration.getWorkflowTypeRegistrationOptions() : new 
WorkflowTypeRegistrationOptions();
-
-        return new CamelWorkflowDefinitionFactory(swfWorkflowConsumer, 
workflowType, registrationOptions);
+        DataConverter dataConverter = configuration.getDataConverter() != null
+                ? configuration.getDataConverter() : new JsonDataConverter();
+        return new CamelWorkflowDefinitionFactory(swfWorkflowConsumer, 
workflowType, registrationOptions, dataConverter);
     }
 
     @Override

Reply via email to