diff --git a/hbase-build-configuration/pom.xml b/hbase-build-configuration/pom.xml
index 311b1c0394b..a617083e486 100644
--- a/hbase-build-configuration/pom.xml
+++ b/hbase-build-configuration/pom.xml
@@ -83,6 +83,7 @@
                 <arg>-XepDisableWarningsInGeneratedCode</arg>
                 <arg>-Xep:FallThrough:OFF</arg> <!-- already in findbugs -->
                 <arg>-Xep:ClassNewInstance:ERROR</arg>
+                <arg>-Xep:MissingDefault:ERROR</arg>
               </compilerArgs>
               <annotationProcessorPaths>
                 <path>
diff --git a/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml b/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml
index b61e79ba7ca..7ad797cf1f3 100644
--- a/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml
+++ b/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml
@@ -61,7 +61,6 @@
     <module name="EqualsHashCode"/>
     <module name="IllegalInstantiation"/>
     <module name="InnerAssignment"/>
-    <module name="MissingSwitchDefault"/>
     <module name="NoFinalizer"/>
 
     <!-- Import Checks
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/JenkinsHash.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/JenkinsHash.java
index 6f9b980f376..76681ea4e9f 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/JenkinsHash.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/JenkinsHash.java
@@ -101,7 +101,7 @@ public class JenkinsHash extends Hash {
    * <p>Use for hash table lookup, or anything where one collision in 2^^32 is
    * acceptable.  Do NOT use for cryptographic purposes.
   */
-  @SuppressWarnings("fallthrough")
+  @SuppressWarnings({"fallthrough", "MissingDefault"})
   @Override
   public <T> int hash(HashKey<T> hashKey, int initval) {
     int length = hashKey.length();
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/MurmurHash3.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/MurmurHash3.java
index f85b98cbdd1..0017e9f177d 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/MurmurHash3.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/MurmurHash3.java
@@ -78,6 +78,8 @@ public class MurmurHash3 extends Hash {
       k1 = (k1 << 15) | (k1 >>> 17); // ROTL32(k1,15);
       k1 *= c2;
       h1 ^= k1;
+    default:
+      // fall out
     }
 
     // finalization
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/ExpressionParser.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/ExpressionParser.java
index c2dd046474d..313e8801e3e 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/ExpressionParser.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/ExpressionParser.java
@@ -306,7 +306,8 @@ public class ExpressionParser {
       return Operator.OR;
     case NOT:
       return Operator.NOT;
+    default:
+      return null;
     }
-    return null;
   }
 }
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestClusterStatusPublisher.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestClusterStatusPublisher.java
index 44c6d8e988c..d8cbc0f7c7b 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestClusterStatusPublisher.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestClusterStatusPublisher.java
@@ -62,6 +62,7 @@ public class TestClusterStatusPublisher {
   @Test
   public void testMaxSend() {
     ClusterStatusPublisher csp = new ClusterStatusPublisher() {
+      @SuppressWarnings("MissingDefault")
       @Override
       protected List<Pair<ServerName, Long>> getDeadServers(long since) {
         List<Pair<ServerName, Long>> res = new ArrayList<>();
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestAssignmentManager.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestAssignmentManager.java
index a5e7135586a..0aac4c7dac6 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestAssignmentManager.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestAssignmentManager.java
@@ -765,6 +765,8 @@ public class TestAssignmentManager {
         case 0: throw new ServerNotRunningYetException("wait on server startup");
         case 1: throw new SocketTimeoutException("simulate socket timeout");
         case 2: throw new RemoteException("java.io.IOException", "unexpected exception");
+        default:
+          // fall out
       }
       return super.sendRequest(server, req);
     }
@@ -785,6 +787,8 @@ public class TestAssignmentManager {
           LOG.info("Return transition report that FAILED_OPEN/FAILED_OPENING response");
           sendTransitionReport(server, openReq.getRegion(), TransitionCode.FAILED_OPEN);
           return OpenRegionResponse.RegionOpeningState.FAILED_OPENING;
+        default:
+          // fall out
       }
       // The procedure on master will just hang forever because nothing comes back
       // from the RS in this case.