Skip to content

Commit c5a1999

Browse files
[SignalR Java] Update to RxJava3 (#31426)
1 parent ed3a2b7 commit c5a1999

16 files changed

+43
-43
lines changed

src/SignalR/clients/java/signalr/core/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ group 'com.microsoft.signalr'
88
dependencies {
99
implementation 'com.google.code.gson:gson:2.8.5'
1010
implementation 'com.squareup.okhttp3:okhttp:3.11.0'
11-
api 'io.reactivex.rxjava2:rxjava:2.2.3'
11+
api 'io.reactivex.rxjava3:rxjava:3.0.11'
1212
implementation 'org.slf4j:slf4j-api:1.7.25'
1313
}
1414

src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/DefaultHttpClient.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
import java.util.concurrent.locks.Lock;
1414
import java.util.concurrent.locks.ReentrantLock;
1515

16-
import io.reactivex.Single;
17-
import io.reactivex.subjects.SingleSubject;
16+
import io.reactivex.rxjava3.core.Single;
17+
import io.reactivex.rxjava3.subjects.SingleSubject;
1818
import okhttp3.*;
1919
import okio.ByteString;
2020

src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HttpClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import java.util.HashMap;
88
import java.util.Map;
99

10-
import io.reactivex.Single;
10+
import io.reactivex.rxjava3.core.Single;
1111

1212
class HttpRequest {
1313
private String method;

src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import java.util.HashMap;
77
import java.util.Map;
88

9-
import io.reactivex.Single;
9+
import io.reactivex.rxjava3.core.Single;
1010
import okhttp3.OkHttpClient;
1111

1212
/**

src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubConnection.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919

2020
import com.google.gson.stream.JsonReader;
2121

22-
import io.reactivex.Completable;
23-
import io.reactivex.Observable;
24-
import io.reactivex.Single;
25-
import io.reactivex.subjects.*;
22+
import io.reactivex.rxjava3.core.Completable;
23+
import io.reactivex.rxjava3.core.Observable;
24+
import io.reactivex.rxjava3.core.Single;
25+
import io.reactivex.rxjava3.subjects.*;
2626
import okhttp3.OkHttpClient;
2727

2828
/**

src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/InvocationRequest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import java.lang.reflect.Type;
77
import java.util.concurrent.CancellationException;
88

9-
import io.reactivex.subjects.ReplaySubject;
10-
import io.reactivex.subjects.Subject;
9+
import io.reactivex.rxjava3.subjects.ReplaySubject;
10+
import io.reactivex.rxjava3.subjects.Subject;
1111

1212
class InvocationRequest {
1313
private final Type returnType;

src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/LongPollingTransport.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
import org.slf4j.Logger;
1414
import org.slf4j.LoggerFactory;
1515

16-
import io.reactivex.Completable;
17-
import io.reactivex.Single;
18-
import io.reactivex.subjects.CompletableSubject;
16+
import io.reactivex.rxjava3.core.Completable;
17+
import io.reactivex.rxjava3.core.Single;
18+
import io.reactivex.rxjava3.subjects.CompletableSubject;
1919

2020
class LongPollingTransport implements Transport {
2121
private OnReceiveCallBack onReceiveCallBack;

src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/OkHttpWebSocketWrapper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
import org.slf4j.Logger;
1212
import org.slf4j.LoggerFactory;
1313

14-
import io.reactivex.Completable;
15-
import io.reactivex.subjects.CompletableSubject;
14+
import io.reactivex.rxjava3.core.Completable;
15+
import io.reactivex.rxjava3.subjects.CompletableSubject;
1616
import okhttp3.Headers;
1717
import okhttp3.OkHttpClient;
1818
import okhttp3.Request;

src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Transport.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import java.nio.ByteBuffer;
77

8-
import io.reactivex.Completable;
8+
import io.reactivex.rxjava3.core.Completable;
99

1010
interface Transport {
1111
Completable start(String url);

src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/WebSocketTransport.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import org.slf4j.Logger;
1010
import org.slf4j.LoggerFactory;
1111

12-
import io.reactivex.Completable;
12+
import io.reactivex.rxjava3.core.Completable;
1313

1414
class WebSocketTransport implements Transport {
1515
private WebSocketWrapper webSocketClient;

0 commit comments

Comments
 (0)