diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/Encryption.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/Encryption.java
index 6cb0b073e0f..781369edd80 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/Encryption.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/crypto/Encryption.java
@@ -497,16 +497,17 @@ public final class Encryption {
    * @return a key for the given subject
    * @throws IOException if the key is not found
    */
-  public static Key getSecretKeyForSubject(String subject, Configuration conf)
-      throws IOException {
+  public static Key getSecretKeyForSubject(String subject, Configuration conf) throws IOException {
     KeyProvider provider = getKeyProvider(conf);
-    if (provider != null) try {
-      Key[] keys = provider.getKeys(new String[] { subject });
-      if (keys != null && keys.length > 0) {
-        return keys[0];
+    if (provider != null) {
+      try {
+        Key[] keys = provider.getKeys(new String[] { subject });
+        if (keys != null && keys.length > 0) {
+          return keys[0];
+        }
+      } catch (Exception e) {
+        throw new IOException(e);
       }
-    } catch (Exception e) {
-      throw new IOException(e);
     }
     throw new IOException("No key found for subject '" + subject + "'");
   }
diff --git a/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorEndpointTracing.java b/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorEndpointTracing.java
index b183d6b3cb2..ada5f1c7a53 100644
--- a/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorEndpointTracing.java
+++ b/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorEndpointTracing.java
@@ -290,14 +290,10 @@ public class TestCoprocessorEndpointTracing {
       final ConcurrentMap<byte[], EchoResponseProto> results = new ConcurrentHashMap<>();
       TraceUtil.trace(() -> {
         try {
-          table.coprocessorService(TestProtobufRpcProto.class, null, null,
-            t -> {
-              t.echo(controller, request, callback);
-              return callback.get();
-            },
-            (region, row, result) -> {
-              results.put(region, result);
-            });
+          table.coprocessorService(TestProtobufRpcProto.class, null, null, t -> {
+            t.echo(controller, request, callback);
+            return callback.get();
+          }, (region, row, result) -> results.put(region, result));
         } catch (Throwable t) {
           throw new RuntimeException(t);
         }
diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RowResource.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RowResource.java
index ae8cc90eaba..d109b093886 100644
--- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RowResource.java
+++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RowResource.java
@@ -223,10 +223,12 @@ public class RowResource extends ResourceBase {
         int i = 0;
         for (CellModel cell: row.getCells()) {
           byte[] col = cell.getColumn();
-          if (col == null) try {
-            col = rowspec.getColumns()[i++];
-          } catch (ArrayIndexOutOfBoundsException e) {
-            col = null;
+          if (col == null) {
+            try {
+              col = rowspec.getColumns()[i++];
+            } catch (ArrayIndexOutOfBoundsException e) {
+              col = null;
+            }
           }
           if (col == null) {
             servlet.getMetrics().incrementFailedPutRequests(1);
@@ -263,10 +265,12 @@ public class RowResource extends ResourceBase {
       servlet.getMetrics().incrementFailedPutRequests(1);
       return processException(e);
     } finally {
-      if (table != null) try {
-        table.close();
-      } catch (IOException ioe) {
-        LOG.debug("Exception received while closing the table", ioe);
+      if (table != null) {
+        try {
+          table.close();
+        } catch (IOException ioe) {
+          LOG.debug("Exception received while closing the table", ioe);
+        }
       }
     }
   }
@@ -334,10 +338,12 @@ public class RowResource extends ResourceBase {
       servlet.getMetrics().incrementFailedPutRequests(1);
       return processException(e);
     } finally {
-      if (table != null) try {
-        table.close();
-      } catch (IOException ioe) {
-        LOG.debug("Exception received while closing the table", ioe);
+      if (table != null) {
+        try {
+          table.close();
+        } catch (IOException ioe) {
+          LOG.debug("Exception received while closing the table", ioe);
+        }
       }
     }
   }
@@ -399,10 +405,11 @@ public class RowResource extends ResourceBase {
         .build();
     }
     Delete delete = null;
-    if (rowspec.hasTimestamp())
+    if (rowspec.hasTimestamp()) {
       delete = new Delete(rowspec.getRow(), rowspec.getTimestamp());
-    else
+    } else {
       delete = new Delete(rowspec.getRow());
+    }
 
     for (byte[] column: rowspec.getColumns()) {
       byte[][] split = CellUtil.parseColumn(column);
@@ -440,10 +447,12 @@ public class RowResource extends ResourceBase {
       servlet.getMetrics().incrementFailedDeleteRequests(1);
       return processException(e);
     } finally {
-      if (table != null) try {
-        table.close();
-      } catch (IOException ioe) {
-        LOG.debug("Exception received while closing the table", ioe);
+      if (table != null) {
+        try {
+          table.close();
+        } catch (IOException ioe) {
+          LOG.debug("Exception received while closing the table", ioe);
+        }
       }
     }
     return Response.ok().build();
@@ -557,10 +566,12 @@ public class RowResource extends ResourceBase {
       servlet.getMetrics().incrementFailedPutRequests(1);
       return processException(e);
     } finally {
-      if (table != null) try {
-        table.close();
-      } catch (IOException ioe) {
-        LOG.debug("Exception received while closing the table", ioe);
+      if (table != null) {
+        try {
+          table.close();
+        } catch (IOException ioe) {
+          LOG.debug("Exception received while closing the table", ioe);
+        }
       }
     }
   }
@@ -687,10 +698,12 @@ public class RowResource extends ResourceBase {
       servlet.getMetrics().incrementFailedDeleteRequests(1);
       return processException(e);
     } finally {
-      if (table != null) try {
-        table.close();
-      } catch (IOException ioe) {
-        LOG.debug("Exception received while closing the table", ioe);
+      if (table != null) {
+        try {
+          table.close();
+        } catch (IOException ioe) {
+          LOG.debug("Exception received while closing the table", ioe);
+        }
       }
     }
   }
@@ -781,10 +794,12 @@ public class RowResource extends ResourceBase {
       servlet.getMetrics().incrementFailedAppendRequests(1);
       return processException(e);
     } finally {
-      if (table != null) try {
-        table.close();
-      } catch (IOException ioe) {
-        LOG.debug("Exception received while closing the table" + table.getName(), ioe);
+      if (table != null) {
+        try {
+          table.close();
+        } catch (IOException ioe) {
+          LOG.debug("Exception received while closing the table" + table.getName(), ioe);
+        }
       }
     }
   }
@@ -878,10 +893,12 @@ public class RowResource extends ResourceBase {
       servlet.getMetrics().incrementFailedIncrementRequests(1);
       return processException(e);
     } finally {
-      if (table != null) try {
-        table.close();
-      } catch (IOException ioe) {
-        LOG.debug("Exception received while closing the table " + table.getName(), ioe);
+      if (table != null) {
+        try {
+          table.close();
+        } catch (IOException ioe) {
+          LOG.debug("Exception received while closing the table " + table.getName(), ioe);
+        }
       }
     }
   }
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestRefreshRecoveredReplication.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestRefreshRecoveredReplication.java
index cf4f7106f06..db671bcc7da 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestRefreshRecoveredReplication.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestRefreshRecoveredReplication.java
@@ -141,9 +141,9 @@ public class TestRefreshRecoveredReplication extends TestReplicationBase {
     Replication replication = (Replication)otherServer.getReplicationSourceService();
     UTIL1.waitFor(60000, () -> !replication.getReplicationManager().getOldSources().isEmpty());
     // Wait on only one server being up.
-    UTIL1.waitFor(60000, () ->
-      // Have to go back to source here because getLiveRegionServerThreads makes new array each time
-      UTIL1.getMiniHBaseCluster().getLiveRegionServerThreads().size() == NUM_SLAVES1 - 1);
+    // Have to go back to source here because getLiveRegionServerThreads makes new array each time
+    UTIL1.waitFor(60000,
+      () -> UTIL1.getMiniHBaseCluster().getLiveRegionServerThreads().size() == NUM_SLAVES1 - 1);
     UTIL1.waitTableAvailable(tablename);
     LOG.info("Available {}", tablename);