From aca9bffd2308f0f7ccd7434b000b1ee64e8fdd57 Mon Sep 17 00:00:00 2001
From: Mikael Mengistu <mikaelm12@users.noreply.github.com>
Date: Thu, 31 Jan 2019 22:45:28 -0800
Subject: [PATCH] Java Client Small Clean up Items(#6969)

---
 .../java/com/microsoft/signalr/HubConnection.java     |  3 +--
 .../com/microsoft/signalr/OkHttpWebSocketWrapper.java |  2 +-
 .../java/com/microsoft/signalr/HubConnectionTest.java |  4 ++--
 .../test/java/com/microsoft/signalr/sample/Chat.java  | 11 ++++-------
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
index 0bb3c22db5..d8c9b931ed 100644
--- a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
+++ b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
@@ -249,10 +249,9 @@ public class HubConnection {
 
             if (negotiateResponse.getAccessToken() != null) {
                 this.accessTokenProvider = Single.just(negotiateResponse.getAccessToken());
-                String token = "";
                 // We know the Single is non blocking in this case
                 // It's fine to call blockingGet() on it.
-                token = this.accessTokenProvider.blockingGet();
+                String token = this.accessTokenProvider.blockingGet();
                 this.headers.put("Authorization", "Bearer " + token);
             }
 
diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/OkHttpWebSocketWrapper.java b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/OkHttpWebSocketWrapper.java
index 0460061ec9..7dfa1706ad 100644
--- a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/OkHttpWebSocketWrapper.java
+++ b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/OkHttpWebSocketWrapper.java
@@ -43,7 +43,7 @@ class OkHttpWebSocketWrapper extends WebSocketWrapper {
         }
 
         Request request = new Request.Builder()
-            .url(url.toString())
+            .url(url)
             .headers(headerBuilder.build())
             .build();
 
diff --git a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/HubConnectionTest.java b/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/HubConnectionTest.java
index 894edf323d..a5590d0381 100644
--- a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/HubConnectionTest.java
+++ b/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/HubConnectionTest.java
@@ -1288,7 +1288,7 @@ class HubConnectionTest {
     }
 
     @Test
-    public void connectionTimesOutIfServerDoesNotSendMessage() throws InterruptedException, ExecutionException, TimeoutException {
+    public void connectionTimesOutIfServerDoesNotSendMessage() {
         HubConnection hubConnection = TestUtils.createHubConnection("http://example.com");
         hubConnection.setServerTimeout(1);
         hubConnection.setTickRate(1);
@@ -1373,7 +1373,7 @@ class HubConnectionTest {
     }
 
     @Test
-    public void hubConnectionCanBeStartedAfterBeingStopped() throws Exception {
+    public void hubConnectionCanBeStartedAfterBeingStopped() {
         MockTransport transport = new MockTransport();
         HubConnection hubConnection = HubConnectionBuilder
                 .create("http://example.com")
diff --git a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/sample/Chat.java b/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/sample/Chat.java
index 0acb379433..bd617fe88e 100644
--- a/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/sample/Chat.java
+++ b/src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/sample/Chat.java
@@ -15,14 +15,11 @@ public class Chat {
         Scanner reader = new Scanner(System.in);  // Reading from System.in
         String input = reader.nextLine();
 
-        System.out.print("Enter your name:");
-        String enteredName = reader.nextLine();
-
         HubConnection hubConnection = HubConnectionBuilder.create(input).build();
 
-        hubConnection.on("Send", (name, message) -> {
-            System.out.println(name + ": " + message);
-        }, String.class, String.class);
+        hubConnection.on("Send", (message) -> {
+            System.out.println(message);
+        }, String.class);
 
         hubConnection.onClosed((ex) -> {
             if (ex != null) {
@@ -37,7 +34,7 @@ public class Chat {
         while (!message.equals("leave")) {
             // Scans the next token of the input as an int.
             message = reader.nextLine();
-            hubConnection.send("Send", enteredName, message);
+            hubConnection.send("Send", message);
         }
 
         hubConnection.stop();