This is an automated email from the ASF dual-hosted git repository. aldettinger 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 444021a CAMEL-12816: CS fixes 444021a is described below commit 444021a9337484ba18b59cd910382c8018c77393 Author: aldettinger <aldettin...@gmail.com> AuthorDate: Thu Sep 20 19:50:37 2018 +0200 CAMEL-12816: CS fixes --- camel-core/src/main/java/org/apache/camel/processor/Throttler.java | 2 +- .../org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java | 2 +- .../apache/camel/component/elasticsearch5/ElasticsearchBaseTest.java | 2 -- .../camel/component/elasticsearch5/ElasticsearchClusterBaseTest.java | 2 -- .../idempotent/hazelcast/HazelcastIdempotentRepositoryTest.java | 5 ++--- .../camel/example/ExplicitEncodingAndXMLCharFilteringTest.java | 3 +-- .../test/java/org/apache/camel/example/ExplicitFileEncodingTest.java | 3 +-- .../java/org/apache/camel/component/validator/jing/JingEndpoint.java | 3 +-- .../apache/camel/processor/jpa/JpaRouteSharedEntityManagerTest.java | 3 +-- .../org/apache/camel/processor/jpa/JpaRouteSkipLockedEntityTest.java | 3 +-- .../src/test/java/org/apache/camel/jsonpath/JsonPathSourceTest.java | 2 -- .../java/org/apache/camel/component/olingo4/Olingo4AppAPITest.java | 2 -- .../test/spring/CamelSpringRouteProcessorDumpRouteCoverageTest.java | 2 -- .../camel-test/src/main/java/org/apache/camel/test/TestSupport.java | 1 + .../src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java | 1 + .../org/apache/camel/test/patterns/DebugNoLazyTypeConverterTest.java | 1 - .../src/test/java/org/apache/camel/test/patterns/DebugTest.java | 3 +-- .../java/org/apache/camel/test/patterns/IsMockEndpointsFileTest.java | 3 +-- .../java/org/apache/camel/test/patterns/IsMockEndpointsTest.java | 1 - .../camel/test/patterns/RouteBuilderConfigureExceptionTest.java | 3 +-- .../camel/test/patterns/RouteProcessorDumpRouteCoverageTest.java | 3 +-- .../org/apache/camel/component/urlrewrite/BaseUrlRewriteTest.java | 1 - .../camel/example/reportincident/ReportIncidentRoutesTest.java | 3 --- .../example/camel/transport/CamelTransportClientServerTest.java | 3 --- .../org/apache/camel/example/cxf/jaxrs/JAXRSClientServerTest.java | 4 +--- .../java/org/apache/camel/example/guice/jms/IntegrationTest.java | 5 ++--- .../src/test/java/org/apache/camel/loanbroker/LoanBrokerWSTest.java | 2 -- .../camel/example/reportincident/ReportIncidentRoutesTest.java | 2 -- .../camel/example/reportincident/ReportIncidentRoutesTest.java | 2 -- .../org/apache/camel/example/SpringJmsClientRemotingServerTest.java | 3 --- .../java/org/apache/camel/example/SpringJmsClientServerTest.java | 2 -- .../test/java/org/apache/camel/example/spring/IntegrationTest.java | 5 ++--- .../org/apache/camel/catalog/maven/MavenArtifactProviderTest.java | 2 +- .../java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java | 2 +- .../catalog/nexus/LocalNexusComponentCatalogRepositoryTest.java | 2 +- .../camel/catalog/nexus/LocalNexusConnectorRepositoryTest.java | 2 +- .../org/apache/camel/catalog/karaf/KarafRuntimeProviderTest.java | 1 - .../camel/catalog/springboot/SpringBootRuntimeProviderTest.java | 2 -- .../test/java/org/apache/camel/component/jetty9/Jetty9SSLTest.java | 1 - .../java/org/apache/camel/component/undertow/UndertowSSLTest.java | 1 - .../camel/test/cxf/blueprint/CxfPayloadProviderRouterTest.java | 3 --- .../apache/camel/itest/standalone/CamelContextStandaloneTest.java | 5 ++--- .../src/test/java/org/apache/camel/itest/CamelJmsTestHelper.java | 1 + .../itest/customerrelations/CustomerServicesWsAddressingTest.java | 1 - .../ftp/FtpAndHttpRecipientListInterceptSendToEndpointIssueTest.java | 4 +--- .../org/apache/camel/itest/ftp/FtpInitialConnectTimeoutTest.java | 1 + .../src/test/java/org/apache/camel/itest/ftp/FtpXQueryTest.java | 4 +--- .../org/apache/camel/itest/greeter/CamelFileGreeterOneWayTest.java | 3 --- .../java/org/apache/camel/itest/greeter/CamelGreeterFileDomTest.java | 4 +--- .../test/java/org/apache/camel/itest/greeter/CamelGreeterTest.java | 3 --- .../src/test/java/org/apache/camel/itest/http/Http4EndpointTest.java | 3 --- .../org/apache/camel/itest/http/Http4MaxConnectionPerHostTest.java | 3 --- .../src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java | 1 - .../src/test/java/org/apache/camel/itest/jms/JmsIntegrationTest.java | 1 + .../src/test/java/org/apache/camel/itest/jms/JmsJettyAsyncTest.java | 1 + .../src/test/java/org/apache/camel/itest/jms/JmsPerformanceTest.java | 1 + .../src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java | 1 + .../src/test/java/org/apache/camel/itest/jms/PurchaseOrder.java | 1 + .../org/apache/camel/itest/netty/NettyAsyncRequestReplyTest.java | 1 + .../apache/camel/itest/quartz/FtpCronScheduledRoutePolicyTest.java | 5 ++--- .../test/java/org/apache/camel/itest/security/GreeterClientTest.java | 1 - .../src/test/java/org/apache/camel/itest/shiro/ShiroOverJmsTest.java | 1 + .../camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsXaTest.java | 1 - .../java/org/apache/camel/json/simple/JsonSimpleOrderedTest.java | 2 +- 64 files changed, 41 insertions(+), 106 deletions(-) diff --git a/camel-core/src/main/java/org/apache/camel/processor/Throttler.java b/camel-core/src/main/java/org/apache/camel/processor/Throttler.java index b57ff1b..d1bd9e5 100644 --- a/camel-core/src/main/java/org/apache/camel/processor/Throttler.java +++ b/camel-core/src/main/java/org/apache/camel/processor/Throttler.java @@ -254,7 +254,7 @@ public class Throttler extends DelegateAsyncProcessor implements Traceable, IdAw private final String key; private final DelayQueue<ThrottlePermit> delayQueue = new DelayQueue<>(); private final AtomicReference<ScheduledFuture<?>> cleanFuture = new AtomicReference<>(); - private volatile int throttleRate = 0; + private volatile int throttleRate; ThrottlingState(String key) { this.key = key; diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java index 34fb04c..3aa8fe0 100644 --- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java +++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java @@ -201,7 +201,7 @@ public class BindyFixedLengthFactory extends BindyAbstractFactory implements Bin // skip ahead if the expected position is greater than the offset if (dataField.pos() > offset) { - LOG.debug("skipping ahead [{}] chars.", (dataField.pos() - offset)); + LOG.debug("skipping ahead [{}] chars.", dataField.pos() - offset); offset = dataField.pos(); } diff --git a/components/camel-elasticsearch5/src/test/java/org/apache/camel/component/elasticsearch5/ElasticsearchBaseTest.java b/components/camel-elasticsearch5/src/test/java/org/apache/camel/component/elasticsearch5/ElasticsearchBaseTest.java index 1876855..9230b81 100644 --- a/components/camel-elasticsearch5/src/test/java/org/apache/camel/component/elasticsearch5/ElasticsearchBaseTest.java +++ b/components/camel-elasticsearch5/src/test/java/org/apache/camel/component/elasticsearch5/ElasticsearchBaseTest.java @@ -15,8 +15,6 @@ * limitations under the License. */ package org.apache.camel.component.elasticsearch5; -import org.junit.Before; -import org.junit.After; import java.io.IOException; import java.net.InetAddress; diff --git a/components/camel-elasticsearch5/src/test/java/org/apache/camel/component/elasticsearch5/ElasticsearchClusterBaseTest.java b/components/camel-elasticsearch5/src/test/java/org/apache/camel/component/elasticsearch5/ElasticsearchClusterBaseTest.java index b3e3ff1..cadc99c 100644 --- a/components/camel-elasticsearch5/src/test/java/org/apache/camel/component/elasticsearch5/ElasticsearchClusterBaseTest.java +++ b/components/camel-elasticsearch5/src/test/java/org/apache/camel/component/elasticsearch5/ElasticsearchClusterBaseTest.java @@ -15,8 +15,6 @@ * limitations under the License. */ package org.apache.camel.component.elasticsearch5; -import org.junit.Before; -import org.junit.After; import java.net.InetAddress; import java.util.HashMap; diff --git a/components/camel-hazelcast/src/test/java/org/apache/camel/processor/idempotent/hazelcast/HazelcastIdempotentRepositoryTest.java b/components/camel-hazelcast/src/test/java/org/apache/camel/processor/idempotent/hazelcast/HazelcastIdempotentRepositoryTest.java index d107456..f4701f5 100644 --- a/components/camel-hazelcast/src/test/java/org/apache/camel/processor/idempotent/hazelcast/HazelcastIdempotentRepositoryTest.java +++ b/components/camel-hazelcast/src/test/java/org/apache/camel/processor/idempotent/hazelcast/HazelcastIdempotentRepositoryTest.java @@ -15,15 +15,14 @@ * limitations under the License. */ package org.apache.camel.processor.idempotent.hazelcast; -import org.junit.Before; -import org.junit.After; - import com.hazelcast.core.Hazelcast; import com.hazelcast.core.HazelcastInstance; import com.hazelcast.core.IMap; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.junit4.CamelTestSupport; +import org.junit.After; +import org.junit.Before; import org.junit.Test; public class HazelcastIdempotentRepositoryTest extends CamelTestSupport { diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/example/ExplicitEncodingAndXMLCharFilteringTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/example/ExplicitEncodingAndXMLCharFilteringTest.java index 0fde24e..0452eac 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/example/ExplicitEncodingAndXMLCharFilteringTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/example/ExplicitEncodingAndXMLCharFilteringTest.java @@ -15,8 +15,6 @@ * limitations under the License. */ package org.apache.camel.example; -import org.junit.Before; - import java.io.FileInputStream; import java.io.InputStream; import java.io.InputStreamReader; @@ -29,6 +27,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.jaxb.JaxbDataFormat; import org.apache.camel.test.junit4.CamelTestSupport; +import org.junit.Before; import org.junit.Test; diff --git a/components/camel-jaxb/src/test/java/org/apache/camel/example/ExplicitFileEncodingTest.java b/components/camel-jaxb/src/test/java/org/apache/camel/example/ExplicitFileEncodingTest.java index f455445..dd5fee7 100644 --- a/components/camel-jaxb/src/test/java/org/apache/camel/example/ExplicitFileEncodingTest.java +++ b/components/camel-jaxb/src/test/java/org/apache/camel/example/ExplicitFileEncodingTest.java @@ -15,8 +15,6 @@ * limitations under the License. */ package org.apache.camel.example; -import org.junit.Before; - import java.io.File; import javax.xml.bind.JAXBContext; @@ -26,6 +24,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.converter.jaxb.JaxbDataFormat; import org.apache.camel.test.junit4.CamelTestSupport; +import org.junit.Before; import org.junit.Test; /** diff --git a/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingEndpoint.java b/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingEndpoint.java index d5c2895..3a1aca2 100644 --- a/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingEndpoint.java +++ b/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingEndpoint.java @@ -18,13 +18,11 @@ package org.apache.camel.component.validator.jing; import java.io.InputStream; -import org.apache.camel.util.StringHelper; import org.xml.sax.InputSource; import com.thaiopensource.relaxng.SchemaFactory; import com.thaiopensource.validate.Schema; import com.thaiopensource.xml.sax.Jaxp11XMLReaderCreator; - import org.apache.camel.Component; import org.apache.camel.Consumer; import org.apache.camel.Processor; @@ -35,6 +33,7 @@ import org.apache.camel.spi.UriEndpoint; import org.apache.camel.spi.UriParam; import org.apache.camel.spi.UriPath; import org.apache.camel.util.ResourceHelper; +import org.apache.camel.util.StringHelper; /** * Validates the payload of a message using RelaxNG Syntax using Jing library. diff --git a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteSharedEntityManagerTest.java b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteSharedEntityManagerTest.java index 09d9227..e0658d5 100644 --- a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteSharedEntityManagerTest.java +++ b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteSharedEntityManagerTest.java @@ -15,8 +15,6 @@ * limitations under the License. */ package org.apache.camel.processor.jpa; -import org.junit.Before; - import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -29,6 +27,7 @@ import org.apache.camel.examples.SendEmail; import org.apache.camel.spring.SpringRouteBuilder; import org.apache.camel.util.ObjectHelper; import org.junit.Assume; +import org.junit.Before; import org.junit.Test; import org.springframework.context.expression.BeanFactoryResolver; import org.springframework.expression.Expression; diff --git a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteSkipLockedEntityTest.java b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteSkipLockedEntityTest.java index 3d1ccde..f2e59b5 100644 --- a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteSkipLockedEntityTest.java +++ b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaRouteSkipLockedEntityTest.java @@ -15,8 +15,6 @@ * limitations under the License. */ package org.apache.camel.processor.jpa; -import org.junit.Before; - import java.sql.Connection; import java.sql.SQLException; import java.util.List; @@ -27,6 +25,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.examples.VersionedItem; import org.apache.camel.spring.SpringRouteBuilder; +import org.junit.Before; import org.junit.Ignore; import org.junit.Test; diff --git a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSourceTest.java b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSourceTest.java index cfeeafd..58acb65 100644 --- a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSourceTest.java +++ b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSourceTest.java @@ -15,8 +15,6 @@ * limitations under the License. */ package org.apache.camel.jsonpath; -import org.junit.After; - import java.io.File; import java.lang.reflect.Field; import java.nio.charset.Charset; diff --git a/components/camel-olingo4/camel-olingo4-api/src/test/java/org/apache/camel/component/olingo4/Olingo4AppAPITest.java b/components/camel-olingo4/camel-olingo4-api/src/test/java/org/apache/camel/component/olingo4/Olingo4AppAPITest.java index 6ffe62f..5050996 100644 --- a/components/camel-olingo4/camel-olingo4-api/src/test/java/org/apache/camel/component/olingo4/Olingo4AppAPITest.java +++ b/components/camel-olingo4/camel-olingo4-api/src/test/java/org/apache/camel/component/olingo4/Olingo4AppAPITest.java @@ -15,8 +15,6 @@ * limitations under the License. */ package org.apache.camel.component.olingo4; -import org.junit.Before; -import org.junit.After; import java.io.IOException; import java.io.InputStream; diff --git a/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringRouteProcessorDumpRouteCoverageTest.java b/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringRouteProcessorDumpRouteCoverageTest.java index e6a6a74..c8d0d25 100644 --- a/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringRouteProcessorDumpRouteCoverageTest.java +++ b/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringRouteProcessorDumpRouteCoverageTest.java @@ -15,8 +15,6 @@ * limitations under the License. */ package org.apache.camel.test.spring; -import org.junit.Before; - import java.io.File; import org.apache.camel.management.ManagedManagementStrategy; diff --git a/components/camel-test/src/main/java/org/apache/camel/test/TestSupport.java b/components/camel-test/src/main/java/org/apache/camel/test/TestSupport.java index c13213a..b5c3dc3 100644 --- a/components/camel-test/src/main/java/org/apache/camel/test/TestSupport.java +++ b/components/camel-test/src/main/java/org/apache/camel/test/TestSupport.java @@ -22,6 +22,7 @@ import java.util.List; import java.util.Locale; import junit.framework.TestCase; + import org.apache.camel.CamelContext; import org.apache.camel.Channel; import org.apache.camel.Endpoint; diff --git a/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java b/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java index c77687c..203a8fb 100644 --- a/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java +++ b/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java @@ -34,6 +34,7 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; + import javax.management.AttributeNotFoundException; import javax.management.InstanceNotFoundException; import javax.management.MBeanException; diff --git a/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugNoLazyTypeConverterTest.java b/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugNoLazyTypeConverterTest.java index 53bf53d..3eccece 100644 --- a/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugNoLazyTypeConverterTest.java +++ b/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugNoLazyTypeConverterTest.java @@ -21,7 +21,6 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.model.ProcessorDefinition; import org.apache.camel.test.junit4.CamelTestSupport; - import org.junit.Test; /** diff --git a/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugTest.java b/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugTest.java index 935bc10..a119058 100644 --- a/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugTest.java +++ b/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugTest.java @@ -16,13 +16,12 @@ */ package org.apache.camel.test.patterns; -import org.junit.Test; - import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.model.ProcessorDefinition; import org.apache.camel.test.junit4.CamelTestSupport; +import org.junit.Test; /** * @version diff --git a/components/camel-test/src/test/java/org/apache/camel/test/patterns/IsMockEndpointsFileTest.java b/components/camel-test/src/test/java/org/apache/camel/test/patterns/IsMockEndpointsFileTest.java index 98db2c3..0868984 100644 --- a/components/camel-test/src/test/java/org/apache/camel/test/patterns/IsMockEndpointsFileTest.java +++ b/components/camel-test/src/test/java/org/apache/camel/test/patterns/IsMockEndpointsFileTest.java @@ -15,12 +15,11 @@ * limitations under the License. */ package org.apache.camel.test.patterns; -import org.junit.Before; - import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.junit4.CamelTestSupport; +import org.junit.Before; import org.junit.Test; /** diff --git a/components/camel-test/src/test/java/org/apache/camel/test/patterns/IsMockEndpointsTest.java b/components/camel-test/src/test/java/org/apache/camel/test/patterns/IsMockEndpointsTest.java index 88a39e4..ed3b285 100644 --- a/components/camel-test/src/test/java/org/apache/camel/test/patterns/IsMockEndpointsTest.java +++ b/components/camel-test/src/test/java/org/apache/camel/test/patterns/IsMockEndpointsTest.java @@ -18,7 +18,6 @@ package org.apache.camel.test.patterns; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.junit4.CamelTestSupport; - import org.junit.Test; /** diff --git a/components/camel-test/src/test/java/org/apache/camel/test/patterns/RouteBuilderConfigureExceptionTest.java b/components/camel-test/src/test/java/org/apache/camel/test/patterns/RouteBuilderConfigureExceptionTest.java index fea3908..0998155 100644 --- a/components/camel-test/src/test/java/org/apache/camel/test/patterns/RouteBuilderConfigureExceptionTest.java +++ b/components/camel-test/src/test/java/org/apache/camel/test/patterns/RouteBuilderConfigureExceptionTest.java @@ -15,11 +15,10 @@ * limitations under the License. */ package org.apache.camel.test.patterns; -import org.junit.Before; - import org.apache.camel.Predicate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.junit4.CamelTestSupport; +import org.junit.Before; import org.junit.Test; public class RouteBuilderConfigureExceptionTest extends CamelTestSupport { diff --git a/components/camel-test/src/test/java/org/apache/camel/test/patterns/RouteProcessorDumpRouteCoverageTest.java b/components/camel-test/src/test/java/org/apache/camel/test/patterns/RouteProcessorDumpRouteCoverageTest.java index 3f4a001..733259a 100644 --- a/components/camel-test/src/test/java/org/apache/camel/test/patterns/RouteProcessorDumpRouteCoverageTest.java +++ b/components/camel-test/src/test/java/org/apache/camel/test/patterns/RouteProcessorDumpRouteCoverageTest.java @@ -15,11 +15,10 @@ * limitations under the License. */ package org.apache.camel.test.patterns; -import org.junit.After; - import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.test.junit4.CamelTestSupport; +import org.junit.After; import org.junit.Test; public class RouteProcessorDumpRouteCoverageTest extends CamelTestSupport { diff --git a/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/BaseUrlRewriteTest.java b/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/BaseUrlRewriteTest.java index 220976a..923d87f 100644 --- a/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/BaseUrlRewriteTest.java +++ b/components/camel-urlrewrite/src/test/java/org/apache/camel/component/urlrewrite/BaseUrlRewriteTest.java @@ -15,7 +15,6 @@ * limitations under the License. */ package org.apache.camel.component.urlrewrite; -import org.junit.Before; import java.util.Properties; import java.util.concurrent.atomic.AtomicInteger; diff --git a/examples/camel-example-cxf-proxy/src/test/java/org/apache/camel/example/reportincident/ReportIncidentRoutesTest.java b/examples/camel-example-cxf-proxy/src/test/java/org/apache/camel/example/reportincident/ReportIncidentRoutesTest.java index b92e4c4..6289b3c 100644 --- a/examples/camel-example-cxf-proxy/src/test/java/org/apache/camel/example/reportincident/ReportIncidentRoutesTest.java +++ b/examples/camel-example-cxf-proxy/src/test/java/org/apache/camel/example/reportincident/ReportIncidentRoutesTest.java @@ -15,9 +15,6 @@ * limitations under the License. */ package org.apache.camel.example.reportincident; -import org.junit.Before; -import org.junit.After; - import java.io.File; import java.io.FileOutputStream; diff --git a/examples/camel-example-cxf/src/test/java/org/apache/camel/example/camel/transport/CamelTransportClientServerTest.java b/examples/camel-example-cxf/src/test/java/org/apache/camel/example/camel/transport/CamelTransportClientServerTest.java index 67259e7..e0bb516 100644 --- a/examples/camel-example-cxf/src/test/java/org/apache/camel/example/camel/transport/CamelTransportClientServerTest.java +++ b/examples/camel-example-cxf/src/test/java/org/apache/camel/example/camel/transport/CamelTransportClientServerTest.java @@ -15,9 +15,6 @@ * limitations under the License. */ package org.apache.camel.example.camel.transport; -import org.junit.Before; -import org.junit.After; - import java.net.MalformedURLException; import org.apache.camel.test.AvailablePortFinder; diff --git a/examples/camel-example-cxf/src/test/java/org/apache/camel/example/cxf/jaxrs/JAXRSClientServerTest.java b/examples/camel-example-cxf/src/test/java/org/apache/camel/example/cxf/jaxrs/JAXRSClientServerTest.java index afc0bd1..f64cbf3 100644 --- a/examples/camel-example-cxf/src/test/java/org/apache/camel/example/cxf/jaxrs/JAXRSClientServerTest.java +++ b/examples/camel-example-cxf/src/test/java/org/apache/camel/example/cxf/jaxrs/JAXRSClientServerTest.java @@ -15,15 +15,13 @@ * limitations under the License. */ package org.apache.camel.example.cxf.jaxrs; -import org.junit.Before; -import org.junit.After; - import org.apache.camel.example.cxf.jaxrs.resources.Book; import org.apache.camel.example.cxf.jaxrs.resources.BookNotFoundFault; import org.apache.camel.example.cxf.jaxrs.resources.BookStore; import org.apache.camel.test.AvailablePortFinder; import org.apache.camel.test.spring.CamelSpringTestSupport; import org.apache.cxf.BusFactory; +import org.junit.After; import org.junit.BeforeClass; import org.junit.Test; import org.springframework.context.support.AbstractXmlApplicationContext; diff --git a/examples/camel-example-guice-jms/src/test/java/org/apache/camel/example/guice/jms/IntegrationTest.java b/examples/camel-example-guice-jms/src/test/java/org/apache/camel/example/guice/jms/IntegrationTest.java index ce5ef35..2badd48 100644 --- a/examples/camel-example-guice-jms/src/test/java/org/apache/camel/example/guice/jms/IntegrationTest.java +++ b/examples/camel-example-guice-jms/src/test/java/org/apache/camel/example/guice/jms/IntegrationTest.java @@ -16,10 +16,9 @@ */ package org.apache.camel.example.guice.jms; -import org.junit.Test; - -import org.junit.Assert; import org.apache.camel.guice.Main; +import org.junit.Assert; +import org.junit.Test; /** * @version diff --git a/examples/camel-example-loan-broker-cxf/src/test/java/org/apache/camel/loanbroker/LoanBrokerWSTest.java b/examples/camel-example-loan-broker-cxf/src/test/java/org/apache/camel/loanbroker/LoanBrokerWSTest.java index bca8644..914cae8 100644 --- a/examples/camel-example-loan-broker-cxf/src/test/java/org/apache/camel/loanbroker/LoanBrokerWSTest.java +++ b/examples/camel-example-loan-broker-cxf/src/test/java/org/apache/camel/loanbroker/LoanBrokerWSTest.java @@ -15,8 +15,6 @@ * limitations under the License. */ package org.apache.camel.loanbroker; -import org.junit.Before; - import java.io.File; import java.io.FileOutputStream; diff --git a/examples/camel-example-reportincident-wssecurity/src/test/java/org/apache/camel/example/reportincident/ReportIncidentRoutesTest.java b/examples/camel-example-reportincident-wssecurity/src/test/java/org/apache/camel/example/reportincident/ReportIncidentRoutesTest.java index c1ef7dd..93f9fe0 100644 --- a/examples/camel-example-reportincident-wssecurity/src/test/java/org/apache/camel/example/reportincident/ReportIncidentRoutesTest.java +++ b/examples/camel-example-reportincident-wssecurity/src/test/java/org/apache/camel/example/reportincident/ReportIncidentRoutesTest.java @@ -15,8 +15,6 @@ * limitations under the License. */ package org.apache.camel.example.reportincident; -import org.junit.Before; - import java.io.File; import java.io.FileOutputStream; import java.util.ArrayList; diff --git a/examples/camel-example-reportincident/src/test/java/org/apache/camel/example/reportincident/ReportIncidentRoutesTest.java b/examples/camel-example-reportincident/src/test/java/org/apache/camel/example/reportincident/ReportIncidentRoutesTest.java index dd7d314..e1119ff 100644 --- a/examples/camel-example-reportincident/src/test/java/org/apache/camel/example/reportincident/ReportIncidentRoutesTest.java +++ b/examples/camel-example-reportincident/src/test/java/org/apache/camel/example/reportincident/ReportIncidentRoutesTest.java @@ -15,8 +15,6 @@ * limitations under the License. */ package org.apache.camel.example.reportincident; -import org.junit.Before; - import java.io.File; import java.io.FileOutputStream; diff --git a/examples/camel-example-spring-jms/src/test/java/org/apache/camel/example/SpringJmsClientRemotingServerTest.java b/examples/camel-example-spring-jms/src/test/java/org/apache/camel/example/SpringJmsClientRemotingServerTest.java index f014e76..44e854d 100644 --- a/examples/camel-example-spring-jms/src/test/java/org/apache/camel/example/SpringJmsClientRemotingServerTest.java +++ b/examples/camel-example-spring-jms/src/test/java/org/apache/camel/example/SpringJmsClientRemotingServerTest.java @@ -15,9 +15,6 @@ * limitations under the License. */ package org.apache.camel.example; -import org.junit.Before; -import org.junit.After; - import java.io.File; import java.io.FileOutputStream; diff --git a/examples/camel-example-spring-jms/src/test/java/org/apache/camel/example/SpringJmsClientServerTest.java b/examples/camel-example-spring-jms/src/test/java/org/apache/camel/example/SpringJmsClientServerTest.java index 63f4be0..fc9890b 100644 --- a/examples/camel-example-spring-jms/src/test/java/org/apache/camel/example/SpringJmsClientServerTest.java +++ b/examples/camel-example-spring-jms/src/test/java/org/apache/camel/example/SpringJmsClientServerTest.java @@ -15,8 +15,6 @@ * limitations under the License. */ package org.apache.camel.example; -import org.junit.Before; - import java.io.File; import java.io.FileOutputStream; diff --git a/examples/camel-example-spring/src/test/java/org/apache/camel/example/spring/IntegrationTest.java b/examples/camel-example-spring/src/test/java/org/apache/camel/example/spring/IntegrationTest.java index 8a843a5..60255d7 100644 --- a/examples/camel-example-spring/src/test/java/org/apache/camel/example/spring/IntegrationTest.java +++ b/examples/camel-example-spring/src/test/java/org/apache/camel/example/spring/IntegrationTest.java @@ -16,10 +16,9 @@ */ package org.apache.camel.example.spring; -import org.junit.Test; - -import org.junit.Assert; import org.apache.camel.spring.Main; +import org.junit.Assert; +import org.junit.Test; /** * @version diff --git a/platforms/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenArtifactProviderTest.java b/platforms/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenArtifactProviderTest.java index 6b0d00c..3a94c21 100644 --- a/platforms/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenArtifactProviderTest.java +++ b/platforms/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenArtifactProviderTest.java @@ -19,12 +19,12 @@ package org.apache.camel.catalog.maven; import java.util.List; import java.util.Set; -import org.junit.Assert; import org.apache.camel.catalog.CamelCatalog; import org.apache.camel.catalog.DefaultCamelCatalog; import org.apache.camel.catalog.connector.CamelConnectorCatalog; import org.apache.camel.catalog.connector.ConnectorDto; import org.apache.camel.catalog.connector.DefaultCamelConnectorCatalog; +import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git a/platforms/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java b/platforms/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java index 0ae4c2f..7a20707 100644 --- a/platforms/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java +++ b/platforms/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java @@ -19,12 +19,12 @@ package org.apache.camel.catalog.maven; import java.io.InputStream; import java.util.List; -import org.junit.Assert; import org.apache.camel.catalog.CamelCatalog; import org.apache.camel.catalog.CatalogHelper; import org.apache.camel.catalog.DefaultCamelCatalog; import org.apache.camel.catalog.karaf.KarafRuntimeProvider; import org.apache.camel.catalog.springboot.SpringBootRuntimeProvider; +import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git a/platforms/camel-catalog-nexus/src/test/java/org/apache/camel/catalog/nexus/LocalNexusComponentCatalogRepositoryTest.java b/platforms/camel-catalog-nexus/src/test/java/org/apache/camel/catalog/nexus/LocalNexusComponentCatalogRepositoryTest.java index 744a74f..24128da 100644 --- a/platforms/camel-catalog-nexus/src/test/java/org/apache/camel/catalog/nexus/LocalNexusComponentCatalogRepositoryTest.java +++ b/platforms/camel-catalog-nexus/src/test/java/org/apache/camel/catalog/nexus/LocalNexusComponentCatalogRepositoryTest.java @@ -19,9 +19,9 @@ package org.apache.camel.catalog.nexus; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.junit.Assert; import org.apache.camel.catalog.CamelCatalog; import org.apache.camel.catalog.DefaultCamelCatalog; +import org.junit.Assert; import org.junit.Test; public class LocalNexusComponentCatalogRepositoryTest extends Assert { diff --git a/platforms/camel-catalog-nexus/src/test/java/org/apache/camel/catalog/nexus/LocalNexusConnectorRepositoryTest.java b/platforms/camel-catalog-nexus/src/test/java/org/apache/camel/catalog/nexus/LocalNexusConnectorRepositoryTest.java index 2e413e6..0e06dc3 100644 --- a/platforms/camel-catalog-nexus/src/test/java/org/apache/camel/catalog/nexus/LocalNexusConnectorRepositoryTest.java +++ b/platforms/camel-catalog-nexus/src/test/java/org/apache/camel/catalog/nexus/LocalNexusConnectorRepositoryTest.java @@ -19,9 +19,9 @@ package org.apache.camel.catalog.nexus; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.junit.Assert; import org.apache.camel.catalog.connector.CamelConnectorCatalog; import org.apache.camel.catalog.connector.DefaultCamelConnectorCatalog; +import org.junit.Assert; import org.junit.Test; public class LocalNexusConnectorRepositoryTest extends Assert { diff --git a/platforms/camel-catalog-provider-karaf/src/test/java/org/apache/camel/catalog/karaf/KarafRuntimeProviderTest.java b/platforms/camel-catalog-provider-karaf/src/test/java/org/apache/camel/catalog/karaf/KarafRuntimeProviderTest.java index 8831593..c6bfa8a 100644 --- a/platforms/camel-catalog-provider-karaf/src/test/java/org/apache/camel/catalog/karaf/KarafRuntimeProviderTest.java +++ b/platforms/camel-catalog-provider-karaf/src/test/java/org/apache/camel/catalog/karaf/KarafRuntimeProviderTest.java @@ -15,7 +15,6 @@ * limitations under the License. */ package org.apache.camel.catalog.karaf; -import org.junit.Before; import java.util.List; diff --git a/platforms/camel-catalog-provider-springboot/src/test/java/org/apache/camel/catalog/springboot/SpringBootRuntimeProviderTest.java b/platforms/camel-catalog-provider-springboot/src/test/java/org/apache/camel/catalog/springboot/SpringBootRuntimeProviderTest.java index a21b20c..2d99e1a 100644 --- a/platforms/camel-catalog-provider-springboot/src/test/java/org/apache/camel/catalog/springboot/SpringBootRuntimeProviderTest.java +++ b/platforms/camel-catalog-provider-springboot/src/test/java/org/apache/camel/catalog/springboot/SpringBootRuntimeProviderTest.java @@ -15,8 +15,6 @@ * limitations under the License. */ package org.apache.camel.catalog.springboot; -import org.junit.Before; - import java.util.List; import org.apache.camel.catalog.CamelCatalog; 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 7ab4cc3..3c68524 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 @@ -15,7 +15,6 @@ * limitations under the License. */ package org.apache.camel.component.jetty9; -import org.junit.Before; import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; diff --git a/platforms/spring-boot/components-starter/camel-undertow-starter/src/test/java/org/apache/camel/component/undertow/UndertowSSLTest.java b/platforms/spring-boot/components-starter/camel-undertow-starter/src/test/java/org/apache/camel/component/undertow/UndertowSSLTest.java index 4334bf9..de59500 100644 --- a/platforms/spring-boot/components-starter/camel-undertow-starter/src/test/java/org/apache/camel/component/undertow/UndertowSSLTest.java +++ b/platforms/spring-boot/components-starter/camel-undertow-starter/src/test/java/org/apache/camel/component/undertow/UndertowSSLTest.java @@ -15,7 +15,6 @@ * limitations under the License. */ package org.apache.camel.component.undertow; -import org.junit.Before; import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; diff --git a/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/test/cxf/blueprint/CxfPayloadProviderRouterTest.java b/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/test/cxf/blueprint/CxfPayloadProviderRouterTest.java index ed92d93..211ac67 100644 --- a/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/test/cxf/blueprint/CxfPayloadProviderRouterTest.java +++ b/tests/camel-blueprint-cxf-test/src/test/java/org/apache/camel/test/cxf/blueprint/CxfPayloadProviderRouterTest.java @@ -16,9 +16,6 @@ */ package org.apache.camel.test.cxf.blueprint; -import org.junit.Before; -import org.junit.After; - import java.util.Properties; import javax.xml.namespace.QName; diff --git a/tests/camel-itest-standalone/src/test/java/org/apache/camel/itest/standalone/CamelContextStandaloneTest.java b/tests/camel-itest-standalone/src/test/java/org/apache/camel/itest/standalone/CamelContextStandaloneTest.java index c9937ad..840e4e8 100644 --- a/tests/camel-itest-standalone/src/test/java/org/apache/camel/itest/standalone/CamelContextStandaloneTest.java +++ b/tests/camel-itest-standalone/src/test/java/org/apache/camel/itest/standalone/CamelContextStandaloneTest.java @@ -16,14 +16,13 @@ */ package org.apache.camel.itest.standalone; -import org.junit.Test; - -import org.junit.Assert; import org.apache.camel.CamelContext; import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.impl.DefaultCamelContext; +import org.junit.Assert; +import org.junit.Test; /** * @version diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/CamelJmsTestHelper.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/CamelJmsTestHelper.java index a44fb95..36809a3 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/CamelJmsTestHelper.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/CamelJmsTestHelper.java @@ -18,6 +18,7 @@ package org.apache.camel.itest; import java.io.File; import java.util.concurrent.atomic.AtomicInteger; + import javax.jms.ConnectionFactory; import org.apache.activemq.ActiveMQConnectionFactory; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesWsAddressingTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesWsAddressingTest.java index 616b3df..b895806 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesWsAddressingTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/customerrelations/CustomerServicesWsAddressingTest.java @@ -16,7 +16,6 @@ */ package org.apache.camel.itest.customerrelations; import org.apache.camel.util.IOHelper; - import org.junit.Assert; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpAndHttpRecipientListInterceptSendToEndpointIssueTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpAndHttpRecipientListInterceptSendToEndpointIssueTest.java index f9d7d05..443f0ca 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpAndHttpRecipientListInterceptSendToEndpointIssueTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpAndHttpRecipientListInterceptSendToEndpointIssueTest.java @@ -15,9 +15,6 @@ * limitations under the License. */ package org.apache.camel.itest.ftp; -import org.junit.Before; -import org.junit.After; - import java.io.File; import org.apache.camel.builder.RouteBuilder; @@ -30,6 +27,7 @@ import org.apache.ftpserver.ftplet.UserManager; import org.apache.ftpserver.listener.ListenerFactory; import org.apache.ftpserver.usermanager.ClearTextPasswordEncryptor; import org.apache.ftpserver.usermanager.impl.PropertiesUserManager; +import org.junit.After; import org.junit.BeforeClass; import org.junit.Test; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpInitialConnectTimeoutTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpInitialConnectTimeoutTest.java index af13d26..27bdb51 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpInitialConnectTimeoutTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpInitialConnectTimeoutTest.java @@ -22,6 +22,7 @@ import java.net.Socket; import java.net.SocketException; import java.net.SocketTimeoutException; import java.util.concurrent.atomic.AtomicBoolean; + import javax.net.SocketFactory; import org.apache.camel.builder.RouteBuilder; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpXQueryTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpXQueryTest.java index bceb864..678d34e 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpXQueryTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpXQueryTest.java @@ -15,9 +15,6 @@ * limitations under the License. */ package org.apache.camel.itest.ftp; -import org.junit.Before; -import org.junit.After; - import java.io.File; import org.apache.camel.Exchange; @@ -32,6 +29,7 @@ import org.apache.ftpserver.ftplet.UserManager; import org.apache.ftpserver.listener.ListenerFactory; import org.apache.ftpserver.usermanager.ClearTextPasswordEncryptor; import org.apache.ftpserver.usermanager.impl.PropertiesUserManager; +import org.junit.After; import org.junit.BeforeClass; import org.junit.Test; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelFileGreeterOneWayTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelFileGreeterOneWayTest.java index 5fc6ac0..6e14920 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelFileGreeterOneWayTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelFileGreeterOneWayTest.java @@ -15,9 +15,6 @@ * limitations under the License. */ package org.apache.camel.itest.greeter; -import org.junit.Before; -import org.junit.After; - import java.io.File; import javax.xml.ws.Endpoint; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterFileDomTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterFileDomTest.java index 617b209..4b010d4 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterFileDomTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterFileDomTest.java @@ -15,10 +15,8 @@ * limitations under the License. */ package org.apache.camel.itest.greeter; -import org.junit.Before; -import org.junit.After; - import java.io.File; + import javax.xml.ws.Endpoint; import org.apache.camel.CamelContext; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterTest.java index 4344f00..c48a470 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterTest.java @@ -15,9 +15,6 @@ * limitations under the License. */ package org.apache.camel.itest.greeter; -import org.junit.Before; -import org.junit.After; - import java.util.List; import javax.xml.ws.Endpoint; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4EndpointTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4EndpointTest.java index 721f9dc..001783f 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4EndpointTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4EndpointTest.java @@ -15,9 +15,6 @@ * limitations under the License. */ package org.apache.camel.itest.http; -import org.junit.Before; -import org.junit.After; - import java.io.IOException; import org.apache.camel.CamelContext; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4MaxConnectionPerHostTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4MaxConnectionPerHostTest.java index e633b0e..db07cde 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4MaxConnectionPerHostTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4MaxConnectionPerHostTest.java @@ -15,9 +15,6 @@ * limitations under the License. */ package org.apache.camel.itest.http; -import org.junit.Before; -import org.junit.After; - import java.io.IOException; import org.apache.camel.CamelContext; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java index e857c06..0b74b98 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java @@ -24,7 +24,6 @@ import org.apache.camel.Exchange; import org.apache.camel.ProducerTemplate; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.AvailablePortFinder; - import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsIntegrationTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsIntegrationTest.java index efcca5c..a99108b 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsIntegrationTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsIntegrationTest.java @@ -18,6 +18,7 @@ package org.apache.camel.itest.jms; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; + import javax.jms.ConnectionFactory; import javax.naming.Context; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsJettyAsyncTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsJettyAsyncTest.java index 34ec086..09a7730 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsJettyAsyncTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsJettyAsyncTest.java @@ -17,6 +17,7 @@ package org.apache.camel.itest.jms; import java.util.concurrent.TimeUnit; + import javax.jms.ConnectionFactory; import javax.naming.Context; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPerformanceTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPerformanceTest.java index 87d9890..7718576 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPerformanceTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPerformanceTest.java @@ -18,6 +18,7 @@ package org.apache.camel.itest.jms; import java.util.ArrayList; import java.util.List; + import javax.jms.ConnectionFactory; import javax.naming.Context; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java index b06809c..3d81cd4 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java @@ -17,6 +17,7 @@ package org.apache.camel.itest.jms; import java.util.List; + import javax.jms.ConnectionFactory; import javax.naming.Context; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/PurchaseOrder.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/PurchaseOrder.java index ce0f06c..03727d4 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/PurchaseOrder.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/PurchaseOrder.java @@ -17,6 +17,7 @@ package org.apache.camel.itest.jms; import java.io.Serializable; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/netty/NettyAsyncRequestReplyTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/netty/NettyAsyncRequestReplyTest.java index c0a22fc..f08dae1 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/netty/NettyAsyncRequestReplyTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/netty/NettyAsyncRequestReplyTest.java @@ -25,6 +25,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; + import javax.jms.ConnectionFactory; import javax.naming.Context; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/quartz/FtpCronScheduledRoutePolicyTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/quartz/FtpCronScheduledRoutePolicyTest.java index bfb33e4..4aeb684 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/quartz/FtpCronScheduledRoutePolicyTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/quartz/FtpCronScheduledRoutePolicyTest.java @@ -15,9 +15,6 @@ * limitations under the License. */ package org.apache.camel.itest.quartz; -import org.junit.Before; -import org.junit.After; - import java.io.File; import java.util.concurrent.TimeUnit; @@ -33,6 +30,8 @@ import org.apache.ftpserver.ftplet.UserManager; import org.apache.ftpserver.listener.ListenerFactory; import org.apache.ftpserver.usermanager.ClearTextPasswordEncryptor; import org.apache.ftpserver.usermanager.impl.PropertiesUserManager; +import org.junit.After; +import org.junit.Before; import org.junit.Ignore; import org.junit.Test; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/security/GreeterClientTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/security/GreeterClientTest.java index f69ae90..c09bcb3 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/security/GreeterClientTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/security/GreeterClientTest.java @@ -33,7 +33,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/shiro/ShiroOverJmsTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/shiro/ShiroOverJmsTest.java index 5233303..6ee04ae 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/shiro/ShiroOverJmsTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/shiro/ShiroOverJmsTest.java @@ -18,6 +18,7 @@ package org.apache.camel.itest.shiro; import java.util.HashMap; import java.util.Map; + import javax.jms.ConnectionFactory; import javax.naming.Context; diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsXaTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsXaTest.java index 53a54e4..ac7a5a1 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsXaTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsXaTest.java @@ -22,7 +22,6 @@ import java.sql.SQLException; import org.apache.camel.itest.ITestSupport; import org.junit.After; import org.junit.Before; - import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/tooling/json-simple-ordered/src/test/java/org/apache/camel/json/simple/JsonSimpleOrderedTest.java b/tooling/json-simple-ordered/src/test/java/org/apache/camel/json/simple/JsonSimpleOrderedTest.java index c286be2..d246dba 100644 --- a/tooling/json-simple-ordered/src/test/java/org/apache/camel/json/simple/JsonSimpleOrderedTest.java +++ b/tooling/json-simple-ordered/src/test/java/org/apache/camel/json/simple/JsonSimpleOrderedTest.java @@ -25,9 +25,9 @@ import java.util.Iterator; import java.util.LinkedHashMap; import java.util.Map; -import org.junit.Assert; import org.json.simple.JsonObject; import org.json.simple.Jsoner; +import org.junit.Assert; import org.junit.Test; public class JsonSimpleOrderedTest extends Assert {