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.

Sign up for GitHub

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

Jump to bottom

[SignalR Java] Update to RxJava3 #31426

Merged
merged 1 commit into from
Apr 1, 2021
Merged

[SignalR Java] Update to RxJava3 #31426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/SignalR/clients/java/signalr/core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ group 'com.microsoft.signalr'
dependencies {
implementation 'com.google.code.gson:gson:2.8.5'
implementation 'com.squareup.okhttp3:okhttp:3.11.0'
api 'io.reactivex.rxjava2:rxjava:2.2.3'
api 'io.reactivex.rxjava3:rxjava:3.0.11'
implementation 'org.slf4j:slf4j-api:1.7.25'
}

Expand Down
4 changes: 2 additions & 2 deletions ...nalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/DefaultHttpClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;

import io.reactivex.Single;
import io.reactivex.subjects.SingleSubject;
import io.reactivex.rxjava3.core.Single;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interesting they chose to change the namespace. Doesn't look like it broke much though.

import io.reactivex.rxjava3.subjects.SingleSubject;
import okhttp3.*;
import okio.ByteString;

Expand Down
2 changes: 1 addition & 1 deletion src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HttpClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import java.util.HashMap;
import java.util.Map;

import io.reactivex.Single;
import io.reactivex.rxjava3.core.Single;

