OOZIE-3555 Remove unnecessary StandardCharsets.UTF_8.name() calls (zsombor via asalamon74)
diff --git a/core/src/main/java/org/apache/oozie/compression/CodecFactory.java b/core/src/main/java/org/apache/oozie/compression/CodecFactory.java
index e139c80..2b12e63 100644
--- a/core/src/main/java/org/apache/oozie/compression/CodecFactory.java
+++ b/core/src/main/java/org/apache/oozie/compression/CodecFactory.java
@@ -23,6 +23,7 @@
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
+import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
@@ -42,7 +43,7 @@
     private static CompressionCodec outputCompressionCodec;
     public static final String COMPRESSION_MAGIC_DATA = "OBJ";
     public static final String COMPRESSION_KEY_HEADER = "codec";
-    public static final String UTF_8_ENCODING = StandardCharsets.UTF_8.name();
+    public static final Charset UTF_8_ENCODING = StandardCharsets.UTF_8;
     private static boolean isEnabled;
     private static XLog LOG = XLog.getLog(CodecFactory.class);
     private static byte[] headerBytes;
diff --git a/core/src/main/java/org/apache/oozie/util/StringSerializationUtil.java b/core/src/main/java/org/apache/oozie/util/StringSerializationUtil.java
index 54196d8..cd23c58 100644
--- a/core/src/main/java/org/apache/oozie/util/StringSerializationUtil.java
+++ b/core/src/main/java/org/apache/oozie/util/StringSerializationUtil.java
@@ -65,7 +65,7 @@
             int length = dIn.readInt();
             byte[] data = new byte[length];
             dIn.readFully(data);
-            value = new String(data, StandardCharsets.UTF_8.name());
+            value = new String(data, StandardCharsets.UTF_8);
         }
         return value;
     }
diff --git a/core/src/main/java/org/apache/oozie/util/schema/Input.java b/core/src/main/java/org/apache/oozie/util/schema/Input.java
index ea23d63..2516916 100644
--- a/core/src/main/java/org/apache/oozie/util/schema/Input.java
+++ b/core/src/main/java/org/apache/oozie/util/schema/Input.java
@@ -23,13 +23,14 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
+import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 
 /**
  * Utility class to handle schema import and include statements
  */
 class Input implements LSInput {
-    private static final String UTF_8_ENCODING = StandardCharsets.UTF_8.name();
+    private static final Charset UTF_8_ENCODING = StandardCharsets.UTF_8;
     private BufferedInputStream inputStream;
     private String publicId;
     private String systemId;
diff --git a/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java b/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java
index 62ce7fe..4c3cbf3 100644
--- a/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java
+++ b/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java
@@ -741,7 +741,7 @@
 
         byte[] secKey = credentials.getSecretKey(new Text(InsertTestToken.DUMMY_SECRET_KEY));
         assertNotNull(secKey);
-        assertEquals(InsertTestToken.DUMMY_SECRET_KEY, new String(secKey, StandardCharsets.UTF_8.name()));
+        assertEquals(InsertTestToken.DUMMY_SECRET_KEY, new String(secKey, StandardCharsets.UTF_8));
     }
 
     public void testCredentialsInvalid() throws Exception {
diff --git a/core/src/test/java/org/apache/oozie/command/coord/TestCoordRerunXCommand.java b/core/src/test/java/org/apache/oozie/command/coord/TestCoordRerunXCommand.java
index 61b9022..7f20f19 100644
--- a/core/src/test/java/org/apache/oozie/command/coord/TestCoordRerunXCommand.java
+++ b/core/src/test/java/org/apache/oozie/command/coord/TestCoordRerunXCommand.java
@@ -987,7 +987,7 @@
                 StandardCharsets.UTF_8);
         byte[] bytes = appXml.getBytes(StandardCharsets.UTF_8);
         ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
-        Reader reader2 = new InputStreamReader(bais,StandardCharsets.UTF_8.name());
+        Reader reader2 = new InputStreamReader(bais,StandardCharsets.UTF_8);
         IOUtils.copyCharStream(reader2, writer);
 
         CoordinatorJobBean coordJob = new CoordinatorJobBean();
