Ban @Nonnull and @NotNull annotations + cleanup

client/trino-client/src/main/java/io/trino/client/JsonResultRows.java

@@ -20,14 +20,12 @@
 import com.google.common.collect.AbstractIterator;
 import com.google.common.io.Closer;
 import io.trino.client.JsonDecodingUtils.TypeDecoder;
-import jakarta.annotation.Nonnull;
 import org.gaul.modernizer_maven_annotations.SuppressModernizer;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UncheckedIOException;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 import static com.fasterxml.jackson.core.JsonParser.Feature.AUTO_CLOSE_SOURCE;
@@ -139,32 +137,24 @@ private void close()
 
     public static ResultRows forJsonParser(JsonParser parser, List<Column> columns)
     {
-        return new ResultRows() {
-            @Override
-            public @Nonnull Iterator<List<Object>> iterator()
-            {
-                try {
-                    return new RowWiseIterator(parser, createTypeDecoders(columns));
-                }
-                catch (IOException e) {
-                    throw new UncheckedIOException(e);
-                }
+        return () -> {
+            try {
+                return new RowWiseIterator(parser, createTypeDecoders(columns));
+            }
+            catch (IOException e) {
+                throw new UncheckedIOException(e);
             }
         };
     }
 
     public static ResultRows forInputStream(InputStream stream, TypeDecoder[] decoders)
     {
-        return new ResultRows() {
-            @Override
-            public @Nonnull Iterator<List<Object>> iterator()
-            {
-                try {
-                    return new RowWiseIterator(stream, decoders);
-                }
-                catch (IOException e) {
-                    throw new UncheckedIOException(e);
-                }
+        return () -> {
+            try {
+                return new RowWiseIterator(stream, decoders);
+            }
+            catch (IOException e) {
+                throw new UncheckedIOException(e);
             }
         };
     }

client/trino-client/src/main/java/io/trino/client/RawQueryData.java

@@ -13,7 +13,6 @@
  */
 package io.trino.client;
 
-import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 import java.util.List;
@@ -35,7 +34,7 @@ private RawQueryData(Iterable<List<Object>> values)
         this.iterable = values == null ? null : unmodifiableIterable(values);
     }
 
-    public @Nonnull Iterable<List<Object>> getIterable()
+    public Iterable<List<Object>> getIterable()
     {
         checkState(iterable != null, "cannot return a null iterable");
         return iterable;

client/trino-client/src/main/java/io/trino/client/ResultRows.java

@@ -13,8 +13,6 @@
  */
 package io.trino.client;
 
-import jakarta.annotation.Nonnull;
-
 import java.util.Iterator;
 import java.util.List;
 
@@ -36,7 +34,7 @@ public boolean isNull()
         }
 
         @Override
-        public @Nonnull Iterator<List<Object>> iterator()
+        public Iterator<List<Object>> iterator()
         {
             return emptyIterator();
         }

client/trino-client/src/main/java/io/trino/client/StatementClient.java

@@ -13,7 +13,6 @@
  */
 package io.trino.client;
 
-import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 import java.io.Closeable;
@@ -45,7 +44,7 @@ public interface StatementClient
     // For backward compatibility and migration path
     QueryData currentData();
 
-    @Nonnull ResultRows currentRows();
+    ResultRows currentRows();
 
     QueryStatusInfo finalStatusInfo();
 

client/trino-client/src/main/java/io/trino/client/StatementClientV1.java

@@ -22,7 +22,6 @@
 import com.google.errorprone.annotations.ThreadSafe;
 import io.airlift.units.Duration;
 import io.trino.client.spooling.SegmentLoader;
-import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 import okhttp3.Call;
 import okhttp3.Headers;
@@ -255,7 +254,6 @@ public QueryStatusInfo currentStatusInfo()
     }
 
     @Override
-    @Nonnull
     public ResultRows currentRows()
     {
         checkState(isRunning(), "current position is not valid (cursor past end)");

client/trino-jdbc/src/test/java/io/trino/jdbc/TestAsyncResultIterator.java

@@ -24,7 +24,6 @@
 import io.trino.client.StatementClient;
 import io.trino.client.StatementStats;
 import io.trino.client.Warning;
-import jakarta.annotation.Nonnull;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
 
@@ -174,7 +173,6 @@ public QueryData currentData()
         }
 
         @Override
-        @Nonnull
         public ResultRows currentRows()
         {
             return queryData.get();

core/trino-main/src/main/java/io/trino/sql/planner/LogicalPlanner.java

@@ -110,7 +110,6 @@
 import io.trino.tracing.ScopedSpan;
 import io.trino.tracing.TrinoAttributes;
 import io.trino.type.UnknownType;
-import jakarta.annotation.Nonnull;
 
 import java.util.AbstractMap.SimpleImmutableEntry;
 import java.util.ArrayList;
@@ -301,7 +300,6 @@ public Plan plan(Analysis analysis, Stage stage, boolean collectPlanStatistics)
         return new Plan(root, statsAndCosts);
     }
 
-    @Nonnull
     private PlanNode runOptimizer(PlanNode root, TableStatsProvider tableStatsProvider, PlanOptimizer optimizer)
     {
         PlanNode result;

core/trino-main/src/main/java/io/trino/util/FastutilSetHelper.java

@@ -37,7 +37,6 @@
 import it.unimi.dsi.fastutil.longs.LongOpenCustomHashSet;
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
 import it.unimi.dsi.fastutil.objects.ObjectOpenCustomHashSet;
-import jakarta.annotation.Nonnull;
 
 import java.lang.invoke.MethodHandle;
 import java.math.BigInteger;
@@ -159,7 +158,6 @@ public boolean contains(long value)
         }
 
         @Override
-        @Nonnull
         public LongIterator iterator()
         {
             PrimitiveIterator.OfInt iterator = bitmask.stream().iterator();

lib/trino-orc/src/main/java/io/trino/orc/reader/MapColumnReader.java

@@ -29,7 +29,6 @@
 import io.trino.spi.type.MapType;
 import io.trino.spi.type.Type;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
-import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
 import java.io.IOException;
@@ -65,12 +64,10 @@ public class MapColumnReader
     private int readOffset;
     private int nextBatchSize;
 
-    @Nonnull
     private InputStreamSource<BooleanInputStream> presentStreamSource = missingStreamSource(BooleanInputStream.class);
     @Nullable
     private BooleanInputStream presentStream;
 
-    @Nonnull
     private InputStreamSource<LongInputStream> lengthStreamSource = missingStreamSource(LongInputStream.class);
     @Nullable
     private LongInputStream lengthStream;

pom.xml

@@ -2534,6 +2534,20 @@
                                     <bannedImport>org.testng.asserts.**</bannedImport>
                                 </bannedImports>
                             </RestrictImports>
+                            <RestrictImports>
+                                <reason>Trino assumes non-nullness by default, otherwise it's marked as @Nullable</reason>
+                                <bannedImports>
+                                    <bannedImport>jakarta.annotation.Nonnull</bannedImport>
+                                    <bannedImport>org.jetbrains.annotations.NotNull</bannedImport>
+                                </bannedImports>
+                                <notFixable>
+                                    <in>io.trino.cache.ElementTypesAreNonnullByDefault</in>
+                                    <allowedImports>
+                                        <allowedImport>jakarta.annotation.Nonnull</allowedImport>
+                                    </allowedImports>
+                                    <because>Extending Guava's API</because>
+                                </notFixable>
+                            </RestrictImports>
                             <RestrictImports>
                                 <bannedImports>
                                     <bannedImport>com.google.api.client.util.Preconditions</bannedImport>