HADOOP-15183 address checkstyle and review comments

Change-Id: I1185b21cb14d9c2238a27dc00f5eac930959f1a4

Author: steveloughran

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

@@ -1368,7 +1368,7 @@ private long innerRename(Path source, Path dest)
         dstKey = maybeAddTrailingSlash(dstKey);
         srcKey = maybeAddTrailingSlash(srcKey);
 
-        //Verify dest is not a child of the source directory
+        // Verify dest is not a child of the source directory
         if (dstKey.startsWith(srcKey)) {
           throw new RenameFailedException(srcKey, dstKey,
               "cannot rename a directory to a subdirectory of itself ");
@@ -1520,7 +1520,7 @@ private void removeSourceObjects(
     List<Path> undeletedObjects = new ArrayList<>();
     try {
       // remove the keys
-      // this does will update the metastore on a failure, but on
+      // this will update the metastore on a failure, but on
       // a successful operation leaves the store as is.
       removeKeys(keysToDelete, false, undeletedObjects);
       // and clear the list.

hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/s3guard/MetadataStore.java

@@ -200,7 +200,7 @@ void move(
    */
   @RetryTranslated
   void put(PathMetadata meta,
-      @Nullable BulkOperationState BulkOperationState) throws IOException;
+      @Nullable BulkOperationState operationState) throws IOException;
 
   /**
    * Saves metadata for any number of paths.
@@ -233,7 +233,7 @@ void put(Collection<PathMetadata> metas,
    * @throws IOException if there is an error
    */
   void put(final DirListingMetadata meta,
-      @Nullable final BulkOperationState operationState) throws IOException;
+      @Nullable BulkOperationState operationState) throws IOException;
 
   /**
    * Destroy all resources associated with the metadata store.

hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/s3guard/S3Guard.java

@@ -511,7 +511,8 @@ public static void addMoveAncestors(MetadataStore ms,
 
   /**
    * This adds all new ancestors of a path as directories.
-   * This forwards to {@link MetadataStore#addAncestors(Path, BulkOperationState)}.
+   * This forwards to
+   * {@link MetadataStore#addAncestors(Path, BulkOperationState)}.
    * <p>
    * Originally it implemented the logic to probe for an add ancestors,
    * but with the addition of a store-specific bulk operation state

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

@@ -116,7 +116,8 @@ private Path maybeGetCsvPath() {
   public void testMultiObjectDeleteNoPermissions() throws Throwable {
     describe("Delete the landsat CSV file and expect it to fail");
     Path csvPath = maybeGetCsvPath();
-    S3AFileSystem fs = (S3AFileSystem)csvPath.getFileSystem(getConfiguration());
+    S3AFileSystem fs = (S3AFileSystem) csvPath.getFileSystem(
+        getConfiguration());
     List<DeleteObjectsRequest.KeyVersion> keys
         = buildDeleteRequest(
             new String[]{

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/commit/ITestCommitOperations.java

@@ -278,7 +278,8 @@ public void testBaseRelativePath() throws Throwable {
     String child = "subdir/child.txt";
     Path pendingChildPath = new Path(pendingBaseDir, child);
     Path expectedDestPath = new Path(destDir, child);
-    assertPathDoesNotExist("dest file was found before upload", expectedDestPath);
+    assertPathDoesNotExist("dest file was found before upload",
+        expectedDestPath);
 
     createFile(fs, pendingChildPath, true, DATASET);
     commit("child.txt", pendingChildPath, expectedDestPath, 0, 0);

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/commit/magic/ITestMagicCommitMRJob.java

@@ -26,9 +26,7 @@
 
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.fs.contract.ContractTestUtils;
 import org.apache.hadoop.fs.s3a.S3AFileSystem;
-import org.apache.hadoop.fs.s3a.S3AUtils;
 import org.apache.hadoop.fs.s3a.commit.AbstractITCommitMRJob;
 import org.apache.hadoop.fs.s3a.commit.files.SuccessData;
 import org.apache.hadoop.mapred.JobConf;

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

@@ -695,8 +695,8 @@ public void testPartialDirDelete() throws Throwable {
         .as("ReadOnly directory " + directoryList)
         .containsAll(readOnlyFiles);
 
-    // do this prune in the test as well as teardown, so that the test reporting includes
-    // it in the runtime of a successful run.
+    // do this prune in the test as well as teardown, so that the test
+    // reporting includes it in the runtime of a successful run.
     prune(basePath);
   }
 

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/s3guard/ITestDynamoDBMetadataStore.java

@@ -303,7 +303,7 @@ public static void deleteMetadataUnderPath(final DynamoDBMetadataStore ms,
       if (meta != null) {
         for (DescendantsIterator desc = new DescendantsIterator(ms,
             meta);
-            desc.hasNext(); ) {
+            desc.hasNext();) {
           forgotten++;
           ms.forgetMetadata(desc.next().getPath());
         }
@@ -1006,7 +1006,8 @@ protected void verifyStoreTags(final Map<String, String> tagMap,
   protected List<Tag> listTagsOfStore(final DynamoDBMetadataStore store) {
     ListTagsOfResourceRequest listTagsOfResourceRequest =
         new ListTagsOfResourceRequest()
-            .withResourceArn(store.getTable().getDescription().getTableArn());
+            .withResourceArn(store.getTable().getDescription()
+                .getTableArn());
     return store.getAmazonDynamoDB()
         .listTagsOfResource(listTagsOfResourceRequest).getTags();
   }

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/s3guard/ITestDynamoDBMetadataStoreScale.java

@@ -68,8 +68,8 @@
  * to overload the system and them have them back of until they finally complete.
  * <p>
  * With DDB on demand, throttling is very unlikely.
- * Here the tests simply run to completion, so act as regression tests on parallel
- * invocations on the metastore APIs
+ * Here the tests simply run to completion, so act as regression tests of
+ * parallel invocations on the metastore APIs
  */
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class ITestDynamoDBMetadataStoreScale
@@ -176,7 +176,7 @@ public void teardown() throws Exception {
   }
 
   private boolean expectThrottling() {
-      return !isOverProvisionedForTest && !isOnDemandTable;
+    return !isOverProvisionedForTest && !isOnDemandTable;
   }
 
   /**
@@ -351,14 +351,14 @@ public void test_070_putDirMarker() throws Throwable {
     PathMetadata metadata = new PathMetadata(status);
     ddbms.put(metadata, null);
     DirListingMetadata children = ddbms.listChildren(path.getParent());
-    try(DynamoDBMetadataStore.AncestorState state = ddbms.initiateBulkWrite(
-        BulkOperationState.OperationType.Put,
-        path)) {
+    try (DynamoDBMetadataStore.AncestorState state =
+             ddbms.initiateBulkWrite(
+                 BulkOperationState.OperationType.Put,
+                 path)) {
       execute("list",
           OPERATIONS_PER_THREAD,
           expectThrottling(),
-          () -> ddbms.put(children, state)
-      );
+          () -> ddbms.put(children, state));
     } finally {
       retryingDelete(path);
     }

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/s3guard/ThrottleTracker.java

@@ -45,7 +45,7 @@ class ThrottleTracker {
 
   private long batchThrottles;
 
-  public ThrottleTracker(final DynamoDBMetadataStore ddbms) {
+  ThrottleTracker(final DynamoDBMetadataStore ddbms) {
     this.ddbms = ddbms;
     reset();
   }