Repository: camel Updated Branches: refs/heads/master 71ea1f3dc -> a1de79893
Fixed the eclipse warnings of camel-exec Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a1de7989 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a1de7989 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a1de7989 Branch: refs/heads/master Commit: a1de79893053ca27a53048e6110bbfb7048bad78 Parents: 71ea1f3 Author: Willem Jiang <willem.ji...@gmail.com> Authored: Mon May 18 14:19:35 2015 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Mon May 18 14:19:35 2015 +0800 ---------------------------------------------------------------------- .../java/org/apache/camel/component/exec/ExecEndpoint.java | 1 - .../org/apache/camel/component/exec/ExecJava8IssueTest.java | 9 +++------ .../component/exec/ExecJavaProcessRecipientListTest.java | 2 +- .../apache/camel/component/exec/ExecJavaProcessTest.java | 2 +- 4 files changed, 5 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/a1de7989/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecEndpoint.java b/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecEndpoint.java index 4f5f4a1..e6cf4f2 100644 --- a/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecEndpoint.java +++ b/components/camel-exec/src/main/java/org/apache/camel/component/exec/ExecEndpoint.java @@ -20,7 +20,6 @@ import org.apache.camel.Consumer; import org.apache.camel.Processor; import org.apache.camel.Producer; import org.apache.camel.component.exec.impl.DefaultExecBinding; -import org.apache.camel.component.exec.impl.ExecParseUtils; import org.apache.camel.impl.DefaultEndpoint; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.UriEndpoint; http://git-wip-us.apache.org/repos/asf/camel/blob/a1de7989/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJava8IssueTest.java ---------------------------------------------------------------------- diff --git a/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJava8IssueTest.java b/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJava8IssueTest.java index 97aa00e..b080449 100644 --- a/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJava8IssueTest.java +++ b/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJava8IssueTest.java @@ -103,14 +103,11 @@ public class ExecJava8IssueTest extends Assert { * Creates a script which will append " world" to a file */ private void writeScript(File script) throws IOException { - FileWriter fw = new FileWriter(script); - try { - PrintWriter pw = new PrintWriter(fw); + try (FileWriter fw = new FileWriter(script); + PrintWriter pw = new PrintWriter(fw);) { String s = "echo \" world\" >> $1"; pw.print(s); - } finally { - fw.close(); - } + } } /** http://git-wip-us.apache.org/repos/asf/camel/blob/a1de7989/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessRecipientListTest.java ---------------------------------------------------------------------- diff --git a/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessRecipientListTest.java b/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessRecipientListTest.java index 70b4e50..512f0df 100644 --- a/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessRecipientListTest.java +++ b/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessRecipientListTest.java @@ -217,7 +217,7 @@ public class ExecJavaProcessRecipientListTest extends CamelTestSupport { int killAfterMillis = 1000; output.setExpectedMessageCount(1); // add some tolerance - output.setMinimumResultWaitTime(800); + output.setResultMinimumWaitTime(800); // max (the test program sleeps 60 000) output.setResultWaitTime(30000); http://git-wip-us.apache.org/repos/asf/camel/blob/a1de7989/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessTest.java ---------------------------------------------------------------------- diff --git a/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessTest.java b/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessTest.java index 1295e54..d77e661 100644 --- a/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessTest.java +++ b/components/camel-exec/src/test/java/org/apache/camel/component/exec/ExecJavaProcessTest.java @@ -322,7 +322,7 @@ public class ExecJavaProcessTest extends CamelTestSupport { int killAfterMillis = 1000; output.setExpectedMessageCount(1); // add some tolerance - output.setMinimumResultWaitTime(800); + output.setResultMinimumWaitTime(800); // max (the test program sleeps 60 000) output.setResultWaitTime(30000);
