From 4eba926be57f0ef8cb01d696ec86c2e9e7712b64 Mon Sep 17 00:00:00 2001 From: Valentin Kovalenko Date: Thu, 6 Mar 2025 02:00:14 -0700 Subject: [PATCH] Replace `org.jetbrains.annotations.NotNull` with `com.mongodb.lang.NonNull` --- .../benchmark/jmh/codec/BsonArrayCodecBenchmark.java | 6 +++--- .../benchmark/jmh/codec/BsonDocumentBenchmark.java | 6 +++--- .../src/main/com/mongodb/internal/time/Timeout.java | 4 ++-- .../internal/async/SameThreadAsyncFunctionsTest.java | 8 ++++---- .../client/internal/crypt/KeyManagementService.java | 4 ++-- .../com/mongodb/client/internal/KeyManagementService.java | 6 +++--- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/driver-benchmarks/src/main/com/mongodb/benchmark/jmh/codec/BsonArrayCodecBenchmark.java b/driver-benchmarks/src/main/com/mongodb/benchmark/jmh/codec/BsonArrayCodecBenchmark.java index 19df4bd8269..75cc9dab337 100644 --- a/driver-benchmarks/src/main/com/mongodb/benchmark/jmh/codec/BsonArrayCodecBenchmark.java +++ b/driver-benchmarks/src/main/com/mongodb/benchmark/jmh/codec/BsonArrayCodecBenchmark.java @@ -27,7 +27,7 @@ import org.bson.codecs.BsonArrayCodec; import org.bson.codecs.DecoderContext; import org.bson.codecs.EncoderContext; -import org.jetbrains.annotations.NotNull; +import com.mongodb.lang.NonNull; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -87,12 +87,12 @@ public void beforeIteration() { } @Benchmark - public void decode(@NotNull Input input, @NotNull Blackhole blackhole) { + public void decode(@NonNull Input input, @NonNull Blackhole blackhole) { blackhole.consume(input.bsonArrayCodec.decode(input.reader, DecoderContext.builder().build())); } @Benchmark - public void encode(@NotNull Input input, @NotNull Blackhole blackhole) { + public void encode(@NonNull Input input, @NonNull Blackhole blackhole) { input.bsonArrayCodec.encode(input.writer, input.bsonValues, EncoderContext.builder().build()); blackhole.consume(input); } diff --git a/driver-benchmarks/src/main/com/mongodb/benchmark/jmh/codec/BsonDocumentBenchmark.java b/driver-benchmarks/src/main/com/mongodb/benchmark/jmh/codec/BsonDocumentBenchmark.java index 22739c511b8..b050f19007e 100644 --- a/driver-benchmarks/src/main/com/mongodb/benchmark/jmh/codec/BsonDocumentBenchmark.java +++ b/driver-benchmarks/src/main/com/mongodb/benchmark/jmh/codec/BsonDocumentBenchmark.java @@ -26,7 +26,7 @@ import org.bson.codecs.BsonDocumentCodec; import org.bson.codecs.DecoderContext; import org.bson.codecs.EncoderContext; -import org.jetbrains.annotations.NotNull; +import com.mongodb.lang.NonNull; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -74,12 +74,12 @@ public void setup() throws IOException { } @Benchmark - public void decode(@NotNull Input input, @NotNull Blackhole blackhole) { + public void decode(@NonNull Input input, @NonNull Blackhole blackhole) { blackhole.consume(input.bsonDocumentCodec.decode(new BsonBinaryReader(ByteBuffer.wrap(input.documentBytes)), DecoderContext.builder().build())); } @Benchmark - public void encode(@NotNull Input input, @NotNull Blackhole blackhole) { + public void encode(@NonNull Input input, @NonNull Blackhole blackhole) { input.bsonDocumentCodec.encode(new BsonBinaryWriter(new ByteBufferBsonOutput(input.bufferPool)), input.document, EncoderContext.builder().build()); blackhole.consume(input); } diff --git a/driver-core/src/main/com/mongodb/internal/time/Timeout.java b/driver-core/src/main/com/mongodb/internal/time/Timeout.java index 85b92d9fde1..3dba42e580f 100644 --- a/driver-core/src/main/com/mongodb/internal/time/Timeout.java +++ b/driver-core/src/main/com/mongodb/internal/time/Timeout.java @@ -22,7 +22,7 @@ import com.mongodb.internal.function.CheckedRunnable; import com.mongodb.internal.function.CheckedSupplier; import com.mongodb.lang.Nullable; -import org.jetbrains.annotations.NotNull; +import com.mongodb.lang.NonNull; import java.util.Arrays; import java.util.Collections; @@ -82,7 +82,7 @@ static Timeout nullAsInfinite(@Nullable final Timeout timeout) { * @param zeroSemantics what to interpret a 0 duration as (infinite or expired) * @return a timeout that expires in the specified duration after now. */ - @NotNull + @NonNull static Timeout expiresIn(final long duration, final TimeUnit unit, final ZeroSemantics zeroSemantics) { if (duration < 0) { throw new AssertionError("Timeouts must not be in the past"); diff --git a/driver-core/src/test/unit/com/mongodb/internal/async/SameThreadAsyncFunctionsTest.java b/driver-core/src/test/unit/com/mongodb/internal/async/SameThreadAsyncFunctionsTest.java index 04b9290af55..7dd4c0f37ac 100644 --- a/driver-core/src/test/unit/com/mongodb/internal/async/SameThreadAsyncFunctionsTest.java +++ b/driver-core/src/test/unit/com/mongodb/internal/async/SameThreadAsyncFunctionsTest.java @@ -16,7 +16,7 @@ package com.mongodb.internal.async; -import org.jetbrains.annotations.NotNull; +import com.mongodb.lang.NonNull; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -62,7 +62,7 @@ void testInvalid() { private static class SameThreadExecutorService extends AbstractExecutorService { @Override - public void execute(@NotNull final Runnable command) { + public void execute(@NonNull final Runnable command) { command.run(); } @@ -70,7 +70,7 @@ public void execute(@NotNull final Runnable command) { public void shutdown() { } - @NotNull + @NonNull @Override public List shutdownNow() { return Collections.emptyList(); @@ -87,7 +87,7 @@ public boolean isTerminated() { } @Override - public boolean awaitTermination(final long timeout, @NotNull final TimeUnit unit) { + public boolean awaitTermination(final long timeout, @NonNull final TimeUnit unit) { return true; } } diff --git a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/crypt/KeyManagementService.java b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/crypt/KeyManagementService.java index 019445e6cde..b82dd590618 100644 --- a/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/crypt/KeyManagementService.java +++ b/driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/crypt/KeyManagementService.java @@ -39,7 +39,7 @@ import com.mongodb.lang.Nullable; import org.bson.ByteBuf; import org.bson.ByteBufNIO; -import org.jetbrains.annotations.NotNull; +import com.mongodb.lang.NonNull; import reactor.core.publisher.Mono; import reactor.core.publisher.MonoSink; @@ -179,7 +179,7 @@ private OperationContext createOperationContext(@Nullable final Timeout operatio return OperationContext.simpleOperationContext(new TimeoutContext(timeoutSettings)); } - @NotNull + @NonNull private static TimeoutSettings createTimeoutSettings(final SocketSettings socketSettings, @Nullable final Long ms) { return new TimeoutSettings( diff --git a/driver-sync/src/main/com/mongodb/client/internal/KeyManagementService.java b/driver-sync/src/main/com/mongodb/client/internal/KeyManagementService.java index fee5ddac729..806f768a923 100644 --- a/driver-sync/src/main/com/mongodb/client/internal/KeyManagementService.java +++ b/driver-sync/src/main/com/mongodb/client/internal/KeyManagementService.java @@ -23,7 +23,7 @@ import com.mongodb.internal.diagnostics.logging.Loggers; import com.mongodb.internal.time.Timeout; import com.mongodb.lang.Nullable; -import org.jetbrains.annotations.NotNull; +import com.mongodb.lang.NonNull; import javax.net.SocketFactory; import javax.net.ssl.SSLContext; @@ -149,13 +149,13 @@ public int read() throws IOException { } @Override - public int read(@NotNull final byte[] b) throws IOException { + public int read(@NonNull final byte[] b) throws IOException { setSocketSoTimeoutToOperationTimeout(); return wrapped.read(b); } @Override - public int read(@NotNull final byte[] b, final int off, final int len) throws IOException { + public int read(@NonNull final byte[] b, final int off, final int len) throws IOException { setSocketSoTimeoutToOperationTimeout(); return wrapped.read(b, off, len); }