CAMEL-10650: fix source style
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/aab30b4a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/aab30b4a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/aab30b4a Branch: refs/heads/master Commit: aab30b4aa6225d813c24142d04f09ac652ec3452 Parents: 8471034 Author: Nicola Ferraro <ni.ferr...@gmail.com> Authored: Mon Apr 10 17:59:56 2017 +0200 Committer: Nicola Ferraro <ni.ferr...@gmail.com> Committed: Tue Apr 11 16:04:22 2017 +0200 ---------------------------------------------------------------------- .../GlobalSSLContextParametersSupplier.java | 21 ++++++++++---------- .../component/consul/ConsulConfiguration.java | 2 +- .../groovy/converter/GPathResultConverter.java | 6 ++++-- .../dataformat/AbstractXmlDataFormat.java | 8 +++++--- .../netty/http/NettyHttpGlobalSSLTest.java | 6 +++--- .../boot/CamelConfigurationProperties.java | 2 +- .../CamelSSLConfigurationProperties.java | 2 +- .../camel/component/jetty9/Jetty9SSLTest.java | 4 ++-- 8 files changed, 28 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/aab30b4a/camel-core/src/main/java/org/apache/camel/util/jsse/GlobalSSLContextParametersSupplier.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/util/jsse/GlobalSSLContextParametersSupplier.java b/camel-core/src/main/java/org/apache/camel/util/jsse/GlobalSSLContextParametersSupplier.java index 31c415d..1ae2656 100644 --- a/camel-core/src/main/java/org/apache/camel/util/jsse/GlobalSSLContextParametersSupplier.java +++ b/camel-core/src/main/java/org/apache/camel/util/jsse/GlobalSSLContextParametersSupplier.java @@ -1,17 +1,18 @@ -/* - * Copyright 2016 Red Hat, Inc. - * - * Red Hat 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 +/** + * 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 + * 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. + * 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. */ package org.apache.camel.util.jsse; http://git-wip-us.apache.org/repos/asf/camel/blob/aab30b4a/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulConfiguration.java b/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulConfiguration.java index f28e9f4..06d270f 100644 --- a/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulConfiguration.java +++ b/components/camel-consul/src/main/java/org/apache/camel/component/consul/ConsulConfiguration.java @@ -49,7 +49,7 @@ public class ConsulConfiguration implements CamelContextAware, Cloneable { @UriParam(label = "security") private SSLContextParameters sslContextParameters; @UriParam(label = "security", defaultValue = "false") - private boolean useGlobalSslContextParameters = false; + private boolean useGlobalSslContextParameters; @UriParam(label = "security", secret = true) private String aclToken; @UriParam(label = "security", secret = true) http://git-wip-us.apache.org/repos/asf/camel/blob/aab30b4a/components/camel-groovy-dsl/src/main/java/org/apache/camel/groovy/converter/GPathResultConverter.java ---------------------------------------------------------------------- diff --git a/components/camel-groovy-dsl/src/main/java/org/apache/camel/groovy/converter/GPathResultConverter.java b/components/camel-groovy-dsl/src/main/java/org/apache/camel/groovy/converter/GPathResultConverter.java index fdf4971..94b989e 100644 --- a/components/camel-groovy-dsl/src/main/java/org/apache/camel/groovy/converter/GPathResultConverter.java +++ b/components/camel-groovy-dsl/src/main/java/org/apache/camel/groovy/converter/GPathResultConverter.java @@ -20,14 +20,16 @@ import java.io.IOException; import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.TransformerException; +import org.w3c.dom.Node; +import org.xml.sax.SAXException; + import groovy.util.XmlSlurper; import groovy.util.slurpersupport.GPathResult; + import org.apache.camel.Converter; import org.apache.camel.Exchange; import org.apache.camel.StringSource; import org.apache.camel.converter.jaxp.XmlConverter; -import org.w3c.dom.Node; -import org.xml.sax.SAXException; @Converter public class GPathResultConverter { http://git-wip-us.apache.org/repos/asf/camel/blob/aab30b4a/components/camel-groovy-dsl/src/main/java/org/apache/camel/groovy/dataformat/AbstractXmlDataFormat.java ---------------------------------------------------------------------- diff --git a/components/camel-groovy-dsl/src/main/java/org/apache/camel/groovy/dataformat/AbstractXmlDataFormat.java b/components/camel-groovy-dsl/src/main/java/org/apache/camel/groovy/dataformat/AbstractXmlDataFormat.java index b2b921e..9202059 100644 --- a/components/camel-groovy-dsl/src/main/java/org/apache/camel/groovy/dataformat/AbstractXmlDataFormat.java +++ b/components/camel-groovy-dsl/src/main/java/org/apache/camel/groovy/dataformat/AbstractXmlDataFormat.java @@ -19,14 +19,16 @@ package org.apache.camel.groovy.dataformat; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; +import org.xml.sax.ErrorHandler; +import org.xml.sax.SAXException; +import org.xml.sax.SAXParseException; + import groovy.xml.FactorySupport; + import org.apache.camel.spi.DataFormat; import org.apache.camel.support.ServiceSupport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.xml.sax.ErrorHandler; -import org.xml.sax.SAXException; -import org.xml.sax.SAXParseException; /** * Common attributes and methods for XmlParser and XmlSlurper usage. http://git-wip-us.apache.org/repos/asf/camel/blob/aab30b4a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpGlobalSSLTest.java ---------------------------------------------------------------------- diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpGlobalSSLTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpGlobalSSLTest.java index 180b463..760e836 100644 --- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpGlobalSSLTest.java +++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpGlobalSSLTest.java @@ -94,9 +94,9 @@ public class NettyHttpGlobalSSLTest extends CamelTestSupport { return new RouteBuilder() { @Override public void configure() throws Exception { - from("netty-http:https://localhost:"; + port +"?ssl=true") - .to("mock:input") - .transform().simple("Bye World"); + from("netty-http:https://localhost:"; + port + "?ssl=true") + .to("mock:input") + .transform().simple("Bye World"); } }; } http://git-wip-us.apache.org/repos/asf/camel/blob/aab30b4a/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 86b5470..55562ef 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 @@ -256,7 +256,7 @@ public class CamelConfigurationProperties { * * Default is false. */ - private boolean logMask = false; + private boolean logMask; /** * Sets whether to log exhausted message body with message history. http://git-wip-us.apache.org/repos/asf/camel/blob/aab30b4a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/security/CamelSSLConfigurationProperties.java ---------------------------------------------------------------------- diff --git a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/security/CamelSSLConfigurationProperties.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/security/CamelSSLConfigurationProperties.java index cf79558..7a5d6b6 100644 --- a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/security/CamelSSLConfigurationProperties.java +++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/security/CamelSSLConfigurationProperties.java @@ -26,7 +26,7 @@ public class CamelSSLConfigurationProperties { /** * Enable the global ssl configuration in Camel. */ - private boolean enabled = false; + private boolean enabled; /** * The Camel global SSL configuration http://git-wip-us.apache.org/repos/asf/camel/blob/aab30b4a/platforms/spring-boot/components-starter/camel-jetty9-starter/src/test/java/org/apache/camel/component/jetty9/Jetty9SSLTest.java ---------------------------------------------------------------------- diff --git a/platforms/spring-boot/components-starter/camel-jetty9-starter/src/test/java/org/apache/camel/component/jetty9/Jetty9SSLTest.java b/platforms/spring-boot/components-starter/camel-jetty9-starter/src/test/java/org/apache/camel/component/jetty9/Jetty9SSLTest.java index c3fc384..57c496b 100644 --- a/platforms/spring-boot/components-starter/camel-jetty9-starter/src/test/java/org/apache/camel/component/jetty9/Jetty9SSLTest.java +++ b/platforms/spring-boot/components-starter/camel-jetty9-starter/src/test/java/org/apache/camel/component/jetty9/Jetty9SSLTest.java @@ -54,11 +54,11 @@ import static org.junit.Assert.assertEquals; }) public class Jetty9SSLTest { + private static int port; + @Autowired private ProducerTemplate producerTemplate; - private static int port; - @BeforeClass public static void init() { port = AvailablePortFinder.getNextAvailable();
