[2/3] camel git commit: fix CS
fix CS Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8cad23cd Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8cad23cd Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8cad23cd Branch: refs/heads/master Commit: 8cad23cdbde00f6c51ed71dcc6a9e3be9091956d Parents: a1e716d Author: Jonathan AnsteyAuthored: Thu Aug 25 12:25:16 2016 -0230 Committer: Jonathan Anstey Committed: Thu Aug 25 12:25:16 2016 -0230 -- .../apache/camel/maven/packaging/PrepareReadmeMojo.java | 10 +- .../camel/maven/packaging/PrepareUserGuideMojo.java | 10 +- 2 files changed, 10 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/8cad23cd/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java -- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java index 9ae8685..7a744b5 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareReadmeMojo.java @@ -420,7 +420,7 @@ public class PrepareReadmeMojo extends AbstractMojo { try { String text = loadText(new FileInputStream(file)); -String existing = StringHelper.between(text, "// eips: START" , "// eips: END"); +String existing = StringHelper.between(text, "// eips: START", "// eips: END"); if (existing != null) { // remove leading line breaks etc existing = existing.trim(); @@ -454,7 +454,7 @@ public class PrepareReadmeMojo extends AbstractMojo { try { String text = loadText(new FileInputStream(file)); -String existing = StringHelper.between(text, "// components: START" , "// components: END"); +String existing = StringHelper.between(text, "// components: START", "// components: END"); if (existing != null) { // remove leading line breaks etc existing = existing.trim(); @@ -488,7 +488,7 @@ public class PrepareReadmeMojo extends AbstractMojo { try { String text = loadText(new FileInputStream(file)); -String existing = StringHelper.between(text, "// dataformats: START" , "// dataformats: END"); +String existing = StringHelper.between(text, "// dataformats: START", "// dataformats: END"); if (existing != null) { // remove leading line breaks etc existing = existing.trim(); @@ -522,7 +522,7 @@ public class PrepareReadmeMojo extends AbstractMojo { try { String text = loadText(new FileInputStream(file)); -String existing = StringHelper.between(text, "// languages: START" , "// languages: END"); +String existing = StringHelper.between(text, "// languages: START", "// languages: END"); if (existing != null) { // remove leading line breaks etc existing = existing.trim(); @@ -658,4 +658,4 @@ public class PrepareReadmeMojo extends AbstractMojo { return language; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/camel/blob/8cad23cd/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareUserGuideMojo.java -- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareUserGuideMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareUserGuideMojo.java index 88697be..1004458 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareUserGuideMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareUserGuideMojo.java @@ -269,7 +269,7 @@ public class PrepareUserGuideMojo extends AbstractMojo { try { String text = loadText(new FileInputStream(file)); -String existing = StringHelper.between(text, "" , ""); +String existing = StringHelper.between(text, "", ""); if (existing != null) { // remove leading line breaks etc existing = existing.trim(); @@ -303,7 +303,7 @@ public class PrepareUserGuideMojo
[2/3] camel git commit: Fix CS error
Fix CS error Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a48b1ff1 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a48b1ff1 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a48b1ff1 Branch: refs/heads/master Commit: a48b1ff1a60c64daa174a32db7b169000caf7ca5 Parents: b784eda Author: Antonin StefanuttiAuthored: Thu Mar 3 15:15:30 2016 +0100 Committer: Antonin Stefanutti Committed: Thu Mar 3 15:15:30 2016 +0100 -- .../src/main/java/org/apache/camel/maven/RunMojo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/a48b1ff1/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java -- diff --git a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java index 48d7839..0b0100c 100644 --- a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java +++ b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java @@ -524,7 +524,7 @@ public class RunMojo extends AbstractExecMojo { class IsolatedThreadGroup extends ThreadGroup { Throwable uncaughtException; // synchronize access to this -public IsolatedThreadGroup(String name) { +IsolatedThreadGroup(String name) { super(name); }
[2/3] camel git commit: Fix CS
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 AnsteyAuthored: 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]; +
[2/3] camel git commit: Fix CS errors
Fix CS errors Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c7a60abc Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c7a60abc Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c7a60abc Branch: refs/heads/camel-2.15.x Commit: c7a60abcc509fdba50882f6d544eaff09b58804d Parents: 74f9ea0 Author: Gregor Zurowski gre...@zurowski.org Authored: Fri Mar 20 20:41:06 2015 -0400 Committer: Claus Ibsen davscl...@apache.org Committed: Sat Mar 21 07:23:50 2015 +0100 -- .../java/org/apache/camel/catalog/DefaultCamelCatalog.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/c7a60abc/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java -- diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java index bc10145..cd4a11b 100644 --- a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java +++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java @@ -472,7 +472,7 @@ public class DefaultCamelCatalog implements CamelCatalog { // parse the syntax and find the same group in the uri Matcher matcher = SYNTAX_PATTERN.matcher(syntax); ListString word = new ArrayListString(); -while (matcher.find() ) { +while (matcher.find()) { String s = matcher.group(1); if (!scheme.equals(s)) { word.add(s); @@ -647,7 +647,7 @@ public class DefaultCamelCatalog implements CamelCatalog { // parse the syntax into each options Matcher matcher = SYNTAX_PATTERN.matcher(originalSyntax); ListString options = new ArrayListString(); -while (matcher.find() ) { +while (matcher.find()) { String s = matcher.group(1); options.add(s); } @@ -655,7 +655,7 @@ public class DefaultCamelCatalog implements CamelCatalog { // parse the syntax into each options Matcher matcher2 = SYNTAX_PATTERN.matcher(syntax); ListString options2 = new ArrayListString(); -while (matcher2.find() ) { +while (matcher2.find()) { String s = matcher2.group(1); options2.add(s); }