HADOOP-17863. ABFS: Fix compiler deprecation warning in TextFileBasedIdentityHandler (#3332)

sumangala-patki · steveloughran · commit 689dd7bf17f5 · 2021-11-05T12:55:45.000Z
Closes #3332 Contributed by Sumangala Patki Change-Id: I2abd33bd62bb734a431cccfc50a52bdeb2bf7db6
diff --git a/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/utils/TextFileBasedIdentityHandler.java b/hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/utils/TextFileBasedIdentityHandler.java
@@ -29,6 +29,7 @@
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.LineIterator;
+import org.apache.hadoop.io.IOUtils;
 
 import static org.apache.hadoop.fs.azurebfs.constants.AbfsHttpConstants.COLON;
 import static org.apache.hadoop.fs.azurebfs.constants.AbfsHttpConstants.EMPTY_STRING;
@@ -189,7 +190,7 @@ private static void loadMap(HashMap<String, String> cache, String fileLocation,
     } catch (ArrayIndexOutOfBoundsException e) {
       LOG.error("Error while parsing mapping file", e);
     } finally {
-      LineIterator.closeQuietly(it);
+      IOUtils.cleanupWithLogger(LOG, it);
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@`
`29`	`29`
`30`	`30`	`import org.apache.commons.io.FileUtils;`
`31`	`31`	`import org.apache.commons.io.LineIterator;`
	`32`	`+import org.apache.hadoop.io.IOUtils;`
`32`	`33`
`33`	`34`	`import static org.apache.hadoop.fs.azurebfs.constants.AbfsHttpConstants.COLON;`
`34`	`35`	`import static org.apache.hadoop.fs.azurebfs.constants.AbfsHttpConstants.EMPTY_STRING;`
`@@ -189,7 +190,7 @@ private static void loadMap(HashMap<String, String> cache, String fileLocation,`
`189`	`190`	`} catch (ArrayIndexOutOfBoundsException e) {`
`190`	`191`	`LOG.error("Error while parsing mapping file", e);`
`191`	`192`	`} finally {`
`192`		`- LineIterator.closeQuietly(it);`
	`193`	`+ IOUtils.cleanupWithLogger(LOG, it);`
`193`	`194`	`}`
`194`	`195`	`}`
`195`	`196`	`}`