CXF-9180: Migrate to JSpecify 1.x annotations

reta · reta · commit 4ac5d78df824 · 2026-01-01T12:17:13.000-05:00
diff --git a/integration/tracing/tracing-micrometer/pom.xml b/integration/tracing/tracing-micrometer/pom.xml
@@ -22,6 +22,10 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.jspecify</groupId>
+            <artifactId>jspecify</artifactId>
+        </dependency>
         <dependency>
             <groupId>jakarta.xml.ws</groupId>
             <artifactId>jakarta.xml.ws-api</artifactId>
diff --git a/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/AbstractObservationClientProvider.java b/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/AbstractObservationClientProvider.java
@@ -24,8 +24,8 @@
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.phase.PhaseInterceptorChain;
 import org.apache.cxf.tracing.AbstractTracingProvider;
+import org.jspecify.annotations.Nullable;
 
-import io.micrometer.common.lang.Nullable;
 import io.micrometer.observation.Observation;
 import io.micrometer.observation.ObservationRegistry;
 
diff --git a/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/ObservationClientFeature.java b/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/ObservationClientFeature.java
@@ -26,8 +26,8 @@
 import org.apache.cxf.feature.AbstractPortableFeature;
 import org.apache.cxf.feature.DelegatingFeature;
 import org.apache.cxf.interceptor.InterceptorProvider;
+import org.jspecify.annotations.Nullable;
 
-import io.micrometer.common.lang.Nullable;
 import io.micrometer.observation.ObservationRegistry;
 
 @NoJSR250Annotations
diff --git a/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/ObservationClientStartInterceptor.java b/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/ObservationClientStartInterceptor.java
@@ -22,8 +22,8 @@
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.Phase;
+import org.jspecify.annotations.Nullable;
 
-import io.micrometer.common.lang.Nullable;
 import io.micrometer.observation.Observation;
 import io.micrometer.observation.ObservationRegistry;
 
diff --git a/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/ObservationFeature.java b/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/ObservationFeature.java
@@ -26,7 +26,7 @@
 import org.apache.cxf.feature.AbstractPortableFeature;
 import org.apache.cxf.feature.DelegatingFeature;
 import org.apache.cxf.interceptor.InterceptorProvider;
-import org.apache.cxf.jaxrs.ext.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import io.micrometer.observation.ObservationRegistry;
 
diff --git a/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/ObservationStartInterceptor.java b/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/ObservationStartInterceptor.java
@@ -20,9 +20,9 @@
 
 import org.apache.cxf.common.injection.NoJSR250Annotations;
 import org.apache.cxf.interceptor.Fault;
-import org.apache.cxf.jaxrs.ext.Nullable;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.Phase;
+import org.jspecify.annotations.Nullable;
 
 import io.micrometer.observation.Observation;
 import io.micrometer.observation.ObservationRegistry;
diff --git a/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/AbstractJaxrsObservationConvention.java b/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/AbstractJaxrsObservationConvention.java
@@ -24,10 +24,10 @@
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.tracing.micrometer.jaxrs.JaxrsObservationDocumentation.CommonHighCardinalityKeys;
 import org.apache.cxf.tracing.micrometer.jaxrs.JaxrsObservationDocumentation.CommonLowCardinalityKeys;
+import org.jspecify.annotations.Nullable;
 
 import io.micrometer.common.KeyValue;
 import io.micrometer.common.KeyValues;
