1.51

Author: MORIMORI0317

common/src/main/java/dev/felnull/fnjl/FNJLBuildIn.java

@@ -1,5 +1,5 @@
 package dev.felnull.fnjl;
 
 public class FNJLBuildIn {
-    protected static final String VERSION = "1.50";
+    protected static final String VERSION = "1.51";
 }

common/src/main/java/dev/felnull/fnjl/io/PostResponse.java

@@ -28,9 +28,11 @@ public String getEncoding() {
 
     public String getResponseString() {
         try {
+            if (encoding == null)
+                return new String(response);
             return new String(response, encoding);
         } catch (UnsupportedEncodingException e) {
-            throw new RuntimeException(e);
+            return new String(response);
         }
     }
 }

common/src/main/java/dev/felnull/fnjl/util/FNDataUtil.java

@@ -8,6 +8,7 @@
 import java.net.URL;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.WatchEvent;
 import java.security.MessageDigest;
@@ -267,7 +268,7 @@ public static byte[] urlLoadToProgress(URL url, Consumer<ProgressWriter.WritePro
      * @throws IOException 例外
      */
     public static byte[] fileLoadToProgress(File file, Consumer<ProgressWriter.WriteProgressListener> progress) throws IOException {
-        return loadToProgress(new FileInputStream(file), file.length(), progress);
+        return loadToProgress(Files.newInputStream(file.toPath()), file.length(), progress);
     }
 
     /**

common/src/main/java/dev/felnull/fnjl/util/FNStringUtil.java

@@ -1,7 +1,6 @@
 package dev.felnull.fnjl.util;
 
 
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.nio.charset.StandardCharsets;
@@ -229,14 +228,29 @@ public static UUID fromNoHyphenStringToUUID(String uuidStr) {
         return UUID.fromString(uuidStr.replaceAll("(\\w{8})(\\w{4})(\\w{4})(\\w{4})(\\w{12})", "$1-$2-$3-$4-$5"));
     }
 
+    /**
+     * 変換で着ない場合はnullを返す
+     *
+     * @param text ハイフン無しUUID文字列
+     * @return uuid
+     */
+    @Nullable
+    public static UUID getUUIDFromNoHyphenStringNonThrow(String text) {
+        try {
+            return fromNoHyphenStringToUUID(text);
+        } catch (Exception ignored) {
+        }
+        return null;
+    }
+
     /**
      * 変換で着ない場合はnullを返す
      *
      * @param text uuid文字列
      * @return uuid
      */
     @Nullable
-    public static UUID getUUIDFromStringNonThrow(@NotNull String text) {
+    public static UUID getUUIDFromStringNonThrow(String text) {
         try {
             return UUID.fromString(text);
         } catch (Exception ignored) {

gradle.properties

@@ -1,3 +1,3 @@
 fnjl_group=dev.felnull
 fnjl_name=felnull-java-library
-fnjl_version=1.50
+fnjl_version=1.51

natives/src/main/java/dev/felnull/fnjln/FNJLNBuildIn.java

@@ -1,7 +1,7 @@
 package dev.felnull.fnjln;
 
 public class FNJLNBuildIn {
-    protected static final String VERSION = "1.50";
+    protected static final String VERSION = "1.51";
 
     protected static final int NATIVE_LIBRARY_VERSION = 1;
 }