From c119fa1bf6363c0e7f07a31168d72b228432ad7d Mon Sep 17 00:00:00 2001
From: Nikita Salnikov-Tarnovski <gnikem@gmail.com>
Date: Mon, 18 Oct 2021 17:32:25 +0300
Subject: [PATCH] Remove more usages of checker's Nullable (#4410)

---
 .../api/caching/Caffeine2Cache.java                |  8 ++++----
 .../api/caching/Caffeine3Cache.java                |  8 ++++----
 .../instrumentation/api/caching/CaffeineCache.java |  8 ++++----
 .../instrumentation/api/package-info.java          |  8 ++------
 .../mongo/v3_1/MongoDbAttributesExtractor.java     | 14 +++++++++-----
 5 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/instrumentation-api-caching/src/main/java/io/opentelemetry/instrumentation/api/caching/Caffeine2Cache.java b/instrumentation-api-caching/src/main/java/io/opentelemetry/instrumentation/api/caching/Caffeine2Cache.java
index 8a8a027df7..2a202b3d0a 100644
--- a/instrumentation-api-caching/src/main/java/io/opentelemetry/instrumentation/api/caching/Caffeine2Cache.java
+++ b/instrumentation-api-caching/src/main/java/io/opentelemetry/instrumentation/api/caching/Caffeine2Cache.java
@@ -9,8 +9,8 @@ import io.opentelemetry.instrumentation.api.internal.shaded.caffeine2.cache.Caff
 import java.util.Set;
 import java.util.concurrent.Executor;
 import java.util.function.Function;
