JDK8兼容性调整

oldmanpushcart · Dec 27, 2024 · 026c4bd · 026c4bd
1 parent 776d38a
commit 026c4bd
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 10 deletions.
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
@@ -33,7 +33,7 @@ private TranscriptionRequest(Builder builder) {
 
     @Override
     protected Object input() {
-        return new HashMap<>() {{
+        return new HashMap<String, Object>() {{
             put("file_urls", resources);
         }};
     }

diff --git a/...ub/oldmanpushcart/dashscope4j/internal/ProcessChatMessageContentForUploadInterceptor.java b/...ub/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/...ub/oldmanpushcart/dashscope4j/internal/ProcessMmEmbeddingContentForUploadInterceptor.java b/...ub/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/.../github/oldmanpushcart/dashscope4j/internal/ProcessTranscriptionForUploadInterceptor.java b/.../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
@@ -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<TaskGetResponse> _rollingTask(TaskGetRequest taskGetRequ
                                 }
 
                                 if (!task.isCancelable()) {
-                                    return failedFuture(ex);
+
+                                    return failedStage(ex);
                                 }
 
                                 final TaskCancelRequest taskCancelRequest = TaskCancelRequest.newBuilder()
@@ -268,7 +269,7 @@ private CompletionStage<TaskGetResponse> _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/...hscope4j/util/CompletableFutureUtils.java → ...internal/util/CompletableFutureUtils.java b/...hscope4j/util/CompletableFutureUtils.java → ...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 <T> CompletionStage<T> failedStage(Throwable ex) {
+        final CompletableFuture<T> 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
@@ -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/...test/java/io/github/oldmanpushcart/dashscope4j/api/image/generation/GenImageTestCase.java b/...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 {