From 486b19aa9007eae3b457394b70fdab4d9220a2d8 Mon Sep 17 00:00:00 2001
From: Luck <git@lucko.me>
Date: Sun, 26 Mar 2017 16:10:49 +0100
Subject: [PATCH] Cleanup some misc stuff

---
 .../luckperms/common/locale/SimpleLocaleManager.java  | 11 ++++++-----
 .../luckperms/common/utils/ExtractedContexts.java     |  2 +-
 .../me/lucko/luckperms/common/utils/PasteUtils.java   |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/common/src/main/java/me/lucko/luckperms/common/locale/SimpleLocaleManager.java b/common/src/main/java/me/lucko/luckperms/common/locale/SimpleLocaleManager.java
index fa8ffbe41..01cb04520 100644
--- a/common/src/main/java/me/lucko/luckperms/common/locale/SimpleLocaleManager.java
+++ b/common/src/main/java/me/lucko/luckperms/common/locale/SimpleLocaleManager.java
@@ -22,16 +22,16 @@
 
 package me.lucko.luckperms.common.locale;
 
-import lombok.Cleanup;
-
 import com.google.common.collect.ImmutableMap;
 
 import me.lucko.luckperms.common.constants.Message;
 
 import org.yaml.snakeyaml.Yaml;
 
+import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileReader;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.util.Map;
 
 public class SimpleLocaleManager implements LocaleManager {
@@ -40,8 +40,9 @@ public class SimpleLocaleManager implements LocaleManager {
 
     @SuppressWarnings("unchecked")
     public void loadFromFile(File file) throws Exception {
-        @Cleanup FileReader fileReader = new FileReader(file);
-        translations = ImmutableMap.copyOf((Map<String, String>) new Yaml().load(fileReader));
+        try (BufferedReader reader = Files.newBufferedReader(file.toPath(), StandardCharsets.UTF_8)) {
+            translations = ImmutableMap.copyOf((Map<String, String>) new Yaml().load(reader));
+        }
     }
 
     @Override
diff --git a/common/src/main/java/me/lucko/luckperms/common/utils/ExtractedContexts.java b/common/src/main/java/me/lucko/luckperms/common/utils/ExtractedContexts.java
index f3a8bbe91..b0c03eb00 100644
--- a/common/src/main/java/me/lucko/luckperms/common/utils/ExtractedContexts.java
+++ b/common/src/main/java/me/lucko/luckperms/common/utils/ExtractedContexts.java
@@ -33,7 +33,7 @@ import me.lucko.luckperms.api.context.ImmutableContextSet;
 @Getter
 @EqualsAndHashCode
 @ToString
-public class ExtractedContexts {
+public final class ExtractedContexts {
     public static ExtractedContexts generate(Contexts contexts) {
         return new ExtractedContexts(contexts);
     }
diff --git a/common/src/main/java/me/lucko/luckperms/common/utils/PasteUtils.java b/common/src/main/java/me/lucko/luckperms/common/utils/PasteUtils.java
index 3baa59340..10c424c07 100644
--- a/common/src/main/java/me/lucko/luckperms/common/utils/PasteUtils.java
+++ b/common/src/main/java/me/lucko/luckperms/common/utils/PasteUtils.java
@@ -70,7 +70,7 @@ public class PasteUtils {
                 connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
                 connection.setDoOutput(true);
                 try (OutputStream os = connection.getOutputStream()) {
-                    os.write(("url=" + pasteUrl).getBytes());
+                    os.write(("url=" + pasteUrl).getBytes(StandardCharsets.UTF_8));
                 }
                 pasteUrl = connection.getHeaderField("Location");
                 connection.disconnect();