Repository: camel Updated Branches: refs/heads/master 1eeba05d4 -> 1608f76e7
http://git-wip-us.apache.org/repos/asf/camel/blob/1608f76e/examples/camel-example-spring-javaconfig/src/main/java/org/apache/camel/example/spring/javaconfig/MyRoute.java ---------------------------------------------------------------------- diff --git a/examples/camel-example-spring-javaconfig/src/main/java/org/apache/camel/example/spring/javaconfig/MyRoute.java b/examples/camel-example-spring-javaconfig/src/main/java/org/apache/camel/example/spring/javaconfig/MyRoute.java index da920f5..e879bd2 100644 --- a/examples/camel-example-spring-javaconfig/src/main/java/org/apache/camel/example/spring/javaconfig/MyRoute.java +++ b/examples/camel-example-spring-javaconfig/src/main/java/org/apache/camel/example/spring/javaconfig/MyRoute.java @@ -5,9 +5,9 @@ * 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 - * <p/> - * http://www.apache.org/licenses/LICENSE-2.0 - * <p/> + * + * 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. http://git-wip-us.apache.org/repos/asf/camel/blob/1608f76e/examples/camel-example-spring-javaconfig/src/main/java/org/apache/camel/example/spring/javaconfig/SomeBean.java ---------------------------------------------------------------------- diff --git a/examples/camel-example-spring-javaconfig/src/main/java/org/apache/camel/example/spring/javaconfig/SomeBean.java b/examples/camel-example-spring-javaconfig/src/main/java/org/apache/camel/example/spring/javaconfig/SomeBean.java index 0bda756..b1b34b5 100644 --- a/examples/camel-example-spring-javaconfig/src/main/java/org/apache/camel/example/spring/javaconfig/SomeBean.java +++ b/examples/camel-example-spring-javaconfig/src/main/java/org/apache/camel/example/spring/javaconfig/SomeBean.java @@ -5,9 +5,9 @@ * 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 - * <p/> - * http://www.apache.org/licenses/LICENSE-2.0 - * <p/> + * + * 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. http://git-wip-us.apache.org/repos/asf/camel/blob/1608f76e/examples/camel-example-zipkin/client/src/main/java/sample/camel/ClientApplication.java ---------------------------------------------------------------------- diff --git a/examples/camel-example-zipkin/client/src/main/java/sample/camel/ClientApplication.java b/examples/camel-example-zipkin/client/src/main/java/sample/camel/ClientApplication.java index 4b83104..0f05e4b 100644 --- a/examples/camel-example-zipkin/client/src/main/java/sample/camel/ClientApplication.java +++ b/examples/camel-example-zipkin/client/src/main/java/sample/camel/ClientApplication.java @@ -5,9 +5,9 @@ * 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 - * <p/> - * http://www.apache.org/licenses/LICENSE-2.0 - * <p/> + * + * 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. http://git-wip-us.apache.org/repos/asf/camel/blob/1608f76e/examples/camel-example-zipkin/client/src/main/java/sample/camel/ClientRoute.java ---------------------------------------------------------------------- diff --git a/examples/camel-example-zipkin/client/src/main/java/sample/camel/ClientRoute.java b/examples/camel-example-zipkin/client/src/main/java/sample/camel/ClientRoute.java index ece56de..b703af6 100644 --- a/examples/camel-example-zipkin/client/src/main/java/sample/camel/ClientRoute.java +++ b/examples/camel-example-zipkin/client/src/main/java/sample/camel/ClientRoute.java @@ -5,9 +5,9 @@ * 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 - * <p/> - * http://www.apache.org/licenses/LICENSE-2.0 - * <p/> + * + * 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. http://git-wip-us.apache.org/repos/asf/camel/blob/1608f76e/examples/camel-example-zipkin/service2/src/main/java/sample/camel/Service2Application.java ---------------------------------------------------------------------- diff --git a/examples/camel-example-zipkin/service2/src/main/java/sample/camel/Service2Application.java b/examples/camel-example-zipkin/service2/src/main/java/sample/camel/Service2Application.java index 851f73d..66a50c0 100644 --- a/examples/camel-example-zipkin/service2/src/main/java/sample/camel/Service2Application.java +++ b/examples/camel-example-zipkin/service2/src/main/java/sample/camel/Service2Application.java @@ -18,7 +18,11 @@ package sample.camel; import org.apache.camel.main.Main; -public class Service2Application { +public final class Service2Application { + + private Service2Application() { + // noop + } public static void main(String[] args) throws Exception { Main main = new Main(); http://git-wip-us.apache.org/repos/asf/camel/blob/1608f76e/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java ---------------------------------------------------------------------- diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java index 2a58f3f..ce45216 100644 --- a/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java +++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/UnsafeUriCharactersEncoder.java @@ -125,7 +125,7 @@ public final class UnsafeUriCharactersEncoder { int left; int right; - public Pair(int left, int right) { + Pair(int left, int right) { this.left = left; this.right = right; } http://git-wip-us.apache.org/repos/asf/camel/blob/1608f76e/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/test/cxf/blueprint/CxfConsumerSoap12Test.java ---------------------------------------------------------------------- diff --git a/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/test/cxf/blueprint/CxfConsumerSoap12Test.java b/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/test/cxf/blueprint/CxfConsumerSoap12Test.java index 9517fc0..7f55c57 100644 --- a/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/test/cxf/blueprint/CxfConsumerSoap12Test.java +++ b/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/test/cxf/blueprint/CxfConsumerSoap12Test.java @@ -74,7 +74,7 @@ public class CxfConsumerSoap12Test extends CamelBlueprintTestSupport { mock.expectedMessageCount(1); Service service = Service.create(SERVICE_NAME); - service.addPort(PORT_NAME , "http://www.w3.org/2003/05/soap/bindings/HTTP/";, + service.addPort(PORT_NAME, "http://www.w3.org/2003/05/soap/bindings/HTTP/";, "http://localhost:"; + CXFTestSupport.getPort1() + "/CxfConsumerSoap12Test/router"); Greeter greeter = service.getPort(PORT_NAME, Greeter.class); http://git-wip-us.apache.org/repos/asf/camel/blob/1608f76e/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/test/cxf/blueprint/CxfPayloadProviderRouterTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/test/cxf/blueprint/CxfPayloadProviderRouterTest.java b/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/test/cxf/blueprint/CxfPayloadProviderRouterTest.java index 1a005a0..c20cb0e 100644 --- a/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/test/cxf/blueprint/CxfPayloadProviderRouterTest.java +++ b/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/test/cxf/blueprint/CxfPayloadProviderRouterTest.java @@ -109,7 +109,7 @@ public class CxfPayloadProviderRouterTest extends CamelBlueprintTestSupport { static class VerifyInboundInterceptor extends AbstractPhaseInterceptor<Message> { private boolean called; - public VerifyInboundInterceptor() { + VerifyInboundInterceptor() { super(Phase.USER_PROTOCOL); } http://git-wip-us.apache.org/repos/asf/camel/blob/1608f76e/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesTest.java index e235667..4c94f5a 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesTest.java @@ -65,7 +65,8 @@ public class CustomerServicesTest extends Assert { } class HeaderChecker extends AbstractPhaseInterceptor<Message> { - public HeaderChecker(String phase) { + + HeaderChecker(String phase) { super(phase); } http://git-wip-us.apache.org/repos/asf/camel/blob/1608f76e/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterConsumerTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterConsumerTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterConsumerTest.java index e27b68f..1d9178c 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterConsumerTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterConsumerTest.java @@ -56,12 +56,12 @@ public class CamelGreeterConsumerTest extends AbstractJUnit4SpringContextTests { ProducerTemplate template = camelContext.createProducerTemplate(); List<String> params = new ArrayList<String>(); params.add("Willem"); - Object result = template.sendBodyAndHeader("cxf://bean:serviceEndpoint", ExchangePattern.InOut , + Object result = template.sendBodyAndHeader("cxf://bean:serviceEndpoint", ExchangePattern.InOut, params, CxfConstants.OPERATION_NAME, "greetMe"); assertTrue("Result is a list instance ", result instanceof List); assertEquals("Get the wrong response", ((List<?>)result).get(0), "HelloWillem"); try { - template.sendBodyAndHeader("cxf://bean:serviceEndpoint", ExchangePattern.InOut , + template.sendBodyAndHeader("cxf://bean:serviceEndpoint", ExchangePattern.InOut, params, CxfConstants.OPERATION_NAME, "pingMe"); fail("Expect exception here."); } catch (Exception ex) { http://git-wip-us.apache.org/repos/asf/camel/blob/1608f76e/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4RouteTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4RouteTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4RouteTest.java index 24696af..a7bdb5b 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4RouteTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4RouteTest.java @@ -32,7 +32,7 @@ public class Http4RouteTest extends CamelTestSupport { public void sendHttpGetRequestTest() { String response = template.requestBody("http4://localhost:" + port1 + "/test?aa=bb&httpClient.socketTimeout=10000&httpClient.connectTimeout=10000" - + "&bridgeEndpoint=true&throwExceptionOnFailure=false" , null, String.class); + + "&bridgeEndpoint=true&throwExceptionOnFailure=false", null, String.class); assertEquals("Get a wrong response", "aa=bb", response); response = template.requestBodyAndHeader("direct:start1", null, Exchange.HTTP_QUERY, "aa=bb", String.class); http://git-wip-us.apache.org/repos/asf/camel/blob/1608f76e/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpTestServer.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpTestServer.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpTestServer.java index 7042dd8..fe1f2d1 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpTestServer.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpTestServer.java @@ -365,7 +365,7 @@ public class HttpTestServer { private volatile Exception exception; - public Worker(final HttpServerConnection conn) { + Worker(final HttpServerConnection conn) { this.conn = conn; } http://git-wip-us.apache.org/repos/asf/camel/blob/1608f76e/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java ---------------------------------------------------------------------- diff --git a/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java b/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java index f55c3e9..0e9a3a3 100644 --- a/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java +++ b/tooling/maven/guice-maven-plugin/src/main/java/org/apache/camel/guice/maven/RunMojo.java @@ -401,7 +401,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); }
