Format code base using palantir plugin (#1642)

* Apply NeedBraces rule

* add palantir format plugin

* Format all

* Add missing overrides

* Fix bad override

* Remove unused recipes

build.gradle

@@ -1,3 +1,9 @@
+buildscript {
+    dependencies {
+        classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.36.0'
+    }
+}
+
 plugins {
     id 'com.netflix.nebula.netflixoss' version '11.3.2'
     id "com.google.osdetector" version "1.7.3"
@@ -32,6 +38,7 @@ subprojects {
     apply plugin: 'com.netflix.nebula.dependency-lock'
     apply plugin: 'me.champeau.jmh'
     apply plugin: 'org.openrewrite.rewrite'
+    apply plugin: 'com.palantir.java-format'
 
     license {
         ignoreFailures = false
@@ -86,6 +93,7 @@ subprojects {
 
 dependencies {
     rewrite(platform("org.openrewrite.recipe:rewrite-recipe-bom:2.2.1"))
+    rewrite("org.openrewrite.recipe:rewrite-static-analysis:1.0.7")
     rewrite("org.openrewrite.recipe:rewrite-logging-frameworks")
     rewrite("org.openrewrite.recipe:rewrite-testing-frameworks")
 }
@@ -94,6 +102,7 @@ rewrite {
     failOnDryRunResults = true
     activeRecipe("org.openrewrite.java.testing.junit5.JUnit5BestPractices")
     activeRecipe("org.openrewrite.java.logging.slf4j.Slf4jBestPractices")
+
     exclusion(
             // Exclude all groovy files
             "**/*.groovy")

zuul-core/src/jmh/java/com/netflix/zuul/message/HeadersBenchmark.java

@@ -15,10 +15,6 @@
  */
 package com.netflix.zuul.message;
 
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.ThreadLocalRandom;
-import java.util.concurrent.TimeUnit;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Mode;
@@ -29,6 +25,10 @@
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.infra.Blackhole;
 
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.TimeUnit;
 
 @State(Scope.Thread)
 public class HeadersBenchmark {
@@ -51,7 +51,9 @@ public void setUp() {
             names = new HeaderName[stringNames.length];
             values = new String[stringNames.length];
             for (int i = 0; i < stringNames.length; i++) {
-                UUID uuid = new UUID(ThreadLocalRandom.current().nextLong(), ThreadLocalRandom.current().nextLong());
+                UUID uuid = new UUID(
+                        ThreadLocalRandom.current().nextLong(),
+                        ThreadLocalRandom.current().nextLong());
                 String name = uuid.toString();
                 assert name.length() >= nameLength;
                 name = name.substring(0, nameLength);
@@ -84,7 +86,6 @@ public Headers addHeaders_headerName() {
         }
     }
 
-
     @State(Scope.Thread)
     public static class GetSetHeaders {
         @Param({"1", "5", "10", "30"})
@@ -105,7 +106,9 @@ public void setUp() {
             names = new HeaderName[stringNames.length];
             values = new String[stringNames.length];
             for (int i = 0; i < stringNames.length; i++) {
-                UUID uuid = new UUID(ThreadLocalRandom.current().nextLong(), ThreadLocalRandom.current().nextLong());
+                UUID uuid = new UUID(
+                        ThreadLocalRandom.current().nextLong(),
+                        ThreadLocalRandom.current().nextLong());
                 String name = uuid.toString();
                 assert name.length() >= nameLength;
                 name = name.substring(0, nameLength);
@@ -152,9 +155,6 @@ public void entries(Blackhole blackhole) {
                 blackhole.consume(header);
             }
         }
-
-
-
     }
 
     @Benchmark
@@ -163,5 +163,4 @@ public void entries(Blackhole blackhole) {
     public Headers newHeaders() {
         return new Headers();
     }
-
 }

zuul-core/src/main/java/com/netflix/config/DynamicIntegerSetProperty.java

@@ -18,8 +18,7 @@
 
 import java.util.Set;
 
-public class DynamicIntegerSetProperty extends DynamicSetProperty<Integer>
-{
+public class DynamicIntegerSetProperty extends DynamicSetProperty<Integer> {
     public DynamicIntegerSetProperty(String propName, String defaultValue) {
         super(propName, defaultValue);
     }

zuul-core/src/main/java/com/netflix/config/PatternListStringProperty.java

@@ -28,26 +28,26 @@
  * Date: 5/15/17
  * Time: 4:38 PM
  */
-public class PatternListStringProperty extends DerivedStringProperty<List<Pattern>>
-{
+public class PatternListStringProperty extends DerivedStringProperty<List<Pattern>> {
     private static final Logger LOG = LoggerFactory.getLogger(PatternListStringProperty.class);
 
-    public PatternListStringProperty(String name, String defaultValue)
-    {
+    public PatternListStringProperty(String name, String defaultValue) {
         super(name, defaultValue);
     }
 
     @Override
-    protected List<Pattern> derive(String value)
-    {
+    protected List<Pattern> derive(String value) {
         ArrayList<Pattern> ptns = new ArrayList<>();
         if (value != null) {
             for (String ptnTxt : value.split(",")) {
                 try {
                     ptns.add(Pattern.compile(ptnTxt.trim()));
-                }
-                catch (Exception e) {
-                    LOG.error("Error parsing regex pattern list from property! name = {}, value = {}, pattern = {}", String.valueOf(this.getName()), String.valueOf(this.getValue()), String.valueOf(value));
+                } catch (Exception e) {
+                    LOG.error(
+                            "Error parsing regex pattern list from property! name = {}, value = {}, pattern = {}",
+                            String.valueOf(this.getName()),
+                            String.valueOf(this.getValue()),
+                            String.valueOf(value));
                 }
             }
         }

zuul-core/src/main/java/com/netflix/netty/common/AbstrHttpConnectionExpiryHandler.java

@@ -33,11 +33,10 @@
  * Date: 7/17/17
  * Time: 10:54 AM
  */
-public abstract class AbstrHttpConnectionExpiryHandler extends ChannelOutboundHandlerAdapter
-{
-    protected final static Logger LOG = LoggerFactory.getLogger(AbstrHttpConnectionExpiryHandler.class);
-    protected final static CachedDynamicLongProperty MAX_EXPIRY_DELTA = new CachedDynamicLongProperty(
-            "server.connection.expiry.delta", 20 * 1000);
+public abstract class AbstrHttpConnectionExpiryHandler extends ChannelOutboundHandlerAdapter {
+    protected static final Logger LOG = LoggerFactory.getLogger(AbstrHttpConnectionExpiryHandler.class);
+    protected static final CachedDynamicLongProperty MAX_EXPIRY_DELTA =
+            new CachedDynamicLongProperty("server.connection.expiry.delta", 20 * 1000);
 
     protected final ConnectionCloseType connectionCloseType;
     protected final int maxRequests;
@@ -48,8 +47,8 @@ public abstract class AbstrHttpConnectionExpiryHandler extends ChannelOutboundHa
     protected int requestCount = 0;
     protected int maxRequestsUnderBrownout = 0;
 
-    public AbstrHttpConnectionExpiryHandler(ConnectionCloseType connectionCloseType, int maxRequestsUnderBrownout, int maxRequests, int maxExpiry)
-    {
+    public AbstrHttpConnectionExpiryHandler(
+            ConnectionCloseType connectionCloseType, int maxRequestsUnderBrownout, int maxRequests, int maxExpiry) {
         this.connectionCloseType = connectionCloseType;
         this.maxRequestsUnderBrownout = maxRequestsUnderBrownout;
         this.maxRequests = maxRequests;
@@ -61,43 +60,43 @@ public AbstrHttpConnectionExpiryHandler(ConnectionCloseType connectionCloseType,
     }
 
     @Override
-    public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception
-    {
+    public void write(ChannelHandlerContext ctx, Object msg, ChannelPromise promise) throws Exception {
         if (isResponseHeaders(msg)) {
             // Update the request count attribute for this channel.
             requestCount++;
 
             if (isConnectionExpired(ctx.channel())) {
                 // Flag this channel to be closed after response is written.
                 Channel channel = HttpUtils.getMainChannel(ctx);
-                ctx.channel().attr(ConnectionCloseChannelAttributes.CLOSE_AFTER_RESPONSE).set(ctx.newPromise());
+                ctx.channel()
+                        .attr(ConnectionCloseChannelAttributes.CLOSE_AFTER_RESPONSE)
+                        .set(ctx.newPromise());
                 ConnectionCloseType.setForChannel(channel, connectionCloseType);
             }
         }
 
         super.write(ctx, msg, promise);
     }
 
-    protected boolean isConnectionExpired(Channel channel)
-    {
-        boolean expired = requestCount >= maxRequests(channel) ||
-                System.currentTimeMillis() > connectionExpiryTime;
+    protected boolean isConnectionExpired(Channel channel) {
+        boolean expired = requestCount >= maxRequests(channel) || System.currentTimeMillis() > connectionExpiryTime;
         if (expired) {
             long lifetime = System.currentTimeMillis() - connectionStartTime;
-            LOG.info("Connection is expired. requestCount={}, lifetime={}, {}",
-                    requestCount, lifetime, ChannelUtils.channelInfoForLogging(channel));
+            LOG.info(
+                    "Connection is expired. requestCount={}, lifetime={}, {}",
+                    requestCount,
+                    lifetime,
+                    ChannelUtils.channelInfoForLogging(channel));
         }
         return expired;
     }
 
     protected abstract boolean isResponseHeaders(Object msg);
 
-    protected int maxRequests(Channel ch)
-    {
+    protected int maxRequests(Channel ch) {
         if (HttpChannelFlags.IN_BROWNOUT.get(ch)) {
             return this.maxRequestsUnderBrownout;
-        }
-        else {
+        } else {
             return this.maxRequests;
         }
     }

zuul-core/src/main/java/com/netflix/netty/common/ByteBufUtil.java

@@ -17,7 +17,6 @@
 package com.netflix.netty.common;
 
 import com.netflix.zuul.message.ZuulMessage;
-import com.netflix.zuul.message.http.HttpRequestMessage;
 import io.netty.handler.codec.http.HttpResponse;
 import io.netty.util.ReferenceCounted;
 import io.netty.util.ResourceLeakDetector;

zuul-core/src/main/java/com/netflix/netty/common/CategorizedThreadFactory.java

@@ -25,8 +25,7 @@
  * Date: 6/8/16
  * Time: 11:49 AM
  */
-public class CategorizedThreadFactory implements ThreadFactory
-{
+public class CategorizedThreadFactory implements ThreadFactory {
     private String category;
     private int num = 0;
 
@@ -35,9 +34,9 @@ public CategorizedThreadFactory(String category) {
         this.category = category;
     }
 
+    @Override
     public Thread newThread(final Runnable r) {
-        final FastThreadLocalThread t = new FastThreadLocalThread(r,
-                category + "-" + num++);
+        final FastThreadLocalThread t = new FastThreadLocalThread(r, category + "-" + num++);
         return t;
     }
 }

zuul-core/src/main/java/com/netflix/netty/common/ConnectionCloseChannelAttributes.java

@@ -23,21 +23,21 @@
 import io.netty.channel.ChannelPromise;
 import io.netty.util.AttributeKey;
 
-public class ConnectionCloseChannelAttributes
-{
-    public static final AttributeKey<ChannelPromise> CLOSE_AFTER_RESPONSE = AttributeKey.newInstance("CLOSE_AFTER_RESPONSE");
+public class ConnectionCloseChannelAttributes {
+    public static final AttributeKey<ChannelPromise> CLOSE_AFTER_RESPONSE =
+            AttributeKey.newInstance("CLOSE_AFTER_RESPONSE");
     public static final AttributeKey<ConnectionCloseType> CLOSE_TYPE = AttributeKey.newInstance("CLOSE_TYPE");
 
-    public static int gracefulCloseDelay(Channel channel)
-    {
-        ChannelConfig channelConfig = channel.attr(BaseZuulChannelInitializer.ATTR_CHANNEL_CONFIG).get();
+    public static int gracefulCloseDelay(Channel channel) {
+        ChannelConfig channelConfig =
+                channel.attr(BaseZuulChannelInitializer.ATTR_CHANNEL_CONFIG).get();
         Integer gracefulCloseDelay = channelConfig.get(CommonChannelConfigKeys.connCloseDelay);
         return gracefulCloseDelay == null ? 0 : gracefulCloseDelay;
     }
 
-    public static boolean allowGracefulDelayed(Channel channel)
-    {
-        ChannelConfig channelConfig = channel.attr(BaseZuulChannelInitializer.ATTR_CHANNEL_CONFIG).get();
+    public static boolean allowGracefulDelayed(Channel channel) {
+        ChannelConfig channelConfig =
+                channel.attr(BaseZuulChannelInitializer.ATTR_CHANNEL_CONFIG).get();
         Boolean value = channelConfig.get(CommonChannelConfigKeys.http2AllowGracefulDelayed);
         return value == null ? false : value;
     }

zuul-core/src/main/java/com/netflix/netty/common/ConnectionCloseType.java

@@ -23,22 +23,22 @@
  * Date: 2/8/17
  * Time: 2:04 PM
  */
-public enum ConnectionCloseType
-{
-    IMMEDIATE, GRACEFUL, DELAYED_GRACEFUL;
+public enum ConnectionCloseType {
+    IMMEDIATE,
+    GRACEFUL,
+    DELAYED_GRACEFUL;
 
-    public static ConnectionCloseType fromChannel(Channel ch)
-    {
-        ConnectionCloseType type = ch.attr(ConnectionCloseChannelAttributes.CLOSE_TYPE).get();
+    public static ConnectionCloseType fromChannel(Channel ch) {
+        ConnectionCloseType type =
+                ch.attr(ConnectionCloseChannelAttributes.CLOSE_TYPE).get();
         if (type == null) {
             // Default to immediate.
             type = ConnectionCloseType.IMMEDIATE;
         }
         return type;
     }
 
-    public static void setForChannel(Channel ch, ConnectionCloseType type)
-    {
+    public static void setForChannel(Channel ch, ConnectionCloseType type) {
         ch.attr(ConnectionCloseChannelAttributes.CLOSE_TYPE).set(type);
     }
 }