diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java index c8b91a9d31d..7b1d01631d9 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java @@ -1526,6 +1526,7 @@ public interface Admin extends Abortable, Closeable { * */ void releaseSplitOrMergeLockAndRollback() throws IOException; + @Deprecated @InterfaceAudience.Public @InterfaceStability.Evolving public enum MasterSwitchType { diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/CorruptedSnapshotException.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/CorruptedSnapshotException.java index 2c6cc355008..d29c89cb58e 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/CorruptedSnapshotException.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/CorruptedSnapshotException.java @@ -43,6 +43,7 @@ public class CorruptedSnapshotException extends HBaseSnapshotException { * @param message full description of the failure * @param snapshot snapshot that was expected */ + @Deprecated public CorruptedSnapshotException(String message, SnapshotDescription snapshot) { super(message, snapshot); } diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/HBaseSnapshotException.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/HBaseSnapshotException.java index 4a28461f3d2..cd2f66fa5cd 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/HBaseSnapshotException.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/HBaseSnapshotException.java @@ -45,6 +45,7 @@ public class HBaseSnapshotException extends DoNotRetryIOException { * @param msg reason why the snapshot failed * @param desc description of the snapshot that is being failed */ + @Deprecated public HBaseSnapshotException(String msg, SnapshotDescription desc) { super(msg); this.description = desc; @@ -56,6 +57,7 @@ public class HBaseSnapshotException extends DoNotRetryIOException { * @param cause root cause of the failure * @param desc description of the snapshot that is being failed */ + @Deprecated public HBaseSnapshotException(String msg, Throwable cause, SnapshotDescription desc) { super(msg, cause); this.description = desc; @@ -71,6 +73,7 @@ public class HBaseSnapshotException extends DoNotRetryIOException { super(message, e); } + @Deprecated public SnapshotDescription getSnapshotDescription() { return this.description; } diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/RestoreSnapshotException.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/RestoreSnapshotException.java index c36d482c88b..25cd583b03a 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/RestoreSnapshotException.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/RestoreSnapshotException.java @@ -29,10 +29,12 @@ import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescriptio @InterfaceAudience.Public @InterfaceStability.Evolving public class RestoreSnapshotException extends HBaseSnapshotException { + @Deprecated public RestoreSnapshotException(String msg, SnapshotDescription desc) { super(msg, desc); } + @Deprecated public RestoreSnapshotException(String msg, Throwable cause, SnapshotDescription desc) { super(msg, cause, desc); } diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotCreationException.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotCreationException.java index 2f7d2be627b..324d41f3c6a 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotCreationException.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotCreationException.java @@ -53,6 +53,7 @@ public class SnapshotCreationException extends HBaseSnapshotException { * @param cause root cause of the failure * @param desc description of the snapshot attempted */ + @Deprecated public SnapshotCreationException(String msg, Throwable cause, SnapshotDescription desc) { super(msg, cause, desc); } diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotDoesNotExistException.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotDoesNotExistException.java index d9ecd14f004..6ba45bddc92 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotDoesNotExistException.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotDoesNotExistException.java @@ -39,6 +39,7 @@ public class SnapshotDoesNotExistException extends HBaseSnapshotException { /** * @param desc expected snapshot to find */ + @Deprecated public SnapshotDoesNotExistException(SnapshotDescription desc) { super("Snapshot '" + desc.getName() +"' doesn't exist on the filesystem", desc); } diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotExistsException.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotExistsException.java index 172c89e70fb..ff3cdcb87c8 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotExistsException.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/snapshot/SnapshotExistsException.java @@ -37,6 +37,7 @@ public class SnapshotExistsException extends HBaseSnapshotException { * @param msg full description of the failure * @param desc snapshot that was attempted */ + @Deprecated public SnapshotExistsException(String msg, SnapshotDescription desc) { super(msg, desc); }