HBASE-22844 Fixed Checkstyle violations in client snapshot exceptions

Signed-off-by: stack <stack@apache.org>
This commit is contained in:
Jan Hentschel 2019-08-21 10:30:26 +02:00
parent bb31ffa9d2
commit 24a821c38d
No known key found for this signature in database
GPG Key ID: 5CD818B19CC299A3
10 changed files with 173 additions and 111 deletions

View File

@ -16,11 +16,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.hadoop.hbase.snapshot;
import org.apache.hadoop.hbase.classification.InterfaceAudience;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.classification.InterfaceAudience;
import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription;
import org.apache.hadoop.hbase.util.Bytes;
@ -29,18 +28,21 @@ import org.apache.hadoop.hbase.util.Bytes;
* There is a corresponding class on the server side.
*/
@InterfaceAudience.Private
public class ClientSnapshotDescriptionUtils {
public final class ClientSnapshotDescriptionUtils {
private ClientSnapshotDescriptionUtils() {
}
/**
* Check to make sure that the description of the snapshot requested is valid
* @param snapshot description of the snapshot
* @throws IllegalArgumentException if the name of the snapshot or the name of the table to
* snapshot are not valid names.
* snapshot are not valid names
*/
public static void assertSnapshotRequestIsValid(SnapshotDescription snapshot)
throws IllegalArgumentException {
// make sure the snapshot name is valid
TableName.isLegalTableQualifierName(Bytes.toBytes(snapshot.getName()), true);
if(snapshot.hasTable()) {
if (snapshot.hasTable()) {
// make sure the table name is valid, this will implicitly check validity
TableName tableName = TableName.valueOf(snapshot.getTable());
@ -51,24 +53,28 @@ public class ClientSnapshotDescriptionUtils {
}
/**
* Returns a single line (no \n) representation of snapshot metadata. Use this instead of
* {@link SnapshotDescription#toString()}. We don't replace SnapshotDescrpition's toString
* because it is auto-generated by protoc.
* @param ssd
* @return Single line string with a summary of the snapshot parameters
* Returns a single line (no \n) representation of snapshot metadata. Use this instead of
* {@link org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription#toString()}.
* We don't replace
* {@link org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription}'s
* {@code toString}, because it is auto-generated by protoc.
*
* @param snapshot description of the snapshot
* @return single line string with a summary of the snapshot parameters
*/
public static String toString(SnapshotDescription ssd) {
if (ssd == null) {
public static String toString(SnapshotDescription snapshot) {
if (snapshot == null) {
return null;
}
return new StringBuilder("{ ss=")
.append(ssd.getName())
.append(snapshot.getName())
.append(" table=")
.append(ssd.hasTable() ? TableName.valueOf(ssd.getTable()) : "")
.append(snapshot.hasTable() ? TableName.valueOf(snapshot.getTable()) : "")
.append(" type=")
.append(ssd.getType())
.append(snapshot.getType())
.append(" ttl=")
.append(ssd.getTtl())
.append(snapshot.getTtl())
.append(" }")
.toString();
}

View File

@ -19,36 +19,42 @@ package org.apache.hadoop.hbase.snapshot;
import org.apache.hadoop.hbase.classification.InterfaceAudience;
import org.apache.hadoop.hbase.classification.InterfaceStability;
import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription;
/**
* Exception thrown when the found snapshot info from the filesystem is not valid
* Exception thrown when the found snapshot info from the filesystem is not valid.
*/
@SuppressWarnings("serial")
@InterfaceAudience.Public
@InterfaceStability.Evolving
public class CorruptedSnapshotException extends HBaseSnapshotException {
/**
* Snapshot was corrupt for some reason.
*
* @param message message describing the exception
* @param e cause
* @param e the actual cause of the exception
*/
public CorruptedSnapshotException(String message, Exception e) {
super(message, e);
}
/**
* Snapshot was corrupt for some reason
* Snapshot was corrupt for some reason.
*
* @param message full description of the failure
* @param snapshot snapshot that was expected
* @param snapshotDescription snapshot that was expected
* @deprecated since 1.3.0, will be removed in 3.0.0
*/
@Deprecated
public CorruptedSnapshotException(String message, SnapshotDescription snapshot) {
super(message, snapshot);
public CorruptedSnapshotException(String message, SnapshotDescription snapshotDescription) {
super(message, snapshotDescription);
}
/**
* Snapshot was corrupt for some reason.
*
* @param message message describing the exception
*/
public CorruptedSnapshotException(String message) {

View File

@ -27,17 +27,16 @@ import org.apache.hadoop.hbase.classification.InterfaceStability;
@InterfaceStability.Stable
@SuppressWarnings("serial")
public class ExportSnapshotException extends HBaseSnapshotException {
/**
* @param msg message describing the exception
* @param message message describing the exception
*/
public ExportSnapshotException(String msg) {
super(msg);
public ExportSnapshotException(String message) {
super(message);
}
/**
* @param message message describing the exception
* @param e cause
* @param e the actual cause of the exception
*/
public ExportSnapshotException(String message, Exception e) {
super(message, e);

View File

@ -17,62 +17,73 @@
*/
package org.apache.hadoop.hbase.snapshot;
import org.apache.hadoop.hbase.DoNotRetryIOException;
import org.apache.hadoop.hbase.classification.InterfaceAudience;
import org.apache.hadoop.hbase.classification.InterfaceStability;
import org.apache.hadoop.hbase.DoNotRetryIOException;
import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription;
/**
* General exception base class for when a snapshot fails
* General exception base class for when a snapshot fails.
*/
@SuppressWarnings("serial")
@InterfaceAudience.Public
@InterfaceStability.Evolving
public class HBaseSnapshotException extends DoNotRetryIOException {
private SnapshotDescription description;
/**
* Some exception happened for a snapshot and don't even know the snapshot that it was about
* @param msg Full description of the failure
* Some exception happened for a snapshot and don't even know the snapshot that it was about.
*
* @param message the full description of the failure
*/
public HBaseSnapshotException(String msg) {
super(msg);
public HBaseSnapshotException(String message) {
super(message);
}
/**
* Exception for the given snapshot that has no previous root cause
* @param msg reason why the snapshot failed
* @param desc description of the snapshot that is being failed
* Exception for the given snapshot that has no previous root cause.
*
* @param message the reason why the snapshot failed
* @param snapshotDescription the description of the snapshot that is failing
* @deprecated since 1.3.0, will be removed in 3.0.0
*/
@Deprecated
public HBaseSnapshotException(String msg, SnapshotDescription desc) {
super(msg);
this.description = desc;
public HBaseSnapshotException(String message, SnapshotDescription snapshotDescription) {
super(message);
this.description = snapshotDescription;
}
/**
* Exception for the given snapshot due to another exception
* @param msg reason why the snapshot failed
* @param cause root cause of the failure
* @param desc description of the snapshot that is being failed
* Exception for the given snapshot due to another exception.
*
* @param message the reason why the snapshot failed
* @param cause the root cause of the failure
* @param snapshotDescription the description of the snapshot that is being failed
* @deprecated since 1.3.0, will be removed in 3.0.0
*/
@Deprecated
public HBaseSnapshotException(String msg, Throwable cause, SnapshotDescription desc) {
super(msg, cause);
this.description = desc;
public HBaseSnapshotException(String message, Throwable cause,
SnapshotDescription snapshotDescription) {
super(message, cause);
this.description = snapshotDescription;
}
/**
* Exception when the description of the snapshot cannot be determined, due to some root other
* root cause
* root cause.
*
* @param message description of what caused the failure
* @param e root cause
* @param e the root cause
*/
public HBaseSnapshotException(String message, Exception e) {
super(message, e);
}
/**
* @return the description of the snapshot that is being failed
* @deprecated since 1.3.0, will be removed in 3.0.0
*/
@Deprecated
public SnapshotDescription getSnapshotDescription() {
return this.description;

View File

@ -15,11 +15,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.hadoop.hbase.snapshot;
import org.apache.hadoop.hbase.classification.InterfaceAudience;
import org.apache.hadoop.hbase.classification.InterfaceStability;
import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription;
/**
@ -29,20 +29,39 @@ import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescriptio
@InterfaceAudience.Public
@InterfaceStability.Evolving
public class RestoreSnapshotException extends HBaseSnapshotException {
/**
* @param message reason why restoring the snapshot fails
* @param snapshotDescription description of the snapshot attempted
* @deprecated since 1.3.0, will be removed in 3.0.0
*/
@Deprecated
public RestoreSnapshotException(String msg, SnapshotDescription desc) {
super(msg, desc);
public RestoreSnapshotException(String message, SnapshotDescription snapshotDescription) {
super(message, snapshotDescription);
}
/**
* @param message reason why restoring the snapshot fails
* @param cause the root cause of the failure
* @param snapshotDescription description of the snapshot attempted
* @deprecated since 1.3.0, will be removed in 3.0.0
*/
@Deprecated
public RestoreSnapshotException(String msg, Throwable cause, SnapshotDescription desc) {
super(msg, cause, desc);
public RestoreSnapshotException(String message, Throwable cause,
SnapshotDescription snapshotDescription) {
super(message, cause, snapshotDescription);
}
public RestoreSnapshotException(String msg) {
super(msg);
/**
* @param message reason why restoring the snapshot fails
*/
public RestoreSnapshotException(String message) {
super(message);
}
/**
* @param message reason why restoring the snapshot fails
* @param e the root cause of the failure
*/
public RestoreSnapshotException(String message, Exception e) {
super(message, e);
}

View File

@ -19,6 +19,7 @@ package org.apache.hadoop.hbase.snapshot;
import org.apache.hadoop.hbase.classification.InterfaceAudience;
import org.apache.hadoop.hbase.classification.InterfaceStability;
import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription;
/**
@ -29,32 +30,36 @@ import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescriptio
@InterfaceAudience.Public
@InterfaceStability.Evolving
public class SnapshotCreationException extends HBaseSnapshotException {
/**
* Used internally by the RPC engine to pass the exception back to the client.
* @param msg error message to pass back
*
* @param message error message to pass back
*/
public SnapshotCreationException(String msg) {
super(msg);
public SnapshotCreationException(String message) {
super(message);
}
/**
* Failure to create the specified snapshot
* @param msg reason why the snapshot couldn't be completed
* @param desc description of the snapshot attempted
* Failure to create the specified snapshot.
*
* @param message reason why the snapshot couldn't be completed
* @param snapshotDescription description of the snapshot attempted
*/
public SnapshotCreationException(String msg, SnapshotDescription desc) {
super(msg, desc);
public SnapshotCreationException(String message, SnapshotDescription snapshotDescription) {
super(message, snapshotDescription);
}
/**
* Failure to create the specified snapshot due to an external cause
* @param msg reason why the snapshot couldn't be completed
* @param cause root cause of the failure
* @param desc description of the snapshot attempted
* Failure to create the specified snapshot due to an external cause.
*
* @param message reason why the snapshot couldn't be completed
* @param cause the root cause of the failure
* @param snapshotDescription description of the snapshot attempted
* @deprecated since 1.3.0, will be removed in 3.0.0
*/
@Deprecated
public SnapshotCreationException(String msg, Throwable cause, SnapshotDescription desc) {
super(msg, cause, desc);
public SnapshotCreationException(String message, Throwable cause,
SnapshotDescription snapshotDescription) {
super(message, cause, snapshotDescription);
}
}

View File

@ -19,28 +19,30 @@ package org.apache.hadoop.hbase.snapshot;
import org.apache.hadoop.hbase.classification.InterfaceAudience;
import org.apache.hadoop.hbase.classification.InterfaceStability;
import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription;
/**
* Thrown when the server is looking for a snapshot but can't find the snapshot on the filesystem
* Thrown when the server is looking for a snapshot, but can't find the snapshot on the filesystem.
*/
@SuppressWarnings("serial")
@InterfaceAudience.Public
@InterfaceStability.Evolving
public class SnapshotDoesNotExistException extends HBaseSnapshotException {
/**
* @param msg full description of the failure
* @param message the full description of the failure
*/
public SnapshotDoesNotExistException(String msg) {
super(msg);
public SnapshotDoesNotExistException(String message) {
super(message);
}
/**
* @param desc expected snapshot to find
* @param snapshotDescription expected snapshot to find
* @deprecated since 1.3.0, will be removed in 3.0.0
*/
@Deprecated
public SnapshotDoesNotExistException(SnapshotDescription desc) {
super("Snapshot '" + desc.getName() +"' doesn't exist on the filesystem", desc);
public SnapshotDoesNotExistException(SnapshotDescription snapshotDescription) {
super("Snapshot '" + snapshotDescription.getName() + "' doesn't exist on the filesystem",
snapshotDescription);
}
}

View File

@ -19,26 +19,34 @@ package org.apache.hadoop.hbase.snapshot;
import org.apache.hadoop.hbase.classification.InterfaceAudience;
import org.apache.hadoop.hbase.classification.InterfaceStability;
import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription;
/**
* Thrown when a snapshot exists but should not
* Thrown when a snapshot exists, but should not.
*/
@SuppressWarnings("serial")
@InterfaceAudience.Public
@InterfaceStability.Evolving
public class SnapshotExistsException extends HBaseSnapshotException {
public SnapshotExistsException(String msg) {
super(msg);
/**
* Failure due to the snapshot already existing.
*
* @param message the full description of the failure
*/
public SnapshotExistsException(String message) {
super(message);
}
/**
* Failure due to the snapshot already existing
* @param msg full description of the failure
* @param desc snapshot that was attempted
* Failure due to the snapshot already existing.
*
* @param message the full description of the failure
* @param snapshotDescription snapshot that was attempted
* @deprecated since 1.3.0, will be removed in 3.0.0
*/
@Deprecated
public SnapshotExistsException(String msg, SnapshotDescription desc) {
super(msg, desc);
public SnapshotExistsException(String message, SnapshotDescription snapshotDescription) {
super(message, snapshotDescription);
}
}

View File

@ -17,43 +17,47 @@
*/
package org.apache.hadoop.hbase.snapshot;
import org.apache.hadoop.hbase.classification.InterfaceAudience;
import org.apache.hadoop.hbase.classification.InterfaceStability;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.util.Bytes;
import java.io.IOException;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.classification.InterfaceAudience;
import org.apache.hadoop.hbase.classification.InterfaceStability;
import org.apache.hadoop.hbase.util.Bytes;
/**
* Thrown if a table should be online/offline but is partially open
* Thrown if a table should be online/offline, but is partially open.
*/
@InterfaceAudience.Public
@InterfaceStability.Evolving
public class TablePartiallyOpenException extends IOException {
private static final long serialVersionUID = 3571982660065058361L;
/**
* Constructs an {@code TablePartiallyOpenException} with {@code null} as its error detail
* message.
*/
public TablePartiallyOpenException() {
super();
}
/**
* @param s message
* @param message the message describing the exception
*/
public TablePartiallyOpenException(String s) {
super(s);
public TablePartiallyOpenException(String message) {
super(message);
}
/**
* @param tableName Name of table that is partial open
* @param tableName the name of the table that is partially open
*/
public TablePartiallyOpenException(TableName tableName) {
this(tableName.getNameAsString());
}
/**
* @param tableName Name of table that is partial open
*/
public TablePartiallyOpenException(byte[] tableName) {
this(Bytes.toString(tableName));
}
* @param tableName the name of the table that is partially open
*/
public TablePartiallyOpenException(byte[] tableName) {
this(Bytes.toString(tableName));
}
}

View File

@ -27,16 +27,18 @@ import org.apache.hadoop.hbase.classification.InterfaceStability;
@InterfaceAudience.Public
@InterfaceStability.Evolving
public class UnknownSnapshotException extends HBaseSnapshotException {
/**
* @param message full information about the failure
*/
public UnknownSnapshotException(String message) {
super(message);
}
/**
* @param msg full information about the failure
* @param message full information about the failure
* @param e the actual cause of the exception
*/
public UnknownSnapshotException(String msg) {
super(msg);
public UnknownSnapshotException(String message, Exception e) {
super(message, e);
}
public UnknownSnapshotException(String msg, Exception e) {
super(msg, e);
}
}