From 39e6c6ff2f91d41564615efdd2df04063d499250 Mon Sep 17 00:00:00 2001 From: Mikael Mengistu Date: Fri, 7 Sep 2018 10:39:05 -0700 Subject: [PATCH] Spotless for the Java Client (#2924) --- clients/java/signalr/build.gradle | 20 +++++++++++++++++++ .../microsoft/aspnet/signalr/CallbackMap.java | 1 - .../aspnet/signalr/ConsoleLogger.java | 2 +- .../aspnet/signalr/HandshakeProtocol.java | 4 ++-- .../aspnet/signalr/HubConnection.java | 6 +++--- .../microsoft/aspnet/signalr/HubProtocol.java | 1 - .../aspnet/signalr/JsonHubProtocol.java | 8 ++++---- .../microsoft/aspnet/signalr/Negotiate.java | 4 ++-- .../aspnet/signalr/NegotiateResponse.java | 7 +++---- .../aspnet/signalr/Subscription.java | 2 +- .../aspnet/signalr/WebSocketTransport.java | 1 - .../signalr/test}/HandshakeProtocolTest.java | 9 ++++++--- .../signalr/test}/HubConnectionTest.java | 11 ++++++---- .../signalr/test}/HubExceptionTest.java | 7 +++++-- .../signalr/test}/JsonHubProtocolTest.java | 9 ++++++--- .../signalr/test}/NegotiateResponseTest.java | 7 +++++-- .../test}/ResolveNegotiateUrlTest.java | 13 +++++++----- .../signalr/test}/WebSocketTransportTest.java | 9 ++++++--- .../WebSocketTransportUrlFormatTest.java | 8 +++++--- 19 files changed, 84 insertions(+), 45 deletions(-) rename clients/java/signalr/src/test/java/{ => com/microsoft/aspnet/signalr/test}/HandshakeProtocolTest.java (96%) rename clients/java/signalr/src/test/java/{ => com/microsoft/aspnet/signalr/test}/HubConnectionTest.java (99%) rename clients/java/signalr/src/test/java/{ => com/microsoft/aspnet/signalr/test}/HubExceptionTest.java (95%) rename clients/java/signalr/src/test/java/{ => com/microsoft/aspnet/signalr/test}/JsonHubProtocolTest.java (99%) rename clients/java/signalr/src/test/java/{ => com/microsoft/aspnet/signalr/test}/NegotiateResponseTest.java (97%) rename clients/java/signalr/src/test/java/{ => com/microsoft/aspnet/signalr/test}/ResolveNegotiateUrlTest.java (97%) rename clients/java/signalr/src/test/java/{ => com/microsoft/aspnet/signalr/test}/WebSocketTransportTest.java (95%) rename clients/java/signalr/src/test/java/{ => com/microsoft/aspnet/signalr/test}/WebSocketTransportUrlFormatTest.java (96%) diff --git a/clients/java/signalr/build.gradle b/clients/java/signalr/build.gradle index daf0c42b12..b688ee869e 100644 --- a/clients/java/signalr/build.gradle +++ b/clients/java/signalr/build.gradle @@ -1,6 +1,7 @@ plugins { id 'java' id 'maven' + id "com.diffplug.gradle.spotless" version "3.14.0" } group 'com.microsoft.aspnet' @@ -21,6 +22,25 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:3.11.0' } +spotless { + java { + licenseHeader '// Copyright (c) .NET Foundation. All rights reserved.\n' + + '// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.\n\n' // License header + + importOrder 'java', 'javax', 'org', 'com', 'com.diffplug', '' // A sequence of package names + + replace 'Not enough space after if', 'if(', 'if (' + replace 'Not enough space after )', '){', ') {' + replace 'Not enough space after for', 'for(', 'for (' + replace 'Not enough space after while', 'while (', 'while (' + replace 'Not enough space after switch', 'switch(', 'switch (' + replaceRegex 'Too much space after if', 'if +\\(', 'if (' + trimTrailingWhitespace() + indentWithSpaces(4) + removeUnusedImports() // removes any unused imports + } +} + task sourceJar(type: Jar) { classifier "sources" from sourceSets.main.allJava diff --git a/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/CallbackMap.java b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/CallbackMap.java index 3e8d8c923c..83c6145e89 100644 --- a/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/CallbackMap.java +++ b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/CallbackMap.java @@ -31,4 +31,3 @@ public class CallbackMap { handlers.remove(key); } } - diff --git a/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/ConsoleLogger.java b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/ConsoleLogger.java index 285ddf71e3..95c4a60322 100644 --- a/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/ConsoleLogger.java +++ b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/ConsoleLogger.java @@ -17,7 +17,7 @@ public class ConsoleLogger implements Logger { @Override public void log(LogLevel logLevel, String message) { - if(logLevel.value >= this.logLevel.value){ + if (logLevel.value >= this.logLevel.value) { String timeStamp = dateFormat.format(new Date()); message = String.format("[%s] [%s] %s", timeStamp, logLevel, message); switch (logLevel) { diff --git a/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/HandshakeProtocol.java b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/HandshakeProtocol.java index 35282fae8f..0dcba3cc31 100644 --- a/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/HandshakeProtocol.java +++ b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/HandshakeProtocol.java @@ -9,12 +9,12 @@ public class HandshakeProtocol { public static Gson gson = new Gson(); private static final String RECORD_SEPARATOR = "\u001e"; - public static String createHandshakeRequestMessage(HandshakeRequestMessage message){ + public static String createHandshakeRequestMessage(HandshakeRequestMessage message) { // The handshake request is always in the JSON format return gson.toJson(message) + RECORD_SEPARATOR; } - public static HandshakeResponseMessage parseHandshakeResponse(String message){ + public static HandshakeResponseMessage parseHandshakeResponse(String message) { return gson.fromJson(message, HandshakeResponseMessage.class); } } diff --git a/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/HubConnection.java b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/HubConnection.java index 6bea115c1a..c524a7e18b 100644 --- a/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/HubConnection.java +++ b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/HubConnection.java @@ -3,15 +3,15 @@ package com.microsoft.aspnet.signalr; -import com.google.gson.Gson; -import com.google.gson.JsonArray; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.function.Consumer; +import com.google.gson.Gson; +import com.google.gson.JsonArray; + public class HubConnection { private String url; private Transport transport; diff --git a/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/HubProtocol.java b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/HubProtocol.java index 0ee6eeb9cb..73564d2828 100644 --- a/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/HubProtocol.java +++ b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/HubProtocol.java @@ -25,4 +25,3 @@ public interface HubProtocol { */ String writeMessage(HubMessage message); } - diff --git a/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/JsonHubProtocol.java b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/JsonHubProtocol.java index a861b3814f..f096e88df3 100644 --- a/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/JsonHubProtocol.java +++ b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/JsonHubProtocol.java @@ -3,14 +3,14 @@ package com.microsoft.aspnet.signalr; +import java.util.ArrayList; +import java.util.List; + import com.google.gson.Gson; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import java.util.ArrayList; -import java.util.List; - public class JsonHubProtocol implements HubProtocol { private final JsonParser jsonParser = new JsonParser(); private final Gson gson = new Gson(); @@ -57,7 +57,7 @@ public class JsonHubProtocol implements HubProtocol { break; case CLOSE: CloseMessage closeMessage; - if (jsonMessage.has("error")){ + if (jsonMessage.has("error")) { String error = jsonMessage.get("error").getAsString(); closeMessage = new CloseMessage(error); } else { diff --git a/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Negotiate.java b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Negotiate.java index 1de9637a3d..3a7a7b2832 100644 --- a/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Negotiate.java +++ b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Negotiate.java @@ -3,13 +3,13 @@ package com.microsoft.aspnet.signalr; +import java.io.IOException; + import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.RequestBody; import okhttp3.Response; -import java.io.IOException; - public class Negotiate { public static NegotiateResponse processNegotiate(String url) throws IOException { diff --git a/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/NegotiateResponse.java b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/NegotiateResponse.java index a46fb18887..cfc0d8c699 100644 --- a/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/NegotiateResponse.java +++ b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/NegotiateResponse.java @@ -3,13 +3,13 @@ package com.microsoft.aspnet.signalr; +import java.util.HashSet; +import java.util.Set; + import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import java.util.HashSet; -import java.util.Set; - public class NegotiateResponse { private String connectionId; private Set availableTransports = new HashSet<>(); @@ -49,4 +49,3 @@ public class NegotiateResponse { return accessToken; } } - diff --git a/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Subscription.java b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Subscription.java index f4a3e7d035..32e04f9513 100644 --- a/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Subscription.java +++ b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/Subscription.java @@ -18,7 +18,7 @@ public class Subscription { public void unsubscribe() { List actions = this.handlers.get(target); - if (actions != null){ + if (actions != null) { actions.remove(action); } } diff --git a/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/WebSocketTransport.java b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/WebSocketTransport.java index 6feb7b9ffe..b7eb3276dd 100644 --- a/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/WebSocketTransport.java +++ b/clients/java/signalr/src/main/java/com/microsoft/aspnet/signalr/WebSocketTransport.java @@ -5,7 +5,6 @@ package com.microsoft.aspnet.signalr; import java.net.URI; import java.net.URISyntaxException; -import java.util.HashMap; import java.util.Map; import org.java_websocket.client.WebSocketClient; diff --git a/clients/java/signalr/src/test/java/HandshakeProtocolTest.java b/clients/java/signalr/src/test/java/com/microsoft/aspnet/signalr/test/HandshakeProtocolTest.java similarity index 96% rename from clients/java/signalr/src/test/java/HandshakeProtocolTest.java rename to clients/java/signalr/src/test/java/com/microsoft/aspnet/signalr/test/HandshakeProtocolTest.java index f41ded8d90..e54c10f00f 100644 --- a/clients/java/signalr/src/test/java/HandshakeProtocolTest.java +++ b/clients/java/signalr/src/test/java/com/microsoft/aspnet/signalr/test/HandshakeProtocolTest.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.test; + +import static org.junit.Assert.*; + +import org.junit.Test; + 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.*; public class HandshakeProtocolTest { diff --git a/clients/java/signalr/src/test/java/HubConnectionTest.java b/clients/java/signalr/src/test/java/com/microsoft/aspnet/signalr/test/HubConnectionTest.java similarity index 99% rename from clients/java/signalr/src/test/java/HubConnectionTest.java rename to clients/java/signalr/src/test/java/com/microsoft/aspnet/signalr/test/HubConnectionTest.java index 1359bbfee5..aaaaf4871e 100644 --- a/clients/java/signalr/src/test/java/HubConnectionTest.java +++ b/clients/java/signalr/src/test/java/com/microsoft/aspnet/signalr/test/HubConnectionTest.java @@ -1,7 +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 com.microsoft.aspnet.signalr.*; +package com.microsoft.aspnet.signalr.test; + +import static org.junit.Assert.*; + import java.util.ArrayList; import java.util.concurrent.atomic.AtomicReference; @@ -9,7 +12,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import static org.junit.Assert.*; +import com.microsoft.aspnet.signalr.*; public class HubConnectionTest { private static final String RECORD_SEPARATOR = "\u001e"; @@ -673,7 +676,7 @@ public class HubConnectionTest { assertEquals(HubConnectionState.DISCONNECTED, hubConnection.getConnectionState()); } - + @Test public void CallingStartOnStartedHubConnectionNoOps() throws Exception { Transport mockTransport = new MockTransport(); @@ -729,7 +732,7 @@ public class HubConnectionTest { this.onReceive(message); } - public String[] getSentMessages(){ + public String[] getSentMessages() { return sentMessages.toArray(new String[sentMessages.size()]); } } diff --git a/clients/java/signalr/src/test/java/HubExceptionTest.java b/clients/java/signalr/src/test/java/com/microsoft/aspnet/signalr/test/HubExceptionTest.java similarity index 95% rename from clients/java/signalr/src/test/java/HubExceptionTest.java rename to clients/java/signalr/src/test/java/com/microsoft/aspnet/signalr/test/HubExceptionTest.java index bfebadfb9f..6162e4453f 100644 --- a/clients/java/signalr/src/test/java/HubExceptionTest.java +++ b/clients/java/signalr/src/test/java/com/microsoft/aspnet/signalr/test/HubExceptionTest.java @@ -1,11 +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 com.microsoft.aspnet.signalr.HubException; -import org.junit.Test; +package com.microsoft.aspnet.signalr.test; import static org.junit.Assert.assertEquals; +import org.junit.Test; + +import com.microsoft.aspnet.signalr.HubException; + public class HubExceptionTest { @Test public void VeryHubExceptionMesssageIsSet() { diff --git a/clients/java/signalr/src/test/java/JsonHubProtocolTest.java b/clients/java/signalr/src/test/java/com/microsoft/aspnet/signalr/test/JsonHubProtocolTest.java similarity index 99% rename from clients/java/signalr/src/test/java/JsonHubProtocolTest.java rename to clients/java/signalr/src/test/java/com/microsoft/aspnet/signalr/test/JsonHubProtocolTest.java index 9fb72622bd..7b73c04674 100644 --- a/clients/java/signalr/src/test/java/JsonHubProtocolTest.java +++ b/clients/java/signalr/src/test/java/com/microsoft/aspnet/signalr/test/JsonHubProtocolTest.java @@ -1,13 +1,16 @@ // 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.JsonArray; -import com.microsoft.aspnet.signalr.*; +package com.microsoft.aspnet.signalr.test; + +import static org.junit.Assert.*; + import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import static org.junit.Assert.*; +import com.google.gson.JsonArray; +import com.microsoft.aspnet.signalr.*; public class JsonHubProtocolTest { private JsonHubProtocol jsonHubProtocol = new JsonHubProtocol(); diff --git a/clients/java/signalr/src/test/java/NegotiateResponseTest.java b/clients/java/signalr/src/test/java/com/microsoft/aspnet/signalr/test/NegotiateResponseTest.java similarity index 97% rename from clients/java/signalr/src/test/java/NegotiateResponseTest.java rename to clients/java/signalr/src/test/java/com/microsoft/aspnet/signalr/test/NegotiateResponseTest.java index df5e18f8f1..94d9e80c00 100644 --- a/clients/java/signalr/src/test/java/NegotiateResponseTest.java +++ b/clients/java/signalr/src/test/java/com/microsoft/aspnet/signalr/test/NegotiateResponseTest.java @@ -1,11 +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 com.microsoft.aspnet.signalr.NegotiateResponse; -import org.junit.Test; +package com.microsoft.aspnet.signalr.test; import static org.junit.Assert.*; +import org.junit.Test; + +import com.microsoft.aspnet.signalr.NegotiateResponse; + public class NegotiateResponseTest { @Test diff --git a/clients/java/signalr/src/test/java/ResolveNegotiateUrlTest.java b/clients/java/signalr/src/test/java/com/microsoft/aspnet/signalr/test/ResolveNegotiateUrlTest.java similarity index 97% rename from clients/java/signalr/src/test/java/ResolveNegotiateUrlTest.java rename to clients/java/signalr/src/test/java/com/microsoft/aspnet/signalr/test/ResolveNegotiateUrlTest.java index c9964db532..8c4fc60960 100644 --- a/clients/java/signalr/src/test/java/ResolveNegotiateUrlTest.java +++ b/clients/java/signalr/src/test/java/com/microsoft/aspnet/signalr/test/ResolveNegotiateUrlTest.java @@ -1,15 +1,18 @@ // 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.Negotiate; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +package com.microsoft.aspnet.signalr.test; + +import static org.junit.Assert.assertEquals; import java.util.Arrays; import java.util.Collection; -import static org.junit.Assert.assertEquals; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; + +import com.microsoft.aspnet.signalr.Negotiate; @RunWith(Parameterized.class) public class ResolveNegotiateUrlTest { diff --git a/clients/java/signalr/src/test/java/WebSocketTransportTest.java b/clients/java/signalr/src/test/java/com/microsoft/aspnet/signalr/test/WebSocketTransportTest.java similarity index 95% rename from clients/java/signalr/src/test/java/WebSocketTransportTest.java rename to clients/java/signalr/src/test/java/com/microsoft/aspnet/signalr/test/WebSocketTransportTest.java index beb07d9bdd..a0ede6354e 100644 --- a/clients/java/signalr/src/test/java/WebSocketTransportTest.java +++ b/clients/java/signalr/src/test/java/com/microsoft/aspnet/signalr/test/WebSocketTransportTest.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.test; + +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; + import com.microsoft.aspnet.signalr.NullLogger; import com.microsoft.aspnet.signalr.Transport; import com.microsoft.aspnet.signalr.WebSocketTransport; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; public class WebSocketTransportTest { diff --git a/clients/java/signalr/src/test/java/WebSocketTransportUrlFormatTest.java b/clients/java/signalr/src/test/java/com/microsoft/aspnet/signalr/test/WebSocketTransportUrlFormatTest.java similarity index 96% rename from clients/java/signalr/src/test/java/WebSocketTransportUrlFormatTest.java rename to clients/java/signalr/src/test/java/com/microsoft/aspnet/signalr/test/WebSocketTransportUrlFormatTest.java index 258c45584b..d9583d47fe 100644 --- a/clients/java/signalr/src/test/java/WebSocketTransportUrlFormatTest.java +++ b/clients/java/signalr/src/test/java/com/microsoft/aspnet/signalr/test/WebSocketTransportUrlFormatTest.java @@ -1,8 +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.NullLogger; -import com.microsoft.aspnet.signalr.WebSocketTransport; +package com.microsoft.aspnet.signalr.test; + +import static org.junit.Assert.*; import java.net.URISyntaxException; import java.util.Arrays; @@ -12,7 +13,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import static org.junit.Assert.*; +import com.microsoft.aspnet.signalr.NullLogger; +import com.microsoft.aspnet.signalr.WebSocketTransport; @RunWith(Parameterized.class) public class WebSocketTransportUrlFormatTest {