Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor - favor Guava's UTF-8 charset constant; sensible -> sensitive in issue template

Browse Source
This commit is contained in:
ljacqu
2016-09-16 23:38:36 +02:00
parent d1b7c0ed99
commit c1e90a8faf
5 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/fr/xephi/authme/ConsoleLoggerTest.java
+3 -4
View File
@@ -1,5 +1,6 @@
package fr.xephi.authme;
import com.google.common.base.Charsets;
import fr.xephi.authme.output.LogLevel;
import fr.xephi.authme.settings.Settings;
import fr.xephi.authme.settings.properties.PluginSettings;
@@ -17,7 +18,6 @@ import org.mockito.runners.MockitoJUnitRunner;
import java.io.File;
import java.io.IOException;
import java.nio.charset.Charset;
import java.nio.file.Files;
import java.util.List;
import java.util.logging.Logger;
@@ -29,7 +29,6 @@ import static org.hamcrest.Matchers.hasSize;
import static org.junit.Assert.assertThat;
import static org.mockito.BDDMockito.given;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@@ -92,7 +91,7 @@ public class ConsoleLoggerTest {
// then
verify(logger, times(2)).info(anyString());
verifyNoMoreInteractions(logger);
List<String> loggedLines = Files.readAllLines(logFile.toPath(), Charset.forName("UTF-8"));
List<String> loggedLines = Files.readAllLines(logFile.toPath(), Charsets.UTF_8);
assertThat(loggedLines, hasSize(2));
assertThat(loggedLines.get(0), containsString("[FINE] Logging a FINE message"));
assertThat(loggedLines.get(1), containsString("[INFO] This is an INFO message"));
@@ -130,7 +129,7 @@ public class ConsoleLoggerTest {
verify(logger).info("Info text");
verify(logger).warning("Exception occurred: [IllegalStateException]: Test exception message");
verifyNoMoreInteractions(logger);
List<String> loggedLines = Files.readAllLines(logFile.toPath(), Charset.forName("UTF-8"));
List<String> loggedLines = Files.readAllLines(logFile.toPath(), Charsets.UTF_8);
assertThat(loggedLines.size(), greaterThan(3));
assertThat(loggedLines.get(0), containsString("[INFO] Info text"));
assertThat(loggedLines.get(1),
src/test/java/tools/messages/translation/ImportMessagesTask.java
+2 -2
View File
@@ -1,5 +1,6 @@
package tools.messages.translation;
import com.google.common.base.Charsets;
import com.google.common.io.Resources;
import com.google.gson.Gson;
import fr.xephi.authme.output.MessageKey;
@@ -14,7 +15,6 @@ import tools.utils.ToolsConstants;
import java.io.File;
import java.io.IOException;
import java.net.URL;
import java.nio.charset.Charset;
import java.util.HashSet;
import java.util.Scanner;
import java.util.Set;
@@ -56,7 +56,7 @@ public class ImportMessagesTask implements ToolTask {
private LanguageExport getLanguageExportFromUrl(String location) {
try {
URL url = new URL(location);
String json = Resources.toString(url, Charset.forName("UTF-8"));
String json = Resources.toString(url, Charsets.UTF_8);
return gson.fromJson(json, LanguageExport.class);
} catch (IOException e) {
throw new IllegalStateException(e);
src/test/java/tools/utils/FileUtils.java
+4 -5
View File
@@ -1,7 +1,8 @@
package tools.utils;
import com.google.common.base.Charsets;
import java.io.IOException;
import java.nio.charset.Charset;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.nio.file.StandardOpenOption;
@@ -12,8 +13,6 @@ import java.util.List;
*/
public final class FileUtils {
private final static Charset CHARSET = Charset.forName("utf-8");
private FileUtils() {
}
@@ -41,7 +40,7 @@ public final class FileUtils {
public static String readFromFile(String file) {
try {
return new String(Files.readAllBytes(Paths.get(file)), CHARSET);
return new String(Files.readAllBytes(Paths.get(file)), Charsets.UTF_8);
} catch (IOException e) {
throw new UnsupportedOperationException("Could not read from file '" + file + "'", e);
}
@@ -49,7 +48,7 @@ public final class FileUtils {
public static List<String> readLinesFromFile(String file) {
try {
return Files.readAllLines(Paths.get(file), CHARSET);
return Files.readAllLines(Paths.get(file), Charsets.UTF_8);
} catch (IOException e) {
throw new UnsupportedOperationException("Could not read from file '" + file + "'", e);
}