Skip to content

Commit cec7a78

Browse files
OlegDokukaOlegDokuka
authored
provides extra @NonNullApi annotation for all packages (rsocket#826)
1 parent 79d2ee6 commit cec7a78

67 files changed

Lines changed: 199 additions & 79 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ subprojects {
6262

6363
dependencies {
6464
dependency "ch.qos.logback:logback-classic:${ext['logback.version']}"
65-
dependency "com.google.code.findbugs:jsr305:${ext['findbugs.version']}"
6665
dependency "io.netty:netty-tcnative-boringssl-static:${ext['netty-boringssl.version']}"
6766
dependency "io.micrometer:micrometer-core:${ext['micrometer.version']}"
6867
dependency "org.assertj:assertj-core:${ext['assertj.version']}"

‎rsocket-core/build.gradle‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ dependencies {
2929

3030
implementation 'org.slf4j:slf4j-api'
3131

32-
compileOnly 'com.google.code.findbugs:jsr305'
33-
3432
testImplementation 'io.projectreactor:reactor-test'
3533
testImplementation 'org.assertj:assertj-core'
3634
testImplementation 'org.junit.jupiter:junit-jupiter-api'

‎rsocket-core/src/main/java/io/rsocket/ConnectionSetupPayload.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import io.netty.buffer.ByteBuf;
2020
import io.netty.util.AbstractReferenceCounted;
2121
import io.rsocket.core.DefaultConnectionSetupPayload;
22-
import javax.annotation.Nullable;
22+
import reactor.util.annotation.Nullable;
2323

2424
/**
2525
* Exposes information from the {@code SETUP} frame to a server, as well as to client responders.

‎rsocket-core/src/main/java/io/rsocket/core/RSocketConnector.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@
4141
import java.util.function.BiConsumer;
4242
import java.util.function.Consumer;
4343
import java.util.function.Supplier;
44-
import javax.annotation.Nullable;
4544
import reactor.core.Disposable;
4645
import reactor.core.publisher.Mono;
4746
import reactor.core.scheduler.Schedulers;
47+
import reactor.util.annotation.Nullable;
4848
import reactor.util.retry.Retry;
4949

5050
/**

‎rsocket-core/src/main/java/io/rsocket/core/RSocketRequester.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
5656
import java.util.function.Consumer;
5757
import java.util.function.Supplier;
58-
import javax.annotation.Nullable;
5958
import org.reactivestreams.Processor;
6059
import org.reactivestreams.Publisher;
6160
import org.reactivestreams.Subscriber;
@@ -68,6 +67,7 @@
6867
import reactor.core.publisher.SignalType;
6968
import reactor.core.publisher.UnicastProcessor;
7069
import reactor.core.scheduler.Scheduler;
70+
import reactor.util.annotation.Nullable;
7171
import reactor.util.concurrent.Queues;
7272

7373
/**

‎rsocket-core/src/main/java/io/rsocket/core/RSocketResponder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@
3939
import java.util.function.Consumer;
4040
import java.util.function.LongConsumer;
4141
import java.util.function.Supplier;
42-
import javax.annotation.Nullable;
4342
import org.reactivestreams.Processor;
4443
import org.reactivestreams.Publisher;
4544
import org.reactivestreams.Subscriber;
4645
import org.reactivestreams.Subscription;
4746
import reactor.core.Disposable;
4847
import reactor.core.Exceptions;
4948
import reactor.core.publisher.*;
49+
import reactor.util.annotation.Nullable;
5050
import reactor.util.concurrent.Queues;
5151

5252
/** Responder side of RSocket. Receives {@link ByteBuf}s from a peer's {@link RSocketRequester} */

‎rsocket-core/src/main/java/io/rsocket/core/StreamIdSupplier.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import io.netty.util.collection.IntObjectMap;
1919

20+
/** This API is not thread-safe and must be strictly used in serialized fashion */
2021
final class StreamIdSupplier {
2122
private static final int MASK = 0x7FFFFFFF;
2223

‎rsocket-core/src/main/java/io/rsocket/exceptions/ApplicationErrorException.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package io.rsocket.exceptions;
1818

1919
import io.rsocket.frame.ErrorFrameCodec;
20-
import javax.annotation.Nullable;
20+
import reactor.util.annotation.Nullable;
2121

2222
/**
2323
* Application layer logic generating a Reactive Streams {@code onError} event.

‎rsocket-core/src/main/java/io/rsocket/exceptions/CanceledException.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package io.rsocket.exceptions;
1818

1919
import io.rsocket.frame.ErrorFrameCodec;
20-
import javax.annotation.Nullable;
20+
import reactor.util.annotation.Nullable;
2121

2222
/**
2323
* The Responder canceled the request but may have started processing it (similar to REJECTED but

‎rsocket-core/src/main/java/io/rsocket/exceptions/ConnectionCloseException.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package io.rsocket.exceptions;
1818

1919
import io.rsocket.frame.ErrorFrameCodec;
20-
import javax.annotation.Nullable;
20+
import reactor.util.annotation.Nullable;
2121

2222
/**
2323
* The connection is being terminated. Sender or Receiver of this frame MUST wait for outstanding

0 commit comments

Comments
 (0)