This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit bec89203bcfd2020cf7a6af57ac3b1cd5858fd99
Author: Otavio Rodolfo Piske <angusyo...@gmail.com>
AuthorDate: Mon Feb 20 13:34:40 2023 +0100
CAMEL-15105: formatting and import cleanups
---
.../org/apache/camel/builder/RouteBuilderTest.java | 33 +++++++++++-----------
.../camel/builder/RouteModelLifecycleTest.java | 1 -
.../builder/RouteTemplateModelLifecycleTest.java | 1 -
.../impl/EventDrivenPollingConsumerCopyTest.java | 1 -
.../org/apache/camel/util/ResourceLoaderTest.java | 6 ++--
.../builder/endpoint/AbstractEndpointBuilder.java | 1 -
.../java/org/apache/camel/main/KameletMain.java | 6 ++--
.../download/DependencyDownloaderRoutesLoader.java | 1 -
.../apache/camel/dsl/yaml/common/YamlSupport.java | 1 -
.../ErrorHandlerBuilderDeserializer.java | 1 -
10 files changed, 25 insertions(+), 27 deletions(-)
diff --git
a/core/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java
b/core/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java
index 38fee2351c7..da458b2402a 100644
---
a/core/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java
@@ -626,22 +626,23 @@ public class RouteBuilderTest extends TestSupport {
});
try (DefaultCamelContext context = new DefaultCamelContext()) {
-
context.getCamelContextExtension().getRegistry().bind(UUID.randomUUID().toString(),
new RouteBuilderLifecycleStrategy() {
- @Override
- public void beforeConfigure(RouteBuilder builder) {
- ordered.add("before-3");
- }
-
- @Override
- public void afterConfigure(RouteBuilder builder) {
- ordered.add("after-3");
- }
-
- @Override
- public int getOrder() {
- return Ordered.HIGHEST;
- }
- });
+
context.getCamelContextExtension().getRegistry().bind(UUID.randomUUID().toString(),
+ new RouteBuilderLifecycleStrategy() {
+ @Override
+ public void beforeConfigure(RouteBuilder builder) {
+ ordered.add("before-3");
+ }
+
+ @Override
+ public void afterConfigure(RouteBuilder builder) {
+ ordered.add("after-3");
+ }
+
+ @Override
+ public int getOrder() {
+ return Ordered.HIGHEST;
+ }
+ });
context.addRoutes(builder);
diff --git
a/core/camel-core/src/test/java/org/apache/camel/builder/RouteModelLifecycleTest.java
b/core/camel-core/src/test/java/org/apache/camel/builder/RouteModelLifecycleTest.java
index 965cced8fe1..0e5cc84210e 100644
---
a/core/camel-core/src/test/java/org/apache/camel/builder/RouteModelLifecycleTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/builder/RouteModelLifecycleTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.builder;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.model.ModelCamelContext;
import org.apache.camel.model.ModelLifecycleStrategySupport;
import org.apache.camel.model.RouteDefinition;
import org.junit.jupiter.api.Assertions;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/builder/RouteTemplateModelLifecycleTest.java
b/core/camel-core/src/test/java/org/apache/camel/builder/RouteTemplateModelLifecycleTest.java
index c4b2fefa933..a6268968702 100644
---
a/core/camel-core/src/test/java/org/apache/camel/builder/RouteTemplateModelLifecycleTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/builder/RouteTemplateModelLifecycleTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.builder;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.model.ModelCamelContext;
import org.apache.camel.model.ModelLifecycleStrategySupport;
import org.apache.camel.model.RouteTemplateDefinition;
import org.junit.jupiter.api.Assertions;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/impl/EventDrivenPollingConsumerCopyTest.java
b/core/camel-core/src/test/java/org/apache/camel/impl/EventDrivenPollingConsumerCopyTest.java
index cd3694c4cb7..dbe6eb03a58 100644
---
a/core/camel-core/src/test/java/org/apache/camel/impl/EventDrivenPollingConsumerCopyTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/impl/EventDrivenPollingConsumerCopyTest.java
@@ -20,7 +20,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.PollingConsumer;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
diff --git
a/core/camel-core/src/test/java/org/apache/camel/util/ResourceLoaderTest.java
b/core/camel-core/src/test/java/org/apache/camel/util/ResourceLoaderTest.java
index 8ae30097279..cffb1ae2dc1 100644
---
a/core/camel-core/src/test/java/org/apache/camel/util/ResourceLoaderTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/util/ResourceLoaderTest.java
@@ -160,7 +160,8 @@ public class ResourceLoaderTest extends TestSupport {
@Test
public void testLoadBeanDoubleColon() throws Exception {
DefaultCamelContext context = new DefaultCamelContext();
- context.getCamelContextExtension().getRegistry().bind("myBean", new
AtomicReference<InputStream>(new ByteArrayInputStream("a".getBytes())));
+ context.getCamelContextExtension().getRegistry().bind("myBean",
+ new AtomicReference<InputStream>(new
ByteArrayInputStream("a".getBytes())));
Resource resource =
context.getResourceLoader().resolveResource("bean:myBean::get");
@@ -193,7 +194,8 @@ public class ResourceLoaderTest extends TestSupport {
@Test
public void testLoadBeanDot() throws Exception {
DefaultCamelContext context = new DefaultCamelContext();
- context.getCamelContextExtension().getRegistry().bind("myBean", new
AtomicReference<InputStream>(new ByteArrayInputStream("a".getBytes())));
+ context.getCamelContextExtension().getRegistry().bind("myBean",
+ new AtomicReference<InputStream>(new
ByteArrayInputStream("a".getBytes())));
Resource resource =
context.getResourceLoader().resolveResource("bean:myBean.get");
diff --git
a/dsl/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/AbstractEndpointBuilder.java
b/dsl/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/AbstractEndpointBuilder.java
index 6d58c26c49b..f2f008919e7 100644
---
a/dsl/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/AbstractEndpointBuilder.java
+++
b/dsl/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/AbstractEndpointBuilder.java
@@ -27,7 +27,6 @@ import java.util.TreeMap;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.Expression;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.NoSuchEndpointException;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.spi.Language;
diff --git
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
index b75a36471f8..179094fd92c 100644
---
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
+++
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/KameletMain.java
@@ -429,7 +429,8 @@ public class KameletMain extends MainCommandLineSupport {
known.loadKnownDependencies();
DependencyDownloaderPropertyBindingListener listener
= new DependencyDownloaderPropertyBindingListener(answer,
known);
-
answer.getCamelContextExtension().getRegistry().bind(DependencyDownloaderPropertyBindingListener.class.getSimpleName(),
listener);
+ answer.getCamelContextExtension().getRegistry()
+
.bind(DependencyDownloaderPropertyBindingListener.class.getSimpleName(),
listener);
answer.getCamelContextExtension().getRegistry().bind(DependencyDownloaderStrategy.class.getSimpleName(),
new DependencyDownloaderStrategy(answer));
answer.setClassResolver(new
DependencyDownloaderClassResolver(answer, known));
@@ -440,7 +441,8 @@ public class KameletMain extends MainCommandLineSupport {
answer.setResourceLoader(new
DependencyDownloaderResourceLoader(answer));
answer.setInjector(new KameletMainInjector(answer.getInjector(),
stub));
answer.addService(new DependencyDownloaderKamelet(answer));
-
answer.getCamelContextExtension().getRegistry().bind(DownloadModelineParser.class.getSimpleName(),
new DownloadModelineParser(answer));
+
answer.getCamelContextExtension().getRegistry().bind(DownloadModelineParser.class.getSimpleName(),
+ new DownloadModelineParser(answer));
} catch (Exception e) {
throw RuntimeCamelException.wrapRuntimeException(e);
}
diff --git
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderRoutesLoader.java
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderRoutesLoader.java
index 44ea49c593a..1238f82ca4f 100644
---
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderRoutesLoader.java
+++
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderRoutesLoader.java
@@ -18,7 +18,6 @@ package org.apache.camel.main.download;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.dsl.yaml.KameletRoutesBuilderLoader;
import org.apache.camel.impl.engine.DefaultRoutesLoader;
import org.apache.camel.spi.FactoryFinder;
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/main/java/org/apache/camel/dsl/yaml/common/YamlSupport.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/main/java/org/apache/camel/dsl/yaml/common/YamlSupport.java
index 74c838217ca..c3838fbbb22 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/main/java/org/apache/camel/dsl/yaml/common/YamlSupport.java
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl-common/src/main/java/org/apache/camel/dsl/yaml/common/YamlSupport.java
@@ -25,7 +25,6 @@ import java.util.function.Function;
import org.apache.camel.CamelContext;
import org.apache.camel.Component;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.PropertyBindingException;
import org.apache.camel.dsl.yaml.common.exception.InvalidEndpointException;
import org.apache.camel.dsl.yaml.common.exception.InvalidNodeTypeException;
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/ErrorHandlerBuilderDeserializer.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/ErrorHandlerBuilderDeserializer.java
index 4d56f153cc3..5b8212f9e15 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/ErrorHandlerBuilderDeserializer.java
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/ErrorHandlerBuilderDeserializer.java
@@ -18,7 +18,6 @@ package org.apache.camel.dsl.yaml.deserializers;
import org.apache.camel.CamelContext;
import org.apache.camel.ErrorHandlerFactory;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.dsl.yaml.common.YamlDeserializationContext;
import org.apache.camel.dsl.yaml.common.YamlDeserializerResolver;
import org.apache.camel.dsl.yaml.common.exception.UnsupportedFieldException;
