HADOOP-17244 checkstyles

Change-Id: I33dd5f1198d2182dd8e214f6f46e1c9c37679be8

Author: steveloughran

hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/impl/MultiObjectDeleteSupport.java

@@ -89,8 +89,8 @@ public static IOException translateDeleteException(
       final MultiObjectDeleteException deleteException) {
     List<MultiObjectDeleteException.DeleteError> errors
         = deleteException.getErrors();
-    LOG.warn(
-        "Bulk delete operation failed to delete all objects; failure count = {}",
+    LOG.warn("Bulk delete operation failed to delete all objects;"
+            + " failure count = {}",
         errors.size());
     final StringBuilder result = new StringBuilder(
         errors.size() * 256);
@@ -328,7 +328,8 @@ static List<KeyPath> removeUndeletedPaths(
       final Collection<KeyPath> pathsBeingDeleted,
       final Function<String, Path> qualifier) {
     // get the undeleted values
-    List<KeyPath> undeleted = extractUndeletedKeyPaths(deleteException, qualifier);
+    List<KeyPath> undeleted = extractUndeletedKeyPaths(deleteException,
+        qualifier);
     // and remove them from the undeleted list, matching on key
     for (KeyPath undel : undeleted) {
       pathsBeingDeleted.removeIf(kp -> kp.getPath().equals(undel.getPath()));
@@ -357,9 +358,12 @@ public List<Path> processDeleteFailureGenericException(Exception ex,
    * </p>
    */
   public static final class KeyPath {
-    public final String key;
-    public final Path path;
-    public final boolean directoryMarker;
+    /** Key in bucket. */
+    private final String key;
+    /** Full path. */
+    private final Path path;
+    /** Is this a directory marker? */
+    private final boolean directoryMarker;
 
     public KeyPath(final String key,
         final Path path,
@@ -395,8 +399,12 @@ public String toString() {
      */
     @Override
     public boolean equals(final Object o) {
-      if (this == o) { return true; }
-      if (o == null || getClass() != o.getClass()) { return false; }
+      if (this == o) {
+        return true;
+      }
+      if (o == null || getClass() != o.getClass()) {
+        return false;
+      }
       KeyPath keyPath = (KeyPath) o;
       return key.equals(keyPath.key);
     }

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/impl/ITestPartialRenamesDeletes.java

@@ -665,15 +665,16 @@ public void testPartialDirDelete() throws Throwable {
     // this set can be deleted by the role FS
     MetricDiff rejectionCount = new MetricDiff(roleFS, FILES_DELETE_REJECTED);
     MetricDiff deleteVerbCount = new MetricDiff(roleFS, OBJECT_DELETE_REQUESTS);
-    MetricDiff deleteObjectCount = new MetricDiff(roleFS, OBJECT_DELETE_OBJECTS);
+    MetricDiff deleteObjectCount = new MetricDiff(roleFS,
+        OBJECT_DELETE_OBJECTS);
 
     describe("Trying to delete read only directory");
     AccessDeniedException ex = expectDeleteForbidden(readOnlyDir);
     if (multiDelete) {
       // multi-delete status checks
       extractCause(MultiObjectDeleteException.class, ex);
       deleteVerbCount.assertDiffEquals("Wrong delete request count", 1);
-      deleteObjectCount.assertDiffEquals("Wrong count of objects in delete request",
+      deleteObjectCount.assertDiffEquals("Number of keys in delete request",
           readOnlyFiles.size());
       rejectionCount.assertDiffEquals("Wrong rejection count",
           readOnlyFiles.size());