diff --git a/core/src/test/java/org/apache/oozie/compression/TestCodecFactory.java b/core/src/test/java/org/apache/oozie/compression/TestCodecFactory.java
index 79bbc63..2bc96d3 100644
--- a/core/src/test/java/org/apache/oozie/compression/TestCodecFactory.java
+++ b/core/src/test/java/org/apache/oozie/compression/TestCodecFactory.java
@@ -26,8 +26,6 @@
 import java.nio.charset.StandardCharsets;
 
 import org.apache.hadoop.conf.Configuration;
-import org.apache.oozie.BinaryBlob;
-import org.apache.oozie.StringBlob;
 import org.apache.oozie.service.Services;
 import org.apache.oozie.test.XTestCase;
 import org.junit.After;
diff --git a/core/src/test/java/org/apache/oozie/servlet/TestJobsServlet.java b/core/src/test/java/org/apache/oozie/servlet/TestJobsServlet.java
index c59858d..d39c40c 100644
--- a/core/src/test/java/org/apache/oozie/servlet/TestJobsServlet.java
+++ b/core/src/test/java/org/apache/oozie/servlet/TestJobsServlet.java
@@ -105,7 +105,7 @@
                 jobConf.writeXml(conn.getOutputStream());
                 assertEquals(HttpServletResponse.SC_CREATED, conn.getResponseCode());
                 obj = (JSONObject) JSONValue.parse(new InputStreamReader(conn.getInputStream(),
-                        StandardCharsets.UTF_8.name()));
+                        StandardCharsets.UTF_8));
                 assertEquals(MockDagEngineService.JOB_ID + wfCount + MockDagEngineService.JOB_ID_END,
                              obj.get(JsonTags.JOB_ID));
                 assertTrue(MockDagEngineService.started.get(wfCount));
@@ -152,7 +152,7 @@
                 assertEquals(HttpServletResponse.SC_OK, conn.getResponseCode());
                 assertTrue(conn.getHeaderField("content-type").startsWith(RestConstants.JSON_CONTENT_TYPE));
                 json = (JSONObject) JSONValue.parse(new InputStreamReader(conn.getInputStream(),
-                        StandardCharsets.UTF_8.name()));
+                        StandardCharsets.UTF_8));
                 array = (JSONArray) json.get(JsonTags.WORKFLOWS_JOBS);
 
                 assertEquals(MockDagEngineService.INIT_WF_COUNT, array.size());
diff --git a/core/src/test/java/org/apache/oozie/servlet/TestV1AdminServlet.java b/core/src/test/java/org/apache/oozie/servlet/TestV1AdminServlet.java
index 5f436c8..5cc193e 100644
--- a/core/src/test/java/org/apache/oozie/servlet/TestV1AdminServlet.java
+++ b/core/src/test/java/org/apache/oozie/servlet/TestV1AdminServlet.java
@@ -170,7 +170,7 @@
                         assertEquals(HttpServletResponse.SC_OK, conn.getResponseCode());
                         assertTrue(conn.getHeaderField("content-type").startsWith(RestConstants.JSON_CONTENT_TYPE));
                         JSONObject json = (JSONObject) JSONValue.parse(new InputStreamReader(conn.getInputStream(),
-                                StandardCharsets.UTF_8.name()));
+                                StandardCharsets.UTF_8));
                         assertTrue(json.containsKey(JsonTags.OOZIE_SYSTEM_MODE));
                         assertEquals(SYSTEM_MODE.NORMAL.toString(), json.get(JsonTags.OOZIE_SYSTEM_MODE));
 
