This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new ad6d2e15358 Regen for commit e0ee0d34645f3dbd6c4a40f7c0fee26b59f1328e
ad6d2e15358 is described below
commit ad6d2e153582c0df77fa86316f8107408ab8abe5
Author: orpiske <[email protected]>
AuthorDate: Sun Apr 2 20:26:18 2023 +0000
Regen for commit e0ee0d34645f3dbd6c4a40f7c0fee26b59f1328e
Signed-off-by: GitHub <[email protected]>
---
.../src/main/java/org/apache/camel/ExtendedCamelContext.java | 3 ---
.../main/java/org/apache/camel/support/jsse/JsseParameters.java | 3 ++-
.../apache/camel/impl/engine/DefaultCamelContextExtension.java | 3 ---
.../main/java/org/apache/camel/converter/ResourceConverter.java | 1 -
.../apache/camel/impl/lw/LightweightCamelContextExtension.java | 3 ---
.../src/test/java/org/apache/camel/util/ResourceLoaderTest.java | 9 ++++++---
.../apache/camel/support/FileWatcherResourceReloadStrategy.java | 3 ++-
.../src/main/java/org/apache/camel/main/KameletMain.java | 3 ++-
.../camel/dsl/xml/jaxb/definition/LoadRestFromXmlTest.java | 3 ++-
.../camel/dsl/xml/jaxb/definition/LoadRouteFromXmlTest.java | 3 ++-
.../xml/jaxb/definition/LoadRouteFromXmlWithInterceptTest.java | 3 ++-
.../xml/jaxb/definition/LoadRouteFromXmlWithNamespaceTest.java | 3 ++-
.../xml/jaxb/definition/LoadRouteFromXmlWithOnExceptionTest.java | 3 ++-
.../dsl/xml/jaxb/definition/LoadRouteFromXmlWithPolicyTest.java | 3 ++-
.../dsl/xml/jaxb/definition/RouteTemplateLoadFromXmlTest.java | 6 ++++--
15 files changed, 28 insertions(+), 24 deletions(-)
diff --git
a/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java
b/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java
index 849a92341a2..b426d7d7c31 100644
--- a/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java
+++ b/core/camel-api/src/main/java/org/apache/camel/ExtendedCamelContext.java
@@ -23,7 +23,6 @@ import java.util.function.Supplier;
import org.apache.camel.catalog.RuntimeCamelCatalog;
import org.apache.camel.spi.AnnotationBasedProcessorFactory;
-import org.apache.camel.spi.BeanIntrospection;
import org.apache.camel.spi.BeanProcessorFactory;
import org.apache.camel.spi.BootstrapCloseable;
import org.apache.camel.spi.DeferServiceFactory;
@@ -43,11 +42,9 @@ import org.apache.camel.spi.PluginManager;
import org.apache.camel.spi.ProcessorExchangeFactory;
import org.apache.camel.spi.ReactiveExecutor;
import org.apache.camel.spi.Registry;
-import org.apache.camel.spi.ResourceLoader;
import org.apache.camel.spi.RouteController;
import org.apache.camel.spi.RouteStartupOrder;
import org.apache.camel.spi.StartupStepRecorder;
-import org.apache.camel.spi.UnitOfWorkFactory;
/**
* Extended {@link CamelContext} which contains the methods and APIs that are
not primary intended for Camel end users
diff --git
a/core/camel-api/src/main/java/org/apache/camel/support/jsse/JsseParameters.java
b/core/camel-api/src/main/java/org/apache/camel/support/jsse/JsseParameters.java
index 47d826a589c..8b7cbeb8cf2 100644
---
a/core/camel-api/src/main/java/org/apache/camel/support/jsse/JsseParameters.java
+++
b/core/camel-api/src/main/java/org/apache/camel/support/jsse/JsseParameters.java
@@ -114,7 +114,8 @@ public class JsseParameters implements CamelContextAware {
protected InputStream resolveResource(String resource) throws IOException {
ObjectHelper.notNull(getCamelContext(), "CamelContext", this);
- Resource res =
getCamelContext().getCamelContextExtension().getContextPlugin(ResourceLoader.class).resolveResource(resource);
+ Resource res
+ =
getCamelContext().getCamelContextExtension().getContextPlugin(ResourceLoader.class).resolveResource(resource);
if (res == null) {
throw new IOException("Could not open " + resource + " as a file,
class path resource, or URL.");
}
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextExtension.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextExtension.java
index 73aa212417b..67baa10af9f 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextExtension.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelContextExtension.java
@@ -36,7 +36,6 @@ import org.apache.camel.Route;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.Service;
import org.apache.camel.spi.AnnotationBasedProcessorFactory;
-import org.apache.camel.spi.BeanIntrospection;
import org.apache.camel.spi.BeanProcessorFactory;
import org.apache.camel.spi.BootstrapCloseable;
import org.apache.camel.spi.Debugger;
@@ -62,11 +61,9 @@ import org.apache.camel.spi.ProcessorExchangeFactory;
import org.apache.camel.spi.PropertiesComponent;
import org.apache.camel.spi.ReactiveExecutor;
import org.apache.camel.spi.Registry;
-import org.apache.camel.spi.ResourceLoader;
import org.apache.camel.spi.RouteController;
import org.apache.camel.spi.RouteStartupOrder;
import org.apache.camel.spi.StartupStepRecorder;
-import org.apache.camel.spi.UnitOfWorkFactory;
import org.apache.camel.support.EndpointHelper;
import org.apache.camel.support.NormalizedUri;
import org.apache.camel.support.PluginHelper;
diff --git
a/core/camel-base/src/main/java/org/apache/camel/converter/ResourceConverter.java
b/core/camel-base/src/main/java/org/apache/camel/converter/ResourceConverter.java
index 8a85783dd28..d12cfac7900 100644
---
a/core/camel-base/src/main/java/org/apache/camel/converter/ResourceConverter.java
+++
b/core/camel-base/src/main/java/org/apache/camel/converter/ResourceConverter.java
@@ -22,7 +22,6 @@ import java.io.Reader;
import org.apache.camel.CamelContext;
import org.apache.camel.Converter;
-import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.spi.Resource;
import org.apache.camel.support.PluginHelper;
diff --git
a/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContextExtension.java
b/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContextExtension.java
index 837da2e48fe..1aaf688b14e 100644
---
a/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContextExtension.java
+++
b/core/camel-core-engine/src/main/java/org/apache/camel/impl/lw/LightweightCamelContextExtension.java
@@ -37,7 +37,6 @@ import org.apache.camel.Route;
import org.apache.camel.Service;
import org.apache.camel.ServiceStatus;
import org.apache.camel.spi.AnnotationBasedProcessorFactory;
-import org.apache.camel.spi.BeanIntrospection;
import org.apache.camel.spi.BeanProcessorFactory;
import org.apache.camel.spi.BootstrapCloseable;
import org.apache.camel.spi.DeferServiceFactory;
@@ -57,12 +56,10 @@ import org.apache.camel.spi.ProcessorExchangeFactory;
import org.apache.camel.spi.PropertiesComponent;
import org.apache.camel.spi.ReactiveExecutor;
import org.apache.camel.spi.Registry;
-import org.apache.camel.spi.ResourceLoader;
import org.apache.camel.spi.RouteController;
import org.apache.camel.spi.RouteStartupOrder;
import org.apache.camel.spi.StartupStepRecorder;
import org.apache.camel.spi.SupervisingRouteController;
-import org.apache.camel.spi.UnitOfWorkFactory;
import org.apache.camel.support.NormalizedUri;
import org.apache.camel.util.StringHelper;
import org.apache.camel.util.URISupport;
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 9968ac80ca7..101c76924ad 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
@@ -48,7 +48,8 @@ public class ResourceLoaderTest extends TestSupport {
@Test
public void testLoadFile() throws Exception {
DefaultCamelContext context = new DefaultCamelContext();
- Resource resource =
PluginHelper.getResourceLoader(context).resolveResource("file:src/test/resources/log4j2.properties");
+ Resource resource
+ =
PluginHelper.getResourceLoader(context).resolveResource("file:src/test/resources/log4j2.properties");
try (InputStream is = resource.getInputStream()) {
assertNotNull(is);
@@ -65,7 +66,8 @@ public class ResourceLoaderTest extends TestSupport {
copyFile(new File("src/test/resources/log4j2.properties"), new
File("target/data/my space/log4j2.properties"));
DefaultCamelContext context = new DefaultCamelContext();
- Resource resource =
PluginHelper.getResourceLoader(context).resolveResource("file:target/data/my%20space/log4j2.properties");
+ Resource resource
+ =
PluginHelper.getResourceLoader(context).resolveResource("file:target/data/my%20space/log4j2.properties");
try (InputStream is = resource.getInputStream()) {
assertNotNull(is);
@@ -229,7 +231,8 @@ public class ResourceLoaderTest extends TestSupport {
@Test
public void testLoadFileAsUrl() throws Exception {
DefaultCamelContext context = new DefaultCamelContext();
- Resource resource =
PluginHelper.getResourceLoader(context).resolveResource("file:src/test/resources/log4j2.properties");
+ Resource resource
+ =
PluginHelper.getResourceLoader(context).resolveResource("file:src/test/resources/log4j2.properties");
URL url = resource.getURI().toURL();
assertNotNull(url);
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/FileWatcherResourceReloadStrategy.java
b/core/camel-support/src/main/java/org/apache/camel/support/FileWatcherResourceReloadStrategy.java
index b24c580ad95..e24606277a5 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/FileWatcherResourceReloadStrategy.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/FileWatcherResourceReloadStrategy.java
@@ -285,7 +285,8 @@ public class FileWatcherResourceReloadStrategy extends
ResourceReloadStrategySup
LOG.debug("Accepted Modified/Created file: {}",
name);
try {
// must use file resource loader as we cannot
load from classpath
- Resource resource =
PluginHelper.getResourceLoader(getCamelContext()).resolveResource("file:" +
name);
+ Resource resource
+ =
PluginHelper.getResourceLoader(getCamelContext()).resolveResource("file:" +
name);
getResourceReload().onReload(name, resource);
incSucceededCounter();
} catch (Exception e) {
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 bc1afb09cb3..8f49f4cbf1c 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
@@ -456,7 +456,8 @@ public class KameletMain extends MainCommandLineSupport {
new DependencyDownloaderDataFormatResolver(answer));
answer.getCamelContextExtension().addContextPlugin(LanguageResolver.class,
new DependencyDownloaderLanguageResolver(answer));
-
answer.getCamelContextExtension().addContextPlugin(ResourceLoader.class, new
DependencyDownloaderResourceLoader(answer));
+
answer.getCamelContextExtension().addContextPlugin(ResourceLoader.class,
+ new DependencyDownloaderResourceLoader(answer));
answer.setInjector(new KameletMainInjector(answer.getInjector(),
stub));
answer.addService(new DependencyDownloaderKamelet(answer));
answer.getCamelContextExtension().getRegistry().bind(DownloadModelineParser.class.getSimpleName(),
diff --git
a/dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRestFromXmlTest.java
b/dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRestFromXmlTest.java
index 1ad1324e56d..7f044047ba1 100644
---
a/dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRestFromXmlTest.java
+++
b/dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRestFromXmlTest.java
@@ -52,7 +52,8 @@ public class LoadRestFromXmlTest extends ContextTestSupport {
foo.assertIsSatisfied();
// load rest from XML and add them to the existing camel context
- Resource resource =
PluginHelper.getResourceLoader(context).resolveResource("org/apache/camel/dsl/xml/jaxb/definition/barRest.xml");
+ Resource resource = PluginHelper.getResourceLoader(context)
+
.resolveResource("org/apache/camel/dsl/xml/jaxb/definition/barRest.xml");
PluginHelper.getRoutesLoader(context).loadRoutes(resource);
assertNotNull(context.getRoute("route1"), "Loaded rest route should be
there");
diff --git
a/dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlTest.java
b/dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlTest.java
index 673f1c45b1c..b2397c8515e 100644
---
a/dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlTest.java
+++
b/dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlTest.java
@@ -41,7 +41,8 @@ public class LoadRouteFromXmlTest extends ContextTestSupport {
// START SNIPPET: e1
// load route from XML and add them to the existing camel context
- Resource resource =
PluginHelper.getResourceLoader(context).resolveResource("org/apache/camel/dsl/xml/jaxb/definition/barRoute.xml");
+ Resource resource = PluginHelper.getResourceLoader(context)
+
.resolveResource("org/apache/camel/dsl/xml/jaxb/definition/barRoute.xml");
PluginHelper.getRoutesLoader(context).loadRoutes(resource);
// END SNIPPET: e1
diff --git
a/dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlWithInterceptTest.java
b/dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlWithInterceptTest.java
index eb6e8d8d832..f0f09cc2cfd 100644
---
a/dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlWithInterceptTest.java
+++
b/dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlWithInterceptTest.java
@@ -34,7 +34,8 @@ public class LoadRouteFromXmlWithInterceptTest extends
ContextTestSupport {
@Test
public void testLoadRouteFromXmlWithIntercept() throws Exception {
Resource resource
- =
PluginHelper.getResourceLoader(context).resolveResource("org/apache/camel/dsl/xml/jaxb/definition/barInterceptorRoute.xml");
+ = PluginHelper.getResourceLoader(context)
+
.resolveResource("org/apache/camel/dsl/xml/jaxb/definition/barInterceptorRoute.xml");
PluginHelper.getRoutesLoader(context).loadRoutes(resource);
context.start();
diff --git
a/dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlWithNamespaceTest.java
b/dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlWithNamespaceTest.java
index 9dcb1442820..45acdac20f5 100644
---
a/dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlWithNamespaceTest.java
+++
b/dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlWithNamespaceTest.java
@@ -30,7 +30,8 @@ public class LoadRouteFromXmlWithNamespaceTest extends
ContextTestSupport {
@Test
public void testLoadRouteWithNamespaceFromXml() throws Exception {
Resource resource
- =
PluginHelper.getResourceLoader(context).resolveResource("org/apache/camel/dsl/xml/jaxb/definition/routeWithNamespace.xml");
+ = PluginHelper.getResourceLoader(context)
+
.resolveResource("org/apache/camel/dsl/xml/jaxb/definition/routeWithNamespace.xml");
PluginHelper.getRoutesLoader(context).loadRoutes(resource);
context.start();
diff --git
a/dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlWithOnExceptionTest.java
b/dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlWithOnExceptionTest.java
index 5cacb3e827a..2942d20f6a4 100644
---
a/dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlWithOnExceptionTest.java
+++
b/dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlWithOnExceptionTest.java
@@ -44,7 +44,8 @@ public class LoadRouteFromXmlWithOnExceptionTest extends
ContextTestSupport {
@Test
public void testLoadRouteFromXmlWitOnException() throws Exception {
Resource resource
- =
PluginHelper.getResourceLoader(context).resolveResource("org/apache/camel/dsl/xml/jaxb/definition/barOnExceptionRoute.xml");
+ = PluginHelper.getResourceLoader(context)
+
.resolveResource("org/apache/camel/dsl/xml/jaxb/definition/barOnExceptionRoute.xml");
PluginHelper.getRoutesLoader(context).loadRoutes(resource);
context.start();
diff --git
a/dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlWithPolicyTest.java
b/dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlWithPolicyTest.java
index 835ab7a554f..f23af9faf8e 100644
---
a/dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlWithPolicyTest.java
+++
b/dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/LoadRouteFromXmlWithPolicyTest.java
@@ -47,7 +47,8 @@ public class LoadRouteFromXmlWithPolicyTest extends
ContextTestSupport {
@Test
public void testLoadRouteFromXmlWitPolicy() throws Exception {
Resource resource
- =
PluginHelper.getResourceLoader(context).resolveResource("org/apache/camel/dsl/xml/jaxb/definition/barPolicyRoute.xml");
+ = PluginHelper.getResourceLoader(context)
+
.resolveResource("org/apache/camel/dsl/xml/jaxb/definition/barPolicyRoute.xml");
PluginHelper.getRoutesLoader(context).loadRoutes(resource);
context.start();
diff --git
a/dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/RouteTemplateLoadFromXmlTest.java
b/dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/RouteTemplateLoadFromXmlTest.java
index edd1ec005f9..b388a64c70a 100644
---
a/dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/RouteTemplateLoadFromXmlTest.java
+++
b/dsl/camel-xml-jaxb-dsl-test/definition/src/test/java/org/apache/camel/dsl/xml/jaxb/definition/RouteTemplateLoadFromXmlTest.java
@@ -33,7 +33,8 @@ public class RouteTemplateLoadFromXmlTest extends
ContextTestSupport {
public void testDefineRouteTemplate() throws Exception {
assertEquals(0, context.getRouteTemplateDefinitions().size());
- Resource resource =
PluginHelper.getResourceLoader(context).resolveResource("org/apache/camel/dsl/xml/jaxb/definition/barTemplate.xml");
+ Resource resource = PluginHelper.getResourceLoader(context)
+
.resolveResource("org/apache/camel/dsl/xml/jaxb/definition/barTemplate.xml");
PluginHelper.getRoutesLoader(context).loadRoutes(resource);
assertEquals(1, context.getRouteTemplateDefinitions().size());
@@ -47,7 +48,8 @@ public class RouteTemplateLoadFromXmlTest extends
ContextTestSupport {
public void testCreateRouteFromRouteTemplate() throws Exception {
assertEquals(0, context.getRouteTemplateDefinitions().size());
- Resource resource =
PluginHelper.getResourceLoader(context).resolveResource("org/apache/camel/dsl/xml/jaxb/definition/barTemplate.xml");
+ Resource resource = PluginHelper.getResourceLoader(context)
+
.resolveResource("org/apache/camel/dsl/xml/jaxb/definition/barTemplate.xml");
PluginHelper.getRoutesLoader(context).loadRoutes(resource);
assertEquals(1, context.getRouteTemplateDefinitions().size());
