This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push: new afb6c3e5267 Regen sort imports afb6c3e5267 is described below commit afb6c3e52670d5c7ce275c14a2486e5c164893ca Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Thu Mar 21 14:45:31 2024 +0100 Regen sort imports --- .../boot/CamelSpringBootApplicationListener.java | 1 - .../boot/CamelSpringBootRoutesCollector.java | 9 ++++---- .../boot/FatJarPackageScanClassResolver.java | 1 - .../boot/FatJarPackageScanResourceResolver.java | 11 +++++----- .../camel/spring/boot/FilePropertySource.java | 1 - .../camel/spring/boot/SpringTypeConverter.java | 1 - .../spring/boot/TypeConversionConfiguration.java | 4 ++-- .../actuate/console/CamelDevConsoleEndpoint.java | 5 ++--- .../endpoint/CamelRouteControllerEndpoint.java | 1 - .../boot/actuate/endpoint/CamelRoutesEndpoint.java | 8 +++---- .../AsyncHealthIndicatorAutoConfiguration.java | 5 ++--- .../actuate/health/CamelHealthCheckIndicator.java | 1 - .../boot/actuate/health/CamelHealthHelper.java | 5 ++--- .../boot/actuate/health/CamelProbesHelper.java | 3 +-- .../CamelLivenessStateHealthIndicator.java | 3 +-- .../CamelReadinessStateHealthIndicator.java | 3 +-- .../camel/spring/boot/aot/CamelRuntimeHints.java | 5 ++--- .../camel/spring/boot/aot/ReflectionHelper.java | 1 - .../cloud/CamelCloudConfigurationProperties.java | 1 - .../boot/cloud/CamelCloudServiceDiscovery.java | 1 - ...amelCloudServiceDiscoveryAutoConfiguration.java | 3 +-- .../spring/boot/cloud/CamelCloudServiceFilter.java | 1 - .../CamelCloudServiceFilterAutoConfiguration.java | 3 +-- .../ClusteredRouteControllerAutoConfiguration.java | 2 -- .../ClusteredRouteControllerConfiguration.java | 1 - .../PropertiesComponentAutoConfiguration.java | 3 +-- .../CamelRouteTemplateAutoConfiguration.java | 1 - .../CamelRouteTemplateConfigurationProperties.java | 1 - .../boot/security/CamelSSLAutoConfiguration.java | 1 - .../CamelThreadPoolConfigurationProperties.java | 1 - .../spring/boot/util/CamelPropertiesHelper.java | 1 - .../boot/util/CompositeConversionService.java | 1 - .../util/ConditionalOnHierarchicalProperties.java | 1 - .../spring/boot/util/HierarchicalCondition.java | 1 - .../boot/util/HierarchicalPropertiesEvaluator.java | 1 - .../util/OnHierarchicalPropertiesCondition.java | 1 - .../camel/spring/boot/CamelAnnotationsTest.java | 2 +- .../boot/CamelAutoConfigurationPropertiesTest.java | 2 +- .../spring/boot/CamelAutoConfigurationTest.java | 12 +++++------ ...CamelAutoConfigurationWithCompatPrefixTest.java | 8 +++---- .../CamelAutoConfigurationWithMainPrefixTest.java | 10 ++++----- .../boot/CamelConfigurationLocationsTest.java | 2 +- .../camel/spring/boot/CamelEventNotifierTest.java | 3 +-- .../spring/boot/CamelLambdaRouteBuilderTest.java | 2 +- .../spring/boot/CamelSpringBootShutdownTest.java | 3 +-- .../boot/CamelSpringBootTemplateShutdownTest.java | 6 +++--- .../camel/spring/boot/CamelXmlRoutesTest.java | 6 +++--- .../boot/CustomCamelCamelConfigurationTest.java | 8 +++---- .../spring/boot/CustomShutdownStrategyTest.java | 1 - .../spring/boot/ExistingConversionServiceTest.java | 6 +++--- .../camel/spring/boot/GlobalOptionsTest.java | 8 +++---- .../spring/boot/LogListenerDiscoveryTest.java | 6 +++--- .../apache/camel/spring/boot/NoConvertersTest.java | 2 +- .../org/apache/camel/spring/boot/PlainTest.java | 2 +- .../spring/boot/SpringConverterDelegationTest.java | 6 +++--- .../camel/spring/boot/SpringTypeConverterTest.java | 3 +-- .../spring/boot/StartupShutdownOrderTest.java | 5 ++--- .../SupervisingRouteControllerRestartTest.java | 7 +++--- .../boot/SupervisingRouteControllerTest.java | 7 +++--- .../spring/boot/ThreadPoolConfigurationTest.java | 2 +- .../spring/boot/UuidGeneratorDiscoveryTest.java | 7 +++--- .../spring/boot/XPathPropertyPlaceholderTest.java | 2 +- .../CamelEndpointsGloballyEnabledTest.java | 2 +- .../CamelRouteControllerEndpointEnabledTest.java | 2 +- ...erEndpointGloballyDisabledAndReenabledTest.java | 2 +- .../endpoint/CamelRouteControllerEndpointTest.java | 3 +-- .../endpoint/CamelRoutesEndpointEnabledTest.java | 2 +- .../actuate/endpoint/CamelRoutesEndpointTest.java | 3 +-- .../CamelRoutesEndpointWriteOperationTest.java | 2 +- .../boot/actuate/health/CamelHealthTest.java | 2 +- .../boot/actuate/health/CamelProbesTest.java | 3 +-- .../spring/boot/actuate/info/CamelInfoTest.java | 2 +- .../spring/boot/aot/CamelRuntimeHintsTest.java | 4 ++-- .../spring/boot/aot/ReflectionHelperTest.java | 5 ++--- .../CamelCloudServiceCallConfigurationTest.java | 8 +++---- ...melCloudServiceCallGlobalConfigurationTest.java | 3 +-- .../CamelCloudServiceCallRefExpressionTest.java | 3 +-- .../CamelCloudServiceCallSimpleExpressionTest.java | 3 +-- .../boot/cloud/CamelCloudServiceCallTest.java | 3 +-- .../boot/componentroute/ComponentRouteTest.java | 2 +- .../camel/spring/boot/dummy/DummyComponent.java | 1 - .../camel/spring/boot/dummy/DummyConsumer.java | 1 - .../spring/boot/issues/OverridePropertiesTest.java | 3 +-- .../camel/spring/boot/issues/RestDslPostTest.java | 2 +- .../camel/spring/boot/issues/SimpleOgnlTest.java | 3 +-- .../spring/boot/issues/StreamCachingTest.java | 5 ++--- .../spring/boot/mockendpoints/AdviceWithTest.java | 4 ++-- .../security/CamelSSLAutoConfigurationTest.java | 8 +++---- .../spring/boot/security/CamelSSLNoConfigTest.java | 2 +- .../boot/util/CamelPropertiesHelperTest.java | 3 +-- .../spring/boot/util/GroupCondition1Test.java | 2 +- .../spring/boot/util/GroupCondition2Test.java | 2 +- .../spring/boot/util/GroupCondition3Test.java | 2 +- .../spring/boot/util/GroupCondition4Test.java | 2 +- .../util/HierarchicalPropertiesEvaluatorTest.java | 2 +- .../maven/SpringBootConfigGeneratorMojo.java | 25 +++++++++++----------- .../maven/AbstractSpringBootGenerator.java | 1 - .../maven/BomDependenciesGeneratorMojo.java | 2 -- .../camel/springboot/maven/BomGeneratorMojo.java | 2 -- .../camel/springboot/maven/DynamicClassLoader.java | 1 - .../maven/PrepareCatalogSpringBootMojo.java | 1 - .../maven/SpringBootAutoConfigurationMojo.java | 5 ++--- .../springboot/maven/SpringBootStarterMojo.java | 11 ++++------ .../springboot/maven/StarterGeneratorMojo.java | 1 - ...pdateSpringBootAutoConfigurationReadmeMojo.java | 13 ++++++----- 105 files changed, 153 insertions(+), 226 deletions(-) diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootApplicationListener.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootApplicationListener.java index 995e1dd5fce..90d05f59776 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootApplicationListener.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootApplicationListener.java @@ -24,7 +24,6 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; - import org.apache.camel.CamelContext; import org.apache.camel.ExtendedCamelContext; import org.apache.camel.StartupListener; diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootRoutesCollector.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootRoutesCollector.java index bad80472ea9..87337f5678d 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootRoutesCollector.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelSpringBootRoutesCollector.java @@ -16,15 +16,14 @@ */ package org.apache.camel.spring.boot; -import org.apache.camel.CamelContext; -import org.apache.camel.main.DefaultRoutesCollector; -import org.apache.camel.support.DefaultRegistry; -import org.springframework.context.ApplicationContext; - import java.util.ArrayList; import java.util.Collection; import java.util.Map; import java.util.Set; +import org.apache.camel.CamelContext; +import org.apache.camel.main.DefaultRoutesCollector; +import org.apache.camel.support.DefaultRegistry; +import org.springframework.context.ApplicationContext; public class CamelSpringBootRoutesCollector extends DefaultRoutesCollector { diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FatJarPackageScanClassResolver.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FatJarPackageScanClassResolver.java index 595dabb9f67..9c0b9ee5907 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FatJarPackageScanClassResolver.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FatJarPackageScanClassResolver.java @@ -27,7 +27,6 @@ import java.util.ArrayList; import java.util.List; import java.util.jar.JarEntry; import java.util.jar.JarInputStream; - import org.apache.camel.impl.engine.DefaultPackageScanClassResolver; import org.apache.camel.util.IOHelper; import org.apache.camel.util.StringHelper; diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FatJarPackageScanResourceResolver.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FatJarPackageScanResourceResolver.java index a9df403a490..ea1177fe44b 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FatJarPackageScanResourceResolver.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FatJarPackageScanResourceResolver.java @@ -16,12 +16,6 @@ */ package org.apache.camel.spring.boot; -import org.apache.camel.impl.engine.DefaultPackageScanResourceResolver; -import org.apache.camel.util.IOHelper; -import org.apache.camel.util.StringHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.IOException; import java.io.InputStream; import java.net.URI; @@ -33,6 +27,11 @@ import java.util.ArrayList; import java.util.List; import java.util.jar.JarEntry; import java.util.jar.JarInputStream; +import org.apache.camel.impl.engine.DefaultPackageScanResourceResolver; +import org.apache.camel.util.IOHelper; +import org.apache.camel.util.StringHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * An implementation of the {@code org.apache.camel.spi.PackageScanResourceResolver} that is able to scan spring-boot diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FilePropertySource.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FilePropertySource.java index c33df92a7a8..56713373bd6 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FilePropertySource.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FilePropertySource.java @@ -19,7 +19,6 @@ package org.apache.camel.spring.boot; import java.io.FileInputStream; import java.io.IOException; import java.util.Properties; - import org.apache.camel.util.StringHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringTypeConverter.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringTypeConverter.java index 88bbc0234a8..e6e9c65282a 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringTypeConverter.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SpringTypeConverter.java @@ -20,7 +20,6 @@ import java.util.Collection; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; - import org.apache.camel.Exchange; import org.apache.camel.TypeConversionException; import org.apache.camel.support.TypeConverterSupport; diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/TypeConversionConfiguration.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/TypeConversionConfiguration.java index a8fb5dfbcfb..b31fdbc220d 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/TypeConversionConfiguration.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/TypeConversionConfiguration.java @@ -16,6 +16,8 @@ */ package org.apache.camel.spring.boot; +import static java.util.Arrays.asList; + import org.apache.camel.CamelContext; import org.apache.camel.TypeConverter; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; @@ -27,8 +29,6 @@ import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.converter.Converter; import org.springframework.core.convert.support.DefaultConversionService; -import static java.util.Arrays.asList; - @Configuration(proxyBeanMethods = false) @ConditionalOnProperty(value = "camel.springboot.type-conversion", matchIfMissing = true) public class TypeConversionConfiguration { diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/console/CamelDevConsoleEndpoint.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/console/CamelDevConsoleEndpoint.java index 1c2431f554b..6e8fc60abb1 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/console/CamelDevConsoleEndpoint.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/console/CamelDevConsoleEndpoint.java @@ -16,6 +16,8 @@ */ package org.apache.camel.spring.boot.actuate.console; +import java.util.HashMap; +import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.Exchange; import org.apache.camel.console.DevConsole; @@ -25,9 +27,6 @@ import org.springframework.boot.actuate.endpoint.annotation.Endpoint; import org.springframework.boot.actuate.endpoint.annotation.ReadOperation; import org.springframework.boot.actuate.endpoint.annotation.Selector; -import java.util.HashMap; -import java.util.Map; - /* * Camel Developer Console */ diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpoint.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpoint.java index 6ed7b93da81..48208266459 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpoint.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpoint.java @@ -19,7 +19,6 @@ package org.apache.camel.spring.boot.actuate.endpoint; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; - import org.apache.camel.CamelContext; import org.apache.camel.Route; import org.apache.camel.spi.RouteController; diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java index 248205a1048..6c175d28023 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpoint.java @@ -16,6 +16,9 @@ */ package org.apache.camel.spring.boot.actuate.endpoint; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; import java.util.Collections; import java.util.Date; import java.util.HashMap; @@ -24,7 +27,6 @@ import java.util.Map; import java.util.Optional; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; - import org.apache.camel.CamelContext; import org.apache.camel.Route; import org.apache.camel.RuntimeCamelException; @@ -37,10 +39,6 @@ import org.springframework.boot.actuate.endpoint.annotation.Selector; import org.springframework.boot.actuate.endpoint.annotation.WriteOperation; import org.springframework.lang.Nullable; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; - /* * Spring Boot Management Endpoint to expose Camel Route information. */ diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/AsyncHealthIndicatorAutoConfiguration.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/AsyncHealthIndicatorAutoConfiguration.java index 25b9c27d9f6..44d42afe377 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/AsyncHealthIndicatorAutoConfiguration.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/AsyncHealthIndicatorAutoConfiguration.java @@ -16,6 +16,8 @@ */ package org.apache.camel.spring.boot.actuate.health; +import java.time.Duration; +import java.time.ZonedDateTime; import org.apache.camel.spring.boot.actuate.health.liveness.CamelLivenessStateHealthIndicator; import org.apache.camel.spring.boot.actuate.health.readiness.CamelReadinessStateHealthIndicator; import org.slf4j.Logger; @@ -30,9 +32,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.TaskScheduler; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; -import java.time.Duration; -import java.time.ZonedDateTime; - /** * Configuration class that replace synchronous Camel Health Checks with asynchronous ones. * diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthCheckIndicator.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthCheckIndicator.java index c38c569751e..4d4ca4c7dfe 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthCheckIndicator.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthCheckIndicator.java @@ -18,7 +18,6 @@ package org.apache.camel.spring.boot.actuate.health; import java.util.Collection; import java.util.Map; - import org.apache.camel.CamelContext; import org.apache.camel.health.HealthCheck; import org.apache.camel.health.HealthCheckHelper; diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthHelper.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthHelper.java index 30769d2e003..ac64499765c 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthHelper.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelHealthHelper.java @@ -16,15 +16,14 @@ */ package org.apache.camel.spring.boot.actuate.health; -import org.apache.camel.health.HealthCheck; -import org.springframework.boot.actuate.health.Health; - import java.io.PrintWriter; import java.io.StringWriter; import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; import java.util.TreeMap; +import org.apache.camel.health.HealthCheck; +import org.springframework.boot.actuate.health.Health; final class CamelHealthHelper { diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelProbesHelper.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelProbesHelper.java index e23de81e64d..a46534fa1f9 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelProbesHelper.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/CamelProbesHelper.java @@ -16,11 +16,10 @@ */ package org.apache.camel.spring.boot.actuate.health; +import java.util.Collection; import org.apache.camel.health.HealthCheck; import org.slf4j.Logger; -import java.util.Collection; - public final class CamelProbesHelper { private CamelProbesHelper() { diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/liveness/CamelLivenessStateHealthIndicator.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/liveness/CamelLivenessStateHealthIndicator.java index 9e25f1cac1f..a9771efce91 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/liveness/CamelLivenessStateHealthIndicator.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/liveness/CamelLivenessStateHealthIndicator.java @@ -16,6 +16,7 @@ */ package org.apache.camel.spring.boot.actuate.health.liveness; +import java.util.Collection; import org.apache.camel.CamelContext; import org.apache.camel.health.HealthCheck; import org.apache.camel.health.HealthCheckHelper; @@ -27,8 +28,6 @@ import org.springframework.boot.availability.ApplicationAvailability; import org.springframework.boot.availability.AvailabilityState; import org.springframework.boot.availability.LivenessState; -import java.util.Collection; - public class CamelLivenessStateHealthIndicator extends LivenessStateHealthIndicator { private static final Logger LOG = LoggerFactory.getLogger(CamelLivenessStateHealthIndicator.class); diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/readiness/CamelReadinessStateHealthIndicator.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/readiness/CamelReadinessStateHealthIndicator.java index 765f6c83dad..b4a034a8939 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/readiness/CamelReadinessStateHealthIndicator.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/actuate/health/readiness/CamelReadinessStateHealthIndicator.java @@ -16,6 +16,7 @@ */ package org.apache.camel.spring.boot.actuate.health.readiness; +import java.util.Collection; import org.apache.camel.CamelContext; import org.apache.camel.health.HealthCheck; import org.apache.camel.health.HealthCheckHelper; @@ -27,8 +28,6 @@ import org.springframework.boot.availability.ApplicationAvailability; import org.springframework.boot.availability.AvailabilityState; import org.springframework.boot.availability.ReadinessState; -import java.util.Collection; - public class CamelReadinessStateHealthIndicator extends ReadinessStateHealthIndicator { private static final Logger LOG = LoggerFactory.getLogger(CamelReadinessStateHealthIndicator.class); diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/aot/CamelRuntimeHints.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/aot/CamelRuntimeHints.java index 253bb3be2f2..ed6682ff169 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/aot/CamelRuntimeHints.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/aot/CamelRuntimeHints.java @@ -16,11 +16,12 @@ */ package org.apache.camel.spring.boot.aot; +import static org.apache.camel.spring.boot.aot.RuntimeHintsHelper.registerClassHierarchy; + import java.io.BufferedReader; import java.io.IOException; import java.io.StringReader; import java.nio.charset.StandardCharsets; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.aot.hint.MemberCategory; @@ -29,8 +30,6 @@ import org.springframework.aot.hint.RuntimeHintsRegistrar; import org.springframework.core.io.Resource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; -import static org.apache.camel.spring.boot.aot.RuntimeHintsHelper.registerClassHierarchy; - /** * {@code CamelRuntimeHints} provide the basic hints for the native compilation of a Camel application. */ diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/aot/ReflectionHelper.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/aot/ReflectionHelper.java index 52532b6a568..637e29fb3f7 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/aot/ReflectionHelper.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/aot/ReflectionHelper.java @@ -29,7 +29,6 @@ import java.util.Set; import java.util.function.Consumer; import java.util.function.Function; import java.util.stream.Collectors; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition; diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudConfigurationProperties.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudConfigurationProperties.java index 1df9d790694..74ce28819d0 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudConfigurationProperties.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudConfigurationProperties.java @@ -19,7 +19,6 @@ package org.apache.camel.spring.boot.cloud; import java.util.HashMap; import java.util.List; import java.util.Map; - import org.apache.camel.model.cloud.ServiceCallDefinitionConstants; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceDiscovery.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceDiscovery.java index 493262ba978..54d06195bca 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceDiscovery.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceDiscovery.java @@ -18,7 +18,6 @@ package org.apache.camel.spring.boot.cloud; import java.util.List; import java.util.concurrent.TimeUnit; - import org.apache.camel.cloud.ServiceDefinition; import org.apache.camel.cloud.ServiceDiscovery; import org.apache.camel.impl.cloud.CombinedServiceDiscovery; diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceDiscoveryAutoConfiguration.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceDiscoveryAutoConfiguration.java index def16a48a97..1796bea178d 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceDiscoveryAutoConfiguration.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceDiscoveryAutoConfiguration.java @@ -16,10 +16,9 @@ */ package org.apache.camel.spring.boot.cloud; +import jakarta.annotation.PostConstruct; import java.util.List; import java.util.Map; - -import jakarta.annotation.PostConstruct; import org.apache.camel.CamelContext; import org.apache.camel.NoTypeConversionAvailableException; import org.apache.camel.cloud.ServiceDiscovery; diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceFilter.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceFilter.java index e517ba20f00..dfc700d95ed 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceFilter.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceFilter.java @@ -17,7 +17,6 @@ package org.apache.camel.spring.boot.cloud; import java.util.List; - import org.apache.camel.Exchange; import org.apache.camel.cloud.ServiceDefinition; import org.apache.camel.cloud.ServiceFilter; diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceFilterAutoConfiguration.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceFilterAutoConfiguration.java index 7f79c143726..427a0b5c5fe 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceFilterAutoConfiguration.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceFilterAutoConfiguration.java @@ -16,11 +16,10 @@ */ package org.apache.camel.spring.boot.cloud; +import jakarta.annotation.PostConstruct; import java.util.Arrays; import java.util.List; import java.util.Map; - -import jakarta.annotation.PostConstruct; import org.apache.camel.CamelContext; import org.apache.camel.impl.cloud.BlacklistServiceFilter; import org.apache.camel.impl.cloud.DefaultServiceDefinition; diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cluster/ClusteredRouteControllerAutoConfiguration.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cluster/ClusteredRouteControllerAutoConfiguration.java index 4df1792f304..8a4e1f921e0 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cluster/ClusteredRouteControllerAutoConfiguration.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cluster/ClusteredRouteControllerAutoConfiguration.java @@ -21,13 +21,11 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Optional; - import org.apache.camel.cluster.CamelClusterService; import org.apache.camel.impl.cluster.ClusteredRouteConfiguration; import org.apache.camel.impl.cluster.ClusteredRouteController; import org.apache.camel.impl.cluster.ClusteredRouteFilter; import org.apache.camel.impl.cluster.ClusteredRouteFilters; - import org.apache.camel.spi.RouteController; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.util.ObjectHelper; diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cluster/ClusteredRouteControllerConfiguration.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cluster/ClusteredRouteControllerConfiguration.java index 66031a24015..ca32cbd0f09 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cluster/ClusteredRouteControllerConfiguration.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/cluster/ClusteredRouteControllerConfiguration.java @@ -18,7 +18,6 @@ package org.apache.camel.spring.boot.cluster; import java.util.HashMap; import java.util.Map; - import org.apache.camel.cluster.CamelClusterService; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/properties/PropertiesComponentAutoConfiguration.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/properties/PropertiesComponentAutoConfiguration.java index 788e25f01b0..2096b68c8af 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/properties/PropertiesComponentAutoConfiguration.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/properties/PropertiesComponentAutoConfiguration.java @@ -17,7 +17,6 @@ package org.apache.camel.spring.boot.properties; import java.util.Properties; - import org.apache.camel.CamelContext; import org.apache.camel.component.properties.PropertiesComponent; import org.apache.camel.component.properties.PropertiesParser; @@ -93,4 +92,4 @@ public class PropertiesComponentAutoConfiguration { } return component; } -} \ No newline at end of file +} diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/routetemplate/CamelRouteTemplateAutoConfiguration.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/routetemplate/CamelRouteTemplateAutoConfiguration.java index a5d97d4a3fd..4b16455f2de 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/routetemplate/CamelRouteTemplateAutoConfiguration.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/routetemplate/CamelRouteTemplateAutoConfiguration.java @@ -17,7 +17,6 @@ package org.apache.camel.spring.boot.routetemplate; import java.util.Map; - import org.apache.camel.CamelContext; import org.apache.camel.main.PropertiesRouteTemplateParametersSource; import org.apache.camel.spi.RouteTemplateParameterSource; diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/routetemplate/CamelRouteTemplateConfigurationProperties.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/routetemplate/CamelRouteTemplateConfigurationProperties.java index a7d32d6a737..a8a413f16ea 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/routetemplate/CamelRouteTemplateConfigurationProperties.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/routetemplate/CamelRouteTemplateConfigurationProperties.java @@ -18,7 +18,6 @@ package org.apache.camel.spring.boot.routetemplate; import java.util.List; import java.util.Map; - import org.springframework.boot.context.properties.ConfigurationProperties; @ConfigurationProperties(prefix = "camel.routetemplate") diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/security/CamelSSLAutoConfiguration.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/security/CamelSSLAutoConfiguration.java index 91c0c4c7195..50e719cdc49 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/security/CamelSSLAutoConfiguration.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/security/CamelSSLAutoConfiguration.java @@ -18,7 +18,6 @@ package org.apache.camel.spring.boot.security; import java.util.Collections; import java.util.Map; - import org.apache.camel.CamelContext; import org.apache.camel.main.MainHelper; import org.apache.camel.spi.ThreadPoolProfile; diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/threadpool/CamelThreadPoolConfigurationProperties.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/threadpool/CamelThreadPoolConfigurationProperties.java index 5716183e24a..4d1e0c86d79 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/threadpool/CamelThreadPoolConfigurationProperties.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/threadpool/CamelThreadPoolConfigurationProperties.java @@ -19,7 +19,6 @@ package org.apache.camel.spring.boot.threadpool; import java.util.HashMap; import java.util.Map; import java.util.concurrent.TimeUnit; - import org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/CamelPropertiesHelper.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/CamelPropertiesHelper.java index f3b482ce16b..31d2b05cdaa 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/CamelPropertiesHelper.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/CamelPropertiesHelper.java @@ -19,7 +19,6 @@ package org.apache.camel.spring.boot.util; import java.util.HashMap; import java.util.Iterator; import java.util.Map; - import org.apache.camel.CamelContext; import org.apache.camel.Component; import org.apache.camel.PropertyBindingException; diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/CompositeConversionService.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/CompositeConversionService.java index cfb395d9c84..d649135515b 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/CompositeConversionService.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/CompositeConversionService.java @@ -17,7 +17,6 @@ package org.apache.camel.spring.boot.util; import java.util.List; - import org.springframework.core.convert.ConversionException; import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.TypeDescriptor; diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/ConditionalOnHierarchicalProperties.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/ConditionalOnHierarchicalProperties.java index bbbe0305a9b..782b18d1e0e 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/ConditionalOnHierarchicalProperties.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/ConditionalOnHierarchicalProperties.java @@ -21,7 +21,6 @@ import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; - import org.springframework.context.annotation.Conditional; @Retention(RetentionPolicy.RUNTIME) diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/HierarchicalCondition.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/HierarchicalCondition.java index 701c3065a2c..261f9b149c4 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/HierarchicalCondition.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/HierarchicalCondition.java @@ -17,7 +17,6 @@ package org.apache.camel.spring.boot.util; import java.util.Arrays; - import org.springframework.boot.autoconfigure.condition.ConditionMessage; import org.springframework.boot.autoconfigure.condition.ConditionOutcome; import org.springframework.boot.autoconfigure.condition.SpringBootCondition; diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/HierarchicalPropertiesEvaluator.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/HierarchicalPropertiesEvaluator.java index a09a0f8fa71..d9ddf2e8e30 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/HierarchicalPropertiesEvaluator.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/HierarchicalPropertiesEvaluator.java @@ -17,7 +17,6 @@ package org.apache.camel.spring.boot.util; import java.util.Collection; - import org.springframework.boot.context.properties.bind.Bindable; import org.springframework.boot.context.properties.bind.Binder; import org.springframework.context.ApplicationContext; diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/OnHierarchicalPropertiesCondition.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/OnHierarchicalPropertiesCondition.java index 81cdceca621..0defe932f3a 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/OnHierarchicalPropertiesCondition.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/OnHierarchicalPropertiesCondition.java @@ -21,7 +21,6 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; - import org.springframework.boot.autoconfigure.condition.ConditionMessage; import org.springframework.boot.autoconfigure.condition.ConditionOutcome; import org.springframework.boot.autoconfigure.condition.SpringBootCondition; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAnnotationsTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAnnotationsTest.java index ba13c409305..5f03bfc2b3d 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAnnotationsTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAnnotationsTest.java @@ -21,6 +21,7 @@ import org.apache.camel.ProducerTemplate; import org.apache.camel.RoutesBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -29,7 +30,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationPropertiesTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationPropertiesTest.java index d03a98ac91f..58ffccafe34 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationPropertiesTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationPropertiesTest.java @@ -20,6 +20,7 @@ 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.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -29,7 +30,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationTest.java index d4f079c468d..3ebe8975d1c 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationTest.java @@ -16,6 +16,11 @@ */ package org.apache.camel.spring.boot; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static org.mockito.Mockito.withSettings; + import org.apache.camel.CamelContext; import org.apache.camel.ConsumerTemplate; import org.apache.camel.EndpointInject; @@ -26,6 +31,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.BeanRepository; import org.apache.camel.spi.Registry; +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -35,12 +41,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.Ordered; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; - -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; -import static org.mockito.Mockito.withSettings; @DirtiesContext @CamelSpringBootTest diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationWithCompatPrefixTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationWithCompatPrefixTest.java index 4ff616b1117..ec2a81a5d95 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationWithCompatPrefixTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationWithCompatPrefixTest.java @@ -16,6 +16,10 @@ */ package org.apache.camel.spring.boot; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.mockito.Mockito.mock; + import org.apache.camel.CamelContext; import org.apache.camel.ConsumerTemplate; import org.apache.camel.test.spring.junit5.CamelSpringBootTest; @@ -27,10 +31,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.mockito.Mockito.mock; - @DirtiesContext @CamelSpringBootTest @EnableAutoConfiguration diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationWithMainPrefixTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationWithMainPrefixTest.java index e55781eaa55..b8bee542e7f 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationWithMainPrefixTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelAutoConfigurationWithMainPrefixTest.java @@ -16,6 +16,11 @@ */ package org.apache.camel.spring.boot; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; + import org.apache.camel.CamelContext; import org.apache.camel.ConsumerTemplate; import org.apache.camel.test.spring.junit5.CamelSpringBootTest; @@ -27,11 +32,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; - @DirtiesContext @CamelSpringBootTest @EnableAutoConfiguration diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelConfigurationLocationsTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelConfigurationLocationsTest.java index 68ed7b154b7..080d864f005 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelConfigurationLocationsTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelConfigurationLocationsTest.java @@ -19,6 +19,7 @@ package org.apache.camel.spring.boot; import org.apache.camel.CamelContext; import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -27,7 +28,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelEventNotifierTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelEventNotifierTest.java index 396c457d30f..7cece7b992f 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelEventNotifierTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelEventNotifierTest.java @@ -17,7 +17,6 @@ package org.apache.camel.spring.boot; import java.util.concurrent.atomic.AtomicInteger; - import org.apache.camel.CamelContext; import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; @@ -25,6 +24,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.spi.CamelEvent; import org.apache.camel.spi.EventNotifier; import org.apache.camel.support.EventNotifierSupport; +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -33,7 +33,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelLambdaRouteBuilderTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelLambdaRouteBuilderTest.java index d1af97e1452..ee7da1d74d8 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelLambdaRouteBuilderTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelLambdaRouteBuilderTest.java @@ -19,13 +19,13 @@ package org.apache.camel.spring.boot; import org.apache.camel.CamelContext; import org.apache.camel.Route; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelSpringBootShutdownTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelSpringBootShutdownTest.java index 18cff29860a..be8bc12950e 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelSpringBootShutdownTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelSpringBootShutdownTest.java @@ -18,13 +18,13 @@ package org.apache.camel.spring.boot; import java.io.Closeable; import java.io.InputStream; - import org.apache.camel.CamelContext; import org.apache.camel.CamelExecutionException; import org.apache.camel.ProducerTemplate; import org.apache.camel.TypeConverter; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.impl.converter.DefaultTypeConverter; +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @@ -33,7 +33,6 @@ import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; /** * Test class illustrating the invalid shutdown sequence when using the autoconfiguration provided by diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelSpringBootTemplateShutdownTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelSpringBootTemplateShutdownTest.java index c8295828f67..f06c1f6de9f 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelSpringBootTemplateShutdownTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelSpringBootTemplateShutdownTest.java @@ -16,6 +16,9 @@ */ package org.apache.camel.spring.boot; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.apache.camel.CamelContext; import org.apache.camel.ConsumerTemplate; import org.apache.camel.FluentProducerTemplate; @@ -27,9 +30,6 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext import org.springframework.context.support.AbstractApplicationContext; import org.springframework.test.annotation.DirtiesContext; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; - @DirtiesContext public class CamelSpringBootTemplateShutdownTest { diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelXmlRoutesTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelXmlRoutesTest.java index 3ec67b3e679..88ef60b04b3 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelXmlRoutesTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CamelXmlRoutesTest.java @@ -16,16 +16,16 @@ */ package org.apache.camel.spring.boot; +import static org.junit.jupiter.api.Assertions.assertNotNull; + import org.apache.camel.CamelContext; import org.apache.camel.Route; +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; - -import static org.junit.jupiter.api.Assertions.assertNotNull; @DirtiesContext @CamelSpringBootTest diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CustomCamelCamelConfigurationTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CustomCamelCamelConfigurationTest.java index 53d9ccc4e3f..1742ca83c47 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CustomCamelCamelConfigurationTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CustomCamelCamelConfigurationTest.java @@ -16,8 +16,12 @@ */ package org.apache.camel.spring.boot; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -25,10 +29,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; - -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; @DirtiesContext @CamelSpringBootTest diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CustomShutdownStrategyTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CustomShutdownStrategyTest.java index 86b21a85d13..05a05683985 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CustomShutdownStrategyTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/CustomShutdownStrategyTest.java @@ -21,7 +21,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.List; import java.util.concurrent.TimeUnit; - import org.apache.camel.CamelContext; import org.apache.camel.impl.engine.DefaultShutdownStrategy; import org.apache.camel.spi.RouteStartupOrder; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/ExistingConversionServiceTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/ExistingConversionServiceTest.java index c26612f40d9..bcb89775266 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/ExistingConversionServiceTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/ExistingConversionServiceTest.java @@ -16,6 +16,9 @@ */ package org.apache.camel.spring.boot; +import static org.junit.jupiter.api.Assertions.assertSame; + +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -26,9 +29,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; - -import static org.junit.jupiter.api.Assertions.assertSame; @DirtiesContext @CamelSpringBootTest diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/GlobalOptionsTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/GlobalOptionsTest.java index 21c7f53a68b..f0ea566ca4f 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/GlobalOptionsTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/GlobalOptionsTest.java @@ -16,18 +16,18 @@ */ package org.apache.camel.spring.boot; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; @DirtiesContext @CamelSpringBootTest diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/LogListenerDiscoveryTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/LogListenerDiscoveryTest.java index b5a4fb1a03e..7781b4d419a 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/LogListenerDiscoveryTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/LogListenerDiscoveryTest.java @@ -16,19 +16,19 @@ */ package org.apache.camel.spring.boot; +import static org.assertj.core.api.Assertions.assertThat; + import org.apache.camel.CamelContext; import org.apache.camel.Exchange; import org.apache.camel.ExtendedCamelContext; import org.apache.camel.spi.CamelLogger; import org.apache.camel.spi.LogListener; +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.stereotype.Component; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; - -import static org.assertj.core.api.Assertions.assertThat; @DirtiesContext @CamelSpringBootTest diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/NoConvertersTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/NoConvertersTest.java index c6fd4d6cbd3..3c10ac3a9d3 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/NoConvertersTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/NoConvertersTest.java @@ -19,6 +19,7 @@ package org.apache.camel.spring.boot; import static org.junit.jupiter.api.Assertions.assertThrows; import org.apache.camel.TypeConverter; +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.beans.factory.annotation.Autowired; @@ -26,7 +27,6 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.ApplicationContext; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/PlainTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/PlainTest.java index abe316a5e84..4a4fc79dcf9 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/PlainTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/PlainTest.java @@ -17,6 +17,7 @@ package org.apache.camel.spring.boot; import org.apache.camel.CamelContext; +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -25,7 +26,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SpringConverterDelegationTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SpringConverterDelegationTest.java index 44bf173b7ce..016f32efa34 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SpringConverterDelegationTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SpringConverterDelegationTest.java @@ -16,7 +16,10 @@ */ package org.apache.camel.spring.boot; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.apache.camel.TypeConverter; +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -25,9 +28,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; - -import static org.junit.jupiter.api.Assertions.assertEquals; @DirtiesContext @CamelSpringBootTest diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SpringTypeConverterTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SpringTypeConverterTest.java index e59fb352f65..b905bec1670 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SpringTypeConverterTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SpringTypeConverterTest.java @@ -19,7 +19,7 @@ package org.apache.camel.spring.boot; import java.util.Arrays; import java.util.Collection; import java.util.List; - +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -35,7 +35,6 @@ import org.springframework.core.convert.ConverterNotFoundException; import org.springframework.core.convert.converter.Converter; import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/StartupShutdownOrderTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/StartupShutdownOrderTest.java index f25f3a61131..7a4b170f2ec 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/StartupShutdownOrderTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/StartupShutdownOrderTest.java @@ -16,8 +16,9 @@ */ package org.apache.camel.spring.boot; -import java.util.Map; +import static org.assertj.core.api.Assertions.assertThat; +import java.util.Map; import org.apache.camel.CamelContext; import org.apache.camel.support.service.ServiceSupport; import org.junit.jupiter.api.Test; @@ -31,8 +32,6 @@ import org.springframework.context.SmartLifecycle; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; -import static org.assertj.core.api.Assertions.assertThat; - public class StartupShutdownOrderTest { static class AutoCloseableBean implements AutoCloseable, TestState { diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerRestartTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerRestartTest.java index 1fa36bcf49a..dd69db511a2 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerRestartTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerRestartTest.java @@ -16,13 +16,15 @@ */ package org.apache.camel.spring.boot; -import java.util.concurrent.TimeUnit; +import static org.awaitility.Awaitility.await; +import java.util.concurrent.TimeUnit; import org.apache.camel.CamelContext; import org.apache.camel.ServiceStatus; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spi.SupervisingRouteController; import org.apache.camel.spring.boot.dummy.DummyComponent; +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -31,9 +33,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; - -import static org.awaitility.Awaitility.await; @DirtiesContext @CamelSpringBootTest diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerTest.java index 9c9a48c9263..ffe8558a75c 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/SupervisingRouteControllerTest.java @@ -16,13 +16,15 @@ */ package org.apache.camel.spring.boot; -import java.util.concurrent.TimeUnit; +import static org.awaitility.Awaitility.await; +import java.util.concurrent.TimeUnit; import org.apache.camel.CamelContext; import org.apache.camel.ServiceStatus; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spi.SupervisingRouteController; import org.apache.camel.test.AvailablePortFinder; +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -31,9 +33,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; - -import static org.awaitility.Awaitility.await; @DirtiesContext @CamelSpringBootTest diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/ThreadPoolConfigurationTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/ThreadPoolConfigurationTest.java index a67a6c793bb..a98b709a8f9 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/ThreadPoolConfigurationTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/ThreadPoolConfigurationTest.java @@ -20,6 +20,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spi.ThreadPoolProfile; import org.apache.camel.spring.boot.threadpool.CamelThreadPoolAutoConfiguration; +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -28,7 +29,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/UuidGeneratorDiscoveryTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/UuidGeneratorDiscoveryTest.java index 07b90033d10..96fe8641647 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/UuidGeneratorDiscoveryTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/UuidGeneratorDiscoveryTest.java @@ -16,18 +16,17 @@ */ package org.apache.camel.spring.boot; -import java.util.UUID; +import static org.assertj.core.api.Assertions.assertThat; +import java.util.UUID; import org.apache.camel.CamelContext; import org.apache.camel.spi.UuidGenerator; +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.stereotype.Component; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; - -import static org.assertj.core.api.Assertions.assertThat; @DirtiesContext @CamelSpringBootTest diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/XPathPropertyPlaceholderTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/XPathPropertyPlaceholderTest.java index e3389e814c1..dbc3a2789e9 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/XPathPropertyPlaceholderTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/XPathPropertyPlaceholderTest.java @@ -21,6 +21,7 @@ import org.apache.camel.EndpointInject; import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -28,7 +29,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelEndpointsGloballyEnabledTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelEndpointsGloballyEnabledTest.java index c779ec5c2bc..3aff79888d8 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelEndpointsGloballyEnabledTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelEndpointsGloballyEnabledTest.java @@ -18,12 +18,12 @@ package org.apache.camel.spring.boot.actuate.endpoint; import org.apache.camel.spring.boot.CamelAutoConfiguration; +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpointEnabledTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpointEnabledTest.java index 50cee53595a..ee1594c038b 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpointEnabledTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpointEnabledTest.java @@ -18,6 +18,7 @@ package org.apache.camel.spring.boot.actuate.endpoint; import org.apache.camel.CamelContext; import org.apache.camel.spring.boot.CamelAutoConfiguration; +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -25,7 +26,6 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; /* * Test for the {@link CamelRoutesEndpoint} actuator endpoint. diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpointGloballyDisabledAndReenabledTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpointGloballyDisabledAndReenabledTest.java index 693faaff502..e398da498b9 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpointGloballyDisabledAndReenabledTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpointGloballyDisabledAndReenabledTest.java @@ -18,6 +18,7 @@ package org.apache.camel.spring.boot.actuate.endpoint; import org.apache.camel.CamelContext; import org.apache.camel.spring.boot.CamelAutoConfiguration; +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -25,7 +26,6 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; /* * Test for the {@link CamelRoutesEndpoint} actuator endpoint. diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpointTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpointTest.java index c0ed44b67d0..aa7221120f6 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpointTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRouteControllerEndpointTest.java @@ -17,9 +17,9 @@ package org.apache.camel.spring.boot.actuate.endpoint; import java.util.List; - import org.apache.camel.CamelContext; import org.apache.camel.spring.boot.CamelAutoConfiguration; +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -27,7 +27,6 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; /* * Test for the {@link CamelRouteControllerEndpoint} actuator endpoint. diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointEnabledTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointEnabledTest.java index 5d775e58b0e..abcee9acf43 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointEnabledTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointEnabledTest.java @@ -18,6 +18,7 @@ package org.apache.camel.spring.boot.actuate.endpoint; import org.apache.camel.CamelContext; import org.apache.camel.spring.boot.CamelAutoConfiguration; +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -25,7 +26,6 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; /* * Test for the {@link CamelRoutesEndpoint} actuator endpoint. diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointTest.java index 606fdc2e5f5..3c1b8ef53d8 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointTest.java @@ -17,7 +17,6 @@ package org.apache.camel.spring.boot.actuate.endpoint; import java.util.List; - import org.apache.camel.CamelContext; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.actuate.endpoint.CamelRoutesEndpoint.ReadAction; @@ -25,6 +24,7 @@ import org.apache.camel.spring.boot.actuate.endpoint.CamelRoutesEndpoint.RouteDe import org.apache.camel.spring.boot.actuate.endpoint.CamelRoutesEndpoint.RouteEndpointInfo; import org.apache.camel.spring.boot.actuate.endpoint.CamelRoutesEndpoint.TimeInfo; import org.apache.camel.spring.boot.actuate.endpoint.CamelRoutesEndpoint.WriteAction; +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -32,7 +32,6 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; /* * Test for the {@link CamelRoutesEndpoint} actuator endpoint. diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointWriteOperationTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointWriteOperationTest.java index 6e57bf6c271..fddae0379c4 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointWriteOperationTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/endpoint/CamelRoutesEndpointWriteOperationTest.java @@ -22,6 +22,7 @@ import org.apache.camel.impl.engine.AbstractCamelContext; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.spring.boot.actuate.endpoint.CamelRoutesEndpoint.TimeInfo; import org.apache.camel.spring.boot.actuate.endpoint.CamelRoutesEndpoint.WriteAction; +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -29,7 +30,6 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; /* * Test for the {@link CamelRoutesEndpoint} actuator endpoint. diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/CamelHealthTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/CamelHealthTest.java index d4bee442b23..381e6c7e584 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/CamelHealthTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/CamelHealthTest.java @@ -18,6 +18,7 @@ package org.apache.camel.spring.boot.actuate.health; import org.apache.camel.CamelContext; import org.apache.camel.spring.boot.CamelAutoConfiguration; +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -25,7 +26,6 @@ import org.springframework.boot.actuate.health.Health; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.springframework.test.annotation.DirtiesContext; @CamelSpringBootTest diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/CamelProbesTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/CamelProbesTest.java index 44e0836a6ed..13955bae2bc 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/CamelProbesTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/CamelProbesTest.java @@ -16,6 +16,7 @@ */ package org.apache.camel.spring.boot.actuate.health; +import java.io.IOException; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.assertj.core.api.Assertions; @@ -33,8 +34,6 @@ import org.springframework.http.ResponseEntity; import org.springframework.http.client.ClientHttpResponse; import org.springframework.web.client.ResponseErrorHandler; -import java.io.IOException; - @CamelSpringBootTest @EnableAutoConfiguration @SpringBootApplication diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/info/CamelInfoTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/info/CamelInfoTest.java index e3ac1dc50fd..d6995c14b73 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/info/CamelInfoTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/info/CamelInfoTest.java @@ -18,6 +18,7 @@ package org.apache.camel.spring.boot.actuate.info; import org.apache.camel.CamelContext; import org.apache.camel.spring.boot.CamelAutoConfiguration; +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -25,7 +26,6 @@ import org.springframework.boot.actuate.info.Info; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; @CamelSpringBootTest @EnableAutoConfiguration diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/aot/CamelRuntimeHintsTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/aot/CamelRuntimeHintsTest.java index ba00c96af9f..c74403ab5c6 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/aot/CamelRuntimeHintsTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/aot/CamelRuntimeHintsTest.java @@ -16,6 +16,8 @@ */ package org.apache.camel.spring.boot.aot; +import static org.assertj.core.api.Assertions.assertThat; + import org.apache.camel.CamelContext; import org.apache.camel.language.simple.SimpleLanguage; import org.junit.jupiter.api.BeforeEach; @@ -23,8 +25,6 @@ import org.junit.jupiter.api.Test; import org.springframework.aot.hint.RuntimeHints; import org.springframework.aot.hint.predicate.RuntimeHintsPredicates; -import static org.assertj.core.api.Assertions.assertThat; - /** * Unit tests for {@link CamelRuntimeHints}. */ diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/aot/ReflectionHelperTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/aot/ReflectionHelperTest.java index 40f8371f5b7..21b69553577 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/aot/ReflectionHelperTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/aot/ReflectionHelperTest.java @@ -16,16 +16,15 @@ */ package org.apache.camel.spring.boot.aot; +import static org.assertj.core.api.Assertions.assertThat; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import java.util.concurrent.atomic.AtomicInteger; - import org.junit.jupiter.api.Test; -import static org.assertj.core.api.Assertions.assertThat; - /** * Unit tests for {@link ReflectionHelperTest}. */ diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallConfigurationTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallConfigurationTest.java index 5a7c1d788c0..063d2da761a 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallConfigurationTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallConfigurationTest.java @@ -16,6 +16,10 @@ */ package org.apache.camel.spring.boot.cloud; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.List; import java.util.Map; import org.apache.camel.cloud.ServiceChooser; @@ -29,10 +33,6 @@ import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.core.env.Environment; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; - public class CamelCloudServiceCallConfigurationTest { @Test public void testConfiguration() { diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallGlobalConfigurationTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallGlobalConfigurationTest.java index 5c3f4609912..257c1b257af 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallGlobalConfigurationTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallGlobalConfigurationTest.java @@ -17,10 +17,10 @@ package org.apache.camel.spring.boot.cloud; import java.util.Properties; - import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spring.boot.CamelAutoConfiguration; +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -34,7 +34,6 @@ import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.MutablePropertySources; import org.springframework.core.env.PropertiesPropertySource; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallRefExpressionTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallRefExpressionTest.java index 64359e92b67..db0861e6612 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallRefExpressionTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallRefExpressionTest.java @@ -17,12 +17,12 @@ package org.apache.camel.spring.boot.cloud; import java.util.Properties; - import org.apache.camel.Expression; import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.model.language.SimpleExpression; import org.apache.camel.spring.boot.CamelAutoConfiguration; +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -36,7 +36,6 @@ import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.MutablePropertySources; import org.springframework.core.env.PropertiesPropertySource; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallSimpleExpressionTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallSimpleExpressionTest.java index 9b3e8436461..35e8a4425a5 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallSimpleExpressionTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallSimpleExpressionTest.java @@ -17,10 +17,10 @@ package org.apache.camel.spring.boot.cloud; import java.util.Properties; - import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spring.boot.CamelAutoConfiguration; +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -34,7 +34,6 @@ import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.MutablePropertySources; import org.springframework.core.env.PropertiesPropertySource; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallTest.java index 72a2fa90824..76c386e102f 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/cloud/CamelCloudServiceCallTest.java @@ -17,10 +17,10 @@ package org.apache.camel.spring.boot.cloud; import java.util.Properties; - import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.spring.boot.CamelAutoConfiguration; +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -34,7 +34,6 @@ import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.MutablePropertySources; import org.springframework.core.env.PropertiesPropertySource; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; @DirtiesContext @CamelSpringBootTest diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/componentroute/ComponentRouteTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/componentroute/ComponentRouteTest.java index 003fa3a4db2..3ee6cb68623 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/componentroute/ComponentRouteTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/componentroute/ComponentRouteTest.java @@ -19,11 +19,11 @@ package org.apache.camel.spring.boot.componentroute; import org.apache.camel.EndpointInject; import org.apache.camel.ProducerTemplate; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; @CamelSpringBootTest @SpringBootApplication diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/dummy/DummyComponent.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/dummy/DummyComponent.java index 832c6a66b78..93a8f13edc9 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/dummy/DummyComponent.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/dummy/DummyComponent.java @@ -17,7 +17,6 @@ package org.apache.camel.spring.boot.dummy; import java.util.Map; - import org.apache.camel.Endpoint; import org.apache.camel.support.DefaultComponent; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/dummy/DummyConsumer.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/dummy/DummyConsumer.java index bbc3889c4a2..982ea9524e1 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/dummy/DummyConsumer.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/dummy/DummyConsumer.java @@ -17,7 +17,6 @@ package org.apache.camel.spring.boot.dummy; import java.io.IOException; - import org.apache.camel.Endpoint; import org.apache.camel.Processor; import org.apache.camel.support.DefaultConsumer; diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/OverridePropertiesTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/OverridePropertiesTest.java index 16b217b8d03..6f4c39d9a72 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/OverridePropertiesTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/OverridePropertiesTest.java @@ -16,6 +16,7 @@ */ package org.apache.camel.spring.boot.issues; +import java.util.Properties; import org.apache.camel.CamelContext; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; @@ -27,8 +28,6 @@ import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.core.env.PropertiesPropertySource; -import java.util.Properties; - public class OverridePropertiesTest extends CamelSpringTestSupport { @Override diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/RestDslPostTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/RestDslPostTest.java index 4fc83771c9f..907cef29494 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/RestDslPostTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/RestDslPostTest.java @@ -25,6 +25,7 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.model.rest.RestBindingMode; import org.apache.camel.test.AvailablePortFinder; +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -33,7 +34,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.HttpMethod; import org.springframework.http.MediaType; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; @CamelSpringBootTest @EnableAutoConfiguration diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/SimpleOgnlTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/SimpleOgnlTest.java index d94b382ec9e..f76b397831f 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/SimpleOgnlTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/SimpleOgnlTest.java @@ -18,18 +18,17 @@ package org.apache.camel.spring.boot.issues; import java.util.ArrayList; import java.util.List; - import org.apache.camel.EndpointInject; import org.apache.camel.Produce; import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; @CamelSpringBootTest @EnableAutoConfiguration diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/StreamCachingTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/StreamCachingTest.java index d79c498fa15..faf9a0e864a 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/StreamCachingTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/issues/StreamCachingTest.java @@ -16,10 +16,11 @@ */ package org.apache.camel.spring.boot.issues; +import static java.util.Arrays.asList; + import java.io.File; import java.io.FileInputStream; import java.util.List; - import org.apache.camel.CamelContext; import org.apache.camel.EndpointInject; import org.apache.camel.builder.RouteBuilder; @@ -30,8 +31,6 @@ import org.junit.jupiter.api.Test; import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.support.DefaultConversionService; -import static java.util.Arrays.asList; - public class StreamCachingTest extends CamelTestSupport { // this is not a spring boot test as its standalone Camel testing by extending CamelTestSupport diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/AdviceWithTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/AdviceWithTest.java index f1f2b9f0b22..1dabdc176c9 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/AdviceWithTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/mockendpoints/AdviceWithTest.java @@ -16,6 +16,8 @@ */ package org.apache.camel.spring.boot.mockendpoints; +import static org.junit.jupiter.api.Assertions.assertFalse; + import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.AdviceWith; import org.apache.camel.builder.AdviceWithRouteBuilder; @@ -28,8 +30,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; -import static org.junit.jupiter.api.Assertions.assertFalse; - @CamelSpringBootTest @UseAdviceWith @SpringBootApplication diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/security/CamelSSLAutoConfigurationTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/security/CamelSSLAutoConfigurationTest.java index f9fd01b6080..4660b84c744 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/security/CamelSSLAutoConfigurationTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/security/CamelSSLAutoConfigurationTest.java @@ -16,6 +16,10 @@ */ package org.apache.camel.spring.boot.security; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.support.jsse.GlobalSSLContextParametersSupplier; import org.apache.camel.support.jsse.SSLContextParameters; @@ -25,10 +29,6 @@ import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.test.context.runner.ApplicationContextRunner; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; - /** * Testing the ssl configuration */ diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/security/CamelSSLNoConfigTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/security/CamelSSLNoConfigTest.java index dffa1e7d79f..21fdf3ace45 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/security/CamelSSLNoConfigTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/security/CamelSSLNoConfigTest.java @@ -18,6 +18,7 @@ package org.apache.camel.spring.boot.security; import org.apache.camel.spring.boot.CamelAutoConfiguration; import org.apache.camel.support.jsse.GlobalSSLContextParametersSupplier; +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.NoSuchBeanDefinitionException; @@ -27,7 +28,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.ApplicationContext; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; /** * Testing that the ssl configuration is not created if a subproperty of "camel.ssl.config." (note the last dot) is not diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/CamelPropertiesHelperTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/CamelPropertiesHelperTest.java index c82f01c8157..1bd72ae811e 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/CamelPropertiesHelperTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/CamelPropertiesHelperTest.java @@ -19,8 +19,8 @@ package org.apache.camel.spring.boot.util; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; - import org.apache.camel.CamelContext; +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -30,7 +30,6 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; @CamelSpringBootTest @DirtiesContext diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition1Test.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition1Test.java index 572730dc200..4aaf3413a2a 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition1Test.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition1Test.java @@ -16,6 +16,7 @@ */ package org.apache.camel.spring.boot.util; +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -23,7 +24,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.ApplicationContext; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; @CamelSpringBootTest @DirtiesContext diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition2Test.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition2Test.java index 504d4d98f86..15e17384d44 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition2Test.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition2Test.java @@ -16,6 +16,7 @@ */ package org.apache.camel.spring.boot.util; +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -23,7 +24,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.ApplicationContext; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; @CamelSpringBootTest @DirtiesContext diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition3Test.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition3Test.java index a260eac1a48..0306884c07f 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition3Test.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition3Test.java @@ -16,6 +16,7 @@ */ package org.apache.camel.spring.boot.util; +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -23,7 +24,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.ApplicationContext; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; @CamelSpringBootTest @DirtiesContext diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition4Test.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition4Test.java index 00c161282b0..e0a907ca456 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition4Test.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/GroupCondition4Test.java @@ -16,6 +16,7 @@ */ package org.apache.camel.spring.boot.util; +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -23,7 +24,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.ApplicationContext; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; @CamelSpringBootTest @DirtiesContext diff --git a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/HierarchicalPropertiesEvaluatorTest.java b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/HierarchicalPropertiesEvaluatorTest.java index a43ab998bd6..512433dbc74 100644 --- a/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/HierarchicalPropertiesEvaluatorTest.java +++ b/core/camel-spring-boot/src/test/java/org/apache/camel/spring/boot/util/HierarchicalPropertiesEvaluatorTest.java @@ -16,6 +16,7 @@ */ package org.apache.camel.spring.boot.util; +import org.apache.camel.test.spring.junit5.CamelSpringBootTest; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -24,7 +25,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.Environment; import org.springframework.test.annotation.DirtiesContext; -import org.apache.camel.test.spring.junit5.CamelSpringBootTest; @CamelSpringBootTest @DirtiesContext diff --git a/tooling/camel-spring-boot-config-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootConfigGeneratorMojo.java b/tooling/camel-spring-boot-config-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootConfigGeneratorMojo.java index d7cb21ba1f6..1320faac2c6 100644 --- a/tooling/camel-spring-boot-config-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootConfigGeneratorMojo.java +++ b/tooling/camel-spring-boot-config-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootConfigGeneratorMojo.java @@ -16,6 +16,18 @@ */ package org.apache.camel.springboot.maven; +import java.io.File; +import java.io.StringWriter; +import java.io.Writer; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Properties; import org.apache.maven.execution.MavenSession; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; @@ -32,19 +44,6 @@ import org.jboss.forge.roaster.model.Method; import org.jboss.forge.roaster.model.source.JavaClassSource; import org.jboss.forge.roaster.model.source.JavaDocCapableSource; -import java.io.File; -import java.io.StringWriter; -import java.io.Writer; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Properties; - @Mojo(name = "generate-config", threadSafe = true) public class SpringBootConfigGeneratorMojo extends AbstractMojo { diff --git a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/AbstractSpringBootGenerator.java b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/AbstractSpringBootGenerator.java index 7430f25b286..5d57b07d9a9 100644 --- a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/AbstractSpringBootGenerator.java +++ b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/AbstractSpringBootGenerator.java @@ -29,7 +29,6 @@ import java.util.jar.JarEntry; import java.util.jar.JarFile; import java.util.stream.Collectors; import java.util.zip.ZipEntry; - import org.apache.camel.tooling.util.PackageHelper; import org.apache.commons.io.IOUtils; import org.apache.maven.artifact.Artifact; diff --git a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/BomDependenciesGeneratorMojo.java b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/BomDependenciesGeneratorMojo.java index 988fe80ed06..ba32ccf4777 100644 --- a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/BomDependenciesGeneratorMojo.java +++ b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/BomDependenciesGeneratorMojo.java @@ -29,7 +29,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.TreeSet; - import javax.xml.XMLConstants; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -43,7 +42,6 @@ import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathExpression; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; - import org.apache.camel.maven.bom.generator.DependencyMatcher; import org.apache.camel.maven.bom.generator.DependencySet; import org.apache.camel.maven.bom.generator.ExternalBomConflictCheck; diff --git a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/BomGeneratorMojo.java b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/BomGeneratorMojo.java index 9daf2a25445..bc3775e8a11 100644 --- a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/BomGeneratorMojo.java +++ b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/BomGeneratorMojo.java @@ -25,7 +25,6 @@ import java.nio.file.Files; import java.util.ArrayList; import java.util.Comparator; import java.util.List; - import javax.xml.XMLConstants; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -39,7 +38,6 @@ import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathExpression; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; - import org.apache.commons.io.IOUtils; import org.apache.maven.model.Dependency; import org.apache.maven.model.Exclusion; diff --git a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/DynamicClassLoader.java b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/DynamicClassLoader.java index aa5297de786..762967ca0b6 100644 --- a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/DynamicClassLoader.java +++ b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/DynamicClassLoader.java @@ -22,7 +22,6 @@ import java.net.URL; import java.net.URLClassLoader; import java.util.Iterator; import java.util.List; - import org.objectweb.asm.ClassWriter; import org.objectweb.asm.Opcodes; diff --git a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/PrepareCatalogSpringBootMojo.java b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/PrepareCatalogSpringBootMojo.java index 87d7ab3097a..b7c7055460f 100644 --- a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/PrepareCatalogSpringBootMojo.java +++ b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/PrepareCatalogSpringBootMojo.java @@ -27,7 +27,6 @@ import java.util.function.Supplier; import java.util.jar.JarFile; import java.util.stream.Collectors; import java.util.stream.Stream; - import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugins.annotations.LifecyclePhase; diff --git a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java index 6a294c66a4d..13d5e91e1c6 100644 --- a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java +++ b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java @@ -16,6 +16,8 @@ */ package org.apache.camel.springboot.maven; +import static org.apache.camel.tooling.util.Strings.camelCaseToDash; + import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -33,7 +35,6 @@ import java.util.jar.JarFile; import java.util.stream.Collectors; import java.util.stream.Stream; import java.util.zip.ZipEntry; - import org.apache.camel.maven.packaging.AbstractGeneratorMojo; import org.apache.camel.tooling.model.ComponentModel; import org.apache.camel.tooling.model.ComponentModel.ComponentOptionModel; @@ -74,8 +75,6 @@ import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Lazy; -import static org.apache.camel.tooling.util.Strings.camelCaseToDash; - /** * Generate Spring Boot auto configuration files for Camel components and data formats. */ diff --git a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootStarterMojo.java b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootStarterMojo.java index 3ce0b63f66c..de4b2765c84 100644 --- a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootStarterMojo.java +++ b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootStarterMojo.java @@ -28,7 +28,6 @@ import java.util.HashSet; import java.util.Properties; import java.util.Set; import java.util.TreeSet; - import javax.xml.XMLConstants; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -41,12 +40,6 @@ import javax.xml.xpath.XPath; import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathExpression; import javax.xml.xpath.XPathFactory; - -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - import org.apache.commons.io.IOUtils; import org.apache.maven.ProjectDependenciesResolver; import org.apache.maven.artifact.Artifact; @@ -61,6 +54,10 @@ import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.maven.project.MavenProject; import org.apache.maven.project.ProjectBuilder; import org.apache.maven.project.ProjectBuildingResult; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; /** * Generate Spring Boot starter for the component diff --git a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/StarterGeneratorMojo.java b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/StarterGeneratorMojo.java index a876392a7b8..d5bd492ad4f 100644 --- a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/StarterGeneratorMojo.java +++ b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/StarterGeneratorMojo.java @@ -23,7 +23,6 @@ import java.nio.file.Path; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; - import org.apache.commons.io.FileUtils; import org.apache.maven.artifact.factory.ArtifactFactory; import org.apache.maven.plugin.AbstractMojo; diff --git a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/UpdateSpringBootAutoConfigurationReadmeMojo.java b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/UpdateSpringBootAutoConfigurationReadmeMojo.java index c649336f9b3..e85142cccbc 100644 --- a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/UpdateSpringBootAutoConfigurationReadmeMojo.java +++ b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/UpdateSpringBootAutoConfigurationReadmeMojo.java @@ -16,17 +16,19 @@ */ package org.apache.camel.springboot.maven; +import static org.apache.camel.tooling.util.PackageHelper.loadText; +import static org.apache.camel.tooling.util.PackageHelper.writeText; + import java.io.File; import java.io.FileInputStream; import java.io.FileReader; +import java.io.IOException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; -import java.io.IOException; import java.nio.file.Path; import java.util.ArrayList; import java.util.Collections; import java.util.List; - import org.apache.camel.maven.packaging.MvelHelper; import org.apache.camel.springboot.maven.model.SpringBootAutoConfigureOptionModel; import org.apache.camel.springboot.maven.model.SpringBootModel; @@ -42,11 +44,8 @@ import org.apache.maven.plugins.annotations.Component; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.project.MavenProject; -import org.mvel2.templates.TemplateRuntime; import org.codehaus.plexus.build.BuildContext; - -import static org.apache.camel.tooling.util.PackageHelper.loadText; -import static org.apache.camel.tooling.util.PackageHelper.writeText; +import org.mvel2.templates.TemplateRuntime; /** * For all the Camel components that has Spring Boot starter JAR, their documentation .adoc files in their component @@ -116,4 +115,4 @@ public class UpdateSpringBootAutoConfigurationReadmeMojo extends AbstractMojo { } } -} \ No newline at end of file +}