diff --git a/core/src/test/java/org/apache/oozie/servlet/TestV1JobServlet.java b/core/src/test/java/org/apache/oozie/servlet/TestV1JobServlet.java
index ea26081..27e88ef 100644
--- a/core/src/test/java/org/apache/oozie/servlet/TestV1JobServlet.java
+++ b/core/src/test/java/org/apache/oozie/servlet/TestV1JobServlet.java
@@ -232,7 +232,7 @@
                 assertEquals(HttpServletResponse.SC_OK, conn.getResponseCode());
                 assertTrue(conn.getHeaderField("content-type").startsWith(RestConstants.JSON_CONTENT_TYPE));
                 obj = (JSONObject) JSONValue.parse(new InputStreamReader(conn.getInputStream(),
-                        StandardCharsets.UTF_8.name()));
+                        StandardCharsets.UTF_8));
                 assertEquals(MockCoordinatorEngineService.JOB_ID + 1, obj.get(JsonTags.COORDINATOR_JOB_ID));
                 assertEquals(RestConstants.JOB_SHOW_INFO, MockCoordinatorEngineService.did);
                 assertEquals(MockCoordinatorEngineService.offset, new Integer(2));
diff --git a/core/src/test/java/org/apache/oozie/servlet/TestV1JobsServlet.java b/core/src/test/java/org/apache/oozie/servlet/TestV1JobsServlet.java
index 2f3a901..bdbb24f 100644
--- a/core/src/test/java/org/apache/oozie/servlet/TestV1JobsServlet.java
+++ b/core/src/test/java/org/apache/oozie/servlet/TestV1JobsServlet.java
@@ -101,7 +101,7 @@
                 jobConf.writeXml(conn.getOutputStream());
                 assertEquals(HttpServletResponse.SC_CREATED, conn.getResponseCode());
                 obj = (JSONObject) JSONValue.parse(new InputStreamReader(conn.getInputStream(),
-                        StandardCharsets.UTF_8.name()));
+                        StandardCharsets.UTF_8));
                 assertEquals(MockDagEngineService.JOB_ID + wfCount + MockDagEngineService.JOB_ID_END,
                              obj.get(JsonTags.JOB_ID));
                 assertTrue(MockDagEngineService.started.get(wfCount));
@@ -194,7 +194,7 @@
                 assertEquals(HttpServletResponse.SC_OK, conn.getResponseCode());
                 assertTrue(conn.getHeaderField("content-type").startsWith(RestConstants.JSON_CONTENT_TYPE));
                 json = (JSONObject) JSONValue.parse(new InputStreamReader(conn.getInputStream(),
-                        StandardCharsets.UTF_8.name()));
+                        StandardCharsets.UTF_8));
                 array = (JSONArray) json.get(JsonTags.WORKFLOWS_JOBS);
 
                 assertEquals(MockDagEngineService.INIT_WF_COUNT, array.size());
@@ -238,7 +238,7 @@
                 assertEquals(HttpServletResponse.SC_OK, conn.getResponseCode());
                 assertTrue(conn.getHeaderField("content-type").startsWith(RestConstants.JSON_CONTENT_TYPE));
                 json = (JSONObject) JSONValue.parse(new InputStreamReader(conn.getInputStream(),
-                        StandardCharsets.UTF_8.name()));
+                        StandardCharsets.UTF_8));
                 array = (JSONArray) json.get(JsonTags.WORKFLOWS_JOBS);
                 assertEquals(MockDagEngineService.INIT_WF_COUNT, array.size());
                 return null;
diff --git a/core/src/test/java/org/apache/oozie/servlet/TestV2JobServlet.java b/core/src/test/java/org/apache/oozie/servlet/TestV2JobServlet.java
index 070cf36..055dfb1 100644
--- a/core/src/test/java/org/apache/oozie/servlet/TestV2JobServlet.java
+++ b/core/src/test/java/org/apache/oozie/servlet/TestV2JobServlet.java
@@ -75,7 +75,7 @@
                 assertEquals(HttpServletResponse.SC_OK, conn.getResponseCode());
                 assertTrue(conn.getHeaderField("content-type").startsWith(RestConstants.JSON_CONTENT_TYPE));
                 obj = (JSONObject) JSONValue.parse(new InputStreamReader(conn.getInputStream(),
-                        StandardCharsets.UTF_8.name()));
+                        StandardCharsets.UTF_8));
                 assertEquals(MockCoordinatorEngineService.JOB_ID + 1, obj.get(JsonTags.COORDINATOR_JOB_ID));
                 assertEquals(RestConstants.JOB_SHOW_INFO, MockCoordinatorEngineService.did);
                 assertEquals(MockCoordinatorEngineService.offset, new Integer(2));
