[1/2] camel git commit: Fix Checkstyle issues / fix license headers
Repository: camel Updated Branches: refs/heads/master 4f270d3fe -> 145295824 Fix Checkstyle issues / fix license headers Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a3c95f13 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a3c95f13 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a3c95f13 Branch: refs/heads/master Commit: a3c95f134a73d837f476115c48100552c63bb9bc Parents: 4f270d3 Author: Gregor ZurowskiAuthored: Sat Oct 7 14:13:47 2017 +0200 Committer: Gregor Zurowski Committed: Sat Oct 7 14:13:47 2017 +0200 -- .../src/test/resources/1K_buyStocks_secure.xml | 3 ++- .../src/test/resources/log4j2.properties| 2 +- .../src/test/resources/wssecurity.properties| 16 3 files changed, 19 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/a3c95f13/tests/camel-performance/src/test/resources/1K_buyStocks_secure.xml -- diff --git a/tests/camel-performance/src/test/resources/1K_buyStocks_secure.xml b/tests/camel-performance/src/test/resources/1K_buyStocks_secure.xml index 184c2f5..c5aa7cc 100644 --- a/tests/camel-performance/src/test/resources/1K_buyStocks_secure.xml +++ b/tests/camel-performance/src/test/resources/1K_buyStocks_secure.xml @@ -1,4 +1,4 @@ -http://schemas.xmlsoap.org/soap/envelope/;> + +http://schemas.xmlsoap.org/soap/envelope/;> http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd; soapenv:mustUnderstand="1">http://www.w3.org/2001/04/xmlenc#; Id="id-1357383968943278000-1391997743">http://www.w3.org/2001/04/xmlenc#rsa-1_5"/>http://www.w3.org/2000/09/xmldsig#;>http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#Base64Binary; ValueType="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-x509-token-profile-1.0#X509SubjectKeyIdentifier;>Xeg55vRyK3ZhAEhEf+YT0z986L0=owAq5w70v6Sy3YNtSwBsCAc5TJXRj16oyi6DPotBP2ftk0dnABSHfRJo7srYE7mIyjbfyZ7usJ4Q 74Cg9Ot33to1CpQ4wl7SlszeomRx+AL3GA+QuouhO9eDJyAbjYIFy+FcUJ619P1AD1FR8VVdW5P4 DvOxGfm+htl81tdP2kU=http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#Base64Binary; ValueType="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-x509-token-profile-1.0#X509v3; xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd; wsu:Id="id-1357383968942887000-228572128">MIIDDDCCAfSgAwIBAgIQM6YEf7FVYx/tZyEXgVComTANBgkqhkiG9w0BAQUFADAwMQ4wDAYDVQQK http://git-wip-us.apache.org/repos/asf/camel/blob/a3c95f13/tests/camel-performance/src/test/resources/log4j2.properties -- diff --git a/tests/camel-performance/src/test/resources/log4j2.properties b/tests/camel-performance/src/test/resources/log4j2.properties index 1c28b5d..8957aa0 100644 --- a/tests/camel-performance/src/test/resources/log4j2.properties +++ b/tests/camel-performance/src/test/resources/log4j2.properties @@ -6,7 +6,7 @@ ## (the "License"); you may not use this file except in compliance with ## the License. You may obtain a copy of the License at ## -## http://www.apache.org/licenses/LICENSE-2.0 +## http://www.apache.org/licenses/LICENSE-2.0 ## ## Unless required by applicable law or agreed to in writing, software ## distributed under the License is distributed on an "AS IS" BASIS, http://git-wip-us.apache.org/repos/asf/camel/blob/a3c95f13/tests/camel-performance/src/test/resources/wssecurity.properties -- diff --git a/tests/camel-performance/src/test/resources/wssecurity.properties b/tests/camel-performance/src/test/resources/wssecurity.properties index 0e54529..68196c1 100644 --- a/tests/camel-performance/src/test/resources/wssecurity.properties +++ b/tests/camel-performance/src/test/resources/wssecurity.properties @@ -1,3 +1,19 @@ +## --- +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the
[1/2] camel git commit: Fix Checkstyle issues
Repository: camel Updated Branches: refs/heads/camel-2.16.x 54a03578d -> 4b743c986 Fix Checkstyle issues Signed-off-by: Gregor ZurowskiProject: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4b743c98 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4b743c98 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4b743c98 Branch: refs/heads/camel-2.16.x Commit: 4b743c986727710e92a53ef51937304f52af44be Parents: a4b219e Author: Gregor Zurowski Authored: Sun Sep 18 16:42:47 2016 +0200 Committer: Gregor Zurowski Committed: Sun Sep 18 16:42:47 2016 +0200 -- --
[1/2] camel git commit: Fix Checkstyle issues
Repository: camel Updated Branches: refs/heads/master d812f545c -> cc9abf94c Fix Checkstyle issues Signed-off-by: Gregor ZurowskiProject: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3e2dcc46 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3e2dcc46 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3e2dcc46 Branch: refs/heads/master Commit: 3e2dcc469564eb4ff6d0232da831ecc0c9e899a4 Parents: d812f54 Author: Gregor Zurowski Authored: Fri Jan 22 16:46:07 2016 +0100 Committer: Gregor Zurowski Committed: Fri Jan 22 16:46:07 2016 +0100 -- .../java/org/apache/camel/component/hdfs/HdfsConsumerTest.java| 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/3e2dcc46/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsConsumerTest.java -- diff --git a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsConsumerTest.java b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsConsumerTest.java index adf2e4d..ddf6d35 100644 --- a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsConsumerTest.java +++ b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsConsumerTest.java @@ -264,7 +264,8 @@ public class HdfsConsumerTest extends HdfsTestSupport { context.addRoutes(new RouteBuilder() { public void configure() { -from("hdfs:localhost/" + file.getParent().toUri() + "?scheduler=#myScheduler=*=LOCAL=SEQUENCE_FILE=0=handled").to("mock:result"); +from("hdfs:localhost/" + file.getParent().toUri() + "?scheduler=#myScheduler=*=LOCAL=SEQUENCE_FILE=0=handled") +.to("mock:result"); } }); ScheduledExecutorService pool = context.getExecutorServiceManager().newScheduledThreadPool(null, "unitTestPool", 1);
[1/2] camel git commit: Fix Checkstyle issues
Repository: camel Updated Branches: refs/heads/camel-2.16.x 12b91a01c -> 98d70169b Fix Checkstyle issues Signed-off-by: Gregor ZurowskiProject: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b4e6c41a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b4e6c41a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b4e6c41a Branch: refs/heads/camel-2.16.x Commit: b4e6c41a2d8b2a05728b774e8a29291a83532aa2 Parents: 12b91a0 Author: Gregor Zurowski Authored: Fri Jan 22 15:52:55 2016 +0100 Committer: Gregor Zurowski Committed: Fri Jan 22 15:56:07 2016 +0100 -- .../component/netty4/NettyProducerHangTest.java | 58 ++-- 1 file changed, 29 insertions(+), 29 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/b4e6c41a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyProducerHangTest.java -- diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyProducerHangTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyProducerHangTest.java index 199180d..2a23d8e 100644 --- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyProducerHangTest.java +++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyProducerHangTest.java @@ -16,18 +16,18 @@ */ package org.apache.camel.component.netty4; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.Test; - import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.net.ServerSocket; import java.net.Socket; +import org.apache.camel.test.junit4.CamelTestSupport; +import org.junit.Test; + public class NettyProducerHangTest extends CamelTestSupport { - private static int PORT = 4093; +private static int PORT = 4093; @Test public void nettyProducerHangsOnTheSecondRequestToTheSocketWhichIsClosed() throws Exception { @@ -40,7 +40,7 @@ public class NettyProducerHangTest extends CamelTestSupport { } catch (IOException e) { log.error("Exception occured: " + e.getMessage(), e); } - } +} }).start(); String response1 = template.requestBody("netty4:tcp://localhost:" + PORT + "?textline=true=true", "request1", String.class); @@ -48,7 +48,7 @@ public class NettyProducerHangTest extends CamelTestSupport { try { // our test server will close the socket now so we should get an error -template.requestBody("netty4:tcp://localhost:" + PORT + "?textline=true=true", "request2", String.class); +template.requestBody("netty4:tcp://localhost:" + PORT + "?textline=true=true", "request2", String.class); } catch (Exception e) { assertStringContains(e.getCause().getMessage(), "No response received from remote server"); } @@ -58,36 +58,36 @@ public class NettyProducerHangTest extends CamelTestSupport { try { // our test server will close the socket now so we should get an error -template.requestBody("netty4:tcp://localhost:" + PORT + "?textline=true=true", "request4", String.class); +template.requestBody("netty4:tcp://localhost:" + PORT + "?textline=true=true", "request4", String.class); } catch (Exception e) { assertStringContains(e.getCause().getMessage(), "No response received from remote server"); } } - private void acceptReplyAcceptClose() throws IOException { - byte buf[] = new byte[128]; +private void acceptReplyAcceptClose() throws IOException { +byte buf[] = new byte[128]; + +ServerSocket serverSocket = new ServerSocket(PORT); +Socket soc = serverSocket.accept(); - ServerSocket serverSocket = new ServerSocket(PORT); - Socket soc = serverSocket.accept(); +log.info("Open socket and accept data"); +try (InputStream is = soc.getInputStream(); +OutputStream os = soc.getOutputStream()) { +// read first message +is.read(buf); - log.info("Open socket and accept data"); - try (InputStream is = soc.getInputStream(); - OutputStream os = soc.getOutputStream()) { - // read first message - is.read(buf); - - // reply to the first message - os.write("response\n".getBytes()); -
[1/2] camel git commit: Fix Checkstyle issues
Repository: camel Updated Branches: refs/heads/master cc9abf94c -> e517f9f1f Fix Checkstyle issues Signed-off-by: Gregor ZurowskiProject: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/378f2195 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/378f2195 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/378f2195 Branch: refs/heads/master Commit: 378f21952b706910142f9098d7e9494f391a4f00 Parents: cc9abf9 Author: Gregor Zurowski Authored: Fri Jan 22 16:53:27 2016 +0100 Committer: Gregor Zurowski Committed: Fri Jan 22 16:55:27 2016 +0100 -- .../java/org/apache/camel/component/hdfs2/HdfsConsumerTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/378f2195/components/camel-hdfs2/src/test/java/org/apache/camel/component/hdfs2/HdfsConsumerTest.java -- diff --git a/components/camel-hdfs2/src/test/java/org/apache/camel/component/hdfs2/HdfsConsumerTest.java b/components/camel-hdfs2/src/test/java/org/apache/camel/component/hdfs2/HdfsConsumerTest.java index 4ffd543..b9d929d 100644 --- a/components/camel-hdfs2/src/test/java/org/apache/camel/component/hdfs2/HdfsConsumerTest.java +++ b/components/camel-hdfs2/src/test/java/org/apache/camel/component/hdfs2/HdfsConsumerTest.java @@ -263,7 +263,8 @@ public class HdfsConsumerTest extends HdfsTestSupport { context.addRoutes(new RouteBuilder() { public void configure() { -from("hdfs2:localhost/" + file.getParent().toUri() + "?scheduler=#myScheduler=*=LOCAL=SEQUENCE_FILE=0=handled").to("mock:result"); +from("hdfs2:localhost/" + file.getParent().toUri() + "?scheduler=#myScheduler=*=LOCAL=SEQUENCE_FILE=0=handled") +.to("mock:result"); } }); ScheduledExecutorService pool = context.getExecutorServiceManager().newScheduledThreadPool(null, "unitTestPool", 1);
[1/2] camel git commit: Fix Checkstyle issues
Repository: camel Updated Branches: refs/heads/camel-2.16.x 763737f2f -> 6d2dd808e Fix Checkstyle issues Signed-off-by: Gregor ZurowskiProject: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/00051efe Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/00051efe Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/00051efe Branch: refs/heads/camel-2.16.x Commit: 00051efef19ebe9f20ed4420a3ffc862a59439bf Parents: 763737f Author: Gregor Zurowski Authored: Fri Jan 22 16:53:27 2016 +0100 Committer: Gregor Zurowski Committed: Fri Jan 22 16:53:27 2016 +0100 -- .../java/org/apache/camel/component/hdfs2/HdfsConsumerTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/00051efe/components/camel-hdfs2/src/test/java/org/apache/camel/component/hdfs2/HdfsConsumerTest.java -- diff --git a/components/camel-hdfs2/src/test/java/org/apache/camel/component/hdfs2/HdfsConsumerTest.java b/components/camel-hdfs2/src/test/java/org/apache/camel/component/hdfs2/HdfsConsumerTest.java index 4ffd543..b9d929d 100644 --- a/components/camel-hdfs2/src/test/java/org/apache/camel/component/hdfs2/HdfsConsumerTest.java +++ b/components/camel-hdfs2/src/test/java/org/apache/camel/component/hdfs2/HdfsConsumerTest.java @@ -263,7 +263,8 @@ public class HdfsConsumerTest extends HdfsTestSupport { context.addRoutes(new RouteBuilder() { public void configure() { -from("hdfs2:localhost/" + file.getParent().toUri() + "?scheduler=#myScheduler=*=LOCAL=SEQUENCE_FILE=0=handled").to("mock:result"); +from("hdfs2:localhost/" + file.getParent().toUri() + "?scheduler=#myScheduler=*=LOCAL=SEQUENCE_FILE=0=handled") +.to("mock:result"); } }); ScheduledExecutorService pool = context.getExecutorServiceManager().newScheduledThreadPool(null, "unitTestPool", 1);
[1/2] camel git commit: Fix Checkstyle issues
Repository: camel Updated Branches: refs/heads/camel-2.16.x 158f4c414 -> 763737f2f Fix Checkstyle issues Signed-off-by: Gregor ZurowskiProject: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c9a767b0 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c9a767b0 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c9a767b0 Branch: refs/heads/camel-2.16.x Commit: c9a767b06348a0eb96f043a5b18bd5fb65a38147 Parents: 158f4c4 Author: Gregor Zurowski Authored: Fri Jan 22 16:46:07 2016 +0100 Committer: Gregor Zurowski Committed: Fri Jan 22 16:49:28 2016 +0100 -- .../java/org/apache/camel/component/hdfs/HdfsConsumerTest.java| 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/c9a767b0/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsConsumerTest.java -- diff --git a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsConsumerTest.java b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsConsumerTest.java index adf2e4d..ddf6d35 100644 --- a/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsConsumerTest.java +++ b/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/HdfsConsumerTest.java @@ -264,7 +264,8 @@ public class HdfsConsumerTest extends HdfsTestSupport { context.addRoutes(new RouteBuilder() { public void configure() { -from("hdfs:localhost/" + file.getParent().toUri() + "?scheduler=#myScheduler=*=LOCAL=SEQUENCE_FILE=0=handled").to("mock:result"); +from("hdfs:localhost/" + file.getParent().toUri() + "?scheduler=#myScheduler=*=LOCAL=SEQUENCE_FILE=0=handled") +.to("mock:result"); } }); ScheduledExecutorService pool = context.getExecutorServiceManager().newScheduledThreadPool(null, "unitTestPool", 1);
[1/2] camel git commit: Fix checkstyle issues
Repository: camel Updated Branches: refs/heads/camel-2.14.x f5dda9c63 -> 97a73d275 Fix checkstyle issues Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ceb8f54c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ceb8f54c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ceb8f54c Branch: refs/heads/camel-2.14.x Commit: ceb8f54c7045385df026de66c87c787ee475ce92 Parents: f5dda9c Author: Daniel KulpAuthored: Mon Sep 28 10:32:40 2015 -0400 Committer: Gregor Zurowski Committed: Sat Oct 17 12:12:54 2015 +0200 -- .../cxf/CxfProducerSoapActionTest.java | 105 +-- 1 file changed, 50 insertions(+), 55 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/ceb8f54c/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSoapActionTest.java -- diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSoapActionTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSoapActionTest.java index 178a425..d6019f4 100644 --- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSoapActionTest.java +++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerSoapActionTest.java @@ -1,5 +1,5 @@ -/** -* Licensed to the Apache Software Foundation (ASF) under one or more +/** + * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. * The ASF licenses this file to You under the Apache License, Version 2.0 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.camel.component.cxf; +package org.apache.camel.component.cxf; import java.util.ArrayList; import java.util.List; @@ -28,60 +28,55 @@ import org.apache.cxf.binding.soap.SoapBindingConstants; import org.junit.Test; public class CxfProducerSoapActionTest extends CamelTestSupport { - - private static final String SOAP_ACTION = "http://camel.apache.org/order/Order;; - private static final String OPERATION_NAMESPACE = "http://camel.apache.org/order;; - private static final String OPERATION_NAME = "order"; - private static final String DIRECT_START = "direct:start"; - private static final String CXF_ENDPOINT = "cxf:http://localhost:9000/order?wsdlURL=classpath:order.wsdl=true;; - private static final String REQUEST_MESSAGE = "http://schemas.xmlsoap.org/soap/envelope/\;>" - + "" - + ""; - @Test - public void testSendSoapRequestWithoutSoapActionSet() { - template.requestBody(DIRECT_START, REQUEST_MESSAGE, String.class); - } - - - protected RouteBuilder createRouteBuilder() { - return new RouteBuilder() { +private static final String SOAP_ACTION = "http://camel.apache.org/order/Order;; +private static final String OPERATION_NAMESPACE = "http://camel.apache.org/order;; +private static final String OPERATION_NAME = "order"; +private static final String DIRECT_START = "direct:start"; +private static final String CXF_ENDPOINT = "cxf:http://localhost:9000/order?wsdlURL=classpath:order.wsdl=true;; +private static final String REQUEST_MESSAGE = "http://schemas.xmlsoap.org/soap/envelope/\;>" + + "" + ""; - @Override - public void configure() throws Exception { - from(DIRECT_START) - .setHeader(CxfConstants.OPERATION_NAME, constant(OPERATION_NAME)) - .setHeader(CxfConstants.OPERATION_NAMESPACE, constant(OPERATION_NAMESPACE)) - .process(new Processor() { +@Test +public void testSendSoapRequestWithoutSoapActionSet() { +template.requestBody(DIRECT_START, REQUEST_MESSAGE, String.class); +} - @Override - public void process(Exchange exchange) throws Exception { - - final List params = new ArrayList(); - params.add("foo"); - params.add(10); - params.add("bar"); -