1.54

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.53";
+    protected static final String VERSION = "1.54";
 }

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

@@ -26,40 +26,41 @@ public ProgressWriter(InputStream stream, long length, Function<WriteData, IOExc
     }
 
     public void start() throws IOException {
-        BufferedInputStream bstream = new BufferedInputStream(stream);
-        byte[] data = new byte[1024];
-        long ct = 0;
-        int x;
-        while ((x = bstream.read(data, 0, 1024)) >= 0) {
-            int finalX = x;
-            ct += x;
-            IOException ex = writer.apply(new WriteData() {
-                @Override
-                public byte[] getBytes() {
-                    return data;
-                }
+        try (BufferedInputStream bstream = new BufferedInputStream(stream)) {
+            byte[] data = new byte[1024];
+            long ct = 0;
+            int x;
+            while ((x = bstream.read(data, 0, 1024)) >= 0) {
+                int finalX = x;
+                ct += x;
+                IOException ex = writer.apply(new WriteData() {
+                    @Override
+                    public byte[] getBytes() {
+                        return data;
+                    }
 
-                @Override
-                public long getReadSize() {
-                    return finalX;
-                }
-            });
+                    @Override
+                    public long getReadSize() {
+                        return finalX;
+                    }
+                });
 
-            long finalCt = ct;
-            progress.accept(new WriteProgressListener() {
-                @Override
-                public long getLength() {
-                    return length;
-                }
+                long finalCt = ct;
+                progress.accept(new WriteProgressListener() {
+                    @Override
+                    public long getLength() {
+                        return length;
+                    }
 
-                @Override
-                public long getWrittenLength() {
-                    return finalCt;
-                }
-            });
+                    @Override
+                    public long getWrittenLength() {
+                        return finalCt;
+                    }
+                });
 
-            if (ex != null)
-                throw ex;
+                if (ex != null)
+                    throw ex;
+            }
         }
     }
 

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

@@ -1,5 +1,7 @@
 package dev.felnull.fnjl.util;
 
+import dev.felnull.fnjl.io.PostResponse;
+
 import java.io.IOException;
 import java.net.URL;
 import java.util.concurrent.CompletableFuture;
@@ -48,13 +50,18 @@ public int send() throws IOException {
         return FNURLUtil.getResponseByPOST(new URL(url), createContent(), "jp", "application/JSON").getCode();
     }
 
+    @Deprecated
     public CompletableFuture<Void> sendAsync(Consumer<Integer> response) throws IOException {
-        return FNURLUtil.getResponseByPOSTAsync(new URL(url), createContent(), "jp", "application/JSON", n -> {
+        return FNURLUtil.getResponseByPOSTAsync(new URL(url), createContent(), "jp", "application/JSON").thenAccept(n -> {
             if (response != null)
                 response.accept(n.getCode());
         });
     }
 
+    public CompletableFuture<Integer> sendAsync() throws IOException {
+        return FNURLUtil.getResponseByPOSTAsync(new URL(url), createContent(), "jp", "application/JSON").thenApply(PostResponse::getCode);
+    }
+
     public static DiscordWebHookBuilder newBuilder(String url, String content) {
         return new DiscordWebHookBuilder(url, content);
     }

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

@@ -2,6 +2,7 @@
 
 import dev.felnull.fnjl.io.FileWatcher;
 import dev.felnull.fnjl.io.ProgressWriter;
+import org.jetbrains.annotations.NotNull;
 
 import java.io.*;
 import java.net.HttpURLConnection;
@@ -139,13 +140,12 @@ public static byte[] streamToByteArray(InputStream stream, int size) throws IOEx
      * @return GZ圧縮済みストリーム
      * @throws IOException 変換失敗
      */
-    public static InputStream zipGz(InputStream data) throws IOException {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        GZIPOutputStream gos = new GZIPOutputStream(baos);
-        gos.write(streamToByteArray(data));
-        gos.close();
-        baos.close();
-        return new ByteArrayInputStream(baos.toByteArray());
+    @NotNull
+    public static InputStream zipGz(@NotNull InputStream data) throws IOException {
+        try (ByteArrayOutputStream baos = new ByteArrayOutputStream(); GZIPOutputStream gos = new GZIPOutputStream(baos)) {
+            inputToOutput(data, gos);
+            return new ByteArrayInputStream(baos.toByteArray());
+        }
     }
 
     /**
@@ -221,7 +221,7 @@ public static void fileDownloadToProgress(URL url, File file, Consumer<ProgressW
      * @throws IOException 例外
      */
     public static void fileCopyToProgress(File copyFile, File file, Consumer<ProgressWriter.WriteProgressListener> progress) throws IOException {
-        fileWriteToProgress(new FileInputStream(copyFile), copyFile.length(), file, progress);
+        fileWriteToProgress(Files.newInputStream(copyFile.toPath()), copyFile.length(), file, progress);
     }
 
     /**

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

@@ -108,62 +108,101 @@ public static String getResponse(@NotNull URL url) throws IOException {
     /**
      * 非同期でストリームを取得
      * 失敗時はnullを返す
+     * {@link #getStreamAsync(URL)}に移行してください
      *
      * @param url            URL
      * @param streamConsumer ストリーム
      * @return 処理結果
      */
+    @Deprecated
     public static CompletableFuture<Void> getStreamAsync(URL url, Consumer<InputStream> streamConsumer) {
-        return CompletableFuture.runAsync(() -> {
-            InputStream stream = null;
+        return getStreamAsync(url).thenAccept(streamConsumer);
+    }
+
+    /**
+     * 非同期でストリームを取得
+     * 失敗時はnullを返す
+     *
+     * @param url URL
+     * @return ストリーム
+     */
+    @NotNull
+    public static CompletableFuture<InputStream> getStreamAsync(@NotNull URL url) {
+        return CompletableFuture.supplyAsync(() -> {
             try {
-                stream = getStream(url);
+                return getStream(url);
             } catch (IOException e) {
-                e.printStackTrace();
+                return null;
             }
-            streamConsumer.accept(stream);
         });
     }
 
     /**
      * 非同期で文字列を取得
      * 失敗時はnullを返す
+     * {@link #getResponseAsync(URL)}に移行してください
      *
      * @param url            URL
      * @param stringConsumer 文字列
      * @return 処理結果
      */
+    @Deprecated()
     public static CompletableFuture<Void> getResponseAsync(URL url, Consumer<String> stringConsumer) {
-        return CompletableFuture.runAsync(() -> {
-            String str = null;
+        return getResponseAsync(url).thenAccept(stringConsumer);
+    }
+
+    /**
+     * 非同期で文字列を取得
+     * 失敗時はnullを返す
+     *
+     * @param url URL
+     * @return 処理結果
+     */
+    @NotNull
+    public static CompletableFuture<String> getResponseAsync(@NotNull URL url) {
+        return CompletableFuture.supplyAsync(() -> {
             try {
-                str = getResponse(url);
+                return getResponse(url);
             } catch (IOException e) {
-                e.printStackTrace();
+                return null;
             }
-            stringConsumer.accept(str);
         });
     }
 
     /**
-     * POSTでテキストを送り返ってきた文字列とステータスコードを取得
+     * 非同期でPOSTでテキストを送り返ってきた文字列とステータスコードを取得
+     * {@link #getResponseByPOSTAsync(URL, String, String, String)}に移行してください
      *
      * @param url              URL
      * @param body             テキスト
      * @param language         言語
      * @param contentType      type
      * @param responseConsumer 返答とステータスコードのペア
-     * @return 返答とステータスコードのペア
+     * @return 返答
      */
+    @Deprecated
     public static CompletableFuture<Void> getResponseByPOSTAsync(URL url, String body, String language, String contentType, Consumer<PostResponse> responseConsumer) {
-        return CompletableFuture.runAsync(() -> {
-            PostResponse ret = null;
+        return getResponseByPOSTAsync(url, body, language, contentType).thenAccept(responseConsumer);
+    }
+
+    /**
+     * 非同期でPOSTでテキストを送り返ってきた文字列とステータスコードを取得
+     * 失敗時はnullを返す
+     *
+     * @param url         URL
+     * @param body        テキスト
+     * @param language    言語
+     * @param contentType type
+     * @return 返答
+     */
+    @NotNull
+    public static CompletableFuture<PostResponse> getResponseByPOSTAsync(@NotNull URL url, @NotNull String body, @NotNull String language, @NotNull String contentType) {
+        return CompletableFuture.supplyAsync(() -> {
             try {
-                ret = getResponseByPOST(url, body, language, contentType);
+                return getResponseByPOST(url, body, language, contentType);
             } catch (IOException e) {
-                e.printStackTrace();
+                return null;
             }
-            responseConsumer.accept(ret);
         });
     }
 

gradle.properties

@@ -1,3 +1,3 @@
 fnjl_group=dev.felnull
 fnjl_name=felnull-java-library
-fnjl_version=1.53
+fnjl_version=1.54

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.53";
+    protected static final String VERSION = "1.54";
 
     protected static final int NATIVE_LIBRARY_VERSION = 1;
 }