@@ -264,7 +264,7 @@
                 assertEquals(HttpServletResponse.SC_OK, conn.getResponseCode());
                 assertTrue(conn.getHeaderField("content-type").startsWith(RestConstants.JSON_CONTENT_TYPE));
                 obj = (JSONObject) JSONValue.parse(new InputStreamReader(conn.getInputStream(),
-                        StandardCharsets.UTF_8.name()));
+                        StandardCharsets.UTF_8));
                 assertEquals("RUNNING", obj.get(JsonTags.STATUS));
                 assertEquals(RestConstants.JOB_SHOW_STATUS, MockCoordinatorEngineService.did);
 
diff --git a/release-log.txt b/release-log.txt
index 4ebd7a0..9ca65a6 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,7 @@
 -- Oozie 5.3.0 release (trunk - unreleased)
 
+OOZIE-3555 Remove unnecessary StandardCharsets.UTF_8.name() calls (zsombor via asalamon74)
+
 -- Oozie 5.2.0 release
 
 OOZIE-3553 [examples] Fix sqoop example (asalamon74 via kmarton)
diff --git a/sharelib/hive/src/main/java/org/apache/oozie/action/hadoop/HiveMain.java b/sharelib/hive/src/main/java/org/apache/oozie/action/hadoop/HiveMain.java
index 37819d1..23231e3 100644
--- a/sharelib/hive/src/main/java/org/apache/oozie/action/hadoop/HiveMain.java
+++ b/sharelib/hive/src/main/java/org/apache/oozie/action/hadoop/HiveMain.java
@@ -302,7 +302,7 @@
     private String createScriptFile(String query) throws IOException {
         String filename = "oozie-hive-query-" + System.currentTimeMillis() + ".hql";
         File f = new File(filename);
-        FileUtils.writeStringToFile(f, query, StandardCharsets.UTF_8.name());
+        FileUtils.writeStringToFile(f, query, StandardCharsets.UTF_8);
         return filename;
     }
 
