This is an automated email from the ASF dual-hosted git repository. struberg pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/deltaspike.git
commit 84b3e062122b655bb564589fc1d014894cbb174d Author: Mark Struberg <[email protected]> AuthorDate: Wed Jun 25 08:19:51 2025 +0200 DELTASPIKE-1480 replace @Typed() with @Vetoed We previously used @Typed() to block utility classes from being picked up for injection. The CDI spec now provides an own @Vetoed annotation which prevents classes from being picked up as beans alltogether and is thus preferred. --- .../org/apache/deltaspike/cdise/owb/MockHttpSession.java | 4 ++-- .../apache/deltaspike/cdise/owb/MockServletContext.java | 4 ++-- .../deltaspike/core/api/control/ExceptionStackItem.java | 4 ++-- .../core/api/control/event/ExceptionStackEvent.java | 4 ++-- .../core/api/control/event/ExceptionToCatchEvent.java | 4 ++-- .../apache/deltaspike/core/api/literal/TypedLiteral.java | 2 +- .../org/apache/deltaspike/core/util/AnnotationUtils.java | 4 ++-- .../org/apache/deltaspike/core/util/CollectionUtils.java | 4 ++-- .../apache/deltaspike/core/util/bean/BeanBuilder.java | 2 +- .../test/api/metadata/AnnotatedTypeBuilderTest.java | 2 +- .../deltaspike/core/api/config/ConfigResolver.java | 5 ++--- .../core/api/monitoring/MonitorResultEvent.java | 4 ++-- .../deltaspike/core/api/projectstage/ProjectStage.java | 16 ++++++++-------- .../core/api/provider/BeanManagerProvider.java | 2 +- .../deltaspike/core/api/provider/BeanProvider.java | 4 ++-- .../org/apache/deltaspike/core/util/AnnotationUtils.java | 4 ++-- .../org/apache/deltaspike/core/util/ArraysUtils.java | 5 +++-- .../java/org/apache/deltaspike/core/util/BeanUtils.java | 4 ++-- .../deltaspike/core/util/ClassDeactivationUtils.java | 4 ++-- .../java/org/apache/deltaspike/core/util/ClassUtils.java | 5 +++-- .../org/apache/deltaspike/core/util/ContextUtils.java | 4 ++-- .../org/apache/deltaspike/core/util/ExceptionUtils.java | 4 ++-- .../apache/deltaspike/core/util/HierarchyDiscovery.java | 4 ++-- .../org/apache/deltaspike/core/util/ParameterUtil.java | 4 ++-- .../deltaspike/core/util/ParameterizedTypeImpl.java | 4 ++-- .../apache/deltaspike/core/util/PropertyFileUtils.java | 4 ++-- .../java/org/apache/deltaspike/core/util/ProxyUtils.java | 4 ++-- .../org/apache/deltaspike/core/util/ReflectionUtils.java | 4 ++-- .../org/apache/deltaspike/core/util/ServiceUtils.java | 4 ++-- .../org/apache/deltaspike/core/util/StringUtils.java | 4 ++-- .../core/util/interceptor/AbstractInvocationContext.java | 4 ++-- .../securitymanaged/SetAccessiblePrivilegedAction.java | 4 ++-- .../core/impl/control/DefaultExceptionEvent.java | 4 ++-- .../core/impl/control/ExceptionHandlerComparator.java | 4 ++-- .../deltaspike/core/impl/control/HandlerMethodImpl.java | 4 ++-- .../core/impl/control/HandlerMethodStorageImpl.java | 4 ++-- .../core/impl/config/ConfigurationExtension.java | 3 ++- .../core/impl/config/LocalJndiConfigSource.java | 4 ++-- .../core/impl/exclude/extension/ExcludeExtension.java | 2 +- .../deltaspike/core/impl/lock/LockSupplierStorage.java | 2 +- .../deltaspike/core/impl/message/DefaultMessage.java | 4 ++-- .../core/impl/message/DefaultMessageContext.java | 2 +- .../core/impl/message/MessageBundleContext.java | 4 ++-- .../scope/conversation/GroupedConversationContext.java | 4 ++-- .../conversation/InjectableGroupedConversation.java | 4 ++-- .../InjectableGroupedConversationManager.java | 4 ++-- .../viewaccess/InjectableViewAccessContextManager.java | 4 ++-- .../core/impl/scope/viewaccess/ViewAccessContext.java | 4 ++-- .../core/impl/scope/window/InjectableWindowContext.java | 4 ++-- .../core/impl/scope/window/WindowContextImpl.java | 4 ++-- .../deltaspike/core/impl/throttling/InvokerStorage.java | 2 +- .../deltaspike/core/impl/util/ConversationUtils.java | 4 ++-- .../org/apache/deltaspike/core/impl/util/JndiUtils.java | 4 ++-- .../test/core/api/message/FixedGermanLocaleResolver.java | 4 ++-- .../test/core/api/message/TestMessageResolver.java | 4 ++-- .../deltaspike/test/core/api/provider/ManualBean.java | 4 ++-- .../descriptor/xml/EntityMappingsDescriptorParser.java | 4 ++-- .../descriptor/xml/PersistenceUnitDescriptorParser.java | 4 ++-- .../xml/PersistenceUnitDescriptorProvider.java | 4 ++-- .../jpa/impl/transaction/context/EntityManagerEntry.java | 4 ++-- .../impl/transaction/context/TransactionBeanEntry.java | 4 ++-- .../entitymanager/TestPersistenceProviderResolver.java | 8 ++++---- .../test/jpa/api/shared/TestEntityManager.java | 4 ++-- .../jsf/impl/config/view/DefaultViewConfigResolver.java | 4 ++-- .../jsf/impl/listener/phase/DeltaSpikePhaseListener.java | 4 ++-- .../listener/phase/JsfRequestLifecyclePhaseListener.java | 2 +- .../deltaspike/jsf/impl/message/DefaultJsfMessage.java | 4 ++-- .../deltaspike/jsf/impl/message/FacesMessageEntry.java | 4 ++-- .../impl/message/JsfMessageBundleInvocationHandler.java | 4 ++-- .../deltaspike/jsf/impl/util/ClientWindowHelper.java | 4 ++-- .../apache/deltaspike/jsf/impl/util/SecurityUtils.java | 4 ++-- .../deltaspike/jsf/impl/util/SharedStringBuilder.java | 4 ++-- .../partialbean/impl/PartialBeanProxyFactory.java | 4 ++-- .../test/core/api/partialbean/uc009/TestCustomType.java | 4 ++-- .../spi/invocation/DeltaSpikeProxyInvocationContext.java | 4 ++-- .../proxy/impl/AsmDeltaSpikeProxyClassGenerator.java | 4 ++-- .../org/apache/deltaspike/scheduler/impl/JobAdapter.java | 4 ++-- .../deltaspike/scheduler/impl/JobRunnableAdapter.java | 4 ++-- .../deltaspike/test/scheduler/custom/TestJobManager.java | 4 +++- .../deltaspike/security/impl/extension/Authorizer.java | 4 ++-- .../deltaspike/security/impl/util/SecurityUtils.java | 4 ++-- .../testcontrol/mock/uc003/MockedSessionScopedBean.java | 2 +- .../mock/uc004/MockedApplicationScopedBean.java | 2 +- .../test/testcontrol/mock/uc005/ProducedBean.java | 2 +- .../testcontrol/mock/uc005/ProducedBeanProducer.java | 2 +- .../test/testcontrol/mock/uc007/ProducedBean.java | 2 +- .../testcontrol/mock/uc007/ProducedBeanProducer.java | 2 +- .../test/testcontrol/mock/uc008/MockedTypedBeanTest.java | 2 +- .../test/testcontrol/mock/uc008/TypedBean1and2.java | 2 +- .../test/testcontrol/mock/uc008/TypedBean3.java | 2 +- .../mock/uc009/MockedTypedProducedBeanTest.java | 2 +- .../test/testcontrol/mock/uc009/TypedBean1and2.java | 2 +- .../test/testcontrol/mock/uc009/TypedBean3.java | 2 +- .../test/testcontrol/mock/uc009/TypedBeanProducer.java | 2 +- .../mock/uc011/MockedRequestScopedBeanWithInjection.java | 2 +- .../mock/uc012/MockedRequestScopedBeanWithInjection.java | 2 +- .../test/testcontrol/mock/uc013/TypedBean1and2.java | 2 +- .../test/testcontrol/mock/uc013/TypedBean3.java | 2 +- .../test/testcontrol/mock/uc013/TypedBeanProducer.java | 2 +- .../mock/uc014/MockedTypedProducedBeanTest.java | 2 +- .../test/testcontrol/mock/uc014/TypedBean1and2.java | 2 +- .../test/testcontrol/mock/uc014/TypedBean3.java | 2 +- .../test/testcontrol/mock/uc014/TypedBeanProducer.java | 2 +- .../testcontrol/impl/mock/AbstractMockManager.java | 2 +- .../deltaspike/testcontrol/impl/mock/MockExtension.java | 4 ++-- .../impl/mock/SimpleApplicationMockManager.java | 2 +- .../testcontrol/impl/mock/SimpleMockManager.java | 2 +- .../validation/StandardContextTestControlValidator.java | 4 ++-- .../deltaspike/test/testcontrol/CustomMockManager.java | 2 +- .../testcontrol/uc004/ProjectStageTestControlTest.java | 2 +- deltaspike/readme/ReleaseNotes-0.3-incubating.txt | 2 +- documentation/src/main/asciidoc/jpa.adoc | 2 +- 112 files changed, 197 insertions(+), 193 deletions(-) diff --git a/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockHttpSession.java b/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockHttpSession.java index 53657d535..3336fe052 100644 --- a/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockHttpSession.java +++ b/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockHttpSession.java @@ -22,14 +22,14 @@ import java.util.Enumeration; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import jakarta.servlet.ServletContext; import jakarta.servlet.http.HttpSession; /** * A simple mock HttpSession */ -@Typed // ignore this as CDI bean +@Vetoed // ignore this as CDI bean public class MockHttpSession implements HttpSession { private String sessionId; diff --git a/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockServletContext.java b/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockServletContext.java index 054ae753f..b79e479c3 100644 --- a/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockServletContext.java +++ b/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockServletContext.java @@ -28,7 +28,7 @@ import java.util.Map; import java.util.Set; import java.util.StringTokenizer; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import jakarta.servlet.Filter; import jakarta.servlet.FilterRegistration; import jakarta.servlet.RequestDispatcher; @@ -45,7 +45,7 @@ import jakarta.servlet.descriptor.JspConfigDescriptor; * Mock ServletContext needed to startup the container. * */ -@Typed // ignore this as CDI bean +@Vetoed // ignore this as CDI bean public class MockServletContext implements ServletContext { private static MockServletContext instance = new MockServletContext(); diff --git a/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/control/ExceptionStackItem.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/control/ExceptionStackItem.java index 8f11f9fac..0bb21f707 100644 --- a/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/control/ExceptionStackItem.java +++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/control/ExceptionStackItem.java @@ -19,7 +19,7 @@ package org.apache.deltaspike.core.api.exception.control; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import java.io.Serializable; import java.util.Arrays; @@ -27,7 +27,7 @@ import java.util.Arrays; * Container for the exception and it's stack trace. */ @SuppressWarnings("CdiManagedBeanInconsistencyInspection") -@Typed() +@Vetoed public final class ExceptionStackItem implements Serializable { private static final long serialVersionUID = 5162936095781886477L; diff --git a/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/control/event/ExceptionStackEvent.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/control/event/ExceptionStackEvent.java index b64f82a50..cc407837b 100644 --- a/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/control/event/ExceptionStackEvent.java +++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/control/event/ExceptionStackEvent.java @@ -21,7 +21,7 @@ package org.apache.deltaspike.core.api.exception.control.event; import org.apache.deltaspike.core.api.exception.control.ExceptionStackItem; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import java.io.Serializable; import java.sql.SQLException; import java.util.ArrayDeque; @@ -33,7 +33,7 @@ import java.util.Deque; * Information about the current exception and exception cause container. This object is not immutable. */ @SuppressWarnings("CdiManagedBeanInconsistencyInspection") -@Typed() +@Vetoed public class ExceptionStackEvent implements Serializable { private static final long serialVersionUID = -6069790756478700680L; diff --git a/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/control/event/ExceptionToCatchEvent.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/control/event/ExceptionToCatchEvent.java index 67c2f012e..dac36e4c9 100644 --- a/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/control/event/ExceptionToCatchEvent.java +++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/control/event/ExceptionToCatchEvent.java @@ -19,7 +19,7 @@ package org.apache.deltaspike.core.api.exception.control.event; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import java.io.Serializable; import java.lang.annotation.Annotation; import java.util.Collections; @@ -31,7 +31,7 @@ import java.util.Set; * is the handled flag. */ @SuppressWarnings("CdiManagedBeanInconsistencyInspection") -@Typed() +@Vetoed public class ExceptionToCatchEvent implements Serializable { private static final long serialVersionUID = 2646115104528108266L; diff --git a/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/TypedLiteral.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/TypedLiteral.java index 018278112..ef945f886 100644 --- a/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/TypedLiteral.java +++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/TypedLiteral.java @@ -19,7 +19,7 @@ package org.apache.deltaspike.core.api.literal; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import jakarta.enterprise.util.AnnotationLiteral; /** diff --git a/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/AnnotationUtils.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/AnnotationUtils.java index ce873eaa1..8ee332638 100644 --- a/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/AnnotationUtils.java +++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/AnnotationUtils.java @@ -19,7 +19,7 @@ package org.apache.deltaspike.core.util; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import jakarta.enterprise.inject.spi.BeanManager; import jakarta.enterprise.util.Nonbinding; import java.lang.annotation.Annotation; @@ -27,7 +27,7 @@ import java.lang.reflect.Method; import java.lang.reflect.Type; import java.util.Arrays; -@Typed() +@Vetoed public abstract class AnnotationUtils { private AnnotationUtils() diff --git a/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/CollectionUtils.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/CollectionUtils.java index f8d329542..96a4009d6 100644 --- a/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/CollectionUtils.java +++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/CollectionUtils.java @@ -19,12 +19,12 @@ package org.apache.deltaspike.core.util; import java.util.Collection; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; /** * A collection of utilities for working with Collections */ -@Typed() +@Vetoed public abstract class CollectionUtils { private CollectionUtils() diff --git a/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/bean/BeanBuilder.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/bean/BeanBuilder.java index c2bc7024c..98d0464a9 100644 --- a/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/bean/BeanBuilder.java +++ b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/bean/BeanBuilder.java @@ -28,7 +28,7 @@ import org.apache.deltaspike.core.util.metadata.builder.DummyInjectionTarget; import jakarta.enterprise.context.Dependent; import jakarta.enterprise.inject.Alternative; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import jakarta.enterprise.inject.spi.AnnotatedType; import jakarta.enterprise.inject.spi.Bean; import jakarta.enterprise.inject.spi.BeanManager; diff --git a/deltaspike/core/api/obsolete/src/test/java/org/apache/deltaspike/test/api/metadata/AnnotatedTypeBuilderTest.java b/deltaspike/core/api/obsolete/src/test/java/org/apache/deltaspike/test/api/metadata/AnnotatedTypeBuilderTest.java index af30e3d57..fdef8e76e 100644 --- a/deltaspike/core/api/obsolete/src/test/java/org/apache/deltaspike/test/api/metadata/AnnotatedTypeBuilderTest.java +++ b/deltaspike/core/api/obsolete/src/test/java/org/apache/deltaspike/test/api/metadata/AnnotatedTypeBuilderTest.java @@ -31,7 +31,7 @@ import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.event.Observes; import jakarta.enterprise.inject.Alternative; import jakarta.enterprise.inject.Default; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import jakarta.enterprise.inject.spi.AnnotatedConstructor; import jakarta.enterprise.inject.spi.AnnotatedMethod; import jakarta.enterprise.inject.spi.AnnotatedParameter; diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/ConfigResolver.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/ConfigResolver.java index f15bb1134..84cf2c7d1 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/ConfigResolver.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/ConfigResolver.java @@ -30,8 +30,7 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; -import jakarta.enterprise.inject.Typed; - +import jakarta.enterprise.inject.Vetoed; import org.apache.deltaspike.core.spi.config.ConfigFilter; import org.apache.deltaspike.core.spi.config.ConfigSource; import org.apache.deltaspike.core.util.ClassUtils; @@ -52,7 +51,7 @@ import org.apache.deltaspike.core.util.ClassUtils; * * @see <a href="http://deltaspike.apache.org/documentation/configuration.html";>DeltaSpike Configuration Mechanism</a> */ -@Typed() +@Vetoed public final class ConfigResolver { /** diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/monitoring/MonitorResultEvent.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/monitoring/MonitorResultEvent.java index 5496bc798..f884ba6ae 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/monitoring/MonitorResultEvent.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/monitoring/MonitorResultEvent.java @@ -18,7 +18,7 @@ */ package org.apache.deltaspike.core.api.monitoring; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import java.util.HashMap; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; @@ -29,7 +29,7 @@ import java.util.concurrent.atomic.AtomicLong; * * @see InvocationMonitored */ -@Typed() +@Vetoed public class MonitorResultEvent { private Map<String, AtomicInteger> methodInvocations = new HashMap<String, AtomicInteger>(); diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/projectstage/ProjectStage.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/projectstage/ProjectStage.java index 6bef269a3..952d96d56 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/projectstage/ProjectStage.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/projectstage/ProjectStage.java @@ -21,7 +21,7 @@ package org.apache.deltaspike.core.api.projectstage; import org.apache.deltaspike.core.util.ServiceUtils; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import java.io.Serializable; import java.util.HashMap; import java.util.List; @@ -103,7 +103,7 @@ import java.util.logging.Logger; * </p> * */ -@Typed() +@Vetoed public abstract class ProjectStage implements Serializable { private static final long serialVersionUID = -1210639662598734888L; @@ -220,7 +220,7 @@ public abstract class ProjectStage implements Serializable /** * Project-stage for unit-tests */ - @Typed() + @Vetoed public static final class UnitTest extends ProjectStage implements TestStage { private static final long serialVersionUID = -7910349894182034559L; @@ -234,7 +234,7 @@ public abstract class ProjectStage implements Serializable /** * Project-stage for development */ - @Typed() + @Vetoed public static final class Development extends ProjectStage { private static final long serialVersionUID = 1977308277341527250L; @@ -248,7 +248,7 @@ public abstract class ProjectStage implements Serializable /** * Project-stage for system-tests */ - @Typed() + @Vetoed public static final class SystemTest extends ProjectStage implements TestStage { private static final long serialVersionUID = -7444003351466372539L; @@ -262,7 +262,7 @@ public abstract class ProjectStage implements Serializable /** * Project-stage for integration-tests */ - @Typed() + @Vetoed public static final class IntegrationTest extends ProjectStage implements TestStage { private static final long serialVersionUID = 2034474361615347127L; @@ -276,7 +276,7 @@ public abstract class ProjectStage implements Serializable /** * Project-stage for staging */ - @Typed() + @Vetoed public static final class Staging extends ProjectStage { private static final long serialVersionUID = -8426149532860809553L; @@ -290,7 +290,7 @@ public abstract class ProjectStage implements Serializable /** * Default project-stage for production */ - @Typed() + @Vetoed public static final class Production extends ProjectStage { private static final long serialVersionUID = -4030601958667812084L; diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanManagerProvider.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanManagerProvider.java index 27c0cbe33..4f9954123 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanManagerProvider.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanManagerProvider.java @@ -93,7 +93,7 @@ public class BeanManagerProvider implements Extension * * <p><b>Attention:</b> This instance must only be used through the {@link #bmpSingleton} singleton!</p> */ - private volatile Map<ClassLoader, BeanManagerInfo> bmInfos = new ConcurrentHashMap<ClassLoader, BeanManagerInfo>(); + private volatile Map<ClassLoader, BeanManagerInfo> bmInfos = new ConcurrentHashMap<>(); /** * Indicates whether the {@link BeanManagerProvider} has been initialized. Usually it's not necessary to call this diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanProvider.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanProvider.java index e4b5d128a..f8741a33b 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanProvider.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanProvider.java @@ -24,7 +24,7 @@ import org.apache.deltaspike.core.util.ProjectStageProducer; import jakarta.enterprise.context.Dependent; import jakarta.enterprise.context.spi.CreationalContext; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import jakarta.enterprise.inject.spi.AnnotatedType; import jakarta.enterprise.inject.spi.Bean; import jakarta.enterprise.inject.spi.BeanManager; @@ -53,7 +53,7 @@ import java.util.logging.Logger; * @see DependentProvider * @see BeanManagerProvider */ -@Typed() +@Vetoed public final class BeanProvider { private static final Logger LOG = Logger.getLogger(BeanProvider.class.getName()); diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/AnnotationUtils.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/AnnotationUtils.java index ce873eaa1..8ee332638 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/AnnotationUtils.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/AnnotationUtils.java @@ -19,7 +19,7 @@ package org.apache.deltaspike.core.util; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import jakarta.enterprise.inject.spi.BeanManager; import jakarta.enterprise.util.Nonbinding; import java.lang.annotation.Annotation; @@ -27,7 +27,7 @@ import java.lang.reflect.Method; import java.lang.reflect.Type; import java.util.Arrays; -@Typed() +@Vetoed public abstract class AnnotationUtils { private AnnotationUtils() diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ArraysUtils.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ArraysUtils.java index dfbb5f4c0..7270427f8 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ArraysUtils.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ArraysUtils.java @@ -18,7 +18,8 @@ */ package org.apache.deltaspike.core.util; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; + import java.util.Collections; import java.util.HashSet; import java.util.Set; @@ -26,7 +27,7 @@ import java.util.Set; /** * A collection of utilities for working with Arrays */ -@Typed() +@Vetoed public abstract class ArraysUtils { private ArraysUtils() diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/BeanUtils.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/BeanUtils.java index acfe3a3cf..75df7daa5 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/BeanUtils.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/BeanUtils.java @@ -19,7 +19,7 @@ package org.apache.deltaspike.core.util; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import jakarta.enterprise.inject.spi.Annotated; import jakarta.enterprise.inject.spi.AnnotatedMethod; import jakarta.enterprise.inject.spi.AnnotatedParameter; @@ -37,7 +37,7 @@ import java.util.Set; /** * A set of utility methods for working with beans. */ -@Typed() +@Vetoed public abstract class BeanUtils { diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ClassDeactivationUtils.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ClassDeactivationUtils.java index d448d5a9f..aeb04f048 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ClassDeactivationUtils.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ClassDeactivationUtils.java @@ -18,12 +18,12 @@ */ package org.apache.deltaspike.core.util; +import jakarta.enterprise.inject.Vetoed; import org.apache.deltaspike.core.api.config.ConfigResolver; import org.apache.deltaspike.core.api.projectstage.ProjectStage; import org.apache.deltaspike.core.spi.activation.ClassDeactivator; import org.apache.deltaspike.core.spi.activation.Deactivatable; -import jakarta.enterprise.inject.Typed; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -34,7 +34,7 @@ import java.util.logging.Logger; /** * Helper methods for {@link ClassDeactivator} */ -@Typed() +@Vetoed public abstract class ClassDeactivationUtils { private static final Logger LOG = Logger.getLogger(ClassDeactivationUtils.class.getName()); diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ClassUtils.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ClassUtils.java index 086432876..2672f059f 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ClassUtils.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ClassUtils.java @@ -20,7 +20,8 @@ package org.apache.deltaspike.core.util; import java.lang.reflect.Constructor; import java.lang.reflect.Method; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; + import java.lang.reflect.Modifier; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; @@ -35,7 +36,7 @@ import java.net.URL; * * Abstract to not get picked up as CDI bean on old containers. */ -@Typed() +@Vetoed public abstract class ClassUtils { /** diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ContextUtils.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ContextUtils.java index 165acb1cd..b1a277bbe 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ContextUtils.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ContextUtils.java @@ -20,14 +20,14 @@ package org.apache.deltaspike.core.util; import java.lang.annotation.Annotation; import jakarta.enterprise.context.ContextNotActiveException; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import jakarta.enterprise.inject.spi.BeanManager; import org.apache.deltaspike.core.api.provider.BeanManagerProvider; /** * A set of utility methods for working with contexts. */ -@Typed() +@Vetoed public abstract class ContextUtils { private ContextUtils() diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ExceptionUtils.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ExceptionUtils.java index b1f70c68e..a347bf0bb 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ExceptionUtils.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ExceptionUtils.java @@ -19,10 +19,10 @@ package org.apache.deltaspike.core.util; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import java.lang.reflect.Constructor; -@Typed() +@Vetoed public abstract class ExceptionUtils { private ExceptionUtils() diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/HierarchyDiscovery.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/HierarchyDiscovery.java index 6e19fd00d..44d19b950 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/HierarchyDiscovery.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/HierarchyDiscovery.java @@ -19,7 +19,7 @@ package org.apache.deltaspike.core.util; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.lang.reflect.TypeVariable; @@ -36,7 +36,7 @@ import java.util.logging.Logger; //X TODO: Look at merging this with ClassUtils perhaps //X TODO: JavaDoc //X TODO review -@Typed() +@Vetoed public class HierarchyDiscovery { private final Type type; diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ParameterUtil.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ParameterUtil.java index abbc679b2..b3045d9ff 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ParameterUtil.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ParameterUtil.java @@ -22,9 +22,9 @@ package org.apache.deltaspike.core.util; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; -@Typed() +@Vetoed public abstract class ParameterUtil { private static boolean parameterSupported = true; diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ParameterizedTypeImpl.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ParameterizedTypeImpl.java index e3a0e761c..c5e77875b 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ParameterizedTypeImpl.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ParameterizedTypeImpl.java @@ -19,7 +19,7 @@ package org.apache.deltaspike.core.util; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.util.Arrays; @@ -27,7 +27,7 @@ import java.util.Arrays; /** * A basic implementation of {@link ParameterizedType}. */ -@Typed() +@Vetoed class ParameterizedTypeImpl implements ParameterizedType { private final Type[] actualTypeArguments; diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/PropertyFileUtils.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/PropertyFileUtils.java index 5f36fdd99..11ee40f06 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/PropertyFileUtils.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/PropertyFileUtils.java @@ -18,7 +18,7 @@ */ package org.apache.deltaspike.core.util; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -31,7 +31,7 @@ import java.util.Properties; import java.util.ResourceBundle; import java.util.Vector; -@Typed() +@Vetoed public abstract class PropertyFileUtils { /** diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ProxyUtils.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ProxyUtils.java index 3d5efba17..47edeb119 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ProxyUtils.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ProxyUtils.java @@ -18,7 +18,7 @@ */ package org.apache.deltaspike.core.util; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import java.lang.reflect.Proxy; import java.util.ArrayList; import java.util.List; @@ -26,7 +26,7 @@ import java.util.List; /** * Helper for proxies */ -@Typed() +@Vetoed public abstract class ProxyUtils { private ProxyUtils() diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ReflectionUtils.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ReflectionUtils.java index 651d2b7fe..bbf31b275 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ReflectionUtils.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ReflectionUtils.java @@ -19,7 +19,7 @@ package org.apache.deltaspike.core.util; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import jakarta.enterprise.util.Nonbinding; import java.io.Serializable; import java.lang.annotation.Annotation; @@ -44,7 +44,7 @@ import org.apache.deltaspike.core.util.securitymanaged.SetAccessiblePrivilegedAc */ //X TODO: Look at merging this with some of the other classes from CODI, or if they're really needed //X TODO: Also some methods need JavaDoc -@Typed() +@Vetoed public abstract class ReflectionUtils { private static final Object[] EMPTY_OBJECT_ARRAY = new Object[0]; diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ServiceUtils.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ServiceUtils.java index ae6f20f39..9493c5c8f 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ServiceUtils.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ServiceUtils.java @@ -20,7 +20,7 @@ package org.apache.deltaspike.core.util; import org.apache.deltaspike.core.spi.activation.Deactivatable; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -31,7 +31,7 @@ import java.util.logging.Logger; * Allows handling the lookup (with fallbacks) in a central place. * See DELTASPIKE-97 */ -@Typed() +@Vetoed public abstract class ServiceUtils { private static final Logger LOG = Logger.getLogger(ServiceUtils.class.getName()); diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/StringUtils.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/StringUtils.java index f6e27b1e3..7d171ef08 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/StringUtils.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/StringUtils.java @@ -18,9 +18,9 @@ */ package org.apache.deltaspike.core.util; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; -@Typed() +@Vetoed public abstract class StringUtils { /** diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/interceptor/AbstractInvocationContext.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/interceptor/AbstractInvocationContext.java index 78aad17d9..e7a68a17a 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/interceptor/AbstractInvocationContext.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/interceptor/AbstractInvocationContext.java @@ -18,14 +18,14 @@ */ package org.apache.deltaspike.core.util.interceptor; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import jakarta.interceptor.InvocationContext; import java.lang.reflect.Constructor; import java.lang.reflect.Method; import java.util.HashMap; import java.util.Map; -@Typed() +@Vetoed public abstract class AbstractInvocationContext<T> implements InvocationContext { protected final T target; diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/securitymanaged/SetAccessiblePrivilegedAction.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/securitymanaged/SetAccessiblePrivilegedAction.java index 596b0dafb..d508bd4ee 100644 --- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/securitymanaged/SetAccessiblePrivilegedAction.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/securitymanaged/SetAccessiblePrivilegedAction.java @@ -19,7 +19,7 @@ package org.apache.deltaspike.core.util.securitymanaged; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import java.lang.reflect.AccessibleObject; import java.security.PrivilegedAction; @@ -27,7 +27,7 @@ import java.security.PrivilegedAction; * PrivilegedAction instance to enabling access to the specified {@link AccessibleObject}. * It's only useful if {@link System#getSecurityManager()} returns a {@link SecurityManager}. */ -@Typed() +@Vetoed public class SetAccessiblePrivilegedAction implements PrivilegedAction<Void> { private final AccessibleObject member; diff --git a/deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/control/DefaultExceptionEvent.java b/deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/control/DefaultExceptionEvent.java index 914d4d6c9..1e5079745 100644 --- a/deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/control/DefaultExceptionEvent.java +++ b/deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/control/DefaultExceptionEvent.java @@ -23,7 +23,7 @@ import org.apache.deltaspike.core.api.exception.control.ExceptionHandlingFlow; import org.apache.deltaspike.core.api.exception.control.event.ExceptionStackEvent; import org.apache.deltaspike.core.spi.exception.control.event.IntrospectiveExceptionEvent; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; /** * Payload for an exception to be handled. This object is not immutable as small pieces of the state may be set by the @@ -31,7 +31,7 @@ import jakarta.enterprise.inject.Typed; * * @param <T> Exception type this event represents */ -@Typed() +@Vetoed public class DefaultExceptionEvent<T extends Throwable> implements IntrospectiveExceptionEvent<T> { private final T exception; diff --git a/deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/control/ExceptionHandlerComparator.java b/deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/control/ExceptionHandlerComparator.java index 48bbf0201..0d697d75e 100644 --- a/deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/control/ExceptionHandlerComparator.java +++ b/deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/control/ExceptionHandlerComparator.java @@ -23,7 +23,7 @@ import org.apache.deltaspike.core.api.exception.control.HandlerMethod; import org.apache.deltaspike.core.api.literal.AnyLiteral; import org.apache.deltaspike.core.util.HierarchyDiscovery; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import java.lang.reflect.Type; import java.util.ArrayList; import java.util.Comparator; @@ -35,7 +35,7 @@ import java.util.Set; * (highest to lowest) and finally hierarchy (least to most specific). */ @SuppressWarnings({ "MethodWithMoreThanThreeNegations" }) -@Typed() +@Vetoed public final class ExceptionHandlerComparator implements Comparator<HandlerMethod<?>> { /** diff --git a/deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/control/HandlerMethodImpl.java b/deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/control/HandlerMethodImpl.java index a96abcdf6..696d8d510 100644 --- a/deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/control/HandlerMethodImpl.java +++ b/deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/control/HandlerMethodImpl.java @@ -30,7 +30,7 @@ import org.apache.deltaspike.core.util.metadata.builder.ImmutableInjectionPoint; import org.apache.deltaspike.core.util.metadata.builder.InjectableMethod; import jakarta.enterprise.context.spi.CreationalContext; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import jakarta.enterprise.inject.spi.AnnotatedMethod; import jakarta.enterprise.inject.spi.AnnotatedParameter; import jakarta.enterprise.inject.spi.Bean; @@ -49,7 +49,7 @@ import java.util.Set; * * @param <T> Type of the exception this handler handles. */ -@Typed() +@Vetoed public class HandlerMethodImpl<T extends Throwable> implements HandlerMethod<T> { private final Class declaringBeanClass; diff --git a/deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/control/HandlerMethodStorageImpl.java b/deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/control/HandlerMethodStorageImpl.java index 59aafd293..7fc7d6a5a 100644 --- a/deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/control/HandlerMethodStorageImpl.java +++ b/deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/control/HandlerMethodStorageImpl.java @@ -23,7 +23,7 @@ import org.apache.deltaspike.core.api.exception.control.HandlerMethod; import org.apache.deltaspike.core.api.literal.AnyLiteral; import org.apache.deltaspike.core.util.HierarchyDiscovery; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import jakarta.enterprise.inject.spi.BeanManager; import java.lang.annotation.Annotation; import java.lang.reflect.Type; @@ -39,7 +39,7 @@ import java.util.logging.Logger; * Basic implementation for {@link HandlerMethodStorage}. */ @SuppressWarnings("CdiManagedBeanInconsistencyInspection") -@Typed() +@Vetoed class HandlerMethodStorageImpl implements HandlerMethodStorage { private final Map<Type, Collection<HandlerMethod<? extends Throwable>>> allHandlers; diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigurationExtension.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigurationExtension.java index 399cff983..092c4f965 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigurationExtension.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/ConfigurationExtension.java @@ -25,6 +25,7 @@ import jakarta.enterprise.inject.Any; import jakarta.enterprise.inject.Default; import jakarta.enterprise.inject.Produces; import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import jakarta.enterprise.inject.spi.AfterBeanDiscovery; import jakarta.enterprise.inject.spi.AfterDeploymentValidation; import jakarta.enterprise.inject.spi.Bean; @@ -493,7 +494,7 @@ public class ConfigurationExtension implements Extension, Deactivatable } } - @Typed + @Vetoed private static final class DynamicBean<T> implements Bean<T> { private final Bean<T> producer; diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/LocalJndiConfigSource.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/LocalJndiConfigSource.java index aedb6407c..6c644b5d9 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/LocalJndiConfigSource.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/config/LocalJndiConfigSource.java @@ -21,7 +21,7 @@ package org.apache.deltaspike.core.impl.config; import java.util.HashMap; import java.util.Map; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import org.apache.deltaspike.core.impl.util.JndiUtils; @@ -29,7 +29,7 @@ import org.apache.deltaspike.core.impl.util.JndiUtils; * {@link org.apache.deltaspike.core.spi.config.ConfigSource} * which uses JNDI for the lookup */ -@Typed() +@Vetoed class LocalJndiConfigSource extends BaseConfigSource { private static final String BASE_NAME = "java:comp/env/deltaspike/"; diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java index 1ecca99c5..f9bdc6411 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exclude/extension/ExcludeExtension.java @@ -187,7 +187,7 @@ public class ExcludeExtension implements Extension, Deactivatable protected void vetoCustomProjectStageBeans(ProcessAnnotatedType processAnnotatedType) { //currently there is a veto for all project-stage implementations, - //but we still need @Typed() for the provided implementations in case of the deactivation of this behaviour + //but we still need for the provided implementations in case of the deactivation of this behaviour if (ProjectStage.class.isAssignableFrom(processAnnotatedType.getAnnotatedType().getJavaClass())) { processAnnotatedType.veto(); diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/lock/LockSupplierStorage.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/lock/LockSupplierStorage.java index e51c6d7bd..1e328b72a 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/lock/LockSupplierStorage.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/lock/LockSupplierStorage.java @@ -18,11 +18,11 @@ */ package org.apache.deltaspike.core.impl.lock; +import jakarta.enterprise.inject.Typed; import org.apache.deltaspike.core.api.lock.Locked; import org.apache.deltaspike.core.impl.util.AnnotatedMethods; import jakarta.enterprise.context.ApplicationScoped; -import jakarta.enterprise.inject.Typed; import jakarta.enterprise.inject.spi.AnnotatedMethod; import jakarta.enterprise.inject.spi.AnnotatedType; import jakarta.enterprise.inject.spi.BeanManager; diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessage.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessage.java index ffb53ec86..e2989fa19 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessage.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessage.java @@ -23,7 +23,7 @@ import org.apache.deltaspike.core.api.message.MessageContext; import org.apache.deltaspike.core.api.message.MessageInterpolator; import org.apache.deltaspike.core.api.message.MessageResolver; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; @@ -37,7 +37,7 @@ import static org.apache.deltaspike.core.api.message.MessageResolver.MISSING_RES /** * {@inheritDoc} */ -@Typed() +@Vetoed public class DefaultMessage implements Message { private String messageTemplate; diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageContext.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageContext.java index a7d6b928f..f7ff05ef2 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageContext.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/DefaultMessageContext.java @@ -18,6 +18,7 @@ */ package org.apache.deltaspike.core.impl.message; +import jakarta.enterprise.inject.Typed; import org.apache.deltaspike.core.api.message.LocaleResolver; import org.apache.deltaspike.core.api.message.Message; import org.apache.deltaspike.core.api.message.MessageContext; @@ -25,7 +26,6 @@ import org.apache.deltaspike.core.api.message.MessageInterpolator; import org.apache.deltaspike.core.api.message.MessageResolver; import jakarta.enterprise.context.Dependent; -import jakarta.enterprise.inject.Typed; import jakarta.inject.Inject; import java.util.ArrayList; import java.util.Collections; diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleContext.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleContext.java index 972eda705..53f04aeb2 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleContext.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/message/MessageBundleContext.java @@ -18,10 +18,10 @@ */ package org.apache.deltaspike.core.impl.message; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import jakarta.enterprise.inject.spi.Bean; -@Typed() +@Vetoed abstract class MessageBundleContext { private static final ThreadLocal<Bean> MESSAGE_BUNDLE_BEAN = new ThreadLocal<Bean>(); diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/conversation/GroupedConversationContext.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/conversation/GroupedConversationContext.java index 06699fe43..4ac04360c 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/conversation/GroupedConversationContext.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/conversation/GroupedConversationContext.java @@ -28,7 +28,7 @@ import org.apache.deltaspike.core.util.context.ContextualInstanceInfo; import org.apache.deltaspike.core.util.context.ContextualStorage; import jakarta.enterprise.context.spi.Contextual; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import jakarta.enterprise.inject.spi.BeanManager; import java.lang.annotation.Annotation; import java.util.ArrayList; @@ -38,7 +38,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -@Typed() +@Vetoed //TODO add RequestCache //TODO ConversationSubGroup public class GroupedConversationContext extends AbstractContext implements GroupedConversationManager diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/conversation/InjectableGroupedConversation.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/conversation/InjectableGroupedConversation.java index 60eee7296..cb824a378 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/conversation/InjectableGroupedConversation.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/conversation/InjectableGroupedConversation.java @@ -21,11 +21,11 @@ package org.apache.deltaspike.core.impl.scope.conversation; import org.apache.deltaspike.core.api.scope.GroupedConversation; import org.apache.deltaspike.core.spi.scope.conversation.GroupedConversationManager; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import java.lang.annotation.Annotation; import java.util.Set; -@Typed() +@Vetoed class InjectableGroupedConversation implements GroupedConversation { private static final long serialVersionUID = -3909049219127821425L; diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/conversation/InjectableGroupedConversationManager.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/conversation/InjectableGroupedConversationManager.java index 57b4eac1e..151d6778d 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/conversation/InjectableGroupedConversationManager.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/conversation/InjectableGroupedConversationManager.java @@ -23,11 +23,11 @@ import org.apache.deltaspike.core.impl.scope.DeltaSpikeContextExtension; import org.apache.deltaspike.core.spi.scope.conversation.GroupedConversationManager; import org.apache.deltaspike.core.util.context.ContextualStorage; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import java.lang.annotation.Annotation; import java.util.Set; -@Typed() +@Vetoed class InjectableGroupedConversationManager implements GroupedConversationManager { private transient volatile GroupedConversationManager conversationManager; diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/InjectableViewAccessContextManager.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/InjectableViewAccessContextManager.java index c72eeac93..f042b3882 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/InjectableViewAccessContextManager.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/InjectableViewAccessContextManager.java @@ -22,9 +22,9 @@ import org.apache.deltaspike.core.api.provider.BeanProvider; import org.apache.deltaspike.core.impl.scope.DeltaSpikeContextExtension; import org.apache.deltaspike.core.spi.scope.viewaccess.ViewAccessContextManager; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; -@Typed() +@Vetoed class InjectableViewAccessContextManager implements ViewAccessContextManager { private transient volatile ViewAccessContextManager viewAccessContextManager; diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/ViewAccessContext.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/ViewAccessContext.java index e2ba15ac0..d551ee6d8 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/ViewAccessContext.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/viewaccess/ViewAccessContext.java @@ -27,13 +27,13 @@ import org.apache.deltaspike.core.util.context.ContextualStorage; import jakarta.enterprise.context.spi.Contextual; import jakarta.enterprise.context.spi.CreationalContext; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import jakarta.enterprise.inject.spi.BeanManager; import jakarta.enterprise.inject.spi.PassivationCapable; import java.lang.annotation.Annotation; import java.util.Map; -@Typed() +@Vetoed public class ViewAccessContext extends AbstractContext implements ViewAccessContextManager { private static final String KEY = "VAS"; //TODO re-visit key (e.g. view-id instead of using one big storage) diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/InjectableWindowContext.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/InjectableWindowContext.java index 6383b19c9..de8ec81e8 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/InjectableWindowContext.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/InjectableWindowContext.java @@ -22,11 +22,11 @@ import org.apache.deltaspike.core.api.provider.BeanProvider; import org.apache.deltaspike.core.impl.scope.DeltaSpikeContextExtension; import org.apache.deltaspike.core.spi.scope.window.WindowContext; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; //keep it public for supporting #{dsWindowContext.getCurrentWindowId()} in addition to //#{dsWindowContext.currentWindowId} -@Typed() +@Vetoed public class InjectableWindowContext implements WindowContext { private static final long serialVersionUID = -3606786361833889628L; diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowContextImpl.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowContextImpl.java index 0845c52e4..a57ad3c20 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowContextImpl.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/scope/window/WindowContextImpl.java @@ -20,7 +20,7 @@ package org.apache.deltaspike.core.impl.scope.window; import jakarta.enterprise.context.ContextNotActiveException; import jakarta.enterprise.context.spi.Contextual; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import jakarta.enterprise.inject.spi.BeanManager; import java.lang.annotation.Annotation; @@ -35,7 +35,7 @@ import org.apache.deltaspike.core.util.context.ContextualStorage; * This also implements the interface to control the id of * the currently active 'window' (e.g. a web browser tab). */ -@Typed() +@Vetoed public class WindowContextImpl extends AbstractContext implements WindowContext { /** diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/throttling/InvokerStorage.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/throttling/InvokerStorage.java index 4b6ee17a7..d57d0c668 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/throttling/InvokerStorage.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/throttling/InvokerStorage.java @@ -19,12 +19,12 @@ package org.apache.deltaspike.core.impl.throttling; +import jakarta.enterprise.inject.Typed; import org.apache.deltaspike.core.api.throttling.Throttled; import org.apache.deltaspike.core.api.throttling.Throttling; import org.apache.deltaspike.core.impl.util.AnnotatedMethods; import jakarta.enterprise.context.ApplicationScoped; -import jakarta.enterprise.inject.Typed; import jakarta.enterprise.inject.spi.AnnotatedMethod; import jakarta.enterprise.inject.spi.AnnotatedType; import jakarta.enterprise.inject.spi.BeanManager; diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/ConversationUtils.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/ConversationUtils.java index 981b1d37e..1afa7796c 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/ConversationUtils.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/ConversationUtils.java @@ -23,14 +23,14 @@ import org.apache.deltaspike.core.api.scope.ConversationSubGroup; import org.apache.deltaspike.core.impl.scope.conversation.ConversationKey; import jakarta.enterprise.context.spi.Contextual; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import jakarta.enterprise.inject.spi.Bean; import jakarta.enterprise.inject.spi.BeanManager; import jakarta.enterprise.inject.spi.PassivationCapable; import java.lang.annotation.Annotation; import java.util.Set; -@Typed() +@Vetoed public abstract class ConversationUtils { private ConversationUtils() diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/JndiUtils.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/JndiUtils.java index b2616a3b6..df0de83a4 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/JndiUtils.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/util/JndiUtils.java @@ -23,7 +23,7 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import javax.naming.InitialContext; import javax.naming.Name; import javax.naming.NameClassPair; @@ -37,7 +37,7 @@ import org.apache.deltaspike.core.util.ExceptionUtils; /** * This is the internal helper class for low level access to JNDI */ -@Typed() +@Vetoed public abstract class JndiUtils { private static final Logger LOG = Logger.getLogger(JndiUtils.class.getName()); diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/FixedGermanLocaleResolver.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/FixedGermanLocaleResolver.java index c10c53129..9653e6e4c 100644 --- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/FixedGermanLocaleResolver.java +++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/FixedGermanLocaleResolver.java @@ -20,10 +20,10 @@ package org.apache.deltaspike.test.core.api.message; import org.apache.deltaspike.core.api.message.LocaleResolver; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import java.util.Locale; -@Typed() +@Vetoed class FixedGermanLocaleResolver implements LocaleResolver { private static final long serialVersionUID = 1927000487639667775L; diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/TestMessageResolver.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/TestMessageResolver.java index c04cc5e16..e79a90afb 100644 --- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/TestMessageResolver.java +++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/message/TestMessageResolver.java @@ -22,11 +22,11 @@ import org.apache.deltaspike.core.api.message.MessageContext; import org.apache.deltaspike.core.api.message.MessageResolver; import org.apache.deltaspike.core.util.PropertyFileUtils; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import java.util.MissingResourceException; import java.util.ResourceBundle; -@Typed() +@Vetoed public class TestMessageResolver implements MessageResolver { private static final long serialVersionUID = -7977480064291950923L; diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/ManualBean.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/ManualBean.java index ba5144ae7..1474f60b8 100644 --- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/ManualBean.java +++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/provider/ManualBean.java @@ -18,10 +18,10 @@ */ package org.apache.deltaspike.test.core.api.provider; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import jakarta.inject.Inject; -@Typed() +@Vetoed class ManualBean { @Inject diff --git a/deltaspike/modules/jpa/api/src/main/java/org/apache/deltaspike/jpa/spi/descriptor/xml/EntityMappingsDescriptorParser.java b/deltaspike/modules/jpa/api/src/main/java/org/apache/deltaspike/jpa/spi/descriptor/xml/EntityMappingsDescriptorParser.java index e3e68ad5b..186ed872b 100644 --- a/deltaspike/modules/jpa/api/src/main/java/org/apache/deltaspike/jpa/spi/descriptor/xml/EntityMappingsDescriptorParser.java +++ b/deltaspike/modules/jpa/api/src/main/java/org/apache/deltaspike/jpa/spi/descriptor/xml/EntityMappingsDescriptorParser.java @@ -23,14 +23,14 @@ import java.io.Serializable; import java.util.Collections; import java.util.LinkedList; import java.util.List; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -@Typed +@Vetoed public class EntityMappingsDescriptorParser extends DescriptorReader { public static final String DEFAULT_ORM_PATH = "META-INF/orm.xml"; diff --git a/deltaspike/modules/jpa/api/src/main/java/org/apache/deltaspike/jpa/spi/descriptor/xml/PersistenceUnitDescriptorParser.java b/deltaspike/modules/jpa/api/src/main/java/org/apache/deltaspike/jpa/spi/descriptor/xml/PersistenceUnitDescriptorParser.java index 566b093a4..93e434cfb 100644 --- a/deltaspike/modules/jpa/api/src/main/java/org/apache/deltaspike/jpa/spi/descriptor/xml/PersistenceUnitDescriptorParser.java +++ b/deltaspike/modules/jpa/api/src/main/java/org/apache/deltaspike/jpa/spi/descriptor/xml/PersistenceUnitDescriptorParser.java @@ -28,9 +28,9 @@ import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; -@Typed +@Vetoed public class PersistenceUnitDescriptorParser extends DescriptorReader { public static final String RESOURCE_PATH = "META-INF/persistence.xml"; diff --git a/deltaspike/modules/jpa/api/src/main/java/org/apache/deltaspike/jpa/spi/descriptor/xml/PersistenceUnitDescriptorProvider.java b/deltaspike/modules/jpa/api/src/main/java/org/apache/deltaspike/jpa/spi/descriptor/xml/PersistenceUnitDescriptorProvider.java index 866b79a74..59fc741dd 100644 --- a/deltaspike/modules/jpa/api/src/main/java/org/apache/deltaspike/jpa/spi/descriptor/xml/PersistenceUnitDescriptorProvider.java +++ b/deltaspike/modules/jpa/api/src/main/java/org/apache/deltaspike/jpa/spi/descriptor/xml/PersistenceUnitDescriptorProvider.java @@ -21,10 +21,10 @@ package org.apache.deltaspike.jpa.spi.descriptor.xml; import java.io.IOException; import java.util.Collections; import java.util.List; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import org.apache.deltaspike.core.util.StringUtils; -@Typed +@Vetoed public final class PersistenceUnitDescriptorProvider { private static final PersistenceUnitDescriptorProvider INSTANCE = new PersistenceUnitDescriptorProvider(); diff --git a/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/transaction/context/EntityManagerEntry.java b/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/transaction/context/EntityManagerEntry.java index 80f51344a..78398a25c 100644 --- a/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/transaction/context/EntityManagerEntry.java +++ b/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/transaction/context/EntityManagerEntry.java @@ -18,14 +18,14 @@ */ package org.apache.deltaspike.jpa.impl.transaction.context; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import jakarta.persistence.EntityManager; import java.lang.annotation.Annotation; /** * Stores a {@link EntityManager} and the qualifier */ -@Typed() +@Vetoed public class EntityManagerEntry { private final EntityManager entityManager; diff --git a/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/transaction/context/TransactionBeanEntry.java b/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/transaction/context/TransactionBeanEntry.java index 4680d7476..cbe9751a0 100644 --- a/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/transaction/context/TransactionBeanEntry.java +++ b/deltaspike/modules/jpa/impl/src/main/java/org/apache/deltaspike/jpa/impl/transaction/context/TransactionBeanEntry.java @@ -20,13 +20,13 @@ package org.apache.deltaspike.jpa.impl.transaction.context; import jakarta.enterprise.context.spi.Contextual; import jakarta.enterprise.context.spi.CreationalContext; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; /** * Holds the information we need store to manage * the beans in the {@link TransactionContext}. */ -@Typed() +@Vetoed public class TransactionBeanEntry<T> { private Contextual<T> bean; diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/entitymanager/TestPersistenceProviderResolver.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/entitymanager/TestPersistenceProviderResolver.java index fc0c4c407..2eb50519f 100644 --- a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/entitymanager/TestPersistenceProviderResolver.java +++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/entitymanager/TestPersistenceProviderResolver.java @@ -18,7 +18,7 @@ */ package org.apache.deltaspike.test.jpa.api.entitymanager; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import jakarta.persistence.Cache; import jakarta.persistence.EntityGraph; import jakarta.persistence.EntityManager; @@ -41,7 +41,7 @@ import org.apache.deltaspike.test.jpa.api.shared.TestEntityManager; /** * PersistenceProviderResolver for dummy PersistenceProviders. */ -@Typed() +@Vetoed public class TestPersistenceProviderResolver implements PersistenceProviderResolver { private List<PersistenceProvider> persistenceProviders; @@ -64,7 +64,7 @@ public class TestPersistenceProviderResolver implements PersistenceProviderResol } - @Typed() + @Vetoed public static class DummyPersistenceProvider implements PersistenceProvider { @Override @@ -98,7 +98,7 @@ public class TestPersistenceProviderResolver implements PersistenceProviderResol } } - @Typed() + @Vetoed public static class DummyEntityManagerFactory implements EntityManagerFactory { private final String emName; diff --git a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/shared/TestEntityManager.java b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/shared/TestEntityManager.java index 641f88944..549a0e95e 100644 --- a/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/shared/TestEntityManager.java +++ b/deltaspike/modules/jpa/impl/src/test/java/org/apache/deltaspike/test/jpa/api/shared/TestEntityManager.java @@ -18,7 +18,7 @@ */ package org.apache.deltaspike.test.jpa.api.shared; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import jakarta.persistence.EntityGraph; import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManagerFactory; @@ -36,7 +36,7 @@ import jakarta.persistence.metamodel.Metamodel; import java.util.List; import java.util.Map; -@Typed() +@Vetoed public class TestEntityManager implements EntityManager { private EntityTransaction entityTransaction = new TestEntityTransaction(this); diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultViewConfigResolver.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultViewConfigResolver.java index a61b6b68e..233317c0f 100644 --- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultViewConfigResolver.java +++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/config/view/DefaultViewConfigResolver.java @@ -33,7 +33,7 @@ import org.apache.deltaspike.jsf.api.literal.FolderLiteral; import org.apache.deltaspike.jsf.api.literal.ViewLiteral; import org.apache.deltaspike.jsf.impl.util.ViewConfigUtils; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import java.lang.annotation.Annotation; import java.util.ArrayList; import java.util.Arrays; @@ -43,7 +43,7 @@ import java.util.List; import java.util.Map; import java.util.Stack; -@Typed() +@Vetoed public class DefaultViewConfigResolver implements ViewConfigResolver { private Map<Class<? extends ViewConfig>, ViewConfigDescriptor> viewDefinitionToViewDefinitionEntryMapping; diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/listener/phase/DeltaSpikePhaseListener.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/listener/phase/DeltaSpikePhaseListener.java index 3cf835b4f..d1ace6cd7 100644 --- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/listener/phase/DeltaSpikePhaseListener.java +++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/listener/phase/DeltaSpikePhaseListener.java @@ -34,7 +34,7 @@ import org.apache.deltaspike.security.api.authorization.ErrorViewAwareAccessDeni import org.apache.deltaspike.security.spi.authorization.EditableAccessDecisionVoterContext; import jakarta.enterprise.context.ContextNotActiveException; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import jakarta.faces.component.UIViewRoot; import jakarta.faces.context.FacesContext; import jakarta.faces.event.PhaseEvent; @@ -42,7 +42,7 @@ import jakarta.faces.event.PhaseId; import jakarta.faces.event.PhaseListener; import java.util.logging.Logger; -@Typed() //don't use PhaseListener as type - JsfRequestLifecyclePhaseListener would fire to this listener as well +@Vetoed //don't use PhaseListener as type - JsfRequestLifecyclePhaseListener would fire to this listener as well public class DeltaSpikePhaseListener implements PhaseListener, Deactivatable { private static final long serialVersionUID = -4458288760053069922L; diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/listener/phase/JsfRequestLifecyclePhaseListener.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/listener/phase/JsfRequestLifecyclePhaseListener.java index 5190f5bcb..827e558ec 100644 --- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/listener/phase/JsfRequestLifecyclePhaseListener.java +++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/listener/phase/JsfRequestLifecyclePhaseListener.java @@ -18,11 +18,11 @@ */ package org.apache.deltaspike.jsf.impl.listener.phase; +import jakarta.enterprise.inject.Typed; import org.apache.deltaspike.core.api.provider.BeanProvider; import org.apache.deltaspike.core.spi.activation.Deactivatable; import org.apache.deltaspike.core.util.ClassDeactivationUtils; -import jakarta.enterprise.inject.Typed; import jakarta.faces.event.PhaseEvent; import jakarta.faces.event.PhaseId; import jakarta.faces.event.PhaseListener; diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/DefaultJsfMessage.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/DefaultJsfMessage.java index 32b4db2db..eb957ef9f 100644 --- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/DefaultJsfMessage.java +++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/DefaultJsfMessage.java @@ -19,7 +19,7 @@ package org.apache.deltaspike.jsf.impl.message; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import jakarta.faces.application.FacesMessage; import jakarta.faces.component.UIComponent; @@ -35,7 +35,7 @@ import org.apache.deltaspike.jsf.api.message.JsfMessage; * The complexity of setting the FacesMessage is * done in the {@link JsfMessageBundleInvocationHandler}. */ -@Typed +@Vetoed public class DefaultJsfMessage<T> implements JsfMessage<T> { private final String clientId; diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/FacesMessageEntry.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/FacesMessageEntry.java index af6077ac0..2ec63c207 100644 --- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/FacesMessageEntry.java +++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/FacesMessageEntry.java @@ -18,14 +18,14 @@ */ package org.apache.deltaspike.jsf.impl.message; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import jakarta.faces.application.FacesMessage; import java.io.Serializable; /** * Entry for {@link FacesMessage} which have to be stored longer than a request */ -@Typed() +@Vetoed public class FacesMessageEntry implements Serializable { private static final long serialVersionUID = 6831499672107426470L; diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/JsfMessageBundleInvocationHandler.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/JsfMessageBundleInvocationHandler.java index 9d7283bba..0757becec 100644 --- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/JsfMessageBundleInvocationHandler.java +++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/message/JsfMessageBundleInvocationHandler.java @@ -18,7 +18,7 @@ */ package org.apache.deltaspike.jsf.impl.message; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import jakarta.faces.application.FacesMessage; import jakarta.faces.context.FacesContext; import java.lang.reflect.InvocationHandler; @@ -32,7 +32,7 @@ import org.apache.deltaspike.jsf.api.message.JsfMessage; * This Proxy InvocationHandler automatically registers the * returned messages in the FacesContext if a severity is set. */ -@Typed() +@Vetoed public class JsfMessageBundleInvocationHandler implements InvocationHandler { private final FacesMessage.Severity severity; diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/ClientWindowHelper.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/ClientWindowHelper.java index 8eac7641a..b08f9aed4 100644 --- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/ClientWindowHelper.java +++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/ClientWindowHelper.java @@ -18,7 +18,7 @@ */ package org.apache.deltaspike.jsf.impl.util; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import jakarta.faces.FacesException; import jakarta.faces.context.ExternalContext; import jakarta.faces.context.FacesContext; @@ -35,7 +35,7 @@ import java.util.*; import java.util.logging.Level; import java.util.logging.Logger; -@Typed() +@Vetoed public abstract class ClientWindowHelper { private static final Logger LOG = Logger.getLogger(ClientWindowHelper.class.getName()); diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/SecurityUtils.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/SecurityUtils.java index 05158ae94..fa2465d22 100644 --- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/SecurityUtils.java +++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/SecurityUtils.java @@ -33,7 +33,7 @@ import org.apache.deltaspike.security.api.authorization.SecurityViolation; import org.apache.deltaspike.security.spi.authorization.EditableAccessDecisionVoterContext; import org.apache.deltaspike.security.spi.authorization.SecurityViolationHandler; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import jakarta.faces.application.FacesMessage; import jakarta.faces.context.FacesContext; import java.lang.annotation.Annotation; @@ -42,7 +42,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -@Typed() +@Vetoed public abstract class SecurityUtils { public static void invokeVoters(EditableAccessDecisionVoterContext accessDecisionVoterContext, diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/SharedStringBuilder.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/SharedStringBuilder.java index f6f1c493c..2a86281fa 100644 --- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/SharedStringBuilder.java +++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/SharedStringBuilder.java @@ -18,10 +18,10 @@ */ package org.apache.deltaspike.jsf.impl.util; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import jakarta.faces.context.FacesContext; -@Typed() +@Vetoed public abstract class SharedStringBuilder { /** diff --git a/deltaspike/modules/partial-bean/impl/src/main/java/org/apache/deltaspike/partialbean/impl/PartialBeanProxyFactory.java b/deltaspike/modules/partial-bean/impl/src/main/java/org/apache/deltaspike/partialbean/impl/PartialBeanProxyFactory.java index fe7d8e7b8..49a68742c 100644 --- a/deltaspike/modules/partial-bean/impl/src/main/java/org/apache/deltaspike/partialbean/impl/PartialBeanProxyFactory.java +++ b/deltaspike/modules/partial-bean/impl/src/main/java/org/apache/deltaspike/partialbean/impl/PartialBeanProxyFactory.java @@ -25,13 +25,13 @@ import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.Iterator; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; /** * {@link DeltaSpikeProxyFactory} which delegates all abstract methods to the * partial bean binding {@link java.lang.reflect.InvocationHandler}. */ -@Typed +@Vetoed public class PartialBeanProxyFactory extends DeltaSpikeProxyFactory { private static final PartialBeanProxyFactory INSTANCE = new PartialBeanProxyFactory(); diff --git a/deltaspike/modules/partial-bean/impl/src/test/java/org/apache/deltaspike/test/core/api/partialbean/uc009/TestCustomType.java b/deltaspike/modules/partial-bean/impl/src/test/java/org/apache/deltaspike/test/core/api/partialbean/uc009/TestCustomType.java index a7d306bcc..ce205e877 100644 --- a/deltaspike/modules/partial-bean/impl/src/test/java/org/apache/deltaspike/test/core/api/partialbean/uc009/TestCustomType.java +++ b/deltaspike/modules/partial-bean/impl/src/test/java/org/apache/deltaspike/test/core/api/partialbean/uc009/TestCustomType.java @@ -18,10 +18,10 @@ */ package org.apache.deltaspike.test.core.api.partialbean.uc009; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import java.io.Serializable; -@Typed() +@Vetoed public class TestCustomType implements Serializable { private Integer testValue; diff --git a/deltaspike/modules/proxy/api/src/main/java/org/apache/deltaspike/proxy/spi/invocation/DeltaSpikeProxyInvocationContext.java b/deltaspike/modules/proxy/api/src/main/java/org/apache/deltaspike/proxy/spi/invocation/DeltaSpikeProxyInvocationContext.java index 685699a4c..c4562bf67 100644 --- a/deltaspike/modules/proxy/api/src/main/java/org/apache/deltaspike/proxy/spi/invocation/DeltaSpikeProxyInvocationContext.java +++ b/deltaspike/modules/proxy/api/src/main/java/org/apache/deltaspike/proxy/spi/invocation/DeltaSpikeProxyInvocationContext.java @@ -21,7 +21,7 @@ package org.apache.deltaspike.proxy.spi.invocation; import java.lang.reflect.Method; import java.util.List; import jakarta.enterprise.context.spi.CreationalContext; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import jakarta.enterprise.inject.spi.BeanManager; import jakarta.enterprise.inject.spi.InterceptionType; import jakarta.enterprise.inject.spi.Interceptor; @@ -32,7 +32,7 @@ import org.apache.deltaspike.core.util.interceptor.AbstractInvocationContext; * {@link jakarta.interceptor.InvocationContext} implementation to support interceptor invocation * before proceed with the original method or delegation. */ -@Typed +@Vetoed public class DeltaSpikeProxyInvocationContext<T, H> extends AbstractInvocationContext<T> { protected List<Interceptor<H>> interceptors; diff --git a/deltaspike/modules/proxy/impl-asm/src/main/java/org/apache/deltaspike/proxy/impl/AsmDeltaSpikeProxyClassGenerator.java b/deltaspike/modules/proxy/impl-asm/src/main/java/org/apache/deltaspike/proxy/impl/AsmDeltaSpikeProxyClassGenerator.java index a93ccc108..c5adf5a38 100644 --- a/deltaspike/modules/proxy/impl-asm/src/main/java/org/apache/deltaspike/proxy/impl/AsmDeltaSpikeProxyClassGenerator.java +++ b/deltaspike/modules/proxy/impl-asm/src/main/java/org/apache/deltaspike/proxy/impl/AsmDeltaSpikeProxyClassGenerator.java @@ -26,7 +26,7 @@ import java.lang.reflect.UndeclaredThrowableException; import java.util.ArrayList; import java.util.Arrays; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import org.apache.deltaspike.proxy.spi.invocation.DeltaSpikeProxyInvocationHandler; import org.objectweb.asm.AnnotationVisitor; @@ -40,7 +40,7 @@ import org.objectweb.asm.commons.GeneratorAdapter; import org.objectweb.asm.commons.Method; import org.apache.deltaspike.proxy.spi.DeltaSpikeProxyClassGenerator; -@Typed +@Vetoed public class AsmDeltaSpikeProxyClassGenerator implements DeltaSpikeProxyClassGenerator { private static final String FIELDNAME_INVOCATION_HANDLER = "invocationHandler"; diff --git a/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/JobAdapter.java b/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/JobAdapter.java index e4c4540ed..8ffc84195 100644 --- a/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/JobAdapter.java +++ b/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/JobAdapter.java @@ -22,10 +22,10 @@ import org.quartz.Job; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; //configured via SchedulerBaseConfig -@Typed() +@Vetoed public class JobAdapter extends AbstractJobAdapter<Job> { @Override diff --git a/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/JobRunnableAdapter.java b/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/JobRunnableAdapter.java index f8e9085b8..199d7d069 100644 --- a/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/JobRunnableAdapter.java +++ b/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/JobRunnableAdapter.java @@ -20,10 +20,10 @@ package org.apache.deltaspike.scheduler.impl; import org.quartz.JobExecutionContext; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; //configured via SchedulerBaseConfig -@Typed() +@Vetoed public class JobRunnableAdapter extends AbstractJobAdapter<Runnable> { @Override diff --git a/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/TestJobManager.java b/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/TestJobManager.java index 671f0defd..b855c19b6 100644 --- a/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/TestJobManager.java +++ b/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/TestJobManager.java @@ -21,10 +21,12 @@ package org.apache.deltaspike.test.scheduler.custom; import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.Produces; import jakarta.enterprise.inject.Typed; + import java.util.ArrayList; import java.util.List; -@Typed() + +@Typed() // This bean doesn't get vetoed because it contains producer methods. But we don't want it to be injected with this type public class TestJobManager { private static TestJobManager currentManager = new TestJobManager(); diff --git a/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/extension/Authorizer.java b/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/extension/Authorizer.java index ad70be85b..2dfaab3fb 100644 --- a/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/extension/Authorizer.java +++ b/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/extension/Authorizer.java @@ -28,7 +28,7 @@ import java.util.Set; import jakarta.enterprise.context.spi.CreationalContext; import jakarta.enterprise.inject.Stereotype; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import jakarta.enterprise.inject.spi.AnnotatedMethod; import jakarta.enterprise.inject.spi.AnnotatedParameter; import jakarta.enterprise.inject.spi.Bean; @@ -48,7 +48,7 @@ import org.apache.deltaspike.security.impl.util.SecurityUtils; /** * Responsible for authorizing method invocations. */ -@Typed() +@Vetoed class Authorizer { private Annotation bindingAnnotation; diff --git a/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/util/SecurityUtils.java b/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/util/SecurityUtils.java index a342ca5cd..516695ddd 100644 --- a/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/util/SecurityUtils.java +++ b/deltaspike/modules/security/impl/src/main/java/org/apache/deltaspike/security/impl/util/SecurityUtils.java @@ -23,7 +23,7 @@ import org.apache.deltaspike.security.api.authorization.SecurityBindingType; import org.apache.deltaspike.security.api.authorization.SecurityParameterBinding; import jakarta.enterprise.inject.Stereotype; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import java.lang.annotation.Annotation; import java.lang.reflect.Method; import java.util.ArrayList; @@ -31,7 +31,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -@Typed() +@Vetoed public abstract class SecurityUtils { private SecurityUtils() diff --git a/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc003/MockedSessionScopedBean.java b/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc003/MockedSessionScopedBean.java index 62e9b61ba..57840c7ad 100644 --- a/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc003/MockedSessionScopedBean.java +++ b/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc003/MockedSessionScopedBean.java @@ -20,7 +20,7 @@ package org.apache.deltaspike.test.testcontrol.mock.uc003; import org.apache.deltaspike.test.testcontrol.mock.shared.SessionScopedBean; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; @Typed() //exclude it for the cdi type-check public class MockedSessionScopedBean extends SessionScopedBean diff --git a/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc004/MockedApplicationScopedBean.java b/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc004/MockedApplicationScopedBean.java index b72944b2e..f687d2469 100644 --- a/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc004/MockedApplicationScopedBean.java +++ b/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc004/MockedApplicationScopedBean.java @@ -20,7 +20,7 @@ package org.apache.deltaspike.test.testcontrol.mock.uc004; import org.apache.deltaspike.test.testcontrol.mock.shared.ApplicationScopedBean; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; @Typed() //exclude it for the cdi type-check public class MockedApplicationScopedBean extends ApplicationScopedBean diff --git a/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc005/ProducedBean.java b/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc005/ProducedBean.java index 756fa8651..2d5ee8cb8 100644 --- a/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc005/ProducedBean.java +++ b/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc005/ProducedBean.java @@ -18,7 +18,7 @@ */ package org.apache.deltaspike.test.testcontrol.mock.uc005; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; @Typed() //exclude it for the cdi type-check public class ProducedBean diff --git a/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc005/ProducedBeanProducer.java b/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc005/ProducedBeanProducer.java index 98e1e0605..d9318d056 100644 --- a/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc005/ProducedBeanProducer.java +++ b/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc005/ProducedBeanProducer.java @@ -20,7 +20,7 @@ package org.apache.deltaspike.test.testcontrol.mock.uc005; import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.inject.Produces; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; @Typed() //exclude it for the cdi type-check public class ProducedBeanProducer diff --git a/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc007/ProducedBean.java b/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc007/ProducedBean.java index f67d26972..a56aea881 100644 --- a/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc007/ProducedBean.java +++ b/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc007/ProducedBean.java @@ -18,7 +18,7 @@ */ package org.apache.deltaspike.test.testcontrol.mock.uc007; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; @Typed() //exclude it for the cdi type-check public class ProducedBean diff --git a/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc007/ProducedBeanProducer.java b/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc007/ProducedBeanProducer.java index 0d3c7fcc7..e26131b8f 100644 --- a/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc007/ProducedBeanProducer.java +++ b/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc007/ProducedBeanProducer.java @@ -22,7 +22,7 @@ import org.apache.deltaspike.test.testcontrol.mock.shared.MyQualifier; import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.inject.Produces; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; @Typed() //exclude it for the cdi type-check public class ProducedBeanProducer diff --git a/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc008/MockedTypedBeanTest.java b/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc008/MockedTypedBeanTest.java index dfbc03297..f6b4a25b3 100644 --- a/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc008/MockedTypedBeanTest.java +++ b/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc008/MockedTypedBeanTest.java @@ -27,7 +27,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import jakarta.inject.Inject; //Usually NOT needed! Currently only needed due to our arquillian-setup diff --git a/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc008/TypedBean1and2.java b/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc008/TypedBean1and2.java index ceb4f2276..038141b90 100644 --- a/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc008/TypedBean1and2.java +++ b/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc008/TypedBean1and2.java @@ -19,7 +19,7 @@ package org.apache.deltaspike.test.testcontrol.mock.uc008; import jakarta.enterprise.context.RequestScoped; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; @RequestScoped @Typed({T1.class, T2.class}) diff --git a/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc008/TypedBean3.java b/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc008/TypedBean3.java index 4719e6590..fc8c6eb0e 100644 --- a/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc008/TypedBean3.java +++ b/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc008/TypedBean3.java @@ -19,7 +19,7 @@ package org.apache.deltaspike.test.testcontrol.mock.uc008; import jakarta.enterprise.context.RequestScoped; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; @RequestScoped @Typed({T3.class}) diff --git a/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc009/MockedTypedProducedBeanTest.java b/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc009/MockedTypedProducedBeanTest.java index e3a86de1c..25f92eff3 100644 --- a/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc009/MockedTypedProducedBeanTest.java +++ b/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc009/MockedTypedProducedBeanTest.java @@ -26,7 +26,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import jakarta.inject.Inject; //Usually NOT needed! Currently only needed due to our arquillian-setup diff --git a/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc009/TypedBean1and2.java b/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc009/TypedBean1and2.java index 41dac9d80..3ec1555ed 100644 --- a/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc009/TypedBean1and2.java +++ b/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc009/TypedBean1and2.java @@ -18,7 +18,7 @@ */ package org.apache.deltaspike.test.testcontrol.mock.uc009; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; @Typed() //exclude it for the cdi type-check public class TypedBean1and2 implements T1, T2, T3 diff --git a/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc009/TypedBean3.java b/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc009/TypedBean3.java index ab3aa01ec..9ea1cd59d 100644 --- a/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc009/TypedBean3.java +++ b/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc009/TypedBean3.java @@ -18,7 +18,7 @@ */ package org.apache.deltaspike.test.testcontrol.mock.uc009; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; @Typed() //exclude it for the cdi type-check public class TypedBean3 implements T1, T2, T3 diff --git a/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc009/TypedBeanProducer.java b/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc009/TypedBeanProducer.java index 4ece3bbb4..57478b91d 100644 --- a/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc009/TypedBeanProducer.java +++ b/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc009/TypedBeanProducer.java @@ -20,7 +20,7 @@ package org.apache.deltaspike.test.testcontrol.mock.uc009; import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.inject.Produces; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; @Typed() //exclude it for the cdi type-check public class TypedBeanProducer diff --git a/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc011/MockedRequestScopedBeanWithInjection.java b/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc011/MockedRequestScopedBeanWithInjection.java index b68e1eaaf..5004d0bbd 100644 --- a/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc011/MockedRequestScopedBeanWithInjection.java +++ b/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc011/MockedRequestScopedBeanWithInjection.java @@ -21,7 +21,7 @@ package org.apache.deltaspike.test.testcontrol.mock.uc011; import org.apache.deltaspike.test.testcontrol.mock.shared.RequestScopedBean; import org.apache.deltaspike.test.testcontrol.mock.shared.SessionScopedBean; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import jakarta.inject.Inject; @Typed() //exclude it for the cdi type-check diff --git a/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc012/MockedRequestScopedBeanWithInjection.java b/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc012/MockedRequestScopedBeanWithInjection.java index c8666b49a..afac57d89 100644 --- a/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc012/MockedRequestScopedBeanWithInjection.java +++ b/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc012/MockedRequestScopedBeanWithInjection.java @@ -21,7 +21,7 @@ package org.apache.deltaspike.test.testcontrol.mock.uc012; import org.apache.deltaspike.test.testcontrol.mock.shared.RequestScopedBean; import org.apache.deltaspike.test.testcontrol.mock.shared.SessionScopedBean; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import jakarta.inject.Inject; @Typed() //exclude it for the cdi type-check diff --git a/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc013/TypedBean1and2.java b/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc013/TypedBean1and2.java index c0524ec99..ea49035ad 100644 --- a/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc013/TypedBean1and2.java +++ b/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc013/TypedBean1and2.java @@ -18,7 +18,7 @@ */ package org.apache.deltaspike.test.testcontrol.mock.uc013; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; @Typed() //exclude it for the cdi type-check public class TypedBean1and2 implements T1, T2, T3 diff --git a/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc013/TypedBean3.java b/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc013/TypedBean3.java index deaf21ccb..4f4b787b7 100644 --- a/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc013/TypedBean3.java +++ b/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc013/TypedBean3.java @@ -18,7 +18,7 @@ */ package org.apache.deltaspike.test.testcontrol.mock.uc013; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; @Typed() //exclude it for the cdi type-check public class TypedBean3 implements T1, T2, T3 diff --git a/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc013/TypedBeanProducer.java b/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc013/TypedBeanProducer.java index 79edd757a..edb96612a 100644 --- a/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc013/TypedBeanProducer.java +++ b/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc013/TypedBeanProducer.java @@ -20,7 +20,7 @@ package org.apache.deltaspike.test.testcontrol.mock.uc013; import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.inject.Produces; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; @Typed() //exclude it for the cdi type-check public class TypedBeanProducer diff --git a/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc014/MockedTypedProducedBeanTest.java b/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc014/MockedTypedProducedBeanTest.java index 470c6517f..acd537e9a 100644 --- a/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc014/MockedTypedProducedBeanTest.java +++ b/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc014/MockedTypedProducedBeanTest.java @@ -27,7 +27,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import jakarta.inject.Inject; //Usually NOT needed! Currently only needed due to our arquillian-setup diff --git a/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc014/TypedBean1and2.java b/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc014/TypedBean1and2.java index 874ef9513..eb3f714b1 100644 --- a/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc014/TypedBean1and2.java +++ b/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc014/TypedBean1and2.java @@ -18,7 +18,7 @@ */ package org.apache.deltaspike.test.testcontrol.mock.uc014; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; @Typed() //exclude it for the cdi type-check public class TypedBean1and2 implements T1, T2, T3 diff --git a/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc014/TypedBean3.java b/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc014/TypedBean3.java index 4c309871a..d26a085ec 100644 --- a/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc014/TypedBean3.java +++ b/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc014/TypedBean3.java @@ -18,7 +18,7 @@ */ package org.apache.deltaspike.test.testcontrol.mock.uc014; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; @Typed() //exclude it for the cdi type-check public class TypedBean3 implements T1, T2, T3 diff --git a/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc014/TypedBeanProducer.java b/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc014/TypedBeanProducer.java index 63fb0191b..9be515c97 100644 --- a/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc014/TypedBeanProducer.java +++ b/deltaspike/modules/test-control/impl/obsolete/src/test/java/org/apache/deltaspike/test/testcontrol/mock/uc014/TypedBeanProducer.java @@ -20,7 +20,7 @@ package org.apache.deltaspike.test.testcontrol.mock.uc014; import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.inject.Produces; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; @Typed() //exclude it for the cdi type-check public class TypedBeanProducer diff --git a/deltaspike/modules/test-control/impl/src/main/java/org/apache/deltaspike/testcontrol/impl/mock/AbstractMockManager.java b/deltaspike/modules/test-control/impl/src/main/java/org/apache/deltaspike/testcontrol/impl/mock/AbstractMockManager.java index b969a9323..e264abaff 100644 --- a/deltaspike/modules/test-control/impl/src/main/java/org/apache/deltaspike/testcontrol/impl/mock/AbstractMockManager.java +++ b/deltaspike/modules/test-control/impl/src/main/java/org/apache/deltaspike/testcontrol/impl/mock/AbstractMockManager.java @@ -18,11 +18,11 @@ */ package org.apache.deltaspike.testcontrol.impl.mock; +import jakarta.enterprise.inject.Typed; import org.apache.deltaspike.testcontrol.api.junit.TestBaseConfig; import org.apache.deltaspike.testcontrol.api.mock.DynamicMockManager; import org.apache.deltaspike.testcontrol.api.mock.TypedMock; -import jakarta.enterprise.inject.Typed; import java.lang.annotation.Annotation; import java.util.HashMap; import java.util.Map; diff --git a/deltaspike/modules/test-control/impl/src/main/java/org/apache/deltaspike/testcontrol/impl/mock/MockExtension.java b/deltaspike/modules/test-control/impl/src/main/java/org/apache/deltaspike/testcontrol/impl/mock/MockExtension.java index b2469d31b..03e32f74c 100644 --- a/deltaspike/modules/test-control/impl/src/main/java/org/apache/deltaspike/testcontrol/impl/mock/MockExtension.java +++ b/deltaspike/modules/test-control/impl/src/main/java/org/apache/deltaspike/testcontrol/impl/mock/MockExtension.java @@ -18,13 +18,13 @@ */ package org.apache.deltaspike.testcontrol.impl.mock; +import jakarta.enterprise.inject.Typed; import org.apache.deltaspike.core.spi.activation.Deactivatable; import org.apache.deltaspike.core.util.ClassDeactivationUtils; import org.apache.deltaspike.core.util.ServiceUtils; import org.apache.deltaspike.testcontrol.spi.mock.MockFilter; import jakarta.enterprise.event.Observes; -import jakarta.enterprise.inject.Typed; import jakarta.enterprise.inject.spi.AnnotatedMember; import jakarta.enterprise.inject.spi.BeanManager; import jakarta.enterprise.inject.spi.BeforeBeanDiscovery; @@ -77,7 +77,7 @@ public class MockExtension implements Extension, Deactivatable Typed typed = processInjectionTarget.getAnnotatedType().getAnnotation(Typed.class); - List<Type> foundTypes = new ArrayList<Type>(); + List<Type> foundTypes = new ArrayList<>(); if (typed != null) { Collections.addAll(foundTypes, typed.value()); diff --git a/deltaspike/modules/test-control/impl/src/main/java/org/apache/deltaspike/testcontrol/impl/mock/SimpleApplicationMockManager.java b/deltaspike/modules/test-control/impl/src/main/java/org/apache/deltaspike/testcontrol/impl/mock/SimpleApplicationMockManager.java index 5161832aa..13dfd2a29 100644 --- a/deltaspike/modules/test-control/impl/src/main/java/org/apache/deltaspike/testcontrol/impl/mock/SimpleApplicationMockManager.java +++ b/deltaspike/modules/test-control/impl/src/main/java/org/apache/deltaspike/testcontrol/impl/mock/SimpleApplicationMockManager.java @@ -18,10 +18,10 @@ */ package org.apache.deltaspike.testcontrol.impl.mock; +import jakarta.enterprise.inject.Typed; import org.apache.deltaspike.testcontrol.api.mock.ApplicationMockManager; import jakarta.enterprise.context.ApplicationScoped; -import jakarta.enterprise.inject.Typed; @ApplicationScoped @Typed(ApplicationMockManager.class) diff --git a/deltaspike/modules/test-control/impl/src/main/java/org/apache/deltaspike/testcontrol/impl/mock/SimpleMockManager.java b/deltaspike/modules/test-control/impl/src/main/java/org/apache/deltaspike/testcontrol/impl/mock/SimpleMockManager.java index 4010b24d9..406cb82f9 100644 --- a/deltaspike/modules/test-control/impl/src/main/java/org/apache/deltaspike/testcontrol/impl/mock/SimpleMockManager.java +++ b/deltaspike/modules/test-control/impl/src/main/java/org/apache/deltaspike/testcontrol/impl/mock/SimpleMockManager.java @@ -18,11 +18,11 @@ */ package org.apache.deltaspike.testcontrol.impl.mock; +import jakarta.enterprise.inject.Typed; import org.apache.deltaspike.testcontrol.api.mock.ApplicationMockManager; import org.apache.deltaspike.testcontrol.api.mock.DynamicMockManager; import jakarta.enterprise.context.RequestScoped; -import jakarta.enterprise.inject.Typed; import jakarta.inject.Inject; import java.lang.annotation.Annotation; diff --git a/deltaspike/modules/test-control/impl/src/main/java/org/apache/deltaspike/testcontrol/impl/validation/StandardContextTestControlValidator.java b/deltaspike/modules/test-control/impl/src/main/java/org/apache/deltaspike/testcontrol/impl/validation/StandardContextTestControlValidator.java index d795855d4..21809a966 100644 --- a/deltaspike/modules/test-control/impl/src/main/java/org/apache/deltaspike/testcontrol/impl/validation/StandardContextTestControlValidator.java +++ b/deltaspike/modules/test-control/impl/src/main/java/org/apache/deltaspike/testcontrol/impl/validation/StandardContextTestControlValidator.java @@ -23,14 +23,14 @@ import org.apache.deltaspike.testcontrol.api.TestControl; import org.apache.deltaspike.testcontrol.spi.TestAware; import org.apache.deltaspike.testcontrol.spi.TestControlValidator; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import java.lang.annotation.Annotation; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Collections; import java.util.List; -@Typed() +@Vetoed public class StandardContextTestControlValidator implements TestAware, TestControlValidator { private static Boolean customContextControlDetected; diff --git a/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/CustomMockManager.java b/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/CustomMockManager.java index 455876ade..c544b06c0 100644 --- a/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/CustomMockManager.java +++ b/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/CustomMockManager.java @@ -18,12 +18,12 @@ */ package org.apache.deltaspike.test.testcontrol; +import jakarta.enterprise.inject.Typed; import org.apache.deltaspike.testcontrol.api.mock.DynamicMockManager; import org.apache.deltaspike.testcontrol.impl.mock.SimpleMockManager; import jakarta.enterprise.context.RequestScoped; import jakarta.enterprise.inject.Alternative; -import jakarta.enterprise.inject.Typed; import java.lang.annotation.Annotation; @Alternative diff --git a/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc004/ProjectStageTestControlTest.java b/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc004/ProjectStageTestControlTest.java index 44f9415e7..806121841 100644 --- a/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc004/ProjectStageTestControlTest.java +++ b/deltaspike/modules/test-control/impl/src/test/java/org/apache/deltaspike/test/testcontrol/uc004/ProjectStageTestControlTest.java @@ -18,6 +18,7 @@ */ package org.apache.deltaspike.test.testcontrol.uc004; +import jakarta.enterprise.inject.Typed; import org.apache.deltaspike.core.api.projectstage.ProjectStage; import org.apache.deltaspike.test.category.SeCategory; import org.apache.deltaspike.test.testcontrol.uc001.RequestAndSessionScopePerTestMethodTest; @@ -28,7 +29,6 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; -import jakarta.enterprise.inject.Typed; import jakarta.inject.Inject; //Usually NOT needed! Currently only needed due to our arquillian-setup diff --git a/deltaspike/readme/ReleaseNotes-0.3-incubating.txt b/deltaspike/readme/ReleaseNotes-0.3-incubating.txt index 47af3c422..b27fae410 100644 --- a/deltaspike/readme/ReleaseNotes-0.3-incubating.txt +++ b/deltaspike/readme/ReleaseNotes-0.3-incubating.txt @@ -63,7 +63,7 @@ Bug Improvement [DELTASPIKE-96] - Give names to tests and shrinkwrap archives - [DELTASPIKE-161] - veto internal beans annotated with @Typed() + [DELTASPIKE-161] - veto internal beans annotated with @Vetoed [DELTASPIKE-172] - Improve BeanProvider [DELTASPIKE-194] - enable examples build by default [DELTASPIKE-197] - pickup ConfigSources via ServiceLoader as well diff --git a/documentation/src/main/asciidoc/jpa.adoc b/documentation/src/main/asciidoc/jpa.adoc index 874b517a4..d0ffdefa9 100644 --- a/documentation/src/main/asciidoc/jpa.adoc +++ b/documentation/src/main/asciidoc/jpa.adoc @@ -506,7 +506,7 @@ public class ExtendedEntityManagerProducer .Implementation of a simple extended EntityManager [source,java] ------------------------------------------------------------------------- -@Typed() +@Vetoed public class ExtendedEntityManager implements EntityManager, Serializable { private static final long serialVersionUID = 3770954229283539616L;
