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.git
commit 6832c8bb3cd41df459ff3c0718339381ce01ef08
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon Jan 10 10:06:15 2022 +0100
CAMEL-17459: camel-cdi - Deprecate legacy XML camel context support
---
components/camel-cdi/src/main/docs/cdi.adoc | 4 +++-
.../camel-cdi/src/main/java/org/apache/camel/cdi/ImportResource.java | 3 +++
.../src/main/java/org/apache/camel/cdi/XmlCdiBeanFactory.java | 1 +
.../src/main/java/org/apache/camel/cdi/XmlCdiJaxbContexts.java | 1 +
.../main/java/org/apache/camel/cdi/XmlErrorHandlerFactoryBean.java | 1 +
.../main/java/org/apache/camel/cdi/XmlFactoryBeanInjectionTarget.java | 1 +
.../java/org/apache/camel/cdi/xml/ApplicationContextFactoryBean.java | 1 +
.../src/main/java/org/apache/camel/cdi/xml/BeanManagerAware.java | 1 +
.../src/main/java/org/apache/camel/cdi/xml/BeanManagerHelper.java | 1 +
.../main/java/org/apache/camel/cdi/xml/CamelContextFactoryBean.java | 1 +
.../java/org/apache/camel/cdi/xml/ConsumerTemplateFactoryBean.java | 1 +
.../java/org/apache/camel/cdi/xml/ContextScanRouteBuilderFinder.java | 1 +
.../src/main/java/org/apache/camel/cdi/xml/EndpointFactoryBean.java | 1 +
.../main/java/org/apache/camel/cdi/xml/ErrorHandlerDefinition.java | 1 +
.../src/main/java/org/apache/camel/cdi/xml/ErrorHandlerType.java | 1 +
.../src/main/java/org/apache/camel/cdi/xml/ImportDefinition.java | 1 +
.../java/org/apache/camel/cdi/xml/PackageScanRouteBuilderFinder.java | 1 +
.../java/org/apache/camel/cdi/xml/ProducerTemplateFactoryBean.java | 1 +
.../java/org/apache/camel/cdi/xml/RedeliveryPolicyFactoryBean.java | 1 +
.../src/main/java/org/apache/camel/cdi/xml/RestContextDefinition.java | 1 +
.../org/apache/camel/cdi/xml/RouteConfigurationContextDefinition.java | 1 +
.../main/java/org/apache/camel/cdi/xml/RouteContextDefinition.java | 1 +
.../java/org/apache/camel/cdi/xml/RouteTemplateContextDefinition.java | 1 +
.../src/main/java/org/apache/camel/cdi/xml/ThreadPoolFactoryBean.java | 1 +
24 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/components/camel-cdi/src/main/docs/cdi.adoc
b/components/camel-cdi/src/main/docs/cdi.adoc
index d753dea..4026403 100644
--- a/components/camel-cdi/src/main/docs/cdi.adoc
+++ b/components/camel-cdi/src/main/docs/cdi.adoc
@@ -622,7 +622,9 @@ endpoint instances and the observer methods as the CDI
container doesn't
have any ways of discovering the Camel context model during the
deployment phase.
-== Camel XML configuration import
+== Camel XML configuration import (deprecated)
+
+WARNING: Using Camel XML in camel-cdi is deprecated and will be removed in the
future.
While CDI favors a typesafe dependency injection mechanism, it may be
useful to reuse existing Camel XML configuration files into a Camel CDI
diff --git
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/ImportResource.java
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/ImportResource.java
index 8b310f1..260df7b9 100644
---
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/ImportResource.java
+++
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/ImportResource.java
@@ -21,6 +21,8 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import javax.enterprise.inject.Default;
+
/**
* Indicates one or more resources representing
* <a
href="http://camel.apache.org/http://camel.apache.org/xml-configuration.html";>Camel
XML configuration</a> to
@@ -94,6 +96,7 @@ import java.lang.annotation.Target;
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ ElementType.TYPE })
+@Default
public @interface ImportResource {
/**
diff --git
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlCdiBeanFactory.java
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlCdiBeanFactory.java
index 489b821e..5875873 100644
---
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlCdiBeanFactory.java
+++
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlCdiBeanFactory.java
@@ -66,6 +66,7 @@ import static org.apache.camel.cdi.ResourceHelper.getResource;
import static org.apache.camel.util.ObjectHelper.isNotEmpty;
@Vetoed
+@Deprecated
final class XmlCdiBeanFactory {
private final Logger logger =
LoggerFactory.getLogger(XmlCdiBeanFactory.class);
diff --git
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlCdiJaxbContexts.java
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlCdiJaxbContexts.java
index 38dd21b0..c75055a 100644
---
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlCdiJaxbContexts.java
+++
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlCdiJaxbContexts.java
@@ -24,6 +24,7 @@ import javax.xml.bind.JAXBException;
import org.apache.camel.cdi.xml.ApplicationContextFactoryBean;
import org.apache.camel.model.Constants;
+@Deprecated
enum XmlCdiJaxbContexts {
CAMEL_CDI(Constants.JAXB_CONTEXT_PACKAGES,
ApplicationContextFactoryBean.class.getPackage().getName());
diff --git
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlErrorHandlerFactoryBean.java
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlErrorHandlerFactoryBean.java
index 2550b49..8b087f0 100644
---
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlErrorHandlerFactoryBean.java
+++
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlErrorHandlerFactoryBean.java
@@ -39,6 +39,7 @@ import static
org.apache.camel.cdi.BeanManagerHelper.getReferenceByName;
import static org.apache.camel.util.ObjectHelper.isNotEmpty;
@Vetoed
+@Deprecated
final class XmlErrorHandlerFactoryBean extends
SyntheticBean<ErrorHandlerBuilder> {
private final BeanManager manager;
diff --git
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlFactoryBeanInjectionTarget.java
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlFactoryBeanInjectionTarget.java
index fff020a..172a651 100644
---
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlFactoryBeanInjectionTarget.java
+++
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlFactoryBeanInjectionTarget.java
@@ -29,6 +29,7 @@ import static
org.apache.camel.cdi.BeanManagerHelper.getReference;
import static org.apache.camel.util.ObjectHelper.isEmpty;
@Vetoed
+@Deprecated
final class XmlFactoryBeanInjectionTarget<T> extends
SyntheticInjectionTarget<T> {
XmlFactoryBeanInjectionTarget(BeanManager manager,
AbstractCamelFactoryBean<T> factory, Bean<?> context) {
diff --git
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ApplicationContextFactoryBean.java
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ApplicationContextFactoryBean.java
index 9dde7dc..54aea4d 100644
---
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ApplicationContextFactoryBean.java
+++
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ApplicationContextFactoryBean.java
@@ -29,6 +29,7 @@ import org.apache.camel.core.xml.AbstractCamelFactoryBean;
@XmlRootElement(name = "beans", namespace =
"http://www.springframework.org/schema/beans";)
@XmlAccessorType(XmlAccessType.FIELD)
+@Deprecated
public class ApplicationContextFactoryBean {
@XmlElement(name = "camelContext")
diff --git
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/BeanManagerAware.java
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/BeanManagerAware.java
index c0ed857..cb13a01 100644
---
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/BeanManagerAware.java
+++
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/BeanManagerAware.java
@@ -18,6 +18,7 @@ package org.apache.camel.cdi.xml;
import javax.enterprise.inject.spi.BeanManager;
+@Deprecated
public interface BeanManagerAware {
void setBeanManager(BeanManager manager);
diff --git
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/BeanManagerHelper.java
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/BeanManagerHelper.java
index 930dda6..05253c9 100644
---
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/BeanManagerHelper.java
+++
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/BeanManagerHelper.java
@@ -21,6 +21,7 @@ import javax.enterprise.inject.spi.BeanManager;
import org.apache.camel.CamelContext;
+@Deprecated
final class BeanManagerHelper {
private BeanManagerHelper() {
diff --git
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/CamelContextFactoryBean.java
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/CamelContextFactoryBean.java
index d859554..6d39128 100644
---
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/CamelContextFactoryBean.java
+++
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/CamelContextFactoryBean.java
@@ -75,6 +75,7 @@ import org.apache.camel.spi.PackageScanFilter;
@XmlRootElement(name = "camelContext")
@XmlAccessorType(XmlAccessType.FIELD)
+@Deprecated
public class CamelContextFactoryBean extends
AbstractCamelContextFactoryBean<DefaultCamelContext> implements
BeanManagerAware {
@XmlAttribute(name = "depends-on")
diff --git
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ConsumerTemplateFactoryBean.java
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ConsumerTemplateFactoryBean.java
index e542769..9fe8385 100644
---
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ConsumerTemplateFactoryBean.java
+++
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ConsumerTemplateFactoryBean.java
@@ -30,6 +30,7 @@ import
org.apache.camel.core.xml.AbstractCamelConsumerTemplateFactoryBean;
*/
@XmlRootElement(name = "consumerTemplate")
@XmlAccessorType(XmlAccessType.FIELD)
+@Deprecated
public class ConsumerTemplateFactoryBean extends
AbstractCamelConsumerTemplateFactoryBean implements BeanManagerAware {
@XmlTransient
diff --git
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ContextScanRouteBuilderFinder.java
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ContextScanRouteBuilderFinder.java
index 4eda5eb..6a293ea 100644
---
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ContextScanRouteBuilderFinder.java
+++
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ContextScanRouteBuilderFinder.java
@@ -32,6 +32,7 @@ import org.slf4j.LoggerFactory;
/**
* A helper class which will find all {@link
org.apache.camel.builder.RouteBuilder} beans in the {@link BeanManager}.
*/
+@Deprecated
final class ContextScanRouteBuilderFinder {
private static final AnnotationLiteral<Any> ANY = new
AnnotationLiteral<Any>() {
diff --git
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/EndpointFactoryBean.java
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/EndpointFactoryBean.java
index 835f6b8..ee267a3 100644
---
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/EndpointFactoryBean.java
+++
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/EndpointFactoryBean.java
@@ -31,6 +31,7 @@ import
org.apache.camel.core.xml.AbstractCamelEndpointFactoryBean;
*/
@XmlRootElement(name = "endpoint")
@XmlAccessorType(XmlAccessType.FIELD)
+@Deprecated
public class EndpointFactoryBean extends AbstractCamelEndpointFactoryBean
implements BeanManagerAware {
@XmlTransient
diff --git
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ErrorHandlerDefinition.java
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ErrorHandlerDefinition.java
index 3246a7f..9f51888 100644
---
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ErrorHandlerDefinition.java
+++
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ErrorHandlerDefinition.java
@@ -29,6 +29,7 @@ import org.apache.camel.model.IdentifiedType;
*/
@XmlRootElement(name = "errorHandler")
@XmlAccessorType(XmlAccessType.FIELD)
+@Deprecated
public class ErrorHandlerDefinition extends IdentifiedType {
@XmlAttribute
diff --git
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ErrorHandlerType.java
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ErrorHandlerType.java
index f90813e..6624a4f 100644
---
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ErrorHandlerType.java
+++
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ErrorHandlerType.java
@@ -30,6 +30,7 @@ import org.apache.camel.jta.JtaTransactionErrorHandlerBuilder;
*/
@XmlType
@XmlEnum(String.class)
+@Deprecated
public enum ErrorHandlerType {
DefaultErrorHandler,
diff --git
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ImportDefinition.java
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ImportDefinition.java
index b843a7c..3283110 100644
---
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ImportDefinition.java
+++
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ImportDefinition.java
@@ -27,6 +27,7 @@ import javax.xml.bind.annotation.XmlRootElement;
*/
@XmlRootElement(name = "import")
@XmlAccessorType(XmlAccessType.FIELD)
+@Deprecated
public class ImportDefinition {
@XmlAttribute(required = true)
diff --git
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/PackageScanRouteBuilderFinder.java
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/PackageScanRouteBuilderFinder.java
index 17c7a4c..4bcf846 100644
---
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/PackageScanRouteBuilderFinder.java
+++
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/PackageScanRouteBuilderFinder.java
@@ -30,6 +30,7 @@ import org.slf4j.LoggerFactory;
/**
* A helper class which will find all {@link
org.apache.camel.builder.RouteBuilder} instances on the classpath.
*/
+@Deprecated
final class PackageScanRouteBuilderFinder {
private final Logger logger =
LoggerFactory.getLogger(PackageScanRouteBuilderFinder.class);
diff --git
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ProducerTemplateFactoryBean.java
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ProducerTemplateFactoryBean.java
index 0ca7c14..d7862cf 100644
---
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ProducerTemplateFactoryBean.java
+++
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ProducerTemplateFactoryBean.java
@@ -31,6 +31,7 @@ import
org.apache.camel.core.xml.AbstractCamelProducerTemplateFactoryBean;
*/
@XmlRootElement(name = "template")
@XmlAccessorType(XmlAccessType.FIELD)
+@Deprecated
public class ProducerTemplateFactoryBean extends
AbstractCamelProducerTemplateFactoryBean implements BeanManagerAware {
@XmlTransient
diff --git
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/RedeliveryPolicyFactoryBean.java
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/RedeliveryPolicyFactoryBean.java
index 8bd4e9f..0c25cbe 100644
---
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/RedeliveryPolicyFactoryBean.java
+++
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/RedeliveryPolicyFactoryBean.java
@@ -31,6 +31,7 @@ import
org.apache.camel.processor.errorhandler.RedeliveryPolicy;
*/
@XmlRootElement(name = "redeliveryPolicyProfile")
@XmlAccessorType(XmlAccessType.FIELD)
+@Deprecated
public class RedeliveryPolicyFactoryBean extends
AbstractCamelRedeliveryPolicyFactoryBean implements BeanManagerAware {
@XmlTransient
diff --git
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/RestContextDefinition.java
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/RestContextDefinition.java
index d5e8171..00a24f9 100644
---
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/RestContextDefinition.java
+++
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/RestContextDefinition.java
@@ -29,6 +29,7 @@ import org.apache.camel.model.rest.RestDefinition;
@XmlRootElement(name = "restContext")
@XmlAccessorType(XmlAccessType.FIELD)
+@Deprecated
public class RestContextDefinition extends IdentifiedType {
@XmlElement(name = "rest", required = true)
diff --git
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/RouteConfigurationContextDefinition.java
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/RouteConfigurationContextDefinition.java
index 0a6fcb1..84880df 100644
---
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/RouteConfigurationContextDefinition.java
+++
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/RouteConfigurationContextDefinition.java
@@ -29,6 +29,7 @@ import org.apache.camel.model.RouteConfigurationDefinition;
@XmlRootElement(name = "routeConfigurationContext")
@XmlAccessorType(XmlAccessType.FIELD)
+@Deprecated
public class RouteConfigurationContextDefinition extends IdentifiedType {
@XmlElement(name = "routeConfiguration", required = true)
diff --git
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/RouteContextDefinition.java
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/RouteContextDefinition.java
index e958804..0930d8c 100644
---
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/RouteContextDefinition.java
+++
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/RouteContextDefinition.java
@@ -29,6 +29,7 @@ import org.apache.camel.model.RouteDefinition;
@XmlRootElement(name = "routeContext")
@XmlAccessorType(XmlAccessType.FIELD)
+@Deprecated
public class RouteContextDefinition extends IdentifiedType {
@XmlElement(name = "route", required = true)
diff --git
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/RouteTemplateContextDefinition.java
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/RouteTemplateContextDefinition.java
index 72ffb83..5e52b5a 100644
---
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/RouteTemplateContextDefinition.java
+++
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/RouteTemplateContextDefinition.java
@@ -29,6 +29,7 @@ import org.apache.camel.model.RouteTemplateDefinition;
@XmlRootElement(name = "routeTemplateContext")
@XmlAccessorType(XmlAccessType.FIELD)
+@Deprecated
public class RouteTemplateContextDefinition extends IdentifiedType {
@XmlElement(name = "routeTemplate", required = true)
diff --git
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ThreadPoolFactoryBean.java
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ThreadPoolFactoryBean.java
index 2feac59..181a701 100644
---
a/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ThreadPoolFactoryBean.java
+++
b/components/camel-cdi/src/main/java/org/apache/camel/cdi/xml/ThreadPoolFactoryBean.java
@@ -30,6 +30,7 @@ import
org.apache.camel.core.xml.AbstractCamelThreadPoolFactoryBean;
*/
@XmlRootElement(name = "threadPool")
@XmlAccessorType(XmlAccessType.FIELD)
+@Deprecated
public class ThreadPoolFactoryBean extends AbstractCamelThreadPoolFactoryBean
implements BeanManagerAware {
@XmlTransient