class HttpRequest {
private String method;
Expand Down
2 changes: 1 addition & 1 deletion ...ients/java/signalr/core/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import java.util.HashMap;
import java.util.Map;

import io.reactivex.Single;
import io.reactivex.rxjava3.core.Single;
import okhttp3.OkHttpClient;

/**
Expand Down
8 changes: 4 additions & 4 deletions src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@

import com.google.gson.stream.JsonReader;

import io.reactivex.Completable;
import io.reactivex.Observable;
import io.reactivex.Single;
import io.reactivex.subjects.*;
import io.reactivex.rxjava3.core.Completable;
import io.reactivex.rxjava3.core.Observable;
import io.reactivex.rxjava3.core.Single;
import io.reactivex.rxjava3.subjects.*;
import okhttp3.OkHttpClient;

/**
Expand Down
4 changes: 2 additions & 2 deletions ...nalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/InvocationRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
import java.lang.reflect.Type;
import java.util.concurrent.CancellationException;

import io.reactivex.subjects.ReplaySubject;
import io.reactivex.subjects.Subject;
import io.reactivex.rxjava3.subjects.ReplaySubject;
import io.reactivex.rxjava3.subjects.Subject;

class InvocationRequest {
private final Type returnType;
Expand Down
6 changes: 3 additions & 3 deletions ...R/clients/java/signalr/core/src/main/java/com/microsoft/signalr/LongPollingTransport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import io.reactivex.Completable;
import io.reactivex.Single;
import io.reactivex.subjects.CompletableSubject;
import io.reactivex.rxjava3.core.Completable;
import io.reactivex.rxjava3.core.Single;
import io.reactivex.rxjava3.subjects.CompletableSubject;

class LongPollingTransport implements Transport {
private OnReceiveCallBack onReceiveCallBack;
Expand Down
4 changes: 2 additions & 2 deletions ...clients/java/signalr/core/src/main/java/com/microsoft/signalr/OkHttpWebSocketWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import io.reactivex.Completable;
import io.reactivex.subjects.CompletableSubject;
import io.reactivex.rxjava3.core.Completable;
import io.reactivex.rxjava3.subjects.CompletableSubject;
import okhttp3.Headers;
import okhttp3.OkHttpClient;
import okhttp3.Request;
Expand Down
2 changes: 1 addition & 1 deletion src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Transport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import java.nio.ByteBuffer;

import io.reactivex.Completable;
import io.reactivex.rxjava3.core.Completable;

interface Transport {
Completable start(String url);
Expand Down
2 changes: 1 addition & 1 deletion ...alR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/WebSocketTransport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import io.reactivex.Completable;
import io.reactivex.rxjava3.core.Completable;

class WebSocketTransport implements Transport {
private WebSocketWrapper webSocketClient;
Expand Down
2 changes: 1 addition & 1 deletion ...gnalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/WebSocketWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import java.nio.ByteBuffer;

import io.reactivex.Completable;
import io.reactivex.rxjava3.core.Completable;

abstract class WebSocketWrapper {
public abstract Completable start();
Expand Down
32 changes: 16 additions & 16 deletions ...nalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/HubConnectionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@
import org.junit.jupiter.api.Test;

import ch.qos.logback.classic.spi.ILoggingEvent;
import io.reactivex.Completable;
import io.reactivex.Observable;
import io.reactivex.Single;
import io.reactivex.disposables.Disposable;
import io.reactivex.schedulers.Schedulers;
import io.reactivex.subjects.CompletableSubject;
import io.reactivex.subjects.PublishSubject;
import io.reactivex.subjects.ReplaySubject;
import io.reactivex.subjects.SingleSubject;
import io.reactivex.rxjava3.core.Completable;
import io.reactivex.rxjava3.core.Observable;
import io.reactivex.rxjava3.core.Single;
import io.reactivex.rxjava3.disposables.Disposable;
import io.reactivex.rxjava3.schedulers.Schedulers;
import io.reactivex.rxjava3.subjects.CompletableSubject;
import io.reactivex.rxjava3.subjects.PublishSubject;
import io.reactivex.rxjava3.subjects.ReplaySubject;
import io.reactivex.rxjava3.subjects.SingleSubject;

class HubConnectionTest {
private static final String RECORD_SEPARATOR = "\u001e";
Expand Down Expand Up @@ -1423,7 +1423,7 @@ public void invokeNoReturnValueWaitsForCompletion() {

mockTransport.receiveMessage("{\"type\":3,\"invocationId\":\"1\"}" + RECORD_SEPARATOR);

assertNull(result.timeout(30, TimeUnit.SECONDS).blockingGet());
assertTrue(result.blockingAwait(30, TimeUnit.SECONDS));
assertTrue(done.get());
}

Expand All @@ -1445,7 +1445,7 @@ public void invokeNoReturnValueWaitsForCompletionWithMessagePack() {

mockTransport.receiveMessage(ByteBuffer.wrap(new byte[] { 0x06, (byte) 0x94, 0x03, (byte) 0x80, (byte) 0xA1, 0x31, 0x02 }));

assertNull(result.timeout(30, TimeUnit.SECONDS).blockingGet());
assertTrue(result.blockingAwait(30, TimeUnit.SECONDS));
assertTrue(done.get());
}

Expand All @@ -1466,7 +1466,7 @@ public void invokeCompletedByCompletionMessageWithResult() {

mockTransport.receiveMessage("{\"type\":3,\"invocationId\":\"1\",\"result\":42}" + RECORD_SEPARATOR);

assertNull(result.timeout(30, TimeUnit.SECONDS).blockingGet());
assertTrue(result.blockingAwait(30, TimeUnit.SECONDS));
assertTrue(done.get());
}

Expand All @@ -1488,7 +1488,7 @@ public void invokeCompletedByCompletionMessageWithResultWithMessagePack() {

mockTransport.receiveMessage(ByteBuffer.wrap(new byte[] { 0x07, (byte) 0x95, 0x03, (byte) 0x80, (byte) 0xA1, 0x31, 0x03, 0x2A }));

assertNull(result.timeout(30, TimeUnit.SECONDS).blockingGet());
assertTrue(result.blockingAwait(30, TimeUnit.SECONDS));
assertTrue(done.get());
}

Expand Down Expand Up @@ -1529,7 +1529,7 @@ public void invokeNoReturnValueHandlesError() {

mockTransport.receiveMessage("{\"type\":3,\"invocationId\":\"1\",\"error\":\"There was an error\"}" + RECORD_SEPARATOR);

result.timeout(30, TimeUnit.SECONDS).blockingGet();
assertTrue(result.onErrorComplete().blockingAwait(30, TimeUnit.SECONDS));

AtomicReference<String> errorMessage = new AtomicReference<>();
result.doOnError(error -> {
Expand Down Expand Up @@ -1559,7 +1559,7 @@ public void invokeNoReturnValueHandlesErrorWithMessagePack() {
0x72, 0x65, 0x20, 0x77, 0x61, 0x73, 0x20, 0x61, 0x6E, 0x20, 0x65, 0x72, 0x72, 0x6F, 0x72 };
mockTransport.receiveMessage(ByteBuffer.wrap(completionMessageErrorBytes));

result.timeout(30, TimeUnit.SECONDS).blockingGet();
assertTrue(result.onErrorComplete().blockingAwait(30, TimeUnit.SECONDS));

AtomicReference<String> errorMessage = new AtomicReference<>();
result.doOnError(error -> {
Expand Down Expand Up @@ -3885,6 +3885,6 @@ public void hubConnectionCloseCallsStop() {
assertEquals(HubConnectionState.CONNECTED, hubConnection.getConnectionState());
}

close.timeout(30, TimeUnit.SECONDS).blockingGet();
assertTrue(close.blockingAwait(30, TimeUnit.SECONDS));
}
}
4 changes: 2 additions & 2 deletions ...ients/java/signalr/test/src/main/java/com/microsoft/signalr/LongPollingTransportTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

import org.junit.jupiter.api.Test;

import io.reactivex.Single;
import io.reactivex.subjects.CompletableSubject;
import io.reactivex.rxjava3.core.Single;
import io.reactivex.rxjava3.subjects.CompletableSubject;

public class LongPollingTransportTest {

Expand Down
6 changes: 3 additions & 3 deletions src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/MockTransport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
import java.nio.ByteBuffer;
import java.util.ArrayList;

import io.reactivex.Completable;
import io.reactivex.subjects.CompletableSubject;
import io.reactivex.subjects.SingleSubject;
import io.reactivex.rxjava3.core.Completable;
import io.reactivex.rxjava3.subjects.CompletableSubject;
import io.reactivex.rxjava3.subjects.SingleSubject;

class MockTransport implements Transport {
private OnReceiveCallBack onReceiveCallBack;
Expand Down
2 changes: 1 addition & 1 deletion ...SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/TestHttpClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import java.util.List;
import java.util.Map;

import io.reactivex.Single;
import io.reactivex.rxjava3.core.Single;

class TestHttpClient extends HttpClient {
private TestHttpRequestHandler handler;
Expand Down
4 changes: 2 additions & 2 deletions ...clients/java/signalr/test/src/main/java/com/microsoft/signalr/WebSocketTransportTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@

import org.junit.jupiter.api.Test;

import io.reactivex.Completable;
import io.reactivex.Single;
import io.reactivex.rxjava3.core.Completable;
import io.reactivex.rxjava3.core.Single;

class WebSocketTransportTest {
@Test
Expand Down