This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 1b5131e Fixed CS
1b5131e is described below
commit 1b5131e3069528474cc131737b39739341ef4839
Author: Claus Ibsen <[email protected]>
AuthorDate: Fri Nov 22 21:47:00 2019 +0100
Fixed CS
---
.../org/apache/camel/component/activemq/ActiveMQConfiguration.java | 1 +
.../camel/component/netty/http/handlers/HttpServerChannelHandler.java | 2 +-
.../apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git
a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQConfiguration.java
b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQConfiguration.java
index f168baf..7fc9036 100644
---
a/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQConfiguration.java
+++
b/components/camel-activemq/src/main/java/org/apache/camel/component/activemq/ActiveMQConfiguration.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.activemq;
import java.lang.reflect.Constructor;
+
import javax.jms.ConnectionFactory;
import org.apache.activemq.ActiveMQConnectionFactory;
diff --git
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpServerChannelHandler.java
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpServerChannelHandler.java
index 1bc5d92..f9abb92 100644
---
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpServerChannelHandler.java
+++
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpServerChannelHandler.java
@@ -20,6 +20,7 @@ import java.net.URI;
import java.nio.channels.ClosedChannelException;
import java.nio.charset.Charset;
import java.util.Locale;
+
import javax.security.auth.Subject;
import javax.security.auth.login.LoginException;
@@ -52,7 +53,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static io.netty.handler.codec.http.HttpResponseStatus.BAD_REQUEST;
-import static
io.netty.handler.codec.http.HttpResponseStatus.INTERNAL_SERVER_ERROR;
import static
io.netty.handler.codec.http.HttpResponseStatus.METHOD_NOT_ALLOWED;
import static
io.netty.handler.codec.http.HttpResponseStatus.SERVICE_UNAVAILABLE;
import static io.netty.handler.codec.http.HttpResponseStatus.UNAUTHORIZED;
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
index 488a147..d77f389 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
@@ -751,8 +751,8 @@ public class SpringBootAutoConfigurationMojo extends
AbstractMojo {
// generate inner class for non-primitive options
type = getSimpleJavaType(type);
JavaClass javaClassSource = readJavaType(type);
- boolean isNestedProperty = isValidNestedProperty(model, option) &&
- (isNestedProperty(nestedTypes, javaClassSource) ||
"org.apache.camel.converter.jaxp.XmlConverter".equals(type));
+ boolean isNestedProperty = isValidNestedProperty(model, option)
+ && (isNestedProperty(nestedTypes, javaClassSource) ||
"org.apache.camel.converter.jaxp.XmlConverter".equals(type));
if (isNestedProperty) {
type = packageName + "." + name + "$" +
option.getShortJavaType() + INNER_TYPE_SUFFIX;
}