Skip to content

Commit ebc2691

Browse files
committed
use UTF8 I/O if possible
1 parent 78358fd commit ebc2691

File tree

7 files changed

+14
-10
lines changed

7 files changed

+14
-10
lines changed

src/main/java/org/maxgamer/quickshop/BuildInfo.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import java.io.IOException;
2727
import java.io.InputStream;
2828
import java.io.InputStreamReader;
29+
import java.nio.charset.StandardCharsets;
2930

3031
/**
3132
* BuildInfo is utilities to help read BUILDINFO file that generated by CodeMC Jenkins.
@@ -57,7 +58,7 @@ public BuildInfo(@Nullable InputStream inputStream) {
5758
jobUrl = "https://ci.codemc.io/job/Ghost-chu/job/QuickShop-Reremake/";
5859
return;
5960
}
60-
YamlConfiguration buildInfo = YamlConfiguration.loadConfiguration(new InputStreamReader(inputStream));
61+
YamlConfiguration buildInfo = YamlConfiguration.loadConfiguration(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
6162
buildId = buildInfo.getInt("build-id", 0);
6263
buildTag = buildInfo.getString("build-tag", "Unknown");
6364
buildUrl = buildInfo.getString("build-url", "Unknown");

src/main/java/org/maxgamer/quickshop/Metrics.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ private static void sendData(Plugin plugin, JsonObject data) throws IllegalAcces
218218

219219
StringBuilder builder = new StringBuilder();
220220
try (BufferedReader bufferedReader =
221-
new BufferedReader(new InputStreamReader(connection.getInputStream()))) {
221+
new BufferedReader(new InputStreamReader(connection.getInputStream(), StandardCharsets.UTF_8))) {
222222
String line;
223223
while ((line = bufferedReader.readLine()) != null) {
224224
builder.append(line);

src/main/java/org/maxgamer/quickshop/QuickShop.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@
9393
import java.io.IOException;
9494
import java.io.InputStreamReader;
9595
import java.net.URISyntaxException;
96+
import java.nio.charset.StandardCharsets;
9697
import java.nio.file.Paths;
9798
import java.util.*;
9899
import java.util.Map.Entry;
@@ -105,7 +106,7 @@ public class QuickShop extends JavaPlugin implements QuickShopAPI {
105106
* You shouldn't use this if you really need it.
106107
*/
107108
@Deprecated
108-
public static QuickShop instance;
109+
private static QuickShop instance;
109110
/**
110111
* The manager to check permissions.
111112
*/
@@ -1950,7 +1951,7 @@ private void updateConfig(int selectedVersion) throws IOException {
19501951
getLogger().warning("You are not using QS Matcher, it may meeting item comparing issue mentioned there: https://hub.spigotmc.org/jira/browse/SPIGOT-5063");
19511952
}
19521953