@@ -314,7 +314,7 @@
         String line;
         BufferedReader br = null;
         try {
-            br = new BufferedReader(new InputStreamReader(new FileInputStream(filePath), StandardCharsets.UTF_8.name()));
+            br = new BufferedReader(new InputStreamReader(new FileInputStream(filePath), StandardCharsets.UTF_8));
             StringBuilder sb = new StringBuilder();
             String sep = System.getProperty("line.separator");
             while ((line = br.readLine()) != null) {
diff --git a/sharelib/hive2/src/main/java/org/apache/oozie/action/hadoop/Hive2Main.java b/sharelib/hive2/src/main/java/org/apache/oozie/action/hadoop/Hive2Main.java
index 0d8ee1b..aeec544 100644
--- a/sharelib/hive2/src/main/java/org/apache/oozie/action/hadoop/Hive2Main.java
+++ b/sharelib/hive2/src/main/java/org/apache/oozie/action/hadoop/Hive2Main.java
@@ -282,7 +282,7 @@
         String line;
         BufferedReader br = null;
         try {
-            br = new BufferedReader(new InputStreamReader(new FileInputStream(filePath), StandardCharsets.UTF_8.name()));
+            br = new BufferedReader(new InputStreamReader(new FileInputStream(filePath), StandardCharsets.UTF_8));
             StringBuilder sb = new StringBuilder();
             String sep = System.getProperty("line.separator");
             while ((line = br.readLine()) != null) {
diff --git a/sharelib/pig/src/main/java/org/apache/oozie/action/hadoop/PigMain.java b/sharelib/pig/src/main/java/org/apache/oozie/action/hadoop/PigMain.java
index e17c07f..306e494 100644
--- a/sharelib/pig/src/main/java/org/apache/oozie/action/hadoop/PigMain.java
+++ b/sharelib/pig/src/main/java/org/apache/oozie/action/hadoop/PigMain.java
@@ -264,7 +264,7 @@
             System.out.println(type + " Pig script [" + name + "] content: ");
             System.out.println("-----------------------------------------------------------");
             fin = new FileInputStream(script);
-            inReader = new InputStreamReader(fin, StandardCharsets.UTF_8.name());
+            inReader = new InputStreamReader(fin, StandardCharsets.UTF_8);
             bufReader = new BufferedReader(inReader);
             String line = bufReader.readLine();
             while (line != null) {
@@ -296,7 +296,7 @@
         System.err.println();
         try {
             try (BufferedReader reader = new BufferedReader(
-                    new InputStreamReader(new FileInputStream(pigLog), StandardCharsets.UTF_8.name()))) {
+                    new InputStreamReader(new FileInputStream(pigLog), StandardCharsets.UTF_8))) {
                 String line = reader.readLine();
                 while (line != null) {
                     System.err.println(line);
diff --git a/sharelib/spark/src/main/java/org/apache/oozie/action/hadoop/SparkArgsExtractor.java b/sharelib/spark/src/main/java/org/apache/oozie/action/hadoop/SparkArgsExtractor.java
index ff1f1bb..eece462 100644
--- a/sharelib/spark/src/main/java/org/apache/oozie/action/hadoop/SparkArgsExtractor.java
+++ b/sharelib/spark/src/main/java/org/apache/oozie/action/hadoop/SparkArgsExtractor.java
@@ -363,7 +363,7 @@
         if (!properties.isEmpty()) {
             try (final Writer writer = new OutputStreamWriter(
                     new FileOutputStream(new File(SPARK_DEFAULTS_GENERATED_PROPERTIES)),
-                            StandardCharsets.UTF_8.name())) {
+                            StandardCharsets.UTF_8)) {
                 properties.store(writer, "Properties file generated by Oozie");
                 System.out.println(String.format("Persisted merged Spark configs in file %s. Merged properties are: %s",
                         SPARK_DEFAULTS_GENERATED_PROPERTIES, Arrays.toString(properties.stringPropertyNames().toArray())));
@@ -455,7 +455,7 @@
     }
 
     private void loadProperties(final File file, final Properties target) {
-        try (final Reader reader = new InputStreamReader(new FileInputStream(file), StandardCharsets.UTF_8.name())) {
+        try (final Reader reader = new InputStreamReader(new FileInputStream(file), StandardCharsets.UTF_8)) {
             final Properties properties = new Properties();
             properties.load(reader);
             for(String key :properties.stringPropertyNames()) {
diff --git a/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java b/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java
index 75b94d1..00f1c3d 100644
--- a/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java
+++ b/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java
@@ -25,6 +25,7 @@
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.StringReader;
@@ -844,7 +845,7 @@
             Path p = fstat.getPath();
             if (getFileSystem().isFile(p) && p.getName().startsWith("part-")) {
                 InputStream is = getFileSystem().open(p);
-                Scanner sc = new Scanner(is,StandardCharsets.UTF_8.name());
+                Scanner sc = new Scanner(new InputStreamReader(is,StandardCharsets.UTF_8));
                 while (sc.hasNextLine()) {
                     String line = sc.nextLine();
                     containsLib1Jar = (containsLib1Jar || line.contains(lib1JarStr) || lib1JarPatYarn.matcher(line).matches());
diff --git a/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java b/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java
index a577cc0..58eb4f7 100644
--- a/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java
+++ b/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java
@@ -672,7 +672,7 @@
                     }
                     PreparedStatement ps = conn.prepareStatement("update " + tableName + " set " + TEMP_COLUMN_PREFIX
                             + column + "=? where id = ?");
-                    byte[] data = IOUtils.toByteArray(confClob.getCharacterStream(), StandardCharsets.UTF_8.name());
+                    byte[] data = IOUtils.toByteArray(confClob.getCharacterStream(), StandardCharsets.UTF_8);
                     ps.setBinaryStream(1, new ByteArrayInputStream(data), data.length);
                     ps.setString(2, rs.getString(1));
                     ps.executeUpdate();
diff --git a/tools/src/main/java/org/apache/oozie/tools/OozieDBExportCLI.java b/tools/src/main/java/org/apache/oozie/tools/OozieDBExportCLI.java
index 340572e..165a548 100644
--- a/tools/src/main/java/org/apache/oozie/tools/OozieDBExportCLI.java
+++ b/tools/src/main/java/org/apache/oozie/tools/OozieDBExportCLI.java
@@ -180,7 +180,7 @@
         Gson gson = new GsonBuilder().setDateFormat("MMM d, yyyy h:mm:ss a").create();
         ZipEntry zipEntry = new ZipEntry(filename);
         zipOutputStream.putNextEntry(zipEntry);
-        BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(zipOutputStream, StandardCharsets.UTF_8.name()));
+        BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(zipOutputStream, StandardCharsets.UTF_8));
         query.setMaxResults(LIMIT);
         int exported = 0;
         List<?> list = query.getResultList();
diff --git a/tools/src/main/java/org/apache/oozie/tools/diag/DiagBundleEntryWriter.java b/tools/src/main/java/org/apache/oozie/tools/diag/DiagBundleEntryWriter.java
index 8485f6a..a23e984 100644
--- a/tools/src/main/java/org/apache/oozie/tools/diag/DiagBundleEntryWriter.java
+++ b/tools/src/main/java/org/apache/oozie/tools/diag/DiagBundleEntryWriter.java
@@ -28,7 +28,6 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
-import java.io.UnsupportedEncodingException;
 import java.io.Writer;
 import java.nio.charset.StandardCharsets;
 import java.util.Date;
@@ -42,11 +41,7 @@
     }
 
     private DiagBundleEntryWriter(final OutputStream ous) {
-        try {
-            this.writer = new OutputStreamWriter(ous, StandardCharsets.UTF_8.name());
-        } catch (UnsupportedEncodingException e) {
-            throw new RuntimeException(e);
-        }
+        this.writer = new OutputStreamWriter(ous, StandardCharsets.UTF_8);
     }
 
     DiagBundleEntryWriter writeDateValue(final String key, final Date date) throws IOException {
diff --git a/tools/src/test/java/org/apache/oozie/tools/diag/TestMetricsCollector.java b/tools/src/test/java/org/apache/oozie/tools/diag/TestMetricsCollector.java
index c5766ca..a06f94b 100644
--- a/tools/src/test/java/org/apache/oozie/tools/diag/TestMetricsCollector.java
+++ b/tools/src/test/java/org/apache/oozie/tools/diag/TestMetricsCollector.java
@@ -121,7 +121,7 @@
         metricsCollector.storeMetrics(testOut);
 
         final File metricsOut = new File(testOut, "metrics.txt");
-        final String str = new String(Files.readAllBytes(metricsOut.toPath()), StandardCharsets.UTF_8.name());
+        final String str = new String(Files.readAllBytes(metricsOut.toPath()), StandardCharsets.UTF_8);
 
         assertTrue(str.contains("CoordJobsGetPendingJPAExecutor"));
     }
@@ -210,7 +210,7 @@
         final File instrumentationFile = new File(testOut, "instrumentation.txt");
         assertTrue(instrumentationFile.exists());
 
-        final String str = new String(Files.readAllBytes(instrumentationFile.toPath()), StandardCharsets.UTF_8.name());
+        final String str = new String(Files.readAllBytes(instrumentationFile.toPath()), StandardCharsets.UTF_8);
         assertTrue(str.contains("45776800"));
     }
 
diff --git a/tools/src/test/java/org/apache/oozie/tools/diag/TestServerInfoCollector.java b/tools/src/test/java/org/apache/oozie/tools/diag/TestServerInfoCollector.java
index a47defa..50247f3 100644
--- a/tools/src/test/java/org/apache/oozie/tools/diag/TestServerInfoCollector.java
+++ b/tools/src/test/java/org/apache/oozie/tools/diag/TestServerInfoCollector.java
@@ -120,7 +120,7 @@
     }
 
     static void assertFileContains(final File testFile, final String testData) throws IOException {
-        final String str = new String(Files.readAllBytes(testFile.toPath()), StandardCharsets.UTF_8.name());
+        final String str = new String(Files.readAllBytes(testFile.toPath()), StandardCharsets.UTF_8);
         assertTrue(str.contains(testData));
     }
 }
\ No newline at end of file