You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2018/09/06 06:51:25 UTC
[camel] 01/02: CAMEL-12777 - Checkstyle issues
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit dbbd7463ede7c610274d1be4f9e7cc4a57774b3f
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Sep 6 08:42:34 2018 +0200
CAMEL-12777 - Checkstyle issues
---
.../main/java/org/apache/camel/builder/BinaryPredicateSupport.java | 4 ++--
.../src/main/java/org/apache/camel/builder/DataFormatClause.java | 2 +-
.../src/main/java/org/apache/camel/builder/PredicateBuilder.java | 4 ++--
.../src/main/java/org/apache/camel/component/bean/MethodInfo.java | 4 ++--
.../java/org/apache/camel/component/binding/BindingComponent.java | 4 ++--
.../java/org/apache/camel/component/binding/BindingEndpoint.java | 4 ++--
.../java/org/apache/camel/component/file/GenericFileComponent.java | 4 ++--
.../src/main/java/org/apache/camel/component/rest/RestEndpoint.java | 4 ++--
.../src/main/java/org/apache/camel/component/rest/RestProducer.java | 6 +++---
.../src/main/java/org/apache/camel/component/stub/StubProducer.java | 6 +++---
.../validator/DefaultValidatorResourceResolverFactory.java | 2 +-
11 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/camel-core/src/main/java/org/apache/camel/builder/BinaryPredicateSupport.java b/camel-core/src/main/java/org/apache/camel/builder/BinaryPredicateSupport.java
index f9bdfab..08dfe6f 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/BinaryPredicateSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/BinaryPredicateSupport.java
@@ -16,13 +16,13 @@
*/
package org.apache.camel.builder;
-import static org.apache.camel.util.ObjectHelper.notNull;
-
import org.apache.camel.BinaryPredicate;
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
import org.apache.camel.Predicate;
+import static org.apache.camel.util.ObjectHelper.notNull;
+
/**
* A useful base class for {@link Predicate} implementations
*
diff --git a/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java b/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
index 8900c4d..15ff70d 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
@@ -20,6 +20,7 @@ import java.nio.charset.Charset;
import java.util.Map;
import java.util.zip.Deflater;
+import org.w3c.dom.Node;
import org.apache.camel.model.DataFormatDefinition;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.dataformat.ASN1DataFormat;
@@ -65,7 +66,6 @@ import org.apache.camel.model.dataformat.ZipDataFormat;
import org.apache.camel.model.dataformat.ZipFileDataFormat;
import org.apache.camel.util.CollectionStringBuffer;
import org.apache.camel.util.jsse.KeyStoreParameters;
-import org.w3c.dom.Node;
/**
* An expression for constructing the different possible {@link org.apache.camel.spi.DataFormat}
diff --git a/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java b/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java
index 94150f4..b0511f8 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.builder;
-import static org.apache.camel.util.ObjectHelper.notNull;
-
import java.util.Arrays;
import java.util.List;
import java.util.regex.Matcher;
@@ -29,6 +27,8 @@ import org.apache.camel.Predicate;
import org.apache.camel.util.ExpressionToPredicateAdapter;
import org.apache.camel.util.ObjectHelper;
+import static org.apache.camel.util.ObjectHelper.notNull;
+
/**
* A helper class for working with predicates
*
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java b/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
index 16d06c6..5fbde08 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.bean;
-import static org.apache.camel.util.ObjectHelper.asString;
-
import java.lang.annotation.Annotation;
import java.lang.reflect.AccessibleObject;
import java.lang.reflect.AnnotatedElement;
@@ -61,6 +59,8 @@ import org.apache.camel.util.StringQuoteHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.camel.util.ObjectHelper.asString;
+
/**
* Information about a method to be used for invocation.
*
diff --git a/camel-core/src/main/java/org/apache/camel/component/binding/BindingComponent.java b/camel-core/src/main/java/org/apache/camel/component/binding/BindingComponent.java
index 517d1eb..b1e8264 100644
--- a/camel-core/src/main/java/org/apache/camel/component/binding/BindingComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/binding/BindingComponent.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.binding;
-import static org.apache.camel.util.CamelContextHelper.getMandatoryEndpoint;
-
import java.util.Map;
import org.apache.camel.CamelContext;
@@ -26,6 +24,8 @@ import org.apache.camel.impl.DefaultComponent;
import org.apache.camel.spi.Binding;
import org.apache.camel.util.ObjectHelper;
+import static org.apache.camel.util.CamelContextHelper.getMandatoryEndpoint;
+
/**
* A composite {@link org.apache.camel.Component} which creates a {@link BindingEndpoint} from a
* configured {@link Binding} instance and using the optional {@link #setUriPrefix(String)}
diff --git a/camel-core/src/main/java/org/apache/camel/component/binding/BindingEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/binding/BindingEndpoint.java
index 466a14e..0af96df 100644
--- a/camel-core/src/main/java/org/apache/camel/component/binding/BindingEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/binding/BindingEndpoint.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.binding;
-import static org.apache.camel.util.CamelContextHelper.getMandatoryEndpoint;
-
import org.apache.camel.CamelContextAware;
import org.apache.camel.Component;
import org.apache.camel.Consumer;
@@ -35,6 +33,8 @@ import org.apache.camel.spi.UriPath;
import org.apache.camel.util.CamelContextHelper;
import org.apache.camel.util.ServiceHelper;
+import static org.apache.camel.util.CamelContextHelper.getMandatoryEndpoint;
+
/**
* The binding component is used for as a of wrapping an Endpoint in a contract with a data format.
*
diff --git a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileComponent.java b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileComponent.java
index 551fea5..4fd9849 100644
--- a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileComponent.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.file;
-import static org.apache.camel.util.ObjectHelper.isNotEmpty;
-
import java.util.Comparator;
import java.util.Iterator;
import java.util.Map;
@@ -32,6 +30,8 @@ import org.apache.camel.util.StringHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.camel.util.ObjectHelper.isNotEmpty;
+
/**
* Base class file component. To be extended.
*/
diff --git a/camel-core/src/main/java/org/apache/camel/component/rest/RestEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/rest/RestEndpoint.java
index 186a6a5..7e63034 100644
--- a/camel-core/src/main/java/org/apache/camel/component/rest/RestEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/rest/RestEndpoint.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.rest;
-import static org.apache.camel.spi.RestProducerFactoryHelper.setupComponent;
-
import java.util.Map;
import java.util.Set;
@@ -43,6 +41,8 @@ import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.camel.spi.RestProducerFactoryHelper.setupComponent;
+
/**
* The rest component is used for either hosting REST services (consumer) or calling external REST services (producer).
*/
diff --git a/camel-core/src/main/java/org/apache/camel/component/rest/RestProducer.java b/camel-core/src/main/java/org/apache/camel/component/rest/RestProducer.java
index 889cea5..83b36cc 100644
--- a/camel-core/src/main/java/org/apache/camel/component/rest/RestProducer.java
+++ b/camel-core/src/main/java/org/apache/camel/component/rest/RestProducer.java
@@ -16,9 +16,6 @@
*/
package org.apache.camel.component.rest;
-import static org.apache.camel.util.ObjectHelper.isEmpty;
-import static org.apache.camel.util.ObjectHelper.isNotEmpty;
-
import java.io.UnsupportedEncodingException;
import java.net.URISyntaxException;
import java.net.URLDecoder;
@@ -49,6 +46,9 @@ import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ServiceHelper;
import org.apache.camel.util.URISupport;
+import static org.apache.camel.util.ObjectHelper.isEmpty;
+import static org.apache.camel.util.ObjectHelper.isNotEmpty;
+
/**
* Rest producer for calling remote REST services.
*/
diff --git a/camel-core/src/main/java/org/apache/camel/component/stub/StubProducer.java b/camel-core/src/main/java/org/apache/camel/component/stub/StubProducer.java
index 582aeb8..43903f9 100644
--- a/camel-core/src/main/java/org/apache/camel/component/stub/StubProducer.java
+++ b/camel-core/src/main/java/org/apache/camel/component/stub/StubProducer.java
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/camel-core/src/main/java/org/apache/camel/component/validator/DefaultValidatorResourceResolverFactory.java b/camel-core/src/main/java/org/apache/camel/component/validator/DefaultValidatorResourceResolverFactory.java
index 68a4169..3d9a5a3 100644
--- a/camel-core/src/main/java/org/apache/camel/component/validator/DefaultValidatorResourceResolverFactory.java
+++ b/camel-core/src/main/java/org/apache/camel/component/validator/DefaultValidatorResourceResolverFactory.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.validator;
-import org.apache.camel.CamelContext;
import org.w3c.dom.ls.LSResourceResolver;
+import org.apache.camel.CamelContext;
/**
* Default resource rsolver factory which instantiates the default resource