From c9104d4932b85ab7dfa784f3314421584a3882e1 Mon Sep 17 00:00:00 2001 From: Mikael Mengistu Date: Wed, 8 Aug 2018 16:32:46 -0600 Subject: [PATCH] Move Java client into com.microsoft.aspnet.signalr (#2763) --- .../microsoft/aspnet/signalr}/Action.java | 2 ++ .../microsoft/aspnet/signalr}/Action1.java | 2 ++ .../microsoft/aspnet/signalr}/Action2.java | 2 ++ .../microsoft/aspnet/signalr}/Action3.java | 2 ++ .../microsoft/aspnet/signalr}/Action4.java | 2 ++ .../microsoft/aspnet/signalr}/Action5.java | 2 ++ .../microsoft/aspnet/signalr}/Action6.java | 2 ++ .../microsoft/aspnet/signalr}/Action7.java | 2 ++ .../microsoft/aspnet/signalr}/Action8.java | 2 ++ .../microsoft/aspnet/signalr}/ActionBase.java | 2 ++ .../aspnet/signalr}/CallbackMap.java | 2 ++ .../microsoft/aspnet/signalr}/Chat.java | 4 +++ .../aspnet/signalr}/ConsoleLogger.java | 2 ++ .../aspnet/signalr}/HandshakeProtocol.java | 2 ++ .../signalr}/HandshakeRequestMessage.java | 2 ++ .../signalr}/HandshakeResponseMessage.java | 2 ++ .../aspnet/signalr}/HubConnection.java | 3 ++- .../aspnet/signalr}/HubConnectionState.java | 2 ++ .../microsoft/aspnet/signalr}/HubMessage.java | 4 ++- .../aspnet/signalr}/HubMessageType.java | 2 ++ .../aspnet/signalr}/HubProtocol.java | 2 ++ .../aspnet/signalr}/InvocationMessage.java | 4 ++- .../aspnet/signalr}/JsonHubProtocol.java | 2 ++ .../microsoft/aspnet/signalr}/LogLevel.java | 2 ++ .../microsoft/aspnet/signalr}/Logger.java | 2 ++ .../microsoft/aspnet/signalr}/NullLogger.java | 2 ++ .../aspnet/signalr}/OnReceiveCallBack.java | 2 +- .../aspnet/signalr}/PingMessage.java | 4 ++- .../aspnet/signalr}/Subscription.java | 3 +++ .../aspnet/signalr}/TransferFormat.java | 2 ++ .../microsoft/aspnet/signalr}/Transport.java | 2 ++ .../aspnet/signalr}/WebSocketTransport.java | 5 ++-- .../src/test/java/HandshakeProtocolTest.java | 3 +++ .../src/test/java/HubConnectionTest.java | 4 +-- .../src/test/java/JsonHubProtocolTest.java | 25 ++++++++++--------- .../src/test/java/WebSocketTransportTest.java | 9 ++++--- 36 files changed, 93 insertions(+), 25 deletions(-) rename clients/java/signalr/src/main/java/{ => com/microsoft/aspnet/signalr}/Action.java (84%) rename clients/java/signalr/src/main/java/{ => com/microsoft/aspnet/signalr}/Action1.java (85%) rename clients/java/signalr/src/main/java/{ => com/microsoft/aspnet/signalr}/Action2.java (86%) rename clients/java/signalr/src/main/java/{ => com/microsoft/aspnet/signalr}/Action3.java (86%) rename clients/java/signalr/src/main/java/{ => com/microsoft/aspnet/signalr}/Action4.java (87%) rename clients/java/signalr/src/main/java/{ => com/microsoft/aspnet/signalr}/Action5.java (88%) rename clients/java/signalr/src/main/java/{ => com/microsoft/aspnet/signalr}/Action6.java (88%) rename clients/java/signalr/src/main/java/{ => com/microsoft/aspnet/signalr}/Action7.java (89%) rename clients/java/signalr/src/main/java/{ => com/microsoft/aspnet/signalr}/Action8.java (89%) rename clients/java/signalr/src/main/java/{ => com/microsoft/aspnet/signalr}/ActionBase.java (85%) rename clients/java/signalr/src/main/java/{ => com/microsoft/aspnet/signalr}/CallbackMap.java (96%) rename clients/java/signalr/src/main/java/{ => com/microsoft/aspnet/signalr}/Chat.java (92%) rename clients/java/signalr/src/main/java/{ => com/microsoft/aspnet/signalr}/ConsoleLogger.java (97%) rename clients/java/signalr/src/main/java/{ => com/microsoft/aspnet/signalr}/HandshakeProtocol.java (94%) rename clients/java/signalr/src/main/java/{ => com/microsoft/aspnet/signalr}/HandshakeRequestMessage.java (90%) rename clients/java/signalr/src/main/java/{ => com/microsoft/aspnet/signalr}/HandshakeResponseMessage.java (90%) rename clients/java/signalr/src/main/java/{ => com/microsoft/aspnet/signalr}/HubConnection.java (99%) rename clients/java/signalr/src/main/java/{ => com/microsoft/aspnet/signalr}/HubConnectionState.java (85%) rename clients/java/signalr/src/main/java/{ => com/microsoft/aspnet/signalr}/HubMessage.java (72%) rename clients/java/signalr/src/main/java/{ => com/microsoft/aspnet/signalr}/HubMessageType.java (91%) rename clients/java/signalr/src/main/java/{ => com/microsoft/aspnet/signalr}/HubProtocol.java (95%) rename clients/java/signalr/src/main/java/{ => com/microsoft/aspnet/signalr}/InvocationMessage.java (92%) rename clients/java/signalr/src/main/java/{ => com/microsoft/aspnet/signalr}/JsonHubProtocol.java (98%) rename clients/java/signalr/src/main/java/{ => com/microsoft/aspnet/signalr}/LogLevel.java (90%) rename clients/java/signalr/src/main/java/{ => com/microsoft/aspnet/signalr}/Logger.java (89%) rename clients/java/signalr/src/main/java/{ => com/microsoft/aspnet/signalr}/NullLogger.java (90%) rename clients/java/signalr/src/main/java/{ => com/microsoft/aspnet/signalr}/OnReceiveCallBack.java (87%) rename clients/java/signalr/src/main/java/{ => com/microsoft/aspnet/signalr}/PingMessage.java (79%) rename clients/java/signalr/src/main/java/{ => com/microsoft/aspnet/signalr}/Subscription.java (94%) rename clients/java/signalr/src/main/java/{ => com/microsoft/aspnet/signalr}/TransferFormat.java (84%) rename clients/java/signalr/src/main/java/{ => com/microsoft/aspnet/signalr}/Transport.java (91%) rename clients/java/signalr/src/main/java/{ => com/microsoft/aspnet/signalr}/WebSocketTransport.java (98%) diff --git a/clients/java/signalr/src/main/java/Action.java b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Action.java similarity index 84% rename from clients/java/signalr/src/main/java/Action.java rename to clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Action.java index 8d41276eb6..09c45da9a6 100644 --- a/clients/java/signalr/src/main/java/Action.java +++ b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Action.java @@ -1,6 +1,8 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +package com.microsoft.aspnet.signalr; + public interface Action { void invoke(); } diff --git a/clients/java/signalr/src/main/java/Action1.java b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Action1.java similarity index 85% rename from clients/java/signalr/src/main/java/Action1.java rename to clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Action1.java index ae4c4d7cbb..6cd1fd7230 100644 --- a/clients/java/signalr/src/main/java/Action1.java +++ b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Action1.java @@ -1,6 +1,8 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +package com.microsoft.aspnet.signalr; + public interface Action1 { void invoke(T1 param1); } diff --git a/clients/java/signalr/src/main/java/Action2.java b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Action2.java similarity index 86% rename from clients/java/signalr/src/main/java/Action2.java rename to clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Action2.java index 41ab3b123f..6f4d74080c 100644 --- a/clients/java/signalr/src/main/java/Action2.java +++ b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Action2.java @@ -1,6 +1,8 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +package com.microsoft.aspnet.signalr; + public interface Action2 { void invoke(T1 param1, T2 param2); } diff --git a/clients/java/signalr/src/main/java/Action3.java b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Action3.java similarity index 86% rename from clients/java/signalr/src/main/java/Action3.java rename to clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Action3.java index b79e6449df..3743dae08c 100644 --- a/clients/java/signalr/src/main/java/Action3.java +++ b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Action3.java @@ -1,6 +1,8 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +package com.microsoft.aspnet.signalr; + public interface Action3 { void invoke(T1 param1, T2 param2, T3 param3); } diff --git a/clients/java/signalr/src/main/java/Action4.java b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Action4.java similarity index 87% rename from clients/java/signalr/src/main/java/Action4.java rename to clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Action4.java index 34665d8fd6..918e9c7568 100644 --- a/clients/java/signalr/src/main/java/Action4.java +++ b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Action4.java @@ -1,6 +1,8 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +package com.microsoft.aspnet.signalr; + public interface Action4 { void invoke(T1 param1, T2 param2, T3 param3, T4 param4); } diff --git a/clients/java/signalr/src/main/java/Action5.java b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Action5.java similarity index 88% rename from clients/java/signalr/src/main/java/Action5.java rename to clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Action5.java index 446aa52132..8f73f053de 100644 --- a/clients/java/signalr/src/main/java/Action5.java +++ b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Action5.java @@ -1,6 +1,8 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +package com.microsoft.aspnet.signalr; + public interface Action5 { void invoke(T1 param1, T2 param2, T3 param3, T4 param4, T5 param5); } diff --git a/clients/java/signalr/src/main/java/Action6.java b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Action6.java similarity index 88% rename from clients/java/signalr/src/main/java/Action6.java rename to clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Action6.java index 2aca2c1d64..54185b4040 100644 --- a/clients/java/signalr/src/main/java/Action6.java +++ b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Action6.java @@ -1,6 +1,8 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +package com.microsoft.aspnet.signalr; + public interface Action6 { void invoke(T1 param1, T2 param2, T3 param3, T4 param4, T5 param5, T6 param6); } diff --git a/clients/java/signalr/src/main/java/Action7.java b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Action7.java similarity index 89% rename from clients/java/signalr/src/main/java/Action7.java rename to clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Action7.java index a835b2c686..8484ca3a0e 100644 --- a/clients/java/signalr/src/main/java/Action7.java +++ b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Action7.java @@ -1,6 +1,8 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +package com.microsoft.aspnet.signalr; + public interface Action7 { void invoke(T1 param1, T2 param2, T3 param3, T4 param4, T5 param5, T6 param6, T7 param7); } diff --git a/clients/java/signalr/src/main/java/Action8.java b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Action8.java similarity index 89% rename from clients/java/signalr/src/main/java/Action8.java rename to clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Action8.java index 769d66b343..700f4933d8 100644 --- a/clients/java/signalr/src/main/java/Action8.java +++ b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Action8.java @@ -1,6 +1,8 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +package com.microsoft.aspnet.signalr; + public interface Action8 { void invoke(T1 param1, T2 param2, T3 param3, T4 param4, T5 param5, T6 param6, T7 param7, T8 param8); } diff --git a/clients/java/signalr/src/main/java/ActionBase.java b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/ActionBase.java similarity index 85% rename from clients/java/signalr/src/main/java/ActionBase.java rename to clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/ActionBase.java index 09b1bc7cfb..bb95ca6515 100644 --- a/clients/java/signalr/src/main/java/ActionBase.java +++ b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/ActionBase.java @@ -1,6 +1,8 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +package com.microsoft.aspnet.signalr; + public interface ActionBase { void invoke(Object ... params); } diff --git a/clients/java/signalr/src/main/java/CallbackMap.java b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/CallbackMap.java similarity index 96% rename from clients/java/signalr/src/main/java/CallbackMap.java rename to clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/CallbackMap.java index ec4bf817d0..3e8d8c923c 100644 --- a/clients/java/signalr/src/main/java/CallbackMap.java +++ b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/CallbackMap.java @@ -1,6 +1,8 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +package com.microsoft.aspnet.signalr; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/clients/java/signalr/src/main/java/Chat.java b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Chat.java similarity index 92% rename from clients/java/signalr/src/main/java/Chat.java rename to clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Chat.java index ca7c4dc074..bf1c33efc5 100644 --- a/clients/java/signalr/src/main/java/Chat.java +++ b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Chat.java @@ -1,6 +1,10 @@ // 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.aspnet.signalr; + +import com.microsoft.aspnet.signalr.HubConnection; + import java.util.Scanner; public class Chat { diff --git a/clients/java/signalr/src/main/java/ConsoleLogger.java b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/ConsoleLogger.java similarity index 97% rename from clients/java/signalr/src/main/java/ConsoleLogger.java rename to clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/ConsoleLogger.java index f74f0080c9..a79ff1ad52 100644 --- a/clients/java/signalr/src/main/java/ConsoleLogger.java +++ b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/ConsoleLogger.java @@ -1,6 +1,8 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +package com.microsoft.aspnet.signalr; + public class ConsoleLogger implements Logger { private LogLevel logLevel; public ConsoleLogger(LogLevel logLevel) { diff --git a/clients/java/signalr/src/main/java/HandshakeProtocol.java b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/HandshakeProtocol.java similarity index 94% rename from clients/java/signalr/src/main/java/HandshakeProtocol.java rename to clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/HandshakeProtocol.java index 322625ce9e..35282fae8f 100644 --- a/clients/java/signalr/src/main/java/HandshakeProtocol.java +++ b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/HandshakeProtocol.java @@ -1,6 +1,8 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +package com.microsoft.aspnet.signalr; + import com.google.gson.Gson; public class HandshakeProtocol { diff --git a/clients/java/signalr/src/main/java/HandshakeRequestMessage.java b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/HandshakeRequestMessage.java similarity index 90% rename from clients/java/signalr/src/main/java/HandshakeRequestMessage.java rename to clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/HandshakeRequestMessage.java index 370de4e513..7786bc229a 100644 --- a/clients/java/signalr/src/main/java/HandshakeRequestMessage.java +++ b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/HandshakeRequestMessage.java @@ -1,6 +1,8 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +package com.microsoft.aspnet.signalr; + public class HandshakeRequestMessage { String protocol; int version; diff --git a/clients/java/signalr/src/main/java/HandshakeResponseMessage.java b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/HandshakeResponseMessage.java similarity index 90% rename from clients/java/signalr/src/main/java/HandshakeResponseMessage.java rename to clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/HandshakeResponseMessage.java index 8b40a79283..cb2eb6c3a7 100644 --- a/clients/java/signalr/src/main/java/HandshakeResponseMessage.java +++ b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/HandshakeResponseMessage.java @@ -1,6 +1,8 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +package com.microsoft.aspnet.signalr; + public class HandshakeResponseMessage { public String error; diff --git a/clients/java/signalr/src/main/java/HubConnection.java b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/HubConnection.java similarity index 99% rename from clients/java/signalr/src/main/java/HubConnection.java rename to clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/HubConnection.java index e3eb1bec97..05984de5f3 100644 --- a/clients/java/signalr/src/main/java/HubConnection.java +++ b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/HubConnection.java @@ -1,9 +1,10 @@ // 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.aspnet.signalr; + import com.google.gson.Gson; import com.google.gson.JsonArray; - import java.net.URISyntaxException; import java.util.ArrayList; import java.util.List; diff --git a/clients/java/signalr/src/main/java/HubConnectionState.java b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/HubConnectionState.java similarity index 85% rename from clients/java/signalr/src/main/java/HubConnectionState.java rename to clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/HubConnectionState.java index 6c45a93e61..2bf62ffa5a 100644 --- a/clients/java/signalr/src/main/java/HubConnectionState.java +++ b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/HubConnectionState.java @@ -1,6 +1,8 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +package com.microsoft.aspnet.signalr; + public enum HubConnectionState { CONNECTED, DISCONNECTED, diff --git a/clients/java/signalr/src/main/java/HubMessage.java b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/HubMessage.java similarity index 72% rename from clients/java/signalr/src/main/java/HubMessage.java rename to clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/HubMessage.java index ca4b9a788f..9e8f887996 100644 --- a/clients/java/signalr/src/main/java/HubMessage.java +++ b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/HubMessage.java @@ -1,9 +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.aspnet.signalr; + /** * A base class for hub messages. */ public abstract class HubMessage { - abstract HubMessageType getMessageType(); + public abstract HubMessageType getMessageType(); } diff --git a/clients/java/signalr/src/main/java/HubMessageType.java b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/HubMessageType.java similarity index 91% rename from clients/java/signalr/src/main/java/HubMessageType.java rename to clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/HubMessageType.java index d18e3b9f6b..a02075858a 100644 --- a/clients/java/signalr/src/main/java/HubMessageType.java +++ b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/HubMessageType.java @@ -1,6 +1,8 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +package com.microsoft.aspnet.signalr; + public enum HubMessageType { INVOCATION(1), STREAM_ITEM(2), diff --git a/clients/java/signalr/src/main/java/HubProtocol.java b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/HubProtocol.java similarity index 95% rename from clients/java/signalr/src/main/java/HubProtocol.java rename to clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/HubProtocol.java index 2869d9ac4a..0ee6eeb9cb 100644 --- a/clients/java/signalr/src/main/java/HubProtocol.java +++ b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/HubProtocol.java @@ -1,6 +1,8 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +package com.microsoft.aspnet.signalr; + /** * A protocol abstraction for communicating with SignalR hubs. */ diff --git a/clients/java/signalr/src/main/java/InvocationMessage.java b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/InvocationMessage.java similarity index 92% rename from clients/java/signalr/src/main/java/InvocationMessage.java rename to clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/InvocationMessage.java index 635067ff2e..4a0ed52ea8 100644 --- a/clients/java/signalr/src/main/java/InvocationMessage.java +++ b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/InvocationMessage.java @@ -1,6 +1,8 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +package com.microsoft.aspnet.signalr; + public class InvocationMessage extends HubMessage { int type = HubMessageType.INVOCATION.value; String invocationId; @@ -37,7 +39,7 @@ public class InvocationMessage extends HubMessage { } @Override - HubMessageType getMessageType() { + public HubMessageType getMessageType() { return HubMessageType.INVOCATION; } } diff --git a/clients/java/signalr/src/main/java/JsonHubProtocol.java b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/JsonHubProtocol.java similarity index 98% rename from clients/java/signalr/src/main/java/JsonHubProtocol.java rename to clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/JsonHubProtocol.java index f80c57912b..4bee9e089c 100644 --- a/clients/java/signalr/src/main/java/JsonHubProtocol.java +++ b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/JsonHubProtocol.java @@ -1,6 +1,8 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +package com.microsoft.aspnet.signalr; + import com.google.gson.Gson; import com.google.gson.JsonElement; import com.google.gson.JsonObject; diff --git a/clients/java/signalr/src/main/java/LogLevel.java b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/LogLevel.java similarity index 90% rename from clients/java/signalr/src/main/java/LogLevel.java rename to clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/LogLevel.java index 72a5dac734..9541e6d891 100644 --- a/clients/java/signalr/src/main/java/LogLevel.java +++ b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/LogLevel.java @@ -1,6 +1,8 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +package com.microsoft.aspnet.signalr; + public enum LogLevel { Trace(0), Debug(1), diff --git a/clients/java/signalr/src/main/java/Logger.java b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Logger.java similarity index 89% rename from clients/java/signalr/src/main/java/Logger.java rename to clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Logger.java index 8e2fee7d4b..db918f51b9 100644 --- a/clients/java/signalr/src/main/java/Logger.java +++ b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Logger.java @@ -1,6 +1,8 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +package com.microsoft.aspnet.signalr; + public interface Logger { void log(LogLevel logLevel, String message); void log(LogLevel logLevel, String formattedMessage, Object ... args); diff --git a/clients/java/signalr/src/main/java/NullLogger.java b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/NullLogger.java similarity index 90% rename from clients/java/signalr/src/main/java/NullLogger.java rename to clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/NullLogger.java index 38eb818fad..b308931ce4 100644 --- a/clients/java/signalr/src/main/java/NullLogger.java +++ b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/NullLogger.java @@ -1,6 +1,8 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +package com.microsoft.aspnet.signalr; + public class NullLogger implements Logger { @Override public void log(LogLevel logLevel, String message) { } diff --git a/clients/java/signalr/src/main/java/OnReceiveCallBack.java b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/OnReceiveCallBack.java similarity index 87% rename from clients/java/signalr/src/main/java/OnReceiveCallBack.java rename to clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/OnReceiveCallBack.java index 6d971d1955..168c858c26 100644 --- a/clients/java/signalr/src/main/java/OnReceiveCallBack.java +++ b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/OnReceiveCallBack.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. -import com.google.gson.JsonObject; +package com.microsoft.aspnet.signalr; public interface OnReceiveCallBack { void invoke(String message) throws Exception; diff --git a/clients/java/signalr/src/main/java/PingMessage.java b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/PingMessage.java similarity index 79% rename from clients/java/signalr/src/main/java/PingMessage.java rename to clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/PingMessage.java index 6bf9be7753..de4d861894 100644 --- a/clients/java/signalr/src/main/java/PingMessage.java +++ b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/PingMessage.java @@ -1,12 +1,14 @@ // 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.aspnet.signalr; + public class PingMessage extends HubMessage { int type = HubMessageType.PING.value; @Override - HubMessageType getMessageType() { + public HubMessageType getMessageType() { return HubMessageType.PING; } } diff --git a/clients/java/signalr/src/main/java/Subscription.java b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Subscription.java similarity index 94% rename from clients/java/signalr/src/main/java/Subscription.java rename to clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Subscription.java index f036d71e6d..f4a3e7d035 100644 --- a/clients/java/signalr/src/main/java/Subscription.java +++ b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Subscription.java @@ -1,12 +1,15 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +package com.microsoft.aspnet.signalr; + import java.util.List; public class Subscription { private CallbackMap handlers; private ActionBase action; private String target; + public Subscription(CallbackMap handlers, ActionBase action, String target) { this.handlers = handlers; this.action = action; diff --git a/clients/java/signalr/src/main/java/TransferFormat.java b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/TransferFormat.java similarity index 84% rename from clients/java/signalr/src/main/java/TransferFormat.java rename to clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/TransferFormat.java index 8813920de6..32b8956bfb 100644 --- a/clients/java/signalr/src/main/java/TransferFormat.java +++ b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/TransferFormat.java @@ -1,6 +1,8 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +package com.microsoft.aspnet.signalr; + public enum TransferFormat { Text, Binary diff --git a/clients/java/signalr/src/main/java/Transport.java b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Transport.java similarity index 91% rename from clients/java/signalr/src/main/java/Transport.java rename to clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Transport.java index 240675dfe5..d8356ae949 100644 --- a/clients/java/signalr/src/main/java/Transport.java +++ b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Transport.java @@ -1,6 +1,8 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +package com.microsoft.aspnet.signalr; + public interface Transport { void start() throws InterruptedException; void send(String message) throws Exception; diff --git a/clients/java/signalr/src/main/java/WebSocketTransport.java b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/WebSocketTransport.java similarity index 98% rename from clients/java/signalr/src/main/java/WebSocketTransport.java rename to clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/WebSocketTransport.java index 0089794d02..40ce5beb7e 100644 --- a/clients/java/signalr/src/main/java/WebSocketTransport.java +++ b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/WebSocketTransport.java @@ -1,11 +1,12 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -import org.java_websocket.client.WebSocketClient; -import org.java_websocket.handshake.ServerHandshake; +package com.microsoft.aspnet.signalr; import java.net.URI; import java.net.URISyntaxException; +import org.java_websocket.client.WebSocketClient; +import org.java_websocket.handshake.ServerHandshake; public class WebSocketTransport implements Transport { private WebSocketClient webSocketClient; diff --git a/clients/java/signalr/src/test/java/HandshakeProtocolTest.java b/clients/java/signalr/src/test/java/HandshakeProtocolTest.java index ae8f960242..f41ded8d90 100644 --- a/clients/java/signalr/src/test/java/HandshakeProtocolTest.java +++ b/clients/java/signalr/src/test/java/HandshakeProtocolTest.java @@ -1,6 +1,9 @@ // 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. +import com.microsoft.aspnet.signalr.HandshakeProtocol; +import com.microsoft.aspnet.signalr.HandshakeRequestMessage; +import com.microsoft.aspnet.signalr.HandshakeResponseMessage; import org.junit.Test; import static org.junit.Assert.*; diff --git a/clients/java/signalr/src/test/java/HubConnectionTest.java b/clients/java/signalr/src/test/java/HubConnectionTest.java index 55f30cae70..617871d443 100644 --- a/clients/java/signalr/src/test/java/HubConnectionTest.java +++ b/clients/java/signalr/src/test/java/HubConnectionTest.java @@ -1,10 +1,10 @@ // 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. -import org.junit.Test; - +import com.microsoft.aspnet.signalr.*; import java.util.ArrayList; import java.util.concurrent.atomic.AtomicReference; +import org.junit.Test; import static org.junit.Assert.*; diff --git a/clients/java/signalr/src/test/java/JsonHubProtocolTest.java b/clients/java/signalr/src/test/java/JsonHubProtocolTest.java index 4d6e2fd6d1..31c349e8e5 100644 --- a/clients/java/signalr/src/test/java/JsonHubProtocolTest.java +++ b/clients/java/signalr/src/test/java/JsonHubProtocolTest.java @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. import com.google.gson.JsonArray; +import com.microsoft.aspnet.signalr.*; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -57,10 +58,10 @@ public class JsonHubProtocolTest { //We can safely cast here because we know that it's an invocation message. InvocationMessage invocationMessage = (InvocationMessage) messages[0]; - assertEquals("test", invocationMessage.target); - assertEquals(null, invocationMessage.invocationId); + assertEquals("test", invocationMessage.getTarget()); + assertEquals(null, invocationMessage.getInvocationId()); - JsonArray messageResult = (JsonArray) invocationMessage.arguments[0]; + JsonArray messageResult = (JsonArray) invocationMessage.getArguments()[0]; assertEquals(42, messageResult.getAsInt()); } @@ -95,9 +96,9 @@ public class JsonHubProtocolTest { //Now that we know we have an invocation message we can cast the hubMessage. InvocationMessage invocationMessage = (InvocationMessage) messages[0]; - assertEquals("one", invocationMessage.target); - assertEquals(null, invocationMessage.invocationId); - JsonArray messageResult = (JsonArray) invocationMessage.arguments[0]; + assertEquals("one", invocationMessage.getTarget()); + assertEquals(null, invocationMessage.getInvocationId()); + JsonArray messageResult = (JsonArray) invocationMessage.getArguments()[0]; assertEquals(42, messageResult.getAsInt()); // Check the second message @@ -106,9 +107,9 @@ public class JsonHubProtocolTest { //Now that we know we have an invocation message we can cast the hubMessage. InvocationMessage invocationMessage2 = (InvocationMessage) messages[1]; - assertEquals("two", invocationMessage2.target); - assertEquals(null, invocationMessage2.invocationId); - JsonArray secondMessageResult = (JsonArray) invocationMessage2.arguments[0]; + assertEquals("two", invocationMessage2.getTarget()); + assertEquals(null, invocationMessage2.getInvocationId()); + JsonArray secondMessageResult = (JsonArray) invocationMessage2.getArguments()[0]; assertEquals(43, secondMessageResult.getAsInt()); } @@ -121,9 +122,9 @@ public class JsonHubProtocolTest { assertEquals(HubMessageType.INVOCATION, messages[0].getMessageType()); InvocationMessage message = (InvocationMessage)messages[0]; - assertEquals("test", message.target); - assertEquals(null, message.invocationId); - JsonArray messageResult = ((JsonArray) message.arguments[0]); + assertEquals("test", message.getTarget()); + assertEquals(null, message.getInvocationId()); + JsonArray messageResult = ((JsonArray) message.getArguments()[0]); assertEquals(42, messageResult.get(0).getAsInt()); assertEquals(24, messageResult.get(1).getAsInt()); } diff --git a/clients/java/signalr/src/test/java/WebSocketTransportTest.java b/clients/java/signalr/src/test/java/WebSocketTransportTest.java index bb550d94dd..ba251c9a9f 100644 --- a/clients/java/signalr/src/test/java/WebSocketTransportTest.java +++ b/clients/java/signalr/src/test/java/WebSocketTransportTest.java @@ -1,13 +1,14 @@ // 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. -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; - +import com.microsoft.aspnet.signalr.NullLogger; +import com.microsoft.aspnet.signalr.WebSocketTransport; import java.net.URISyntaxException; import java.util.Arrays; import java.util.Collection; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; import static org.junit.Assert.*;