Remove TypeReference, make Protocols private again

Author: wtgodbe

src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java

@@ -57,13 +57,22 @@ HttpHubConnectionBuilder withHttpClient(HttpClient httpClient) {
     }
 
     /**
-     * Sets the {@link HubProtocol} to be used by the {@link HubConnection}.
+     * Sets Json as 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) {
-        this.protocol = protocol;
+    public HttpHubConnectionBuilder withJson() {
+        this.protocol = new JsonHubProtocol();
+        return this;
+    }
+    
+    /**
+     * Sets MessagePack as the {@link HubProtocol} to be used by the {@link HubConnection}.
+     *
+     * @return This instance of the HttpHubConnectionBuilder.
+     */
+    public HttpHubConnectionBuilder withMessagePack() {
+        this.protocol = new MessagePackHubProtocol();
         return this;
     }
 

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.
  */
-public interface HubProtocol {
+interface HubProtocol {
     String getName();
     int getVersion();
     TransferFormat getTransferFormat();

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.
  */
-public interface InvocationBinder {
+interface InvocationBinder {
     Type getReturnType(String invocationId);
     List<Type> getParameterTypes(String methodName);
 }

src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/JsonHubProtocol.java

@@ -19,7 +19,7 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
 
-public class JsonHubProtocol implements HubProtocol {
+class JsonHubProtocol implements HubProtocol {
     private final JsonParser jsonParser = new JsonParser();
     private final Gson gson = new Gson();
     private static final String RECORD_SEPARATOR = "\u001e";

src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/MessagePackHubProtocol.java

@@ -25,7 +25,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.type.TypeFactory;
 
-public class MessagePackHubProtocol implements HubProtocol {
+class MessagePackHubProtocol implements HubProtocol {
 
     private static final int ERROR_RESULT = 1;
     private static final int VOID_RESULT = 2;

src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/TransferFormat.java

@@ -3,7 +3,7 @@
 
 package com.microsoft.signalr;
 
-public enum TransferFormat {
+enum TransferFormat {
     TEXT,
     BINARY
 }

src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/TypeReference.java

@@ -13,6 +13,8 @@
 
 import org.junit.jupiter.api.Test;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+
 class JsonHubProtocolTest {
     private JsonHubProtocol jsonHubProtocol = new JsonHubProtocol();
 

src/SignalR/clients/java/signalr/src/test/java/com/microsoft/signalr/HubConnectionTest.java

@@ -19,6 +19,8 @@
 
 import org.junit.jupiter.api.Test;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+
 class MessagePackHubProtocolTest {
     private MessagePackHubProtocol messagePackHubProtocol = new MessagePackHubProtocol();