From 3e53533db3b097adae467cdeeec17361e3823245 Mon Sep 17 00:00:00 2001 From: Mikael Mengistu Date: Mon, 16 Jul 2018 14:18:55 -0700 Subject: [PATCH] Adding HubConnection State Enum (#2627) --- clients/java/signalr/src/main/java/HubConnection.java | 11 +++++++---- .../signalr/src/main/java/HubConnectionState.java | 7 +++++++ .../java/signalr/src/test/java/HubConnectionTest.java | 4 ++-- 3 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 clients/java/signalr/src/main/java/HubConnectionState.java diff --git a/clients/java/signalr/src/main/java/HubConnection.java b/clients/java/signalr/src/main/java/HubConnection.java index 7e0f6c5852..30eeec1fc9 100644 --- a/clients/java/signalr/src/main/java/HubConnection.java +++ b/clients/java/signalr/src/main/java/HubConnection.java @@ -15,8 +15,7 @@ public class HubConnection { private CallbackMap handlers = new CallbackMap(); private HubProtocol protocol; private Gson gson = new Gson(); - - public Boolean connected = false; + private HubConnectionState connectionState = HubConnectionState.DISCONNECTED; public HubConnection(String url, Transport transport){ this.url = url; @@ -68,15 +67,19 @@ public class HubConnection { this(url, null); } + public HubConnectionState getConnectionState() { + return connectionState; + } + public void start() throws InterruptedException { transport.setOnReceive(this.callback); transport.start(); - connected = true; + connectionState = HubConnectionState.CONNECTED; } public void stop(){ transport.stop(); - connected = false; + connectionState = HubConnectionState.DISCONNECTED; } public void send(String method, Object... args) throws Exception { diff --git a/clients/java/signalr/src/main/java/HubConnectionState.java b/clients/java/signalr/src/main/java/HubConnectionState.java new file mode 100644 index 0000000000..6c45a93e61 --- /dev/null +++ b/clients/java/signalr/src/main/java/HubConnectionState.java @@ -0,0 +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. + +public enum HubConnectionState { + CONNECTED, + DISCONNECTED, +} \ No newline at end of file diff --git a/clients/java/signalr/src/test/java/HubConnectionTest.java b/clients/java/signalr/src/test/java/HubConnectionTest.java index ce502183ea..77fc1f7f39 100644 --- a/clients/java/signalr/src/test/java/HubConnectionTest.java +++ b/clients/java/signalr/src/test/java/HubConnectionTest.java @@ -13,10 +13,10 @@ public class HubConnectionTest { Transport mockTransport = new MockEchoTransport(); HubConnection hubConnection = new HubConnection("http://example.com", mockTransport); hubConnection.start(); - assertTrue(hubConnection.connected); + assertEquals(HubConnectionState.CONNECTED, hubConnection.getConnectionState()); hubConnection.stop(); - assertFalse(hubConnection.connected); + assertEquals(HubConnectionState.DISCONNECTED, hubConnection.getConnectionState()); } @Test