huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3205 from dotnet-maestro-bot/merge/release/2.2-to-master 

[automated] Merge branch 'release/2.2' => 'master'
This commit is contained in:
Mikael Mengistu 2018-10-25 16:54:54 -07:00 committed by GitHub
parent a79d23ea72 fc3a1fee61
commit dcf21dd486
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 61 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
View File

@ -15,7 +15,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import java.util.function.Consumer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -38,7 +37,7 @@ public class HubConnection {
private Boolean handshakeReceived = false;
private HubConnectionState hubConnectionState = HubConnectionState.DISCONNECTED;
private final Lock hubConnectionStateLock = new ReentrantLock();
private List<Consumer<Exception>> onClosedCallbackList;
private List<OnClosedCallback> onClosedCallbackList;
private final boolean skipNegotiate;
private Single<String> accessTokenProvider;
private final Map<String, String> headers = new HashMap<>();
@ -432,8 +431,8 @@ public class HubConnection {
// Do not run these callbacks inside the hubConnectionStateLock
if (onClosedCallbackList != null) {
for (Consumer<Exception> callback : onClosedCallbackList) {
callback.accept(exception);
for (OnClosedCallback callback : onClosedCallbackList) {
callback.invoke(exception);
}
}
}
@ -526,7 +525,7 @@ public class HubConnection {
*
* @param callback A callback to run when the connection closes.
*/
public void onClosed(Consumer<Exception> callback) {
public void onClosed(OnClosedCallback callback) {
if (onClosedCallbackList == null) {
onClosedCallbackList = new ArrayList<>();
}

9
clients/java/signalr/src/main/java/com/microsoft/signalr/OkHttpWebSocketWrapper.java
View File

@ -4,7 +4,6 @@
package com.microsoft.signalr;
import java.util.Map;
import java.util.function.BiConsumer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -24,7 +23,7 @@ class OkHttpWebSocketWrapper extends WebSocketWrapper {
private Map<String, String> headers;
private OkHttpClient client;
private OnReceiveCallBack onReceive;
private BiConsumer<Integer, String> onClose;
private WebSocketOnClosedCallback onClose;
private CompletableSubject startSubject = CompletableSubject.create();
private CompletableSubject closeSubject = CompletableSubject.create();
@ -70,7 +69,7 @@ class OkHttpWebSocketWrapper extends WebSocketWrapper {
}
@Override
public void setOnClose(BiConsumer<Integer, String> onClose) {
public void setOnClose(WebSocketOnClosedCallback onClose) {
this.onClose = onClose;
}
@ -92,7 +91,7 @@ class OkHttpWebSocketWrapper extends WebSocketWrapper {
@Override
public void onClosing(WebSocket webSocket, int code, String reason) {
onClose.accept(code, reason);
onClose.invoke(code, reason);
closeSubject.onComplete();
checkStartFailure();
}
@ -101,7 +100,7 @@ class OkHttpWebSocketWrapper extends WebSocketWrapper {
public void onFailure(WebSocket webSocket, Throwable t, Response response) {
logger.error("Websocket closed from an error: {}.", t.getMessage());
closeSubject.onError(new RuntimeException(t));
onClose.accept(null, t.getMessage());
onClose.invoke(null, t.getMessage());
checkStartFailure();
}

11
clients/java/signalr/src/main/java/com/microsoft/signalr/OnClosedCallback.java Normal file
View File

@ -0,0 +1,11 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
package com.microsoft.signalr;
/**
* A callback to create and register on a HubConnections OnClosed method.
*/
public interface OnClosedCallback {
void invoke(Exception exception);
}

4
clients/java/signalr/src/main/java/com/microsoft/signalr/Transport.java
View File

@ -3,8 +3,6 @@
package com.microsoft.signalr;
import java.util.function.Consumer;
import io.reactivex.Completable;
interface Transport {
@ -12,6 +10,6 @@ interface Transport {
Completable send(String message);
void setOnReceive(OnReceiveCallBack callback);
void onReceive(String message);
void setOnClose(Consumer<String> onCloseCallback);
void setOnClose(TransportOnClosedCallback onCloseCallback);
Completable stop();
}

8
clients/java/signalr/src/main/java/com/microsoft/signalr/TransportOnClosedCallback.java Normal file
View File

@ -0,0 +1,8 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
package com.microsoft.signalr;
interface TransportOnClosedCallback {
void invoke(String reason);
}

9
clients/java/signalr/src/main/java/com/microsoft/signalr/WebSocketTransport.java
View File

@ -4,7 +4,6 @@
package com.microsoft.signalr;
import java.util.Map;
import java.util.function.Consumer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -14,7 +13,7 @@ import io.reactivex.Completable;
class WebSocketTransport implements Transport {
private WebSocketWrapper webSocketClient;
private OnReceiveCallBack onReceiveCallBack;
private Consumer<String> onClose;
private TransportOnClosedCallback onClose;
private String url;
private final HttpClient client;
private final Map<String, String> headers;
@ -78,7 +77,7 @@ class WebSocketTransport implements Transport {
}
@Override
public void setOnClose(Consumer<String> onCloseCallback) {
public void setOnClose(TransportOnClosedCallback onCloseCallback) {
this.onClose = onCloseCallback;
}
@ -91,10 +90,10 @@ class WebSocketTransport implements Transport {
logger.info("WebSocket connection stopping with " +
"code {} and reason '{}'.", code, reason);
if (code != 1000) {
onClose.accept(reason);
onClose.invoke(reason);
}
else {
onClose.accept(null);
onClose.invoke(null);
}
}
}

4
clients/java/signalr/src/main/java/com/microsoft/signalr/WebSocketWrapper.java
View File

@ -3,8 +3,6 @@
package com.microsoft.signalr;
import java.util.function.BiConsumer;
import io.reactivex.Completable;
abstract class WebSocketWrapper {
@ -16,5 +14,5 @@ abstract class WebSocketWrapper {
public abstract void setOnReceive(OnReceiveCallBack onReceive);
public abstract void setOnClose(BiConsumer<Integer, String> onClose);
public abstract void setOnClose(WebSocketOnClosedCallback onClose);
}

8
clients/java/signalr/src/main/java/com/microsoft/signalr/WebsocketWrapperOnClosed.java Normal file
View File

@ -0,0 +1,8 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
package com.microsoft.signalr;
interface WebSocketOnClosedCallback {
void invoke(Integer code, String reason);
}

9
clients/java/signalr/src/test/java/com/microsoft/signalr/MockTransport.java
View File

@ -4,7 +4,6 @@
package com.microsoft.signalr;
import java.util.ArrayList;
import java.util.function.Consumer;
import io.reactivex.Completable;
import io.reactivex.subjects.CompletableSubject;
@ -13,7 +12,7 @@ class MockTransport implements Transport {
private OnReceiveCallBack onReceiveCallBack;
private ArrayList<String> sentMessages = new ArrayList<>();
private String url;
private Consumer<String> onClose;
private TransportOnClosedCallback onClose;
final private boolean ignorePings;
final private boolean autoHandshake;
final private CompletableSubject startSubject = CompletableSubject.create();
@ -67,19 +66,19 @@ class MockTransport implements Transport {
}
@Override
public void setOnClose(Consumer<String> onCloseCallback) {
public void setOnClose(TransportOnClosedCallback onCloseCallback) {
this.onClose = onCloseCallback;
}
@Override
public Completable stop() {
onClose.accept(null);
onClose.invoke(null);
stopSubject.onComplete();
return stopSubject;
}
public void stopWithError(String errorMessage) {
onClose.accept(errorMessage);
onClose.invoke(errorMessage);
}
public void receiveMessage(String message) {

29
clients/java/signalr/src/test/java/com/microsoft/signalr/TestHttpClient.java
View File

@ -6,12 +6,11 @@ package com.microsoft.signalr;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import io.reactivex.Single;
class TestHttpClient extends HttpClient {
private Function<HttpRequest, Single<HttpResponse>> handler;
private TestHttpRequestHandler handler;
private List<HttpRequest> sentRequests;
public TestHttpClient() {
@ -24,39 +23,39 @@ class TestHttpClient extends HttpClient {
@Override
public Single<HttpResponse> send(HttpRequest request) {
this.sentRequests.add(request);
return this.handler.apply(request);
return this.handler.invoke(request);
}
public List<HttpRequest> getSentRequests() {
return sentRequests;
}
public TestHttpClient on(Function<HttpRequest, Single<HttpResponse>> handler) {
this.handler = (req) -> handler.apply(req);
public TestHttpClient on(TestHttpRequestHandler handler) {
this.handler = (req) -> handler.invoke(req);
return this;
}
public TestHttpClient on(String method, Function<HttpRequest, Single<HttpResponse>> handler) {
Function<HttpRequest, Single<HttpResponse>> oldHandler = this.handler;
public TestHttpClient on(String method, TestHttpRequestHandler handler) {
TestHttpRequestHandler oldHandler = this.handler;
this.handler = (req) -> {
if (req.getMethod().equals(method)) {
return handler.apply(req);
return handler.invoke(req);
}
return oldHandler.apply(req);
return oldHandler.invoke(req);
};
return this;
}
public TestHttpClient on(String method, String url, Function<HttpRequest, Single<HttpResponse>> handler) {
Function<HttpRequest, Single<HttpResponse>> oldHandler = this.handler;
public TestHttpClient on(String method, String url, TestHttpRequestHandler handler) {
TestHttpRequestHandler oldHandler = this.handler;
this.handler = (req) -> {
if (req.getMethod().equals(method) && req.getUrl().equals(url)) {
return handler.apply(req);
return handler.invoke(req);
}
return oldHandler.apply(req);
return oldHandler.invoke(req);
};
return this;
@ -66,4 +65,8 @@ class TestHttpClient extends HttpClient {
public WebSocketWrapper createWebSocket(String url, Map<String, String> headers) {
throw new RuntimeException("WebSockets isn't supported in testing currently.");
}
interface TestHttpRequestHandler {
Single<HttpResponse> invoke(HttpRequest request);
}
}