This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push: new 32dbbdb setting up basic OSGi-CDI metadata in the manifest (#4562) 32dbbdb is described below commit 32dbbdbca780d2ae5da0450cb989a9a7607f89a2 Author: Romain Manni-Bucau <rmannibu...@gmail.com> AuthorDate: Fri Nov 13 06:24:19 2020 +0100 setting up basic OSGi-CDI metadata in the manifest (#4562) --- components/camel-cdi/pom.xml | 30 ++++++++++++++++++++-- .../org/apache/camel/cdi/AnnotatedDelegate.java | 2 ++ .../apache/camel/cdi/AnnotatedMemberDelegate.java | 2 ++ .../apache/camel/cdi/AnnotatedMethodDelegate.java | 2 ++ .../apache/camel/cdi/AnnotatedTypeDelegate.java | 2 ++ .../java/org/apache/camel/cdi/BeanDelegate.java | 2 ++ .../apache/camel/cdi/CamelBeanInjectionTarget.java | 2 ++ .../camel/cdi/CamelContextInjectionTarget.java | 2 ++ .../org/apache/camel/cdi/CamelContextProducer.java | 2 ++ .../camel/cdi/CdiCamelConfigurationEvent.java | 3 +++ .../org/apache/camel/cdi/CdiCamelInjector.java | 2 ++ .../org/apache/camel/cdi/CdiEventConsumer.java | 3 +++ .../org/apache/camel/cdi/CdiEventEndpoint.java | 1 + .../org/apache/camel/cdi/CdiEventNotifier.java | 2 ++ .../org/apache/camel/cdi/CdiEventProducer.java | 2 ++ .../apache/camel/cdi/ForwardingObserverMethod.java | 2 ++ .../apache/camel/cdi/ListParameterizedType.java | 3 +++ .../java/org/apache/camel/cdi/SyntheticBean.java | 2 ++ .../apache/camel/cdi/SyntheticBeanAttributes.java | 2 ++ .../org/apache/camel/cdi/XmlCdiBeanFactory.java | 2 ++ .../camel/cdi/XmlErrorHandlerFactoryBean.java | 2 ++ .../camel/cdi/XmlFactoryBeanInjectionTarget.java | 2 ++ .../org/apache/camel/cdi/XmlProxyFactoryBean.java | 2 ++ .../apache/camel/cdi/XmlServiceExporterBean.java | 2 ++ 24 files changed, 76 insertions(+), 2 deletions(-) diff --git a/components/camel-cdi/pom.xml b/components/camel-cdi/pom.xml index 5242560..4d7747b 100644 --- a/components/camel-cdi/pom.xml +++ b/components/camel-cdi/pom.xml @@ -37,10 +37,37 @@ <label>java</label> <title>CDI</title> + <camel.osgi.provide.capability> + osgi.cdi.extension;osgi.cdi.extension="org.apache.camel.cdi"; + version:Version="${camel.osgi.version}"; + aries.cdi.extension.bean.classes:List<String>="org.apache.camel.cdi.CdiCamelFactory,org.apache.camel.cdi.CdiEventComponent"; + uses:="javax.annotation,javax.enterprise.event,javax.enterprise.inject.spi", + osgi.service;objectClass:List<String>="javax.enterprise.inject.spi.Extension", + osgi.service;objectClass:List<String>="javax.enterprise.inject.spi.Extension"; + uses:="javax.enterprise.inject.spi"; + osgi.cdi.extension="org.apache.camel.cdi"; + service.scope=prototype;service.vendor="Apache Software Foundation"; + version:Version="${camel.osgi.version}"; + effective:=active, + osgi.serviceloader;osgi.serviceloader="javax.enterprise.inject.spi.Extension"; + register:="org.apache.camel.cdi.CdiCamelExtension"; + uses:="javax.enterprise.inject.spi"; + osgi.cdi.extension="org.apache.camel.cdi"; + service.scope=prototype; + service.vendor="Apache Software Foundation"; + version:Version="${camel.osgi.version}" + </camel.osgi.provide.capability> + <camel.osgi.require.capability> + osgi.extender;filter:="(&(osgi.extender=osgi.cdi)(version>=1.0.0)(!(version>=2.0.0)))", + osgi.extender;filter:="(&(osgi.extender=osgi.serviceloader.registrar)(version>=1.0.0)(!(version>=2.0.0)))", + osgi.contract;osgi.contract=JavaInject;filter:="(&(osgi.contract=JavaInject)(version=1.0.0))", + osgi.contract;osgi.contract=JavaCDI;filter:="(&(osgi.contract=JavaCDI)(version=2.0.0))", + osgi.contract;osgi.contract=JavaAnnotation;filter:="(&(osgi.contract=JavaAnnotation)(version=1.3.0))" + </camel.osgi.require.capability> <camel.osgi.import> !org.apache.camel.cdi.*, !org.apache.deltaspike.cdise.api.*, - javax.xml.bind*;version="[2.2,3.0)", + javax.xml.bind*;version="[2.2,3.0);optional=true", ${camel.osgi.import.defaults}, * </camel.osgi.import> @@ -70,7 +97,6 @@ </dependencies> </dependencyManagement> <dependencies> - <!-- compile dependencies --> <dependency> diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedDelegate.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedDelegate.java index 4ab5742..0ae285a 100644 --- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedDelegate.java +++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedDelegate.java @@ -21,11 +21,13 @@ import java.lang.reflect.Type; import java.util.HashSet; import java.util.Set; +import javax.enterprise.inject.Vetoed; import javax.enterprise.inject.spi.Annotated; import static java.util.stream.Collectors.toSet; import static org.apache.camel.cdi.CdiSpiHelper.isAnnotationType; +@Vetoed class AnnotatedDelegate implements Annotated { private final Annotated delegate; diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedMemberDelegate.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedMemberDelegate.java index 6fe2c64..6518ec4 100644 --- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedMemberDelegate.java +++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedMemberDelegate.java @@ -20,9 +20,11 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Member; import java.util.Set; +import javax.enterprise.inject.Vetoed; import javax.enterprise.inject.spi.AnnotatedMember; import javax.enterprise.inject.spi.AnnotatedType; +@Vetoed class AnnotatedMemberDelegate<T> extends AnnotatedDelegate implements AnnotatedMember<T> { private final AnnotatedMember<T> delegate; diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedMethodDelegate.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedMethodDelegate.java index d29d625..72d16a2 100644 --- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedMethodDelegate.java +++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedMethodDelegate.java @@ -21,9 +21,11 @@ import java.lang.reflect.Method; import java.util.List; import java.util.Set; +import javax.enterprise.inject.Vetoed; import javax.enterprise.inject.spi.AnnotatedMethod; import javax.enterprise.inject.spi.AnnotatedParameter; +@Vetoed final class AnnotatedMethodDelegate<T> extends AnnotatedMemberDelegate<T> implements AnnotatedMethod<T> { private final AnnotatedMethod<T> delegate; diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedTypeDelegate.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedTypeDelegate.java index e3adc00..1a469a4 100644 --- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedTypeDelegate.java +++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/AnnotatedTypeDelegate.java @@ -19,11 +19,13 @@ package org.apache.camel.cdi; import java.util.HashSet; import java.util.Set; +import javax.enterprise.inject.Vetoed; import javax.enterprise.inject.spi.AnnotatedConstructor; import javax.enterprise.inject.spi.AnnotatedField; import javax.enterprise.inject.spi.AnnotatedMethod; import javax.enterprise.inject.spi.AnnotatedType; +@Vetoed final class AnnotatedTypeDelegate<T> extends AnnotatedDelegate implements AnnotatedType<T> { private final Set<AnnotatedMethod<? super T>> methods; diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanDelegate.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanDelegate.java index 0b2a6ae..4111b28 100644 --- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanDelegate.java +++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/BeanDelegate.java @@ -23,9 +23,11 @@ import java.util.HashSet; import java.util.Set; import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.inject.Vetoed; import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.InjectionPoint; +@Vetoed final class BeanDelegate<T> implements Bean<T> { private final Bean<T> delegate; diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelBeanInjectionTarget.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelBeanInjectionTarget.java index 40cbe7f..e9eb003 100644 --- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelBeanInjectionTarget.java +++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelBeanInjectionTarget.java @@ -18,9 +18,11 @@ package org.apache.camel.cdi; import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.InjectionException; +import javax.enterprise.inject.Vetoed; import javax.enterprise.inject.spi.BeanManager; import javax.enterprise.inject.spi.InjectionTarget; +@Vetoed final class CamelBeanInjectionTarget<T> extends DelegateInjectionTarget<T> implements InjectionTarget<T> { private final InjectionTarget<T> delegate; diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelContextInjectionTarget.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelContextInjectionTarget.java index 3bb343d..b3e7db9 100644 --- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelContextInjectionTarget.java +++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelContextInjectionTarget.java @@ -16,11 +16,13 @@ */ package org.apache.camel.cdi; +import javax.enterprise.inject.Vetoed; import javax.enterprise.inject.spi.InjectionTarget; import javax.enterprise.inject.spi.Producer; import org.apache.camel.CamelContext; +@Vetoed final class CamelContextInjectionTarget<T extends CamelContext> extends DelegateInjectionTarget<T> implements InjectionTarget<T> { diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelContextProducer.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelContextProducer.java index f7929f9..553a68d 100644 --- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelContextProducer.java +++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CamelContextProducer.java @@ -21,6 +21,7 @@ import java.util.Set; import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.InjectionException; +import javax.enterprise.inject.Vetoed; import javax.enterprise.inject.spi.Annotated; import javax.enterprise.inject.spi.AnnotatedField; import javax.enterprise.inject.spi.AnnotatedMethod; @@ -46,6 +47,7 @@ import static org.apache.camel.cdi.CdiSpiHelper.getRawType; import static org.apache.camel.cdi.CdiSpiHelper.isAnnotationType; import static org.apache.camel.cdi.DefaultLiteral.DEFAULT; +@Vetoed final class CamelContextProducer<T extends CamelContext> extends DelegateProducer<T> { private final Logger logger = LoggerFactory.getLogger(getClass()); diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelConfigurationEvent.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelConfigurationEvent.java index d5f3c5f..1cef27f 100644 --- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelConfigurationEvent.java +++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelConfigurationEvent.java @@ -16,6 +16,9 @@ */ package org.apache.camel.cdi; +import javax.enterprise.inject.Vetoed; + +@Vetoed /* package-private */ final class CdiCamelConfigurationEvent implements CdiCamelConfiguration { private boolean autoConfigureRoutes = true; diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelInjector.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelInjector.java index d35d836..c6f741a 100644 --- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelInjector.java +++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiCamelInjector.java @@ -19,6 +19,7 @@ package org.apache.camel.cdi; import java.lang.reflect.Method; import java.lang.reflect.Modifier; +import javax.enterprise.inject.Vetoed; import javax.enterprise.inject.spi.BeanManager; import org.apache.camel.RuntimeCamelException; @@ -26,6 +27,7 @@ import org.apache.camel.spi.Injector; import static org.apache.camel.cdi.BeanManagerHelper.getReferenceByType; +@Vetoed final class CdiCamelInjector implements Injector { private final Injector injector; diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventConsumer.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventConsumer.java index 393b13f..82f8374 100644 --- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventConsumer.java +++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventConsumer.java @@ -16,6 +16,8 @@ */ package org.apache.camel.cdi; +import javax.enterprise.inject.Vetoed; + import org.apache.camel.Exchange; import org.apache.camel.ExtendedExchange; import org.apache.camel.Processor; @@ -25,6 +27,7 @@ import org.apache.camel.support.DefaultConsumer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +@Vetoed final class CdiEventConsumer<T> extends DefaultConsumer { private final Logger logger = LoggerFactory.getLogger(CdiEventConsumer.class); diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventEndpoint.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventEndpoint.java index 2733534..aebfdbc 100644 --- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventEndpoint.java +++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventEndpoint.java @@ -89,6 +89,7 @@ import static java.util.stream.Collectors.joining; * </code> * </pre> */ +@javax.enterprise.inject.Vetoed public final class CdiEventEndpoint<T> extends DefaultEndpoint { private final List<CdiEventConsumer<T>> consumers = new ArrayList<>(); diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventNotifier.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventNotifier.java index 4d42fab..f3d7dfe 100644 --- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventNotifier.java +++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventNotifier.java @@ -22,6 +22,7 @@ import java.util.Collection; import java.util.Collections; import java.util.List; +import javax.enterprise.inject.Vetoed; import javax.enterprise.inject.spi.BeanManager; import org.apache.camel.spi.CamelEvent; @@ -30,6 +31,7 @@ import org.apache.camel.support.EventNotifierSupport; import static org.apache.camel.util.ObjectHelper.isNotEmpty; +@Vetoed final class CdiEventNotifier extends EventNotifierSupport { private final BeanManager manager; diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventProducer.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventProducer.java index 19e17d1..6c5ea8b 100644 --- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventProducer.java +++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/CdiEventProducer.java @@ -17,12 +17,14 @@ package org.apache.camel.cdi; import javax.enterprise.event.Event; +import javax.enterprise.inject.Vetoed; import org.apache.camel.Exchange; import org.apache.camel.support.DefaultProducer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +@Vetoed final class CdiEventProducer<T> extends DefaultProducer { private final Logger logger = LoggerFactory.getLogger(CdiEventProducer.class); diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/ForwardingObserverMethod.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/ForwardingObserverMethod.java index 8371c43..6767d75 100644 --- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/ForwardingObserverMethod.java +++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/ForwardingObserverMethod.java @@ -22,10 +22,12 @@ import java.util.Set; import javax.enterprise.event.Reception; import javax.enterprise.event.TransactionPhase; +import javax.enterprise.inject.Vetoed; import javax.enterprise.inject.spi.ObserverMethod; import org.apache.camel.CamelContext; +@Vetoed final class ForwardingObserverMethod<T> implements ObserverMethod<T> { private final CdiEventEndpoint<T> endpoint; diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/ListParameterizedType.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/ListParameterizedType.java index ae95743..08ead2c 100644 --- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/ListParameterizedType.java +++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/ListParameterizedType.java @@ -20,6 +20,9 @@ import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.util.List; +import javax.enterprise.inject.Vetoed; + +@Vetoed final class ListParameterizedType implements ParameterizedType { private final Type argument; diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBean.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBean.java index 34d6261..c283902 100644 --- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBean.java +++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBean.java @@ -24,6 +24,7 @@ import java.util.function.Function; import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.CreationException; import javax.enterprise.inject.InjectionException; +import javax.enterprise.inject.Vetoed; import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.BeanManager; import javax.enterprise.inject.spi.InjectionPoint; @@ -32,6 +33,7 @@ import javax.enterprise.inject.spi.PassivationCapable; import static org.apache.camel.cdi.CdiSpiHelper.createBeanId; +@Vetoed class SyntheticBean<T> extends SyntheticBeanAttributes<T> implements Bean<T>, PassivationCapable { private final Class<?> type; diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBeanAttributes.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBeanAttributes.java index 6c19317..7eae85a 100644 --- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBeanAttributes.java +++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/SyntheticBeanAttributes.java @@ -21,6 +21,7 @@ import java.lang.reflect.Type; import java.util.Set; import javax.enterprise.context.Dependent; +import javax.enterprise.inject.Vetoed; import javax.enterprise.inject.spi.BeanManager; import javax.inject.Named; @@ -28,6 +29,7 @@ import static java.util.Collections.emptySet; import static java.util.stream.Collectors.toSet; import static org.apache.camel.cdi.CdiSpiHelper.isAnnotationType; +@Vetoed class SyntheticBeanAttributes<T> { private final BeanManager manager; 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 dd7f75f..a46f94d 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 @@ -28,6 +28,7 @@ import java.util.Set; import java.util.stream.Stream; import javax.enterprise.inject.CreationException; +import javax.enterprise.inject.Vetoed; import javax.enterprise.inject.spi.AnnotatedType; import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.BeanManager; @@ -68,6 +69,7 @@ import static org.apache.camel.cdi.Startup.Literal.STARTUP; import static org.apache.camel.util.ObjectHelper.isEmpty; import static org.apache.camel.util.ObjectHelper.isNotEmpty; +@Vetoed final class XmlCdiBeanFactory { private final Logger logger = LoggerFactory.getLogger(XmlCdiBeanFactory.class); 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 895bc18..2550b49 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 @@ -21,6 +21,7 @@ import java.util.function.Function; import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.CreationException; import javax.enterprise.inject.UnsatisfiedResolutionException; +import javax.enterprise.inject.Vetoed; import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.BeanManager; @@ -37,6 +38,7 @@ import static java.util.Objects.nonNull; import static org.apache.camel.cdi.BeanManagerHelper.getReferenceByName; import static org.apache.camel.util.ObjectHelper.isNotEmpty; +@Vetoed 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 00944b8..fff020a 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 @@ -18,6 +18,7 @@ package org.apache.camel.cdi; import javax.enterprise.inject.CreationException; import javax.enterprise.inject.InjectionException; +import javax.enterprise.inject.Vetoed; import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.BeanManager; @@ -27,6 +28,7 @@ import org.apache.camel.core.xml.AbstractCamelFactoryBean; import static org.apache.camel.cdi.BeanManagerHelper.getReference; import static org.apache.camel.util.ObjectHelper.isEmpty; +@Vetoed 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/XmlProxyFactoryBean.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlProxyFactoryBean.java index 4dbeaec..59f35a5 100644 --- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlProxyFactoryBean.java +++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlProxyFactoryBean.java @@ -21,6 +21,7 @@ import java.util.function.Function; import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.CreationException; import javax.enterprise.inject.UnsatisfiedResolutionException; +import javax.enterprise.inject.Vetoed; import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.BeanManager; @@ -36,6 +37,7 @@ import static org.apache.camel.component.bean.ProxyHelper.createProxy; import static org.apache.camel.support.service.ServiceHelper.startService; import static org.apache.camel.util.ObjectHelper.isNotEmpty; +@Vetoed final class XmlProxyFactoryBean<T> extends SyntheticBean<T> { private final BeanManager manager; diff --git a/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlServiceExporterBean.java b/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlServiceExporterBean.java index 5598fc8..3df61e2 100644 --- a/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlServiceExporterBean.java +++ b/components/camel-cdi/src/main/java/org/apache/camel/cdi/XmlServiceExporterBean.java @@ -21,6 +21,7 @@ import java.util.function.Function; import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.CreationException; import javax.enterprise.inject.UnsatisfiedResolutionException; +import javax.enterprise.inject.Vetoed; import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.BeanManager; @@ -37,6 +38,7 @@ import static org.apache.camel.support.CamelContextHelper.getMandatoryEndpoint; import static org.apache.camel.support.service.ServiceHelper.initService; import static org.apache.camel.util.ObjectHelper.isNotEmpty; +@Vetoed final class XmlServiceExporterBean<T> extends SyntheticBean<T> { private final BeanManager manager;