Revert "HBASE-19665 Add table based replication peers/queues storage …

…back"

This reverts commit 31978c3.

 Conflicts:
	hbase-replication/src/main/java/org/apache/hadoop/hbase/replication/TableReplicationStorageBase.java

hbase-replication/src/main/java/org/apache/hadoop/hbase/replication/ReplicationPeerStorage.java

@@ -42,8 +42,7 @@ void addPeer(String peerId, ReplicationPeerConfig peerConfig, boolean enabled)
 
   /**
    * Set the state of peer, {@code true} to {@code ENABLED}, otherwise to {@code DISABLED}.
-   * @throws ReplicationException if there are errors accessing the storage service or peer does not
-   *           exist.
+   * @throws ReplicationException if there are errors accessing the storage service.
    */
   void setPeerState(String peerId, boolean enabled) throws ReplicationException;
 

hbase-replication/src/main/java/org/apache/hadoop/hbase/replication/ReplicationStorageFactory.java

@@ -18,7 +18,6 @@
 package org.apache.hadoop.hbase.replication;
 
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.util.ReflectionUtils;
 import org.apache.hadoop.hbase.zookeeper.ZKWatcher;
 import org.apache.yetus.audience.InterfaceAudience;
 
@@ -30,36 +29,21 @@
 @InterfaceAudience.Private
 public final class ReplicationStorageFactory {
 
-  public static final String REPLICATION_PEER_STORAGE_IMPL = "hbase.replication.peer.storage.impl";
-  public static final String DEFAULT_REPLICATION_PEER_STORAGE_IMPL =
-      ZKReplicationPeerStorage.class.getName();
-
-  public static final String REPLICATION_QUEUE_STORAGE_IMPL =
-      "hbase.replication.queue.storage.impl";
-  public static final String DEFAULT_REPLICATION_QUEUE_STORAGE_IMPL =
-      ZKReplicationQueueStorage.class.getName();
-
   private ReplicationStorageFactory() {
   }
 
   /**
    * Create a new {@link ReplicationPeerStorage}.
    */
   public static ReplicationPeerStorage getReplicationPeerStorage(ZKWatcher zk, Configuration conf) {
-    String peerStorageClass =
-        conf.get(REPLICATION_PEER_STORAGE_IMPL, DEFAULT_REPLICATION_PEER_STORAGE_IMPL);
-    return ReflectionUtils.instantiateWithCustomCtor(peerStorageClass,
-      new Class[] { ZKWatcher.class, Configuration.class }, new Object[] { zk, conf });
+    return new ZKReplicationPeerStorage(zk, conf);
   }
 
   /**
    * Create a new {@link ReplicationQueueStorage}.
    */
   public static ReplicationQueueStorage getReplicationQueueStorage(ZKWatcher zk,
       Configuration conf) {
-    String queueStorageClass =
-        conf.get(REPLICATION_QUEUE_STORAGE_IMPL, DEFAULT_REPLICATION_QUEUE_STORAGE_IMPL);
-    return ReflectionUtils.instantiateWithCustomCtor(queueStorageClass,
-      new Class[] { ZKWatcher.class, Configuration.class }, new Object[] { zk, conf });
+    return new ZKReplicationQueueStorage(zk, conf);
   }
 }

hbase-replication/src/main/java/org/apache/hadoop/hbase/replication/ReplicationUtils.java

@@ -17,8 +17,6 @@
  */
 package org.apache.hadoop.hbase.replication;
 
-import static org.apache.hadoop.hbase.replication.ZKReplicationStorageBase.toByteArray;
-
 import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
@@ -32,19 +30,12 @@
 import org.apache.hadoop.hbase.TableName;
 import org.apache.yetus.audience.InterfaceAudience;
 
-import org.apache.hadoop.hbase.shaded.protobuf.generated.ReplicationProtos;
-
 /**
  * Helper class for replication.
  */
 @InterfaceAudience.Private
 public final class ReplicationUtils {
 
-  public static final byte[] PEER_STATE_ENABLED_BYTES =
-      toByteArray(ReplicationProtos.ReplicationState.State.ENABLED);
-  public static final byte[] PEER_STATE_DISABLED_BYTES =
-      toByteArray(ReplicationProtos.ReplicationState.State.DISABLED);
-
   private ReplicationUtils() {
   }
 
@@ -182,8 +173,4 @@ public static boolean contains(ReplicationPeerConfig peerConfig, TableName table
       return tableCFs != null && tableCFs.containsKey(tableName);
     }
   }
-
-  public static String parsePeerIdFromQueueId(String queueId) {
-    return new ReplicationQueueInfo(queueId).getPeerId();
-  }
 }