-import org.checkerframework.checker.index.qual.NonNegative;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import javax.annotation.Nonnegative;
+import javax.annotation.Nonnull;
 
 final class Caffeine2Cache<K, V> implements CaffeineCache<K, V> {
 
@@ -68,12 +68,12 @@ final class Caffeine2Cache<K, V> implements CaffeineCache<K, V> {
     }
 
     @Override
-    public void maximumSize(@NonNegative long maximumSize) {
+    public void maximumSize(@Nonnegative long maximumSize) {
       caffeine.maximumSize(maximumSize);
     }
 
     @Override
-    public void executor(@NonNull Executor executor) {
+    public void executor(@Nonnull Executor executor) {
       caffeine.executor(executor);
     }
 
diff --git a/instrumentation-api-caching/src/main/java/io/opentelemetry/instrumentation/api/caching/Caffeine3Cache.java b/instrumentation-api-caching/src/main/java/io/opentelemetry/instrumentation/api/caching/Caffeine3Cache.java
index 8b8350ebf3..a9c1c3287d 100644
--- a/instrumentation-api-caching/src/main/java/io/opentelemetry/instrumentation/api/caching/Caffeine3Cache.java
+++ b/instrumentation-api-caching/src/main/java/io/opentelemetry/instrumentation/api/caching/Caffeine3Cache.java
@@ -9,8 +9,8 @@ import io.opentelemetry.instrumentation.api.internal.shaded.caffeine3.cache.Caff
 import java.util.Set;
 import java.util.concurrent.Executor;
 import java.util.function.Function;
-import org.checkerframework.checker.index.qual.NonNegative;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import javax.annotation.Nonnegative;
+import javax.annotation.Nonnull;
 
 final class Caffeine3Cache<K, V> implements CaffeineCache<K, V> {
 
@@ -78,12 +78,12 @@ final class Caffeine3Cache<K, V> implements CaffeineCache<K, V> {
     }
 
     @Override
-    public void maximumSize(@NonNegative long maximumSize) {
+    public void maximumSize(@Nonnegative long maximumSize) {
       caffeine.maximumSize(maximumSize);
     }
 
     @Override
-    public void executor(@NonNull Executor executor) {
+    public void executor(@Nonnull Executor executor) {
       caffeine.executor(executor);
     }
 
diff --git a/instrumentation-api-caching/src/main/java/io/opentelemetry/instrumentation/api/caching/CaffeineCache.java b/instrumentation-api-caching/src/main/java/io/opentelemetry/instrumentation/api/caching/CaffeineCache.java
index 861bd9490d..16774d07b6 100644
--- a/instrumentation-api-caching/src/main/java/io/opentelemetry/instrumentation/api/caching/CaffeineCache.java
+++ b/instrumentation-api-caching/src/main/java/io/opentelemetry/instrumentation/api/caching/CaffeineCache.java
@@ -7,8 +7,8 @@ package io.opentelemetry.instrumentation.api.caching;
 
 import java.util.Set;
 import java.util.concurrent.Executor;
-import org.checkerframework.checker.index.qual.NonNegative;
-import org.checkerframework.checker.nullness.qual.NonNull;
+import javax.annotation.Nonnegative;
+import javax.annotation.Nonnull;
 
 interface CaffeineCache<K, V> extends Cache<K, V> {
 
@@ -18,9 +18,9 @@ interface CaffeineCache<K, V> extends Cache<K, V> {
 
     void weakValues();
 
-    void maximumSize(@NonNegative long maximumSize);
+    void maximumSize(@Nonnegative long maximumSize);
 
-    void executor(@NonNull Executor executor);
+    void executor(@Nonnull Executor executor);
 
     Cache<K, V> build();
   }
diff --git a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/package-info.java b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/package-info.java
index a102201e9f..7b8ea44d48 100644
--- a/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/package-info.java
+++ b/instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/package-info.java
@@ -1,8 +1,4 @@
-@DefaultQualifier(
-    value = NonNull.class,
-    locations = {TypeUseLocation.FIELD, TypeUseLocation.PARAMETER, TypeUseLocation.RETURN})
+@ParametersAreNonnullByDefault
 package io.opentelemetry.instrumentation.api;
 
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.framework.qual.DefaultQualifier;
-import org.checkerframework.framework.qual.TypeUseLocation;
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoDbAttributesExtractor.java b/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoDbAttributesExtractor.java
index d1a97149ba..1d37e472cb 100644
--- a/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoDbAttributesExtractor.java
+++ b/instrumentation/mongo/mongo-3.1/library/src/main/java/io/opentelemetry/instrumentation/mongo/v3_1/MongoDbAttributesExtractor.java
@@ -16,12 +16,12 @@ import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.Map;
 import java.util.Optional;
+import javax.annotation.Nullable;
 import org.bson.BsonArray;
 import org.bson.BsonDocument;
 import org.bson.BsonValue;
 import org.bson.json.JsonWriter;
 import org.bson.json.JsonWriterSettings;
-import org.checkerframework.checker.nullness.qual.Nullable;
 
 class MongoDbAttributesExtractor extends DbAttributesExtractor<CommandStartedEvent, Void> {
 
@@ -50,17 +50,20 @@ class MongoDbAttributesExtractor extends DbAttributesExtractor<CommandStartedEve
   }
 
   @Override
-  protected @Nullable String user(CommandStartedEvent event) {
+  @Nullable
+  protected String user(CommandStartedEvent event) {
     return null;
   }
 
   @Override
-  protected @Nullable String name(CommandStartedEvent event) {
+  @Nullable
+  protected String name(CommandStartedEvent event) {
     return event.getDatabaseName();
   }
 
   @Override
-  protected @Nullable String connectionString(CommandStartedEvent event) {
+  @Nullable
+  protected String connectionString(CommandStartedEvent event) {
     ConnectionDescription connectionDescription = event.getConnectionDescription();
     if (connectionDescription != null) {
       ServerAddress sa = connectionDescription.getServerAddress();
@@ -82,7 +85,8 @@ class MongoDbAttributesExtractor extends DbAttributesExtractor<CommandStartedEve
   }
 
   @Override
-  protected @Nullable String operation(CommandStartedEvent event) {
+  @Nullable
+  protected String operation(CommandStartedEvent event) {
     return event.getCommandName();
   }