1953-
try (InputStreamReader buildInConfigReader = new InputStreamReader(new BufferedInputStream(Objects.requireNonNull(getResource("config.yml"))))) {
1954+
try (InputStreamReader buildInConfigReader = new InputStreamReader(new BufferedInputStream(Objects.requireNonNull(getResource("config.yml"))), StandardCharsets.UTF_8)) {
19541955
if (new ConfigurationFixerLightning(this, new File(getDataFolder(), "config.yml"), getConfiguration(), YamlConfiguration.loadConfiguration(buildInConfigReader)).fix()) {
19551956
reloadConfiguration();
19561957
}

src/main/java/org/maxgamer/quickshop/localization/text/SimpleTextManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ private JsonConfiguration loadBundled(String file) {
104104
JsonConfiguration bundledLang = new JsonConfiguration();
105105
File fileObject = new File(file);
106106
try {
107-
bundledLang.loadFromString(new String(IOUtils.toByteArray(new InputStreamReader(plugin.getResource("lang/" + fileObject.getName())), StandardCharsets.UTF_8)));
107+
bundledLang.loadFromString(new String(IOUtils.toByteArray(new InputStreamReader(plugin.getResource("lang/" + fileObject.getName()), StandardCharsets.UTF_8), StandardCharsets.UTF_8)));
108108
} catch (IOException | InvalidConfigurationException ex) {
109109
bundledLang = new JsonConfiguration();
110110
plugin.getLogger().log(Level.SEVERE, "Cannot load bundled language file from Jar, some strings may missing!", ex);

src/main/java/org/maxgamer/quickshop/nonquickshopstuff/com/sk89q/worldedit/util/net/HttpRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ private static URL reformat(URL existing) {
128128
* @return this object
129129
*/
130130
public HttpRequest body(String data) {
131-
body = data.getBytes();
131+
body = data.getBytes(StandardCharsets.UTF_8);
132132
return this;
133133
}
134134

src/main/java/org/maxgamer/quickshop/util/MsgUtil.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
import java.io.File;
6060
import java.io.IOException;
6161
import java.io.InputStreamReader;
62+
import java.nio.charset.StandardCharsets;
6263
import java.sql.ResultSet;
6364
import java.sql.SQLException;
6465
import java.text.DecimalFormat;
@@ -204,7 +205,7 @@ public static void loadEnchi18n() {
204205
enchi18n.options().copyDefaults(false);
205206
YamlConfiguration enchi18nYAML =
206207
YamlConfiguration.loadConfiguration(
207-
new InputStreamReader(Objects.requireNonNull(plugin.getResource("enchi18n.yml"))));
208+
new InputStreamReader(Objects.requireNonNull(plugin.getResource("enchi18n.yml")), StandardCharsets.UTF_8));
208209
enchi18n.setDefaults(enchi18nYAML);
209210
Util.parseColours(enchi18n);
210211
Enchantment[] enchsi18n = Enchantment.values();
@@ -241,7 +242,7 @@ public static void loadItemi18n() {
241242
itemi18n.options().copyDefaults(false);
242243
YamlConfiguration itemi18nYAML =
243244
YamlConfiguration.loadConfiguration(
244-
new InputStreamReader(Objects.requireNonNull(plugin.getResource("itemi18n.yml"))));
245+
new InputStreamReader(Objects.requireNonNull(plugin.getResource("itemi18n.yml")), StandardCharsets.UTF_8));
245246
itemi18n.setDefaults(itemi18nYAML);
246247
Util.parseColours(itemi18n);
247248
Material[] itemsi18n = Material.values();
@@ -277,7 +278,7 @@ public static void loadPotioni18n() {
277278
potioni18n.options().copyDefaults(false);
278279
YamlConfiguration potioni18nYAML =
279280
YamlConfiguration.loadConfiguration(
280-
new InputStreamReader(Objects.requireNonNull(plugin.getResource("potioni18n.yml"))));
281+
new InputStreamReader(Objects.requireNonNull(plugin.getResource("potioni18n.yml")), StandardCharsets.UTF_8));
281282
potioni18n.setDefaults(potioni18nYAML);
282283
Util.parseColours(potioni18n);
283284
for (PotionEffectType potion : PotionEffectType.values()) {

src/main/java/org/maxgamer/quickshop/util/paste/UbuntuPaster.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import java.net.URL;
3030
import java.net.URLConnection;
3131
import java.net.URLEncoder;
32+
import java.nio.charset.StandardCharsets;
3233

3334
public class UbuntuPaster implements PasteInterface {
3435
/**
@@ -65,7 +66,7 @@ public String pasteTheText(@NotNull String text) throws IOException {
6566
out.print(builder);
6667
out.flush(); // Drop
6768

68-
BufferedReader in = new BufferedReader(new InputStreamReader(conn.getInputStream()));
69+
BufferedReader in = new BufferedReader(new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8));
6970
Util.debugLog("Request Completed: " + conn.getURL());
7071
String link = conn.getURL().toString();
7172
in.close();

0 commit comments

Comments
 (0)