From 47a38710b11fbb80a5c3d61b3879636d1a858ca5 Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Sun, 09 Dec 2018 12:07:43 +0000
Subject: [PATCH] Definitions.STD_CHARSET = UTF-8.
---
borgbutler-core/src/main/java/de/micromata/borgbutler/BorgCommands.java | 6 +++---
borgbutler-core/src/main/java/de/micromata/borgbutler/config/ConfigurationHandler.java | 5 ++---
borgbutler-core/src/main/java/de/micromata/borgbutler/config/Definitions.java | 10 ++++++++++
3 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgCommands.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgCommands.java
index ed58dae..7388b2d 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgCommands.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgCommands.java
@@ -3,6 +3,7 @@
import de.micromata.borgbutler.config.BorgRepoConfig;
import de.micromata.borgbutler.config.Configuration;
import de.micromata.borgbutler.config.ConfigurationHandler;
+import de.micromata.borgbutler.config.Definitions;
import de.micromata.borgbutler.json.JsonUtils;
import de.micromata.borgbutler.json.borg.ArchiveInfo;
import de.micromata.borgbutler.json.borg.RepoInfo;
@@ -15,7 +16,6 @@
import org.slf4j.LoggerFactory;
import java.io.IOException;
-import java.nio.charset.Charset;
import java.util.Map;
public class BorgCommands {
@@ -96,11 +96,11 @@
executor.execute(cmdLine, getEnvironment(repoConfig));
} catch (Exception ex) {
log.error("Error while creating environment for borg call '" + borgCall + "': " + ex.getMessage(), ex);
- String response = outputStream.toString(Charset.forName("UTF-8"));
+ String response = outputStream.toString(Definitions.STD_CHARSET);
log.error("Response: " + response);
return null;
}
- String json = outputStream.toString(Charset.forName("UTF-8"));
+ String json = outputStream.toString(Definitions.STD_CHARSET);
return json;
}
diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/config/ConfigurationHandler.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/config/ConfigurationHandler.java
index 9f13c00..0575a77 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/config/ConfigurationHandler.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/config/ConfigurationHandler.java
@@ -8,7 +8,6 @@
import java.io.File;
import java.io.IOException;
-import java.nio.charset.Charset;
public class ConfigurationHandler {
private static Logger log = LoggerFactory.getLogger(ConfigurationHandler.class);
@@ -31,7 +30,7 @@
public void read() {
log.info("Reading config file '" + configFile.getAbsolutePath() + "'");
try {
- String json = FileUtils.readFileToString(configFile, Charset.forName("UTF-8"));
+ String json = FileUtils.readFileToString(configFile, Definitions.STD_CHARSET);
this.configuration = JsonUtils.fromJson(Configuration.class, json);
} catch (IOException ex) {
log.error("Error while trying to read from config file: " + configFile.getAbsolutePath() + ": " + ex.getMessage(), ex);
@@ -48,7 +47,7 @@
FileUtils.copyFile(configFile, backupConfigFile);
}
log.info("Writing config file '" + configFile.getAbsolutePath() + "'");
- FileUtils.write(configFile, json, Charset.forName("UTF-8"));
+ FileUtils.write(configFile, json, Definitions.STD_CHARSET);
} catch (IOException ex) {
log.error("Error while trying to write config file: " + configFile.getAbsolutePath() + ": " + ex.getMessage(), ex);
}
diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/config/Definitions.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/config/Definitions.java
new file mode 100644
index 0000000..886597f
--- /dev/null
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/config/Definitions.java
@@ -0,0 +1,10 @@
+package de.micromata.borgbutler.config;
+
+import java.nio.charset.Charset;
+
+public class Definitions {
+ /**
+ * For sure, it's UTF-8.
+ */
+ public static final Charset STD_CHARSET = Charset.forName("UTF-8");
+}
--
Gitblit v1.10.0