Skip to content

Commit 304f854

Browse files
authored
Replace org.jetbrains.annotations.NotNull with com.mongodb.lang.NonNull (#1644)
1 parent 005652e commit 304f854

File tree

6 files changed

+17
-17
lines changed

6 files changed

+17
-17
lines changed

driver-benchmarks/src/main/com/mongodb/benchmark/jmh/codec/BsonArrayCodecBenchmark.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import org.bson.codecs.BsonArrayCodec;
2828
import org.bson.codecs.DecoderContext;
2929
import org.bson.codecs.EncoderContext;
30-
import org.jetbrains.annotations.NotNull;
30+
import com.mongodb.lang.NonNull;
3131
import org.openjdk.jmh.annotations.Benchmark;
3232
import org.openjdk.jmh.annotations.BenchmarkMode;
3333
import org.openjdk.jmh.annotations.Fork;
@@ -87,12 +87,12 @@ public void beforeIteration() {
8787
}
8888

8989
@Benchmark
90-
public void decode(@NotNull Input input, @NotNull Blackhole blackhole) {
90+
public void decode(@NonNull Input input, @NonNull Blackhole blackhole) {
9191
blackhole.consume(input.bsonArrayCodec.decode(input.reader, DecoderContext.builder().build()));
9292
}
9393

9494
@Benchmark
95-
public void encode(@NotNull Input input, @NotNull Blackhole blackhole) {
95+
public void encode(@NonNull Input input, @NonNull Blackhole blackhole) {
9696
input.bsonArrayCodec.encode(input.writer, input.bsonValues, EncoderContext.builder().build());
9797
blackhole.consume(input);
9898
}

driver-benchmarks/src/main/com/mongodb/benchmark/jmh/codec/BsonDocumentBenchmark.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.bson.codecs.BsonDocumentCodec;
2727
import org.bson.codecs.DecoderContext;
2828
import org.bson.codecs.EncoderContext;
29-
import org.jetbrains.annotations.NotNull;
29+
import com.mongodb.lang.NonNull;
3030
import org.openjdk.jmh.annotations.Benchmark;
3131
import org.openjdk.jmh.annotations.BenchmarkMode;
3232
import org.openjdk.jmh.annotations.Fork;
@@ -74,12 +74,12 @@ public void setup() throws IOException {
7474
}
7575

7676
@Benchmark
77-
public void decode(@NotNull Input input, @NotNull Blackhole blackhole) {
77+
public void decode(@NonNull Input input, @NonNull Blackhole blackhole) {
7878
blackhole.consume(input.bsonDocumentCodec.decode(new BsonBinaryReader(ByteBuffer.wrap(input.documentBytes)), DecoderContext.builder().build()));
7979
}
8080

8181
@Benchmark
82-
public void encode(@NotNull Input input, @NotNull Blackhole blackhole) {
82+
public void encode(@NonNull Input input, @NonNull Blackhole blackhole) {
8383
input.bsonDocumentCodec.encode(new BsonBinaryWriter(new ByteBufferBsonOutput(input.bufferPool)), input.document, EncoderContext.builder().build());
8484
blackhole.consume(input);
8585
}

driver-core/src/main/com/mongodb/internal/time/Timeout.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import com.mongodb.internal.function.CheckedRunnable;
2323
import com.mongodb.internal.function.CheckedSupplier;
2424
import com.mongodb.lang.Nullable;
25-
import org.jetbrains.annotations.NotNull;
25+
import com.mongodb.lang.NonNull;
2626

2727
import java.util.Arrays;
2828
import java.util.Collections;
@@ -82,7 +82,7 @@ static Timeout nullAsInfinite(@Nullable final Timeout timeout) {
8282
* @param zeroSemantics what to interpret a 0 duration as (infinite or expired)
8383
* @return a timeout that expires in the specified duration after now.
8484
*/
85-
@NotNull
85+
@NonNull
8686
static Timeout expiresIn(final long duration, final TimeUnit unit, final ZeroSemantics zeroSemantics) {
8787
if (duration < 0) {
8888
throw new AssertionError("Timeouts must not be in the past");

driver-core/src/test/unit/com/mongodb/internal/async/SameThreadAsyncFunctionsTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package com.mongodb.internal.async;
1818

19-
import org.jetbrains.annotations.NotNull;
19+
import com.mongodb.lang.NonNull;
2020
import org.junit.jupiter.api.DisplayName;
2121
import org.junit.jupiter.api.Test;
2222

@@ -62,15 +62,15 @@ void testInvalid() {
6262

6363
private static class SameThreadExecutorService extends AbstractExecutorService {
6464
@Override
65-
public void execute(@NotNull final Runnable command) {
65+
public void execute(@NonNull final Runnable command) {
6666
command.run();
6767
}
6868

6969
@Override
7070
public void shutdown() {
7171
}
7272

73-
@NotNull
73+
@NonNull
7474
@Override
7575
public List<Runnable> shutdownNow() {
7676
return Collections.emptyList();
@@ -87,7 +87,7 @@ public boolean isTerminated() {
8787
}
8888

8989
@Override
90-
public boolean awaitTermination(final long timeout, @NotNull final TimeUnit unit) {
90+
public boolean awaitTermination(final long timeout, @NonNull final TimeUnit unit) {
9191
return true;
9292
}
9393
}

driver-reactive-streams/src/main/com/mongodb/reactivestreams/client/internal/crypt/KeyManagementService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import com.mongodb.lang.Nullable;
4040
import org.bson.ByteBuf;
4141
import org.bson.ByteBufNIO;
42-
import org.jetbrains.annotations.NotNull;
42+
import com.mongodb.lang.NonNull;
4343
import reactor.core.publisher.Mono;
4444
import reactor.core.publisher.MonoSink;
4545

@@ -179,7 +179,7 @@ private OperationContext createOperationContext(@Nullable final Timeout operatio
179179
return OperationContext.simpleOperationContext(new TimeoutContext(timeoutSettings));
180180
}
181181

182-
@NotNull
182+
@NonNull
183183
private static TimeoutSettings createTimeoutSettings(final SocketSettings socketSettings,
184184
@Nullable final Long ms) {
185185
return new TimeoutSettings(

driver-sync/src/main/com/mongodb/client/internal/KeyManagementService.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import com.mongodb.internal.diagnostics.logging.Loggers;
2424
import com.mongodb.internal.time.Timeout;
2525
import com.mongodb.lang.Nullable;
26-
import org.jetbrains.annotations.NotNull;
26+
import com.mongodb.lang.NonNull;
2727

2828
import javax.net.SocketFactory;
2929
import javax.net.ssl.SSLContext;
@@ -149,13 +149,13 @@ public int read() throws IOException {
149149
}
150150

151151
@Override
152-
public int read(@NotNull final byte[] b) throws IOException {
152+
public int read(@NonNull final byte[] b) throws IOException {
153153
setSocketSoTimeoutToOperationTimeout();
154154
return wrapped.read(b);
155155
}
156156

157157
@Override
158-
public int read(@NotNull final byte[] b, final int off, final int len) throws IOException {
158+
public int read(@NonNull final byte[] b, final int off, final int len) throws IOException {
159159
setSocketSoTimeoutToOperationTimeout();
160160
return wrapped.read(b, off, len);
161161
}

0 commit comments

Comments
 (0)