undo extra formatting

Author: sumangala17

hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystem.java

@@ -143,18 +143,17 @@ public void initialize(URI uri, Configuration configuration)
         configuration, abfsCounters);
     LOG.trace("AzureBlobFileSystemStore init complete");
 
-    final AbfsConfiguration abfsConfiguration = abfsStore.getAbfsConfiguration();
+    final AbfsConfiguration abfsConfiguration = abfsStore
+        .getAbfsConfiguration();
     clientCorrelationId = TracingContext.validateClientCorrelationID(
         abfsConfiguration.getClientCorrelationId());
     tracingHeaderFormat = abfsConfiguration.getTracingHeaderFormat();
     this.setWorkingDirectory(this.getHomeDirectory());
 
     if (abfsConfiguration.getCreateRemoteFileSystemDuringInitialization()) {
       TracingContext tracingContext = new TracingContext(clientCorrelationId,
-          fileSystemId, FSOperationType.CREATE_FILESYSTEM, tracingHeaderFormat,
-          listener);
-      if (this.tryGetFileStatus(new Path(AbfsHttpConstants.ROOT_PATH),
-          tracingContext) == null) {
+          fileSystemId, FSOperationType.CREATE_FILESYSTEM, tracingHeaderFormat, listener);
+      if (this.tryGetFileStatus(new Path(AbfsHttpConstants.ROOT_PATH), tracingContext) == null) {
         try {
           this.createFileSystem(tracingContext);
         } catch (AzureBlobFileSystemException ex) {
@@ -182,7 +181,8 @@ public void initialize(URI uri, Configuration configuration)
 
   @Override
   public String toString() {
-    final StringBuilder sb = new StringBuilder("AzureBlobFileSystem{");
+    final StringBuilder sb = new StringBuilder(
+        "AzureBlobFileSystem{");
     sb.append("uri=").append(uri);
     sb.append(", user='").append(abfsStore.getUser()).append('\'');
     sb.append(", primaryUserGroup='").append(abfsStore.getPrimaryGroup()).append('\'');
@@ -205,8 +205,7 @@ public void registerListener(Listener listener1) {
 
   @Override
   public FSDataInputStream open(final Path path, final int bufferSize) throws IOException {
-    LOG.debug("AzureBlobFileSystem.open path: {} bufferSize: {}", path,
-        bufferSize);
+    LOG.debug("AzureBlobFileSystem.open path: {} bufferSize: {}", path, bufferSize);
     // bufferSize is unused.
     return open(path, Optional.empty());
   }
@@ -219,10 +218,10 @@ private FSDataInputStream open(final Path path,
     try {
       TracingContext tracingContext = new TracingContext(clientCorrelationId,
           fileSystemId, FSOperationType.OPEN, tracingHeaderFormat, listener);
-      InputStream inputStream = abfsStore.openFileForRead(qualifiedPath,
-          parameters, statistics, tracingContext);
+      InputStream inputStream = abfsStore
+          .openFileForRead(qualifiedPath, parameters, statistics, tracingContext);
       return new FSDataInputStream(inputStream);
-    } catch (AzureBlobFileSystemException ex) {
+    } catch(AzureBlobFileSystemException ex) {
       checkException(path, ex);
       return null;
     }
@@ -233,18 +232,21 @@ private FSDataInputStream open(final Path path,
    * {@link org.apache.hadoop.fs.impl.OpenFileParameters}. Ensure that
    * FileStatus entered is up-to-date, as it will be used to create the
    * InputStream (with info such as contentLength, eTag)
-   *
    * @param path       The location of file to be opened
    * @param parameters OpenFileParameters instance; can hold FileStatus,
    *                   Configuration, bufferSize and mandatoryKeys
    */
   @Override
   protected CompletableFuture<FSDataInputStream> openFileWithOptions(
-      final Path path, final OpenFileParameters parameters) throws IOException {
+      final Path path, final OpenFileParameters parameters) {
     LOG.debug("AzureBlobFileSystem.openFileWithOptions path: {}", path);
     AbstractFSBuilderImpl.rejectUnknownMandatoryKeys(
-        parameters.getMandatoryKeys(), Collections.emptySet(), "for " + path);
-    return LambdaUtils.eval(new CompletableFuture<>(), () -> open(path, Optional.of(parameters)));
+        parameters.getMandatoryKeys(),
+        Collections.emptySet(),
+        "for " + path);
+    return LambdaUtils.eval(
+        new CompletableFuture<>(), () ->
+            open(path, Optional.of(parameters)));
   }
 
   @Override
@@ -253,7 +255,10 @@ public FSDataOutputStream create(final Path f, final FsPermission permission,
       final long blockSize, final Progressable progress) throws IOException {
     LOG.debug(
         "AzureBlobFileSystem.create path: {} permission: {} overwrite: {} bufferSize: {}",
-        f, permission, overwrite, blockSize);
+        f,
+        permission,
+        overwrite,
+        blockSize);
 
     statIncrement(CALL_CREATE);
     trailingPeriodCheck(f);
@@ -262,8 +267,7 @@ public FSDataOutputStream create(final Path f, final FsPermission permission,
 
     try {
       TracingContext tracingContext = new TracingContext(clientCorrelationId,
-          fileSystemId, FSOperationType.CREATE, overwrite, tracingHeaderFormat,
-          listener);
+          fileSystemId, FSOperationType.CREATE, overwrite, tracingHeaderFormat, listener);
       OutputStream outputStream = abfsStore.createFile(qualifiedPath, statistics, overwrite,
           permission == null ? FsPermission.getFileDefault() : permission,
           FsPermission.getUMask(getConf()), tracingContext);
@@ -289,11 +293,11 @@ public FSDataOutputStream createNonRecursive(final Path f, final FsPermission pe
     final FileStatus parentFileStatus = tryGetFileStatus(parent, tracingContext);
 
     if (parentFileStatus == null) {
-      throw new FileNotFoundException("Cannot create file " + f.getName() + " because parent folder does not exist.");
+      throw new FileNotFoundException("Cannot create file "
+          + f.getName() + " because parent folder does not exist.");
     }
 
-    return create(f, permission, overwrite, bufferSize, replication, blockSize,
-        progress);
+    return create(f, permission, overwrite, bufferSize, replication, blockSize, progress);
   }
 
   @Override
@@ -304,38 +308,40 @@ public FSDataOutputStream createNonRecursive(final Path f, final FsPermission pe
 
     // Check if file should be appended or overwritten. Assume that the file
     // is overwritten on if the CREATE and OVERWRITE create flags are set.
-    final EnumSet<CreateFlag> createflags = EnumSet.of(CreateFlag.CREATE,
-        CreateFlag.OVERWRITE);
+    final EnumSet<CreateFlag> createflags =
+        EnumSet.of(CreateFlag.CREATE, CreateFlag.OVERWRITE);
     final boolean overwrite = flags.containsAll(createflags);
 
     // Delegate the create non-recursive call.
-    return this.createNonRecursive(f, permission, overwrite, bufferSize,
-        replication, blockSize, progress);
+    return this.createNonRecursive(f, permission, overwrite,
+        bufferSize, replication, blockSize, progress);
   }
 
   @Override
   @SuppressWarnings("deprecation")
   public FSDataOutputStream createNonRecursive(final Path f,
-      final boolean overwrite, final int bufferSize, final short replication,
-      final long blockSize, final Progressable progress) throws IOException {
-    return this.createNonRecursive(f, FsPermission.getFileDefault(), overwrite,
-        bufferSize, replication, blockSize, progress);
+      final boolean overwrite, final int bufferSize, final short replication, final long blockSize,
+      final Progressable progress) throws IOException {
+    return this.createNonRecursive(f, FsPermission.getFileDefault(),
+        overwrite, bufferSize, replication, blockSize, progress);
   }
 
   @Override
   public FSDataOutputStream append(final Path f, final int bufferSize, final Progressable progress) throws IOException {
     LOG.debug("AzureBlobFileSystem.append path: {} bufferSize: {}",
-        f.toString(), bufferSize);
+        f.toString(),
+        bufferSize);
     statIncrement(CALL_APPEND);
     Path qualifiedPath = makeQualified(f);
 
     try {
       TracingContext tracingContext = new TracingContext(clientCorrelationId,
-          fileSystemId, FSOperationType.APPEND, tracingHeaderFormat, listener);
-      OutputStream outputStream = abfsStore.openFileForWrite(qualifiedPath,
-          statistics, false, tracingContext);
+          fileSystemId, FSOperationType.APPEND, tracingHeaderFormat,
+          listener);
+      OutputStream outputStream = abfsStore
+          .openFileForWrite(qualifiedPath, statistics, false, tracingContext);
       return new FSDataOutputStream(outputStream, statistics);
-    } catch (AzureBlobFileSystemException ex) {
+    } catch(AzureBlobFileSystemException ex) {
       checkException(f, ex);
       return null;
     }
@@ -395,7 +401,7 @@ public boolean rename(final Path src, final Path dst) throws IOException {
 
       abfsStore.rename(qualifiedSrcPath, qualifiedDstPath, tracingContext);
       return true;
-    } catch (AzureBlobFileSystemException ex) {
+    } catch(AzureBlobFileSystemException ex) {
       LOG.debug("Rename operation failed. ", ex);
       checkException(src, ex, AzureServiceErrorCode.PATH_ALREADY_EXISTS,
           AzureServiceErrorCode.INVALID_RENAME_SOURCE_PATH,
@@ -409,8 +415,8 @@ public boolean rename(final Path src, final Path dst) throws IOException {
 
   @Override
   public boolean delete(final Path f, final boolean recursive) throws IOException {
-    LOG.debug("AzureBlobFileSystem.delete path: {} recursive: {}", f.toString(),
-        recursive);
+    LOG.debug(
+        "AzureBlobFileSystem.delete path: {} recursive: {}", f.toString(), recursive);
     statIncrement(CALL_DELETE);
     Path qualifiedPath = makeQualified(f);
 
@@ -424,7 +430,8 @@ public boolean delete(final Path f, final boolean recursive) throws IOException
 
     try {
       TracingContext tracingContext = new TracingContext(clientCorrelationId,
-          fileSystemId, FSOperationType.DELETE, tracingHeaderFormat, listener);
+          fileSystemId, FSOperationType.DELETE, tracingHeaderFormat,
+          listener);
       abfsStore.delete(qualifiedPath, recursive, tracingContext);
       return true;
     } catch (AzureBlobFileSystemException ex) {

hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystemStore.java

@@ -52,9 +52,6 @@
 import java.util.WeakHashMap;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.RejectedExecutionHandler;
 import java.util.concurrent.SynchronousQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;

hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/services/ITestGetContentSummary.java

@@ -178,9 +178,6 @@ public void testConcurrentGetContentSummaryCalls()
 
   private void verifyContentSummary(ContentSummary contentSummary,
       long expectedDirectoryCount, long expectedFileCount, long expectedByteCount) {
-    System.out.println(contentSummary);
-    System.out.println(expectedDirectoryCount + " : " + expectedFileCount +
-        " : " + expectedByteCount);
     Assertions.assertThat(contentSummary.getDirectoryCount())
         .describedAs("Incorrect directory count").isEqualTo(expectedDirectoryCount);
     Assertions.assertThat(contentSummary.getFileCount())