This is an automated email from the ASF dual-hosted git repository.
ayushsaxena pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new a079f6261d77 HADOOP-18917. Addendum. Fix deprecation issues after
commons-io upgrade. (#6228). Contributed by PJ Fanning.
a079f6261d77 is described below
commit a079f6261d77512a4eeb9a1d10e667caaecde29c
Author: PJ Fanning <pjfann...@users.noreply.github.com>
AuthorDate: Mon Oct 30 04:05:02 2023 +0000
HADOOP-18917. Addendum. Fix deprecation issues after commons-io upgrade.
(#6228). Contributed by PJ Fanning.
---
.../apache/hadoop/hdfs/server/namenode/snapshot/TestSnapshot.java | 2 +-
.../hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java | 2 +-
.../src/main/java/org/apache/hadoop/tools/HadoopArchiveLogs.java | 6 +++++-
.../org/apache/hadoop/yarn/logaggregation/AggregatedLogFormat.java | 6 +++++-
.../hadoop/yarn/server/timeline/TestLeveldbTimelineStore.java | 5 +++--
.../yarn/server/timeline/TestRollingLevelDBTimelineStore.java | 5 +++--
6 files changed, 18 insertions(+), 8 deletions(-)
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestSnapshot.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestSnapshot.java
index 107333c5a63c..3a3898727fc1 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestSnapshot.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/snapshot/TestSnapshot.java
@@ -257,7 +257,7 @@ public class TestSnapshot {
FSImageTestUtil.getFSImage(
cluster.getNameNode()).getStorage().getStorageDir(0));
assertNotNull("Didn't generate or can't find fsimage", originalFsimage);
- PrintStream o = new PrintStream(NullOutputStream.NULL_OUTPUT_STREAM);
+ PrintStream o = new PrintStream(NullOutputStream.INSTANCE);
PBImageXmlWriter v = new PBImageXmlWriter(new Configuration(), o);
v.visit(new RandomAccessFile(originalFsimage, "r"));
}
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java
index c24c9132cbcd..b2112a74e855 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java
@@ -405,7 +405,7 @@ public class TestOfflineImageViewer {
@Test(expected = IOException.class)
public void testTruncatedFSImage() throws IOException {
File truncatedFile = new File(tempDir, "truncatedFsImage");
- PrintStream output = new PrintStream(NullOutputStream.NULL_OUTPUT_STREAM);
+ PrintStream output = new PrintStream(NullOutputStream.INSTANCE);
copyPartOfFile(originalFsimage, truncatedFile);
try (RandomAccessFile r = new RandomAccessFile(truncatedFile, "r")) {
new FileDistributionCalculator(new Configuration(), 0, 0, false, output)
diff --git
a/hadoop-tools/hadoop-archive-logs/src/main/java/org/apache/hadoop/tools/HadoopArchiveLogs.java
b/hadoop-tools/hadoop-archive-logs/src/main/java/org/apache/hadoop/tools/HadoopArchiveLogs.java
index f745a2e519e3..9b28ca406d69 100644
---
a/hadoop-tools/hadoop-archive-logs/src/main/java/org/apache/hadoop/tools/HadoopArchiveLogs.java
+++
b/hadoop-tools/hadoop-archive-logs/src/main/java/org/apache/hadoop/tools/HadoopArchiveLogs.java
@@ -54,6 +54,7 @@ import org.apache.hadoop.yarn.util.ConverterUtils;
import java.io.File;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -505,7 +506,10 @@ public class HadoopArchiveLogs implements Tool {
String classpath = halrJarPath + File.pathSeparator + harJarPath;
FileWriterWithEncoding fw = null;
try {
- fw = new FileWriterWithEncoding(localScript, "UTF-8");
+ fw = FileWriterWithEncoding.builder()
+ .setFile(localScript)
+ .setCharset(StandardCharsets.UTF_8)
+ .get();
fw.write("#!/bin/bash\nset -e\nset -x\n");
int containerCount = 1;
for (AppInfo context : eligibleApplications) {
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/AggregatedLogFormat.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/AggregatedLogFormat.java
index 477a8a293ceb..26c3e01a45d0 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/AggregatedLogFormat.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/logaggregation/AggregatedLogFormat.java
@@ -32,6 +32,7 @@ import java.io.OutputStream;
import java.io.PrintStream;
import java.io.Writer;
import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.security.PrivilegedExceptionAction;
import java.util.ArrayList;
import java.util.Arrays;
@@ -783,7 +784,10 @@ public class AggregatedLogFormat {
OutputStream os = null;
PrintStream ps = null;
try {
- os = new WriterOutputStream(writer, Charset.forName("UTF-8"));
+ os = WriterOutputStream.builder()
+ .setWriter(writer)
+ .setCharset(StandardCharsets.UTF_8)
+ .get();
ps = new PrintStream(os);
while (true) {
try {
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/TestLeveldbTimelineStore.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/TestLeveldbTimelineStore.java
index c7166a1268c5..1e550890fda8 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/TestLeveldbTimelineStore.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/TestLeveldbTimelineStore.java
@@ -496,8 +496,9 @@ public class TestLeveldbTimelineStore extends
TimelineStoreTestUtils {
store.init(conf);
Mockito.verify(factory, Mockito.times(1))
.repair(Mockito.any(File.class), Mockito.any(Options.class));
- FileFilter fileFilter = new WildcardFileFilter(
- "*" + LeveldbTimelineStore.BACKUP_EXT + "*");
+ FileFilter fileFilter = WildcardFileFilter.builder()
+ .setWildcards("*" + LeveldbTimelineStore.BACKUP_EXT +"*")
+ .get();
assertTrue(path.listFiles(fileFilter).length > 0);
} finally {
store.close();
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/TestRollingLevelDBTimelineStore.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/TestRollingLevelDBTimelineStore.java
index b20497728bab..6d37a9730e1d 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/TestRollingLevelDBTimelineStore.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/timeline/TestRollingLevelDBTimelineStore.java
@@ -444,8 +444,9 @@ public class TestRollingLevelDBTimelineStore extends
TimelineStoreTestUtils {
store.init(conf);
Mockito.verify(factory, Mockito.times(1))
.repair(Mockito.any(File.class), Mockito.any(Options.class));
- FilenameFilter fileFilter =
- new WildcardFileFilter("*" + RollingLevelDBTimelineStore.BACKUP_EXT
+ "*");
+ FilenameFilter fileFilter = WildcardFileFilter.builder()
+ .setWildcards("*" + RollingLevelDBTimelineStore.BACKUP_EXT + "*")
+ .get();
assertTrue(new File(path.getAbsolutePath(),
RollingLevelDBTimelineStore.FILENAME)
.list(fileFilter).length > 0);
} finally {
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
