Repository: camel Updated Branches: refs/heads/master b61c4328a -> 1fc998341
Fixed CS Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1fc99834 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1fc99834 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1fc99834 Branch: refs/heads/master Commit: 1fc9983413dc71c5d77403fd4eb32fd34badde4c Parents: b61c432 Author: Claus Ibsen <davscl...@apache.org> Authored: Fri Apr 29 09:05:10 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Apr 29 09:05:15 2016 +0200 ---------------------------------------------------------------------- .../java/org/apache/camel/dataformat/bindy/model/car/Car.java | 2 +- .../apache/camel/dataformat/bindy/model/csv/MyCsvRecord.java | 2 +- .../main/java/org/apache/camel/component/box/BoxEndpoint.java | 1 + .../apache/camel/component/box/internal/BoxClientHelper.java | 2 +- .../camel/component/box/internal/OAuthHelperListener.java | 2 +- .../NettyHttpEndpointUriCustomHeaderFilterStrategyTest.java | 2 +- .../netty/http/NettyHttpGetWithInvalidMessageTest.java | 2 +- .../NettyHttpEndpointUriCustomHeaderFilterStrategyTest.java | 2 +- .../netty4/http/NettyHttpGetWithInvalidMessageTest.java | 2 +- .../org/apache/camel/component/netty4/Netty2978IssueTest.java | 2 +- .../apache/camel/spring/boot/mockendpoints/AdviceWithTest.java | 6 +++--- .../camel/spring/boot/mockendpoints/MockEndpointsTest.java | 6 +++--- .../org/apache/camel/spring/boot/mockendpoints/MyRoute.java | 6 +++--- .../src/main/java/org/apache/camel/maven/JavadocParser.java | 2 +- 14 files changed, 20 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/1fc99834/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/car/Car.java ---------------------------------------------------------------------- diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/car/Car.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/car/Car.java index 7be8c4d..b37c664 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/car/Car.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/car/Car.java @@ -226,7 +226,7 @@ public class Car { this.nvic = nvic; } - public static enum Colour { + public enum Colour { BLACK } http://git-wip-us.apache.org/repos/asf/camel/blob/1fc99834/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/csv/MyCsvRecord.java ---------------------------------------------------------------------- diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/csv/MyCsvRecord.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/csv/MyCsvRecord.java index 423f639..93ee469 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/csv/MyCsvRecord.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/csv/MyCsvRecord.java @@ -21,7 +21,7 @@ import java.io.Serializable; import org.apache.camel.dataformat.bindy.annotation.CsvRecord; import org.apache.camel.dataformat.bindy.annotation.DataField; -@CsvRecord(separator = "," , skipFirstLine = false) +@CsvRecord(separator = ",", skipFirstLine = false) public class MyCsvRecord implements Serializable { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/camel/blob/1fc99834/components/camel-box/src/main/java/org/apache/camel/component/box/BoxEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-box/src/main/java/org/apache/camel/component/box/BoxEndpoint.java b/components/camel-box/src/main/java/org/apache/camel/component/box/BoxEndpoint.java index df8c2ec..aa23d36 100644 --- a/components/camel-box/src/main/java/org/apache/camel/component/box/BoxEndpoint.java +++ b/components/camel-box/src/main/java/org/apache/camel/component/box/BoxEndpoint.java @@ -175,6 +175,7 @@ public class BoxEndpoint extends AbstractApiEndpoint<BoxApiName, BoxConfiguratio if (ObjectHelper.isEmpty(sharedLink)) { throw new IllegalArgumentException("Missing required property sharedLink"); } + break; default: } http://git-wip-us.apache.org/repos/asf/camel/blob/1fc99834/components/camel-box/src/main/java/org/apache/camel/component/box/internal/BoxClientHelper.java ---------------------------------------------------------------------- diff --git a/components/camel-box/src/main/java/org/apache/camel/component/box/internal/BoxClientHelper.java b/components/camel-box/src/main/java/org/apache/camel/component/box/internal/BoxClientHelper.java index 71f1aca..b526fa7 100644 --- a/components/camel-box/src/main/java/org/apache/camel/component/box/internal/BoxClientHelper.java +++ b/components/camel-box/src/main/java/org/apache/camel/component/box/internal/BoxClientHelper.java @@ -258,7 +258,7 @@ public final class BoxClientHelper { static class SocksSSLSocketFactory extends SSLSocketFactory { HttpHost proxyHost; - public SocksSSLSocketFactory(SSLContext sslContext, HttpHost proxyHost) { + SocksSSLSocketFactory(SSLContext sslContext, HttpHost proxyHost) { super(sslContext, SSLSocketFactory.BROWSER_COMPATIBLE_HOSTNAME_VERIFIER); this.proxyHost = proxyHost; } http://git-wip-us.apache.org/repos/asf/camel/blob/1fc99834/components/camel-box/src/main/java/org/apache/camel/component/box/internal/OAuthHelperListener.java ---------------------------------------------------------------------- diff --git a/components/camel-box/src/main/java/org/apache/camel/component/box/internal/OAuthHelperListener.java b/components/camel-box/src/main/java/org/apache/camel/component/box/internal/OAuthHelperListener.java index 7a62796..591b0a4 100644 --- a/components/camel-box/src/main/java/org/apache/camel/component/box/internal/OAuthHelperListener.java +++ b/components/camel-box/src/main/java/org/apache/camel/component/box/internal/OAuthHelperListener.java @@ -30,7 +30,7 @@ class OAuthHelperListener implements OAuthRefreshListener { private String refreshToken; - public OAuthHelperListener(IAuthSecureStorage authSecureStorage, OAuthRefreshListener configListener) { + OAuthHelperListener(IAuthSecureStorage authSecureStorage, OAuthRefreshListener configListener) { this.authSecureStorage = authSecureStorage; this.configListener = configListener; http://git-wip-us.apache.org/repos/asf/camel/blob/1fc99834/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriCustomHeaderFilterStrategyTest.java ---------------------------------------------------------------------- diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriCustomHeaderFilterStrategyTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriCustomHeaderFilterStrategyTest.java index ddbb06b..93e6571 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriCustomHeaderFilterStrategyTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriCustomHeaderFilterStrategyTest.java @@ -62,7 +62,7 @@ public class NettyHttpEndpointUriCustomHeaderFilterStrategyTest extends BaseNett } private class CustomHeaderFilterStrategy extends DefaultHeaderFilterStrategy { - public CustomHeaderFilterStrategy() { + CustomHeaderFilterStrategy() { // allow all outbound headers to pass through but only filter out below inbound header getInFilter().add("sub-date"); } http://git-wip-us.apache.org/repos/asf/camel/blob/1fc99834/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpGetWithInvalidMessageTest.java ---------------------------------------------------------------------- diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpGetWithInvalidMessageTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpGetWithInvalidMessageTest.java index 5e6a46b..e18d098 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpGetWithInvalidMessageTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpGetWithInvalidMessageTest.java @@ -70,7 +70,7 @@ public class NettyHttpGetWithInvalidMessageTest extends CamelTestSupport { } private void invokeService(int port) { - Exchange out = template.request("netty:tcp://localhost:" + port + "?encoders=#encoders&decoders=#decoders&sync=true" , new Processor() { + Exchange out = template.request("netty:tcp://localhost:" + port + "?encoders=#encoders&decoders=#decoders&sync=true", new Processor() { @Override public void process(Exchange exchange) throws Exception { exchange.getIn().setBody(REQUEST_STRING); http://git-wip-us.apache.org/repos/asf/camel/blob/1fc99834/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpEndpointUriCustomHeaderFilterStrategyTest.java ---------------------------------------------------------------------- diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpEndpointUriCustomHeaderFilterStrategyTest.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpEndpointUriCustomHeaderFilterStrategyTest.java index 9d78016..3948e71 100644 --- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpEndpointUriCustomHeaderFilterStrategyTest.java +++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpEndpointUriCustomHeaderFilterStrategyTest.java @@ -62,7 +62,7 @@ public class NettyHttpEndpointUriCustomHeaderFilterStrategyTest extends BaseNett } private class CustomHeaderFilterStrategy extends DefaultHeaderFilterStrategy { - public CustomHeaderFilterStrategy() { + CustomHeaderFilterStrategy() { // allow all outbound headers to pass through but only filter out below inbound header getInFilter().add("sub-date"); } http://git-wip-us.apache.org/repos/asf/camel/blob/1fc99834/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpGetWithInvalidMessageTest.java ---------------------------------------------------------------------- diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpGetWithInvalidMessageTest.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpGetWithInvalidMessageTest.java index 3fdc57d..41aa4df 100644 --- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpGetWithInvalidMessageTest.java +++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpGetWithInvalidMessageTest.java @@ -72,7 +72,7 @@ public class NettyHttpGetWithInvalidMessageTest extends CamelTestSupport { } private void invokeService(int port) { - Exchange out = template.request("netty4:tcp://localhost:" + port + "?encoders=#encoders&decoders=#decoders&sync=true" , new Processor() { + Exchange out = template.request("netty4:tcp://localhost:" + port + "?encoders=#encoders&decoders=#decoders&sync=true", new Processor() { @Override public void process(Exchange exchange) throws Exception { exchange.getIn().setBody(REQUEST_STRING); http://git-wip-us.apache.org/repos/asf/camel/blob/1fc99834/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/Netty2978IssueTest.java ---------------------------------------------------------------------- diff --git a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/Netty2978IssueTest.java b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/Netty2978IssueTest.java index 7f9e689..b69b4c8 100644 --- a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/Netty2978IssueTest.java +++ b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/Netty2978IssueTest.java @@ -106,7 +106,7 @@ public class Netty2978IssueTest extends BaseNettyTest { private final Endpoint endpoint; private final ProducerTemplate producerTemplate; - public CamelClient(CamelContext camelContext) { + CamelClient(CamelContext camelContext) { this.endpoint = camelContext.getEndpoint("netty4:tcp://localhost:{{port}}?sync=true"); this.producerTemplate = camelContext.createProducerTemplate(); } http://git-wip-us.apache.org/repos/asf/camel/blob/1fc99834/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/AdviceWithTest.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/AdviceWithTest.java b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/AdviceWithTest.java index 18565d4..c4feae9 100644 --- a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/AdviceWithTest.java +++ b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/AdviceWithTest.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/1fc99834/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/MockEndpointsTest.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/MockEndpointsTest.java b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/MockEndpointsTest.java index 96dfacf..d315bc5 100644 --- a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/MockEndpointsTest.java +++ b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/MockEndpointsTest.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/1fc99834/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/MyRoute.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/MyRoute.java b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/MyRoute.java index 8f59520..1abb466 100644 --- a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/MyRoute.java +++ b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/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/1fc99834/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocParser.java ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocParser.java b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocParser.java index b6a1ea2..bda641c 100644 --- a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocParser.java +++ b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/JavadocParser.java @@ -194,7 +194,7 @@ public class JavadocParser extends Parser { return methodText; } - private static enum ParserState { + private enum ParserState { INIT, METHOD_SUMMARY, METHOD } }
