From 1d2b8a033d9b68c8a8b22646b2dadd786bb48fc3 Mon Sep 17 00:00:00 2001
From: sunyuting1 <49149058+sunyuting1@users.noreply.github.com>
Date: Wed, 19 Jan 2022 19:25:06 +0800
Subject: [PATCH] HBASE-26661 Remove deprecated methods in MasterObserver
 (#4031)

Signrd-off-by: Duo Zhang <zhangduo@apache.org>
---
 .../hbase/coprocessor/MasterObserver.java     | 95 +------------------
 1 file changed, 5 insertions(+), 90 deletions(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java
index 02607b732ddf..076c18a09ca7 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MasterObserver.java
@@ -225,18 +225,6 @@ default void postCompletedTruncateTableAction(
       final ObserverContext<MasterCoprocessorEnvironment> ctx, final TableName tableName)
       throws IOException {}
 
-  /**
-   * Called prior to modifying a table's properties.  Called as part of modify
-   * table RPC call.
-   * @param ctx the environment to interact with the framework and master
-   * @param tableName the name of the table
-   * @param newDescriptor after modify operation, table will have this descriptor
-   * @deprecated Since 2.1. Will be removed in 3.0.
-   */
-  @Deprecated
-  default void preModifyTable(final ObserverContext<MasterCoprocessorEnvironment> ctx,
-    final TableName tableName, TableDescriptor newDescriptor) throws IOException {}
-
   /**
    * Called prior to modifying a table's properties.  Called as part of modify
    * table RPC call.
@@ -248,22 +236,9 @@ default void preModifyTable(final ObserverContext<MasterCoprocessorEnvironment>
   default TableDescriptor preModifyTable(final ObserverContext<MasterCoprocessorEnvironment> ctx,
       final TableName tableName, TableDescriptor currentDescriptor, TableDescriptor newDescriptor)
       throws IOException {
-    preModifyTable(ctx, tableName, newDescriptor);
     return newDescriptor;
   }
 
-  /**
-   * Called after the modifyTable operation has been requested.  Called as part
-   * of modify table RPC call.
-   * @param ctx the environment to interact with the framework and master
-   * @param tableName the name of the table
-   * @param currentDescriptor current TableDescriptor of the table
-   * @deprecated Since 2.1. Will be removed in 3.0.
-   */
-  @Deprecated
-  default void postModifyTable(final ObserverContext<MasterCoprocessorEnvironment> ctx,
-    final TableName tableName, TableDescriptor currentDescriptor) throws IOException {}
-
   /**
    * Called after the modifyTable operation has been requested.  Called as part
    * of modify table RPC call.
@@ -274,24 +249,7 @@ default void postModifyTable(final ObserverContext<MasterCoprocessorEnvironment>
    */
   default void postModifyTable(final ObserverContext<MasterCoprocessorEnvironment> ctx,
       final TableName tableName, TableDescriptor oldDescriptor, TableDescriptor currentDescriptor)
-    throws IOException {
-    postModifyTable(ctx, tableName, currentDescriptor);
-  }
-
-  /**
-   * Called prior to modifying a table's properties.  Called as part of modify
-   * table procedure and it is async to the modify table RPC call.
-   *
-   * @param ctx the environment to interact with the framework and master
-   * @param tableName the name of the table
-   * @param newDescriptor after modify operation, table will have this descriptor
-   * @deprecated Since 2.1. Will be removed in 3.0.
-   */
-  @Deprecated
-  default void preModifyTableAction(
-    final ObserverContext<MasterCoprocessorEnvironment> ctx,
-    final TableName tableName,
-    final TableDescriptor newDescriptor) throws IOException {}
+    throws IOException {}
 
   /**
    * Called prior to modifying a table's properties.  Called as part of modify
@@ -306,24 +264,7 @@ default void preModifyTableAction(
       final ObserverContext<MasterCoprocessorEnvironment> ctx,
       final TableName tableName,
       final TableDescriptor currentDescriptor,
-      final TableDescriptor newDescriptor) throws IOException {
-    preModifyTableAction(ctx, tableName, newDescriptor);
-  }
-
-  /**
-   * Called after to modifying a table's properties.  Called as part of modify
-   * table procedure and it is async to the modify table RPC call.
-   *
-   * @param ctx the environment to interact with the framework and master
-   * @param tableName the name of the table
-   * @param currentDescriptor current TableDescriptor of the table
-   * @deprecated Since 2.1. Will be removed in 3.0.
-   */
-  @Deprecated
-  default void postCompletedModifyTableAction(
-    final ObserverContext<MasterCoprocessorEnvironment> ctx,
-    final TableName tableName,
-    final TableDescriptor currentDescriptor) throws IOException {}
+      final TableDescriptor newDescriptor) throws IOException {}
 
   /**
    * Called after to modifying a table's properties.  Called as part of modify
@@ -338,9 +279,7 @@ default void postCompletedModifyTableAction(
       final ObserverContext<MasterCoprocessorEnvironment> ctx,
       final TableName tableName,
       final TableDescriptor oldDescriptor,
-      final TableDescriptor currentDescriptor) throws IOException {
-    postCompletedModifyTableAction(ctx, tableName, currentDescriptor);
-  }
+      final TableDescriptor currentDescriptor) throws IOException {}
 
   /**
    * Called prior to enabling a table.  Called as part of enable table RPC call.
@@ -916,16 +855,6 @@ default void preDeleteNamespace(final ObserverContext<MasterCoprocessorEnvironme
   default void postDeleteNamespace(final ObserverContext<MasterCoprocessorEnvironment> ctx,
       String namespace) throws IOException {}
 
-  /**
-   * Called prior to modifying a namespace's properties.
-   * @param ctx the environment to interact with the framework and master
-   * @param newNsDescriptor after modify operation, namespace will have this descriptor
-   * @deprecated Since 2.1. Will be removed in 3.0.
-   */
-  @Deprecated
-  default void preModifyNamespace(final ObserverContext<MasterCoprocessorEnvironment> ctx,
-    NamespaceDescriptor newNsDescriptor) throws IOException {}
-
   /**
    * Called prior to modifying a namespace's properties.
    * @param ctx the environment to interact with the framework and master
@@ -934,19 +863,7 @@ default void preModifyNamespace(final ObserverContext<MasterCoprocessorEnvironme
    */
   default void preModifyNamespace(final ObserverContext<MasterCoprocessorEnvironment> ctx,
       NamespaceDescriptor currentNsDescriptor, NamespaceDescriptor newNsDescriptor)
-    throws IOException {
-    preModifyNamespace(ctx, newNsDescriptor);
-  }
-
-  /**
-   * Called after the modifyNamespace operation has been requested.
-   * @param ctx the environment to interact with the framework and master
-   * @param currentNsDescriptor current NamespaceDescriptor of the namespace
-   * @deprecated Since 2.1. Will be removed in 3.0.
-   */
-  @Deprecated
-  default void postModifyNamespace(final ObserverContext<MasterCoprocessorEnvironment> ctx,
-    NamespaceDescriptor currentNsDescriptor) throws IOException {}
+    throws IOException {}
 
   /**
    * Called after the modifyNamespace operation has been requested.
@@ -956,9 +873,7 @@ default void postModifyNamespace(final ObserverContext<MasterCoprocessorEnvironm
    */
   default void postModifyNamespace(final ObserverContext<MasterCoprocessorEnvironment> ctx,
       NamespaceDescriptor oldNsDescriptor, NamespaceDescriptor currentNsDescriptor)
-    throws IOException {
-    postModifyNamespace(ctx, currentNsDescriptor);
-  }
+    throws IOException {}
 
   /**
    * Called before a getNamespaceDescriptor request has been processed.