From f2b00023f83e070ac0682742124130f7c9ad26d8 Mon Sep 17 00:00:00 2001
From: Fokko Driesprong <fokko@apache.org>
Date: Tue, 4 Jun 2019 10:02:46 +0200
Subject: [PATCH] Bump Checkstyle to 8.21 (#7826)

---
 .../main/java/org/apache/druid/utils/CloseableUtils.java    | 3 ++-
 pom.xml                                                     | 2 +-
 .../java/org/apache/druid/client/cache/HybridCache.java     | 6 ++----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/org/apache/druid/utils/CloseableUtils.java b/core/src/main/java/org/apache/druid/utils/CloseableUtils.java
index cb622611501..768abbe86dc 100644
--- a/core/src/main/java/org/apache/druid/utils/CloseableUtils.java
+++ b/core/src/main/java/org/apache/druid/utils/CloseableUtils.java
@@ -40,7 +40,8 @@ public final class CloseableUtils
   public static void closeBoth(Closeable first, Closeable second) throws IOException
   {
     //noinspection EmptyTryBlock
-    try (Closeable ignore1 = second; Closeable ignore2 = first) {
+    try (Closeable ignore1 = second;
+         Closeable ignore2 = first) {
       // piggy-back try-with-resources semantics
     }
   }
diff --git a/pom.xml b/pom.xml
index 904ddc2cb34..e7ad47afd21 100644
--- a/pom.xml
+++ b/pom.xml
@@ -996,7 +996,7 @@
                     <dependency>
                         <groupId>com.puppycrawl.tools</groupId>
                         <artifactId>checkstyle</artifactId>
-                        <version>8.20</version>
+                        <version>8.21</version>
                     </dependency>
                 </dependencies>
                 <executions>
diff --git a/server/src/main/java/org/apache/druid/client/cache/HybridCache.java b/server/src/main/java/org/apache/druid/client/cache/HybridCache.java
index fcd211a908d..65bf957a27e 100644
--- a/server/src/main/java/org/apache/druid/client/cache/HybridCache.java
+++ b/server/src/main/java/org/apache/druid/client/cache/HybridCache.java
@@ -23,9 +23,9 @@ import com.google.common.collect.Sets;
 import org.apache.druid.java.util.common.lifecycle.LifecycleStop;
 import org.apache.druid.java.util.common.logger.Logger;
 import org.apache.druid.java.util.emitter.service.ServiceEmitter;
+import org.apache.druid.utils.CloseableUtils;
 
 import javax.annotation.Nullable;
-import java.io.Closeable;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.HashMap;
@@ -156,9 +156,7 @@ public class HybridCache implements Cache
   @LifecycleStop
   public void close() throws IOException
   {
-    try (Closeable closeable1 = level1; Closeable closeable2 = level2) {
-      // Just for closing
-    }
+    CloseableUtils.closeBoth(level1, level2);
   }
 
   @Override