From 6861e89c8b3081a828c7dd51576d29615dafc48e Mon Sep 17 00:00:00 2001 From: BrennanConroy Date: Wed, 10 Oct 2018 16:31:14 -0700 Subject: [PATCH] [Java] Fix incorrect visibility and some minor cleanup (#3112) --- .../com/microsoft/signalr/CallbackMap.java | 2 +- .../microsoft/signalr/DefaultHttpClient.java | 4 ++-- .../microsoft/signalr/HandshakeProtocol.java | 2 +- .../signalr/HttpHubConnectionBuilder.java | 4 ++-- .../com/microsoft/signalr/HubConnection.java | 20 +++++++++---------- .../signalr/HubConnectionBuilder.java | 3 +-- .../com/microsoft/signalr/HubException.java | 2 ++ .../microsoft/signalr/InvocationHandler.java | 4 ++-- .../microsoft/signalr/InvocationRequest.java | 6 +++--- .../com/microsoft/signalr/PingMessage.java | 2 +- .../signalr/StreamInvocationMessage.java | 3 +-- .../com/microsoft/signalr/Subscription.java | 6 +++--- .../com/microsoft/signalr/TransferFormat.java | 2 +- .../microsoft/signalr/WebSocketTransport.java | 4 ++-- 14 files changed, 32 insertions(+), 32 deletions(-) diff --git a/clients/java/signalr/src/main/java/com/microsoft/signalr/CallbackMap.java b/clients/java/signalr/src/main/java/com/microsoft/signalr/CallbackMap.java index e5f7b58edd..134ab2ed09 100644 --- a/clients/java/signalr/src/main/java/com/microsoft/signalr/CallbackMap.java +++ b/clients/java/signalr/src/main/java/com/microsoft/signalr/CallbackMap.java @@ -7,7 +7,7 @@ import java.util.*; import java.util.concurrent.ConcurrentHashMap; class CallbackMap { - private Map> handlers = new ConcurrentHashMap<>(); + private final Map> handlers = new ConcurrentHashMap<>(); public InvocationHandler put(String target, ActionBase action, Class... classes) { InvocationHandler handler = new InvocationHandler(action, classes); diff --git a/clients/java/signalr/src/main/java/com/microsoft/signalr/DefaultHttpClient.java b/clients/java/signalr/src/main/java/com/microsoft/signalr/DefaultHttpClient.java index 2f42e1f5f7..a2e81c8e70 100644 --- a/clients/java/signalr/src/main/java/com/microsoft/signalr/DefaultHttpClient.java +++ b/clients/java/signalr/src/main/java/com/microsoft/signalr/DefaultHttpClient.java @@ -22,8 +22,8 @@ import okhttp3.RequestBody; import okhttp3.Response; import okhttp3.ResponseBody; -class DefaultHttpClient extends HttpClient { - private OkHttpClient client; +final class DefaultHttpClient extends HttpClient { + private final OkHttpClient client; private Logger logger; public DefaultHttpClient(Logger logger) { diff --git a/clients/java/signalr/src/main/java/com/microsoft/signalr/HandshakeProtocol.java b/clients/java/signalr/src/main/java/com/microsoft/signalr/HandshakeProtocol.java index ca7987c68c..4c1d2ad896 100644 --- a/clients/java/signalr/src/main/java/com/microsoft/signalr/HandshakeProtocol.java +++ b/clients/java/signalr/src/main/java/com/microsoft/signalr/HandshakeProtocol.java @@ -5,7 +5,7 @@ package com.microsoft.signalr; import com.google.gson.Gson; -class HandshakeProtocol { +final class HandshakeProtocol { private static final Gson gson = new Gson(); private static final String RECORD_SEPARATOR = "\u001e"; diff --git a/clients/java/signalr/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java b/clients/java/signalr/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java index d18c0a8d35..9d059ab8ba 100644 --- a/clients/java/signalr/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java +++ b/clients/java/signalr/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java @@ -8,7 +8,7 @@ import java.time.Duration; import io.reactivex.Single; public class HttpHubConnectionBuilder { - private String url; + private final String url; private Transport transport; private Logger logger; private HttpClient httpClient; @@ -56,7 +56,7 @@ public class HttpHubConnectionBuilder { return this; } - HttpHubConnectionBuilder withHandshakeResponseTimeout(Duration timeout) { + public HttpHubConnectionBuilder withHandshakeResponseTimeout(Duration timeout) { this.handshakeResponseTimeout = timeout; return this; } diff --git a/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java b/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java index f799c6ddb1..c7cf0ae6a1 100644 --- a/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java +++ b/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java @@ -24,28 +24,28 @@ import io.reactivex.Single; public class HubConnection { private static final String RECORD_SEPARATOR = "\u001e"; - private static List> emptyArray = new ArrayList<>(); - private static int MAX_NEGOTIATE_ATTEMPTS = 100; + private static final List> emptyArray = new ArrayList<>(); + private static final int MAX_NEGOTIATE_ATTEMPTS = 100; - private String baseUrl; + private final String baseUrl; private Transport transport; private OnReceiveCallBack callback; - private CallbackMap handlers = new CallbackMap(); + private final CallbackMap handlers = new CallbackMap(); private HubProtocol protocol; private Boolean handshakeReceived = false; private HubConnectionState hubConnectionState = HubConnectionState.DISCONNECTED; - private Lock hubConnectionStateLock = new ReentrantLock(); + private final Lock hubConnectionStateLock = new ReentrantLock(); private Logger logger; private List> onClosedCallbackList; - private boolean skipNegotiate; + private final boolean skipNegotiate; private Single accessTokenProvider; - private Map headers = new HashMap<>(); + private final Map headers = new HashMap<>(); private ConnectionState connectionState = null; - private HttpClient httpClient; + private final HttpClient httpClient; private String stopError; private Timer pingTimer = null; - private AtomicLong nextServerTimeout = new AtomicLong(); - private AtomicLong nextPingActivation = new AtomicLong(); + private final AtomicLong nextServerTimeout = new AtomicLong(); + private final AtomicLong nextPingActivation = new AtomicLong(); private Duration keepAliveInterval = Duration.ofSeconds(15); private Duration serverTimeout = Duration.ofSeconds(30); private Duration tickRate = Duration.ofSeconds(1); diff --git a/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnectionBuilder.java b/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnectionBuilder.java index c5bc761071..3aee028ee4 100644 --- a/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnectionBuilder.java +++ b/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnectionBuilder.java @@ -4,12 +4,11 @@ package com.microsoft.signalr; public abstract class HubConnectionBuilder { - public static HttpHubConnectionBuilder create(String url) { if (url == null || url.isEmpty()) { throw new IllegalArgumentException("A valid url is required."); } - return new HttpHubConnectionBuilder(url); + return new HttpHubConnectionBuilder(url); } public abstract HubConnection build(); diff --git a/clients/java/signalr/src/main/java/com/microsoft/signalr/HubException.java b/clients/java/signalr/src/main/java/com/microsoft/signalr/HubException.java index 6c7872372f..a7a30a3d9b 100644 --- a/clients/java/signalr/src/main/java/com/microsoft/signalr/HubException.java +++ b/clients/java/signalr/src/main/java/com/microsoft/signalr/HubException.java @@ -4,6 +4,8 @@ package com.microsoft.signalr; public class HubException extends Exception { + private static final long serialVersionUID = -572019264269821519L; + public HubException() { } diff --git a/clients/java/signalr/src/main/java/com/microsoft/signalr/InvocationHandler.java b/clients/java/signalr/src/main/java/com/microsoft/signalr/InvocationHandler.java index 4d10df0faf..64f8ed3a1d 100644 --- a/clients/java/signalr/src/main/java/com/microsoft/signalr/InvocationHandler.java +++ b/clients/java/signalr/src/main/java/com/microsoft/signalr/InvocationHandler.java @@ -7,8 +7,8 @@ import java.util.Arrays; import java.util.List; class InvocationHandler { - private List> classes; - private ActionBase action; + private final List> classes; + private final ActionBase action; InvocationHandler(ActionBase action, Class... classes) { this.action = action; diff --git a/clients/java/signalr/src/main/java/com/microsoft/signalr/InvocationRequest.java b/clients/java/signalr/src/main/java/com/microsoft/signalr/InvocationRequest.java index fded3b9fa0..d4fa34c66e 100644 --- a/clients/java/signalr/src/main/java/com/microsoft/signalr/InvocationRequest.java +++ b/clients/java/signalr/src/main/java/com/microsoft/signalr/InvocationRequest.java @@ -6,9 +6,9 @@ package com.microsoft.signalr; import java.util.concurrent.CompletableFuture; class InvocationRequest { - private Class returnType; - private CompletableFuture pendingCall = new CompletableFuture<>(); - private String invocationId; + private final Class returnType; + private final CompletableFuture pendingCall = new CompletableFuture<>(); + private final String invocationId; InvocationRequest(Class returnType, String invocationId) { this.returnType = returnType; diff --git a/clients/java/signalr/src/main/java/com/microsoft/signalr/PingMessage.java b/clients/java/signalr/src/main/java/com/microsoft/signalr/PingMessage.java index 318de059dd..1c0286f70e 100644 --- a/clients/java/signalr/src/main/java/com/microsoft/signalr/PingMessage.java +++ b/clients/java/signalr/src/main/java/com/microsoft/signalr/PingMessage.java @@ -5,7 +5,7 @@ package com.microsoft.signalr; class PingMessage extends HubMessage { - int type = HubMessageType.PING.value; + private final int type = HubMessageType.PING.value; private static PingMessage instance = new PingMessage(); diff --git a/clients/java/signalr/src/main/java/com/microsoft/signalr/StreamInvocationMessage.java b/clients/java/signalr/src/main/java/com/microsoft/signalr/StreamInvocationMessage.java index 968b655f3f..eb4ae0e479 100644 --- a/clients/java/signalr/src/main/java/com/microsoft/signalr/StreamInvocationMessage.java +++ b/clients/java/signalr/src/main/java/com/microsoft/signalr/StreamInvocationMessage.java @@ -4,8 +4,7 @@ package com.microsoft.signalr; class StreamInvocationMessage extends InvocationMessage { - - int type = HubMessageType.STREAM_INVOCATION.value; + private final int type = HubMessageType.STREAM_INVOCATION.value; public StreamInvocationMessage(String invocationId, String target, Object[] arguments) { super(invocationId, target, arguments); diff --git a/clients/java/signalr/src/main/java/com/microsoft/signalr/Subscription.java b/clients/java/signalr/src/main/java/com/microsoft/signalr/Subscription.java index 8c7bf2acce..0ce344959d 100644 --- a/clients/java/signalr/src/main/java/com/microsoft/signalr/Subscription.java +++ b/clients/java/signalr/src/main/java/com/microsoft/signalr/Subscription.java @@ -6,9 +6,9 @@ package com.microsoft.signalr; import java.util.List; public class Subscription { - private CallbackMap handlers; - private InvocationHandler handler; - private String target; + private final CallbackMap handlers; + private final InvocationHandler handler; + private final String target; public Subscription(CallbackMap handlers, InvocationHandler handler, String target) { this.handlers = handlers; diff --git a/clients/java/signalr/src/main/java/com/microsoft/signalr/TransferFormat.java b/clients/java/signalr/src/main/java/com/microsoft/signalr/TransferFormat.java index 413404bea6..59a9dd5889 100644 --- a/clients/java/signalr/src/main/java/com/microsoft/signalr/TransferFormat.java +++ b/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 } diff --git a/clients/java/signalr/src/main/java/com/microsoft/signalr/WebSocketTransport.java b/clients/java/signalr/src/main/java/com/microsoft/signalr/WebSocketTransport.java index 2ade4048e1..2024310d85 100644 --- a/clients/java/signalr/src/main/java/com/microsoft/signalr/WebSocketTransport.java +++ b/clients/java/signalr/src/main/java/com/microsoft/signalr/WebSocketTransport.java @@ -13,8 +13,8 @@ class WebSocketTransport implements Transport { private Consumer onClose; private String url; private Logger logger; - private HttpClient client; - private Map headers; + private final HttpClient client; + private final Map headers; private static final String HTTP = "http"; private static final String HTTPS = "https";