-import io.micrometer.common.lang.Nullable;
 
 /**
  *
diff --git a/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/ObservationClientProvider.java b/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/ObservationClientProvider.java
@@ -25,9 +25,9 @@
 import jakarta.ws.rs.client.ClientResponseContext;
 import jakarta.ws.rs.client.ClientResponseFilter;
 import jakarta.ws.rs.ext.Provider;
-import org.apache.cxf.jaxrs.ext.Nullable;
 import org.apache.cxf.tracing.micrometer.AbstractObservationClientProvider;
 import org.apache.cxf.tracing.micrometer.ObservationScope;
+import org.jspecify.annotations.Nullable;
 
 import io.micrometer.observation.Observation;
 import io.micrometer.observation.ObservationRegistry;
diff --git a/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/ObservationFeature.java b/integration/tracing/tracing-micrometer/src/main/java/org/apache/cxf/tracing/micrometer/jaxrs/ObservationFeature.java
@@ -21,7 +21,7 @@
 import jakarta.ws.rs.core.Feature;
 import jakarta.ws.rs.core.FeatureContext;
 import jakarta.ws.rs.ext.Provider;
-import org.apache.cxf.jaxrs.ext.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import io.micrometer.observation.ObservationRegistry;
 
diff --git a/parent/pom.xml b/parent/pom.xml
@@ -113,7 +113,6 @@
         <cxf.dropwizard4.version>4.2.37</cxf.dropwizard4.version>
         <cxf.ehcache3.version>3.11.1</cxf.ehcache3.version>
         <cxf.el-api.version>6.0.1</cxf.el-api.version>
-        <cxf.findbugs.version>3.0.2</cxf.findbugs.version>
         <cxf.jvnet.jaxb.version>4.0.12</cxf.jvnet.jaxb.version>
         <cxf.geronimo.jta.version>1.1.1</cxf.geronimo.jta.version>
         <cxf.geronimo.openapi.version>1.0.15</cxf.geronimo.openapi.version>
@@ -166,6 +165,7 @@
         <cxf.jexl.version>3.5.0</cxf.jexl.version>
         <cxf.joda.time.version>2.10.10</cxf.joda.time.version>
         <cxf.johnzon.version>2.0.2</cxf.johnzon.version>
+        <cxf.jspecify.version>1.0.0</cxf.jspecify.version>
         <cxf.json.api.version>2.1.3</cxf.json.api.version>
         <cxf.json.bind-api.version>3.0.1</cxf.json.bind-api.version>
         <cxf.jsr250.api.version>1.0</cxf.jsr250.api.version>
@@ -2065,6 +2065,11 @@
                      </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>org.jspecify</groupId>
+                <artifactId>jspecify</artifactId>
+                <version>${cxf.jspecify.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <profiles>
diff --git a/rt/rs/client/pom.xml b/rt/rs/client/pom.xml
@@ -38,6 +38,10 @@
         </cxf.osgi.import>
     </properties>
     <dependencies>
+        <dependency>
+            <groupId>org.jspecify</groupId>
+            <artifactId>jspecify</artifactId>
+        </dependency>
         <dependency>
             <groupId>jakarta.xml.ws</groupId>
             <artifactId>jakarta.xml.ws-api</artifactId>
diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
@@ -46,7 +46,6 @@
 
 import javax.xml.stream.XMLStreamWriter;
 
-import jakarta.annotation.Nullable;
 import jakarta.ws.rs.PathParam;
 import jakarta.ws.rs.ProcessingException;
 import jakarta.ws.rs.WebApplicationException;
@@ -105,6 +104,7 @@
 import org.apache.cxf.service.model.BindingOperationInfo;
 import org.apache.cxf.transport.MessageObserver;
 import org.apache.cxf.transport.http.HTTPConduit;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Common proxy and http-centric client implementation
diff --git a/rt/rs/extensions/providers/pom.xml b/rt/rs/extensions/providers/pom.xml
@@ -38,6 +38,10 @@
         </cxf.osgi.import>
     </properties>
     <dependencies>
+        <dependency>
+            <groupId>org.jspecify</groupId>
+            <artifactId>jspecify</artifactId>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsrjsonb/JsrJsonbProvider.java b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/jsrjsonb/JsrJsonbProvider.java
@@ -27,7 +27,6 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 
-import jakarta.annotation.Nullable;
 import jakarta.json.JsonException;
 import jakarta.json.bind.Jsonb;
 import jakarta.json.bind.JsonbBuilder;
@@ -46,6 +45,7 @@
 import jakarta.ws.rs.ext.Providers;
 import org.apache.cxf.jaxrs.utils.ExceptionUtils;
 import org.apache.cxf.jaxrs.utils.JAXRSUtils;
+import org.jspecify.annotations.Nullable;
 
 /**
  * 11.2.7 Java API for JSON Binding (JSR-370)
diff --git a/rt/transports/http/pom.xml b/rt/transports/http/pom.xml
@@ -51,6 +51,10 @@
         </cxf.public.suffix.list.url>
     </properties>
     <dependencies>
+        <dependency>
+            <groupId>org.jspecify</groupId>
+            <artifactId>jspecify</artifactId>
+        </dependency>
         <dependency>
             <groupId>jakarta.xml.ws</groupId>
             <artifactId>jakarta.xml.ws-api</artifactId>
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPServerEngineFactoryParametersProvider.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPServerEngineFactoryParametersProvider.java
@@ -21,9 +21,9 @@
 
 import java.util.Optional;
 
-import jakarta.annotation.Nullable;
 import org.apache.cxf.Bus;
 import org.apache.cxf.configuration.jsse.TLSServerParameters;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Provides programmatic defaults to the different HTTP server engine
