From 553db3c7560e24804206195e13edfca1b3c4c8c6 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 21 Sep 2020 12:52:12 +0200 Subject: [PATCH] Use StandardCharsets Java 10 allows us to use a proper constant for charset. Change-Id: Ie7706356bf5bcbde05e7632b099901d226f40cf1 Signed-off-by: Robert Varga --- .../opendaylight/yangtools/yang/model/util/Bug5410Test.java | 3 ++- .../yangtools/yang/parser/stmt/rfc7950/Bug6878Test.java | 3 ++- .../org/opendaylight/yangtools/yang/stmt/Bug5335Test.java | 4 ++-- .../yangtools/yang/stmt/SubstatementValidatorTest.java | 3 ++- .../yangtools/yang/stmt/YangParserNegativeTest.java | 3 ++- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/Bug5410Test.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/Bug5410Test.java index 08aa0513ad..50f27f9f61 100644 --- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/Bug5410Test.java +++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/Bug5410Test.java @@ -15,6 +15,7 @@ import com.google.common.collect.ImmutableList; import java.io.ByteArrayOutputStream; import java.io.PrintStream; import java.io.UnsupportedEncodingException; +import java.nio.charset.StandardCharsets; import java.util.List; import org.junit.Test; @@ -150,7 +151,7 @@ public class Bug5410Test { throws UnsupportedEncodingException { final PrintStream stdout = System.out; final ByteArrayOutputStream output = new ByteArrayOutputStream(); - System.setOut(new PrintStream(output, true, "UTF-8")); + System.setOut(new PrintStream(output, true, StandardCharsets.UTF_8)); RegexUtils.getJavaRegexFromXSD(xsdRegex); diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6878Test.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6878Test.java index 5b7875fe0a..b6201bca7b 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6878Test.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6878Test.java @@ -13,6 +13,7 @@ import static org.junit.Assert.assertFalse; import java.io.ByteArrayOutputStream; import java.io.PrintStream; +import java.nio.charset.StandardCharsets; import org.junit.Test; import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; @@ -41,7 +42,7 @@ public class Bug6878Test { final PrintStream stdout = System.out; final ByteArrayOutputStream output = new ByteArrayOutputStream(); - try (PrintStream out = new PrintStream(output, true, "UTF-8")) { + try (PrintStream out = new PrintStream(output, true, StandardCharsets.UTF_8)) { System.setOut(out); StmtTestUtils.parseYangSource(yangFile); } finally { diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5335Test.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5335Test.java index e325c0c0ac..ac9912c4cc 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5335Test.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5335Test.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.yangtools.yang.stmt; import static org.junit.Assert.assertNotNull; @@ -15,6 +14,7 @@ import static org.junit.Assert.assertTrue; import java.io.ByteArrayOutputStream; import java.io.PrintStream; import java.io.UnsupportedEncodingException; +import java.nio.charset.StandardCharsets; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -42,7 +42,7 @@ public class Bug5335Test { @Before public void setUp() throws UnsupportedEncodingException { - System.setOut(new PrintStream(output, true, "UTF-8")); + System.setOut(new PrintStream(output, true, StandardCharsets.UTF_8)); } @After diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/SubstatementValidatorTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/SubstatementValidatorTest.java index d2baf198e7..be3cc46eae 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/SubstatementValidatorTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/SubstatementValidatorTest.java @@ -16,6 +16,7 @@ import static org.junit.Assert.fail; import java.io.ByteArrayOutputStream; import java.io.PrintStream; import java.io.UnsupportedEncodingException; +import java.nio.charset.StandardCharsets; import java.util.Collection; import org.junit.After; import org.junit.Before; @@ -31,7 +32,7 @@ public class SubstatementValidatorTest { @Before public void setUp() throws UnsupportedEncodingException { - System.setOut(new PrintStream(output, true, "UTF-8")); + System.setOut(new PrintStream(output, true, StandardCharsets.UTF_8)); } @After diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserNegativeTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserNegativeTest.java index 1d17d1f01f..c6160eed4f 100644 --- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserNegativeTest.java +++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserNegativeTest.java @@ -18,6 +18,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.PrintStream; import java.io.UnsupportedEncodingException; +import java.nio.charset.StandardCharsets; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -36,7 +37,7 @@ public class YangParserNegativeTest { @Before public void setUp() throws UnsupportedEncodingException { - System.setOut(new PrintStream(output, true, "UTF-8")); + System.setOut(new PrintStream(output, true, StandardCharsets.UTF_8)); } @After -- 2.36.6