From c466885a0e326c3e90140bc3b8edb5c16c02143e Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Tue, 25 Aug 2020 13:54:13 -0700 Subject: [PATCH 01/18] Separate MessagePackHubProtocol into its own package --- src/SignalR/.gitignore | 1 + .../signalr/CancelInvocationMessage.java | 2 +- .../com/microsoft/signalr/CloseMessage.java | 2 +- .../microsoft/signalr/CompletionMessage.java | 2 +- .../signalr/HttpHubConnectionBuilder.java | 6 +- .../com/microsoft/signalr/HubMessage.java | 2 +- .../com/microsoft/signalr/HubMessageType.java | 2 +- .../com/microsoft/signalr/HubProtocol.java | 2 +- .../microsoft/signalr/InvocationBinder.java | 2 +- .../InvocationBindingFailureMessage.java | 2 +- .../microsoft/signalr/InvocationMessage.java | 2 +- .../com/microsoft/signalr/PingMessage.java | 2 +- .../signalr/StreamBindingFailureMessage.java | 2 +- .../signalr/StreamInvocationMessage.java | 2 +- .../com/microsoft/signalr/StreamItem.java | 2 +- .../com/microsoft/signalr/TransferFormat.java | 2 +- .../java/com/microsoft/signalr/Utils.java | 74 +------------ .../MessagePackHubProtocol.java | 19 +++- .../microsoft/signalr/messagepack/Utils.java | 101 ++++++++++++++++++ .../signalr/MessagePackHubProtocolTest.java | 2 + .../java/com/microsoft/signalr/TestUtils.java | 3 +- 21 files changed, 144 insertions(+), 90 deletions(-) create mode 100644 src/SignalR/.gitignore rename src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/{ => messagepack}/MessagePackHubProtocol.java (97%) create mode 100644 src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/messagepack/Utils.java diff --git a/src/SignalR/.gitignore b/src/SignalR/.gitignore new file mode 100644 index 000000000000..e10e727be5ce --- /dev/null +++ b/src/SignalR/.gitignore @@ -0,0 +1 @@ +/.metadata/ diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/CancelInvocationMessage.java b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/CancelInvocationMessage.java index 9f375aea72c2..ce5d76f4b7a6 100644 --- a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/CancelInvocationMessage.java +++ b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/CancelInvocationMessage.java @@ -5,7 +5,7 @@ import java.util.Map; -final class CancelInvocationMessage extends HubMessage { +public final class CancelInvocationMessage extends HubMessage { private final int type = HubMessageType.CANCEL_INVOCATION.value; private Map headers; private final String invocationId; diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/CloseMessage.java b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/CloseMessage.java index 1d896950579c..3486949aac4b 100644 --- a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/CloseMessage.java +++ b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/CloseMessage.java @@ -3,7 +3,7 @@ package com.microsoft.signalr; -final class CloseMessage extends HubMessage { +public final class CloseMessage extends HubMessage { private final String error; private final boolean allowReconnect; diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/CompletionMessage.java b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/CompletionMessage.java index 7256c7dfd4de..e581a636ac55 100644 --- a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/CompletionMessage.java +++ b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/CompletionMessage.java @@ -5,7 +5,7 @@ import java.util.Map; -final class CompletionMessage extends HubMessage { +public final class CompletionMessage extends HubMessage { private final int type = HubMessageType.COMPLETION.value; private Map headers; private final String invocationId; diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java index ce29e1a2cecf..99b671b68d36 100644 --- a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java +++ b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java @@ -57,12 +57,12 @@ HttpHubConnectionBuilder withHttpClient(HttpClient httpClient) { } /** - * Sets MessagePack as the {@link HubProtocol} to be used by the {@link HubConnection}. + * Sets the {@link HubProtocol} to be used by the {@link HubConnection}. * * @return This instance of the HttpHubConnectionBuilder. */ - public HttpHubConnectionBuilder withMessagePackHubProtocol() { - this.protocol = new MessagePackHubProtocol(); + public HttpHubConnectionBuilder withProtocol(HubProtocol protocol) { + this.protocol = protocol; return this; } diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubMessage.java b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubMessage.java index ff9e50747a22..c4192bf12844 100644 --- a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubMessage.java +++ b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubMessage.java @@ -6,6 +6,6 @@ /** * A base class for hub messages. */ - abstract class HubMessage { +public abstract class HubMessage { public abstract HubMessageType getMessageType(); } diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubMessageType.java b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubMessageType.java index a1bfeebfcf3b..805f9c9c4e9e 100644 --- a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubMessageType.java +++ b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubMessageType.java @@ -3,7 +3,7 @@ package com.microsoft.signalr; -enum HubMessageType { +public enum HubMessageType { INVOCATION(1), STREAM_ITEM(2), COMPLETION(3), diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubProtocol.java b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubProtocol.java index 844a458c8cde..3096bf719c90 100644 --- a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubProtocol.java +++ b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubProtocol.java @@ -9,7 +9,7 @@ /** * A protocol abstraction for communicating with SignalR hubs. */ -interface HubProtocol { +public interface HubProtocol { String getName(); int getVersion(); TransferFormat getTransferFormat(); diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/InvocationBinder.java b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/InvocationBinder.java index 40767a7a985f..f09035f4f968 100644 --- a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/InvocationBinder.java +++ b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/InvocationBinder.java @@ -9,7 +9,7 @@ /** * An abstraction for passing around information about method signatures. */ -interface InvocationBinder { +public interface InvocationBinder { Type getReturnType(String invocationId); List getParameterTypes(String methodName); } \ No newline at end of file diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/InvocationBindingFailureMessage.java b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/InvocationBindingFailureMessage.java index cda90f9c946d..f87c0b2cd15a 100644 --- a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/InvocationBindingFailureMessage.java +++ b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/InvocationBindingFailureMessage.java @@ -3,7 +3,7 @@ package com.microsoft.signalr; -class InvocationBindingFailureMessage extends HubMessage { +public class InvocationBindingFailureMessage extends HubMessage { private final String invocationId; private final String target; private final Exception exception; diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/InvocationMessage.java b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/InvocationMessage.java index ecc3650ffef5..7820fb4ffc5f 100644 --- a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/InvocationMessage.java +++ b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/InvocationMessage.java @@ -6,7 +6,7 @@ import java.util.Collection; import java.util.Map; -class InvocationMessage extends HubMessage { +public class InvocationMessage extends HubMessage { int type = HubMessageType.INVOCATION.value; private Map headers; private final String invocationId; diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/PingMessage.java b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/PingMessage.java index 1c0286f70e1d..4efb26e21b9d 100644 --- a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/PingMessage.java +++ b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/PingMessage.java @@ -3,7 +3,7 @@ package com.microsoft.signalr; -class PingMessage extends HubMessage +public class PingMessage extends HubMessage { private final int type = HubMessageType.PING.value; diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/StreamBindingFailureMessage.java b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/StreamBindingFailureMessage.java index d7b145fa3f71..dbd6c3cd9139 100644 --- a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/StreamBindingFailureMessage.java +++ b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/StreamBindingFailureMessage.java @@ -3,7 +3,7 @@ package com.microsoft.signalr; -class StreamBindingFailureMessage extends HubMessage { +public class StreamBindingFailureMessage extends HubMessage { private final String invocationId; private final Exception exception; diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/StreamInvocationMessage.java b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/StreamInvocationMessage.java index 0a8c6211b6bb..414adaf9421f 100644 --- a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/StreamInvocationMessage.java +++ b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/StreamInvocationMessage.java @@ -6,7 +6,7 @@ import java.util.Collection; import java.util.Map; -final class StreamInvocationMessage extends InvocationMessage { +public final class StreamInvocationMessage extends InvocationMessage { public StreamInvocationMessage(Map headers, String invocationId, String target, Object[] args, Collection streamIds) { super(headers, invocationId, target, args, streamIds); diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/StreamItem.java b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/StreamItem.java index 9b18f0bdc3de..26dfc7f8e236 100644 --- a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/StreamItem.java +++ b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/StreamItem.java @@ -5,7 +5,7 @@ import java.util.Map; -final class StreamItem extends HubMessage { +public final class StreamItem extends HubMessage { private final int type = HubMessageType.STREAM_ITEM.value; private Map headers; private final String invocationId; diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/TransferFormat.java b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/TransferFormat.java index 59a9dd588967..413404bea612 100644 --- a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/TransferFormat.java +++ b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/TransferFormat.java @@ -3,7 +3,7 @@ package com.microsoft.signalr; -enum TransferFormat { +public enum TransferFormat { TEXT, BINARY } diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Utils.java b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Utils.java index 88d589a93683..45fc99d32f35 100644 --- a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Utils.java +++ b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Utils.java @@ -22,76 +22,10 @@ public static String appendQueryString(String original, String queryStringValue) } } - public static int readLengthHeader(ByteBuffer buffer) throws IOException { - // The payload starts with a length prefix encoded as a VarInt. VarInts use the most significant bit - // as a marker whether the byte is the last byte of the VarInt or if it spans to the next byte. Bytes - // appear in the reverse order - i.e. the first byte contains the least significant bits of the value - // Examples: - // VarInt: 0x35 - %00110101 - the most significant bit is 0 so the value is %x0110101 i.e. 0x35 (53) - // VarInt: 0x80 0x25 - %10000000 %00101001 - the most significant bit of the first byte is 1 so the - // remaining bits (%x0000000) are the lowest bits of the value. The most significant bit of the second - // byte is 0 meaning this is last byte of the VarInt. The actual value bits (%x0101001) need to be - // prepended to the bits we already read so the values is %01010010000000 i.e. 0x1480 (5248) - // We support payloads up to 2GB so the biggest number we support is 7fffffff which when encoded as - // VarInt is 0xFF 0xFF 0xFF 0xFF 0x07 - hence the maximum length prefix is 5 bytes. - - int length = 0; - int numBytes = 0; - int maxLength = 5; - byte curr; - - do { - // If we run out of bytes before we finish reading the length header, the message is malformed - if (buffer.hasRemaining()) { - curr = buffer.get(); - } else { - throw new RuntimeException("The length header was incomplete"); - } - length = length | (curr & (byte) 0x7f) << (numBytes * 7); - numBytes++; - } while (numBytes < maxLength && (curr & (byte) 0x80) != 0); - - // Max header length is 5, and the maximum value of the 5th byte is 0x07 - if ((curr & (byte) 0x80) != 0 || (numBytes == maxLength && curr > (byte) 0x07)) { - throw new RuntimeException("Messages over 2GB in size are not supported"); - } - - return length; - } - - public static ArrayList getLengthHeader(int length) { - // This code writes length prefix of the message as a VarInt. Read the comment in - // the readLengthHeader for details. - - ArrayList header = new ArrayList(); - do { - byte curr = (byte) (length & 0x7f); - length >>= 7; - if (length > 0) { - curr |= 0x80; - } - header.add(curr); - } while (length > 0); - - return header; - } - - public static Object toPrimitive(Class c, Object value) { - if (boolean.class == c) return ((Boolean) value).booleanValue(); - if (byte.class == c) return ((Byte) value).byteValue(); - if (short.class == c) return ((Short) value).shortValue(); - if (int.class == c) return ((Integer) value).intValue(); - if (long.class == c) return ((Long) value).longValue(); - if (float.class == c) return ((Float) value).floatValue(); - if (double.class == c) return ((Double) value).doubleValue(); - if (char.class == c) return ((Character) value).charValue(); - return value; - } - public static Class typeToClass(Type type) { - if (type == null) { - return null; - } + if (type == null) { + return null; + } if (type instanceof Class) { return (Class) type; } else if (type instanceof GenericArrayType) { @@ -108,5 +42,5 @@ public static Class typeToClass(Type type) { } else { throw new UnsupportedOperationException("Cannot handle type class: " + type.getClass()); } - } + } } \ No newline at end of file diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/MessagePackHubProtocol.java b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/messagepack/MessagePackHubProtocol.java similarity index 97% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/MessagePackHubProtocol.java rename to src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/messagepack/MessagePackHubProtocol.java index bd7f9cd7b2e5..e1d4a5e1009c 100644 --- a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/MessagePackHubProtocol.java +++ b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/messagepack/MessagePackHubProtocol.java @@ -1,7 +1,7 @@ // 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; +package com.microsoft.signalr.messagepack; import java.io.IOException; import java.lang.reflect.Type; @@ -25,7 +25,22 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.type.TypeFactory; -class MessagePackHubProtocol implements HubProtocol { +import com.microsoft.signalr.CancelInvocationMessage; +import com.microsoft.signalr.CloseMessage; +import com.microsoft.signalr.CompletionMessage; +import com.microsoft.signalr.HubMessage; +import com.microsoft.signalr.HubMessageType; +import com.microsoft.signalr.HubProtocol; +import com.microsoft.signalr.InvocationBinder; +import com.microsoft.signalr.InvocationBindingFailureMessage; +import com.microsoft.signalr.InvocationMessage; +import com.microsoft.signalr.PingMessage; +import com.microsoft.signalr.StreamBindingFailureMessage; +import com.microsoft.signalr.StreamInvocationMessage; +import com.microsoft.signalr.StreamItem; +import com.microsoft.signalr.TransferFormat; + +public class MessagePackHubProtocol implements HubProtocol { private static final int ERROR_RESULT = 1; private static final int VOID_RESULT = 2; diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/messagepack/Utils.java b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/messagepack/Utils.java new file mode 100644 index 000000000000..4eba17b6fc98 --- /dev/null +++ b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/messagepack/Utils.java @@ -0,0 +1,101 @@ +package com.microsoft.signalr.messagepack; + +import java.io.IOException; +import java.lang.reflect.Array; +import java.lang.reflect.GenericArrayType; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.lang.reflect.TypeVariable; +import java.lang.reflect.WildcardType; +import java.nio.ByteBuffer; +import java.util.ArrayList; + +class Utils { + public static int readLengthHeader(ByteBuffer buffer) throws IOException { + // The payload starts with a length prefix encoded as a VarInt. VarInts use the most significant bit + // as a marker whether the byte is the last byte of the VarInt or if it spans to the next byte. Bytes + // appear in the reverse order - i.e. the first byte contains the least significant bits of the value + // Examples: + // VarInt: 0x35 - %00110101 - the most significant bit is 0 so the value is %x0110101 i.e. 0x35 (53) + // VarInt: 0x80 0x25 - %10000000 %00101001 - the most significant bit of the first byte is 1 so the + // remaining bits (%x0000000) are the lowest bits of the value. The most significant bit of the second + // byte is 0 meaning this is last byte of the VarInt. The actual value bits (%x0101001) need to be + // prepended to the bits we already read so the values is %01010010000000 i.e. 0x1480 (5248) + // We support payloads up to 2GB so the biggest number we support is 7fffffff which when encoded as + // VarInt is 0xFF 0xFF 0xFF 0xFF 0x07 - hence the maximum length prefix is 5 bytes. + + int length = 0; + int numBytes = 0; + int maxLength = 5; + byte curr; + + do { + // If we run out of bytes before we finish reading the length header, the message is malformed + if (buffer.hasRemaining()) { + curr = buffer.get(); + } else { + throw new RuntimeException("The length header was incomplete"); + } + length = length | (curr & (byte) 0x7f) << (numBytes * 7); + numBytes++; + } while (numBytes < maxLength && (curr & (byte) 0x80) != 0); + + // Max header length is 5, and the maximum value of the 5th byte is 0x07 + if ((curr & (byte) 0x80) != 0 || (numBytes == maxLength && curr > (byte) 0x07)) { + throw new RuntimeException("Messages over 2GB in size are not supported"); + } + + return length; + } + + public static ArrayList getLengthHeader(int length) { + // This code writes length prefix of the message as a VarInt. Read the comment in + // the readLengthHeader for details. + + ArrayList header = new ArrayList(); + do { + byte curr = (byte) (length & 0x7f); + length >>= 7; + if (length > 0) { + curr |= 0x80; + } + header.add(curr); + } while (length > 0); + + return header; + } + + public static Object toPrimitive(Class c, Object value) { + if (boolean.class == c) return ((Boolean) value).booleanValue(); + if (byte.class == c) return ((Byte) value).byteValue(); + if (short.class == c) return ((Short) value).shortValue(); + if (int.class == c) return ((Integer) value).intValue(); + if (long.class == c) return ((Long) value).longValue(); + if (float.class == c) return ((Float) value).floatValue(); + if (double.class == c) return ((Double) value).doubleValue(); + if (char.class == c) return ((Character) value).charValue(); + return value; + } + + public static Class typeToClass(Type type) { + if (type == null) { + return null; + } + if (type instanceof Class) { + return (Class) type; + } else if (type instanceof GenericArrayType) { + // Instantiate an array of the same type as this type, then return its class + return Array.newInstance(typeToClass(((GenericArrayType)type).getGenericComponentType()), 0).getClass(); + } else if (type instanceof ParameterizedType) { + return typeToClass(((ParameterizedType) type).getRawType()); + } else if (type instanceof TypeVariable) { + Type[] bounds = ((TypeVariable) type).getBounds(); + return bounds.length == 0 ? Object.class : typeToClass(bounds[0]); + } else if (type instanceof WildcardType) { + Type[] bounds = ((WildcardType) type).getUpperBounds(); + return bounds.length == 0 ? Object.class : typeToClass(bounds[0]); + } else { + throw new UnsupportedOperationException("Cannot handle type class: " + type.getClass()); + } + } +} diff --git a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/MessagePackHubProtocolTest.java b/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/MessagePackHubProtocolTest.java index 37df89fabfb2..d1533ca32841 100644 --- a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/MessagePackHubProtocolTest.java +++ b/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/MessagePackHubProtocolTest.java @@ -19,6 +19,8 @@ import org.junit.jupiter.api.Test; +import com.microsoft.signalr.messagepack.MessagePackHubProtocol; + class MessagePackHubProtocolTest { private MessagePackHubProtocol messagePackHubProtocol = new MessagePackHubProtocol(); diff --git a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/TestUtils.java b/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/TestUtils.java index 29b08709883b..f57e9ddbd7e2 100644 --- a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/TestUtils.java +++ b/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/TestUtils.java @@ -5,6 +5,7 @@ import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; +import com.microsoft.signalr.messagepack.MessagePackHubProtocol; class TestUtils { @@ -33,7 +34,7 @@ static HubConnection createHubConnection(String url, Transport transport, boolea .shouldSkipNegotiate(skipNegotiate); if (withMessagePack) { - builder = builder.withMessagePackHubProtocol(); + builder = builder.withProtocol(new MessagePackHubProtocol()); } return builder.build(); From a429195793efeba4d911cd59363ce323bfeb0886 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Tue, 25 Aug 2020 14:08:33 -0700 Subject: [PATCH 02/18] Remove gitignore --- src/SignalR/.gitignore | 1 - 1 file changed, 1 deletion(-) delete mode 100644 src/SignalR/.gitignore diff --git a/src/SignalR/.gitignore b/src/SignalR/.gitignore deleted file mode 100644 index e10e727be5ce..000000000000 --- a/src/SignalR/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/.metadata/ From 5b9b4555e3840b4d99dab41c479694c4630b7c98 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Wed, 26 Aug 2020 13:11:50 -0700 Subject: [PATCH 03/18] Maybe undo this later --- src/SignalR/clients/java/signalr/build.gradle | 42 ++++++++++++++----- .../clients/java/signalr/settings.gradle | 2 +- .../messagepack/MessagePackHubProtocol.java | 0 .../signalr => }/messagepack/Utils.java | 0 4 files changed, 32 insertions(+), 12 deletions(-) rename src/SignalR/clients/java/signalr/src/{main/java/com/microsoft/signalr => }/messagepack/MessagePackHubProtocol.java (100%) rename src/SignalR/clients/java/signalr/src/{main/java/com/microsoft/signalr => }/messagepack/Utils.java (100%) diff --git a/src/SignalR/clients/java/signalr/build.gradle b/src/SignalR/clients/java/signalr/build.gradle index d55927441423..ed65427faf08 100644 --- a/src/SignalR/clients/java/signalr/build.gradle +++ b/src/SignalR/clients/java/signalr/build.gradle @@ -19,8 +19,6 @@ apply plugin: "java-library" apply plugin: "com.diffplug.gradle.spotless" apply plugin: 'org.junit.platform.gradle.plugin' -group 'com.microsoft.signalr' - // If we're run from outside MSBuild, just assign a bogus dev version. version project.findProperty('packageVersion') ?: "99.99.99-dev" @@ -35,12 +33,39 @@ dependencies { testCompile 'org.junit.jupiter:junit-jupiter-params:5.3.1' testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.3.1' testCompile 'org.slf4j:slf4j-jdk14:1.7.25' - 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' implementation 'org.slf4j:slf4j-api:1.7.25' - compile 'org.msgpack:msgpack-core:0.8.20' - compile 'org.msgpack:jackson-dataformat-msgpack:0.8.20' +} + +project(':main') { + + group 'com.microsoft.signalr' + + dependencies { + implementation 'com.google.code.gson:gson:2.8.5' + implementation 'com.squareup.okhttp3:okhttp:3.11.0' + } + + task sourceJar(type: Jar) { + classifier "sources" + from sourceSets.main.allJava + } +} + +project(':messagepack') { + + group 'com.microsoft.signalr.messagepack' + + dependencies { + implementation project(':main') + compile 'org.msgpack:msgpack-core:0.8.20' + compile 'org.msgpack:jackson-dataformat-msgpack:0.8.20' + } + + task sourceJar(type: Jar) { + classifier "sources" + from sourceSets.messagepack.allJava + } } spotless { @@ -72,11 +97,6 @@ junitPlatform { reportsDir file('test-results') } -task sourceJar(type: Jar) { - classifier "sources" - from sourceSets.main.allJava -} - task javadocJar(type: Jar, dependsOn: javadoc) { classifier "javadoc" from javadoc.destinationDir diff --git a/src/SignalR/clients/java/signalr/settings.gradle b/src/SignalR/clients/java/signalr/settings.gradle index 80beacb801d6..71f8fb46d92f 100644 --- a/src/SignalR/clients/java/signalr/settings.gradle +++ b/src/SignalR/clients/java/signalr/settings.gradle @@ -1,2 +1,2 @@ rootProject.name = 'signalr' -include 'main' +include 'main', 'messagepack' diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/messagepack/MessagePackHubProtocol.java b/src/SignalR/clients/java/signalr/src/messagepack/MessagePackHubProtocol.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/messagepack/MessagePackHubProtocol.java rename to src/SignalR/clients/java/signalr/src/messagepack/MessagePackHubProtocol.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/messagepack/Utils.java b/src/SignalR/clients/java/signalr/src/messagepack/Utils.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/messagepack/Utils.java rename to src/SignalR/clients/java/signalr/src/messagepack/Utils.java From 94f271b50d23056b975aa39435b24f16199e8c8f Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Thu, 27 Aug 2020 12:02:19 -0700 Subject: [PATCH 04/18] More factoring --- src/SignalR/clients/java/signalr/build.gradle | 58 ++++++++++--------- .../clients/java/signalr/settings.gradle | 2 +- .../java/signalr/src/main/build.gradle | 9 +++ .../java/com/microsoft/signalr/Version.java | 2 +- .../java/signalr/src/messagepack/build.gradle | 7 +++ .../messagepack}/MessagePackHubProtocol.java | 0 .../microsoft/signalr/messagepack}/Utils.java | 0 .../java/signalr/src/test/build.gradle | 7 +++ 8 files changed, 56 insertions(+), 29 deletions(-) create mode 100644 src/SignalR/clients/java/signalr/src/main/build.gradle create mode 100644 src/SignalR/clients/java/signalr/src/messagepack/build.gradle rename src/SignalR/clients/java/signalr/src/messagepack/{ => java/com/microsoft/signalr/messagepack}/MessagePackHubProtocol.java (100%) rename src/SignalR/clients/java/signalr/src/messagepack/{ => java/com/microsoft/signalr/messagepack}/Utils.java (100%) create mode 100644 src/SignalR/clients/java/signalr/src/test/build.gradle diff --git a/src/SignalR/clients/java/signalr/build.gradle b/src/SignalR/clients/java/signalr/build.gradle index ed65427faf08..56acc69b4be1 100644 --- a/src/SignalR/clients/java/signalr/build.gradle +++ b/src/SignalR/clients/java/signalr/build.gradle @@ -15,45 +15,39 @@ plugins { id 'maven' } -apply plugin: "java-library" -apply plugin: "com.diffplug.gradle.spotless" -apply plugin: 'org.junit.platform.gradle.plugin' +allprojects { + apply plugin: "java-library" + apply plugin: "com.diffplug.gradle.spotless" + apply plugin: 'org.junit.platform.gradle.plugin' -// If we're run from outside MSBuild, just assign a bogus dev version. -version project.findProperty('packageVersion') ?: "99.99.99-dev" + // If we're run from outside MSBuild, just assign a bogus dev version. + version project.findProperty('packageVersion') ?: "99.99.99-dev" -sourceCompatibility = 1.8 + sourceCompatibility = 1.8 -repositories { - mavenCentral() + repositories { + mavenCentral() + } } -dependencies { - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.1' - testCompile 'org.junit.jupiter:junit-jupiter-params:5.3.1' - testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.3.1' - testCompile 'org.slf4j:slf4j-jdk14:1.7.25' - api 'io.reactivex.rxjava2:rxjava:2.2.3' - implementation 'org.slf4j:slf4j-api:1.7.25' +subprojects { + dependencies { + testCompile 'org.slf4j:slf4j-jdk14:1.7.25' + api 'io.reactivex.rxjava2:rxjava:2.2.3' + implementation 'org.slf4j:slf4j-api:1.7.25' + } } project(':main') { - group 'com.microsoft.signalr' dependencies { implementation 'com.google.code.gson:gson:2.8.5' implementation 'com.squareup.okhttp3:okhttp:3.11.0' } - - task sourceJar(type: Jar) { - classifier "sources" - from sourceSets.main.allJava - } } project(':messagepack') { - group 'com.microsoft.signalr.messagepack' dependencies { @@ -61,10 +55,15 @@ project(':messagepack') { compile 'org.msgpack:msgpack-core:0.8.20' compile 'org.msgpack:jackson-dataformat-msgpack:0.8.20' } +} - task sourceJar(type: Jar) { - classifier "sources" - from sourceSets.messagepack.allJava +project(':test') { + dependencies { + implementation project(':main') + implementation project(':messagepack') + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.1' + testCompile 'org.junit.jupiter:junit-jupiter-params:5.3.1' + testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.3.1' } } @@ -73,7 +72,7 @@ spotless { licenseHeader '// Copyright (c) .NET Foundation. All rights reserved.\n' + '// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\n\n' // License header - importOrder 'java', 'javax', 'org', 'com', 'com.diffplug', '' // A sequence of package names + importOrder 'java', 'javax', 'org', 'com', 'com.diffplug', '' // A sequence of package names replace 'Not enough space after if', 'if(', 'if (' replace 'Not enough space after else', 'else{', 'else {' @@ -97,6 +96,11 @@ junitPlatform { reportsDir file('test-results') } +task sourceJar(type: Jar) { + classifier "sources" + from sourceSets.main.allJava +} + task javadocJar(type: Jar, dependsOn: javadoc) { classifier "javadoc" from javadoc.destinationDir @@ -155,4 +159,4 @@ class Version { } } -compileJava.dependsOn generateVersionClass +compileJava.dependsOn generateVersionClass \ No newline at end of file diff --git a/src/SignalR/clients/java/signalr/settings.gradle b/src/SignalR/clients/java/signalr/settings.gradle index 71f8fb46d92f..e4940b6f93ca 100644 --- a/src/SignalR/clients/java/signalr/settings.gradle +++ b/src/SignalR/clients/java/signalr/settings.gradle @@ -1,2 +1,2 @@ rootProject.name = 'signalr' -include 'main', 'messagepack' +include 'main', 'messagepack', 'test' diff --git a/src/SignalR/clients/java/signalr/src/main/build.gradle b/src/SignalR/clients/java/signalr/src/main/build.gradle new file mode 100644 index 000000000000..cbb3c2091ca9 --- /dev/null +++ b/src/SignalR/clients/java/signalr/src/main/build.gradle @@ -0,0 +1,9 @@ +group 'com.microsoft.signalr' + +dependencies { + testCompile 'org.slf4j:slf4j-jdk14:1.7.25' + api 'io.reactivex.rxjava2:rxjava:2.2.3' + implementation 'org.slf4j:slf4j-api:1.7.25' + implementation 'com.google.code.gson:gson:2.8.5' + implementation 'com.squareup.okhttp3:okhttp:3.11.0' +} \ No newline at end of file diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Version.java b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Version.java index 3877f515be7a..4c73a498f682 100644 --- a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Version.java +++ b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Version.java @@ -6,6 +6,6 @@ class Version { public static String getDetailedVersion() { - return "5.0.0-dev"; + return "99.99.99-dev"; } } diff --git a/src/SignalR/clients/java/signalr/src/messagepack/build.gradle b/src/SignalR/clients/java/signalr/src/messagepack/build.gradle new file mode 100644 index 000000000000..d095afe1154c --- /dev/null +++ b/src/SignalR/clients/java/signalr/src/messagepack/build.gradle @@ -0,0 +1,7 @@ +group 'com.microsoft.signalr.messagepack' + +dependencies { + implementation project(':main') + compile 'org.msgpack:msgpack-core:0.8.20' + compile 'org.msgpack:jackson-dataformat-msgpack:0.8.20' +} \ No newline at end of file diff --git a/src/SignalR/clients/java/signalr/src/messagepack/MessagePackHubProtocol.java b/src/SignalR/clients/java/signalr/src/messagepack/java/com/microsoft/signalr/messagepack/MessagePackHubProtocol.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/messagepack/MessagePackHubProtocol.java rename to src/SignalR/clients/java/signalr/src/messagepack/java/com/microsoft/signalr/messagepack/MessagePackHubProtocol.java diff --git a/src/SignalR/clients/java/signalr/src/messagepack/Utils.java b/src/SignalR/clients/java/signalr/src/messagepack/java/com/microsoft/signalr/messagepack/Utils.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/messagepack/Utils.java rename to src/SignalR/clients/java/signalr/src/messagepack/java/com/microsoft/signalr/messagepack/Utils.java diff --git a/src/SignalR/clients/java/signalr/src/test/build.gradle b/src/SignalR/clients/java/signalr/src/test/build.gradle new file mode 100644 index 000000000000..96ec297a34dd --- /dev/null +++ b/src/SignalR/clients/java/signalr/src/test/build.gradle @@ -0,0 +1,7 @@ +dependencies { + implementation project(':main') + implementation project(':messagepack') + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.1' + testCompile 'org.junit.jupiter:junit-jupiter-params:5.3.1' + testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.3.1' +} \ No newline at end of file From 2c767b31cb5f67965a6bcbc3c56a3cf035648096 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Fri, 28 Aug 2020 10:12:44 -0700 Subject: [PATCH 05/18] Get gradle test working --- .../src/main/java/com/microsoft/signalr/Version.java | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Version.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Version.java b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Version.java deleted file mode 100644 index 4c73a498f682..000000000000 --- a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Version.java +++ /dev/null @@ -1,11 +0,0 @@ - -// 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; - -class Version { - public static String getDetailedVersion() { - return "99.99.99-dev"; - } -} From 3b1944405388764a4b28eeb2f1d238dd0832597f Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Fri, 28 Aug 2020 10:12:44 -0700 Subject: [PATCH 06/18] Get gradle test working --- src/SignalR/clients/java/signalr/build.gradle | 38 +- .../java/com/microsoft/signalr/Action.java | 0 .../java/com/microsoft/signalr/Action1.java | 0 .../java/com/microsoft/signalr/Action2.java | 0 .../java/com/microsoft/signalr/Action3.java | 0 .../java/com/microsoft/signalr/Action4.java | 0 .../java/com/microsoft/signalr/Action5.java | 0 .../java/com/microsoft/signalr/Action6.java | 0 .../java/com/microsoft/signalr/Action7.java | 0 .../java/com/microsoft/signalr/Action8.java | 0 .../com/microsoft/signalr/ActionBase.java | 0 .../com/microsoft/signalr/CallbackMap.java | 0 .../signalr/CancelInvocationMessage.java | 0 .../com/microsoft/signalr/CloseMessage.java | 0 .../microsoft/signalr/CompletionMessage.java | 0 .../microsoft/signalr/DefaultHttpClient.java | 0 .../microsoft/signalr/HandshakeProtocol.java | 0 .../signalr/HandshakeRequestMessage.java | 0 .../signalr/HandshakeResponseMessage.java | 0 .../com/microsoft/signalr/HttpClient.java | 0 .../signalr/HttpHubConnectionBuilder.java | 0 .../com/microsoft/signalr/HubConnection.java | 0 .../signalr/HubConnectionBuilder.java | 0 .../microsoft/signalr/HubConnectionState.java | 0 .../com/microsoft/signalr/HubException.java | 0 .../com/microsoft/signalr/HubMessage.java | 0 .../com/microsoft/signalr/HubMessageType.java | 0 .../com/microsoft/signalr/HubProtocol.java | 0 .../microsoft/signalr/InvocationBinder.java | 0 .../InvocationBindingFailureMessage.java | 0 .../microsoft/signalr/InvocationHandler.java | 0 .../microsoft/signalr/InvocationMessage.java | 0 .../microsoft/signalr/InvocationRequest.java | 0 .../microsoft/signalr/JsonHubProtocol.java | 0 .../signalr/LongPollingTransport.java | 0 .../java/com/microsoft/signalr/Negotiate.java | 0 .../microsoft/signalr/NegotiateResponse.java | 0 .../signalr/OkHttpWebSocketWrapper.java | 0 .../microsoft/signalr/OnClosedCallback.java | 0 .../microsoft/signalr/OnReceiveCallBack.java | 0 .../com/microsoft/signalr/PingMessage.java | 0 .../signalr/StreamBindingFailureMessage.java | 0 .../signalr/StreamInvocationMessage.java | 0 .../com/microsoft/signalr/StreamItem.java | 0 .../com/microsoft/signalr/Subscription.java | 0 .../com/microsoft/signalr/TransferFormat.java | 0 .../java/com/microsoft/signalr/Transport.java | 0 .../com/microsoft/signalr/TransportEnum.java | 0 .../signalr/TransportOnClosedCallback.java | 0 .../microsoft/signalr/UserAgentHelper.java | 0 .../java/com/microsoft/signalr/Utils.java | 0 .../java/com/microsoft/signalr/Version.java | 11 + .../microsoft/signalr/WebSocketTransport.java | 0 .../microsoft/signalr/WebSocketWrapper.java | 0 .../signalr/WebsocketWrapperOnClosed.java | 0 .../com/microsoft/signalr/package-info.java | 0 .../messagepack/MessagePackHubProtocol.java | 2 +- .../com/microsoft}/messagepack/Utils.java | 2 +- .../clients/java/signalr/settings.gradle | 2 +- .../java/signalr/src/main/build.gradle | 9 - .../java/signalr/src/messagepack/build.gradle | 7 - .../java/signalr/src/test/build.gradle | 7 - .../com/microsoft/signalr/ByteString.java | 0 .../signalr/HandshakeProtocolTest.java | 0 .../signalr/HubConnectionBuilderTest.java | 0 .../microsoft/signalr/HubConnectionTest.java | 0 .../microsoft/signalr/HubExceptionTest.java | 0 .../signalr/JsonHubProtocolTest.java | 0 .../signalr/LongPollingTransportTest.java | 0 .../signalr/MessagePackHubProtocolTest.java | 2 +- .../com/microsoft/signalr/MockTransport.java | 0 .../signalr/NegotiateResponseTest.java | 0 .../com/microsoft/signalr/PersonPojo.java | 0 .../signalr/ResolveNegotiateUrlTest.java | 0 .../com/microsoft/signalr/TestBinder.java | 0 .../com/microsoft/signalr/TestHttpClient.java | 0 .../java/com/microsoft/signalr/TestUtils.java | 2 +- .../com/microsoft/signalr/UserAgentTest.java | 0 .../signalr/WebSocketTransportTest.java | 0 .../WebSocketTransportUrlFormatTest.java | 0 .../com/microsoft/signalr/sample/Chat.java | 0 .../test/test-results/TEST-junit-jupiter.xml | 1589 +++++++++++++++++ 82 files changed, 1623 insertions(+), 48 deletions(-) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/Action.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/Action1.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/Action2.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/Action3.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/Action4.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/Action5.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/Action6.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/Action7.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/Action8.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/ActionBase.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/CallbackMap.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/CancelInvocationMessage.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/CloseMessage.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/CompletionMessage.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/DefaultHttpClient.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/HandshakeProtocol.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/HandshakeRequestMessage.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/HandshakeResponseMessage.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/HttpClient.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/HubConnection.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/HubConnectionBuilder.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/HubConnectionState.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/HubException.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/HubMessage.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/HubMessageType.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/HubProtocol.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/InvocationBinder.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/InvocationBindingFailureMessage.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/InvocationHandler.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/InvocationMessage.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/InvocationRequest.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/JsonHubProtocol.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/LongPollingTransport.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/Negotiate.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/NegotiateResponse.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/OkHttpWebSocketWrapper.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/OnClosedCallback.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/OnReceiveCallBack.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/PingMessage.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/StreamBindingFailureMessage.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/StreamInvocationMessage.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/StreamItem.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/Subscription.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/TransferFormat.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/Transport.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/TransportEnum.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/TransportOnClosedCallback.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/UserAgentHelper.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/Utils.java (100%) create mode 100644 src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Version.java rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/WebSocketTransport.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/WebSocketWrapper.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/WebsocketWrapperOnClosed.java (100%) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/package-info.java (100%) rename src/SignalR/clients/java/signalr/{src/messagepack/java/com/microsoft/signalr => messagepack/src/main/java/com/microsoft}/messagepack/MessagePackHubProtocol.java (99%) rename src/SignalR/clients/java/signalr/{src/messagepack/java/com/microsoft/signalr => messagepack/src/main/java/com/microsoft}/messagepack/Utils.java (99%) delete mode 100644 src/SignalR/clients/java/signalr/src/main/build.gradle delete mode 100644 src/SignalR/clients/java/signalr/src/messagepack/build.gradle delete mode 100644 src/SignalR/clients/java/signalr/src/test/build.gradle rename src/SignalR/clients/java/signalr/{src/test => test/src/main}/java/com/microsoft/signalr/ByteString.java (100%) rename src/SignalR/clients/java/signalr/{src/test => test/src/main}/java/com/microsoft/signalr/HandshakeProtocolTest.java (100%) rename src/SignalR/clients/java/signalr/{src/test => test/src/main}/java/com/microsoft/signalr/HubConnectionBuilderTest.java (100%) rename src/SignalR/clients/java/signalr/{src/test => test/src/main}/java/com/microsoft/signalr/HubConnectionTest.java (100%) rename src/SignalR/clients/java/signalr/{src/test => test/src/main}/java/com/microsoft/signalr/HubExceptionTest.java (100%) rename src/SignalR/clients/java/signalr/{src/test => test/src/main}/java/com/microsoft/signalr/JsonHubProtocolTest.java (100%) rename src/SignalR/clients/java/signalr/{src/test => test/src/main}/java/com/microsoft/signalr/LongPollingTransportTest.java (100%) rename src/SignalR/clients/java/signalr/{src/test => test/src/main}/java/com/microsoft/signalr/MessagePackHubProtocolTest.java (99%) rename src/SignalR/clients/java/signalr/{src/test => test/src/main}/java/com/microsoft/signalr/MockTransport.java (100%) rename src/SignalR/clients/java/signalr/{src/test => test/src/main}/java/com/microsoft/signalr/NegotiateResponseTest.java (100%) rename src/SignalR/clients/java/signalr/{src/test => test/src/main}/java/com/microsoft/signalr/PersonPojo.java (100%) rename src/SignalR/clients/java/signalr/{src/test => test/src/main}/java/com/microsoft/signalr/ResolveNegotiateUrlTest.java (100%) rename src/SignalR/clients/java/signalr/{src/test => test/src/main}/java/com/microsoft/signalr/TestBinder.java (100%) rename src/SignalR/clients/java/signalr/{src/test => test/src/main}/java/com/microsoft/signalr/TestHttpClient.java (100%) rename src/SignalR/clients/java/signalr/{src/test => test/src/main}/java/com/microsoft/signalr/TestUtils.java (96%) rename src/SignalR/clients/java/signalr/{src/test => test/src/main}/java/com/microsoft/signalr/UserAgentTest.java (100%) rename src/SignalR/clients/java/signalr/{src/test => test/src/main}/java/com/microsoft/signalr/WebSocketTransportTest.java (100%) rename src/SignalR/clients/java/signalr/{src/test => test/src/main}/java/com/microsoft/signalr/WebSocketTransportUrlFormatTest.java (100%) rename src/SignalR/clients/java/signalr/{src/test => test/src/main}/java/com/microsoft/signalr/sample/Chat.java (100%) create mode 100644 src/SignalR/clients/java/signalr/test/test-results/TEST-junit-jupiter.xml diff --git a/src/SignalR/clients/java/signalr/build.gradle b/src/SignalR/clients/java/signalr/build.gradle index 56acc69b4be1..f622e4a2f160 100644 --- a/src/SignalR/clients/java/signalr/build.gradle +++ b/src/SignalR/clients/java/signalr/build.gradle @@ -18,7 +18,6 @@ plugins { allprojects { apply plugin: "java-library" apply plugin: "com.diffplug.gradle.spotless" - apply plugin: 'org.junit.platform.gradle.plugin' // If we're run from outside MSBuild, just assign a bogus dev version. version project.findProperty('packageVersion') ?: "99.99.99-dev" @@ -30,40 +29,43 @@ allprojects { } } -subprojects { - dependencies { - testCompile 'org.slf4j:slf4j-jdk14:1.7.25' - api 'io.reactivex.rxjava2:rxjava:2.2.3' - implementation 'org.slf4j:slf4j-api:1.7.25' - } -} - -project(':main') { +project(':core') { 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' + implementation 'org.slf4j:slf4j-api:1.7.25' } } project(':messagepack') { - group 'com.microsoft.signalr.messagepack' + group 'com.microsoft.messagepack' dependencies { - implementation project(':main') + implementation project(':core') compile 'org.msgpack:msgpack-core:0.8.20' compile 'org.msgpack:jackson-dataformat-msgpack:0.8.20' } } project(':test') { + apply plugin: 'org.junit.platform.gradle.plugin' + dependencies { - implementation project(':main') + implementation 'org.junit.jupiter:junit-jupiter-api:5.3.1' + compile 'org.junit.jupiter:junit-jupiter-params:5.3.1' + runtime 'org.junit.jupiter:junit-jupiter-engine:5.3.1' + implementation 'com.google.code.gson:gson:2.8.5' + testCompile 'org.slf4j:slf4j-jdk14:1.7.25' + implementation project(':core') implementation project(':messagepack') - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.1' - testCompile 'org.junit.jupiter:junit-jupiter-params:5.3.1' - testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.3.1' + compile project(':messagepack') + } + + junitPlatform { + reportsDir file('test-results') } } @@ -92,10 +94,6 @@ spotless { } } -junitPlatform { - reportsDir file('test-results') -} - task sourceJar(type: Jar) { classifier "sources" from sourceSets.main.allJava diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Action.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Action.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action1.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Action1.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action1.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Action1.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action2.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Action2.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action2.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Action2.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action3.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Action3.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action3.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Action3.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action4.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Action4.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action4.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Action4.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action5.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Action5.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action5.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Action5.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action6.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Action6.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action6.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Action6.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action7.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Action7.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action7.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Action7.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action8.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Action8.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action8.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Action8.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/ActionBase.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/ActionBase.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/ActionBase.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/ActionBase.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/CallbackMap.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/CallbackMap.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/CallbackMap.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/CallbackMap.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/CancelInvocationMessage.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/CancelInvocationMessage.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/CancelInvocationMessage.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/CancelInvocationMessage.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/CloseMessage.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/CloseMessage.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/CloseMessage.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/CloseMessage.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/CompletionMessage.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/CompletionMessage.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/CompletionMessage.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/CompletionMessage.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/DefaultHttpClient.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/DefaultHttpClient.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/DefaultHttpClient.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/DefaultHttpClient.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HandshakeProtocol.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HandshakeProtocol.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HandshakeProtocol.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HandshakeProtocol.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HandshakeRequestMessage.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HandshakeRequestMessage.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HandshakeRequestMessage.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HandshakeRequestMessage.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HandshakeResponseMessage.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HandshakeResponseMessage.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HandshakeResponseMessage.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HandshakeResponseMessage.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HttpClient.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HttpClient.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HttpClient.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HttpClient.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubConnection.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubConnection.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnectionBuilder.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubConnectionBuilder.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnectionBuilder.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubConnectionBuilder.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnectionState.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubConnectionState.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnectionState.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubConnectionState.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubException.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubException.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubException.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubException.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubMessage.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubMessage.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubMessage.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubMessage.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubMessageType.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubMessageType.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubMessageType.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubMessageType.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubProtocol.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubProtocol.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubProtocol.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubProtocol.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/InvocationBinder.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/InvocationBinder.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/InvocationBinder.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/InvocationBinder.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/InvocationBindingFailureMessage.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/InvocationBindingFailureMessage.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/InvocationBindingFailureMessage.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/InvocationBindingFailureMessage.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/InvocationHandler.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/InvocationHandler.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/InvocationHandler.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/InvocationHandler.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/InvocationMessage.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/InvocationMessage.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/InvocationMessage.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/InvocationMessage.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/InvocationRequest.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/InvocationRequest.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/InvocationRequest.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/InvocationRequest.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/JsonHubProtocol.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/JsonHubProtocol.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/JsonHubProtocol.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/JsonHubProtocol.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/LongPollingTransport.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/LongPollingTransport.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/LongPollingTransport.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/LongPollingTransport.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Negotiate.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Negotiate.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Negotiate.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Negotiate.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/NegotiateResponse.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/NegotiateResponse.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/NegotiateResponse.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/NegotiateResponse.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/OkHttpWebSocketWrapper.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/OkHttpWebSocketWrapper.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/OkHttpWebSocketWrapper.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/OkHttpWebSocketWrapper.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/OnClosedCallback.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/OnClosedCallback.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/OnClosedCallback.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/OnClosedCallback.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/OnReceiveCallBack.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/OnReceiveCallBack.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/OnReceiveCallBack.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/OnReceiveCallBack.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/PingMessage.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/PingMessage.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/PingMessage.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/PingMessage.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/StreamBindingFailureMessage.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/StreamBindingFailureMessage.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/StreamBindingFailureMessage.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/StreamBindingFailureMessage.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/StreamInvocationMessage.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/StreamInvocationMessage.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/StreamInvocationMessage.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/StreamInvocationMessage.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/StreamItem.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/StreamItem.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/StreamItem.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/StreamItem.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Subscription.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Subscription.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Subscription.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Subscription.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/TransferFormat.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/TransferFormat.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/TransferFormat.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/TransferFormat.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Transport.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Transport.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Transport.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Transport.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/TransportEnum.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/TransportEnum.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/TransportEnum.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/TransportEnum.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/TransportOnClosedCallback.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/TransportOnClosedCallback.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/TransportOnClosedCallback.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/TransportOnClosedCallback.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/UserAgentHelper.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/UserAgentHelper.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/UserAgentHelper.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/UserAgentHelper.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Utils.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Utils.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Utils.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Utils.java diff --git a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Version.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Version.java new file mode 100644 index 000000000000..4c73a498f682 --- /dev/null +++ b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Version.java @@ -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; + +class Version { + public static String getDetailedVersion() { + return "99.99.99-dev"; + } +} diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/WebSocketTransport.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/WebSocketTransport.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/WebSocketTransport.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/WebSocketTransport.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/WebSocketWrapper.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/WebSocketWrapper.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/WebSocketWrapper.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/WebSocketWrapper.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/WebsocketWrapperOnClosed.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/WebsocketWrapperOnClosed.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/WebsocketWrapperOnClosed.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/WebsocketWrapperOnClosed.java diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/package-info.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/package-info.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/package-info.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/package-info.java diff --git a/src/SignalR/clients/java/signalr/src/messagepack/java/com/microsoft/signalr/messagepack/MessagePackHubProtocol.java b/src/SignalR/clients/java/signalr/messagepack/src/main/java/com/microsoft/messagepack/MessagePackHubProtocol.java similarity index 99% rename from src/SignalR/clients/java/signalr/src/messagepack/java/com/microsoft/signalr/messagepack/MessagePackHubProtocol.java rename to src/SignalR/clients/java/signalr/messagepack/src/main/java/com/microsoft/messagepack/MessagePackHubProtocol.java index e1d4a5e1009c..f9f6ce4c6c24 100644 --- a/src/SignalR/clients/java/signalr/src/messagepack/java/com/microsoft/signalr/messagepack/MessagePackHubProtocol.java +++ b/src/SignalR/clients/java/signalr/messagepack/src/main/java/com/microsoft/messagepack/MessagePackHubProtocol.java @@ -1,7 +1,7 @@ // 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.messagepack; +package com.microsoft.messagepack; import java.io.IOException; import java.lang.reflect.Type; diff --git a/src/SignalR/clients/java/signalr/src/messagepack/java/com/microsoft/signalr/messagepack/Utils.java b/src/SignalR/clients/java/signalr/messagepack/src/main/java/com/microsoft/messagepack/Utils.java similarity index 99% rename from src/SignalR/clients/java/signalr/src/messagepack/java/com/microsoft/signalr/messagepack/Utils.java rename to src/SignalR/clients/java/signalr/messagepack/src/main/java/com/microsoft/messagepack/Utils.java index 4eba17b6fc98..921d55885c7c 100644 --- a/src/SignalR/clients/java/signalr/src/messagepack/java/com/microsoft/signalr/messagepack/Utils.java +++ b/src/SignalR/clients/java/signalr/messagepack/src/main/java/com/microsoft/messagepack/Utils.java @@ -1,4 +1,4 @@ -package com.microsoft.signalr.messagepack; +package com.microsoft.messagepack; import java.io.IOException; import java.lang.reflect.Array; diff --git a/src/SignalR/clients/java/signalr/settings.gradle b/src/SignalR/clients/java/signalr/settings.gradle index e4940b6f93ca..a82ab27defb8 100644 --- a/src/SignalR/clients/java/signalr/settings.gradle +++ b/src/SignalR/clients/java/signalr/settings.gradle @@ -1,2 +1,2 @@ rootProject.name = 'signalr' -include 'main', 'messagepack', 'test' +include 'core', 'messagepack', 'test' diff --git a/src/SignalR/clients/java/signalr/src/main/build.gradle b/src/SignalR/clients/java/signalr/src/main/build.gradle deleted file mode 100644 index cbb3c2091ca9..000000000000 --- a/src/SignalR/clients/java/signalr/src/main/build.gradle +++ /dev/null @@ -1,9 +0,0 @@ -group 'com.microsoft.signalr' - -dependencies { - testCompile 'org.slf4j:slf4j-jdk14:1.7.25' - api 'io.reactivex.rxjava2:rxjava:2.2.3' - implementation 'org.slf4j:slf4j-api:1.7.25' - implementation 'com.google.code.gson:gson:2.8.5' - implementation 'com.squareup.okhttp3:okhttp:3.11.0' -} \ No newline at end of file diff --git a/src/SignalR/clients/java/signalr/src/messagepack/build.gradle b/src/SignalR/clients/java/signalr/src/messagepack/build.gradle deleted file mode 100644 index d095afe1154c..000000000000 --- a/src/SignalR/clients/java/signalr/src/messagepack/build.gradle +++ /dev/null @@ -1,7 +0,0 @@ -group 'com.microsoft.signalr.messagepack' - -dependencies { - implementation project(':main') - compile 'org.msgpack:msgpack-core:0.8.20' - compile 'org.msgpack:jackson-dataformat-msgpack:0.8.20' -} \ No newline at end of file diff --git a/src/SignalR/clients/java/signalr/src/test/build.gradle b/src/SignalR/clients/java/signalr/src/test/build.gradle deleted file mode 100644 index 96ec297a34dd..000000000000 --- a/src/SignalR/clients/java/signalr/src/test/build.gradle +++ /dev/null @@ -1,7 +0,0 @@ -dependencies { - implementation project(':main') - implementation project(':messagepack') - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.1' - testCompile 'org.junit.jupiter:junit-jupiter-params:5.3.1' - testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.3.1' -} \ No newline at end of file diff --git a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/ByteString.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/ByteString.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/ByteString.java rename to src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/ByteString.java diff --git a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/HandshakeProtocolTest.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/HandshakeProtocolTest.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/HandshakeProtocolTest.java rename to src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/HandshakeProtocolTest.java diff --git a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/HubConnectionBuilderTest.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/HubConnectionBuilderTest.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/HubConnectionBuilderTest.java rename to src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/HubConnectionBuilderTest.java diff --git a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/HubConnectionTest.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/HubConnectionTest.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/HubConnectionTest.java rename to src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/HubConnectionTest.java diff --git a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/HubExceptionTest.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/HubExceptionTest.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/HubExceptionTest.java rename to src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/HubExceptionTest.java diff --git a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/JsonHubProtocolTest.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/JsonHubProtocolTest.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/JsonHubProtocolTest.java rename to src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/JsonHubProtocolTest.java diff --git a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/LongPollingTransportTest.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/LongPollingTransportTest.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/LongPollingTransportTest.java rename to src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/LongPollingTransportTest.java diff --git a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/MessagePackHubProtocolTest.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/MessagePackHubProtocolTest.java similarity index 99% rename from src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/MessagePackHubProtocolTest.java rename to src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/MessagePackHubProtocolTest.java index d1533ca32841..6b439b2ffe4c 100644 --- a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/MessagePackHubProtocolTest.java +++ b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/MessagePackHubProtocolTest.java @@ -19,7 +19,7 @@ import org.junit.jupiter.api.Test; -import com.microsoft.signalr.messagepack.MessagePackHubProtocol; +import com.microsoft.messagepack.MessagePackHubProtocol; class MessagePackHubProtocolTest { private MessagePackHubProtocol messagePackHubProtocol = new MessagePackHubProtocol(); diff --git a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/MockTransport.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/MockTransport.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/MockTransport.java rename to src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/MockTransport.java diff --git a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/NegotiateResponseTest.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/NegotiateResponseTest.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/NegotiateResponseTest.java rename to src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/NegotiateResponseTest.java diff --git a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/PersonPojo.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/PersonPojo.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/PersonPojo.java rename to src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/PersonPojo.java diff --git a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/ResolveNegotiateUrlTest.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/ResolveNegotiateUrlTest.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/ResolveNegotiateUrlTest.java rename to src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/ResolveNegotiateUrlTest.java diff --git a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/TestBinder.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/TestBinder.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/TestBinder.java rename to src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/TestBinder.java diff --git a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/TestHttpClient.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/TestHttpClient.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/TestHttpClient.java rename to src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/TestHttpClient.java diff --git a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/TestUtils.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/TestUtils.java similarity index 96% rename from src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/TestUtils.java rename to src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/TestUtils.java index f57e9ddbd7e2..f749ca87acc4 100644 --- a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/TestUtils.java +++ b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/TestUtils.java @@ -5,7 +5,7 @@ import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; -import com.microsoft.signalr.messagepack.MessagePackHubProtocol; +import com.microsoft.messagepack.MessagePackHubProtocol; class TestUtils { diff --git a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/UserAgentTest.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/UserAgentTest.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/UserAgentTest.java rename to src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/UserAgentTest.java diff --git a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/WebSocketTransportTest.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/WebSocketTransportTest.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/WebSocketTransportTest.java rename to src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/WebSocketTransportTest.java diff --git a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/WebSocketTransportUrlFormatTest.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/WebSocketTransportUrlFormatTest.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/WebSocketTransportUrlFormatTest.java rename to src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/WebSocketTransportUrlFormatTest.java diff --git a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/sample/Chat.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/sample/Chat.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/sample/Chat.java rename to src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/sample/Chat.java diff --git a/src/SignalR/clients/java/signalr/test/test-results/TEST-junit-jupiter.xml b/src/SignalR/clients/java/signalr/test/test-results/TEST-junit-jupiter.xml new file mode 100644 index 000000000000..fddddb445eef --- /dev/null +++ b/src/SignalR/clients/java/signalr/test/test-results/TEST-junit-jupiter.xml @@ -0,0 +1,1589 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From c2d6ab776d7979f672f4f4c58cc46751796fc5be Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Fri, 28 Aug 2020 10:31:43 -0700 Subject: [PATCH 07/18] Get rid of version.java --- src/SignalR/clients/java/signalr/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SignalR/clients/java/signalr/build.gradle b/src/SignalR/clients/java/signalr/build.gradle index f622e4a2f160..325a300d261f 100644 --- a/src/SignalR/clients/java/signalr/build.gradle +++ b/src/SignalR/clients/java/signalr/build.gradle @@ -139,7 +139,7 @@ task generateVersionClass { inputs.property "version", project.version outputs.dir "$buildDir/generated" doFirst { - def versionFile = file("$buildDir/../src/main/java/com/microsoft/signalr/Version.java") + def versionFile = file("$buildDir/../core/src/main/java/com/microsoft/signalr/Version.java") versionFile.parentFile.mkdirs() versionFile.text = """ From 4c7c9af5702a06fe11210daf1bff5da246f3a3ef Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Fri, 28 Aug 2020 10:35:58 -0700 Subject: [PATCH 08/18] Separate build.gradle files for all --- src/SignalR/clients/java/signalr/.gitignore | 2 +- src/SignalR/clients/java/signalr/build.gradle | 40 - .../clients/java/signalr/core/build.gradle | 8 + .../java/signalr/messagepack/build.gradle | 7 + .../clients/java/signalr/test/build.gradle | 16 + .../test/test-results/TEST-junit-jupiter.xml | 1589 ----------------- 6 files changed, 32 insertions(+), 1630 deletions(-) create mode 100644 src/SignalR/clients/java/signalr/core/build.gradle create mode 100644 src/SignalR/clients/java/signalr/messagepack/build.gradle create mode 100644 src/SignalR/clients/java/signalr/test/build.gradle delete mode 100644 src/SignalR/clients/java/signalr/test/test-results/TEST-junit-jupiter.xml diff --git a/src/SignalR/clients/java/signalr/.gitignore b/src/SignalR/clients/java/signalr/.gitignore index 3e9534ce3967..88f14c5cafbe 100644 --- a/src/SignalR/clients/java/signalr/.gitignore +++ b/src/SignalR/clients/java/signalr/.gitignore @@ -2,7 +2,7 @@ .gradletasknamecache .gradle/ build/ -/test-results +test/test-results .settings/ out/ *.class diff --git a/src/SignalR/clients/java/signalr/build.gradle b/src/SignalR/clients/java/signalr/build.gradle index 325a300d261f..ec807360a31d 100644 --- a/src/SignalR/clients/java/signalr/build.gradle +++ b/src/SignalR/clients/java/signalr/build.gradle @@ -29,46 +29,6 @@ allprojects { } } -project(':core') { - 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' - implementation 'org.slf4j:slf4j-api:1.7.25' - } -} - -project(':messagepack') { - group 'com.microsoft.messagepack' - - dependencies { - implementation project(':core') - compile 'org.msgpack:msgpack-core:0.8.20' - compile 'org.msgpack:jackson-dataformat-msgpack:0.8.20' - } -} - -project(':test') { - apply plugin: 'org.junit.platform.gradle.plugin' - - dependencies { - implementation 'org.junit.jupiter:junit-jupiter-api:5.3.1' - compile 'org.junit.jupiter:junit-jupiter-params:5.3.1' - runtime 'org.junit.jupiter:junit-jupiter-engine:5.3.1' - implementation 'com.google.code.gson:gson:2.8.5' - testCompile 'org.slf4j:slf4j-jdk14:1.7.25' - implementation project(':core') - implementation project(':messagepack') - compile project(':messagepack') - } - - junitPlatform { - reportsDir file('test-results') - } -} - spotless { java { licenseHeader '// Copyright (c) .NET Foundation. All rights reserved.\n' + diff --git a/src/SignalR/clients/java/signalr/core/build.gradle b/src/SignalR/clients/java/signalr/core/build.gradle new file mode 100644 index 000000000000..22abd5b3e0c3 --- /dev/null +++ b/src/SignalR/clients/java/signalr/core/build.gradle @@ -0,0 +1,8 @@ +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' + implementation 'org.slf4j:slf4j-api:1.7.25' +} \ No newline at end of file diff --git a/src/SignalR/clients/java/signalr/messagepack/build.gradle b/src/SignalR/clients/java/signalr/messagepack/build.gradle new file mode 100644 index 000000000000..005760dc156f --- /dev/null +++ b/src/SignalR/clients/java/signalr/messagepack/build.gradle @@ -0,0 +1,7 @@ +group 'com.microsoft.messagepack' + +dependencies { + implementation project(':core') + compile 'org.msgpack:msgpack-core:0.8.20' + compile 'org.msgpack:jackson-dataformat-msgpack:0.8.20' +} \ No newline at end of file diff --git a/src/SignalR/clients/java/signalr/test/build.gradle b/src/SignalR/clients/java/signalr/test/build.gradle new file mode 100644 index 000000000000..75a451b92986 --- /dev/null +++ b/src/SignalR/clients/java/signalr/test/build.gradle @@ -0,0 +1,16 @@ +apply plugin: 'org.junit.platform.gradle.plugin' + +dependencies { + implementation 'org.junit.jupiter:junit-jupiter-api:5.3.1' + compile 'org.junit.jupiter:junit-jupiter-params:5.3.1' + runtime 'org.junit.jupiter:junit-jupiter-engine:5.3.1' + implementation 'com.google.code.gson:gson:2.8.5' + testCompile 'org.slf4j:slf4j-jdk14:1.7.25' + implementation project(':core') + implementation project(':messagepack') + compile project(':messagepack') +} + +junitPlatform { + reportsDir file('test-results') +} \ No newline at end of file diff --git a/src/SignalR/clients/java/signalr/test/test-results/TEST-junit-jupiter.xml b/src/SignalR/clients/java/signalr/test/test-results/TEST-junit-jupiter.xml deleted file mode 100644 index fddddb445eef..000000000000 --- a/src/SignalR/clients/java/signalr/test/test-results/TEST-junit-jupiter.xml +++ /dev/null @@ -1,1589 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From d04fb5cbba512f7707a4caa4b65cde0488594171 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Mon, 31 Aug 2020 10:06:38 -0700 Subject: [PATCH 09/18] Create separate javaproj's for everything --- src/SignalR/clients/java/signalr/build.gradle | 67 +----------------- .../clients/java/signalr/core/build.gradle | 69 ++++++++++++++++++- .../core/signalr.client.java.core.javaproj | 53 ++++++++++++++ .../java/com/microsoft/signalr/Version.java | 11 --- .../java/signalr/messagepack/build.gradle | 45 +++++++++++- .../signalr.client.java.messagepack.javaproj | 55 +++++++++++++++ .../signalr.client.java.Tests.javaproj | 55 +++------------ 7 files changed, 232 insertions(+), 123 deletions(-) create mode 100644 src/SignalR/clients/java/signalr/core/signalr.client.java.core.javaproj delete mode 100644 src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Version.java create mode 100644 src/SignalR/clients/java/signalr/messagepack/signalr.client.java.messagepack.javaproj rename src/SignalR/clients/java/signalr/{ => test}/signalr.client.java.Tests.javaproj (55%) diff --git a/src/SignalR/clients/java/signalr/build.gradle b/src/SignalR/clients/java/signalr/build.gradle index ec807360a31d..e09780cc6039 100644 --- a/src/SignalR/clients/java/signalr/build.gradle +++ b/src/SignalR/clients/java/signalr/build.gradle @@ -52,69 +52,4 @@ spotless { indentWithSpaces(4) removeUnusedImports() // removes any unused imports } -} - -task sourceJar(type: Jar) { - classifier "sources" - from sourceSets.main.allJava -} - -task javadocJar(type: Jar, dependsOn: javadoc) { - classifier "javadoc" - from javadoc.destinationDir -} - -task generatePOM { - pom { - project { - inceptionYear '2018' - description 'ASP.NET Core SignalR Client for Java applications' - url 'https://github.com/dotnet/aspnetcore' - name groupId + ':' + artifactId - licenses { - license { - name 'The Apache Software License, Version 2.0' - url 'http://www.apache.org/licenses/LICENSE-2.0.txt' - distribution 'repo' - } - } - scm { - connection 'scm:git:git://github.com/dotnet/aspnetcore.git' - developerConnection 'scm:git:git://github.com/dotnet/aspnetcore.git' - url 'http://github.com/dotnet/aspnetcore/tree/master' - } - developers { - developer { - id 'microsoft' - name 'Microsoft' - } - } - } - }.writeTo("${buildDir}/libs/signalr-${project.version}.pom") -} - -task createPackage(dependsOn: [jar,sourceJar,javadocJar,generatePOM]) - -task generateVersionClass { - inputs.property "version", project.version - outputs.dir "$buildDir/generated" - doFirst { - def versionFile = file("$buildDir/../core/src/main/java/com/microsoft/signalr/Version.java") - versionFile.parentFile.mkdirs() - versionFile.text = - """ -// 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; - -class Version { - public static String getDetailedVersion() { - return "$project.version"; - } -} -""" - } -} - -compileJava.dependsOn generateVersionClass \ No newline at end of file +} \ No newline at end of file diff --git a/src/SignalR/clients/java/signalr/core/build.gradle b/src/SignalR/clients/java/signalr/core/build.gradle index 22abd5b3e0c3..f7bdcb67e983 100644 --- a/src/SignalR/clients/java/signalr/core/build.gradle +++ b/src/SignalR/clients/java/signalr/core/build.gradle @@ -5,4 +5,71 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:3.11.0' api 'io.reactivex.rxjava2:rxjava:2.2.3' implementation 'org.slf4j:slf4j-api:1.7.25' -} \ No newline at end of file +} + +archivesBaseName = 'signalr' + +task sourceJar(type: Jar) { + classifier "sources" + from sourceSets.main.allJava +} + +task javadocJar(type: Jar, dependsOn: javadoc) { + classifier "javadoc" + from javadoc.destinationDir +} + +task generatePOM { + pom { + project { + inceptionYear '2018' + description 'ASP.NET Core SignalR Client for Java applications' + url 'https://github.com/dotnet/aspnetcore' + name groupId + ':' + artifactId + licenses { + license { + name 'The Apache Software License, Version 2.0' + url 'http://www.apache.org/licenses/LICENSE-2.0.txt' + distribution 'repo' + } + } + scm { + connection 'scm:git:git://github.com/dotnet/aspnetcore.git' + developerConnection 'scm:git:git://github.com/dotnet/aspnetcore.git' + url 'http://github.com/dotnet/aspnetcore/tree/master' + } + developers { + developer { + id 'microsoft' + name 'Microsoft' + } + } + } + }.writeTo("${buildDir}/libs/signalr-${project.version}.pom") +} + +task createPackage(dependsOn: [jar,sourceJar,javadocJar,generatePOM]) + +task generateVersionClass { + inputs.property "version", project.version + outputs.dir "$buildDir/generated" + doFirst { + def versionFile = file("$buildDir/../src/main/java/com/microsoft/signalr/Version.java") + versionFile.parentFile.mkdirs() + versionFile.text = + """ +// 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; + +class Version { + public static String getDetailedVersion() { + return "$project.version"; + } +} +""" + } +} + +compileJava.dependsOn generateVersionClass \ No newline at end of file diff --git a/src/SignalR/clients/java/signalr/core/signalr.client.java.core.javaproj b/src/SignalR/clients/java/signalr/core/signalr.client.java.core.javaproj new file mode 100644 index 000000000000..5bd4bcd373ce --- /dev/null +++ b/src/SignalR/clients/java/signalr/core/signalr.client.java.core.javaproj @@ -0,0 +1,53 @@ + + + + + + java:signalr.core + + true + false + + $(GradleOptions) -Dorg.gradle.daemon=false + $(OutputPath) + + + + + + + + + + + + + $(PackDependsOn); + Build + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Version.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Version.java deleted file mode 100644 index 4c73a498f682..000000000000 --- a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/Version.java +++ /dev/null @@ -1,11 +0,0 @@ - -// 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; - -class Version { - public static String getDetailedVersion() { - return "99.99.99-dev"; - } -} diff --git a/src/SignalR/clients/java/signalr/messagepack/build.gradle b/src/SignalR/clients/java/signalr/messagepack/build.gradle index 005760dc156f..ed467cd3ecf8 100644 --- a/src/SignalR/clients/java/signalr/messagepack/build.gradle +++ b/src/SignalR/clients/java/signalr/messagepack/build.gradle @@ -4,4 +4,47 @@ dependencies { implementation project(':core') compile 'org.msgpack:msgpack-core:0.8.20' compile 'org.msgpack:jackson-dataformat-msgpack:0.8.20' -} \ No newline at end of file +} + +archivesBaseName = 'signalr-messagepack' + +task sourceJar(type: Jar) { + classifier "sources" + from sourceSets.main.allJava +} + +task javadocJar(type: Jar, dependsOn: javadoc) { + classifier "javadoc" + from javadoc.destinationDir +} + +task generatePOM { + pom { + project { + inceptionYear '2020' + description 'MessagePack protocol implementation for ASP.NET Core SignalR Client for Java applications' + url 'https://github.com/dotnet/aspnetcore' + name groupId + ':' + artifactId + licenses { + license { + name 'The Apache Software License, Version 2.0' + url 'http://www.apache.org/licenses/LICENSE-2.0.txt' + distribution 'repo' + } + } + scm { + connection 'scm:git:git://github.com/dotnet/aspnetcore.git' + developerConnection 'scm:git:git://github.com/dotnet/aspnetcore.git' + url 'http://github.com/dotnet/aspnetcore/tree/master' + } + developers { + developer { + id 'microsoft' + name 'Microsoft' + } + } + } + }.writeTo("${buildDir}/libs/signalr-messagepack-${project.version}.pom") +} + +task createPackage(dependsOn: [jar,sourceJar,javadocJar,generatePOM]) \ No newline at end of file diff --git a/src/SignalR/clients/java/signalr/messagepack/signalr.client.java.messagepack.javaproj b/src/SignalR/clients/java/signalr/messagepack/signalr.client.java.messagepack.javaproj new file mode 100644 index 000000000000..7fadf4e89ee7 --- /dev/null +++ b/src/SignalR/clients/java/signalr/messagepack/signalr.client.java.messagepack.javaproj @@ -0,0 +1,55 @@ + + + + + + java:signalr.messagepack + + true + false + + true + + $(GradleOptions) -Dorg.gradle.daemon=false + $(OutputPath) + + + + + + + + + + + + + $(PackDependsOn); + Build + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/SignalR/clients/java/signalr/signalr.client.java.Tests.javaproj b/src/SignalR/clients/java/signalr/test/signalr.client.java.Tests.javaproj similarity index 55% rename from src/SignalR/clients/java/signalr/signalr.client.java.Tests.javaproj rename to src/SignalR/clients/java/signalr/test/signalr.client.java.Tests.javaproj index 84771b3fe4c6..e9761cd4c4bc 100644 --- a/src/SignalR/clients/java/signalr/signalr.client.java.Tests.javaproj +++ b/src/SignalR/clients/java/signalr/test/signalr.client.java.Tests.javaproj @@ -2,75 +2,42 @@ - - - java:signalr - - - true - + false true - true - $(GradleOptions) -Dorg.gradle.daemon=false $(OutputPath) true - - - - - - - - - - $(PackDependsOn); - Build - - - - - - - - - - + - - - - + - + - - - - + + + + - - + + + From 0f2c93bef7911e3e92fd1c37d9cc85d9c72a48e2 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Mon, 31 Aug 2020 10:11:58 -0700 Subject: [PATCH 10/18] Fix warnings --- src/SignalR/clients/java/signalr/.gitignore | 2 ++ .../java/com/microsoft/signalr/HttpHubConnectionBuilder.java | 1 + .../core/src/main/java/com/microsoft/signalr/HubProtocol.java | 1 + 3 files changed, 4 insertions(+) diff --git a/src/SignalR/clients/java/signalr/.gitignore b/src/SignalR/clients/java/signalr/.gitignore index 88f14c5cafbe..14ff2161fbf6 100644 --- a/src/SignalR/clients/java/signalr/.gitignore +++ b/src/SignalR/clients/java/signalr/.gitignore @@ -7,7 +7,9 @@ test/test-results out/ *.class *.jar +*version.java .project .classpath +core/src/main/java/com/microsoft/signalr/Version.java # We need the gradle-wrapper.jar file so that others can use the gradle wrapper !gradle/wrapper/gradle-wrapper.jar diff --git a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java index 99b671b68d36..435194bfce13 100644 --- a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java +++ b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java @@ -59,6 +59,7 @@ HttpHubConnectionBuilder withHttpClient(HttpClient httpClient) { /** * Sets the {@link HubProtocol} to be used by the {@link HubConnection}. * + * @param protocol The {@link HubProtocol} to be used by the {@link HubConnection}. * @return This instance of the HttpHubConnectionBuilder. */ public HttpHubConnectionBuilder withProtocol(HubProtocol protocol) { diff --git a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubProtocol.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubProtocol.java index 3096bf719c90..bf56c8efb0e1 100644 --- a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubProtocol.java +++ b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubProtocol.java @@ -17,6 +17,7 @@ public interface HubProtocol { /** * Creates a new list of {@link HubMessage}s. * @param message A ByteBuffer representation of one or more {@link HubMessage}s. + * @param binder The {@link InvocationBinder} to use for this Protocol instance. * @return A list of {@link HubMessage}s. */ List parseMessages(ByteBuffer message, InvocationBinder binder); From b9244b8cef6b75fbaebc8dea8934bed8002717da Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Mon, 31 Aug 2020 10:19:13 -0700 Subject: [PATCH 11/18] Resolve conflicts --- .../src/main/java/com/microsoft/signalr/TypeReference.java | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/SignalR/clients/java/signalr/{ => core}/src/main/java/com/microsoft/signalr/TypeReference.java (100%) diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/TypeReference.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/TypeReference.java similarity index 100% rename from src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/TypeReference.java rename to src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/TypeReference.java From b167b2961e5fdb4b74424ff9cdc2763b9f1b7466 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Mon, 31 Aug 2020 10:22:51 -0700 Subject: [PATCH 12/18] Fixup gitignore --- src/SignalR/clients/java/signalr/.gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/src/SignalR/clients/java/signalr/.gitignore b/src/SignalR/clients/java/signalr/.gitignore index 14ff2161fbf6..c442e33f0c60 100644 --- a/src/SignalR/clients/java/signalr/.gitignore +++ b/src/SignalR/clients/java/signalr/.gitignore @@ -7,7 +7,6 @@ test/test-results out/ *.class *.jar -*version.java .project .classpath core/src/main/java/com/microsoft/signalr/Version.java From 178b8daab72d6071cf2b681a34286b62fc0a0843 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Mon, 31 Aug 2020 12:33:01 -0700 Subject: [PATCH 13/18] Feedback, fix error --- .../java/signalr/core/signalr.client.java.core.javaproj | 4 ++-- .../com/microsoft/signalr/HttpHubConnectionBuilder.java | 2 +- .../src/main/java/com/microsoft/signalr/TypeReference.java | 1 + .../messagepack/signalr.client.java.messagepack.javaproj | 6 +++--- .../test/src/main/java/com/microsoft/signalr/TestUtils.java | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/SignalR/clients/java/signalr/core/signalr.client.java.core.javaproj b/src/SignalR/clients/java/signalr/core/signalr.client.java.core.javaproj index 5bd4bcd373ce..5ed3333dabdf 100644 --- a/src/SignalR/clients/java/signalr/core/signalr.client.java.core.javaproj +++ b/src/SignalR/clients/java/signalr/core/signalr.client.java.core.javaproj @@ -3,7 +3,7 @@ - java:signalr.core + java:signalr true false @@ -38,7 +38,7 @@ - + diff --git a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java index 435194bfce13..24722eba1753 100644 --- a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java +++ b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java @@ -62,7 +62,7 @@ HttpHubConnectionBuilder withHttpClient(HttpClient httpClient) { * @param protocol The {@link HubProtocol} to be used by the {@link HubConnection}. * @return This instance of the HttpHubConnectionBuilder. */ - public HttpHubConnectionBuilder withProtocol(HubProtocol protocol) { + public HttpHubConnectionBuilder withHubProtocol(HubProtocol protocol) { this.protocol = protocol; return this; } diff --git a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/TypeReference.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/TypeReference.java index 9fad029eecce..24213e663bc6 100644 --- a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/TypeReference.java +++ b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/TypeReference.java @@ -31,6 +31,7 @@ public TypeReference() { /** * Gets the referenced type. + * @return The Type encapsulated by this TypeReference */ public Type getType() { return this.type; diff --git a/src/SignalR/clients/java/signalr/messagepack/signalr.client.java.messagepack.javaproj b/src/SignalR/clients/java/signalr/messagepack/signalr.client.java.messagepack.javaproj index 7fadf4e89ee7..10f8e1914b56 100644 --- a/src/SignalR/clients/java/signalr/messagepack/signalr.client.java.messagepack.javaproj +++ b/src/SignalR/clients/java/signalr/messagepack/signalr.client.java.messagepack.javaproj @@ -3,7 +3,7 @@ - java:signalr.messagepack + java:signalr-messagepack true false @@ -39,8 +39,8 @@ - - + + diff --git a/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/TestUtils.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/TestUtils.java index f749ca87acc4..8864aef552c6 100644 --- a/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/TestUtils.java +++ b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/TestUtils.java @@ -34,7 +34,7 @@ static HubConnection createHubConnection(String url, Transport transport, boolea .shouldSkipNegotiate(skipNegotiate); if (withMessagePack) { - builder = builder.withProtocol(new MessagePackHubProtocol()); + builder = builder.withHubProtocol(new MessagePackHubProtocol()); } return builder.build(); From 85eadc47e826bbdf8173864dadb8f6d8247b29d8 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Mon, 31 Aug 2020 14:16:39 -0700 Subject: [PATCH 14/18] Fix error --- .../java/signalr/core/signalr.client.java.core.javaproj | 4 ++++ .../messagepack/signalr.client.java.messagepack.javaproj | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/SignalR/clients/java/signalr/core/signalr.client.java.core.javaproj b/src/SignalR/clients/java/signalr/core/signalr.client.java.core.javaproj index 5ed3333dabdf..2bc876ea0ccb 100644 --- a/src/SignalR/clients/java/signalr/core/signalr.client.java.core.javaproj +++ b/src/SignalR/clients/java/signalr/core/signalr.client.java.core.javaproj @@ -32,6 +32,10 @@ + + $(GradleOptions) -PpackageVersion="$(PackageVersion)" + + diff --git a/src/SignalR/clients/java/signalr/messagepack/signalr.client.java.messagepack.javaproj b/src/SignalR/clients/java/signalr/messagepack/signalr.client.java.messagepack.javaproj index 10f8e1914b56..37e14879af24 100644 --- a/src/SignalR/clients/java/signalr/messagepack/signalr.client.java.messagepack.javaproj +++ b/src/SignalR/clients/java/signalr/messagepack/signalr.client.java.messagepack.javaproj @@ -7,8 +7,6 @@ true false - - true $(GradleOptions) -Dorg.gradle.daemon=false $(OutputPath) @@ -34,6 +32,10 @@ + + $(GradleOptions) -PpackageVersion="$(PackageVersion)" + + From 120bec6191a4e2702cec4cd8320f81b3b1e8e261 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Mon, 31 Aug 2020 15:56:10 -0700 Subject: [PATCH 15/18] Change package name --- src/SignalR/clients/java/signalr/messagepack/build.gradle | 2 +- .../java/com/microsoft/messagepack/MessagePackHubProtocol.java | 2 +- .../src/main/java/com/microsoft/messagepack/Utils.java | 2 +- .../java/com/microsoft/signalr/MessagePackHubProtocolTest.java | 2 +- .../test/src/main/java/com/microsoft/signalr/TestUtils.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/SignalR/clients/java/signalr/messagepack/build.gradle b/src/SignalR/clients/java/signalr/messagepack/build.gradle index ed467cd3ecf8..7d4d979c112f 100644 --- a/src/SignalR/clients/java/signalr/messagepack/build.gradle +++ b/src/SignalR/clients/java/signalr/messagepack/build.gradle @@ -1,4 +1,4 @@ -group 'com.microsoft.messagepack' +group 'com.microsoft.signalr.messagepack' dependencies { implementation project(':core') diff --git a/src/SignalR/clients/java/signalr/messagepack/src/main/java/com/microsoft/messagepack/MessagePackHubProtocol.java b/src/SignalR/clients/java/signalr/messagepack/src/main/java/com/microsoft/messagepack/MessagePackHubProtocol.java index f9f6ce4c6c24..e1d4a5e1009c 100644 --- a/src/SignalR/clients/java/signalr/messagepack/src/main/java/com/microsoft/messagepack/MessagePackHubProtocol.java +++ b/src/SignalR/clients/java/signalr/messagepack/src/main/java/com/microsoft/messagepack/MessagePackHubProtocol.java @@ -1,7 +1,7 @@ // 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.messagepack; +package com.microsoft.signalr.messagepack; import java.io.IOException; import java.lang.reflect.Type; diff --git a/src/SignalR/clients/java/signalr/messagepack/src/main/java/com/microsoft/messagepack/Utils.java b/src/SignalR/clients/java/signalr/messagepack/src/main/java/com/microsoft/messagepack/Utils.java index 921d55885c7c..4eba17b6fc98 100644 --- a/src/SignalR/clients/java/signalr/messagepack/src/main/java/com/microsoft/messagepack/Utils.java +++ b/src/SignalR/clients/java/signalr/messagepack/src/main/java/com/microsoft/messagepack/Utils.java @@ -1,4 +1,4 @@ -package com.microsoft.messagepack; +package com.microsoft.signalr.messagepack; import java.io.IOException; import java.lang.reflect.Array; diff --git a/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/MessagePackHubProtocolTest.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/MessagePackHubProtocolTest.java index 6b439b2ffe4c..d1533ca32841 100644 --- a/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/MessagePackHubProtocolTest.java +++ b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/MessagePackHubProtocolTest.java @@ -19,7 +19,7 @@ import org.junit.jupiter.api.Test; -import com.microsoft.messagepack.MessagePackHubProtocol; +import com.microsoft.signalr.messagepack.MessagePackHubProtocol; class MessagePackHubProtocolTest { private MessagePackHubProtocol messagePackHubProtocol = new MessagePackHubProtocol(); diff --git a/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/TestUtils.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/TestUtils.java index 8864aef552c6..bf6f7e0b61e0 100644 --- a/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/TestUtils.java +++ b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/TestUtils.java @@ -5,7 +5,7 @@ import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; -import com.microsoft.messagepack.MessagePackHubProtocol; +import com.microsoft.signalr.messagepack.MessagePackHubProtocol; class TestUtils { From 18f368c896e6ab8691f1b99668bc0961280bd7b9 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Mon, 31 Aug 2020 16:11:36 -0700 Subject: [PATCH 16/18] Fix folder structure --- .../{ => signalr}/messagepack/MessagePackHubProtocol.java | 0 .../main/java/com/microsoft/{ => signalr}/messagepack/Utils.java | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename src/SignalR/clients/java/signalr/messagepack/src/main/java/com/microsoft/{ => signalr}/messagepack/MessagePackHubProtocol.java (100%) rename src/SignalR/clients/java/signalr/messagepack/src/main/java/com/microsoft/{ => signalr}/messagepack/Utils.java (100%) diff --git a/src/SignalR/clients/java/signalr/messagepack/src/main/java/com/microsoft/messagepack/MessagePackHubProtocol.java b/src/SignalR/clients/java/signalr/messagepack/src/main/java/com/microsoft/signalr/messagepack/MessagePackHubProtocol.java similarity index 100% rename from src/SignalR/clients/java/signalr/messagepack/src/main/java/com/microsoft/messagepack/MessagePackHubProtocol.java rename to src/SignalR/clients/java/signalr/messagepack/src/main/java/com/microsoft/signalr/messagepack/MessagePackHubProtocol.java diff --git a/src/SignalR/clients/java/signalr/messagepack/src/main/java/com/microsoft/messagepack/Utils.java b/src/SignalR/clients/java/signalr/messagepack/src/main/java/com/microsoft/signalr/messagepack/Utils.java similarity index 100% rename from src/SignalR/clients/java/signalr/messagepack/src/main/java/com/microsoft/messagepack/Utils.java rename to src/SignalR/clients/java/signalr/messagepack/src/main/java/com/microsoft/signalr/messagepack/Utils.java From 7a3ca89c7b00d104eb3f969bfc4e59bc747de2d1 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Tue, 1 Sep 2020 09:37:15 -0700 Subject: [PATCH 17/18] Skip helix tests, fix .gitignore --- src/SignalR/clients/java/signalr/.gitignore | 1 - .../signalr/core/src/main/java/com/microsoft/signalr/.gitignore | 1 + .../java/signalr/test/signalr.client.java.Tests.javaproj | 2 ++ 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/.gitignore diff --git a/src/SignalR/clients/java/signalr/.gitignore b/src/SignalR/clients/java/signalr/.gitignore index c442e33f0c60..88f14c5cafbe 100644 --- a/src/SignalR/clients/java/signalr/.gitignore +++ b/src/SignalR/clients/java/signalr/.gitignore @@ -9,6 +9,5 @@ out/ *.jar .project .classpath -core/src/main/java/com/microsoft/signalr/Version.java # We need the gradle-wrapper.jar file so that others can use the gradle wrapper !gradle/wrapper/gradle-wrapper.jar diff --git a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/.gitignore b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/.gitignore new file mode 100644 index 000000000000..b74fd93836dd --- /dev/null +++ b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/.gitignore @@ -0,0 +1 @@ +Version.java \ No newline at end of file diff --git a/src/SignalR/clients/java/signalr/test/signalr.client.java.Tests.javaproj b/src/SignalR/clients/java/signalr/test/signalr.client.java.Tests.javaproj index e9761cd4c4bc..d44d8d25a0d9 100644 --- a/src/SignalR/clients/java/signalr/test/signalr.client.java.Tests.javaproj +++ b/src/SignalR/clients/java/signalr/test/signalr.client.java.Tests.javaproj @@ -6,6 +6,8 @@ true true + + false $(GradleOptions) -Dorg.gradle.daemon=false $(OutputPath) From 06b621d6f741b0d6a9a56a085ba9aec017c898f6 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Tue, 1 Sep 2020 13:20:11 -0700 Subject: [PATCH 18/18] Make TransferFormat private --- .../src/main/java/com/microsoft/signalr/HubProtocol.java | 1 - .../main/java/com/microsoft/signalr/JsonHubProtocol.java | 5 ----- .../src/main/java/com/microsoft/signalr/TransferFormat.java | 2 +- .../signalr/messagepack/MessagePackHubProtocol.java | 6 ------ .../java/com/microsoft/signalr/JsonHubProtocolTest.java | 5 ----- .../com/microsoft/signalr/MessagePackHubProtocolTest.java | 5 ----- 6 files changed, 1 insertion(+), 23 deletions(-) diff --git a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubProtocol.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubProtocol.java index bf56c8efb0e1..42471a45e168 100644 --- a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubProtocol.java +++ b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/HubProtocol.java @@ -12,7 +12,6 @@ public interface HubProtocol { String getName(); int getVersion(); - TransferFormat getTransferFormat(); /** * Creates a new list of {@link HubMessage}s. diff --git a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/JsonHubProtocol.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/JsonHubProtocol.java index 892f600ea71a..bd0348442e5a 100644 --- a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/JsonHubProtocol.java +++ b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/JsonHubProtocol.java @@ -34,11 +34,6 @@ public int getVersion() { return 1; } - @Override - public TransferFormat getTransferFormat() { - return TransferFormat.TEXT; - } - @Override public List parseMessages(ByteBuffer payload, InvocationBinder binder) { String payloadStr; diff --git a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/TransferFormat.java b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/TransferFormat.java index 413404bea612..59a9dd588967 100644 --- a/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/TransferFormat.java +++ b/src/SignalR/clients/java/signalr/core/src/main/java/com/microsoft/signalr/TransferFormat.java @@ -3,7 +3,7 @@ package com.microsoft.signalr; -public enum TransferFormat { +enum TransferFormat { TEXT, BINARY } diff --git a/src/SignalR/clients/java/signalr/messagepack/src/main/java/com/microsoft/signalr/messagepack/MessagePackHubProtocol.java b/src/SignalR/clients/java/signalr/messagepack/src/main/java/com/microsoft/signalr/messagepack/MessagePackHubProtocol.java index e1d4a5e1009c..ebd2047331a2 100644 --- a/src/SignalR/clients/java/signalr/messagepack/src/main/java/com/microsoft/signalr/messagepack/MessagePackHubProtocol.java +++ b/src/SignalR/clients/java/signalr/messagepack/src/main/java/com/microsoft/signalr/messagepack/MessagePackHubProtocol.java @@ -38,7 +38,6 @@ import com.microsoft.signalr.StreamBindingFailureMessage; import com.microsoft.signalr.StreamInvocationMessage; import com.microsoft.signalr.StreamItem; -import com.microsoft.signalr.TransferFormat; public class MessagePackHubProtocol implements HubProtocol { @@ -59,11 +58,6 @@ public int getVersion() { return 1; } - @Override - public TransferFormat getTransferFormat() { - return TransferFormat.BINARY; - } - @Override public List parseMessages(ByteBuffer payload, InvocationBinder binder) { if (payload.remaining() == 0) { diff --git a/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/JsonHubProtocolTest.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/JsonHubProtocolTest.java index 1b707d6a53e6..c77fa1509391 100644 --- a/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/JsonHubProtocolTest.java +++ b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/JsonHubProtocolTest.java @@ -26,11 +26,6 @@ public void checkVersionNumber() { assertEquals(1, jsonHubProtocol.getVersion()); } - @Test - public void checkTransferFormat() { - assertEquals(TransferFormat.TEXT, jsonHubProtocol.getTransferFormat()); - } - @Test public void verifyWriteMessage() { InvocationMessage invocationMessage = new InvocationMessage(null, null, "test", new Object[] {"42"}, null); diff --git a/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/MessagePackHubProtocolTest.java b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/MessagePackHubProtocolTest.java index d1533ca32841..ad8cca19fcd2 100644 --- a/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/MessagePackHubProtocolTest.java +++ b/src/SignalR/clients/java/signalr/test/src/main/java/com/microsoft/signalr/MessagePackHubProtocolTest.java @@ -33,11 +33,6 @@ public void checkProtocolName() { public void checkVersionNumber() { assertEquals(1, messagePackHubProtocol.getVersion()); } - - @Test - public void checkTransferFormat() { - assertEquals(TransferFormat.BINARY, messagePackHubProtocol.getTransferFormat()); - } @Test public void verifyWriteInvocationMessage() {