Skip to content

Commit 84b3e06

Browse files
committed
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.
1 parent 355af59 commit 84b3e06

File tree

112 files changed

+197
-193
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+197
-193
lines changed

deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockHttpSession.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
import java.util.Map;
2323
import java.util.concurrent.ConcurrentHashMap;
2424

25-
import jakarta.enterprise.inject.Typed;
25+
import jakarta.enterprise.inject.Vetoed;
2626
import jakarta.servlet.ServletContext;
2727
import jakarta.servlet.http.HttpSession;
2828

2929
/**
3030
* A simple mock HttpSession
3131
*/
32-
@Typed // ignore this as CDI bean
32+
@Vetoed // ignore this as CDI bean
3333
public class MockHttpSession implements HttpSession
3434
{
3535
private String sessionId;

deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockServletContext.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import java.util.Set;
2929
import java.util.StringTokenizer;
3030

31-
import jakarta.enterprise.inject.Typed;
31+
import jakarta.enterprise.inject.Vetoed;
3232
import jakarta.servlet.Filter;
3333
import jakarta.servlet.FilterRegistration;
3434
import jakarta.servlet.RequestDispatcher;
@@ -45,7 +45,7 @@
4545
* Mock ServletContext needed to startup the container.
4646
*
4747
*/
48-
@Typed // ignore this as CDI bean
48+
@Vetoed // ignore this as CDI bean
4949
public class MockServletContext implements ServletContext
5050
{
5151
private static MockServletContext instance = new MockServletContext();

deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/control/ExceptionStackItem.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919

2020
package org.apache.deltaspike.core.api.exception.control;
2121

22-
import jakarta.enterprise.inject.Typed;
22+
import jakarta.enterprise.inject.Vetoed;
2323
import java.io.Serializable;
2424
import java.util.Arrays;
2525

2626
/**
2727
* Container for the exception and it's stack trace.
2828
*/
2929
@SuppressWarnings("CdiManagedBeanInconsistencyInspection")
30-
@Typed()
30+
@Vetoed
3131
public final class ExceptionStackItem implements Serializable
3232
{
3333
private static final long serialVersionUID = 5162936095781886477L;

deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/control/event/ExceptionStackEvent.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
import org.apache.deltaspike.core.api.exception.control.ExceptionStackItem;
2323

24-
import jakarta.enterprise.inject.Typed;
24+
import jakarta.enterprise.inject.Vetoed;
2525
import java.io.Serializable;
2626
import java.sql.SQLException;
2727
import java.util.ArrayDeque;
@@ -33,7 +33,7 @@
3333
* Information about the current exception and exception cause container. This object is not immutable.
3434
*/
3535
@SuppressWarnings("CdiManagedBeanInconsistencyInspection")
36-
@Typed()
36+
@Vetoed
3737
public class ExceptionStackEvent implements Serializable
3838
{
3939
private static final long serialVersionUID = -6069790756478700680L;

deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/control/event/ExceptionToCatchEvent.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
package org.apache.deltaspike.core.api.exception.control.event;
2121

22-
import jakarta.enterprise.inject.Typed;
22+
import jakarta.enterprise.inject.Vetoed;
2323
import java.io.Serializable;
2424
import java.lang.annotation.Annotation;
2525
import java.util.Collections;
@@ -31,7 +31,7 @@
3131
* is the handled flag.
3232
*/
3333
@SuppressWarnings("CdiManagedBeanInconsistencyInspection")
34-
@Typed()
34+
@Vetoed
3535
public class ExceptionToCatchEvent implements Serializable
3636
{
3737
private static final long serialVersionUID = 2646115104528108266L;

deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/literal/TypedLiteral.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
package org.apache.deltaspike.core.api.literal;
2121

22-
import jakarta.enterprise.inject.Typed;
22+
import jakarta.enterprise.inject.Vetoed;
2323
import jakarta.enterprise.util.AnnotationLiteral;
2424

2525
/**

deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/AnnotationUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919

2020
package org.apache.deltaspike.core.util;
2121

22-
import jakarta.enterprise.inject.Typed;
22+
import jakarta.enterprise.inject.Vetoed;
2323
import jakarta.enterprise.inject.spi.BeanManager;
2424
import jakarta.enterprise.util.Nonbinding;
2525
import java.lang.annotation.Annotation;
2626
import java.lang.reflect.Method;
2727
import java.lang.reflect.Type;
2828
import java.util.Arrays;
2929

30-
@Typed()
30+
@Vetoed
3131
public abstract class AnnotationUtils
3232
{
3333
private AnnotationUtils()

deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/CollectionUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
package org.apache.deltaspike.core.util;
2020

2121
import java.util.Collection;
22-
import jakarta.enterprise.inject.Typed;
22+
import jakarta.enterprise.inject.Vetoed;
2323

2424
/**
2525
* A collection of utilities for working with Collections
2626
*/
27-
@Typed()
27+
@Vetoed
2828
public abstract class CollectionUtils
2929
{
3030
private CollectionUtils()

deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/bean/BeanBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
import jakarta.enterprise.context.Dependent;
3030
import jakarta.enterprise.inject.Alternative;
31-
import jakarta.enterprise.inject.Typed;
31+
import jakarta.enterprise.inject.Vetoed;
3232
import jakarta.enterprise.inject.spi.AnnotatedType;
3333
import jakarta.enterprise.inject.spi.Bean;
3434
import jakarta.enterprise.inject.spi.BeanManager;

deltaspike/core/api/obsolete/src/test/java/org/apache/deltaspike/test/api/metadata/AnnotatedTypeBuilderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import jakarta.enterprise.event.Observes;
3232
import jakarta.enterprise.inject.Alternative;
3333
import jakarta.enterprise.inject.Default;
34-
import jakarta.enterprise.inject.Typed;
34+
import jakarta.enterprise.inject.Vetoed;
3535
import jakarta.enterprise.inject.spi.AnnotatedConstructor;
3636
import jakarta.enterprise.inject.spi.AnnotatedMethod;
3737
import jakarta.enterprise.inject.spi.AnnotatedParameter;

0 commit comments

Comments
 (0)