This is an automated email from the ASF dual-hosted git repository.
kmarton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/oozie.git
The following commit(s) were added to refs/heads/master by this push:
new b91457e OOZIE-3463 Migrate from com.google.common.base.Charsets to
java.nio.charset.StandardCharsets (nobigo via kmarton)
b91457e is described below
commit b91457edd2a76f94f41a89ec718eec574c200c71
Author: Julia Kinga Marton <[email protected]>
AuthorDate: Wed Apr 10 15:36:15 2019 +0200
OOZIE-3463 Migrate from com.google.common.base.Charsets to
java.nio.charset.StandardCharsets (nobigo via kmarton)
---
.../main/java/org/apache/oozie/cli/CLIParser.java | 5 +-
.../main/java/org/apache/oozie/cli/OozieCLI.java | 3 +-
.../org/apache/oozie/client/AuthOozieClient.java | 5 +-
.../java/org/apache/oozie/client/OozieClient.java | 79 +++++++++++-----------
.../java/org/apache/oozie/client/XOozieClient.java | 7 +-
.../src/main/java/org/apache/oozie/StringBlob.java | 5 +-
.../org/apache/oozie/action/ActionExecutor.java | 6 +-
.../apache/oozie/action/hadoop/LauncherHelper.java | 17 +++--
.../action/hadoop/MapReduceActionExecutor.java | 4 +-
.../oozie/action/hadoop/SqoopActionExecutor.java | 4 +-
.../apache/oozie/action/ssh/SshActionExecutor.java | 8 +--
.../oozie/command/bundle/BundleSubmitXCommand.java | 4 +-
.../oozie/command/coord/CoordSubmitXCommand.java | 4 +-
.../oozie/command/coord/CoordUpdateXCommand.java | 8 +--
.../org/apache/oozie/compression/CodecFactory.java | 3 +-
.../apache/oozie/service/AuthorizationService.java | 4 +-
.../org/apache/oozie/service/CallbackService.java | 9 +--
.../org/apache/oozie/service/ShareLibService.java | 3 +-
.../apache/oozie/service/WorkflowAppService.java | 4 +-
.../oozie/service/ZKXLogStreamingService.java | 4 +-
.../org/apache/oozie/servlet/JsonRestServlet.java | 9 ++-
.../org/apache/oozie/servlet/V1JobServlet.java | 4 +-
.../apache/oozie/servlet/V2ValidateServlet.java | 6 +-
.../java/org/apache/oozie/util/AuthUrlClient.java | 6 +-
.../java/org/apache/oozie/util/BufferDrainer.java | 8 ++-
.../java/org/apache/oozie/util/ClassUtils.java | 3 +-
.../apache/oozie/util/ELConstantsFunctions.java | 3 +-
.../main/java/org/apache/oozie/util/IOUtils.java | 7 +-
.../org/apache/oozie/util/MultiFileReader.java | 7 +-
.../apache/oozie/util/StringSerializationUtil.java | 2 +-
.../java/org/apache/oozie/util/XConfiguration.java | 4 +-
.../main/java/org/apache/oozie/util/XmlUtils.java | 6 +-
.../oozie/util/graph/WorkflowGraphHandler.java | 4 +-
.../java/org/apache/oozie/util/schema/Input.java | 3 +-
.../test/java/org/apache/oozie/QueryServlet.java | 6 +-
.../oozie/action/hadoop/InsertTestToken.java | 9 +--
.../action/hadoop/TestJavaActionExecutor.java | 3 +-
.../oozie/action/hadoop/TestWorkflowHelper.java | 5 +-
.../command/coord/TestCoordRerunXCommand.java | 3 +-
.../oozie/service/DummyLogStreamingServlet.java | 5 +-
.../apache/oozie/servlet/DagServletTestCase.java | 6 +-
.../servlet/TestAuthFilterAuthOozieClient.java | 8 +--
.../servlet/TestBulkMonitorWebServiceAPI.java | 5 +-
.../apache/oozie/servlet/TestCallbackServlet.java | 6 +-
.../java/org/apache/oozie/test/XDataTestCase.java | 5 +-
.../test/java/org/apache/oozie/test/XTestCase.java | 1 -
release-log.txt | 1 +
.../org/apache/oozie/action/hadoop/HiveMain.java | 6 +-
.../org/apache/oozie/action/hadoop/Hive2Main.java | 8 ++-
.../oozie/action/hadoop/PrepareActionsDriver.java | 3 +-
.../oozie/action/hadoop/PrepareActionsHandler.java | 3 +-
.../oozie/action/hadoop/ShellContentWriter.java | 4 +-
.../org/apache/oozie/action/hadoop/PigMain.java | 8 ++-
.../java/org/apache/oozie/tools/OozieDBCLI.java | 3 +-
.../org/apache/oozie/tools/OozieDBExportCLI.java | 3 +-
.../org/apache/oozie/tools/OozieDBImportCLI.java | 6 +-
.../apache/oozie/tools/diag/AppInfoCollector.java | 4 +-
.../oozie/tools/diag/DiagBundleEntryWriter.java | 2 +-
.../oozie/tools/diag/TestMetricsCollector.java | 5 +-
.../oozie/tools/diag/TestServerInfoCollector.java | 3 +-
60 files changed, 198 insertions(+), 181 deletions(-)
diff --git a/client/src/main/java/org/apache/oozie/cli/CLIParser.java
b/client/src/main/java/org/apache/oozie/cli/CLIParser.java
index f6b49b5..3db29ac 100644
--- a/client/src/main/java/org/apache/oozie/cli/CLIParser.java
+++ b/client/src/main/java/org/apache/oozie/cli/CLIParser.java
@@ -18,7 +18,6 @@
package org.apache.oozie.cli;
-import com.google.common.base.Charsets;
import org.apache.commons.cli.MissingOptionException;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.GnuParser;
@@ -27,8 +26,8 @@ import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.HelpFormatter;
import java.io.OutputStreamWriter;
-import java.io.UnsupportedEncodingException;
import java.io.Writer;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Map;
import java.util.LinkedHashMap;
@@ -168,7 +167,7 @@ public class CLIParser {
* @param commandLine the command line
*/
public void showHelp(CommandLine commandLine) {
- Writer writer = new OutputStreamWriter(System.out, Charsets.UTF_8);
+ Writer writer = new OutputStreamWriter(System.out,
StandardCharsets.UTF_8);
PrintWriter pw = new PrintWriter(writer);
pw.println("usage: ");
for (String s : cliHelp) {
diff --git a/client/src/main/java/org/apache/oozie/cli/OozieCLI.java
b/client/src/main/java/org/apache/oozie/cli/OozieCLI.java
index 9507a70..3507461 100644
--- a/client/src/main/java/org/apache/oozie/cli/OozieCLI.java
+++ b/client/src/main/java/org/apache/oozie/cli/OozieCLI.java
@@ -19,7 +19,6 @@
package org.apache.oozie.cli;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Charsets;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Option;
@@ -856,7 +855,7 @@ public class OozieCLI {
throw new IOException("configuration file [" + configFile + "]
not found");
}
if (configFile.endsWith(".properties")) {
- conf.load(new InputStreamReader(new FileInputStream(file),
Charsets.UTF_8));
+ conf.load(new InputStreamReader(new FileInputStream(file),
StandardCharsets.UTF_8));
}
else if (configFile.endsWith(".xml")) {
parse(new FileInputStream(configFile), conf);
diff --git a/client/src/main/java/org/apache/oozie/client/AuthOozieClient.java
b/client/src/main/java/org/apache/oozie/client/AuthOozieClient.java
index 1371a91..600bbd3 100644
--- a/client/src/main/java/org/apache/oozie/client/AuthOozieClient.java
+++ b/client/src/main/java/org/apache/oozie/client/AuthOozieClient.java
@@ -36,7 +36,6 @@ import java.util.HashMap;
import java.util.Map;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Charsets;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.io.FilenameUtils;
@@ -247,7 +246,7 @@ public class AuthOozieClient extends XOozieClient {
if (authTokenCacheFile.exists()) {
try {
BufferedReader reader = new BufferedReader(new
InputStreamReader(new FileInputStream(authTokenCacheFile),
- Charsets.UTF_8));
+ StandardCharsets.UTF_8));
String line = reader.readLine();
reader.close();
if (line != null) {
@@ -277,7 +276,7 @@ public class AuthOozieClient extends XOozieClient {
new File(System.getProperty("user.home")));
// just to be safe, if something goes wrong delete tmp file
eventually
tmpTokenFile.deleteOnExit();
- Writer writer = new OutputStreamWriter(new
FileOutputStream(tmpTokenFile), Charsets.UTF_8);
+ Writer writer = new OutputStreamWriter(new
FileOutputStream(tmpTokenFile), StandardCharsets.UTF_8);
writer.write(authToken.toString());
writer.close();
Files.move(tmpTokenFile.toPath(), authTokenCacheFile.toPath(),
StandardCopyOption.ATOMIC_MOVE);
diff --git a/client/src/main/java/org/apache/oozie/client/OozieClient.java
b/client/src/main/java/org/apache/oozie/client/OozieClient.java
index 2862d33..54e45c0 100644
--- a/client/src/main/java/org/apache/oozie/client/OozieClient.java
+++ b/client/src/main/java/org/apache/oozie/client/OozieClient.java
@@ -20,7 +20,6 @@ package org.apache.oozie.client;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Charsets;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import org.apache.oozie.BuildInfo;
@@ -53,6 +52,7 @@ import java.io.Reader;
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -395,7 +395,7 @@ public class OozieClient {
HttpURLConnection conn = createRetryableConnection(url, "GET");
if (conn.getResponseCode() == HttpURLConnection.HTTP_OK) {
- versions = (JSONArray) JSONValue.parse(new
InputStreamReader(conn.getInputStream(), Charsets.UTF_8));
+ versions = (JSONArray) JSONValue.parse(new
InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8));
}
else {
handleError(conn);
@@ -479,8 +479,8 @@ public class OozieClient {
String separator = "?";
for (Map.Entry<String, String> param : parameters.entrySet()) {
if (param.getValue() != null) {
-
sb.append(separator).append(URLEncoder.encode(param.getKey(),
Charsets.UTF_8.name())).append("=").append(
- URLEncoder.encode(param.getValue(),
Charsets.UTF_8.name()));
+
sb.append(separator).append(URLEncoder.encode(param.getKey(),
StandardCharsets.UTF_8.name())).append("=")
+ .append(URLEncoder.encode(param.getValue(),
StandardCharsets.UTF_8.name()));
separator = "&";
}
}
@@ -588,7 +588,7 @@ public class OozieClient {
@Override
protected Map<String, String> call(HttpURLConnection conn) throws
IOException, OozieClientException {
if ((conn.getResponseCode() == HttpURLConnection.HTTP_OK)) {
- Reader reader = new InputStreamReader(conn.getInputStream(),
Charsets.UTF_8);
+ Reader reader = new InputStreamReader(conn.getInputStream(),
StandardCharsets.UTF_8);
JSONObject json = (JSONObject) JSONValue.parse(reader);
Map<String, String> map = new HashMap<>();
for (Object key : json.keySet()) {
@@ -711,7 +711,8 @@ public class OozieClient {
writeToXml(conf, conn.getOutputStream());
if (conn.getResponseCode() == HttpURLConnection.HTTP_CREATED) {
- JSONObject json = (JSONObject) JSONValue.parse(new
InputStreamReader(conn.getInputStream(), Charsets.UTF_8));
+ JSONObject json = (JSONObject) JSONValue.parse(
+ new InputStreamReader(conn.getInputStream(),
StandardCharsets.UTF_8));
return (String) json.get(JsonTags.JOB_ID);
}
@@ -772,7 +773,7 @@ public class OozieClient {
protected JSONObject call(HttpURLConnection conn) throws IOException,
OozieClientException {
conn.setRequestProperty("content-type",
RestConstants.XML_CONTENT_TYPE);
if ((conn.getResponseCode() == HttpURLConnection.HTTP_OK)) {
- Reader reader = new InputStreamReader(conn.getInputStream(),
Charsets.UTF_8);
+ Reader reader = new InputStreamReader(conn.getInputStream(),
StandardCharsets.UTF_8);
return (JSONObject) JSONValue.parse(reader);
}
else {
@@ -832,7 +833,8 @@ public class OozieClient {
writeToXml(conf, conn.getOutputStream());
if (conn.getResponseCode() == HttpURLConnection.HTTP_OK) {
- JSONObject json = (JSONObject) JSONValue.parse(new
InputStreamReader(conn.getInputStream(), Charsets.UTF_8));
+ JSONObject json = (JSONObject) JSONValue.parse(
+ new InputStreamReader(conn.getInputStream(),
StandardCharsets.UTF_8));
JSONObject update = (JSONObject)
json.get(JsonTags.COORD_UPDATE);
if (update != null) {
return (String) update.get(JsonTags.COORD_UPDATE_DIFF);
@@ -991,7 +993,7 @@ public class OozieClient {
@Override
protected WorkflowJob call(HttpURLConnection conn) throws IOException,
OozieClientException {
if ((conn.getResponseCode() == HttpURLConnection.HTTP_OK)) {
- Reader reader = new InputStreamReader(conn.getInputStream(),
Charsets.UTF_8);
+ Reader reader = new InputStreamReader(conn.getInputStream(),
StandardCharsets.UTF_8);
JSONObject json = (JSONObject) JSONValue.parse(reader);
return JsonToBean.createWorkflowJob(json);
}
@@ -1010,7 +1012,7 @@ public class OozieClient {
protected JMSConnectionInfo call(HttpURLConnection conn) throws
IOException, OozieClientException {
if ((conn.getResponseCode() == HttpURLConnection.HTTP_OK)) {
- Reader reader = new InputStreamReader(conn.getInputStream(),
Charsets.UTF_8);
+ Reader reader = new InputStreamReader(conn.getInputStream(),
StandardCharsets.UTF_8);
JSONObject json = (JSONObject) JSONValue.parse(reader);
return JsonToBean.createJMSConnectionInfo(json);
}
@@ -1030,7 +1032,7 @@ public class OozieClient {
@Override
protected WorkflowAction call(HttpURLConnection conn) throws
IOException, OozieClientException {
if ((conn.getResponseCode() == HttpURLConnection.HTTP_OK)) {
- Reader reader = new InputStreamReader(conn.getInputStream(),
Charsets.UTF_8);
+ Reader reader = new InputStreamReader(conn.getInputStream(),
StandardCharsets.UTF_8);
JSONObject json = (JSONObject) JSONValue.parse(reader);
return JsonToBean.createWorkflowAction(json);
}
@@ -1051,7 +1053,7 @@ public class OozieClient {
protected List<Map<String, String>> call(HttpURLConnection conn)
throws IOException, OozieClientException {
if ((conn.getResponseCode() == HttpURLConnection.HTTP_OK)) {
- Reader reader = new InputStreamReader(conn.getInputStream(),
Charsets.UTF_8);
+ Reader reader = new InputStreamReader(conn.getInputStream(),
StandardCharsets.UTF_8);
JSONObject json = (JSONObject) JSONValue.parse(reader);
return new
ObjectMapper().readValue(json.get(JsonTags.WORKFLOW_ACTION_RETRIES).toString(),
new TypeReference<List<Map<String, String>>>() {
@@ -1223,7 +1225,7 @@ public class OozieClient {
protected String call(HttpURLConnection conn) throws IOException,
OozieClientException {
if ((conn.getResponseCode() == HttpURLConnection.HTTP_OK)) {
- Reader reader = new InputStreamReader(conn.getInputStream(),
Charsets.UTF_8);
+ Reader reader = new InputStreamReader(conn.getInputStream(),
StandardCharsets.UTF_8);
JSONObject json = (JSONObject) JSONValue.parse(reader);
return (String) json.get(JsonTags.JMS_TOPIC_NAME);
}
@@ -1287,7 +1289,7 @@ public class OozieClient {
@SuppressWarnings("unchecked")
protected String call(HttpURLConnection conn) throws IOException,
OozieClientException {
if ((conn.getResponseCode() == HttpURLConnection.HTTP_OK)) {
- Reader reader = new InputStreamReader(conn.getInputStream(),
Charsets.UTF_8);
+ Reader reader = new InputStreamReader(conn.getInputStream(),
StandardCharsets.UTF_8);
JSONObject json = (JSONObject) JSONValue.parse(reader);
if (json != null) {
JSONArray inputDependencies = (JSONArray)
json.get(JsonTags.COORD_ACTION_MISSING_DEPENDENCIES);
@@ -1372,7 +1374,7 @@ public class OozieClient {
String returnVal = null;
if ((conn.getResponseCode() == HttpURLConnection.HTTP_OK)) {
InputStream is = conn.getInputStream();
- try (InputStreamReader isr = new InputStreamReader(is,
Charsets.UTF_8)) {
+ try (InputStreamReader isr = new InputStreamReader(is,
StandardCharsets.UTF_8)) {
if (printStream != null) {
sendToOutputStream(isr, -1, printStream);
} else {
@@ -1455,7 +1457,7 @@ public class OozieClient {
@Override
protected CoordinatorJob call(HttpURLConnection conn) throws
IOException, OozieClientException {
if ((conn.getResponseCode() == HttpURLConnection.HTTP_OK)) {
- Reader reader = new InputStreamReader(conn.getInputStream(),
Charsets.UTF_8);
+ Reader reader = new InputStreamReader(conn.getInputStream(),
StandardCharsets.UTF_8);
JSONObject json = (JSONObject) JSONValue.parse(reader);
return JsonToBean.createCoordinatorJob(json);
}
@@ -1476,7 +1478,7 @@ public class OozieClient {
@Override
protected List<WorkflowJob> call(HttpURLConnection conn) throws
IOException, OozieClientException {
if ((conn.getResponseCode() == HttpURLConnection.HTTP_OK)) {
- Reader reader = new InputStreamReader(conn.getInputStream(),
Charsets.UTF_8);
+ Reader reader = new InputStreamReader(conn.getInputStream(),
StandardCharsets.UTF_8);
JSONObject json = (JSONObject) JSONValue.parse(reader);
JSONArray workflows = (JSONArray)
json.get(JsonTags.WORKFLOWS_JOBS);
if (workflows == null) {
@@ -1502,7 +1504,7 @@ public class OozieClient {
@Override
protected BundleJob call(HttpURLConnection conn) throws IOException,
OozieClientException {
if ((conn.getResponseCode() == HttpURLConnection.HTTP_OK)) {
- Reader reader = new InputStreamReader(conn.getInputStream(),
Charsets.UTF_8);
+ Reader reader = new InputStreamReader(conn.getInputStream(),
StandardCharsets.UTF_8);
JSONObject json = (JSONObject) JSONValue.parse(reader);
return JsonToBean.createBundleJob(json);
}
@@ -1522,7 +1524,7 @@ public class OozieClient {
@Override
protected CoordinatorAction call(HttpURLConnection conn) throws
IOException, OozieClientException {
if ((conn.getResponseCode() == HttpURLConnection.HTTP_OK)) {
- Reader reader = new InputStreamReader(conn.getInputStream(),
Charsets.UTF_8);
+ Reader reader = new InputStreamReader(conn.getInputStream(),
StandardCharsets.UTF_8);
JSONObject json = (JSONObject) JSONValue.parse(reader);
return JsonToBean.createCoordinatorAction(json);
}
@@ -1613,7 +1615,7 @@ public class OozieClient {
protected List<WorkflowJob> call(HttpURLConnection conn) throws
IOException, OozieClientException {
conn.setRequestProperty("content-type",
RestConstants.XML_CONTENT_TYPE);
if ((conn.getResponseCode() == HttpURLConnection.HTTP_OK)) {
- Reader reader = new InputStreamReader(conn.getInputStream(),
Charsets.UTF_8);
+ Reader reader = new InputStreamReader(conn.getInputStream(),
StandardCharsets.UTF_8);
JSONObject json = (JSONObject) JSONValue.parse(reader);
JSONArray workflows = (JSONArray)
json.get(JsonTags.WORKFLOWS_JOBS);
if (workflows == null) {
@@ -1640,7 +1642,7 @@ public class OozieClient {
protected List<CoordinatorJob> call(HttpURLConnection conn) throws
IOException, OozieClientException {
conn.setRequestProperty("content-type",
RestConstants.XML_CONTENT_TYPE);
if ((conn.getResponseCode() == HttpURLConnection.HTTP_OK)) {
- Reader reader = new InputStreamReader(conn.getInputStream(),
Charsets.UTF_8);
+ Reader reader = new InputStreamReader(conn.getInputStream(),
StandardCharsets.UTF_8);
JSONObject json = (JSONObject) JSONValue.parse(reader);
JSONArray jobs = (JSONArray)
json.get(JsonTags.COORDINATOR_JOBS);
if (jobs == null) {
@@ -1667,7 +1669,7 @@ public class OozieClient {
protected List<BundleJob> call(HttpURLConnection conn) throws
IOException, OozieClientException {
conn.setRequestProperty("content-type",
RestConstants.XML_CONTENT_TYPE);
if ((conn.getResponseCode() == HttpURLConnection.HTTP_OK)) {
- Reader reader = new InputStreamReader(conn.getInputStream(),
Charsets.UTF_8);
+ Reader reader = new InputStreamReader(conn.getInputStream(),
StandardCharsets.UTF_8);
JSONObject json = (JSONObject) JSONValue.parse(reader);
JSONArray jobs = (JSONArray) json.get(JsonTags.BUNDLE_JOBS);
if (jobs == null) {
@@ -1693,7 +1695,7 @@ public class OozieClient {
protected List<BulkResponse> call(HttpURLConnection conn) throws
IOException, OozieClientException {
conn.setRequestProperty("content-type",
RestConstants.XML_CONTENT_TYPE);
if ((conn.getResponseCode() == HttpURLConnection.HTTP_OK)) {
- Reader reader = new InputStreamReader(conn.getInputStream(),
Charsets.UTF_8);
+ Reader reader = new InputStreamReader(conn.getInputStream(),
StandardCharsets.UTF_8);
JSONObject json = (JSONObject) JSONValue.parse(reader);
JSONArray results = (JSONArray)
json.get(JsonTags.BULK_RESPONSES);
if (results == null) {
@@ -1720,7 +1722,7 @@ public class OozieClient {
protected List<CoordinatorAction> call(HttpURLConnection conn) throws
IOException, OozieClientException {
conn.setRequestProperty("content-type",
RestConstants.XML_CONTENT_TYPE);
if ((conn.getResponseCode() == HttpURLConnection.HTTP_OK)) {
- Reader reader = new InputStreamReader(conn.getInputStream(),
Charsets.UTF_8);
+ Reader reader = new InputStreamReader(conn.getInputStream(),
StandardCharsets.UTF_8);
JSONObject json = (JSONObject) JSONValue.parse(reader);
JSONArray coordActions = (JSONArray)
json.get(JsonTags.COORDINATOR_ACTIONS);
return JsonToBean.createCoordinatorActionList(coordActions);
@@ -1743,7 +1745,7 @@ public class OozieClient {
protected List<CoordinatorAction> call(HttpURLConnection conn) throws
IOException, OozieClientException {
conn.setRequestProperty("content-type",
RestConstants.XML_CONTENT_TYPE);
if ((conn.getResponseCode() == HttpURLConnection.HTTP_OK)) {
- Reader reader = new InputStreamReader(conn.getInputStream(),
Charsets.UTF_8);
+ Reader reader = new InputStreamReader(conn.getInputStream(),
StandardCharsets.UTF_8);
JSONObject json = (JSONObject) JSONValue.parse(reader);
if(json != null) {
JSONArray coordActions = (JSONArray)
json.get(JsonTags.COORDINATOR_ACTIONS);
@@ -1773,7 +1775,7 @@ public class OozieClient {
protected List<CoordinatorAction> call(HttpURLConnection conn) throws
IOException, OozieClientException {
conn.setRequestProperty("content-type",
RestConstants.XML_CONTENT_TYPE);
if ((conn.getResponseCode() == HttpURLConnection.HTTP_OK)) {
- Reader reader = new InputStreamReader(conn.getInputStream(),
Charsets.UTF_8);
+ Reader reader = new InputStreamReader(conn.getInputStream(),
StandardCharsets.UTF_8);
JSONObject json = (JSONObject) JSONValue.parse(reader);
JSONArray coordActions = (JSONArray)
json.get(JsonTags.COORDINATOR_ACTIONS);
return JsonToBean.createCoordinatorActionList(coordActions);
@@ -2045,7 +2047,8 @@ public class OozieClient {
protected Void call(HttpURLConnection conn) throws IOException,
OozieClientException {
conn.setRequestProperty("content-type",
RestConstants.XML_CONTENT_TYPE);
if ((conn.getResponseCode() == HttpURLConnection.HTTP_OK)) {
- BufferedReader br = new BufferedReader(new
InputStreamReader(conn.getInputStream(), Charsets.UTF_8));
+ BufferedReader br = new BufferedReader(
+ new InputStreamReader(conn.getInputStream(),
StandardCharsets.UTF_8));
String line;
while ((line = br.readLine()) != null) {
System.out.println(line);
@@ -2068,7 +2071,7 @@ public class OozieClient {
@Override
protected String call(HttpURLConnection conn) throws IOException,
OozieClientException {
if ((conn.getResponseCode() == HttpURLConnection.HTTP_OK)) {
- Reader reader = new InputStreamReader(conn.getInputStream(),
Charsets.UTF_8);
+ Reader reader = new InputStreamReader(conn.getInputStream(),
StandardCharsets.UTF_8);
JSONObject json = (JSONObject) JSONValue.parse(reader);
return (String) json.get(JsonTags.JOB_ID);
}
@@ -2128,7 +2131,7 @@ public class OozieClient {
@Override
protected SYSTEM_MODE call(HttpURLConnection conn) throws IOException,
OozieClientException {
if ((conn.getResponseCode() == HttpURLConnection.HTTP_OK)) {
- Reader reader = new InputStreamReader(conn.getInputStream(),
Charsets.UTF_8);
+ Reader reader = new InputStreamReader(conn.getInputStream(),
StandardCharsets.UTF_8);
JSONObject json = (JSONObject) JSONValue.parse(reader);
return SYSTEM_MODE.valueOf((String)
json.get(JsonTags.OOZIE_SYSTEM_MODE));
}
@@ -2170,7 +2173,7 @@ public class OozieClient {
@Override
protected String call(HttpURLConnection conn) throws IOException,
OozieClientException {
if ((conn.getResponseCode() == HttpURLConnection.HTTP_OK)) {
- Reader reader = new InputStreamReader(conn.getInputStream(),
Charsets.UTF_8);
+ Reader reader = new InputStreamReader(conn.getInputStream(),
StandardCharsets.UTF_8);
JSONObject json = (JSONObject) JSONValue.parse(reader);
return json.get(JsonTags.BUILD_INFO).toString();
}
@@ -2203,7 +2206,7 @@ public class OozieClient {
}
}
if ((conn.getResponseCode() == HttpURLConnection.HTTP_OK)) {
- Reader reader = new InputStreamReader(conn.getInputStream(),
Charsets.UTF_8);
+ Reader reader = new InputStreamReader(conn.getInputStream(),
StandardCharsets.UTF_8);
JSONObject json = (JSONObject) JSONValue.parse(reader);
return (String) json.get(JsonTags.VALIDATE);
}
@@ -2244,7 +2247,7 @@ public class OozieClient {
protected String call(HttpURLConnection conn) throws IOException,
OozieClientException {
StringBuffer bf = new StringBuffer();
if ((conn.getResponseCode() == HttpURLConnection.HTTP_OK)) {
- Reader reader = new InputStreamReader(conn.getInputStream(),
Charsets.UTF_8);
+ Reader reader = new InputStreamReader(conn.getInputStream(),
StandardCharsets.UTF_8);
Object sharelib = JSONValue.parse(reader);
bf.append("[ShareLib update
status]").append(System.getProperty("line.separator"));
if (sharelib instanceof JSONArray) {
@@ -2286,7 +2289,7 @@ public class OozieClient {
if ((conn.getResponseCode() == HttpURLConnection.HTTP_OK)) {
StringBuffer bf = new StringBuffer();
- Reader reader = new InputStreamReader(conn.getInputStream(),
Charsets.UTF_8);
+ Reader reader = new InputStreamReader(conn.getInputStream(),
StandardCharsets.UTF_8);
JSONObject json = (JSONObject) JSONValue.parse(reader);
Object sharelib = json.get(JsonTags.SHARELIB_LIB);
bf.append("[Available
ShareLib]").append(System.getProperty("line.separator"));
@@ -2369,7 +2372,7 @@ public class OozieClient {
@Override
protected String call(HttpURLConnection conn) throws IOException,
OozieClientException {
if (conn.getResponseCode() == HttpURLConnection.HTTP_OK) {
- Reader reader = new InputStreamReader(conn.getInputStream(),
Charsets.UTF_8);
+ Reader reader = new InputStreamReader(conn.getInputStream(),
StandardCharsets.UTF_8);
JSONObject jsonObject = (JSONObject) JSONValue.parse(reader);
Object msg = jsonObject.get(JsonTags.PURGE);
return msg.toString();
@@ -2530,7 +2533,7 @@ public class OozieClient {
@Override
protected String call(HttpURLConnection conn) throws IOException,
OozieClientException {
if ((conn.getResponseCode() == HttpURLConnection.HTTP_OK)) {
- Reader reader = new InputStreamReader(conn.getInputStream(),
Charsets.UTF_8);
+ Reader reader = new InputStreamReader(conn.getInputStream(),
StandardCharsets.UTF_8);
JSONObject json = (JSONObject) JSONValue.parse(reader);
return (String) json.get(JsonTags.STATUS);
}
@@ -2553,7 +2556,7 @@ public class OozieClient {
return null;
}
- Reader reader = new InputStreamReader(conn.getInputStream(),
Charsets.UTF_8);
+ Reader reader = new InputStreamReader(conn.getInputStream(),
StandardCharsets.UTF_8);
JSONObject json = (JSONObject) JSONValue.parse(reader);
List<String> queueDumpMessages = Lists.newArrayList();
@@ -2695,7 +2698,7 @@ public class OozieClient {
@Override
protected Metrics call(HttpURLConnection conn) throws IOException,
OozieClientException {
if ((conn.getResponseCode() == HttpURLConnection.HTTP_OK)) {
- Reader reader = new InputStreamReader(conn.getInputStream(),
Charsets.UTF_8);
+ Reader reader = new InputStreamReader(conn.getInputStream(),
StandardCharsets.UTF_8);
JSONObject json = (JSONObject) JSONValue.parse(reader);
return new Metrics(json);
}
@@ -2927,7 +2930,7 @@ public class OozieClient {
@Override
protected Instrumentation call(HttpURLConnection conn) throws
IOException, OozieClientException {
if ((conn.getResponseCode() == HttpURLConnection.HTTP_OK)) {
- Reader reader = new InputStreamReader(conn.getInputStream(),
Charsets.UTF_8);
+ Reader reader = new InputStreamReader(conn.getInputStream(),
StandardCharsets.UTF_8);
JSONObject json = (JSONObject) JSONValue.parse(reader);
return new Instrumentation(json);
}
diff --git a/client/src/main/java/org/apache/oozie/client/XOozieClient.java
b/client/src/main/java/org/apache/oozie/client/XOozieClient.java
index 7761d11..0735958 100644
--- a/client/src/main/java/org/apache/oozie/client/XOozieClient.java
+++ b/client/src/main/java/org/apache/oozie/client/XOozieClient.java
@@ -24,9 +24,9 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.net.HttpURLConnection;
+import java.nio.charset.StandardCharsets;
import java.util.Properties;
-import com.google.common.base.Charsets;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import org.apache.commons.io.FilenameUtils;
import org.apache.oozie.cli.OozieCLI;
@@ -83,7 +83,7 @@ public class XOozieClient extends OozieClient {
BufferedReader br = null;
try {
br = new BufferedReader(new InputStreamReader(new FileInputStream(
- FilenameUtils.getFullPath(script) +
FilenameUtils.getName(script)), Charsets.UTF_8));
+ FilenameUtils.getFullPath(script) +
FilenameUtils.getName(script)), StandardCharsets.UTF_8));
StringBuilder sb = new StringBuilder();
String line;
while ((line = br.readLine()) != null) {
@@ -279,7 +279,8 @@ public class XOozieClient extends OozieClient {
conn.setRequestProperty("content-type",
RestConstants.XML_CONTENT_TYPE);
writeToXml(conf, conn.getOutputStream());
if (conn.getResponseCode() == HttpURLConnection.HTTP_CREATED) {
- JSONObject json = (JSONObject) JSONValue.parse(new
InputStreamReader(conn.getInputStream(), Charsets.UTF_8));
+ JSONObject json = (JSONObject) JSONValue.parse(
+ new InputStreamReader(conn.getInputStream(),
StandardCharsets.UTF_8));
return (String) json.get(JsonTags.JOB_ID);
}
if (conn.getResponseCode() != HttpURLConnection.HTTP_OK) {
diff --git a/core/src/main/java/org/apache/oozie/StringBlob.java
b/core/src/main/java/org/apache/oozie/StringBlob.java
index eba1313..0747600 100644
--- a/core/src/main/java/org/apache/oozie/StringBlob.java
+++ b/core/src/main/java/org/apache/oozie/StringBlob.java
@@ -21,9 +21,8 @@ package org.apache.oozie;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
import java.io.IOException;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
-import com.google.common.base.Charsets;
import org.apache.oozie.compression.CodecFactory;
import org.apache.oozie.compression.CompressionCodec;
import org.apache.oozie.util.ByteArrayUtils;
@@ -119,7 +118,7 @@ public class StringBlob {
}
}
else {
- rawBlob =
ByteArrayUtils.weakIntern(string.getBytes(Charsets.UTF_8));
+ rawBlob =
ByteArrayUtils.weakIntern(string.getBytes(StandardCharsets.UTF_8));
}
return rawBlob;
}
diff --git a/core/src/main/java/org/apache/oozie/action/ActionExecutor.java
b/core/src/main/java/org/apache/oozie/action/ActionExecutor.java
index 8a585b3..d19a5cd 100644
--- a/core/src/main/java/org/apache/oozie/action/ActionExecutor.java
+++ b/core/src/main/java/org/apache/oozie/action/ActionExecutor.java
@@ -18,7 +18,6 @@
package org.apache.oozie.action;
-import com.google.common.base.Charsets;
import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
@@ -37,6 +36,7 @@ import java.io.IOException;
import java.io.PrintStream;
import java.io.UnsupportedEncodingException;
import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
@@ -353,8 +353,8 @@ public abstract class ActionExecutor {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
try {
- err.printStackTrace(new PrintStream(baos, false,
Charsets.UTF_8.name()));
-
XLog.getLog(getClass()).warn(baos.toString(Charsets.UTF_8.name()));
+ err.printStackTrace(new PrintStream(baos, false,
StandardCharsets.UTF_8.name()));
+
XLog.getLog(getClass()).warn(baos.toString(StandardCharsets.UTF_8.name()));
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e);
}
diff --git
a/core/src/main/java/org/apache/oozie/action/hadoop/LauncherHelper.java
b/core/src/main/java/org/apache/oozie/action/hadoop/LauncherHelper.java
index 8f98137..4c74b73 100644
--- a/core/src/main/java/org/apache/oozie/action/hadoop/LauncherHelper.java
+++ b/core/src/main/java/org/apache/oozie/action/hadoop/LauncherHelper.java
@@ -22,8 +22,8 @@ import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.security.PrivilegedExceptionAction;
@@ -34,7 +34,6 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
-import com.google.common.base.Charsets;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
@@ -67,7 +66,7 @@ public class LauncherHelper {
if (fs.exists(recoveryFile)) {
InputStream is = fs.open(recoveryFile);
- BufferedReader reader = new BufferedReader(new
InputStreamReader(is, Charsets.UTF_8));
+ BufferedReader reader = new BufferedReader(new
InputStreamReader(is, StandardCharsets.UTF_8));
jobId = reader.readLine();
reader.close();
}
@@ -157,7 +156,7 @@ public class LauncherHelper {
public static String getTag(String launcherTag) throws
NoSuchAlgorithmException {
MessageDigest digest = MessageDigest.getInstance("MD5");
- digest.update(launcherTag.getBytes(Charsets.UTF_8), 0,
launcherTag.length());
+ digest.update(launcherTag.getBytes(StandardCharsets.UTF_8), 0,
launcherTag.length());
return "oozie-" + new BigInteger(1, digest.digest()).toString(16);
}
@@ -254,12 +253,12 @@ public class LauncherHelper {
Path path = fileStatus.getPath();
if (path.equals(new Path(actionDir,
"externalChildIds.properties"))) {
is = fs.open(path);
- reader = new BufferedReader(new
InputStreamReader(is, Charsets.UTF_8));
+ reader = new BufferedReader(new
InputStreamReader(is, StandardCharsets.UTF_8));
ret.put(LauncherAMUtils.ACTION_DATA_EXTERNAL_CHILD_IDS,
IOUtils.getReaderAsString(reader, -1));
} else if (path.equals(new Path(actionDir,
"newId.properties"))) {
is = fs.open(path);
- reader = new BufferedReader(new
InputStreamReader(is, Charsets.UTF_8));
+ reader = new BufferedReader(new
InputStreamReader(is, StandardCharsets.UTF_8));
props = PropertiesUtils.readProperties(reader,
-1);
ret.put(LauncherAMUtils.ACTION_DATA_NEW_ID,
props.getProperty("id"));
}
@@ -267,7 +266,7 @@ public class LauncherHelper {
int maxOutputData =
conf.getInt(LauncherAMUtils.CONF_OOZIE_ACTION_MAX_OUTPUT_DATA,
2 * 1024);
is = fs.open(path);
- reader = new BufferedReader(new
InputStreamReader(is, Charsets.UTF_8));
+ reader = new BufferedReader(new
InputStreamReader(is, StandardCharsets.UTF_8));
ret.put(LauncherAMUtils.ACTION_DATA_OUTPUT_PROPS, PropertiesUtils
.propertiesToString(PropertiesUtils.readProperties(reader, maxOutputData)));
}
@@ -275,13 +274,13 @@ public class LauncherHelper {
int statsMaxOutputData =
conf.getInt(LauncherAMUtils.CONF_OOZIE_EXTERNAL_STATS_MAX_SIZE,
Integer.MAX_VALUE);
is = fs.open(path);
- reader = new BufferedReader(new
InputStreamReader(is, Charsets.UTF_8));
+ reader = new BufferedReader(new
InputStreamReader(is, StandardCharsets.UTF_8));
ret.put(LauncherAMUtils.ACTION_DATA_STATS,
PropertiesUtils
.propertiesToString(PropertiesUtils.readProperties(reader,
statsMaxOutputData)));
}
else if (path.equals(new Path(actionDir,
LauncherAMUtils.ACTION_DATA_ERROR_PROPS))) {
is = fs.open(path);
- reader = new BufferedReader(new
InputStreamReader(is, Charsets.UTF_8));
+ reader = new BufferedReader(new
InputStreamReader(is, StandardCharsets.UTF_8));
ret.put(LauncherAMUtils.ACTION_DATA_ERROR_PROPS,
IOUtils.getReaderAsString(reader, -1));
}
}
diff --git
a/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java
b/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java
index 9b102a5..7ebc909 100644
---
a/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java
+++
b/core/src/main/java/org/apache/oozie/action/hadoop/MapReduceActionExecutor.java
@@ -21,6 +21,7 @@ package org.apache.oozie.action.hadoop;
import java.io.IOException;
import java.io.StringReader;
import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.Comparator;
@@ -28,7 +29,6 @@ import java.util.List;
import java.util.Map;
import java.util.function.Predicate;
-import com.google.common.base.Charsets;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Function;
import com.google.common.base.Preconditions;
@@ -260,7 +260,7 @@ public class MapReduceActionExecutor extends
JavaActionExecutor {
// do not store the action stats
if
(Boolean.parseBoolean(evaluateConfigurationProperty(actionXml,
OOZIE_ACTION_EXTERNAL_STATS_WRITE, "false"))
- &&
(statsJsonString.getBytes(Charsets.UTF_8).length <= getMaxExternalStatsSize()))
{
+ &&
(statsJsonString.getBytes(StandardCharsets.UTF_8).length <=
getMaxExternalStatsSize())) {
context.setExecutionStats(statsJsonString);
log.debug(
"Printing stats for Map-Reduce action as a
JSON string : [{0}]", statsJsonString);
diff --git
a/core/src/main/java/org/apache/oozie/action/hadoop/SqoopActionExecutor.java
b/core/src/main/java/org/apache/oozie/action/hadoop/SqoopActionExecutor.java
index 4117d8b..8522238 100644
--- a/core/src/main/java/org/apache/oozie/action/hadoop/SqoopActionExecutor.java
+++ b/core/src/main/java/org/apache/oozie/action/hadoop/SqoopActionExecutor.java
@@ -20,12 +20,12 @@ package org.apache.oozie.action.hadoop;
import java.io.IOException;
import java.io.StringReader;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import java.util.StringTokenizer;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Charsets;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.mapred.Counters;
@@ -210,7 +210,7 @@ public class SqoopActionExecutor extends JavaActionExecutor
{
// do not store the action stats
if
(Boolean.parseBoolean(evaluateConfigurationProperty(actionXml,
OOZIE_ACTION_EXTERNAL_STATS_WRITE, "true"))
- &&
(statsJsonString.getBytes(Charsets.UTF_8).length <= getMaxExternalStatsSize()))
{
+ &&
(statsJsonString.getBytes(StandardCharsets.UTF_8).length <=
getMaxExternalStatsSize())) {
context.setExecutionStats(statsJsonString);
LOG.debug(
"Printing stats for sqoop action as a JSON string :
[{0}]", statsJsonString);
diff --git
a/core/src/main/java/org/apache/oozie/action/ssh/SshActionExecutor.java
b/core/src/main/java/org/apache/oozie/action/ssh/SshActionExecutor.java
index 34a26a9..6956cba 100644
--- a/core/src/main/java/org/apache/oozie/action/ssh/SshActionExecutor.java
+++ b/core/src/main/java/org/apache/oozie/action/ssh/SshActionExecutor.java
@@ -18,17 +18,15 @@
package org.apache.oozie.action.ssh;
-import java.io.BufferedReader;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.Callable;
-import com.google.common.base.Charsets;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import org.apache.hadoop.util.StringUtils;
@@ -534,9 +532,9 @@ public class SshActionExecutor extends ActionExecutor {
}
try {
IOUtils.copyCharStream(IOUtils.getResourceAsReader("ssh-base.sh",
-1), new OutputStreamWriter(
- new FileOutputStream(dirLocation + "/ssh-base.sh"),
Charsets.UTF_8));
+ new FileOutputStream(dirLocation + "/ssh-base.sh"),
StandardCharsets.UTF_8));
IOUtils.copyCharStream(IOUtils.getResourceAsReader("ssh-wrapper.sh", -1), new
OutputStreamWriter(
- new FileOutputStream(dirLocation + "/ssh-wrapper.sh"),
Charsets.UTF_8));
+ new FileOutputStream(dirLocation + "/ssh-wrapper.sh"),
StandardCharsets.UTF_8));
}
catch (IOException ie) {
throw new RuntimeException(XLog.format("Not able to copy required
scripts file to {0} "
diff --git
a/core/src/main/java/org/apache/oozie/command/bundle/BundleSubmitXCommand.java
b/core/src/main/java/org/apache/oozie/command/bundle/BundleSubmitXCommand.java
index 1ee2237..ab88cac 100644
---
a/core/src/main/java/org/apache/oozie/command/bundle/BundleSubmitXCommand.java
+++
b/core/src/main/java/org/apache/oozie/command/bundle/BundleSubmitXCommand.java
@@ -25,6 +25,7 @@ import java.io.StringReader;
import java.io.StringWriter;
import java.net.URI;
import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
@@ -34,7 +35,6 @@ import java.util.Set;
import javax.xml.transform.stream.StreamSource;
import javax.xml.validation.Validator;
-import com.google.common.base.Charsets;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
@@ -297,7 +297,7 @@ public class BundleSubmitXCommand extends
SubmitTransitionXCommand {
appDefPath = path;
}
- Reader reader = new InputStreamReader(fs.open(appDefPath),
Charsets.UTF_8);
+ Reader reader = new InputStreamReader(fs.open(appDefPath),
StandardCharsets.UTF_8);
StringWriter writer = new StringWriter();
IOUtils.copyCharStream(reader, writer);
return writer.toString();
diff --git
a/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java
b/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java
index 705350d..2622f05 100644
--- a/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java
+++ b/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java
@@ -25,6 +25,7 @@ import java.io.StringReader;
import java.io.StringWriter;
import java.net.URI;
import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
@@ -39,7 +40,6 @@ import java.util.TreeSet;
import javax.xml.transform.stream.StreamSource;
import javax.xml.validation.Validator;
-import com.google.common.base.Charsets;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
@@ -1209,7 +1209,7 @@ public class CoordSubmitXCommand extends
SubmitTransitionXCommand {
appDefPath = path;
}
- Reader reader = new InputStreamReader(fs.open(appDefPath),
Charsets.UTF_8);
+ Reader reader = new InputStreamReader(fs.open(appDefPath),
StandardCharsets.UTF_8);
StringWriter writer = new StringWriter();
IOUtils.copyCharStream(reader, writer);
return writer.toString();
diff --git
a/core/src/main/java/org/apache/oozie/command/coord/CoordUpdateXCommand.java
b/core/src/main/java/org/apache/oozie/command/coord/CoordUpdateXCommand.java
index 8ab0a8a..d7a2e95 100644
--- a/core/src/main/java/org/apache/oozie/command/coord/CoordUpdateXCommand.java
+++ b/core/src/main/java/org/apache/oozie/command/coord/CoordUpdateXCommand.java
@@ -21,9 +21,9 @@ package org.apache.oozie.command.coord;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.StringReader;
+import java.nio.charset.StandardCharsets;
import java.util.Date;
-import com.google.common.base.Charsets;
import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.oozie.CoordinatorJobBean;
@@ -200,12 +200,12 @@ public class CoordUpdateXCommand extends
CoordSubmitXCommand {
*/
private String getDiffinGitFormat(String string1, String string2) throws
IOException {
ByteArrayOutputStream out = new ByteArrayOutputStream();
- RawText rt1 = new RawText(string1.getBytes(Charsets.UTF_8));
- RawText rt2 = new RawText(string2.getBytes(Charsets.UTF_8));
+ RawText rt1 = new RawText(string1.getBytes(StandardCharsets.UTF_8));
+ RawText rt2 = new RawText(string2.getBytes(StandardCharsets.UTF_8));
EditList diffList = new EditList();
diffList.addAll(new HistogramDiff().diff(RawTextComparator.DEFAULT,
rt1, rt2));
new DiffFormatter(out).format(diffList, rt1, rt2);
- return out.toString(Charsets.UTF_8.name());
+ return out.toString(StandardCharsets.UTF_8.name());
}
@Override
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 ef9fb04..e139c80 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.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Map;
@@ -41,7 +42,7 @@ public class CodecFactory {
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 = "UTF-8";
+ public static final String UTF_8_ENCODING = StandardCharsets.UTF_8.name();
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/service/AuthorizationService.java
b/core/src/main/java/org/apache/oozie/service/AuthorizationService.java
index 98fcc76..70c0ed7 100644
--- a/core/src/main/java/org/apache/oozie/service/AuthorizationService.java
+++ b/core/src/main/java/org/apache/oozie/service/AuthorizationService.java
@@ -24,13 +24,13 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.net.URI;
+import java.nio.charset.StandardCharsets;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.LinkedHashSet;
-import com.google.common.base.Charsets;
import com.google.common.collect.Sets;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang3.StringUtils;
@@ -193,7 +193,7 @@ public class AuthorizationService implements Service {
if (file.exists()) {
try {
BufferedReader br = new BufferedReader(
- new InputStreamReader(new FileInputStream(file),
Charsets.UTF_8));
+ new InputStreamReader(new FileInputStream(file),
StandardCharsets.UTF_8));
try {
String line = br.readLine();
while (line != null) {
diff --git a/core/src/main/java/org/apache/oozie/service/CallbackService.java
b/core/src/main/java/org/apache/oozie/service/CallbackService.java
index 405701d..d91f45b 100644
--- a/core/src/main/java/org/apache/oozie/service/CallbackService.java
+++ b/core/src/main/java/org/apache/oozie/service/CallbackService.java
@@ -18,13 +18,12 @@
package org.apache.oozie.service;
-import org.apache.oozie.service.Service;
-import org.apache.oozie.service.Services;
import org.apache.oozie.util.ParamChecker;
import org.apache.hadoop.conf.Configuration;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
import java.text.MessageFormat;
/**
@@ -114,7 +113,8 @@ public class CallbackService implements Service {
*/
public String getActionId(String callback) {
try {
- return URLDecoder.decode(getParam(ParamChecker.notEmpty(callback,
"callback"), ID_PARAM), "UTF-8");
+ return URLDecoder.decode(getParam(ParamChecker.notEmpty(callback,
"callback"), ID_PARAM),
+ StandardCharsets.UTF_8.name());
}
catch (UnsupportedEncodingException ex) {
throw new RuntimeException(ex);
@@ -129,7 +129,8 @@ public class CallbackService implements Service {
*/
public String getExternalStatus(String callback) {
try {
- return URLDecoder.decode(getParam(ParamChecker.notEmpty(callback,
"callback"), STATUS_PARAM), "UTF-8");
+ return URLDecoder.decode(getParam(ParamChecker.notEmpty(callback,
"callback"), STATUS_PARAM),
+ StandardCharsets.UTF_8.name());
}
catch (UnsupportedEncodingException ex) {
throw new RuntimeException(ex);
diff --git a/core/src/main/java/org/apache/oozie/service/ShareLibService.java
b/core/src/main/java/org/apache/oozie/service/ShareLibService.java
index 134c6ee..7d074a1 100644
--- a/core/src/main/java/org/apache/oozie/service/ShareLibService.java
+++ b/core/src/main/java/org/apache/oozie/service/ShareLibService.java
@@ -27,6 +27,7 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
import java.text.MessageFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@@ -494,7 +495,7 @@ public class ShareLibService implements Service,
Instrumentable {
// that they are kept sacred during the decoding
// process.
toReturn = toReturn.replaceAll("\\+", "%2B");
- toReturn = URLDecoder.decode(toReturn, "UTF-8");
+ toReturn = URLDecoder.decode(toReturn,
StandardCharsets.UTF_8.name());
toReturn = toReturn.replaceAll("!.*$", "");
return toReturn;
}
diff --git
a/core/src/main/java/org/apache/oozie/service/WorkflowAppService.java
b/core/src/main/java/org/apache/oozie/service/WorkflowAppService.java
index b7eb950..6678427 100644
--- a/core/src/main/java/org/apache/oozie/service/WorkflowAppService.java
+++ b/core/src/main/java/org/apache/oozie/service/WorkflowAppService.java
@@ -18,7 +18,6 @@
package org.apache.oozie.service;
-import com.google.common.base.Charsets;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
@@ -38,6 +37,7 @@ import java.io.Reader;
import java.io.StringWriter;
import java.net.URI;
import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -130,7 +130,7 @@ public abstract class WorkflowAppService implements Service
{
throw new WorkflowException(ErrorCode.E0736,
fsStatus.getLen(), this.maxWFLength);
}
- Reader reader = new InputStreamReader(fs.open(path),
Charsets.UTF_8);
+ Reader reader = new InputStreamReader(fs.open(path),
StandardCharsets.UTF_8);
StringWriter writer = new StringWriter();
IOUtils.copyCharStream(reader, writer);
return writer.toString();
diff --git
a/core/src/main/java/org/apache/oozie/service/ZKXLogStreamingService.java
b/core/src/main/java/org/apache/oozie/service/ZKXLogStreamingService.java
index 2b780d3..eac3b38 100644
--- a/core/src/main/java/org/apache/oozie/service/ZKXLogStreamingService.java
+++ b/core/src/main/java/org/apache/oozie/service/ZKXLogStreamingService.java
@@ -21,6 +21,7 @@ import java.io.BufferedReader;
import java.io.IOException;
import java.io.Writer;
import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -170,7 +171,8 @@ public class ZKXLogStreamingService extends
XLogStreamingService implements Serv
}
String urlWithoutdoAs = null;
if (value != null && value.length > 0 && value[0] !=
null && value[0].length() > 0) {
- urlWithoutdoAs = url.replace("&" + key + "=" +
URLEncoder.encode(value[0], "UTF-8"), "");
+ urlWithoutdoAs = url.replace("&" + key + "=" +
URLEncoder.encode(value[0],
+ StandardCharsets.UTF_8.name()), "");
}
else {
urlWithoutdoAs = url;
diff --git a/core/src/main/java/org/apache/oozie/servlet/JsonRestServlet.java
b/core/src/main/java/org/apache/oozie/servlet/JsonRestServlet.java
index 016b694..aca79ba 100644
--- a/core/src/main/java/org/apache/oozie/servlet/JsonRestServlet.java
+++ b/core/src/main/java/org/apache/oozie/servlet/JsonRestServlet.java
@@ -42,6 +42,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.security.AccessControlException;
import java.util.*;
import java.util.concurrent.atomic.AtomicLong;
@@ -52,11 +53,13 @@ import java.util.concurrent.atomic.AtomicLong;
*/
public abstract class JsonRestServlet extends HttpServlet {
- static final String JSON_UTF8 = RestConstants.JSON_CONTENT_TYPE + ";
charset=\"UTF-8\"";
+ private static final String UTF_8_ENCODING = StandardCharsets.UTF_8.name();
- protected static final String XML_UTF8 = RestConstants.XML_CONTENT_TYPE +
"; charset=\"UTF-8\"";
+ static final String JSON_UTF8 = RestConstants.JSON_CONTENT_TYPE + ";
charset=\""+UTF_8_ENCODING+"\"";
- protected static final String TEXT_UTF8 = RestConstants.TEXT_CONTENT_TYPE
+ "; charset=\"UTF-8\"";
+ protected static final String XML_UTF8 = RestConstants.XML_CONTENT_TYPE +
"; charset=\""+UTF_8_ENCODING+"\"";
+
+ protected static final String TEXT_UTF8 = RestConstants.TEXT_CONTENT_TYPE
+ "; charset=\""+UTF_8_ENCODING+"\"";
protected static final String AUDIT_OPERATION = "audit.operation";
protected static final String AUDIT_PARAM = "audit.param";
diff --git a/core/src/main/java/org/apache/oozie/servlet/V1JobServlet.java
b/core/src/main/java/org/apache/oozie/servlet/V1JobServlet.java
index aa443bb..869568f 100644
--- a/core/src/main/java/org/apache/oozie/servlet/V1JobServlet.java
+++ b/core/src/main/java/org/apache/oozie/servlet/V1JobServlet.java
@@ -19,6 +19,7 @@
package org.apache.oozie.servlet;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Locale;
@@ -26,7 +27,6 @@ import javax.servlet.ServletInputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import com.google.common.base.Charsets;
import com.google.common.base.Strings;
import org.apache.hadoop.conf.Configuration;
import org.apache.oozie.*;
@@ -225,7 +225,7 @@ public class V1JobServlet extends BaseJobServlet {
ServletInputStream is = request.getInputStream();
byte[] b = new byte[101];
while (is.readLine(b, 0, 100) != -1) {
- XLog.getLog(getClass()).warn("Printing :" + new String(b,
Charsets.UTF_8));
+ XLog.getLog(getClass()).warn("Printing :" + new String(b,
StandardCharsets.UTF_8));
}
JsonBean jobBean;
diff --git a/core/src/main/java/org/apache/oozie/servlet/V2ValidateServlet.java
b/core/src/main/java/org/apache/oozie/servlet/V2ValidateServlet.java
index 8a0da93..8bddf1b 100644
--- a/core/src/main/java/org/apache/oozie/servlet/V2ValidateServlet.java
+++ b/core/src/main/java/org/apache/oozie/servlet/V2ValidateServlet.java
@@ -18,7 +18,6 @@
package org.apache.oozie.servlet;
-import com.google.common.base.Charsets;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
@@ -45,6 +44,7 @@ import java.io.Reader;
import java.io.StringReader;
import java.io.StringWriter;
import java.net.URI;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
public class V2ValidateServlet extends JsonRestServlet {
@@ -82,14 +82,14 @@ public class V2ValidateServlet extends JsonRestServlet {
FileSystem fs = has.createFileSystem(user, uri, fsConf);
Path path = new Path(uri.getPath());
- IOUtils.copyCharStream(new InputStreamReader(fs.open(path),
Charsets.UTF_8), stringWriter);
+ IOUtils.copyCharStream(new InputStreamReader(fs.open(path),
StandardCharsets.UTF_8), stringWriter);
} catch (Exception e) {
throw new
XServletException(HttpServletResponse.SC_BAD_REQUEST, ErrorCode.E0505,
"File does not exist, "+ file);
}
}
else {
- IOUtils.copyCharStream(new
InputStreamReader(request.getInputStream(), Charsets.UTF_8), stringWriter);
+ IOUtils.copyCharStream(new
InputStreamReader(request.getInputStream(), StandardCharsets.UTF_8),
stringWriter);
}
try {
validate(stringWriter.toString());
diff --git a/core/src/main/java/org/apache/oozie/util/AuthUrlClient.java
b/core/src/main/java/org/apache/oozie/util/AuthUrlClient.java
index d7f19b2..84db8b0 100644
--- a/core/src/main/java/org/apache/oozie/util/AuthUrlClient.java
+++ b/core/src/main/java/org/apache/oozie/util/AuthUrlClient.java
@@ -26,10 +26,10 @@ import java.io.UnsupportedEncodingException;
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
import java.security.PrivilegedExceptionAction;
import java.util.Map;
-import com.google.common.base.Charsets;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.authentication.client.AuthenticatedURL;
import
org.apache.hadoop.security.authentication.client.AuthenticationException;
@@ -129,7 +129,7 @@ public class AuthUrlClient {
BufferedReader reader = null;
if ((conn.getResponseCode() == HttpURLConnection.HTTP_OK))
{
InputStream is = conn.getInputStream();
- reader = new BufferedReader(new InputStreamReader(is,
Charsets.UTF_8));
+ reader = new BufferedReader(new InputStreamReader(is,
StandardCharsets.UTF_8));
}
return reader;
}
@@ -152,7 +152,7 @@ public class AuthUrlClient {
String value = params.get(key)[0]; // We don't support multi
value.
stringBuilder.append(key);
stringBuilder.append("=");
-
stringBuilder.append(URLEncoder.encode(value,Charsets.UTF_8.name()));
+
stringBuilder.append(URLEncoder.encode(value,StandardCharsets.UTF_8.name()));
}
}
return stringBuilder.toString();
diff --git a/core/src/main/java/org/apache/oozie/util/BufferDrainer.java
b/core/src/main/java/org/apache/oozie/util/BufferDrainer.java
index 0120316..aa44fb0 100644
--- a/core/src/main/java/org/apache/oozie/util/BufferDrainer.java
+++ b/core/src/main/java/org/apache/oozie/util/BufferDrainer.java
@@ -19,11 +19,11 @@
package org.apache.oozie.util;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Charsets;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
public class BufferDrainer {
@@ -68,8 +68,10 @@ public class BufferDrainer {
boolean processEnded = false;
- try (final BufferedReader ir = new BufferedReader(new
InputStreamReader(process.getInputStream(), Charsets.UTF_8));
- final BufferedReader er = new BufferedReader(new
InputStreamReader(process.getErrorStream(), Charsets.UTF_8))) {
+ try (final BufferedReader ir =
+ new BufferedReader(new
InputStreamReader(process.getInputStream(), StandardCharsets.UTF_8));
+ final BufferedReader er =
+ new BufferedReader(new
InputStreamReader(process.getErrorStream(), StandardCharsets.UTF_8))) {
// Here we do some kind of busy waiting, checking whether the
process has finished by calling Process#exitValue().
// If not yet finished, an IllegalThreadStateException is thrown
and ignored, the progress on stdout and stderr read,
// and retried until the process has ended.
diff --git a/core/src/main/java/org/apache/oozie/util/ClassUtils.java
b/core/src/main/java/org/apache/oozie/util/ClassUtils.java
index b47f4f0..d0b5eae 100644
--- a/core/src/main/java/org/apache/oozie/util/ClassUtils.java
+++ b/core/src/main/java/org/apache/oozie/util/ClassUtils.java
@@ -18,6 +18,7 @@
package org.apache.oozie.util;
+import java.nio.charset.StandardCharsets;
import java.util.Enumeration;
import java.net.URL;
import java.net.URLDecoder;
@@ -46,7 +47,7 @@ public class ClassUtils {
if (toReturn.startsWith("file:")) {
toReturn = toReturn.substring("file:".length());
}
- toReturn = URLDecoder.decode(toReturn, "UTF-8");
+ toReturn = URLDecoder.decode(toReturn,
StandardCharsets.UTF_8.name());
return toReturn.replaceAll("!.*$", "");
}
}
diff --git a/core/src/main/java/org/apache/oozie/util/ELConstantsFunctions.java
b/core/src/main/java/org/apache/oozie/util/ELConstantsFunctions.java
index 35ef75c..4de7295 100644
--- a/core/src/main/java/org/apache/oozie/util/ELConstantsFunctions.java
+++ b/core/src/main/java/org/apache/oozie/util/ELConstantsFunctions.java
@@ -21,6 +21,7 @@ package org.apache.oozie.util;
import org.apache.hadoop.conf.Configuration;
import org.json.simple.JSONValue;
+import java.nio.charset.StandardCharsets;
import java.util.Map;
import java.util.Properties;
import java.util.Date;
@@ -179,7 +180,7 @@ public class ELConstantsFunctions {
* @return the encoded <code>String</code>
*/
public static String urlEncode(String input) {
- final String encoding = "UTF-8";
+ final String encoding = StandardCharsets.UTF_8.name();
try {
return (input == null) ? "" : URLEncoder.encode(input, encoding);
}
diff --git a/core/src/main/java/org/apache/oozie/util/IOUtils.java
b/core/src/main/java/org/apache/oozie/util/IOUtils.java
index 94db257..1ee237b 100644
--- a/core/src/main/java/org/apache/oozie/util/IOUtils.java
+++ b/core/src/main/java/org/apache/oozie/util/IOUtils.java
@@ -18,8 +18,6 @@
package org.apache.oozie.util;
-import com.google.common.base.Charsets;
-
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -30,6 +28,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.Closeable;
+import java.nio.charset.StandardCharsets;
import java.util.zip.ZipOutputStream;
import java.util.zip.ZipEntry;
import java.util.jar.JarOutputStream;
@@ -118,7 +117,7 @@ public abstract class IOUtils {
* @throws IOException thrown if the resource could not be read.
*/
public static Reader getResourceAsReader(String path, int maxLen) throws
IOException {
- return new InputStreamReader(getResourceAsStream(path, maxLen),
Charsets.UTF_8);
+ return new InputStreamReader(getResourceAsStream(path, maxLen),
StandardCharsets.UTF_8);
}
/**
@@ -135,7 +134,7 @@ public abstract class IOUtils {
if (is == null) {
throw new IllegalArgumentException(XLog.format("resource [{0}] not
found", path));
}
- Reader reader = new InputStreamReader(is, Charsets.UTF_8);
+ Reader reader = new InputStreamReader(is, StandardCharsets.UTF_8);
return getReaderAsString(reader, maxLen);
}
diff --git a/core/src/main/java/org/apache/oozie/util/MultiFileReader.java
b/core/src/main/java/org/apache/oozie/util/MultiFileReader.java
index 9078f36..6164148 100644
--- a/core/src/main/java/org/apache/oozie/util/MultiFileReader.java
+++ b/core/src/main/java/org/apache/oozie/util/MultiFileReader.java
@@ -18,14 +18,13 @@
package org.apache.oozie.util;
-import com.google.common.base.Charsets;
-
import java.io.File;
import java.io.FileInputStream;
import java.io.FileReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.Reader;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.zip.GZIPInputStream;
@@ -81,11 +80,11 @@ public class MultiFileReader extends Reader {
// gzip files
if (files.get(index).getName().endsWith(".gz")) {
GZIPInputStream gzipInputStream = new GZIPInputStream(new
FileInputStream(files.get(index)));
- reader = new InputStreamReader(gzipInputStream,
Charsets.UTF_8);
+ reader = new InputStreamReader(gzipInputStream,
StandardCharsets.UTF_8);
}
// regular files
else {
- reader = new InputStreamReader(new
FileInputStream(files.get(index)), Charsets.UTF_8);
+ reader = new InputStreamReader(new
FileInputStream(files.get(index)), StandardCharsets.UTF_8);
}
index++;
}
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 e78659b..54196d8 100644
--- a/core/src/main/java/org/apache/oozie/util/StringSerializationUtil.java
+++ b/core/src/main/java/org/apache/oozie/util/StringSerializationUtil.java
@@ -49,7 +49,7 @@ public final class StringSerializationUtil {
return;
}
- byte[] data = value.getBytes(StandardCharsets.UTF_8.name());
+ byte[] data = value.getBytes(StandardCharsets.UTF_8);
if (data.length > CONVERSION_TRESHOLD) {
dOut.writeUTF(DATA_VERSION);
dOut.writeInt(data.length);
diff --git a/core/src/main/java/org/apache/oozie/util/XConfiguration.java
b/core/src/main/java/org/apache/oozie/util/XConfiguration.java
index 6e11c2c..9374538 100644
--- a/core/src/main/java/org/apache/oozie/util/XConfiguration.java
+++ b/core/src/main/java/org/apache/oozie/util/XConfiguration.java
@@ -18,7 +18,6 @@
package org.apache.oozie.util;
-import com.google.common.base.Charsets;
import org.apache.hadoop.conf.Configuration;
import org.apache.oozie.service.ConfigurationService;
import org.apache.oozie.service.Services;
@@ -38,6 +37,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
import java.io.ByteArrayOutputStream;
+import java.nio.charset.StandardCharsets;
import java.util.Map;
import java.util.Properties;
import java.util.regex.Matcher;
@@ -367,7 +367,7 @@ public class XConfiguration extends Configuration {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
this.writeXml(baos);
baos.close();
- xml = new String(baos.toByteArray(), Charsets.UTF_8);
+ xml = new String(baos.toByteArray(), StandardCharsets.UTF_8);
}
catch (IOException ex) {
throw new RuntimeException("Xml writing failed, " +
ex.getMessage(), ex);
diff --git a/core/src/main/java/org/apache/oozie/util/XmlUtils.java
b/core/src/main/java/org/apache/oozie/util/XmlUtils.java
index 177fb62..41a8281 100644
--- a/core/src/main/java/org/apache/oozie/util/XmlUtils.java
+++ b/core/src/main/java/org/apache/oozie/util/XmlUtils.java
@@ -23,6 +23,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.StringReader;
import java.io.StringWriter;
+import java.nio.charset.StandardCharsets;
import java.text.CharacterIterator;
import java.text.StringCharacterIterator;
import java.util.Enumeration;
@@ -31,7 +32,6 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
-import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
@@ -43,10 +43,8 @@ import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
import javax.xml.validation.Schema;
-import javax.xml.validation.SchemaFactory;
import javax.xml.validation.Validator;
-import com.google.common.base.Charsets;
import org.apache.hadoop.conf.Configuration;
import org.apache.oozie.service.SchemaService;
import org.apache.oozie.service.SchemaService.SchemaName;
@@ -268,7 +266,7 @@ public class XmlUtils {
*/
public static void validateXml(Schema schema, String xml) throws
SAXException, IOException {
Validator validator = SchemaService.getValidator(schema);
- validator.validate(new StreamSource(new
ByteArrayInputStream(xml.getBytes(Charsets.UTF_8))));
+ validator.validate(new StreamSource(new
ByteArrayInputStream(xml.getBytes(StandardCharsets.UTF_8))));
}
public static void validateData(String xmlData, SchemaName xsdFile) throws
SAXException, IOException {
diff --git
a/core/src/main/java/org/apache/oozie/util/graph/WorkflowGraphHandler.java
b/core/src/main/java/org/apache/oozie/util/graph/WorkflowGraphHandler.java
index 2a01587..b34b976 100644
--- a/core/src/main/java/org/apache/oozie/util/graph/WorkflowGraphHandler.java
+++ b/core/src/main/java/org/apache/oozie/util/graph/WorkflowGraphHandler.java
@@ -18,7 +18,6 @@
package org.apache.oozie.util.graph;
-import com.google.common.base.Charsets;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import org.apache.oozie.client.WorkflowAction;
@@ -32,6 +31,7 @@ import javax.imageio.ImageIO;
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
import java.util.LinkedHashMap;
import java.util.Locale;
import java.util.Map;
@@ -141,7 +141,7 @@ public class WorkflowGraphHandler extends DefaultHandler {
Preconditions.checkState(!Strings.isNullOrEmpty(content), "No output
generated from graph.");
try {
- out.write(content.getBytes(Charsets.UTF_8));
+ out.write(content.getBytes(StandardCharsets.UTF_8));
} catch (final IOException ioe) {
throw new SAXException(ioe);
}
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 d5ac886..ea23d63 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,12 +23,13 @@ import java.io.BufferedInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
+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 = "UTF-8";
+ private static final String UTF_8_ENCODING = StandardCharsets.UTF_8.name();
private BufferedInputStream inputStream;
private String publicId;
private String systemId;
diff --git a/core/src/test/java/org/apache/oozie/QueryServlet.java
b/core/src/test/java/org/apache/oozie/QueryServlet.java
index 8789438..eebccd2 100644
--- a/core/src/test/java/org/apache/oozie/QueryServlet.java
+++ b/core/src/test/java/org/apache/oozie/QueryServlet.java
@@ -18,12 +18,12 @@
package org.apache.oozie;
-import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
/**
* Servlet that keeps track of the last query string it recieved
@@ -32,8 +32,8 @@ public class QueryServlet extends HttpServlet {
public static String lastQueryString = null;
- protected void doGet(HttpServletRequest request, HttpServletResponse
response) throws ServletException, IOException {
- lastQueryString = URLDecoder.decode(request.getQueryString(), "UTF-8");
+ protected void doGet(HttpServletRequest request, HttpServletResponse
response) throws IOException {
+ lastQueryString = URLDecoder.decode(request.getQueryString(),
StandardCharsets.UTF_8.name());
response.setStatus(HttpServletResponse.SC_OK);
}
diff --git
a/core/src/test/java/org/apache/oozie/action/hadoop/InsertTestToken.java
b/core/src/test/java/org/apache/oozie/action/hadoop/InsertTestToken.java
index 201ea88..9a28ea6 100644
--- a/core/src/test/java/org/apache/oozie/action/hadoop/InsertTestToken.java
+++ b/core/src/test/java/org/apache/oozie/action/hadoop/InsertTestToken.java
@@ -26,20 +26,21 @@ import org.apache.hadoop.security.token.Token;
import org.apache.oozie.action.ActionExecutor.Context;
import org.apache.oozie.util.XLog;
+import java.nio.charset.StandardCharsets;
+
public class InsertTestToken implements CredentialsProvider {
public static String DUMMY_SECRET_KEY = "DummySecretKey";
public InsertTestToken() {
}
@Override
- public void updateCredentials(Credentials credentials, Configuration
config, CredentialsProperties props, Context context)
- throws Exception {
+ public void updateCredentials(Credentials credentials, Configuration
config,
+ CredentialsProperties props, Context
context) {
try {
Token<DelegationTokenIdentifier> abctoken = new
Token<DelegationTokenIdentifier>();
credentials.addToken(new Text("ABC Token"), abctoken);
XLog.getLog(getClass()).debug("Added the ABC token in job conf");
-
- credentials.addSecretKey(new Text(DUMMY_SECRET_KEY),
DUMMY_SECRET_KEY.getBytes("UTF-8"));
+ credentials.addSecretKey(new Text(DUMMY_SECRET_KEY),
DUMMY_SECRET_KEY.getBytes(StandardCharsets.UTF_8));
XLog.getLog(getClass()).debug("Added the " + DUMMY_SECRET_KEY + "
in job conf");
}
catch (Exception e) {
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 4d3e3d7..d49144f 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
@@ -27,6 +27,7 @@ import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.StringReader;
import java.io.Writer;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collections;
import java.util.Date;
@@ -740,7 +741,7 @@ public class TestJavaActionExecutor extends
ActionExecutorTestCase {
byte[] secKey = credentials.getSecretKey(new
Text(InsertTestToken.DUMMY_SECRET_KEY));
assertNotNull(secKey);
- assertEquals(InsertTestToken.DUMMY_SECRET_KEY, new String(secKey,
"UTF-8"));
+ assertEquals(InsertTestToken.DUMMY_SECRET_KEY, new String(secKey,
StandardCharsets.UTF_8.name()));
}
public void testCredentialsInvalid() throws Exception {
diff --git
a/core/src/test/java/org/apache/oozie/action/hadoop/TestWorkflowHelper.java
b/core/src/test/java/org/apache/oozie/action/hadoop/TestWorkflowHelper.java
index d6bebe4..8227c44 100644
--- a/core/src/test/java/org/apache/oozie/action/hadoop/TestWorkflowHelper.java
+++ b/core/src/test/java/org/apache/oozie/action/hadoop/TestWorkflowHelper.java
@@ -19,8 +19,6 @@ package org.apache.oozie.action.hadoop;
import org.apache.oozie.client.WorkflowAction;
import org.apache.oozie.client.WorkflowJob;
-import org.apache.oozie.test.MiniOozieTestCase;
-import org.apache.oozie.test.XTestCase;
import org.apache.oozie.util.IOUtils;
import java.io.ByteArrayInputStream;
@@ -28,6 +26,7 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.net.URI;
+import java.nio.charset.StandardCharsets;
import java.util.List;
public class TestWorkflowHelper {
@@ -68,7 +67,7 @@ public class TestWorkflowHelper {
"<end name=\"end\"/>" +
"</workflow-app>";
final File f = new File(URI.create(workflowUri));
- final ByteArrayInputStream inputStream = new
ByteArrayInputStream(appXml.getBytes("UTF-8"));
+ final ByteArrayInputStream inputStream = new
ByteArrayInputStream(appXml.getBytes(StandardCharsets.UTF_8));
IOUtils.copyStream(inputStream, new FileOutputStream(f));
return workflowUri;
}
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 c408103..d3fd625 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
@@ -26,6 +26,7 @@ import java.io.Reader;
import java.io.Writer;
import java.io.StringReader;
import java.net.URI;
+import java.nio.charset.StandardCharsets;
import java.util.Date;
import java.util.List;
import java.util.Properties;
@@ -983,7 +984,7 @@ public class TestCoordRerunXCommand extends XDataTestCase {
FileSystem fs = getFileSystem();
Writer writer = new OutputStreamWriter(fs.create(new Path(appPath +
"/coordinator.xml")));
- byte[] bytes = appXml.getBytes("UTF-8");
+ byte[] bytes = appXml.getBytes(StandardCharsets.UTF_8);
ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
Reader reader2 = new InputStreamReader(bais);
IOUtils.copyCharStream(reader2, writer);
diff --git
a/core/src/test/java/org/apache/oozie/service/DummyLogStreamingServlet.java
b/core/src/test/java/org/apache/oozie/service/DummyLogStreamingServlet.java
index bbc816e..770fa60 100644
--- a/core/src/test/java/org/apache/oozie/service/DummyLogStreamingServlet.java
+++ b/core/src/test/java/org/apache/oozie/service/DummyLogStreamingServlet.java
@@ -21,6 +21,7 @@ package org.apache.oozie.service;
import java.io.IOException;
import java.io.Writer;
import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@@ -36,8 +37,8 @@ public class DummyLogStreamingServlet extends HttpServlet {
public static String logs = null;
@Override
- protected void doGet(HttpServletRequest request, HttpServletResponse
response) throws ServletException, IOException {
- lastQueryString = URLDecoder.decode(request.getQueryString(), "UTF-8");
+ protected void doGet(HttpServletRequest request, HttpServletResponse
response) throws IOException {
+ lastQueryString = URLDecoder.decode(request.getQueryString(),
StandardCharsets.UTF_8.name());
response.setStatus(HttpServletResponse.SC_OK);
Writer writer = response.getWriter();
writer.append(logs);
diff --git
a/core/src/test/java/org/apache/oozie/servlet/DagServletTestCase.java
b/core/src/test/java/org/apache/oozie/servlet/DagServletTestCase.java
index bf6685d..2d1bc1b 100644
--- a/core/src/test/java/org/apache/oozie/servlet/DagServletTestCase.java
+++ b/core/src/test/java/org/apache/oozie/servlet/DagServletTestCase.java
@@ -25,10 +25,10 @@ import org.apache.oozie.service.ForTestAuthorizationService;
import org.apache.oozie.service.ForTestWorkflowStoreService;
import org.apache.oozie.test.EmbeddedServletContainer;
import org.apache.oozie.test.XDataTestCase;
-import org.apache.oozie.test.XFsTestCase;
import java.net.URL;
import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
import java.util.Map;
import java.util.concurrent.Callable;
@@ -49,8 +49,8 @@ public abstract class DagServletTestCase extends
XDataTestCase {
if (parameters.size() > 0) {
String separator = "?";
for (Map.Entry<String, String> param : parameters.entrySet()) {
- sb.append(separator).append(URLEncoder.encode(param.getKey(),
"UTF-8")).append("=")
- .append(URLEncoder.encode(param.getValue(), "UTF-8"));
+ sb.append(separator).append(URLEncoder.encode(param.getKey(),
StandardCharsets.UTF_8.name())).append("=")
+ .append(URLEncoder.encode(param.getValue(),
StandardCharsets.UTF_8.name()));
separator = "&";
}
}
diff --git
a/core/src/test/java/org/apache/oozie/servlet/TestAuthFilterAuthOozieClient.java
b/core/src/test/java/org/apache/oozie/servlet/TestAuthFilterAuthOozieClient.java
index 0f9a9ea..a747f08 100644
---
a/core/src/test/java/org/apache/oozie/servlet/TestAuthFilterAuthOozieClient.java
+++
b/core/src/test/java/org/apache/oozie/servlet/TestAuthFilterAuthOozieClient.java
@@ -44,7 +44,7 @@ import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.URL;
import java.net.URLEncoder;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Map;
@@ -75,8 +75,8 @@ public class TestAuthFilterAuthOozieClient extends XTestCase {
if (parameters.size() > 0) {
String separator = "?";
for (Map.Entry<String, String> param : parameters.entrySet()) {
- sb.append(separator).append(URLEncoder.encode(param.getKey(),
"UTF-8")).append("=")
- .append(URLEncoder.encode(param.getValue(), "UTF-8"));
+ sb.append(separator).append(URLEncoder.encode(param.getKey(),
StandardCharsets.UTF_8.name())).append("=")
+ .append(URLEncoder.encode(param.getValue(),
StandardCharsets.UTF_8.name()));
separator = "&";
}
}
@@ -349,7 +349,7 @@ public class TestAuthFilterAuthOozieClient extends
XTestCase {
private static String writeTokenCache(long expirationTime, File cacheFile)
throws Exception {
AuthenticationToken authToken = new
AuthenticationToken(getOozieUser(), getOozieUser(), "simple");
authToken.setExpires(expirationTime);
- String signedTokenStr =
computeSignature(SECRET.getBytes(Charset.forName("UTF-8")),
authToken.toString());
+ String signedTokenStr =
computeSignature(SECRET.getBytes(StandardCharsets.UTF_8), authToken.toString());
signedTokenStr = authToken.toString() + "&s=" + signedTokenStr;
PrintWriter pw = new PrintWriter(cacheFile);
pw.write(signedTokenStr);
diff --git
a/core/src/test/java/org/apache/oozie/servlet/TestBulkMonitorWebServiceAPI.java
b/core/src/test/java/org/apache/oozie/servlet/TestBulkMonitorWebServiceAPI.java
index 159fba6..bf44ecf 100644
---
a/core/src/test/java/org/apache/oozie/servlet/TestBulkMonitorWebServiceAPI.java
+++
b/core/src/test/java/org/apache/oozie/servlet/TestBulkMonitorWebServiceAPI.java
@@ -22,6 +22,7 @@ import java.io.InputStreamReader;
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
@@ -93,8 +94,8 @@ public class TestBulkMonitorWebServiceAPI extends
XDataTestCase {
if (parameters.size() > 0) {
String separator = "?";
for (Map.Entry<String, String> param : parameters.entrySet()) {
- sb.append(separator).append(URLEncoder.encode(param.getKey(),
"UTF-8")).append("=")
- .append(URLEncoder.encode(param.getValue(), "UTF-8"));
+ sb.append(separator).append(URLEncoder.encode(param.getKey(),
StandardCharsets.UTF_8.name())).append("=")
+ .append(URLEncoder.encode(param.getValue(),
StandardCharsets.UTF_8.name()));
separator = "&";
}
}
diff --git
a/core/src/test/java/org/apache/oozie/servlet/TestCallbackServlet.java
b/core/src/test/java/org/apache/oozie/servlet/TestCallbackServlet.java
index ee9d011..3cfd3b2 100644
--- a/core/src/test/java/org/apache/oozie/servlet/TestCallbackServlet.java
+++ b/core/src/test/java/org/apache/oozie/servlet/TestCallbackServlet.java
@@ -19,11 +19,11 @@
package org.apache.oozie.servlet;
import org.apache.oozie.client.rest.RestConstants;
-import org.apache.oozie.servlet.CallbackServlet;
import javax.servlet.http.HttpServletResponse;
import java.net.HttpURLConnection;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -83,7 +83,7 @@ public class TestCallbackServlet extends DagServletTestCase {
conn.setRequestProperty("content-type",
RestConstants.TEXT_CONTENT_TYPE);
Properties props = new Properties();
props.setProperty("a", "A");
- props.store(conn.getOutputStream(), "UTF-8");
+ props.store(conn.getOutputStream(),
StandardCharsets.UTF_8.name());
assertEquals(HttpServletResponse.SC_BAD_REQUEST,
conn.getResponseCode());
MockDagEngineService.reset();
@@ -97,7 +97,7 @@ public class TestCallbackServlet extends DagServletTestCase {
conn.setRequestProperty("content-type",
RestConstants.TEXT_CONTENT_TYPE);
props = new Properties();
props.setProperty("a", "A");
- props.store(conn.getOutputStream(), "UTF-8");
+ props.store(conn.getOutputStream(),
StandardCharsets.UTF_8.name());
assertEquals(HttpServletResponse.SC_OK,
conn.getResponseCode());
assertEquals(props, MockDagEngineService.properties);
return null;
diff --git a/core/src/test/java/org/apache/oozie/test/XDataTestCase.java
b/core/src/test/java/org/apache/oozie/test/XDataTestCase.java
index 20e1e82..9ea6143 100644
--- a/core/src/test/java/org/apache/oozie/test/XDataTestCase.java
+++ b/core/src/test/java/org/apache/oozie/test/XDataTestCase.java
@@ -28,6 +28,7 @@ import java.io.PrintWriter;
import java.io.Reader;
import java.io.UnsupportedEncodingException;
import java.io.Writer;
+import java.nio.charset.StandardCharsets;
import java.util.Calendar;
import java.util.Collections;
import java.util.Date;
@@ -595,7 +596,7 @@ public abstract class XDataTestCase extends XHCatTestCase {
FileSystem fs = getFileSystem();
Writer writer = new OutputStreamWriter(fs.create(new Path(appPath +
"/coordinator.xml")));
- byte[] bytes = appXml.getBytes("UTF-8");
+ byte[] bytes = appXml.getBytes(StandardCharsets.UTF_8);
ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
Reader reader2 = new InputStreamReader(bais);
IOUtils.copyCharStream(reader2, writer);
@@ -617,7 +618,7 @@ public abstract class XDataTestCase extends XHCatTestCase {
FileSystem fs = getFileSystem();
Writer writer = new OutputStreamWriter(fs.create(new Path(appPath +
"/coordinator.xml")));
- byte[] bytes = appXml.getBytes("UTF-8");
+ byte[] bytes = appXml.getBytes(StandardCharsets.UTF_8);
ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
Reader reader2 = new InputStreamReader(bais);
IOUtils.copyCharStream(reader2, writer);
diff --git a/core/src/test/java/org/apache/oozie/test/XTestCase.java
b/core/src/test/java/org/apache/oozie/test/XTestCase.java
index 1f0cf17..3ba1e7f 100644
--- a/core/src/test/java/org/apache/oozie/test/XTestCase.java
+++ b/core/src/test/java/org/apache/oozie/test/XTestCase.java
@@ -28,7 +28,6 @@ import java.io.OutputStream;
import java.io.IOException;
import java.net.InetAddress;
import java.net.URL;
-import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.EnumSet;
diff --git a/release-log.txt b/release-log.txt
index 3bbed8f..21435f8 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 5.2.0 release (trunk - unreleased)
+OOZIE-3463 Migrate from com.google.common.base.Charsets to
java.nio.charset.StandardCharsets (nobigo via kmarton)
OOZIE-3467 Migrate from com.google.common.base.Stopwatch (asalamon74 via
kmarton)
OOZIE-3466 Migrate from com.google.common.io.Closeables to
org.apache.commons.io.IOUtils (asalamon74 via kmarton)
OOZIE-3249 [tools] Instrumentation log parser (andras.piros via asalamon74)
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 657fcfb..37819d1 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
@@ -24,10 +24,10 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
-import java.util.Map.Entry;
import java.util.Set;
import java.util.regex.Pattern;
@@ -302,7 +302,7 @@ public class HiveMain extends LauncherMain {
private String createScriptFile(String query) throws IOException {
String filename = "oozie-hive-query-" + System.currentTimeMillis() +
".hql";
File f = new File(filename);
- FileUtils.writeStringToFile(f, query, "UTF-8");
+ FileUtils.writeStringToFile(f, query, StandardCharsets.UTF_8.name());
return filename;
}
@@ -314,7 +314,7 @@ public class HiveMain extends LauncherMain {
String line;
BufferedReader br = null;
try {
- br = new BufferedReader(new InputStreamReader(new
FileInputStream(filePath), "UTF-8"));
+ br = new BufferedReader(new InputStreamReader(new
FileInputStream(filePath), StandardCharsets.UTF_8.name()));
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 7ec1922..3732c3d 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
@@ -25,6 +25,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.PrintStream;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
@@ -258,14 +259,15 @@ public class Hive2Main extends LauncherMain {
private String createScriptFile(String query) throws IOException {
String filename = "oozie-hive2-query-" + System.currentTimeMillis() +
".hql";
File f = new File(filename);
- FileUtils.writeStringToFile(f, query, "UTF-8");
+ FileUtils.writeStringToFile(f, query, StandardCharsets.UTF_8.name());
return filename;
}
private void runBeeline(String[] args, String logFile) throws Exception {
// We do this instead of calling BeeLine.main so we can duplicate the
error stream for harvesting Hadoop child job IDs
BeeLine beeLine = new BeeLine();
- beeLine.setErrorStream(new PrintStream(new TeeOutputStream(System.err,
new FileOutputStream(logFile)), false, "UTF-8"));
+ beeLine.setErrorStream(new PrintStream(new TeeOutputStream(System.err,
new FileOutputStream(logFile)),
+ false, StandardCharsets.UTF_8.name()));
int status = beeLine.begin(args, null);
beeLine.close();
if (status != 0) {
@@ -277,7 +279,7 @@ public class Hive2Main extends LauncherMain {
String line;
BufferedReader br = null;
try {
- br = new BufferedReader(new InputStreamReader(new
FileInputStream(filePath), "UTF-8"));
+ br = new BufferedReader(new InputStreamReader(new
FileInputStream(filePath), StandardCharsets.UTF_8.name()));
StringBuilder sb = new StringBuilder();
String sep = System.getProperty("line.separator");
while ((line = br.readLine()) != null) {
diff --git
a/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/PrepareActionsDriver.java
b/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/PrepareActionsDriver.java
index e730f0f..c98eb3a 100644
---
a/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/PrepareActionsDriver.java
+++
b/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/PrepareActionsDriver.java
@@ -21,6 +21,7 @@ package org.apache.oozie.action.hadoop;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
import org.apache.hadoop.conf.Configuration;
import org.xml.sax.SAXException;
@@ -61,7 +62,7 @@ public class PrepareActionsDriver {
docBuilderFactory.setExpandEntityReferences(false);
docBuilderFactory.setFeature("http://apache.org/xml/features/disallow-doctype-decl";,
true);
DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
- InputStream is = new
ByteArrayInputStream(prepareXML.getBytes("UTF-8"));
+ InputStream is = new
ByteArrayInputStream(prepareXML.getBytes(StandardCharsets.UTF_8));
return docBuilder.parse(is);
}
diff --git
a/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/PrepareActionsHandler.java
b/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/PrepareActionsHandler.java
index 983d49a..b9c4878 100644
---
a/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/PrepareActionsHandler.java
+++
b/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/PrepareActionsHandler.java
@@ -21,6 +21,7 @@ import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
+import java.nio.charset.StandardCharsets;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -103,7 +104,7 @@ public class PrepareActionsHandler {
docBuilderFactory.setExpandEntityReferences(false);
docBuilderFactory.setFeature("http://apache.org/xml/features/disallow-doctype-decl";,
true);
DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
- InputStream is = new
ByteArrayInputStream(prepareXML.getBytes("UTF-8"));
+ InputStream is = new
ByteArrayInputStream(prepareXML.getBytes(StandardCharsets.UTF_8));
return docBuilder.parse(is);
}
diff --git
a/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/ShellContentWriter.java
b/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/ShellContentWriter.java
index 0cef202..1e637d5 100644
---
a/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/ShellContentWriter.java
+++
b/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/ShellContentWriter.java
@@ -19,13 +19,13 @@
package org.apache.oozie.action.hadoop;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-import org.apache.commons.io.Charsets;
import java.io.BufferedInputStream;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -141,7 +141,7 @@ public class ShellContentWriter {
}
private void writeLine(OutputStream stream, String s) throws IOException {
- writeLine(stream, s.getBytes(Charsets.UTF_8));
+ writeLine(stream, s.getBytes(StandardCharsets.UTF_8));
}
private void writeLine(OutputStream stream, byte[] arr) throws IOException
{
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 101260b..e17c07f 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
@@ -39,6 +39,7 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
+import java.nio.charset.StandardCharsets;
import java.util.HashSet;
import java.util.Map;
import java.util.List;
@@ -263,7 +264,7 @@ public class PigMain extends LauncherMain {
System.out.println(type + " Pig script [" + name + "] content: ");
System.out.println("-----------------------------------------------------------");
fin = new FileInputStream(script);
- inReader = new InputStreamReader(fin, "UTF-8");
+ inReader = new InputStreamReader(fin,
StandardCharsets.UTF_8.name());
bufReader = new BufferedReader(inReader);
String line = bufReader.readLine();
while (line != null) {
@@ -294,7 +295,8 @@ public class PigMain extends LauncherMain {
System.err.println("Pig logfile dump:");
System.err.println();
try {
- try (BufferedReader reader = new BufferedReader(new
InputStreamReader(new FileInputStream(pigLog), "UTF-8"))) {
+ try (BufferedReader reader = new BufferedReader(
+ new InputStreamReader(new FileInputStream(pigLog),
StandardCharsets.UTF_8.name()))) {
String line = reader.readLine();
while (line != null) {
System.err.println(line);
@@ -359,7 +361,7 @@ public class PigMain extends LauncherMain {
private static void writeExternalData(String data, File f) throws
IOException {
BufferedWriter out = null;
try {
- out = new BufferedWriter(new OutputStreamWriter(new
FileOutputStream(f), "UTF-8"));
+ out = new BufferedWriter(new OutputStreamWriter(new
FileOutputStream(f), StandardCharsets.UTF_8.name()));
out.write(data);
}
finally {
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 b421aa6..dc223e8 100644
--- a/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java
+++ b/tools/src/main/java/org/apache/oozie/tools/OozieDBCLI.java
@@ -36,6 +36,7 @@ import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileWriter;
import java.io.PrintWriter;
+import java.nio.charset.StandardCharsets;
import java.sql.Blob;
import java.sql.CallableStatement;
import java.sql.Clob;
@@ -665,7 +666,7 @@ public class OozieDBCLI {
}
PreparedStatement ps = conn.prepareStatement("update " +
tableName + " set " + TEMP_COLUMN_PREFIX
+ column + "=? where id = ?");
- byte[] data =
IOUtils.toByteArray(confClob.getCharacterStream(), "UTF-8");
+ byte[] data =
IOUtils.toByteArray(confClob.getCharacterStream(),
StandardCharsets.UTF_8.name());
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 ac315f8..0d3aba8 100644
--- a/tools/src/main/java/org/apache/oozie/tools/OozieDBExportCLI.java
+++ b/tools/src/main/java/org/apache/oozie/tools/OozieDBExportCLI.java
@@ -35,6 +35,7 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
+import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
@@ -178,7 +179,7 @@ public class OozieDBExportCLI {
Gson gson = new Gson();
ZipEntry zipEntry = new ZipEntry(filename);
zipOutputStream.putNextEntry(zipEntry);
- BufferedWriter writer = new BufferedWriter(new
OutputStreamWriter(zipOutputStream, "UTF-8"));
+ BufferedWriter writer = new BufferedWriter(new
OutputStreamWriter(zipOutputStream, StandardCharsets.UTF_8.name()));
query.setMaxResults(LIMIT);
int exported = 0;
List<?> list = query.getResultList();
diff --git a/tools/src/main/java/org/apache/oozie/tools/OozieDBImportCLI.java
b/tools/src/main/java/org/apache/oozie/tools/OozieDBImportCLI.java
index 784782d..3db590d 100644
--- a/tools/src/main/java/org/apache/oozie/tools/OozieDBImportCLI.java
+++ b/tools/src/main/java/org/apache/oozie/tools/OozieDBImportCLI.java
@@ -18,7 +18,6 @@
package org.apache.oozie.tools;
-import com.google.common.base.Charsets;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
@@ -54,6 +53,7 @@ import javax.persistence.metamodel.Metamodel;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.ResultSet;
@@ -222,7 +222,7 @@ public class OozieDBImportCLI {
final ZipEntry sysInfoEntry =
mainZipFile.getEntry(OOZIEDB_SYS_INFO_JSON);
try (BufferedReader reader = new BufferedReader(
- new
InputStreamReader(mainZipFile.getInputStream(sysInfoEntry), Charsets.UTF_8))) {
+ new
InputStreamReader(mainZipFile.getInputStream(sysInfoEntry),
StandardCharsets.UTF_8))) {
String line;
final Gson gson = new Gson();
while ((line = reader.readLine()) != null) {
@@ -315,7 +315,7 @@ public class OozieDBImportCLI {
if (importEntry != null) {
long lineIndex = 1L;
try (BufferedReader reader = new BufferedReader(
- new
InputStreamReader(mainZipFile.getInputStream(importEntry), Charsets.UTF_8))) {
+ new
InputStreamReader(mainZipFile.getInputStream(importEntry),
StandardCharsets.UTF_8))) {
String line;
while ((line = reader.readLine()) != null) {
final E newEntity = gson.fromJson(line, entityClass);
diff --git
a/tools/src/main/java/org/apache/oozie/tools/diag/AppInfoCollector.java
b/tools/src/main/java/org/apache/oozie/tools/diag/AppInfoCollector.java
index d7e4534..41acd14 100644
--- a/tools/src/main/java/org/apache/oozie/tools/diag/AppInfoCollector.java
+++ b/tools/src/main/java/org/apache/oozie/tools/diag/AppInfoCollector.java
@@ -162,7 +162,7 @@ class AppInfoCollector {
private void storeOozieLauncherLog(final File outputDir, final
WorkflowAction action, final String user) {
try (PrintStream fw = new PrintStream(new File(outputDir, "launcher_"
+ action.getName() + ".log"),
- StandardCharsets.UTF_8.toString())) {
+ StandardCharsets.UTF_8.name())) {
final ApplicationId appId =
ConverterUtils.toApplicationId(action.getExternalId());
oozieLauncherLogFetcher.dumpAllContainersLogs(appId, user, fw);
@@ -342,7 +342,7 @@ class AppInfoCollector {
private void persistJobLog(final File outputDir, final String jobId)
throws FileNotFoundException,
UnsupportedEncodingException, OozieClientException {
- try (PrintStream ps = new PrintStream(new File(outputDir, "log.txt"),
StandardCharsets.UTF_8.toString())) {
+ try (PrintStream ps = new PrintStream(new File(outputDir, "log.txt"),
StandardCharsets.UTF_8.name())) {
client.getJobLog(jobId, null, null, null, ps);
}
}
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 e98e0c6..8485f6a 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
@@ -43,7 +43,7 @@ public class DiagBundleEntryWriter implements Closeable {
private DiagBundleEntryWriter(final OutputStream ous) {
try {
- this.writer = new OutputStreamWriter(ous,
StandardCharsets.UTF_8.toString());
+ this.writer = new OutputStreamWriter(ous,
StandardCharsets.UTF_8.name());
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e);
}
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 53a9dcd..c5766ca 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
@@ -32,7 +32,6 @@ import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
@@ -122,7 +121,7 @@ public class TestMetricsCollector {
metricsCollector.storeMetrics(testOut);
final File metricsOut = new File(testOut, "metrics.txt");
- final String str = new String(Files.readAllBytes(metricsOut.toPath()),
StandardCharsets.UTF_8.toString());
+ final String str = new String(Files.readAllBytes(metricsOut.toPath()),
StandardCharsets.UTF_8.name());
assertTrue(str.contains("CoordJobsGetPendingJPAExecutor"));
}
@@ -211,7 +210,7 @@ public class TestMetricsCollector {
final File instrumentationFile = new File(testOut,
"instrumentation.txt");
assertTrue(instrumentationFile.exists());
- final String str = new
String(Files.readAllBytes(instrumentationFile.toPath()),
StandardCharsets.UTF_8.toString());
+ final String str = new
String(Files.readAllBytes(instrumentationFile.toPath()),
StandardCharsets.UTF_8.name());
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 a8225f7..d9ab374 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
@@ -27,7 +27,6 @@ import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
@@ -119,7 +118,7 @@ public class TestServerInfoCollector {
}
static void assertFileContains(final File testFile, final String testData)
throws IOException {
- final String str = new String(Files.readAllBytes(testFile.toPath()),
StandardCharsets.UTF_8.toString());
+ final String str = new String(Files.readAllBytes(testFile.toPath()),
StandardCharsets.UTF_8.name());
assertTrue(str.contains(testData));
}
}
\ No newline at end of file
