Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace org.jetbrains.annotations.NotNull with com.mongodb.lang.NonNull #1644

Merged
merged 1 commit into from
Mar 6, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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);
}
Original file line number Diff line number Diff line change
@@ -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);
}
4 changes: 2 additions & 2 deletions driver-core/src/main/com/mongodb/internal/time/Timeout.java
Original file line number Diff line number Diff line change
@@ -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");
Original file line number Diff line number Diff line change
@@ -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,15 +62,15 @@ 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();
}

@Override
public void shutdown() {
}

@NotNull
@NonNull
@Override
public List<Runnable> 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;
}
}
Original file line number Diff line number Diff line change
@@ -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(
Original file line number Diff line number Diff line change
@@ -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);
}