Always use UTF-8

ebean-core/src/main/java/io/ebeaninternal/server/core/DScriptRunner.java

@@ -3,13 +3,13 @@ package io.ebeaninternal.server.core;
 import io.ebean.ScriptRunner;
 import io.ebean.ddlrunner.DdlRunner;
 import io.ebean.ddlrunner.ScriptTransform;
+import io.ebean.util.IOUtils;
 import io.ebeaninternal.api.SpiEbeanServer;
 import io.ebeaninternal.util.UrlHelper;
 
 import javax.persistence.PersistenceException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.LineNumberReader;
 import java.io.Reader;
 import java.net.URL;
@@ -66,8 +66,9 @@ final class DScriptRunner implements ScriptRunner {
       throw new IllegalArgumentException("resource is null?");
     }
 
-    try (InputStream inputStream = UrlHelper.openNoCache(resource)) {
-      return readContent(new InputStreamReader(inputStream));
+    try (InputStream inputStream = UrlHelper.openNoCache(resource);
+        Reader reader = IOUtils.newReader(inputStream)) {
+      return readContent(reader);
 
     } catch (IOException e) {
       throw new PersistenceException("Failed to read script content", e);

ebean-core/src/main/java/io/ebeaninternal/server/transaction/DefaultProfileHandler.java

@@ -4,11 +4,13 @@ import io.ebean.ProfileLocation;
 import io.ebean.config.ProfilingConfig;
 import io.ebean.plugin.Plugin;
 import io.ebean.plugin.SpiServer;
+import io.ebean.util.IOUtils;
 import io.ebeaninternal.api.CoreLog;
 import io.ebeaninternal.api.SpiProfileHandler;
 import org.slf4j.Logger;
 
 import java.io.*;
+import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatterBuilder;
@@ -123,7 +125,7 @@ public final class DefaultProfileHandler implements SpiProfileHandler, Plugin {
       try {
         String now = DTF.format(LocalDateTime.now());
         File file = new File(dir, "txprofile-" + now + ".tprofile");
-        out = new BufferedWriter(new FileWriter(file));
+        out = IOUtils.newWriter(file);
       } catch (IOException e) {
         log.error("Not expected", e);
       }

ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonMap.java

@@ -8,6 +8,7 @@ import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
 import io.ebean.text.TextException;
 import io.ebean.text.json.EJson;
+import io.ebean.util.IOUtils;
 
 import java.io.*;
 import java.nio.charset.StandardCharsets;
@@ -75,14 +76,14 @@ abstract class ScalarTypeJsonMap extends ScalarTypeBase<Map> {
       try {
         if (keepSource) {
           StringWriter jsonBuffer = new StringWriter();
-          try (InputStreamReader streamReader = new InputStreamReader(is, StandardCharsets.UTF_8)) {
+          try (Reader streamReader = IOUtils.newReader(is)) {
             transferTo(streamReader, jsonBuffer);
           }
           String rawJson = jsonBuffer.toString();
           reader.pushJson(rawJson);
           return parse(rawJson);
         } else {
-          try (InputStreamReader streamReader = new InputStreamReader(is, StandardCharsets.UTF_8)) {
+          try (Reader streamReader = IOUtils.newReader(is)) {
             return parse(streamReader);
           }
         }

ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNode.java

@@ -8,12 +8,12 @@ import io.ebean.core.type.DataBinder;
 import io.ebean.core.type.DataReader;
 import io.ebean.core.type.DocPropertyType;
 import io.ebean.text.TextException;
+import io.ebean.util.IOUtils;
 
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.Reader;
 import java.nio.charset.StandardCharsets;
 import java.sql.SQLException;
@@ -68,7 +68,7 @@ abstract class ScalarTypeJsonNode extends ScalarTypeBase<JsonNode> {
       if (is == null) {
         return null;
       }
-      try (InputStreamReader reader = new InputStreamReader(is)) {
+      try (Reader reader = IOUtils.newReader(is)) {
         return parse(reader);
       } catch (IOException e) {
         throw new SQLException("Error reading Blob stream from DB", e);

ebean-core/src/main/java/io/ebeaninternal/server/type/SimpleAesEncryptor.java

@@ -32,7 +32,7 @@ public final class SimpleAesEncryptor implements Encryptor {
   }
 
   private IvParameterSpec getIvParameterSpec(String initialVector) {
-    return new IvParameterSpec(initialVector.getBytes());
+    return new IvParameterSpec(initialVector.getBytes(StandardCharsets.UTF_8));
   }
 
   @Override