From 026c4bde06e86a7075fa527fb4615d3605877206 Mon Sep 17 00:00:00 2001 From: oldmanpushcart Date: Sat, 28 Dec 2024 03:08:57 +0800 Subject: [PATCH] =?UTF-8?q?JDK8=E5=85=BC=E5=AE=B9=E6=80=A7=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dashscope4j/api/audio/asr/TranscriptionRequest.java | 2 +- .../ProcessChatMessageContentForUploadInterceptor.java | 2 +- .../ProcessMmEmbeddingContentForUploadInterceptor.java | 2 +- .../ProcessTranscriptionForUploadInterceptor.java | 2 +- .../dashscope4j/internal/api/ApiOpImpl.java | 7 ++++--- .../{ => internal}/util/CompletableFutureUtils.java | 8 +++++++- .../oldmanpushcart/dashscope4j/api/chat/ChatTestCase.java | 2 +- .../api/image/generation/GenImageTestCase.java | 2 +- 8 files changed, 17 insertions(+), 10 deletions(-) rename src/main/java/io/github/oldmanpushcart/dashscope4j/{ => internal}/util/CompletableFutureUtils.java (86%) diff --git a/src/main/java/io/github/oldmanpushcart/dashscope4j/api/audio/asr/TranscriptionRequest.java b/src/main/java/io/github/oldmanpushcart/dashscope4j/api/audio/asr/TranscriptionRequest.java index 8eaeddf..cf19a38 100644 --- a/src/main/java/io/github/oldmanpushcart/dashscope4j/api/audio/asr/TranscriptionRequest.java +++ b/src/main/java/io/github/oldmanpushcart/dashscope4j/api/audio/asr/TranscriptionRequest.java @@ -33,7 +33,7 @@ private TranscriptionRequest(Builder builder) { @Override protected Object input() { - return new HashMap<>() {{ + return new HashMap() {{ put("file_urls", resources); }}; } diff --git a/src/main/java/io/github/oldmanpushcart/dashscope4j/internal/ProcessChatMessageContentForUploadInterceptor.java b/src/main/java/io/github/oldmanpushcart/dashscope4j/internal/ProcessChatMessageContentForUploadInterceptor.java index e369e8f..57c27ff 100644 --- a/src/main/java/io/github/oldmanpushcart/dashscope4j/internal/ProcessChatMessageContentForUploadInterceptor.java +++ b/src/main/java/io/github/oldmanpushcart/dashscope4j/internal/ProcessChatMessageContentForUploadInterceptor.java @@ -8,7 +8,7 @@ import java.util.Collection; import java.util.concurrent.CompletionStage; -import static io.github.oldmanpushcart.dashscope4j.util.CompletableFutureUtils.thenIterateCompose; +import static io.github.oldmanpushcart.dashscope4j.internal.util.CompletableFutureUtils.thenIterateCompose; import static java.util.concurrent.CompletableFuture.completedFuture; /** diff --git a/src/main/java/io/github/oldmanpushcart/dashscope4j/internal/ProcessMmEmbeddingContentForUploadInterceptor.java b/src/main/java/io/github/oldmanpushcart/dashscope4j/internal/ProcessMmEmbeddingContentForUploadInterceptor.java index b1ce25d..68db032 100644 --- a/src/main/java/io/github/oldmanpushcart/dashscope4j/internal/ProcessMmEmbeddingContentForUploadInterceptor.java +++ b/src/main/java/io/github/oldmanpushcart/dashscope4j/internal/ProcessMmEmbeddingContentForUploadInterceptor.java @@ -7,7 +7,7 @@ import java.net.URI; import java.util.concurrent.CompletionStage; -import static io.github.oldmanpushcart.dashscope4j.util.CompletableFutureUtils.thenIterateCompose; +import static io.github.oldmanpushcart.dashscope4j.internal.util.CompletableFutureUtils.thenIterateCompose; import static java.util.concurrent.CompletableFuture.completedFuture; /** diff --git a/src/main/java/io/github/oldmanpushcart/dashscope4j/internal/ProcessTranscriptionForUploadInterceptor.java b/src/main/java/io/github/oldmanpushcart/dashscope4j/internal/ProcessTranscriptionForUploadInterceptor.java index 11ba505..e24af89 100644 --- a/src/main/java/io/github/oldmanpushcart/dashscope4j/internal/ProcessTranscriptionForUploadInterceptor.java +++ b/src/main/java/io/github/oldmanpushcart/dashscope4j/internal/ProcessTranscriptionForUploadInterceptor.java @@ -7,7 +7,7 @@ import java.util.List; import java.util.concurrent.CompletionStage; -import static io.github.oldmanpushcart.dashscope4j.util.CompletableFutureUtils.thenIterateCompose; +import static io.github.oldmanpushcart.dashscope4j.internal.util.CompletableFutureUtils.thenIterateCompose; import static java.util.concurrent.CompletableFuture.completedFuture; class ProcessTranscriptionForUploadInterceptor implements Interceptor { diff --git a/src/main/java/io/github/oldmanpushcart/dashscope4j/internal/api/ApiOpImpl.java b/src/main/java/io/github/oldmanpushcart/dashscope4j/internal/api/ApiOpImpl.java index ed75fea..8bc1db4 100644 --- a/src/main/java/io/github/oldmanpushcart/dashscope4j/internal/api/ApiOpImpl.java +++ b/src/main/java/io/github/oldmanpushcart/dashscope4j/internal/api/ApiOpImpl.java @@ -36,9 +36,9 @@ import java.util.function.Function; import static io.github.oldmanpushcart.dashscope4j.internal.InternalContents.*; +import static io.github.oldmanpushcart.dashscope4j.internal.util.CompletableFutureUtils.failedStage; import static java.util.Objects.isNull; import static java.util.Objects.requireNonNull; -import static java.util.concurrent.CompletableFuture.failedFuture; @Slf4j public class ApiOpImpl implements ApiOp { @@ -257,7 +257,8 @@ private CompletionStage _rollingTask(TaskGetRequest taskGetRequ } if (!task.isCancelable()) { - return failedFuture(ex); + + return failedStage(ex); } final TaskCancelRequest taskCancelRequest = TaskCancelRequest.newBuilder() @@ -268,7 +269,7 @@ private CompletionStage _rollingTask(TaskGetRequest taskGetRequ log.warn("dashscope://task/cancel completed: task={};", task.identity(), cex); return cv; }) - .thenCompose(cv -> failedFuture(ex)); + .thenCompose(cv -> failedStage(ex)); }) .thenCompose(f -> f) diff --git a/src/main/java/io/github/oldmanpushcart/dashscope4j/util/CompletableFutureUtils.java b/src/main/java/io/github/oldmanpushcart/dashscope4j/internal/util/CompletableFutureUtils.java similarity index 86% rename from src/main/java/io/github/oldmanpushcart/dashscope4j/util/CompletableFutureUtils.java rename to src/main/java/io/github/oldmanpushcart/dashscope4j/internal/util/CompletableFutureUtils.java index fe19202..c9bb656 100644 --- a/src/main/java/io/github/oldmanpushcart/dashscope4j/util/CompletableFutureUtils.java +++ b/src/main/java/io/github/oldmanpushcart/dashscope4j/internal/util/CompletableFutureUtils.java @@ -1,4 +1,4 @@ -package io.github.oldmanpushcart.dashscope4j.util; +package io.github.oldmanpushcart.dashscope4j.internal.util; import java.util.ArrayList; import java.util.Iterator; @@ -15,6 +15,12 @@ */ public class CompletableFutureUtils { + public static CompletionStage failedStage(Throwable ex) { + final CompletableFuture future = new CompletableFuture<>(); + future.completeExceptionally(ex); + return future; + } + /** * 解包异常 * diff --git a/src/test/java/io/github/oldmanpushcart/dashscope4j/api/chat/ChatTestCase.java b/src/test/java/io/github/oldmanpushcart/dashscope4j/api/chat/ChatTestCase.java index e22fac9..2216da3 100644 --- a/src/test/java/io/github/oldmanpushcart/dashscope4j/api/chat/ChatTestCase.java +++ b/src/test/java/io/github/oldmanpushcart/dashscope4j/api/chat/ChatTestCase.java @@ -19,7 +19,7 @@ import java.util.stream.Collectors; import static io.github.oldmanpushcart.dashscope4j.api.ApiAssertions.assertApiResponseSuccessful; -import static io.github.oldmanpushcart.dashscope4j.util.CompletableFutureUtils.unwrapEx; +import static io.github.oldmanpushcart.dashscope4j.internal.util.CompletableFutureUtils.unwrapEx; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/src/test/java/io/github/oldmanpushcart/dashscope4j/api/image/generation/GenImageTestCase.java b/src/test/java/io/github/oldmanpushcart/dashscope4j/api/image/generation/GenImageTestCase.java index 760cd36..76a2ada 100644 --- a/src/test/java/io/github/oldmanpushcart/dashscope4j/api/image/generation/GenImageTestCase.java +++ b/src/test/java/io/github/oldmanpushcart/dashscope4j/api/image/generation/GenImageTestCase.java @@ -12,7 +12,7 @@ import java.util.concurrent.ExecutionException; import static io.github.oldmanpushcart.dashscope4j.api.ApiAssertions.assertApiResponseSuccessful; -import static io.github.oldmanpushcart.dashscope4j.util.CompletableFutureUtils.unwrapEx; +import static io.github.oldmanpushcart.dashscope4j.internal.util.CompletableFutureUtils.unwrapEx; public class GenImageTestCase extends ClientSupport {