Skip to content

Commit 2253257

Browse files
authored
Change Nonnull & Nullable annotation to jakarta.annotation (#488)
1 parent a7641c5 commit 2253257

File tree

11 files changed

+22
-12
lines changed

11 files changed

+22
-12
lines changed

analytics-core/pom.xml

+5
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@
4040
<artifactId>guava</artifactId>
4141
<scope>provided</scope>
4242
</dependency>
43+
<dependency>
44+
<groupId>jakarta.annotation</groupId>
45+
<artifactId>jakarta.annotation-api</artifactId>
46+
<version>2.1.1</version>
47+
</dependency>
4348

4449
<dependency>
4550
<groupId>junit</groupId>

analytics-core/src/main/java/com/segment/analytics/messages/GroupMessage.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import com.google.auto.value.AutoValue;
44
import com.segment.analytics.gson.AutoGson;
5+
import jakarta.annotation.Nullable;
56
import java.util.Date;
67
import java.util.Map;
7-
import javax.annotation.Nullable;
88

99
/**
1010
* The group API call is how you associate an individual user with a group—be it a company,

analytics-core/src/main/java/com/segment/analytics/messages/IdentifyMessage.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import com.google.auto.value.AutoValue;
44
import com.segment.analytics.gson.AutoGson;
5+
import jakarta.annotation.Nullable;
56
import java.util.Date;
67
import java.util.Map;
7-
import javax.annotation.Nullable;
88

99
/**
1010
* The identify call ties a customer and their actions to a recognizable ID and traits like their

analytics-core/src/main/java/com/segment/analytics/messages/Message.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.segment.analytics.messages;
22

3+
import jakarta.annotation.Nonnull;
4+
import jakarta.annotation.Nullable;
35
import java.util.Date;
46
import java.util.Map;
5-
import javax.annotation.Nonnull;
6-
import javax.annotation.Nullable;
77

88
/**
99
* Encapsulates properties common to all messages. Although not enforced by the compiler, either the

analytics-core/src/main/java/com/segment/analytics/messages/PageMessage.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import com.google.auto.value.AutoValue;
44
import com.segment.analytics.gson.AutoGson;
5+
import jakarta.annotation.Nullable;
56
import java.util.Date;
67
import java.util.Map;
7-
import javax.annotation.Nullable;
88

99
/**
1010
* The page call lets you record whenever a user sees a page of your website, along with any

analytics-core/src/main/java/com/segment/analytics/messages/ScreenMessage.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import com.google.auto.value.AutoValue;
44
import com.segment.analytics.gson.AutoGson;
5+
import jakarta.annotation.Nullable;
56
import java.util.Date;
67
import java.util.Map;
7-
import javax.annotation.Nullable;
88

99
/**
1010
* The screen call lets you record whenever a user sees a screen, along with any properties about

analytics-core/src/main/java/com/segment/analytics/messages/TrackMessage.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import com.google.auto.value.AutoValue;
44
import com.segment.analytics.gson.AutoGson;
5+
import jakarta.annotation.Nullable;
56
import java.util.Date;
67
import java.util.Map;
7-
import javax.annotation.Nullable;
88

99
/**
1010
* The track API call is how you record any actions your users perform, along with any properties

analytics/pom.xml

+5
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,11 @@
6868
<artifactId>mockito-core</artifactId>
6969
<scope>test</scope>
7070
</dependency>
71+
<dependency>
72+
<groupId>jakarta.annotation</groupId>
73+
<artifactId>jakarta.annotation-api</artifactId>
74+
<version>2.1.1</version>
75+
</dependency>
7176
</dependencies>
7277

7378
<build>

analytics/src/main/java/com/segment/analytics/AnalyticsRequestInterceptor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.segment.analytics;
22

3+
import jakarta.annotation.Nonnull;
34
import java.io.IOException;
4-
import javax.annotation.Nonnull;
55
import okhttp3.Interceptor;
66
import okhttp3.Request;
77

analytics/src/main/java/com/segment/analytics/internal/FlushMessage.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.segment.analytics.internal;
22

33
import com.segment.analytics.messages.Message;
4+
import jakarta.annotation.Nonnull;
5+
import jakarta.annotation.Nullable;
46
import java.util.Date;
57
import java.util.Map;
6-
import javax.annotation.Nonnull;
7-
import javax.annotation.Nullable;
88

99
class FlushMessage implements Message {
1010
static final FlushMessage POISON = new FlushMessage();

analytics/src/main/java/com/segment/analytics/internal/StopMessage.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.segment.analytics.internal;
22

33
import com.segment.analytics.messages.Message;
4+
import jakarta.annotation.Nonnull;
5+
import jakarta.annotation.Nullable;
46
import java.util.Date;
57
import java.util.Map;
6-
import javax.annotation.Nonnull;
7-
import javax.annotation.Nullable;
88

99
class StopMessage implements Message {
1010
static final StopMessage STOP = new StopMessage();

0 commit comments

Comments
 (0)