Remove jetbrains:annotations (#563)

build.gradle

@@ -100,7 +100,6 @@ dependencies {
     def gsonVersion = '2.10.1'
     def guavaVersion = '32.1.3-android'
     def snakeYamlVersion = '2.2'
-    def jetBrainsAnnotationsVersion = '22.0.0'
     def okHttpVersion = '3.12.13'
     def playServicesVersion = '18.2.0'
     def multidexVersion = '2.0.1'
@@ -132,7 +131,6 @@ dependencies {
     implementation "com.google.guava:guava:$guavaVersion"
 
     implementation "org.yaml:snakeyaml:$snakeYamlVersion"
-    implementation "org.jetbrains:annotations:$jetBrainsAnnotationsVersion"
     implementation "com.squareup.okhttp3:okhttp:$okHttpVersion"
     implementation "com.google.android.gms:play-services-base:$playServicesVersion"
     implementation "androidx.multidex:multidex:$multidexVersion"

deps.txt

@@ -64,7 +64,6 @@ releaseRuntimeClasspath - Runtime classpath of /release.
 |    +--- org.checkerframework:checker-qual:3.37.0
 |    \--- com.google.errorprone:error_prone_annotations:2.21.1
 +--- org.yaml:snakeyaml:2.2
-+--- org.jetbrains:annotations:22.0.0
 +--- com.squareup.okhttp3:okhttp:3.12.13
 |    \--- com.squareup.okio:okio:1.15.0
 +--- com.google.android.gms:play-services-base:18.2.0

src/main/java/io/split/android/client/network/HttpClientImpl.java

@@ -2,10 +2,10 @@
 
 import android.content.Context;
 
-import com.google.common.base.Strings;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import com.google.common.base.Strings;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -204,7 +204,7 @@ private Authenticator createBasicAuthenticator(String username, String password)
             return new Authenticator() {
                 @Nullable
                 @Override
-                public Request authenticate(@Nullable Route route, @NotNull Response response) throws IOException {
+                public Request authenticate(@Nullable Route route, @NonNull Response response) throws IOException {
                     String credential = Credentials.basic(username, password);
                     return response.request().newBuilder().header(PROXY_AUTHORIZATION_HEADER, credential).build();
                 }

src/main/java/io/split/android/client/network/HttpStreamResponse.java

@@ -1,9 +1,10 @@
 package io.split.android.client.network;
 
-import org.jetbrains.annotations.Nullable;
+import androidx.annotation.Nullable;
 
 import java.io.BufferedReader;
 
 public interface HttpStreamResponse extends BaseHttpResponse {
-    @Nullable BufferedReader getBufferedReader();
+    @Nullable
+    BufferedReader getBufferedReader();
 }

src/main/java/io/split/android/client/service/executor/SplitTaskExecutionInfo.java

@@ -1,14 +1,13 @@
 package io.split.android.client.service.executor;
 
-import androidx.annotation.NonNull;
+import static com.google.common.base.Preconditions.checkNotNull;
 
-import org.jetbrains.annotations.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 public class SplitTaskExecutionInfo {
 
     public static final String NON_SENT_RECORDS = "NON_SENT_RECORDS";

src/main/java/io/split/android/client/service/mysegments/MySegmentsSyncTask.java

@@ -1,8 +1,7 @@
 package io.split.android.client.service.mysegments;
 
 import androidx.annotation.NonNull;
-
-import org.jetbrains.annotations.Nullable;
+import androidx.annotation.Nullable;
 
 import java.util.ArrayList;
 import java.util.HashMap;

src/main/java/io/split/android/client/service/splits/SplitsSyncHelper.java

@@ -3,10 +3,9 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
-import org.jetbrains.annotations.Nullable;
-
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;

src/main/java/io/split/android/client/service/sseclient/notifications/MySegmentChangeV2Notification.java

@@ -1,8 +1,8 @@
 package io.split.android.client.service.sseclient.notifications;
 
-import com.google.gson.annotations.SerializedName;
+import androidx.annotation.Nullable;
 
-import org.jetbrains.annotations.Nullable;
+import com.google.gson.annotations.SerializedName;
 
 import io.split.android.client.common.CompressionType;
 

src/main/java/io/split/android/client/service/sseclient/sseclient/NotificationManagerKeeper.java

@@ -1,12 +1,11 @@
 package io.split.android.client.service.sseclient.sseclient;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.google.common.collect.Maps;
 import com.google.gson.JsonSyntaxException;
 
-import org.jetbrains.annotations.Nullable;
-
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
@@ -127,7 +126,7 @@ private synchronized int publishersCount() {
         return mPublishers.get(CHANNEL_PRI_KEY).count +  mPublishers.get(CHANNEL_SEC_KEY).count;
     }
 
-    private @Nullable  String getChannelKey(OccupancyNotification notification ) {
+    private @Nullable String getChannelKey(OccupancyNotification notification ) {
         if (notification.isControlPriChannel()) {
             return CHANNEL_PRI_KEY;
         } else if (notification.isControlSecChannel()) {

src/main/java/io/split/android/client/storage/impressions/SqLitePersistentImpressionsCountStorage.java

@@ -4,8 +4,6 @@
 
 import com.google.gson.JsonParseException;
 
-import org.jetbrains.annotations.NotNull;
-
 import java.util.List;
 
 import io.split.android.client.service.impressions.ImpressionsCountPerFeature;
@@ -79,7 +77,7 @@ protected void deleteById(@NonNull List<Long> ids) {
     }
 
     @Override
-    protected void updateStatus(@NonNull @NotNull List<Long> ids, int status) {
+    protected void updateStatus(@NonNull List<Long> ids, int status) {
         mDao.updateStatus(ids, status);
     }
 

src/main/java/io/split/android/client/storage/legacy/FileStorage.java

@@ -1,6 +1,6 @@
 package io.split.android.client.storage.legacy;
 
-import org.jetbrains.annotations.NotNull;
+import androidx.annotation.NonNull;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -20,7 +20,7 @@ public class FileStorage implements IStorage {
 
     protected final File mDataFolder;
 
-    public FileStorage(@NotNull File rootFolder, @NotNull String folderName) {
+    public FileStorage(@NonNull File rootFolder, @NonNull String folderName) {
         mDataFolder = new File(rootFolder, folderName);
         if(!mDataFolder.exists()) {
             if(!mDataFolder.mkdir()) {