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

Merge branch 'release/2.2'

This commit is contained in:
unknown 2018-07-16 11:24:19 -07:00
parent f9d37c89b1 25c65a5d85
commit f732279b39
8 changed files with 150 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
clients/java/signalr/src/main/java/HubConnection.java
View File

@ -23,19 +23,32 @@ public class HubConnection {
this.protocol = new JsonHubProtocol();
this.callback = (payload) -> {
InvocationMessage[] messages = protocol.parseMessages(payload);
HubMessage[] messages = protocol.parseMessages(payload);
// message will be null if we receive any message other than an invocation.
// Adding this to avoid getting error messages on pings for now.
for (InvocationMessage message : messages) {
if (message != null && handlers.containsKey(message.target)) {
ArrayList<Object> args = gson.fromJson((JsonArray)message.arguments[0], (new ArrayList<Object>()).getClass());
List<ActionBase> actions = handlers.get(message.target);
if (actions != null) {
for (ActionBase action: actions) {
action.invoke(args.toArray());
for (HubMessage message : messages) {
switch (message.getMessageType()) {
case INVOCATION:
InvocationMessage invocationMessage = (InvocationMessage)message;
if (message != null && handlers.containsKey(invocationMessage.target)) {
ArrayList<Object> args = gson.fromJson((JsonArray)invocationMessage.arguments[0], (new ArrayList<Object>()).getClass());
List<ActionBase> actions = handlers.get(invocationMessage.target);
if (actions != null) {
for (ActionBase action: actions) {
action.invoke(args.toArray());
}
}
}
}
break;
case STREAM_INVOCATION:
case STREAM_ITEM:
throw new UnsupportedOperationException("Streaming is not yet supported");
case CLOSE:
case CANCEL_INVOCATION:
case COMPLETION:
case PING:
// We don't need to do anything in the case of a ping message.
// The other message types aren't supported
break;
}
}
};

6
clients/java/signalr/src/main/java/HubMessage.java Normal file
View File

@ -0,0 +1,6 @@
// 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.
public abstract class HubMessage {
abstract HubMessageType getMessageType();
}

15
clients/java/signalr/src/main/java/HubMessageType.java Normal file
View File

@ -0,0 +1,15 @@
// 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.
public enum HubMessageType {
INVOCATION(1),
STREAM_ITEM(2),
COMPLETION(3),
STREAM_INVOCATION(4),
CANCEL_INVOCATION(5),
PING(6),
CLOSE(7);
public int value;
HubMessageType(int id) { this.value = id; }
}

2
clients/java/signalr/src/main/java/HubProtocol.java
View File

@ -5,7 +5,7 @@ public interface HubProtocol {
String getName();
int getVersion();
TransferFormat getTransferFormat();
InvocationMessage[] parseMessages(String message);
HubMessage[] parseMessages(String message);
String writeMessage(InvocationMessage message);
}

9
clients/java/signalr/src/main/java/InvocationMessage.java
View File

@ -1,8 +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.
public class InvocationMessage {
int type = 1;
public class InvocationMessage extends HubMessage {
int type = HubMessageType.INVOCATION.value;
String invocationId;
String target;
Object[] arguments;
@ -35,4 +35,9 @@ public class InvocationMessage {
public void setArguments(Object[] arguments) {
this.arguments = arguments;
}
@Override
HubMessageType getMessageType() {
return HubMessageType.INVOCATION;
}
}

38
clients/java/signalr/src/main/java/JsonHubProtocol.java
View File

@ -30,9 +30,9 @@ public class JsonHubProtocol implements HubProtocol {
}
@Override
public InvocationMessage[] parseMessages(String payload) {
public HubMessage[] parseMessages(String payload) {
String[] messages = payload.split(RECORD_SEPARATOR);
List<InvocationMessage> invocationMessages = new ArrayList<>();
List<HubMessage> hubMessages = new ArrayList<>();
for (String splitMessage : messages) {
// Empty handshake response "{}". We can ignore it
if (splitMessage.equals("{}")) {
@ -40,41 +40,35 @@ public class JsonHubProtocol implements HubProtocol {
}
JsonObject jsonMessage = jsonParser.parse(splitMessage).getAsJsonObject();
String messageType = jsonMessage.get("type").toString();
HubMessageType messageType = HubMessageType.values()[jsonMessage.get("type").getAsInt() -1];
switch (messageType) {
case "1":
case INVOCATION:
//Invocation Message
String target = jsonMessage.get("target").getAsString();
JsonElement args = jsonMessage.get("arguments");
invocationMessages.add(new InvocationMessage(target, new Object[] {args}));
hubMessages.add(new InvocationMessage(target, new Object[] {args}));
break;
case "2":
//Stream item
case STREAM_ITEM:
throw new UnsupportedOperationException("Support for streaming is not yet available");
case COMPLETION:
//Don't care yet
break;
case "3":
//Completion
//Don't care yet
break;
case "4":
//Stream invocation
case STREAM_INVOCATION:
//Don't care yet;
throw new UnsupportedOperationException("Support for streaming is not yet available");
case CANCEL_INVOCATION:
// Not tracking invocations yet
break;
case "5":
//Cancel invocation
//Don't care yet
break;
case "6":
case PING:
//Ping
//Don't care yet
hubMessages.add(new PingMessage());
break;
case "7":
// Close message
case CLOSE:
//Don't care yet;
break;
}
}
return invocationMessages.toArray(new InvocationMessage[invocationMessages.size()]);
return hubMessages.toArray(new HubMessage[hubMessages.size()]);
}
@Override

12
clients/java/signalr/src/main/java/PingMessage.java Normal file
View File

@ -0,0 +1,12 @@
// 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.
public class PingMessage extends HubMessage {
int type = HubMessageType.PING.value;
@Override
HubMessageType getMessageType() {
return HubMessageType.PING;
}
}

96
clients/java/signalr/src/test/java/JsonHubProtocolTest.java
View File

@ -2,7 +2,9 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
import com.google.gson.JsonArray;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import static org.junit.Assert.*;
@ -34,30 +36,63 @@ public class JsonHubProtocolTest {
}
@Test
public void ParseSingleMessage() {
String stringifiedMessage = "{\"type\":1,\"target\":\"test\",\"arguments\":[42]}\u001E";
InvocationMessage[] messages = jsonHubProtocol.parseMessages(stringifiedMessage);
public void ParsePingMessage() {
String stringifiedMessage = "{\"type\":6}\u001E";
HubMessage[] messages = jsonHubProtocol.parseMessages(stringifiedMessage);
//We know it's only one message
assertEquals(1, messages.length);
InvocationMessage message = messages[0];
assertEquals("test", message.target);
assertEquals(null, message.invocationId);
assertEquals(1, message.type);
JsonArray messageResult = (JsonArray) message.arguments[0];
assertEquals(HubMessageType.PING, messages[0].getMessageType());
}
@Test
public void ParseSingleMessage() {
String stringifiedMessage = "{\"type\":1,\"target\":\"test\",\"arguments\":[42]}\u001E";
HubMessage[] messages = jsonHubProtocol.parseMessages(stringifiedMessage);
//We know it's only one message
assertEquals(1, messages.length);
assertEquals(HubMessageType.INVOCATION, messages[0].getMessageType());
//We can safely cast here because we know that it's an invocation message.
InvocationMessage invocationMessage = (InvocationMessage) messages[0];
assertEquals("test", invocationMessage.target);
assertEquals(null, invocationMessage.invocationId);
JsonArray messageResult = (JsonArray) invocationMessage.arguments[0];
assertEquals(42, messageResult.getAsInt());
}
@Rule
public ExpectedException exceptionRule = ExpectedException.none();
@Test
public void ParseSingleUnsupportedStreamItemMessage() {
exceptionRule.expect(UnsupportedOperationException.class);
exceptionRule.expectMessage("Support for streaming is not yet available");
String stringifiedMessage = "{\"type\":2,\"Id\":1,\"Item\":42}\u001E";
HubMessage[] messages = jsonHubProtocol.parseMessages(stringifiedMessage);
}
@Test
public void ParseSingleUnsupportedStreamInvocationMessage() {
exceptionRule.expect(UnsupportedOperationException.class);
exceptionRule.expectMessage("Support for streaming is not yet available");
String stringifiedMessage = "{\"type\":4,\"Id\":1,\"target\":\"test\",\"arguments\":[42]}\u001E";
HubMessage[] messages = jsonHubProtocol.parseMessages(stringifiedMessage);
}
@Test
public void ParseHandshakeResponsePlusMessage() {
String twoMessages = "{}\u001E{\"type\":1,\"target\":\"test\",\"arguments\":[42]}\u001E";
InvocationMessage[] messages = jsonHubProtocol.parseMessages(twoMessages);
HubMessage[] messages = jsonHubProtocol.parseMessages(twoMessages);
assertEquals(HubMessageType.INVOCATION, messages[0].getMessageType());
//We ignore the Handshake response for now
InvocationMessage message = messages[0];
//We ignore the Handshake response for now and we can cast because we know we have in invocation message.
InvocationMessage message = (InvocationMessage) messages[0];
assertEquals("test", message.target);
assertEquals(null, message.invocationId);
assertEquals(1, message.type);
JsonArray messageResult = (JsonArray) message.arguments[0];
assertEquals(42, messageResult.getAsInt());
}
@ -65,36 +100,43 @@ public class JsonHubProtocolTest {
@Test
public void ParseTwoMessages() {
String twoMessages = "{\"type\":1,\"target\":\"one\",\"arguments\":[42]}\u001E{\"type\":1,\"target\":\"two\",\"arguments\":[43]}\u001E";
InvocationMessage[] messages = jsonHubProtocol.parseMessages(twoMessages);
HubMessage[] messages = jsonHubProtocol.parseMessages(twoMessages);
assertEquals(2, messages.length);
// Check the first message
InvocationMessage message = messages[0];
assertEquals("one", message.target);
assertEquals(null, message.invocationId);
assertEquals(1, message.type);
JsonArray messageResult = (JsonArray) message.arguments[0];
assertEquals(HubMessageType.INVOCATION, messages[0].getMessageType());
//Now that we know we have an invocation message we can cast the hubMessage.
InvocationMessage invocationMessage = (InvocationMessage) messages[0];
assertEquals("one", invocationMessage.target);
assertEquals(null, invocationMessage.invocationId);
JsonArray messageResult = (JsonArray) invocationMessage.arguments[0];
assertEquals(42, messageResult.getAsInt());
// Check the second message
InvocationMessage secondMessage = messages[1];
assertEquals("two", secondMessage.target);
assertEquals(null, secondMessage.invocationId);
assertEquals(1, secondMessage.type);
JsonArray secondMessageResult = (JsonArray) secondMessage.arguments[0];
assertEquals(HubMessageType.INVOCATION, messages[1].getMessageType());
//Now that we know we have an invocation message we can cast the hubMessage.
InvocationMessage invocationMessage2 = (InvocationMessage) messages[1];
assertEquals("two", invocationMessage2.target);
assertEquals(null, invocationMessage2.invocationId);
JsonArray secondMessageResult = (JsonArray) invocationMessage2.arguments[0];
assertEquals(43, secondMessageResult.getAsInt());
}
@Test
public void ParseSingleMessageMutipleArgs() {
String stringifiedMessage = "{\"type\":1,\"target\":\"test\",\"arguments\":[42, 24]}\u001E";
InvocationMessage[] messages = jsonHubProtocol.parseMessages(stringifiedMessage);
HubMessage[] messages = jsonHubProtocol.parseMessages(stringifiedMessage);
//We know it's only one message
InvocationMessage message = messages[0];
assertEquals(HubMessageType.INVOCATION, messages[0].getMessageType());
InvocationMessage message = (InvocationMessage)messages[0];
assertEquals("test", message.target);
assertEquals(null, message.invocationId);
assertEquals(1, message.type);
JsonArray messageResult = ((JsonArray) message.arguments[0]);
assertEquals(42, messageResult.get(0).getAsInt());
assertEquals(24, messageResult.get(1).getAsInt());