date:20150901

[1/3] camel git commit: FUSETOOLS-1347: Add built-in functions for transformation

2015-09-01 Thread janstey

Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x ac31039c9 -> bd29f1ccc


FUSETOOLS-1347: Add built-in functions for transformation


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

Branch: refs/heads/camel-2.15.x
Commit: c21c312b46bf99c25b47050d4142952154f7c486
Parents: ac31039
Author: John Verhaeg 
Authored: Tue Aug 25 22:48:57 2015 -0500
Committer: Jonathan Anstey 
Committed: Tue Sep 1 09:53:03 2015 -0230

--
 .../camel/component/dozer/CustomMapper.java | 204 +++
 .../camel/component/dozer/DozerProducer.java|   6 +
 .../dozer/CustomMapperParametersTest.java   |  62 ++
 3 files changed, 231 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/c21c312b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/CustomMapper.java
--
diff --git 
a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/CustomMapper.java
 
b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/CustomMapper.java
index 331de0c..0807160 100644
--- 
a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/CustomMapper.java
+++ 
b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/CustomMapper.java
@@ -16,7 +16,12 @@
  */
 package org.apache.camel.component.dozer;
 
+import java.lang.reflect.Array;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
 
 import org.apache.camel.spi.ClassResolver;
 
@@ -25,71 +30,188 @@ import org.apache.camel.spi.ClassResolver;
  * required to extend/implement Dozer-specific classes.
  */
 public class CustomMapper extends BaseConverter {
-
+
 private ClassResolver resolver;
-
+
 public CustomMapper(ClassResolver resolver) {
 this.resolver = resolver;
 }
-
+
 @Override
-public Object convert(Object existingDestinationFieldValue, 
-Object sourceFieldValue, 
-Class destinationClass,
-Class sourceClass) {
+public Object convert(Object existingDestinationFieldValue,
+ Object sourceFieldValue,
+ Class destinationClass,
+ Class sourceClass) {
 try {
 return mapCustom(sourceFieldValue);
 } finally {
 done();
 }
 }
-
-Method selectMethod(Class customClass, Object fromType) {
-Method method = null;
-for (Method m : customClass.getDeclaredMethods()) {
-if (m.getReturnType() != null 
-&& m.getParameterTypes().length == 1
-&& 
m.getParameterTypes()[0].isAssignableFrom(fromType.getClass())) {
-method = m;
-break;
-}
-}
-return method;
+
+private Object invokeFunction(Method method,
+ Object customObj,
+ Object source,
+ String[][] 
parameters) throws Exception {
+   Class[] prmTypes = method.getParameterTypes();
+   Object[] methodPrms = new Object[prmTypes.length];
+   methodPrms[0] = source;
+   for (int parameterNdx = 0, methodPrmNdx = 1; parameterNdx < 
parameters.length; parameterNdx++, methodPrmNdx++) {
+   if (method.isVarArgs() && methodPrmNdx == 
prmTypes.length - 1) {
+   Object array = 
Array.newInstance(prmTypes[methodPrmNdx].getComponentType(), parameters.length 
- parameterNdx);
+   for (int arrayNdx = 0; parameterNdx < 
parameters.length; parameterNdx++, arrayNdx++) {
+   String[] parts = 
parameters[parameterNdx];
+   Array.set(array, arrayNdx, 
resolver.resolveClass(parts[0]).getConstructor(String.class).newInstance(parts[1]));
+   }
+   methodPrms[methodPrmNdx] = array;
+   } else {
+   String[] parts = parameters[parameterNdx];
+   methodPrms[methodPrmNdx] = 
resolver.resolveClass(parts[0]).getConstructor(String.class).newInstance(parts[1]);;
+   }
+   }
+   return method.invoke(customObj,

[3/3] camel git commit: Fix more CS

2015-09-01 Thread janstey

Fix more CS


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

Branch: refs/heads/camel-2.15.x
Commit: bd29f1ccc5fb44716717603c031b979cea603dbc
Parents: 4bd681c
Author: Jonathan Anstey 
Authored: Tue Sep 1 09:58:22 2015 -0230
Committer: Jonathan Anstey 
Committed: Tue Sep 1 09:58:22 2015 -0230

--
 .../java/org/apache/camel/component/dozer/CustomMapper.java   | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/bd29f1cc/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/CustomMapper.java
--
diff --git 
a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/CustomMapper.java
 
b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/CustomMapper.java
index b26cd73..8f796f8 100644
--- 
a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/CustomMapper.java
+++ 
b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/CustomMapper.java
@@ -56,7 +56,8 @@ public class CustomMapper extends BaseConverter {
 Class[] prmTypes = method.getParameterTypes();
 Object[] methodPrms = new Object[prmTypes.length];
 methodPrms[0] = source;
-for (int parameterNdx = 0, methodPrmNdx = 1; parameterNdx < 
parameters.length; parameterNdx++, methodPrmNdx++) {
+int methodPrmNdx = 1;
+for (int parameterNdx = 0; parameterNdx < parameters.length; 
parameterNdx++, methodPrmNdx++) {
 if (method.isVarArgs() && methodPrmNdx == prmTypes.length - 1) {
 Object array = 
Array.newInstance(prmTypes[methodPrmNdx].getComponentType(), parameters.length 
- parameterNdx);
 for (int arrayNdx = 0; parameterNdx < parameters.length; 
parameterNdx++, arrayNdx++) {
@@ -188,7 +189,7 @@ public class CustomMapper extends BaseConverter {
 Object source,
 String[][] parameters) {
 // Create list of potential methods
-List methods = new ArrayList<>();
+List methods = new ArrayList();
 for (Method method : customClass.getDeclaredMethods()) {
 methods.add(method);
 }
@@ -226,4 +227,4 @@ public class CustomMapper extends BaseConverter {
 
 return methods.size() > 0 ? methods.get(0) : null;
 }
-}
\ No newline at end of file
+}

[1/2] camel git commit: FUSETOOLS-1347: Add built-in functions for transformation

2015-09-01 Thread janstey

Repository: camel
Updated Branches:
  refs/heads/master e1289b864 -> 803d14888


FUSETOOLS-1347: Add built-in functions for transformation


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

Branch: refs/heads/master
Commit: c53a5c814fc235cd1c47f6abd0e3bfc2b9356ac4
Parents: e1289b8
Author: John Verhaeg 
Authored: Tue Aug 25 22:48:57 2015 -0500
Committer: Jonathan Anstey 
Committed: Tue Sep 1 09:32:56 2015 -0230

--
 .../camel/component/dozer/CustomMapper.java | 204 +++
 .../camel/component/dozer/DozerProducer.java|   6 +
 .../dozer/CustomMapperParametersTest.java   |  62 ++
 3 files changed, 231 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/c53a5c81/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/CustomMapper.java
--
diff --git 
a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/CustomMapper.java
 
b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/CustomMapper.java
index 331de0c..0807160 100644
--- 
a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/CustomMapper.java
+++ 
b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/CustomMapper.java
@@ -16,7 +16,12 @@
  */
 package org.apache.camel.component.dozer;
 
+import java.lang.reflect.Array;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
 
 import org.apache.camel.spi.ClassResolver;
 
@@ -25,71 +30,188 @@ import org.apache.camel.spi.ClassResolver;
  * required to extend/implement Dozer-specific classes.
  */
 public class CustomMapper extends BaseConverter {
-
+
 private ClassResolver resolver;
-
+
 public CustomMapper(ClassResolver resolver) {
 this.resolver = resolver;
 }
-
+
 @Override
-public Object convert(Object existingDestinationFieldValue, 
-Object sourceFieldValue, 
-Class destinationClass,
-Class sourceClass) {
+public Object convert(Object existingDestinationFieldValue,
+ Object sourceFieldValue,
+ Class destinationClass,
+ Class sourceClass) {
 try {
 return mapCustom(sourceFieldValue);
 } finally {
 done();
 }
 }
-
-Method selectMethod(Class customClass, Object fromType) {
-Method method = null;
-for (Method m : customClass.getDeclaredMethods()) {
-if (m.getReturnType() != null 
-&& m.getParameterTypes().length == 1
-&& 
m.getParameterTypes()[0].isAssignableFrom(fromType.getClass())) {
-method = m;
-break;
-}
-}
-return method;
+
+private Object invokeFunction(Method method,
+ Object customObj,
+ Object source,
+ String[][] 
parameters) throws Exception {
+   Class[] prmTypes = method.getParameterTypes();
+   Object[] methodPrms = new Object[prmTypes.length];
+   methodPrms[0] = source;
+   for (int parameterNdx = 0, methodPrmNdx = 1; parameterNdx < 
parameters.length; parameterNdx++, methodPrmNdx++) {
+   if (method.isVarArgs() && methodPrmNdx == 
prmTypes.length - 1) {
+   Object array = 
Array.newInstance(prmTypes[methodPrmNdx].getComponentType(), parameters.length 
- parameterNdx);
+   for (int arrayNdx = 0; parameterNdx < 
parameters.length; parameterNdx++, arrayNdx++) {
+   String[] parts = 
parameters[parameterNdx];
+   Array.set(array, arrayNdx, 
resolver.resolveClass(parts[0]).getConstructor(String.class).newInstance(parts[1]));
+   }
+   methodPrms[methodPrmNdx] = array;
+   } else {
+   String[] parts = parameters[parameterNdx];
+   methodPrms[methodPrmNdx] = 
resolver.resolveClass(parts[0]).getConstructor(String.class).newInstance(parts[1]);;
+   }
+   }
+   return method.invoke(customObj, methodPrms);

[2/3] camel git commit: Fix CS

2015-09-01 Thread janstey

Fix CS


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

Branch: refs/heads/camel-2.15.x
Commit: 4bd681cd8b48aaf59b45ba3ba0a98cefac7b4cab
Parents: c21c312
Author: Jonathan Anstey 
Authored: Tue Sep 1 09:51:09 2015 -0230
Committer: Jonathan Anstey 
Committed: Tue Sep 1 09:53:11 2015 -0230

--
 .../camel/component/dozer/CustomMapper.java | 176 ++-
 .../camel/component/dozer/DozerProducer.java|   4 +-
 .../dozer/CustomMapperParametersTest.java   |  12 +-
 3 files changed, 102 insertions(+), 90 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4bd681cd/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/CustomMapper.java
--
diff --git 
a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/CustomMapper.java
 
b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/CustomMapper.java
index 0807160..b26cd73 100644
--- 
a/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/CustomMapper.java
+++ 
b/components/camel-dozer/src/main/java/org/apache/camel/component/dozer/CustomMapper.java
@@ -39,9 +39,9 @@ public class CustomMapper extends BaseConverter {
 
 @Override
 public Object convert(Object existingDestinationFieldValue,
- Object sourceFieldValue,
- Class destinationClass,
- Class sourceClass) {
+  Object sourceFieldValue,
+  Class destinationClass,
+  Class sourceClass) {
 try {
 return mapCustom(sourceFieldValue);
 } finally {
@@ -50,26 +50,26 @@ public class CustomMapper extends BaseConverter {
 }
 
 private Object invokeFunction(Method method,
- Object customObj,
- Object source,
- String[][] 
parameters) throws Exception {
-   Class[] prmTypes = method.getParameterTypes();
-   Object[] methodPrms = new Object[prmTypes.length];
-   methodPrms[0] = source;
-   for (int parameterNdx = 0, methodPrmNdx = 1; parameterNdx < 
parameters.length; parameterNdx++, methodPrmNdx++) {
-   if (method.isVarArgs() && methodPrmNdx == 
prmTypes.length - 1) {
-   Object array = 
Array.newInstance(prmTypes[methodPrmNdx].getComponentType(), parameters.length 
- parameterNdx);
-   for (int arrayNdx = 0; parameterNdx < 
parameters.length; parameterNdx++, arrayNdx++) {
-   String[] parts = 
parameters[parameterNdx];
-   Array.set(array, arrayNdx, 
resolver.resolveClass(parts[0]).getConstructor(String.class).newInstance(parts[1]));
-   }
-   methodPrms[methodPrmNdx] = array;
-   } else {
-   String[] parts = parameters[parameterNdx];
-   methodPrms[methodPrmNdx] = 
resolver.resolveClass(parts[0]).getConstructor(String.class).newInstance(parts[1]);;
-   }
-   }
-   return method.invoke(customObj, methodPrms);
+  Object customObj,
+  Object source,
+  String[][] parameters) throws Exception {
+Class[] prmTypes = method.getParameterTypes();
+Object[] methodPrms = new Object[prmTypes.length];
+methodPrms[0] = source;
+for (int parameterNdx = 0, methodPrmNdx = 1; parameterNdx < 
parameters.length; parameterNdx++, methodPrmNdx++) {
+if (method.isVarArgs() && methodPrmNdx == prmTypes.length - 1) {
+Object array = 
Array.newInstance(prmTypes[methodPrmNdx].getComponentType(), parameters.length 
- parameterNdx);
+for (int arrayNdx = 0; parameterNdx < parameters.length; 
parameterNdx++, arrayNdx++) {
+String[] parts = parameters[parameterNdx];
+Array.set(array, arrayNdx, 
resolver.resolveClass(parts[0]).getConstructor(String.class).newInstance(parts[1]));
+}
+methodPrms[methodPrmNdx] = array;
+} else {
+String[] parts = parameters[parameterNdx];
+

camel git commit: Upgrade Jline to version 2.13

2015-09-01 Thread acosentino

Repository: camel
Updated Branches:
  refs/heads/master 803d14888 -> ec6ca36f9


Upgrade Jline to version 2.13


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

Branch: refs/heads/master
Commit: ec6ca36f9876f4cbfdee67b12a61667c6d1a4728
Parents: 803d148
Author: Andrea Cosentino 
Authored: Tue Sep 1 17:21:11 2015 +0200
Committer: Andrea Cosentino 
Committed: Tue Sep 1 17:21:11 2015 +0200

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ec6ca36f/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index f230cdd..f18d2c6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -279,7 +279,7 @@
 1.2.6
 20030619_5
 20030619
-2.12
+2.13
 1.5
 1.6.2
 2.8.2

[1/3] camel git commit: FUSETOOLS-1347: Add built-in functions for transformation

[3/3] camel git commit: Fix more CS

[1/2] camel git commit: FUSETOOLS-1347: Add built-in functions for transformation

[2/3] camel git commit: Fix CS

camel git commit: Upgrade Jline to version 2.13

5 matches

Site Navigation

Mail list logo

Footer information