Change Nonnull & Nullable annotation to jakarta.annotation (#488)

segmentio · Sep 16, 2024 · 2253257 · 2253257
1 parent a7641c5
commit 2253257
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 12 deletions.
diff --git a/analytics-core/pom.xml b/analytics-core/pom.xml
@@ -40,6 +40,11 @@
       <artifactId>guava</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>jakarta.annotation</groupId>
+      <artifactId>jakarta.annotation-api</artifactId>
+      <version>2.1.1</version>
+    </dependency>
 
     <dependency>
       <groupId>junit</groupId>

diff --git a/analytics-core/src/main/java/com/segment/analytics/messages/GroupMessage.java b/analytics-core/src/main/java/com/segment/analytics/messages/GroupMessage.java
@@ -2,9 +2,9 @@
 
 import com.google.auto.value.AutoValue;
 import com.segment.analytics.gson.AutoGson;
+import jakarta.annotation.Nullable;
 import java.util.Date;
 import java.util.Map;
-import javax.annotation.Nullable;
 
 /**
  * The group API call is how you associate an individual user with a group—be it a company,

diff --git a/analytics-core/src/main/java/com/segment/analytics/messages/IdentifyMessage.java b/analytics-core/src/main/java/com/segment/analytics/messages/IdentifyMessage.java
@@ -2,9 +2,9 @@
 
 import com.google.auto.value.AutoValue;
 import com.segment.analytics.gson.AutoGson;
+import jakarta.annotation.Nullable;
 import java.util.Date;
 import java.util.Map;
-import javax.annotation.Nullable;
 
 /**
  * The identify call ties a customer and their actions to a recognizable ID and traits like their

diff --git a/analytics-core/src/main/java/com/segment/analytics/messages/Message.java b/analytics-core/src/main/java/com/segment/analytics/messages/Message.java
@@ -1,9 +1,9 @@
 package com.segment.analytics.messages;
 
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.util.Date;
 import java.util.Map;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 
 /**
  * Encapsulates properties common to all messages. Although not enforced by the compiler, either the

diff --git a/analytics-core/src/main/java/com/segment/analytics/messages/PageMessage.java b/analytics-core/src/main/java/com/segment/analytics/messages/PageMessage.java
@@ -2,9 +2,9 @@
 
 import com.google.auto.value.AutoValue;
 import com.segment.analytics.gson.AutoGson;
+import jakarta.annotation.Nullable;
 import java.util.Date;
 import java.util.Map;
-import javax.annotation.Nullable;
 
 /**
  * The page call lets you record whenever a user sees a page of your website, along with any

diff --git a/analytics-core/src/main/java/com/segment/analytics/messages/ScreenMessage.java b/analytics-core/src/main/java/com/segment/analytics/messages/ScreenMessage.java
@@ -2,9 +2,9 @@
 
 import com.google.auto.value.AutoValue;
 import com.segment.analytics.gson.AutoGson;
+import jakarta.annotation.Nullable;
 import java.util.Date;
 import java.util.Map;
-import javax.annotation.Nullable;
 
 /**
  * The screen call lets you record whenever a user sees a screen, along with any properties about

diff --git a/analytics-core/src/main/java/com/segment/analytics/messages/TrackMessage.java b/analytics-core/src/main/java/com/segment/analytics/messages/TrackMessage.java
@@ -2,9 +2,9 @@
 
 import com.google.auto.value.AutoValue;
 import com.segment.analytics.gson.AutoGson;
+import jakarta.annotation.Nullable;
 import java.util.Date;
 import java.util.Map;
-import javax.annotation.Nullable;
 
 /**
  * The track API call is how you record any actions your users perform, along with any properties

diff --git a/analytics/pom.xml b/analytics/pom.xml
@@ -68,6 +68,11 @@
       <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>jakarta.annotation</groupId>
+      <artifactId>jakarta.annotation-api</artifactId>
+      <version>2.1.1</version>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/analytics/src/main/java/com/segment/analytics/AnalyticsRequestInterceptor.java b/analytics/src/main/java/com/segment/analytics/AnalyticsRequestInterceptor.java
@@ -1,7 +1,7 @@
 package com.segment.analytics;
 
+import jakarta.annotation.Nonnull;
 import java.io.IOException;
-import javax.annotation.Nonnull;
 import okhttp3.Interceptor;
 import okhttp3.Request;
 

diff --git a/analytics/src/main/java/com/segment/analytics/internal/FlushMessage.java b/analytics/src/main/java/com/segment/analytics/internal/FlushMessage.java
@@ -1,10 +1,10 @@
 package com.segment.analytics.internal;
 
 import com.segment.analytics.messages.Message;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.util.Date;
 import java.util.Map;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 
 class FlushMessage implements Message {
   static final FlushMessage POISON = new FlushMessage();

diff --git a/analytics/src/main/java/com/segment/analytics/internal/StopMessage.java b/analytics/src/main/java/com/segment/analytics/internal/StopMessage.java
@@ -1,10 +1,10 @@
 package com.segment.analytics.internal;
 
 import com.segment.analytics.messages.Message;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.util.Date;
 import java.util.Map;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 
 class StopMessage implements Message {
   static final StopMessage STOP = new StopMessage();