diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/executor/EventType.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/executor/EventType.java
similarity index 96%
rename from hbase-client/src/main/java/org/apache/hadoop/hbase/executor/EventType.java
rename to hbase-server/src/main/java/org/apache/hadoop/hbase/executor/EventType.java
index 03eb55a0e94..26fb63ad3f6 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/executor/EventType.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/executor/EventType.java
@@ -1,5 +1,4 @@
 /**
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +15,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.hadoop.hbase.executor;
 
 import org.apache.yetus.audience.InterfaceAudience;
@@ -295,20 +293,18 @@ public enum EventType {
   }
 
   public static EventType get(final int code) {
-    // Is this going to be slow?  Its used rare but still...
-    for (EventType et: EventType.values()) {
-      if (et.getCode() == code) return et;
+    // Is this going to be slow? Its used rare but still...
+    for (EventType et : EventType.values()) {
+      if (et.getCode() == code) {
+        return et;
+      }
     }
     throw new IllegalArgumentException("Unknown code " + code);
   }
 
   public boolean isOnlineSchemaChangeSupported() {
-    return (
-      this.equals(EventType.C_M_ADD_FAMILY) ||
-      this.equals(EventType.C_M_DELETE_FAMILY) ||
-      this.equals(EventType.C_M_MODIFY_FAMILY) ||
-      this.equals(EventType.C_M_MODIFY_TABLE)
-    );
+    return this.equals(EventType.C_M_ADD_FAMILY) || this.equals(EventType.C_M_DELETE_FAMILY) ||
+      this.equals(EventType.C_M_MODIFY_FAMILY) || this.equals(EventType.C_M_MODIFY_TABLE);
   }
 
   ExecutorType getExecutorServiceType() {
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/executor/ExecutorType.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/executor/ExecutorType.java
similarity index 93%
rename from hbase-client/src/main/java/org/apache/hadoop/hbase/executor/ExecutorType.java
rename to hbase-server/src/main/java/org/apache/hadoop/hbase/executor/ExecutorType.java
index 548c7a43b6b..c75a0a90246 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/executor/ExecutorType.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/executor/ExecutorType.java
@@ -1,5 +1,4 @@
 /**
- *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -16,7 +15,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.hadoop.hbase.executor;
 
 import org.apache.yetus.audience.InterfaceAudience;
@@ -50,11 +48,11 @@ public enum ExecutorType {
   RS_COMPACTED_FILES_DISCHARGER (29),
   RS_OPEN_PRIORITY_REGION    (30);
 
-  ExecutorType(int value) {}
+  ExecutorType(int value) {
+  }
 
   /**
-   * @param serverName
-   * @return Conflation of the executor type and the passed servername.
+   * @return Conflation of the executor type and the passed {@code serverName}.
    */
   String getExecutorName(String serverName) {
     return this.toString() + "-" + serverName.replace("%", "%%");