Add CDI annotations to the annotations that need them. Updated the si…

…gnature test profile to use the new maven plugin for generation. Signed-off-by: James R. Perkins <jperkins@redhat.com>
jakartaee · Feb 15, 2024 · 21f7c25 · 21f7c25
1 parent a7f5a0c
commit 21f7c25
Show file tree

Hide file tree

Showing 15 changed files with 111 additions and 13 deletions.
diff --git a/jaxrs-api/src/main/java/jakarta/ws/rs/ApplicationPath.java b/jaxrs-api/src/main/java/jakarta/ws/rs/ApplicationPath.java
@@ -22,6 +22,9 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Stereotype;
+
 /**
  * Identifies the application path that serves as the base URI for all resource URIs provided by
  * {@link jakarta.ws.rs.Path}. May only be applied to a subclass of {@link jakarta.ws.rs.core.Application}.
@@ -40,6 +43,8 @@
 @Documented
 @Target({ ElementType.TYPE })
 @Retention(RetentionPolicy.RUNTIME)
+@Stereotype
+@ApplicationScoped
 public @interface ApplicationPath {
 
     /**

diff --git a/jaxrs-api/src/main/java/jakarta/ws/rs/BeanParam.java b/jaxrs-api/src/main/java/jakarta/ws/rs/BeanParam.java
@@ -22,6 +22,8 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import jakarta.inject.Qualifier;
+
 /**
  * The annotation that may be used to inject custom JAX-RS "parameter aggregator" value object into a resource class
  * field, property or resource method parameter.
@@ -68,5 +70,6 @@
 @Target({ ElementType.PARAMETER, ElementType.METHOD, ElementType.FIELD })
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
+@Qualifier
 public @interface BeanParam {
 }
diff --git a/jaxrs-api/src/main/java/jakarta/ws/rs/CookieParam.java b/jaxrs-api/src/main/java/jakarta/ws/rs/CookieParam.java
@@ -22,6 +22,8 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import jakarta.inject.Qualifier;
+
 /**
  * Binds the value of a HTTP cookie to a resource method parameter, resource class field, or resource class bean
  * property. A default value can be specified using the {@link DefaultValue} annotation.
@@ -55,6 +57,7 @@
 @Target({ ElementType.PARAMETER, ElementType.METHOD, ElementType.FIELD })
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
+@Qualifier
 public @interface CookieParam {
 
     /**

diff --git a/jaxrs-api/src/main/java/jakarta/ws/rs/FormParam.java b/jaxrs-api/src/main/java/jakarta/ws/rs/FormParam.java
@@ -22,6 +22,8 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import jakarta.inject.Qualifier;
+
 /**
  * Binds the value(s) of a form parameter contained within a request entity body to a resource method parameter. Values
  * are URL decoded unless this is disabled using the {@link Encoded} annotation. A default value can be specified using
@@ -66,6 +68,7 @@
 @Target({ ElementType.PARAMETER, ElementType.METHOD, ElementType.FIELD })
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
+@Qualifier
 public @interface FormParam {
 
     /**

diff --git a/jaxrs-api/src/main/java/jakarta/ws/rs/HeaderParam.java b/jaxrs-api/src/main/java/jakarta/ws/rs/HeaderParam.java
@@ -22,6 +22,8 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import jakarta.inject.Qualifier;
+
 /**
  * Binds the value(s) of a HTTP header to a resource method parameter, resource class field, or resource class bean
  * property. A default value can be specified using the {@link DefaultValue} annotation.
@@ -58,6 +60,7 @@
 @Target({ ElementType.PARAMETER, ElementType.METHOD, ElementType.FIELD })
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
+@Qualifier
 public @interface HeaderParam {
 
     /**

diff --git a/jaxrs-api/src/main/java/jakarta/ws/rs/MatrixParam.java b/jaxrs-api/src/main/java/jakarta/ws/rs/MatrixParam.java
@@ -22,6 +22,8 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import jakarta.inject.Qualifier;
+
 /**
  * Binds the value(s) of a URI matrix parameter to a resource method parameter, resource class field, or resource class
  * bean property. Values are URL decoded unless this is disabled using the {@link Encoded} annotation. A default value
@@ -66,6 +68,7 @@
 @Target({ ElementType.PARAMETER, ElementType.METHOD, ElementType.FIELD })
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
+@Qualifier
 public @interface MatrixParam {
 
     /**

diff --git a/jaxrs-api/src/main/java/jakarta/ws/rs/Path.java b/jaxrs-api/src/main/java/jakarta/ws/rs/Path.java
@@ -22,6 +22,9 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import jakarta.enterprise.context.RequestScoped;
+import jakarta.enterprise.inject.Stereotype;
+
 /**
  * Identifies the URI path that a resource class or class method will serve requests for.
  *
@@ -65,6 +68,8 @@
 @Target({ ElementType.TYPE, ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
+@Stereotype
+@RequestScoped
 public @interface Path {
 
     /**

diff --git a/jaxrs-api/src/main/java/jakarta/ws/rs/PathParam.java b/jaxrs-api/src/main/java/jakarta/ws/rs/PathParam.java
@@ -22,6 +22,8 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import jakarta.inject.Qualifier;
+
 /**
  * Binds the value of a URI template parameter or a path segment containing the template parameter to a resource method
  * parameter, resource class field, or resource class bean property. The value is URL decoded unless this is disabled
@@ -67,6 +69,7 @@
 @Target({ ElementType.PARAMETER, ElementType.METHOD, ElementType.FIELD })
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
+@Qualifier
 public @interface PathParam {
 
     /**

diff --git a/jaxrs-api/src/main/java/jakarta/ws/rs/QueryParam.java b/jaxrs-api/src/main/java/jakarta/ws/rs/QueryParam.java
@@ -22,6 +22,8 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import jakarta.inject.Qualifier;
+
 /**
  * Binds the value(s) of a HTTP query parameter to a resource method parameter, resource class field, or resource class
  * bean property. Values are URL decoded unless this is disabled using the {@link Encoded} annotation. A default value
@@ -60,6 +62,7 @@
 @Target({ ElementType.PARAMETER, ElementType.METHOD, ElementType.FIELD })
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
+@Qualifier
 public @interface QueryParam {
 
     /**

diff --git a/jaxrs-api/src/main/java/jakarta/ws/rs/ext/Provider.java b/jaxrs-api/src/main/java/jakarta/ws/rs/ext/Provider.java
@@ -22,6 +22,9 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Stereotype;
+
 /**
  * Marks an implementation of an extension interface that should be discoverable by JAX-RS runtime during a provider
  * scanning phase.
@@ -33,5 +36,7 @@
 @Target({ ElementType.TYPE })
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
+@Stereotype
+@ApplicationScoped
 public @interface Provider {
 }
diff --git a/jaxrs-api/src/main/java/module-info.java b/jaxrs-api/src/main/java/module-info.java
@@ -20,6 +20,9 @@
 module jakarta.ws.rs {
 
     requires static jakarta.xml.bind;
+    // These two modules are not required on the client side
+    requires static jakarta.cdi;
+    requires static jakarta.inject;
 
     requires java.logging;
 

diff --git a/jaxrs-tck/pom.xml b/jaxrs-tck/pom.xml
@@ -39,6 +39,15 @@
             <groupId>jakarta.ws.rs</groupId>
             <artifactId>jakarta.ws.rs-api</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
         </dependency>
 
         <dependency>
@@ -97,12 +106,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.netbeans.tools</groupId>
-            <artifactId>sigtest-maven-plugin</artifactId>
-            <version>1.4</version>
-        </dependency>
-
         <!-- Test Dependencies -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -147,9 +150,9 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.netbeans.tools</groupId>
+                        <groupId>jakarta.tck</groupId>
                         <artifactId>sigtest-maven-plugin</artifactId>
-                        <version>1.4</version>
+                        <version>2.0</version>
                         <executions>
                             <execution>
                                 <goals>
@@ -158,10 +161,16 @@
                             </execution>
                         </executions>
                         <configuration>
-                            <FileName>${project.build.directory}/jakarta.ws.rs.sig_${project.parent.version}</FileName>
                             <packages>
-                                jakarta.ws.rs,jakarta.ws.rs.client,jakarta.ws.rs.core,jakarta.ws.rs.container,jakarta.ws.rs.ext,jakarta.ws.rs.sse
+                                jakarta.ws.rs,
+                                jakarta.ws.rs.client,
+                                jakarta.ws.rs.core,
+                                jakarta.ws.rs.container,
+                                jakarta.ws.rs.ext,
+                                jakarta.ws.rs.sse
                             </packages>
+                            <attach>false</attach>
+                            <sigfile>${project.build.directory}/jakarta.ws.rs.sig_${project.parent.version}</sigfile>
                         </configuration>
                     </plugin>
                 </plugins>

diff --git a/.../rs/signaturetest/jakarta.ws.rs.sig_3.1.0 → .../rs/signaturetest/jakarta.ws.rs.sig_3.2.0 b/.../rs/signaturetest/jakarta.ws.rs.sig_3.1.0 → .../rs/signaturetest/jakarta.ws.rs.sig_3.2.0
@@ -1,10 +1,49 @@
 #Signature file v4.1
-#Version 3.1.0
+#Version 3.2.0
+
+CLSS public abstract interface !annotation jakarta.enterprise.context.ApplicationScoped
+ anno 0 jakarta.enterprise.context.NormalScope(boolean passivating=false)
+ anno 0 java.lang.annotation.Documented()
+ anno 0 java.lang.annotation.Inherited()
+ anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
+ anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[TYPE, METHOD, FIELD])
+innr public final static Literal
+intf java.lang.annotation.Annotation
+
+CLSS public abstract interface !annotation jakarta.enterprise.context.NormalScope
+ anno 0 java.lang.annotation.Documented()
+ anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
+ anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[ANNOTATION_TYPE])
+intf java.lang.annotation.Annotation
+meth public abstract !hasdefault boolean passivating()
+
+CLSS public abstract interface !annotation jakarta.enterprise.context.RequestScoped
+ anno 0 jakarta.enterprise.context.NormalScope(boolean passivating=false)
+ anno 0 java.lang.annotation.Documented()
+ anno 0 java.lang.annotation.Inherited()
+ anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
+ anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[TYPE, METHOD, FIELD])
+innr public final static Literal
+intf java.lang.annotation.Annotation
+
+CLSS public abstract interface !annotation jakarta.enterprise.inject.Stereotype
+ anno 0 java.lang.annotation.Documented()
+ anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
+ anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[ANNOTATION_TYPE])
+intf java.lang.annotation.Annotation
+
+CLSS public abstract interface !annotation jakarta.inject.Qualifier
+ anno 0 java.lang.annotation.Documented()
+ anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
+ anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[ANNOTATION_TYPE])
+intf java.lang.annotation.Annotation
 
 CLSS public abstract interface !annotation jakarta.ws.rs.ApplicationPath
  anno 0 java.lang.annotation.Documented()
  anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
  anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[TYPE])
+ anno 0 jakarta.enterprise.context.ApplicationScoped()
+ anno 0 jakarta.enterprise.inject.Stereotype()
 intf java.lang.annotation.Annotation
 meth public abstract java.lang.String value()
 
@@ -24,6 +63,7 @@ CLSS public abstract interface !annotation jakarta.ws.rs.BeanParam
  anno 0 java.lang.annotation.Documented()
  anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
  anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[PARAMETER, METHOD, FIELD])
+ anno 0 jakarta.inject.Qualifier()
 intf java.lang.annotation.Annotation
 
 CLSS public jakarta.ws.rs.ClientErrorException
@@ -61,6 +101,7 @@ CLSS public abstract interface !annotation jakarta.ws.rs.CookieParam
  anno 0 java.lang.annotation.Documented()
  anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
  anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[PARAMETER, METHOD, FIELD])
+ anno 0 jakarta.inject.Qualifier()
 intf java.lang.annotation.Annotation
 meth public abstract java.lang.String value()
 
@@ -100,6 +141,7 @@ CLSS public abstract interface !annotation jakarta.ws.rs.FormParam
  anno 0 java.lang.annotation.Documented()
  anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
  anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[PARAMETER, METHOD, FIELD])
+ anno 0 jakarta.inject.Qualifier()
 intf java.lang.annotation.Annotation
 meth public abstract java.lang.String value()
 
@@ -121,6 +163,7 @@ CLSS public abstract interface !annotation jakarta.ws.rs.HeaderParam
  anno 0 java.lang.annotation.Documented()
  anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
  anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[PARAMETER, METHOD, FIELD])
+ anno 0 jakarta.inject.Qualifier()
 intf java.lang.annotation.Annotation
 meth public abstract java.lang.String value()
 
@@ -154,6 +197,7 @@ CLSS public abstract interface !annotation jakarta.ws.rs.MatrixParam
  anno 0 java.lang.annotation.Documented()
  anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
  anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[PARAMETER, METHOD, FIELD])
+ anno 0 jakarta.inject.Qualifier()
 intf java.lang.annotation.Annotation
 meth public abstract java.lang.String value()
 
@@ -256,13 +300,16 @@ CLSS public abstract interface !annotation jakarta.ws.rs.Path
  anno 0 java.lang.annotation.Documented()
  anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
  anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[TYPE, METHOD])
+ anno 0 jakarta.enterprise.context.RequestScoped()
+ anno 0 jakarta.enterprise.inject.Stereotype()
 intf java.lang.annotation.Annotation
 meth public abstract java.lang.String value()
 
 CLSS public abstract interface !annotation jakarta.ws.rs.PathParam
  anno 0 java.lang.annotation.Documented()
  anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
  anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[PARAMETER, METHOD, FIELD])
+ anno 0 jakarta.inject.Qualifier()
 intf java.lang.annotation.Annotation
 meth public abstract java.lang.String value()
 
@@ -293,6 +340,7 @@ CLSS public abstract interface !annotation jakarta.ws.rs.QueryParam
  anno 0 java.lang.annotation.Documented()
  anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
  anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[PARAMETER, METHOD, FIELD])
+ anno 0 jakarta.inject.Qualifier()
 intf java.lang.annotation.Annotation
 meth public abstract java.lang.String value()
 
@@ -1685,6 +1733,8 @@ CLSS public abstract interface !annotation jakarta.ws.rs.ext.Provider
  anno 0 java.lang.annotation.Documented()
  anno 0 java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy value=RUNTIME)
  anno 0 java.lang.annotation.Target(java.lang.annotation.ElementType[] value=[TYPE])
+ anno 0 jakarta.enterprise.context.ApplicationScoped()
+ anno 0 jakarta.enterprise.inject.Stereotype()
 intf java.lang.annotation.Annotation
 
 CLSS public abstract interface jakarta.ws.rs.ext.Providers

diff --git a/jaxrs-tck/src/main/resources/ee/jakarta/tck/ws/rs/signaturetest/sig-test.map b/jaxrs-tck/src/main/resources/ee/jakarta/tck/ws/rs/signaturetest/sig-test.map
@@ -17,4 +17,4 @@
 ###############################################################
 # The signature test mapping file for the JAX-RS TCK.
 ###############################################################
-jakarta.ws.rs=3.1.0
+jakarta.ws.rs=3.2.0
diff --git a/pom.xml b/pom.xml
@@ -103,7 +103,7 @@
         <validation.api.version>3.0.0</validation.api.version>
         <concurrent.api.version>2.0.0</concurrent.api.version>
         <xml.binding.api.version>4.0.0</xml.binding.api.version>
-        <cdi.api.version>3.0.0</cdi.api.version>
+        <cdi.api.version>4.1.0-M1</cdi.api.version>
         <junit.version>5.8.2</junit.version>
         <org.glassfish.jaxb.version>4.0.3</org.glassfish.jaxb.version>
         <com.sun.istack.version>4.1.2</com.sun.istack.version>