camel git commit: Fix CS
Repository: camel Updated Branches: refs/heads/master b5d9464b0 -> 39afe71fc Fix CS Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/39afe71f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/39afe71f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/39afe71f Branch: refs/heads/master Commit: 39afe71fc0183e8d97120e88ff952bf8811cd398 Parents: b5d9464 Author: lburgazzoliAuthored: Sun Oct 15 10:34:32 2017 +0200 Committer: lburgazzoli Committed: Sun Oct 15 10:34:59 2017 +0200 -- .../camel/test/spring/CamelSpringBootExecutionListener.java| 2 +- .../test/spring/CamelSpringDelegatingTestContextLoader.java| 4 ++-- .../apache/camel/test/spring/CamelSpringTestContextLoader.java | 2 +- .../apache/camel/test/spring/RouteCoverageEventNotifier.java | 6 +++--- .../spring/CamelSpringRouteProcessorDumpRouteCoverageTest.java | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/39afe71f/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringBootExecutionListener.java -- diff --git a/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringBootExecutionListener.java b/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringBootExecutionListener.java index 195f57d..fb4836f 100644 --- a/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringBootExecutionListener.java +++ b/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringBootExecutionListener.java @@ -67,7 +67,7 @@ public class CamelSpringBootExecutionListener extends AbstractTestExecutionListe System.clearProperty("skipStartingCamelContext"); // route coverage need to know the test method -CamelAnnotationsHandler.handleRouteCoverage(context, testClass, (String) -> testName); +CamelAnnotationsHandler.handleRouteCoverage(context, testClass, s -> testName); LOG.info("Initialized CamelSpringBootRunner now ready to start CamelContext"); CamelAnnotationsHandler.handleCamelContextStartup(context, testClass); http://git-wip-us.apache.org/repos/asf/camel/blob/39afe71f/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringDelegatingTestContextLoader.java -- diff --git a/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringDelegatingTestContextLoader.java b/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringDelegatingTestContextLoader.java index aa76c15..b01c2d2 100644 --- a/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringDelegatingTestContextLoader.java +++ b/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringDelegatingTestContextLoader.java @@ -79,7 +79,7 @@ public class CamelSpringDelegatingTestContextLoader extends DelegatingSmartConte AnnotationConfigUtils.registerAnnotationConfigProcessors((BeanDefinitionRegistry) context); // Post CamelContext(s) instantiation but pre CamelContext(s) start setup -CamelAnnotationsHandler.handleRouteCoverage(context, testClass, (String) -> getTestMethod().getName()); +CamelAnnotationsHandler.handleRouteCoverage(context, testClass, s -> getTestMethod().getName()); CamelAnnotationsHandler.handleProvidesBreakpoint(context, testClass); CamelAnnotationsHandler.handleShutdownTimeout(context, testClass); CamelAnnotationsHandler.handleMockEndpoints(context, testClass); @@ -132,4 +132,4 @@ public class CamelSpringDelegatingTestContextLoader extends DelegatingSmartConte return CamelSpringTestHelper.getTestMethod(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/camel/blob/39afe71f/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java -- diff --git a/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java b/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java index 049bc7c..583ebca 100644 --- a/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java +++ b/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java @@ -291,7 +291,7 @@ public class CamelSpringTestContextLoader extends
camel git commit: Fix CS
Repository: camel Updated Branches: refs/heads/master ee2909e8a -> 3a2d5e626 Fix CS Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3a2d5e62 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3a2d5e62 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3a2d5e62 Branch: refs/heads/master Commit: 3a2d5e6269000e6209c67d5cc01f323a7ddf6ba8 Parents: ee2909e Author: lburgazzoliAuthored: Fri Sep 29 09:53:21 2017 +0200 Committer: lburgazzoli Committed: Fri Sep 29 09:53:21 2017 +0200 -- .../apache/camel/component/zookeeper/ha/ZooKeeperMasterMain.java | 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/3a2d5e62/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ha/ZooKeeperMasterMain.java -- diff --git a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ha/ZooKeeperMasterMain.java b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ha/ZooKeeperMasterMain.java index 1c70ff0..479c6f1 100644 --- a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ha/ZooKeeperMasterMain.java +++ b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ha/ZooKeeperMasterMain.java @@ -26,6 +26,9 @@ import org.apache.camel.main.Main; import org.apache.camel.main.MainListenerSupport; public final class ZooKeeperMasterMain { +private ZooKeeperMasterMain() { +} + public static void main(String[] args) throws Exception { final String nodeId = UUID.randomUUID().toString(); final String address = args[0];
camel git commit: Fix CS
Repository: camel Updated Branches: refs/heads/master 4d6e8f187 -> 26091d09f Fix CS Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/26091d09 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/26091d09 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/26091d09 Branch: refs/heads/master Commit: 26091d09f0fedad8d98eeae832955f6ffe117eff Parents: 4d6e8f1 Author: lburgazzoliAuthored: Fri Sep 8 17:45:46 2017 +0200 Committer: lburgazzoli Committed: Fri Sep 8 17:46:31 2017 +0200 -- .../src/main/resources/application.properties | 18 +- .../src/main/resources/application.properties | 18 +- .../src/main/resources/application.properties | 5 ++--- 3 files changed, 36 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/26091d09/examples/camel-example-spring-boot-clustered-route-controller/cluster-bootstrap/src/main/resources/application.properties -- diff --git a/examples/camel-example-spring-boot-clustered-route-controller/cluster-bootstrap/src/main/resources/application.properties b/examples/camel-example-spring-boot-clustered-route-controller/cluster-bootstrap/src/main/resources/application.properties index 1b4b220..32d417f 100644 --- a/examples/camel-example-spring-boot-clustered-route-controller/cluster-bootstrap/src/main/resources/application.properties +++ b/examples/camel-example-spring-boot-clustered-route-controller/cluster-bootstrap/src/main/resources/application.properties @@ -1,7 +1,23 @@ +## --- +## 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 License for the specific language governing permissions and +## limitations under the License. +## --- debug = false logging.level.org.springframework = INFO logging.level.io.atomix = DEBUG -cluster.address = 127.0.0.1:8700 \ No newline at end of file +cluster.address = 127.0.0.1:8700 http://git-wip-us.apache.org/repos/asf/camel/blob/26091d09/examples/camel-example-spring-boot-clustered-route-controller/cluster-node/src/main/resources/application.properties -- diff --git a/examples/camel-example-spring-boot-clustered-route-controller/cluster-node/src/main/resources/application.properties b/examples/camel-example-spring-boot-clustered-route-controller/cluster-node/src/main/resources/application.properties index e364efa..8a74e7d 100644 --- a/examples/camel-example-spring-boot-clustered-route-controller/cluster-node/src/main/resources/application.properties +++ b/examples/camel-example-spring-boot-clustered-route-controller/cluster-node/src/main/resources/application.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 License for the specific language governing permissions and +## limitations under the License. +## --- debug = false @@ -28,4 +44,4 @@ camel.clustered.controller.routes.heartbeat.clustered = false camel.clustered.service.atomix.enabled = true camel.clustered.service.atomix.mode = client camel.clustered.service.atomix.nodes =
camel git commit: Fix CS
Repository: camel Updated Branches: refs/heads/master de223d438 -> 34a7afbf6 Fix CS Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/34a7afbf Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/34a7afbf Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/34a7afbf Branch: refs/heads/master Commit: 34a7afbf6c77a11aa71027e2afa7ff00f46bd630 Parents: de223d4 Author: lburgazzoliAuthored: Fri Sep 8 16:08:27 2017 +0200 Committer: lburgazzoli Committed: Fri Sep 8 16:08:27 2017 +0200 -- .../src/test/resources/SpringCryptoCmsTests.xml | 28 +--- 1 file changed, 18 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/34a7afbf/components/camel-crypto-cms/src/test/resources/SpringCryptoCmsTests.xml -- diff --git a/components/camel-crypto-cms/src/test/resources/SpringCryptoCmsTests.xml b/components/camel-crypto-cms/src/test/resources/SpringCryptoCmsTests.xml index 69ac433..820f1bd 100644 --- a/components/camel-crypto-cms/src/test/resources/SpringCryptoCmsTests.xml +++ b/components/camel-crypto-cms/src/test/resources/SpringCryptoCmsTests.xml @@ -1,14 +1,22 @@ - + http://www.springframework.org/schema/beans; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="
camel git commit: Fix CS
Repository: camel Updated Branches: refs/heads/master 08d60c0c1 -> 30baf10b7 Fix CS Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/30baf10b Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/30baf10b Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/30baf10b Branch: refs/heads/master Commit: 30baf10b71599b4f9c1a0aaca9ef5be0fdc06ea6 Parents: 08d60c0 Author: lburgazzoliAuthored: Tue Sep 5 16:38:42 2017 +0200 Committer: lburgazzoli Committed: Tue Sep 5 16:38:42 2017 +0200 -- .../org/apache/camel/component/ahc/AhcProducerSessionTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/30baf10b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProducerSessionTest.java -- diff --git a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProducerSessionTest.java b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProducerSessionTest.java index 95b519a..3c6e762 100644 --- a/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProducerSessionTest.java +++ b/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProducerSessionTest.java @@ -104,7 +104,7 @@ public class AhcProducerSessionTest extends BaseAhcTest { session.setAttribute("foo", "bar"); message.setBody("New " + body); } -message.getResponse().addCookie(new Cookie("othercookie","value")); +message.getResponse().addCookie(new Cookie("othercookie", "value")); } }); }
camel git commit: Fix CS
Repository: camel Updated Branches: refs/heads/master d6c829ac3 -> f8ddd2305 Fix CS Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f8ddd230 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f8ddd230 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f8ddd230 Branch: refs/heads/master Commit: f8ddd2305ee5db5e85dba60787821b869e2bda4b Parents: d6c829a Author: lburgazzoliAuthored: Thu Aug 10 17:31:26 2017 +0200 Committer: lburgazzoli Committed: Thu Aug 10 17:31:26 2017 +0200 -- .../camel/spring/boot/SupervisingRouteControllerRestartTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/f8ddd230/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerRestartTest.java -- diff --git a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerRestartTest.java b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerRestartTest.java index 77547ab..3383be4 100644 --- a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerRestartTest.java +++ b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerRestartTest.java @@ -1,4 +1,4 @@ -/* +/** * 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.
camel git commit: Fix CS
Repository: camel Updated Branches: refs/heads/master 43ca13886 -> 9fc6d0bda Fix CS Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9fc6d0bd Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9fc6d0bd Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9fc6d0bd Branch: refs/heads/master Commit: 9fc6d0bda4d44b5d0c424afe68b4911e59af857e Parents: 43ca138 Author: lburgazzoliAuthored: Tue Aug 8 14:59:09 2017 +0200 Committer: lburgazzoli Committed: Tue Aug 8 14:59:09 2017 +0200 -- .../apache/camel/management/DefaultManagementNamingStrategy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/9fc6d0bd/camel-core/src/main/java/org/apache/camel/management/DefaultManagementNamingStrategy.java -- diff --git a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementNamingStrategy.java b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementNamingStrategy.java index 341b9e9..c78c22b 100644 --- a/camel-core/src/main/java/org/apache/camel/management/DefaultManagementNamingStrategy.java +++ b/camel-core/src/main/java/org/apache/camel/management/DefaultManagementNamingStrategy.java @@ -52,7 +52,7 @@ public class DefaultManagementNamingStrategy implements ManagementNamingStrategy public static final String KEY_TYPE = "type"; public static final String KEY_CONTEXT = "context"; public static final String TYPE_CONTEXT = "context"; -public static final String TYPE_ROUTE_CONTROLLER= "routecontroller"; +public static final String TYPE_ROUTE_CONTROLLER = "routecontroller"; public static final String TYPE_ENDPOINT = "endpoints"; public static final String TYPE_DATAFORMAT = "dataformats"; public static final String TYPE_PROCESSOR = "processors";
[1/2] camel git commit: Fix CS
Repository: camel Updated Branches: refs/heads/master 5a7a671c0 -> b42ce8574 Fix CS Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b42ce857 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b42ce857 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b42ce857 Branch: refs/heads/master Commit: b42ce8574b6bef46359165f935aaf14ee409b832 Parents: 68113f7 Author: lburgazzoliAuthored: Thu Jun 22 19:08:20 2017 +0200 Committer: lburgazzoli Committed: Thu Jun 22 19:08:33 2017 +0200 -- .../infinispan/policy/InfinispanRoutePolicyTestBase.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/b42ce857/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/policy/InfinispanRoutePolicyTestBase.java -- diff --git a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/policy/InfinispanRoutePolicyTestBase.java b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/policy/InfinispanRoutePolicyTestBase.java index 43abf8f..18376ad 100644 --- a/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/policy/InfinispanRoutePolicyTestBase.java +++ b/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/policy/InfinispanRoutePolicyTestBase.java @@ -25,8 +25,8 @@ import org.junit.Assert; import org.junit.Test; abstract class InfinispanRoutePolicyTestBase { -private final static String CACHE_NAME = "camel-route-policy"; -private final static String CACHE_KEY = "route-policy"; +private static final String CACHE_NAME = "camel-route-policy"; +private static final String CACHE_KEY = "route-policy"; protected abstract BasicCacheContainer createCacheManager() throws Exception; @@ -56,7 +56,7 @@ abstract class InfinispanRoutePolicyTestBase { context.addRouteDefinition(RouteDefinition.fromUri("direct:r1").routePolicy(policy1).to("mock:p1")); -for (int i=0; i < 10 && !policy1.isLeader(); i++) { +for (int i = 0; i < 10 && !policy1.isLeader(); i++) { Thread.sleep(250); }
[3/4] 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/a74c4255 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a74c4255 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a74c4255 Branch: refs/heads/master Commit: a74c4255913b263b5ac8f5250973b5948d7c1f83 Parents: 5e3e318 Author: lburgazzoliAuthored: Fri May 5 13:35:57 2017 +0200 Committer: lburgazzoli Committed: Fri May 5 13:35:57 2017 +0200 -- .../camel/component/infinispan/InfinispanConfiguration.java| 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/a74c4255/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanConfiguration.java -- diff --git a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanConfiguration.java b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanConfiguration.java index 395af55..18dfa20 100644 --- a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanConfiguration.java +++ b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/InfinispanConfiguration.java @@ -65,16 +65,16 @@ public class InfinispanConfiguration implements Cloneable { } /** - * @deprecated @see @{link setOperation} - * * The operation to perform. + * + * @deprecated replaced by @{link setOperation} */ public void setCommand(String command) { if (command.startsWith(InfinispanConstants.OPERATION)) { command = command.substring(InfinispanConstants.OPERATION.length()).toUpperCase(); } - setOperation(InfinispanOperation.valueOf(command)); +setOperation(InfinispanOperation.valueOf(command)); } public InfinispanOperation getOperation() {
[3/5] 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/1262a81a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1262a81a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1262a81a Branch: refs/heads/master Commit: 1262a81a16ef0b1063af579fde0152c963048233 Parents: 67ab9a9 Author: Jonathan AnsteyAuthored: Wed Apr 12 16:33:17 2017 -0230 Committer: Jonathan Anstey Committed: Wed Apr 12 17:13:00 2017 -0230 -- .../java/org/apache/camel/component/http4/HttpComponent.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/1262a81a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java -- diff --git a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java index b465374..dd09fea 100644 --- a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java +++ b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java @@ -85,8 +85,6 @@ public class HttpComponent extends HttpCommonComponent implements RestProducerFa + " Important: Only one instance of org.apache.camel.util.jsse.SSLContextParameters is supported per HttpComponent." + " If you need to use 2 or more different instances, you need to define a new HttpComponent per instance you need.") protected SSLContextParameters sslContextParameters; -@Metadata(label = "security", defaultValue = "false") -private boolean useGlobalSslContextParameters; @Metadata(label = "security", description = "To use a custom X509HostnameVerifier such as DefaultHostnameVerifier or NoopHostnameVerifier.") protected HostnameVerifier x509HostnameVerifier = new DefaultHostnameVerifier(); @Metadata(label = "producer", description = "To use a custom org.apache.http.client.CookieStore." @@ -103,6 +101,8 @@ public class HttpComponent extends HttpCommonComponent implements RestProducerFa // It's MILLISECONDS, the default value is always keep alive @Metadata(label = "advanced", description = "The time for connection to live, the time unit is millisecond, the default value is always keep alive.") protected long connectionTimeToLive = -1; +@Metadata(label = "security", defaultValue = "false") +private boolean useGlobalSslContextParameters; public HttpComponent() { super(HttpEndpoint.class);
camel git commit: Fix CS
Repository: camel Updated Branches: refs/heads/master 179399aa8 -> 985be58d1 Fix CS Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/985be58d Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/985be58d Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/985be58d Branch: refs/heads/master Commit: 985be58d177f3da6c4f0a947c1dd3ed16b79bd7f Parents: 179399a Author: Jonathan AnsteyAuthored: Fri Apr 7 15:32:15 2017 -0230 Committer: Jonathan Anstey Committed: Fri Apr 7 15:32:15 2017 -0230 -- .../src/main/java/org/apache/camel/cdi/CdiCamelRegistry.java | 2 +- .../java/org/apache/camel/test/karaf/AbstractFeatureTest.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/985be58d/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelRegistry.java -- diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelRegistry.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelRegistry.java index 7a3c2c5..bf809d0 100755 --- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelRegistry.java +++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelRegistry.java @@ -33,8 +33,8 @@ import static org.apache.camel.cdi.AnyLiteral.ANY; import static org.apache.camel.cdi.BeanManagerHelper.getReference; import static org.apache.camel.cdi.BeanManagerHelper.getReferenceByName; import static org.apache.camel.cdi.BeanManagerHelper.getReferencesByType; -import static org.apache.camel.util.StringHelper.notEmpty; import static org.apache.camel.util.ObjectHelper.notNull; +import static org.apache.camel.util.StringHelper.notEmpty; /** * The {@link Registry} used by Camel to perform lookup into the CDI {@link BeanManager}. http://git-wip-us.apache.org/repos/asf/camel/blob/985be58d/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/AbstractFeatureTest.java -- diff --git a/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/AbstractFeatureTest.java b/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/AbstractFeatureTest.java index e4edf4c..2639091 100644 --- a/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/AbstractFeatureTest.java +++ b/components/camel-test-karaf/src/main/java/org/apache/camel/test/karaf/AbstractFeatureTest.java @@ -107,7 +107,7 @@ public abstract class AbstractFeatureTest { } protected Bundle installBlueprintAsBundle(String name, URL url, boolean start) throws BundleException { -return installBlueprintAsBundle(name, url, start, bundle -> {}); +return installBlueprintAsBundle(name, url, start, bundle -> { }); } protected Bundle installBlueprintAsBundle(String name, URL url, boolean start, Consumer consumer) throws BundleException { @@ -128,7 +128,7 @@ public abstract class AbstractFeatureTest { } protected Bundle installSpringAsBundle(String name, URL url, boolean start) throws BundleException { -return installSpringAsBundle(name, url, start, bundle -> {}); +return installSpringAsBundle(name, url, start, bundle -> { }); } protected Bundle installSpringAsBundle(String name, URL url, boolean start, Consumer consumer) throws BundleException { @@ -172,7 +172,7 @@ public abstract class AbstractFeatureTest { if (currentProperties == null) { currentProperties = newProps; } -for (Enumeration ek = currentProperties.keys(); ek.hasMoreElements(); ) { +for (Enumeration ek = currentProperties.keys(); ek.hasMoreElements();) { String k = ek.nextElement(); newProps.put(k, currentProperties.get(k)); }
camel git commit: Fix CS
Repository: camel Updated Branches: refs/heads/master dbd68347b -> e0fed4569 Fix CS Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e0fed456 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e0fed456 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e0fed456 Branch: refs/heads/master Commit: e0fed4569f1a6d66eab0d4d07b9d20cf031c Parents: dbd6834 Author: lburgazzoliAuthored: Fri Apr 7 18:16:06 2017 +0200 Committer: lburgazzoli Committed: Fri Apr 7 18:16:06 2017 +0200 -- .../camel-infinispan/src/main/docs/infinispan-component.adoc | 3 ++- .../component/infinispan/policy/InfinispanRoutePolicy.java | 4 ++-- .../infinispan/policy/InfinispanRoutePolicyTestBase.java | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/e0fed456/components/camel-infinispan/src/main/docs/infinispan-component.adoc -- diff --git a/components/camel-infinispan/src/main/docs/infinispan-component.adoc b/components/camel-infinispan/src/main/docs/infinispan-component.adoc index 9dfa579..85f2615 100644 --- a/components/camel-infinispan/src/main/docs/infinispan-component.adoc +++ b/components/camel-infinispan/src/main/docs/infinispan-component.adoc @@ -59,7 +59,7 @@ with the following path and query parameters: | **host** | *Required* Specifies the host of the cache on Infinispan instance | | String |=== - Query Parameters (14 parameters): + Query Parameters (15 parameters): [width="100%",cols="2,5,^1,2",options="header"] |=== @@ -75,6 +75,7 @@ with the following path and query parameters: | **exceptionHandler** (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this options is not in use. By default the consumer will deal with exceptions that will be logged at WARN or ERROR level and ignored. | | ExceptionHandler | **exchangePattern** (consumer) | Sets the exchange pattern when the consumer creates an exchange. | | ExchangePattern | **command** (producer) | The operation to perform. | put | String +| **configurationProperties** (advanced) | Infinispan configuration properties. | | Map | **configurationUri** (advanced) | An implementation specific URI for the CacheManager | | String | **flags** (advanced) | A comma separated list of Flag to be applied by default on each cache invocation not applicable to remote caches. | | String | **synchronous** (advanced) | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported). | false | boolean http://git-wip-us.apache.org/repos/asf/camel/blob/e0fed456/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/policy/InfinispanRoutePolicy.java -- diff --git a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/policy/InfinispanRoutePolicy.java b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/policy/InfinispanRoutePolicy.java index 7103edf..7afc26a 100644 --- a/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/policy/InfinispanRoutePolicy.java +++ b/components/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/policy/InfinispanRoutePolicy.java @@ -356,7 +356,7 @@ public class InfinispanRoutePolicy extends RoutePolicySupport implements CamelCo private Cache cache; private ScheduledFuture future; -public EmbeddedCacheService(Cache cache) { +EmbeddedCacheService(Cache cache) { this.cache = cache; this.future = null; } @@ -427,7 +427,7 @@ public class InfinispanRoutePolicy extends RoutePolicySupport implements CamelCo private ScheduledFuture future; private Long version; -public RemoteCacheService(RemoteCache cache) { +RemoteCacheService(RemoteCache cache) { this.cache = cache; this.future = null; this.version = null; http://git-wip-us.apache.org/repos/asf/camel/blob/e0fed456/components/camel-infinispan/src/test/java/org/apache/camel/component/infinispan/policy/InfinispanRoutePolicyTestBase.java -- diff --git
[2/2] 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/28a15675 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/28a15675 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/28a15675 Branch: refs/heads/master Commit: 28a1567537b8c13228dc9d2a4563370598cd0cd7 Parents: fb74240 Author: lburgazzoliAuthored: Fri Mar 31 09:56:18 2017 +0200 Committer: lburgazzoli Committed: Fri Mar 31 09:56:18 2017 +0200 -- .../rabbitmq/RabbitMQConsumerIntTestReplyTo.java | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/28a15675/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerIntTestReplyTo.java -- diff --git a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerIntTestReplyTo.java b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerIntTestReplyTo.java index 39e0f7b..85cc1f3 100644 --- a/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerIntTestReplyTo.java +++ b/components/camel-rabbitmq/src/test/java/org/apache/camel/component/rabbitmq/RabbitMQConsumerIntTestReplyTo.java @@ -16,15 +16,17 @@ */ package org.apache.camel.component.rabbitmq; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.TimeoutException; + import com.rabbitmq.client.AMQP; import com.rabbitmq.client.Channel; import com.rabbitmq.client.Connection; import com.rabbitmq.client.DefaultConsumer; import com.rabbitmq.client.Envelope; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.TimeoutException; + import org.apache.camel.Endpoint; import org.apache.camel.EndpointInject; import org.apache.camel.builder.RouteBuilder;
[6/6] 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/b1e5a108 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b1e5a108 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b1e5a108 Branch: refs/heads/master Commit: b1e5a108f3975d50d7c00ef80019f8ed5437d7eb Parents: c0e7e60 Author: lburgazzoliAuthored: Thu Mar 30 18:05:24 2017 +0200 Committer: lburgazzoli Committed: Thu Mar 30 18:05:24 2017 +0200 -- .../org/apache/camel/ComponentVerifierHelper.java | 16 .../org/apache/camel/ComponentVerifierTest.java | 15 --- .../salesforce/SalesforceComponentVerifier.java | 3 +-- .../twitter/CamelComponentVerifierTest.java | 2 +- 4 files changed, 22 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/b1e5a108/camel-core/src/main/java/org/apache/camel/ComponentVerifierHelper.java -- diff --git a/camel-core/src/main/java/org/apache/camel/ComponentVerifierHelper.java b/camel-core/src/main/java/org/apache/camel/ComponentVerifierHelper.java index 1c6f288..7be03d4 100644 --- a/camel-core/src/main/java/org/apache/camel/ComponentVerifierHelper.java +++ b/camel-core/src/main/java/org/apache/camel/ComponentVerifierHelper.java @@ -46,8 +46,12 @@ class ComponentVerifierHelper { @Override public boolean equals(Object o) { -if (this == o) return true; -if (!(o instanceof Code)) return false; +if (this == o) { +return true; +} +if (!(o instanceof Code)) { +return false; +} Code errorCode = (Code) o; @@ -84,8 +88,12 @@ class ComponentVerifierHelper { @Override public boolean equals(Object o) { -if (this == o) return true; -if (!(o instanceof Attribute)) return false; +if (this == o) { +return true; +} +if (!(o instanceof Attribute)) { +return false; +} Attribute that = (Attribute) o; http://git-wip-us.apache.org/repos/asf/camel/blob/b1e5a108/camel-core/src/test/java/org/apache/camel/ComponentVerifierTest.java -- diff --git a/camel-core/src/test/java/org/apache/camel/ComponentVerifierTest.java b/camel-core/src/test/java/org/apache/camel/ComponentVerifierTest.java index b14541b..5173053 100644 --- a/camel-core/src/test/java/org/apache/camel/ComponentVerifierTest.java +++ b/camel-core/src/test/java/org/apache/camel/ComponentVerifierTest.java @@ -23,15 +23,15 @@ import org.junit.Assert; public class ComponentVerifierTest extends TestCase { public void testGetErrorDetails() { -VerificationError error = - ResultErrorBuilder.withCodeAndDescription(VerificationError.asCode("test_code"), "test error desc") - .detail(VerificationError.asAttribute("test_attr_1"), "test_detail_1") - .detail(VerificationError.HttpAttribute.HTTP_CODE,"test_detail_2") - .build(); +VerificationError error = ResultErrorBuilder.withCodeAndDescription(VerificationError.asCode("test_code"), "test error desc") +.detail(VerificationError.asAttribute("test_attr_1"), "test_detail_1") +.detail(VerificationError.HttpAttribute.HTTP_CODE, "test_detail_2") +.build(); + Assert.assertEquals("test_detail_1", error.getDetail(VerificationError.asAttribute("test_attr_1"))); Assert.assertEquals("test_detail_1", error.getDetail("test_attr_1")); Assert.assertEquals("test_detail_2", error.getDetail(VerificationError.HttpAttribute.HTTP_CODE)); -Assert.assertNull(error.getDetail(VerificationError.HttpAttribute.HTTP_TEXT)); + Assert.assertNull(error.getDetail(VerificationError.HttpAttribute.HTTP_TEXT)); Assert.assertNull(error.getDetail(VerificationError.asAttribute("test_attr_non_existant"))); } @@ -78,6 +78,7 @@ Assert.assertNull(error.getDetail(VerificationError.HttpAttribute.HTTP_TEXT)); try { ComponentVerifier.Scope.fromString("unknown"); fail(); -} catch (IllegalArgumentException exp) {} +} catch (IllegalArgumentException exp) { +} } } http://git-wip-us.apache.org/repos/asf/camel/blob/b1e5a108/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceComponentVerifier.java -- diff --git
[4/6] 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/891dc979 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/891dc979 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/891dc979 Branch: refs/heads/master Commit: 891dc979df0f0d49d53cd4a26bd88cc953736673 Parents: 922a99f Author: lburgazzoliAuthored: Thu Mar 30 18:04:04 2017 +0200 Committer: lburgazzoli Committed: Thu Mar 30 18:04:04 2017 +0200 -- camel-core/src/test/java/org/apache/camel/LoggingLevelTest.java | 2 -- 1 file changed, 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/891dc979/camel-core/src/test/java/org/apache/camel/LoggingLevelTest.java -- diff --git a/camel-core/src/test/java/org/apache/camel/LoggingLevelTest.java b/camel-core/src/test/java/org/apache/camel/LoggingLevelTest.java index cf093d6..508d3bf 100644 --- a/camel-core/src/test/java/org/apache/camel/LoggingLevelTest.java +++ b/camel-core/src/test/java/org/apache/camel/LoggingLevelTest.java @@ -19,8 +19,6 @@ package org.apache.camel; import junit.framework.TestCase; import org.junit.Test; -import org.junit.Test; - public class LoggingLevelTest extends TestCase { @Test
camel git commit: Fix CS
Repository: camel Updated Branches: refs/heads/master 1237f8abc -> 762a2359d Fix CS Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/762a2359 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/762a2359 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/762a2359 Branch: refs/heads/master Commit: 762a2359daf35abedfb876e215872fe5bd938aeb Parents: 1237f8a Author: lburgazzoliAuthored: Thu Mar 30 10:09:12 2017 +0200 Committer: lburgazzoli Committed: Thu Mar 30 10:09:12 2017 +0200 -- .../camel/model/OnExceptionDefinition.java | 19 +-- .../java/org/apache/camel/util/ObjectHelper.java | 17 + .../org/apache/camel/util/StringHelperTest.java | 6 +++--- .../component/http/HttpProxyConfigurer.java | 3 ++- .../camel/component/http4/HttpComponent.java | 2 +- .../servicenow/ServiceNowExceptionModel.java | 16 .../servicenow/ServiceNowTestSupport.java| 4 ++-- .../twitter/CamelComponentVerifierTest.java | 2 +- 8 files changed, 55 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/762a2359/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java -- diff --git a/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java b/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java index 47fbc92..b9bdaaa 100644 --- a/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/OnExceptionDefinition.java @@ -262,12 +262,19 @@ public class OnExceptionDefinition extends ProcessorDefinition new IllegalArgumentException(this + " is not configured.") +); } } http://git-wip-us.apache.org/repos/asf/camel/blob/762a2359/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java -- diff --git a/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java b/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java index 3ada9d0..9fcc1ad 100644 --- a/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java +++ b/camel-core/src/main/java/org/apache/camel/util/ObjectHelper.java @@ -398,6 +398,23 @@ public final class ObjectHelper { } } + +/** + * Returns the first non null object null. + * + * @param values the values + * @return an Optional + */ +public static Optional firstNotNull(Object... values) { +for (int i = 0; i < values.length; i++) { +if (values[i] != null) { +Optional.of(values[i]); +} +} + +return Optional.empty(); +} + /** * Tests whether the value is not null, an empty string, an empty collection or a map * http://git-wip-us.apache.org/repos/asf/camel/blob/762a2359/camel-core/src/test/java/org/apache/camel/util/StringHelperTest.java -- diff --git a/camel-core/src/test/java/org/apache/camel/util/StringHelperTest.java b/camel-core/src/test/java/org/apache/camel/util/StringHelperTest.java index ca987d8..aa9c37e 100644 --- a/camel-core/src/test/java/org/apache/camel/util/StringHelperTest.java +++ b/camel-core/src/test/java/org/apache/camel/util/StringHelperTest.java @@ -240,9 +240,9 @@ public class StringHelperTest extends TestCase { } public void testTrimToNull() { -assertEquals(StringHelper.trimToNull("abc"),"abc"); -assertEquals(StringHelper.trimToNull(" abc") , "abc"); -assertEquals(StringHelper.trimToNull(" abc "),"abc"); +assertEquals(StringHelper.trimToNull("abc"), "abc"); +assertEquals(StringHelper.trimToNull(" abc"), "abc"); +assertEquals(StringHelper.trimToNull(" abc "), "abc"); assertNull(StringHelper.trimToNull(" ")); assertNull(StringHelper.trimToNull("\t")); assertNull(StringHelper.trimToNull(" \t ")); http://git-wip-us.apache.org/repos/asf/camel/blob/762a2359/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProxyConfigurer.java -- diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProxyConfigurer.java b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProxyConfigurer.java index ae2bd83..78e99ad 100644 --- a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProxyConfigurer.java +++
[2/2] 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/7ba19021 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7ba19021 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7ba19021 Branch: refs/heads/master Commit: 7ba19021655a105422a9c191cc1a55258d662283 Parents: 3bc26be Author: lburgazzoliAuthored: Thu Mar 23 14:08:10 2017 +0100 Committer: lburgazzoli Committed: Thu Mar 23 14:08:10 2017 +0100 -- .../main/java/org/apache/camel/ComponentVerifier.java | 2 +- .../apache/camel/management/ManagedComponentTest.java | 12 +++- .../apache/camel/management/ManagementTestSupport.java | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/7ba19021/camel-core/src/main/java/org/apache/camel/ComponentVerifier.java -- diff --git a/camel-core/src/main/java/org/apache/camel/ComponentVerifier.java b/camel-core/src/main/java/org/apache/camel/ComponentVerifier.java index 969b25b..53cb8c7 100644 --- a/camel-core/src/main/java/org/apache/camel/ComponentVerifier.java +++ b/camel-core/src/main/java/org/apache/camel/ComponentVerifier.java @@ -58,7 +58,7 @@ public interface ComponentVerifier { private static final Scope[] VALUES = values(); public static Scope fromString(String scope) { -for (int i=0; i < VALUES.length; i++) { +for (int i = 0; i < VALUES.length; i++) { if (ObjectHelper.equal(scope, VALUES[i].name(), true)) { return VALUES[i]; } http://git-wip-us.apache.org/repos/asf/camel/blob/7ba19021/camel-core/src/test/java/org/apache/camel/management/ManagedComponentTest.java -- diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedComponentTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedComponentTest.java index 00ade1f..491e766 100644 --- a/camel-core/src/test/java/org/apache/camel/management/ManagedComponentTest.java +++ b/camel-core/src/test/java/org/apache/camel/management/ManagedComponentTest.java @@ -31,7 +31,9 @@ import org.apache.camel.impl.verifier.DefaultComponentVerifier; import org.apache.camel.impl.verifier.ResultBuilder; public class ManagedComponentTest extends ManagementTestSupport { -private static final String[] VERIFY_SIGNATURE = new String[]{ "java.lang.String", "java.util.Map" }; +private static final String[] VERIFY_SIGNATURE = new String[] { +"java.lang.String", "java.util.Map" +}; @Override protected CamelContext createCamelContext() throws Exception { @@ -76,17 +78,17 @@ public class ManagedComponentTest extends ManagementTestSupport { ComponentVerifier.Result res; // check lowercase -res = invoke(mbeanServer, on, "verify", new Object[]{ "connectivity", Collections.emptyMap() }, VERIFY_SIGNATURE); +res = invoke(mbeanServer, on, "verify", new Object[]{"connectivity", Collections.emptyMap()}, VERIFY_SIGNATURE); assertEquals(ComponentVerifier.Result.Status.OK, res.getStatus()); assertEquals(ComponentVerifier.Scope.CONNECTIVITY, res.getScope()); // check mixed case -res = invoke(mbeanServer, on, "verify", new Object[]{ "ConnEctivIty", Collections.emptyMap() }, VERIFY_SIGNATURE); +res = invoke(mbeanServer, on, "verify", new Object[]{"ConnEctivIty", Collections.emptyMap()}, VERIFY_SIGNATURE); assertEquals(ComponentVerifier.Result.Status.OK, res.getStatus()); assertEquals(ComponentVerifier.Scope.CONNECTIVITY, res.getScope()); // check uppercase -res = invoke(mbeanServer, on, "verify", new Object[]{ "PARAMETERS", Collections.emptyMap() }, VERIFY_SIGNATURE); +res = invoke(mbeanServer, on, "verify", new Object[]{"PARAMETERS", Collections.emptyMap()}, VERIFY_SIGNATURE); assertEquals(ComponentVerifier.Result.Status.OK, res.getStatus()); assertEquals(ComponentVerifier.Scope.PARAMETERS, res.getScope()); } @@ -115,4 +117,4 @@ public class ManagedComponentTest extends ManagementTestSupport { throw new UnsupportedOperationException(); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/camel/blob/7ba19021/camel-core/src/test/java/org/apache/camel/management/ManagementTestSupport.java -- diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagementTestSupport.java b/camel-core/src/test/java/org/apache/camel/management/ManagementTestSupport.java index 1d484ec..ed0b372
camel git commit: Fix CS
Repository: camel Updated Branches: refs/heads/master fbb189763 -> 3d780020c Fix CS Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3d780020 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3d780020 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3d780020 Branch: refs/heads/master Commit: 3d780020c297fff0882c74eaf95d883a74130cd5 Parents: fbb1897 Author: lburgazzoliAuthored: Thu Mar 16 09:26:21 2017 +0100 Committer: lburgazzoli Committed: Thu Mar 16 09:26:21 2017 +0100 -- .../apache/camel/maven/CamelSalesforceMojo.java | 5 ++-- .../maven/CamelSalesforceMojoOutputTest.java| 25 ++-- 2 files changed, 14 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/3d780020/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java -- diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java index 08ee1ab..e9151f3 100644 --- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java +++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java @@ -93,12 +93,11 @@ import org.eclipse.jetty.util.ssl.SslContextFactory; */ @Mojo(name = "generate", requiresProject = false, defaultPhase = LifecyclePhase.GENERATE_SOURCES) public class CamelSalesforceMojo extends AbstractMojo { - -private static final String UTF_8 = "UTF-8"; - // default connect and call timeout protected static final int DEFAULT_TIMEOUT = 6; +private static final String UTF_8 = "UTF-8"; + private static final String JAVA_EXT = ".java"; private static final String PACKAGE_NAME_PATTERN = "(\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*\\.)+\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*"; http://git-wip-us.apache.org/repos/asf/camel/blob/3d780020/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoOutputTest.java -- diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoOutputTest.java b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoOutputTest.java index 3728e1b..a30f5de 100644 --- a/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoOutputTest.java +++ b/components/camel-salesforce/camel-salesforce-maven-plugin/src/test/java/org/apache/camel/maven/CamelSalesforceMojoOutputTest.java @@ -44,12 +44,21 @@ public class CamelSalesforceMojoOutputTest { private static final String TEST_CALCULATED_FORMULA_FILE = "complex_calculated_formula.json"; private static final String FIXED_DATE = "Thu Mar 09 16:15:49 ART 2017"; -private CamelSalesforceMojo mojo; -private CamelSalesforceMojo.GeneratorUtility utility = new CamelSalesforceMojo.GeneratorUtility(false); - @Rule public TemporaryFolder temp = new TemporaryFolder(); +@Parameter(0) +public String json; + +@Parameter(1) +public SObjectDescription description; + +@Parameter(2) +public String source; + +private CamelSalesforceMojo mojo; +private CamelSalesforceMojo.GeneratorUtility utility = new CamelSalesforceMojo.GeneratorUtility(false); + @Parameters(name = "json = {0}, source = {2}") public static Iterable
camel git commit: Fix CS
Repository: camel Updated Branches: refs/heads/master 3e36dfe3f -> e93b5b400 Fix CS Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e93b5b40 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e93b5b40 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e93b5b40 Branch: refs/heads/master Commit: e93b5b400eb27406893456575c3725e478dc9fe5 Parents: 3e36dfe Author: lburgazzoliAuthored: Wed Feb 1 14:00:52 2017 +0100 Committer: lburgazzoli Committed: Wed Feb 1 14:01:28 2017 +0100 -- .../component/chronicle/engine/ChronicleEngineEndpoint.java | 8 +++- .../camel/component/google/mail/GoogleMailEndpoint.java | 9 - .../java/org/apache/camel/component/irc/IrcEndpoint.java| 9 - .../org/apache/camel/maven/connector/ConnectorMojo.java | 2 +- 4 files changed, 24 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/e93b5b40/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineEndpoint.java -- diff --git a/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineEndpoint.java b/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineEndpoint.java index d2b4491..7735ac0 100644 --- a/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineEndpoint.java +++ b/components/camel-chronicle/src/main/java/org/apache/camel/component/chronicle/engine/ChronicleEngineEndpoint.java @@ -30,7 +30,13 @@ import org.apache.camel.spi.UriPath; /** * The camel chronicle-engine component let you leverage the power of OpenHFT's https://github.com/OpenHFT/Chronicle-Engine;>Chronicle-Engine. */ -@UriEndpoint(firstVersion = "2.18.0", scheme = "chronicle-engine", title = "Chronicle Engine", syntax = "chronicle-engine:addresses/path", consumerClass = ChronicleEngineConsumer.class, label = "datagrid,cache") +@UriEndpoint( +firstVersion = "2.18.0", +scheme = "chronicle-engine", +title = "Chronicle Engine", +syntax = "chronicle-engine:addresses/path", +consumerClass = ChronicleEngineConsumer.class, +label = "datagrid,cache") public class ChronicleEngineEndpoint extends DefaultEndpoint { @UriPath(description = "Engine addresses. Multiple addresses can be separated by comman.") http://git-wip-us.apache.org/repos/asf/camel/blob/e93b5b40/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailEndpoint.java -- diff --git a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailEndpoint.java b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailEndpoint.java index ba83671..5e32c2b 100644 --- a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailEndpoint.java +++ b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailEndpoint.java @@ -36,7 +36,14 @@ import org.apache.camel.util.component.ApiMethodPropertiesHelper; /** * The google-mail component provides access to Google Mail. */ -@UriEndpoint(firstVersion = "2.15.0", scheme = "google-mail", title = "Google Mail", syntax = "google-mail:apiName/methodName", consumerClass = GoogleMailConsumer.class, consumerPrefix = "consumer", label = "api,cloud,mail") +@UriEndpoint( +firstVersion = "2.15.0", +scheme = "google-mail", +title = "Google Mail", +syntax = "google-mail:apiName/methodName", +consumerClass = GoogleMailConsumer.class, +consumerPrefix = "consumer", +label = "api,cloud,mail") public class GoogleMailEndpoint extends AbstractApiEndpoint { // TODO create and manage API proxy http://git-wip-us.apache.org/repos/asf/camel/blob/e93b5b40/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java -- diff --git a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java index a057979..9572a63 100644 --- a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java +++ b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java @@ -34,7 +34,14 @@ import org.slf4j.LoggerFactory; /** * The irc component implements an https://en.wikipedia.org/wiki/Internet_Relay_Chat;>IRC (Internet Relay
camel git commit: Fix CS
Repository: camel Updated Branches: refs/heads/master e3ec108c8 -> 2de6d9079 Fix CS Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2de6d907 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2de6d907 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2de6d907 Branch: refs/heads/master Commit: 2de6d9079fc81a510e63f902688a64a46c2b0aa9 Parents: e3ec108 Author: lburgazzoliAuthored: Wed Feb 1 12:31:54 2017 +0100 Committer: lburgazzoli Committed: Wed Feb 1 12:31:54 2017 +0100 -- .../camel/test/blueprint/cloud/ServiceCallFilterTest.java | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/2de6d907/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/cloud/ServiceCallFilterTest.java -- diff --git a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/cloud/ServiceCallFilterTest.java b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/cloud/ServiceCallFilterTest.java index 5c2a505..e5732ec 100644 --- a/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/cloud/ServiceCallFilterTest.java +++ b/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/cloud/ServiceCallFilterTest.java @@ -28,11 +28,17 @@ public class ServiceCallFilterTest extends CamelBlueprintTestSupport { public void testServiceFilter() throws Exception { Exchange result; -result = template.request("direct:start", e -> { return; } ); +result = template.request("direct:start", e -> { +return; +}); + assertHeader(result, ServiceCallConstants.SERVICE_HOST, "host1"); assertHeader(result, ServiceCallConstants.SERVICE_PORT, 9093); -result = template.request("direct:start", e -> { return; } ); +result = template.request("direct:start", e -> { +return; +}); + assertHeader(result, ServiceCallConstants.SERVICE_HOST, "host4"); assertHeader(result, ServiceCallConstants.SERVICE_PORT, 9094); }
[52/52] 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/df077dc6 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/df077dc6 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/df077dc6 Branch: refs/heads/master Commit: df077dc6b5ca64e88d414af2f60f27965709226a Parents: 3b20e36 Author: lburgazzoliAuthored: Mon Jan 16 18:28:55 2017 +0100 Committer: lburgazzoli Committed: Mon Jan 16 18:29:16 2017 +0100 -- .../java/org/apache/camel/maven/packaging/ReadmeComponentMojo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/df077dc6/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ReadmeComponentMojo.java -- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ReadmeComponentMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ReadmeComponentMojo.java index 3725acf..fff5e3f 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ReadmeComponentMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ReadmeComponentMojo.java @@ -308,7 +308,7 @@ public class ReadmeComponentMojo extends AbstractMojo { } // use single line headers with # as level instead of the cumbersome adoc weird style -if (line.startsWith("^^^") || line.startsWith("~~~") || line.startsWith("+++") ) { +if (line.startsWith("^^^") || line.startsWith("~~~") || line.startsWith("+++")) { String level = line.startsWith("+++") ? "" : "###"; // transform legacy heading into new style
camel git commit: Fix CS
Repository: camel Updated Branches: refs/heads/master 11a78fd8d -> 33d82ce71 Fix CS Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/33d82ce7 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/33d82ce7 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/33d82ce7 Branch: refs/heads/master Commit: 33d82ce7161f40998d22fdf32e872c0f2e1c40b2 Parents: 11a78fd Author: lburgazzoliAuthored: Mon Jan 2 18:04:56 2017 +0100 Committer: lburgazzoli Committed: Mon Jan 2 18:04:56 2017 +0100 -- .../camel/example/spring/boot/MySpringBootApplication.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/33d82ce7/examples/camel-example-spring-boot/src/main/java/org/apache/camel/example/spring/boot/MySpringBootApplication.java -- diff --git a/examples/camel-example-spring-boot/src/main/java/org/apache/camel/example/spring/boot/MySpringBootApplication.java b/examples/camel-example-spring-boot/src/main/java/org/apache/camel/example/spring/boot/MySpringBootApplication.java index c561692..4aa91e9 100644 --- a/examples/camel-example-spring-boot/src/main/java/org/apache/camel/example/spring/boot/MySpringBootApplication.java +++ b/examples/camel-example-spring-boot/src/main/java/org/apache/camel/example/spring/boot/MySpringBootApplication.java @@ -20,7 +20,9 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication -public class MySpringBootApplication { +public final class MySpringBootApplication { +private MySpringBootApplication() { +} /** * A main method to start this application. @@ -28,5 +30,4 @@ public class MySpringBootApplication { public static void main(String[] args) { SpringApplication.run(MySpringBootApplication.class, args); } - }
camel git commit: Fix CS
Repository: camel Updated Branches: refs/heads/master ec28e18fa -> 11a78fd8d Fix CS Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/11a78fd8 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/11a78fd8 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/11a78fd8 Branch: refs/heads/master Commit: 11a78fd8d50174cfd27bdcba13d0ce3711971f2c Parents: ec28e18 Author: lburgazzoliAuthored: Mon Jan 2 17:19:16 2017 +0100 Committer: lburgazzoli Committed: Mon Jan 2 17:19:16 2017 +0100 -- .../org/apache/camel/dataformat/xmljson/XmlJsonDataFormatTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/11a78fd8/components/camel-xmljson/src/test/java/org/apache/camel/dataformat/xmljson/XmlJsonDataFormatTest.java -- diff --git a/components/camel-xmljson/src/test/java/org/apache/camel/dataformat/xmljson/XmlJsonDataFormatTest.java b/components/camel-xmljson/src/test/java/org/apache/camel/dataformat/xmljson/XmlJsonDataFormatTest.java index 27c3bfc..f7c0258 100644 --- a/components/camel-xmljson/src/test/java/org/apache/camel/dataformat/xmljson/XmlJsonDataFormatTest.java +++ b/components/camel-xmljson/src/test/java/org/apache/camel/dataformat/xmljson/XmlJsonDataFormatTest.java @@ -24,7 +24,6 @@ import java.util.Map; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.sax.SAXSource; -import org.apache.camel.Exchange; import org.w3c.dom.Document; import net.sf.json.JSON; @@ -32,6 +31,7 @@ import net.sf.json.JSONArray; import net.sf.json.JSONObject; import net.sf.json.JSONSerializer; +import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint;
camel git commit: Fix CS
Repository: camel Updated Branches: refs/heads/master 72ce87d9b -> ec28e18fa Fix CS Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ec28e18f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ec28e18f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ec28e18f Branch: refs/heads/master Commit: ec28e18fa9a8fadec9a3aa93b178ddf62f0b6ac7 Parents: 72ce87d Author: lburgazzoliAuthored: Mon Jan 2 16:27:46 2017 +0100 Committer: lburgazzoli Committed: Mon Jan 2 16:27:46 2017 +0100 -- .../jacksonxml/JacksonMarshalContentTypeHeaderTest.java| 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/ec28e18f/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalContentTypeHeaderTest.java -- diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalContentTypeHeaderTest.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalContentTypeHeaderTest.java index 82a65c8..62b22df 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalContentTypeHeaderTest.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/JacksonMarshalContentTypeHeaderTest.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 - * - * 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, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
camel git commit: Fix CS violations
Repository: camel Updated Branches: refs/heads/master 079b5f9e6 -> 490a76f17 Fix CS violations Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/490a76f1 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/490a76f1 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/490a76f1 Branch: refs/heads/master Commit: 490a76f17a1cb96a08009607a7aa972e7bc0372d Parents: 079b5f9 Author: Babak VahdatAuthored: Sun Dec 18 18:26:52 2016 +0100 Committer: Babak Vahdat Committed: Sun Dec 18 18:26:52 2016 +0100 -- .../component/bonita/BonitaConfiguration.java | 6 +- .../core/xml/CamelProxyFactoryDefinition.java | 2 +- .../camel/component/gridfs/GridFsEndpoint.java | 1 - .../openstack/nova/KeypairProducerTest.java | 2 +- .../processor/RibbonServiceCallProcessor.java | 19 +- .../component/servicenow/ServiceNowClient.java | 2 +- components/readme.adoc | 402 --- 7 files changed, 15 insertions(+), 419 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/490a76f1/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/BonitaConfiguration.java -- diff --git a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/BonitaConfiguration.java b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/BonitaConfiguration.java index 7343e2c..b992682 100644 --- a/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/BonitaConfiguration.java +++ b/components/camel-bonita/src/main/java/org/apache/camel/component/bonita/BonitaConfiguration.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 - * - * 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, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. http://git-wip-us.apache.org/repos/asf/camel/blob/490a76f1/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelProxyFactoryDefinition.java -- diff --git a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelProxyFactoryDefinition.java b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelProxyFactoryDefinition.java index 6f160ce..5c78b93 100644 --- a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelProxyFactoryDefinition.java +++ b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/CamelProxyFactoryDefinition.java @@ -63,7 +63,7 @@ public class CamelProxyFactoryDefinition extends IdentifiedType { * @deprecated use serviceUrl instead with the ref endpoint. */ @Deprecated - public void setServiceRef(String serviceRef) { +public void setServiceRef(String serviceRef) { this.serviceRef = serviceRef; } http://git-wip-us.apache.org/repos/asf/camel/blob/490a76f1/components/camel-mongodb-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsEndpoint.java -- diff --git a/components/camel-mongodb-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsEndpoint.java b/components/camel-mongodb-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsEndpoint.java index cb8f686..f4d5d65 100644 --- a/components/camel-mongodb-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsEndpoint.java +++ b/components/camel-mongodb-gridfs/src/main/java/org/apache/camel/component/gridfs/GridFsEndpoint.java @@ -39,7 +39,6 @@ import org.slf4j.LoggerFactory; @UriEndpoint(scheme = "gridfs", title = "MongoDBGridFS", syntax = "gridfs:connectionBean", label = "database,nosql") public class GridFsEndpoint extends DefaultEndpoint { -; public static final String GRIDFS_OPERATION = "gridfs.operation"; public static final String GRIDFS_METADATA = "gridfs.metadata"; public static final String GRIDFS_CHUNKSIZE = "gridfs.chunksize"; http://git-wip-us.apache.org/repos/asf/camel/blob/490a76f1/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/KeypairProducerTest.java -- diff --git a/components/camel-openstack/src/test/java/org/apache/camel/component/openstack/nova/KeypairProducerTest.java
camel git commit: Fix CS
Repository: camel Updated Branches: refs/heads/master 2fe9ed210 -> 5fa4f3eb5 Fix CS Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5fa4f3eb Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5fa4f3eb Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5fa4f3eb Branch: refs/heads/master Commit: 5fa4f3eb570c33abfab30e424a01eaddefdf3e85 Parents: 2fe9ed2 Author: lburgazzoliAuthored: Thu Dec 1 16:47:51 2016 +0100 Committer: lburgazzoli Committed: Thu Dec 1 16:47:51 2016 +0100 -- .../camel/spring/boot/CamelConfigurationProperties.java | 6 +++--- .../camel/spring/boot/SpringTypeConverterTest.java | 12 +++- 2 files changed, 10 insertions(+), 8 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/5fa4f3eb/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java -- diff --git a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java index b6bafe0..bded0e2 100644 --- a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java +++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.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 - * - * 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, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. http://git-wip-us.apache.org/repos/asf/camel/blob/5fa4f3eb/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SpringTypeConverterTest.java -- diff --git a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SpringTypeConverterTest.java b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SpringTypeConverterTest.java index 3ccc367..4814374 100644 --- a/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SpringTypeConverterTest.java +++ b/components/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SpringTypeConverterTest.java @@ -98,17 +98,19 @@ public class SpringTypeConverterTest { @Override public String toString() { -return "Person{" + -"name='" + name + '\'' + -", age=" + age + -'}'; +return "Person{" ++ "name='" + name + '\'' ++ ", age=" + age ++ '}'; } } @Configuration @EnableAutoConfiguration( exclude = { -CamelAutoConfiguration.class, TypeConversionConfiguration.class, WebMvcAutoConfiguration.class +CamelAutoConfiguration.class, +TypeConversionConfiguration.class, +WebMvcAutoConfiguration.class } ) public static class SpringTypeConversionConfiguration {
[12/12] 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/b15c2f5d Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b15c2f5d Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b15c2f5d Branch: refs/heads/camel-2.18.x Commit: b15c2f5d62eb0285c5d48b9e9199e48abce365aa Parents: 8de429e Author: Jonathan AnsteyAuthored: Tue Oct 11 23:37:48 2016 -0230 Committer: Jonathan Anstey Committed: Tue Oct 11 23:44:21 2016 -0230 -- .../component/google/calendar/CalendarConfigurationTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/b15c2f5d/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java -- diff --git a/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java b/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java index c22915f..6777434 100644 --- a/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java +++ b/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java @@ -18,6 +18,8 @@ package org.apache.camel.component.google.calendar; import java.util.Random; +import com.google.api.services.calendar.model.Calendar; + import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.google.calendar.internal.CalendarCalendarsApiMethod; @@ -29,8 +31,6 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.api.services.calendar.model.Calendar; - public class CalendarConfigurationTest extends AbstractGoogleCalendarTestSupport { private static final Logger LOG = LoggerFactory.getLogger(CalendarConfigurationTest.class);
[06/12] 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/471e25a3 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/471e25a3 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/471e25a3 Branch: refs/heads/master Commit: 471e25a31c95aabc9718430f2c1fed6a88677c1c Parents: 329aca6 Author: Jonathan AnsteyAuthored: Tue Oct 11 23:37:48 2016 -0230 Committer: Jonathan Anstey Committed: Tue Oct 11 23:37:48 2016 -0230 -- .../component/google/calendar/CalendarConfigurationTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/471e25a3/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java -- diff --git a/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java b/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java index c22915f..6777434 100644 --- a/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java +++ b/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/CalendarConfigurationTest.java @@ -18,6 +18,8 @@ package org.apache.camel.component.google.calendar; import java.util.Random; +import com.google.api.services.calendar.model.Calendar; + import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.google.calendar.internal.CalendarCalendarsApiMethod; @@ -29,8 +31,6 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.api.services.calendar.model.Calendar; - public class CalendarConfigurationTest extends AbstractGoogleCalendarTestSupport { private static final Logger LOG = LoggerFactory.getLogger(CalendarConfigurationTest.class);
[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/5] camel git commit: fix CS for CAMEL-10070
fix CS for CAMEL-10070 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6b1557ef Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6b1557ef Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6b1557ef Branch: refs/heads/camel-2.17.x Commit: 6b1557ef1208bdefeeb3bc46041ab9d60b070fb2 Parents: 47c3f90 Author: Akitoshi YoshidaAuthored: Sat Jun 18 19:35:54 2016 +0200 Committer: Akitoshi Yoshida Committed: Mon Jun 20 09:51:09 2016 +0200 -- .../apache/camel/converter/jaxp/XMLStreamReaderInputStream.java | 4 ++-- .../org/apache/camel/converter/jaxp/XMLStreamReaderReader.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/6b1557ef/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderInputStream.java -- diff --git a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderInputStream.java b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderInputStream.java index 1e3158f..96783d4 100644 --- a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderInputStream.java +++ b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderInputStream.java @@ -39,7 +39,7 @@ class XMLStreamReaderInputStream extends InputStream { private String charset; private int bpos; -public XMLStreamReaderInputStream(XMLStreamReader reader, String charset, XMLOutputFactory outfactory) { +XMLStreamReaderInputStream(XMLStreamReader reader, String charset, XMLOutputFactory outfactory) { this.reader = reader; this.buffer = new byte[BUFFER_SIZE]; this.chunk = new TrimmableByteArrayOutputStream(); @@ -51,7 +51,7 @@ class XMLStreamReaderInputStream extends InputStream { } } -public XMLStreamReaderInputStream(XMLStreamReader reader, XMLOutputFactory outfactory) { +XMLStreamReaderInputStream(XMLStreamReader reader, XMLOutputFactory outfactory) { this(reader, "utf-8", outfactory); } http://git-wip-us.apache.org/repos/asf/camel/blob/6b1557ef/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderReader.java -- diff --git a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderReader.java b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderReader.java index 571c21b..207f273 100644 --- a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderReader.java +++ b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderReader.java @@ -38,7 +38,7 @@ class XMLStreamReaderReader extends Reader { private char[] buffer; private int bpos; -public XMLStreamReaderReader(XMLStreamReader reader, XMLOutputFactory outfactory) { +XMLStreamReaderReader(XMLStreamReader reader, XMLOutputFactory outfactory) { this.reader = reader; this.buffer = new char[BUFFER_SIZE]; this.chunk = new TrimmableCharArrayWriter();
camel git commit: fix CS for CAMEL-10070
Repository: camel Updated Branches: refs/heads/master a9d093faf -> ff7d97dc1 fix CS for CAMEL-10070 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ff7d97dc Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ff7d97dc Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ff7d97dc Branch: refs/heads/master Commit: ff7d97dc1a7222e6c207a95f429aa5bfde5155ee Parents: a9d093f Author: Akitoshi YoshidaAuthored: Sat Jun 18 19:35:54 2016 +0200 Committer: Akitoshi Yoshida Committed: Sat Jun 18 19:35:54 2016 +0200 -- .../apache/camel/converter/jaxp/XMLStreamReaderInputStream.java | 4 ++-- .../org/apache/camel/converter/jaxp/XMLStreamReaderReader.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/ff7d97dc/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderInputStream.java -- diff --git a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderInputStream.java b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderInputStream.java index 1e3158f..96783d4 100644 --- a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderInputStream.java +++ b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderInputStream.java @@ -39,7 +39,7 @@ class XMLStreamReaderInputStream extends InputStream { private String charset; private int bpos; -public XMLStreamReaderInputStream(XMLStreamReader reader, String charset, XMLOutputFactory outfactory) { +XMLStreamReaderInputStream(XMLStreamReader reader, String charset, XMLOutputFactory outfactory) { this.reader = reader; this.buffer = new byte[BUFFER_SIZE]; this.chunk = new TrimmableByteArrayOutputStream(); @@ -51,7 +51,7 @@ class XMLStreamReaderInputStream extends InputStream { } } -public XMLStreamReaderInputStream(XMLStreamReader reader, XMLOutputFactory outfactory) { +XMLStreamReaderInputStream(XMLStreamReader reader, XMLOutputFactory outfactory) { this(reader, "utf-8", outfactory); } http://git-wip-us.apache.org/repos/asf/camel/blob/ff7d97dc/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderReader.java -- diff --git a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderReader.java b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderReader.java index 571c21b..207f273 100644 --- a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderReader.java +++ b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XMLStreamReaderReader.java @@ -38,7 +38,7 @@ class XMLStreamReaderReader extends Reader { private char[] buffer; private int bpos; -public XMLStreamReaderReader(XMLStreamReader reader, XMLOutputFactory outfactory) { +XMLStreamReaderReader(XMLStreamReader reader, XMLOutputFactory outfactory) { this.reader = reader; this.buffer = new char[BUFFER_SIZE]; this.chunk = new TrimmableCharArrayWriter();
[3/4] 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/99ab3ae5 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/99ab3ae5 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/99ab3ae5 Branch: refs/heads/master Commit: 99ab3ae5a5cfcce55a9db80cf27f44aff70692e3 Parents: 0859e25 Author: Tadayoshi SatoAuthored: Tue Mar 1 22:09:07 2016 +0900 Committer: Claus Ibsen Committed: Fri Mar 4 10:15:23 2016 +0100 -- .../camel/component/jetty/rest/RestJettyDefaultValueTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/99ab3ae5/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/rest/RestJettyDefaultValueTest.java -- diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/rest/RestJettyDefaultValueTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/rest/RestJettyDefaultValueTest.java index 881bd1d..28d07a8 100644 --- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/rest/RestJettyDefaultValueTest.java +++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/rest/RestJettyDefaultValueTest.java @@ -65,7 +65,8 @@ public class RestJettyDefaultValueTest extends BaseJettyTest { if ("true".equals(verbose)) { exchange.getOut().setBody(id + ";Donald Duck;1113 Quack Street Duckburg"); -} if ("false".equals(verbose)) { +} +if ("false".equals(verbose)) { exchange.getOut().setBody(id + ";Donald Duck"); } }
[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); }
[1/6] camel git commit: Fix CS.
Repository: camel Updated Branches: refs/heads/master 0350423d9 -> 0570a6ca3 Fix CS. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/37040b10 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/37040b10 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/37040b10 Branch: refs/heads/master Commit: 37040b10adb4821fe656f506495b20e5b79cb3f7 Parents: 0a25e51 Author: CandleAuthored: Mon Dec 21 14:05:21 2015 + Committer: Claus Ibsen Committed: Thu Dec 24 09:45:31 2015 +0100 -- .../component/aws/ddbstream/ShardList.java | 22 ++- .../StringSequenceNumberConverter.java | 2 +- .../aws/ddbstream/DdbStreamEndpointTest.java| 14 +++ .../ShardListAfterSequenceParametrised.java | 40 ++-- .../ShardListAtSequenceParametrised.java| 40 ++-- .../component/aws/ddbstream/ShardListTest.java | 10 ++--- 6 files changed, 82 insertions(+), 46 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/37040b10/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddbstream/ShardList.java -- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddbstream/ShardList.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddbstream/ShardList.java index 3ae1c4e..0a6e332 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddbstream/ShardList.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddbstream/ShardList.java @@ -16,20 +16,21 @@ */ package org.apache.camel.component.aws.ddbstream; -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; - -import com.amazonaws.services.dynamodbv2.model.Shard; import java.math.BigInteger; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.Comparator; +import java.util.HashMap; import java.util.List; +import java.util.Map; + +import com.amazonaws.services.dynamodbv2.model.Shard; import org.slf4j.Logger; import org.slf4j.LoggerFactory; class ShardList { + private final Logger log = LoggerFactory.getLogger(ShardList.class); private final Map shards = new HashMap<>(); @@ -54,6 +55,8 @@ class ShardList { } Shard first() { +// Potential optimisation: if the two provided sequence numbers are the +// same then we can skip the shard entirely. Need to confirm this with AWS. for (Shard shard : shards.values()) { if (!shards.containsKey(shard.getParentShardId())) { return shard; @@ -99,14 +102,15 @@ class ShardList { } } if (shards.size() > 0) { -return sorted.get(sorted.size()-1); +return sorted.get(sorted.size() - 1); } throw new IllegalStateException("Unable to find a shard with appropriate sequence numbers for " + sequenceNumber + " in " + shards); } /** - * Removes shards that are older than the provided shard. - * Does not remove the provided shard. + * Removes shards that are older than the provided shard. Does not remove + * the provided shard. + * * @param removeBefore */ void removeOlderThan(Shard removeBefore) { @@ -162,4 +166,4 @@ class ShardList { } } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/camel/blob/37040b10/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddbstream/StringSequenceNumberConverter.java -- diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddbstream/StringSequenceNumberConverter.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddbstream/StringSequenceNumberConverter.java index 92bae2b..0048ce0 100644 --- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddbstream/StringSequenceNumberConverter.java +++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddbstream/StringSequenceNumberConverter.java @@ -19,7 +19,7 @@ package org.apache.camel.component.aws.ddbstream; import org.apache.camel.Converter; @Converter -public class StringSequenceNumberConverter { +public final class StringSequenceNumberConverter { private StringSequenceNumberConverter() { } http://git-wip-us.apache.org/repos/asf/camel/blob/37040b10/components/camel-aws/src/test/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpointTest.java -- diff --git
[2/2] 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/4f3ccee4 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4f3ccee4 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4f3ccee4 Branch: refs/heads/master Commit: 4f3ccee409c039647dbc4f0bdbcbbcdacded40ca Parents: b975c30 Author: Jonathan AnsteyAuthored: Wed Sep 2 21:04:51 2015 -0230 Committer: Jonathan Anstey Committed: Wed Sep 2 21:04:51 2015 -0230 -- .../java/org/apache/camel/component/http4/HttpPathTest.java| 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/4f3ccee4/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpPathTest.java -- diff --git a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpPathTest.java b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpPathTest.java index fe6f0f1..465854f 100644 --- a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpPathTest.java +++ b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpPathTest.java @@ -84,8 +84,7 @@ public class HttpPathTest extends BaseHttpTest { @Test public void httpPathHeaderWithStaticQueryParams() throws Exception { -Exchange exchange = template.request("http4://" + localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort() + -"?abc=123", new Processor() { +Exchange exchange = template.request("http4://" + localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort() + "?abc=123", new Processor() { public void process(Exchange exchange) throws Exception { exchange.getIn().setHeader(Exchange.HTTP_PATH, "testWithQueryParams"); } @@ -97,8 +96,7 @@ public class HttpPathTest extends BaseHttpTest { @Test public void httpPathHeaderWithBaseSlashesAndWithStaticQueryParams() throws Exception { -Exchange exchange = template.request("http4://" + localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort() + "/" + -"?abc=123", new Processor() { +Exchange exchange = template.request("http4://" + localServer.getInetAddress().getHostName() + ":" + localServer.getLocalPort() + "/" + "?abc=123", new Processor() { public void process(Exchange exchange) throws Exception { exchange.getIn().setHeader(Exchange.HTTP_PATH, "/testWithQueryParams"); }
[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); }
camel git commit: Fix CS errors
Repository: camel Updated Branches: refs/heads/master 344d1329b - 32b4fd25d 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/32b4fd25 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/32b4fd25 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/32b4fd25 Branch: refs/heads/master Commit: 32b4fd25dee37243762932cbe8c1ca6a683c3f57 Parents: 344d132 Author: Gregor Zurowski gre...@zurowski.org Authored: Fri Mar 20 20:41:06 2015 -0400 Committer: Gregor Zurowski gre...@zurowski.org Committed: Fri Mar 20 20:41:06 2015 -0400 -- .../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/32b4fd25/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); }
[1/5] camel git commit: Fix CS
Repository: camel Updated Branches: refs/heads/master 7ffb70e2b - 4b45630f6 Fix CS Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/38c0a977 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/38c0a977 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/38c0a977 Branch: refs/heads/master Commit: 38c0a9f256708cce50b68937c24d33c5e5db Parents: 3c6769d Author: Jonathan Anstey jans...@gmail.com Authored: Tue Dec 2 17:16:36 2014 -0330 Committer: Jonathan Anstey jans...@gmail.com Committed: Tue Dec 2 17:16:54 2014 -0330 -- .../mail/BatchGoogleMailClientFactory.java | 12 +-- .../google/mail/GoogleMailComponent.java| 18 ++--- .../google/mail/GoogleMailConfiguration.java| 10 +-- .../google/mail/GoogleMailConsumer.java | 8 +- .../google/mail/GoogleMailEndpoint.java | 62 +++ .../google/mail/GoogleMailProducer.java | 5 +- .../mail/AbstractGoogleMailTestSupport.java | 17 ++--- .../google/mail/GmailUsersIntegrationTest.java | 11 +-- .../mail/GmailUsersLabelsIntegrationTest.java | 27 +++ .../mail/GmailUsersMessagesIntegrationTest.java | 80 .../mail/GmailUsersThreadsIntegrationTest.java | 56 ++ parent/pom.xml | 1 + 12 files changed, 128 insertions(+), 179 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/38c0a977/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/BatchGoogleMailClientFactory.java -- diff --git a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/BatchGoogleMailClientFactory.java b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/BatchGoogleMailClientFactory.java index 626d232..ea6b085 100644 --- a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/BatchGoogleMailClientFactory.java +++ b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/BatchGoogleMailClientFactory.java @@ -45,24 +45,20 @@ public class BatchGoogleMailClientFactory implements GoogleMailClientFactory { if (refreshToken != null !.equals(refreshToken)) { credential.setRefreshToken(refreshToken); -} +} if (accessToken != null !.equals(accessToken)) { credential.setAccessToken(accessToken); } return new Gmail.Builder(transport, jsonFactory, credential).setApplicationName(applicationName).build(); } catch (Exception e) { -LOG.error(Could not create Google Drive client., e); +LOG.error(Could not create Google Drive client., e); } return null; } - + // Authorizes the installed application to access user's protected data. private Credential authorize(String clientId, String clientSecret, CollectionString scopes) throws Exception { // authorize -return new GoogleCredential.Builder() -.setJsonFactory(jsonFactory) -.setTransport(transport) -.setClientSecrets(clientId, clientSecret) -.build(); +return new GoogleCredential.Builder().setJsonFactory(jsonFactory).setTransport(transport).setClientSecrets(clientId, clientSecret).build(); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/38c0a977/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java -- diff --git a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java index 4d88110..b19d485 100644 --- a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java +++ b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/GoogleMailComponent.java @@ -16,15 +16,12 @@ */ package org.apache.camel.component.google.mail; - import com.google.api.services.gmail.Gmail; import org.apache.camel.CamelContext; import org.apache.camel.Endpoint; import org.apache.camel.spi.UriEndpoint; import org.apache.camel.util.component.AbstractApiComponent; -import org.apache.camel.component.google.mail.internal.GoogleMailApiCollection; -import org.apache.camel.component.google.mail.internal.GoogleMailApiName; /** * Represents the component that manages {@link GoogleMailEndpoint}. @@ -34,7 +31,7 @@ public class GoogleMailComponent extends