Skip to content

Commit 2abf10d

Browse files
tzolovtzolov
committed
Fix javadoc issue. Remove wildcard imports
1 parent 83c997d commit 2abf10d

File tree

19 files changed

+117
-28
lines changed

19 files changed

+117
-28
lines changed

‎models/spring-ai-minimax/src/main/java/org/springframework/ai/minimax/MiniMaxChatClient.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,13 @@
3737
import org.springframework.util.MimeType;
3838
import reactor.core.publisher.Flux;
3939

40-
import java.util.*;
40+
import java.util.Base64;
41+
import java.util.HashMap;
42+
import java.util.HashSet;
43+
import java.util.List;
44+
import java.util.Map;
45+
import java.util.Optional;
46+
import java.util.Set;
4147
import java.util.concurrent.ConcurrentHashMap;
4248

4349
/**

‎models/spring-ai-minimax/src/main/java/org/springframework/ai/minimax/MiniMaxChatOptions.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@
1515
*/
1616
package org.springframework.ai.minimax;
1717

18+
import java.util.ArrayList;
19+
import java.util.HashSet;
20+
import java.util.List;
21+
import java.util.Set;
22+
1823
import com.fasterxml.jackson.annotation.JsonIgnore;
1924
import com.fasterxml.jackson.annotation.JsonInclude;
2025
import com.fasterxml.jackson.annotation.JsonInclude.Include;
@@ -26,8 +31,6 @@
2631
import org.springframework.boot.context.properties.NestedConfigurationProperty;
2732
import org.springframework.util.Assert;
2833

29-
import java.util.*;
30-
3134
/**
3235
* MiniMaxChatOptions represents the options for performing chat completion using the
3336
* MiniMax API. It provides methods to set and retrieve various options like model,

‎models/spring-ai-minimax/src/main/java/org/springframework/ai/minimax/MiniMaxEmbeddingClient.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,12 @@
1919
import org.slf4j.LoggerFactory;
2020
import org.springframework.ai.document.Document;
2121
import org.springframework.ai.document.MetadataMode;
22-
import org.springframework.ai.embedding.*;
22+
import org.springframework.ai.embedding.AbstractEmbeddingClient;
23+
import org.springframework.ai.embedding.Embedding;
24+
import org.springframework.ai.embedding.EmbeddingOptions;
25+
import org.springframework.ai.embedding.EmbeddingRequest;
26+
import org.springframework.ai.embedding.EmbeddingResponse;
27+
import org.springframework.ai.embedding.EmbeddingResponseMetadata;
2328
import org.springframework.ai.minimax.api.MiniMaxApi;
2429
import org.springframework.ai.model.ModelOptionsUtils;
2530
import org.springframework.ai.retry.RetryUtils;

‎models/spring-ai-minimax/src/main/java/org/springframework/ai/minimax/api/MiniMaxApi.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -863,9 +863,6 @@ public record EmbeddingList(
863863
*
864864
* @param embeddingRequest The embedding request.
865865
* @return Returns {@link EmbeddingList}.
866-
* @param <T> Type of the entity in the data list. Can be a {@link String} or {@link List} of tokens (e.g.
867-
* Integers). For embedding multiple inputs in a single request, You can pass a {@link List} of {@link String} or
868-
* {@link List} of {@link List} of tokens. For example:
869866
*
870867
* <pre>{@code List.of("text1", "text2", "text3") or List.of(List.of(1, 2, 3), List.of(3, 4, 5))} </pre>
871868
*/

‎models/spring-ai-minimax/src/test/java/org/springframework/ai/minimax/api/MiniMaxApiIT.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,13 @@
1717

1818
import org.junit.jupiter.api.Test;
1919
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
20-
import org.springframework.ai.minimax.api.MiniMaxApi.*;
20+
21+
import org.springframework.ai.minimax.api.MiniMaxApi.ChatCompletion;
22+
import org.springframework.ai.minimax.api.MiniMaxApi.ChatCompletionChunk;
23+
import org.springframework.ai.minimax.api.MiniMaxApi.ChatCompletionMessage;
2124
import org.springframework.ai.minimax.api.MiniMaxApi.ChatCompletionMessage.Role;
25+
import org.springframework.ai.minimax.api.MiniMaxApi.ChatCompletionRequest;
26+
import org.springframework.ai.minimax.api.MiniMaxApi.EmbeddingList;
2227
import org.springframework.http.ResponseEntity;
2328
import reactor.core.publisher.Flux;
2429

‎models/spring-ai-minimax/src/test/java/org/springframework/ai/minimax/api/MiniMaxApiToolFunctionCallIT.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
2323
import org.slf4j.Logger;
2424
import org.slf4j.LoggerFactory;
25-
import org.springframework.ai.model.ModelOptionsUtils;
2625
import org.springframework.ai.minimax.api.MiniMaxApi.ChatCompletion;
2726
import org.springframework.ai.minimax.api.MiniMaxApi.ChatCompletionMessage;
2827
import org.springframework.ai.minimax.api.MiniMaxApi.ChatCompletionMessage.Role;
@@ -37,7 +36,6 @@
3736
import java.util.Objects;
3837

3938
import static org.assertj.core.api.Assertions.assertThat;
40-
import static org.springframework.ai.minimax.api.MiniMaxApi.ChatModel.*;
4139

4240
/**
4341
* @author Geng Rong
@@ -86,8 +84,9 @@ public void toolFunctionCall() {
8684

8785
List<ChatCompletionMessage> messages = new ArrayList<>(List.of(message));
8886

89-
ChatCompletionRequest chatCompletionRequest = new ChatCompletionRequest(messages, ABAB_6_Chat.value,
90-
List.of(functionTool), ToolChoiceBuilder.AUTO);
87+
ChatCompletionRequest chatCompletionRequest = new ChatCompletionRequest(messages,
88+
org.springframework.ai.minimax.api.MiniMaxApi.ChatModel.ABAB_6_Chat.getValue(), List.of(functionTool),
89+
ToolChoiceBuilder.AUTO);
9190

9291
ResponseEntity<ChatCompletion> chatCompletion = miniMaxApi.chatCompletionEntity(chatCompletionRequest);
9392

@@ -116,7 +115,8 @@ public void toolFunctionCall() {
116115
}
117116
}
118117

119-
var functionResponseRequest = new ChatCompletionRequest(messages, ABAB_6_Chat.value, 0.5F);
118+
var functionResponseRequest = new ChatCompletionRequest(messages,
119+
org.springframework.ai.minimax.api.MiniMaxApi.ChatModel.ABAB_6_Chat.getValue(), 0.5F);
120120

121121
ResponseEntity<ChatCompletion> chatCompletion2 = miniMaxApi.chatCompletionEntity(functionResponseRequest);
122122

‎models/spring-ai-minimax/src/test/java/org/springframework/ai/minimax/api/MiniMaxRetryTests.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,14 @@
2626
import org.springframework.ai.minimax.MiniMaxChatOptions;
2727
import org.springframework.ai.minimax.MiniMaxEmbeddingClient;
2828
import org.springframework.ai.minimax.MiniMaxEmbeddingOptions;
29-
import org.springframework.ai.minimax.api.MiniMaxApi.*;
29+
import org.springframework.ai.minimax.api.MiniMaxApi.ChatCompletion;
30+
import org.springframework.ai.minimax.api.MiniMaxApi.ChatCompletionChunk;
31+
import org.springframework.ai.minimax.api.MiniMaxApi.ChatCompletionFinishReason;
32+
import org.springframework.ai.minimax.api.MiniMaxApi.ChatCompletionMessage;
3033
import org.springframework.ai.minimax.api.MiniMaxApi.ChatCompletionMessage.Role;
34+
import org.springframework.ai.minimax.api.MiniMaxApi.ChatCompletionRequest;
35+
import org.springframework.ai.minimax.api.MiniMaxApi.EmbeddingList;
36+
import org.springframework.ai.minimax.api.MiniMaxApi.EmbeddingRequest;
3137
import org.springframework.ai.retry.RetryUtils;
3238
import org.springframework.ai.retry.TransientAiException;
3339
import org.springframework.http.ResponseEntity;

‎models/spring-ai-mistral-ai/src/main/java/org/springframework/ai/mistralai/MistralAiChatClient.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,12 @@
4141
import org.springframework.util.CollectionUtils;
4242
import reactor.core.publisher.Flux;
4343

44-
import java.util.*;
44+
import java.util.HashMap;
45+
import java.util.HashSet;
46+
import java.util.List;
47+
import java.util.Map;
48+
import java.util.Optional;
49+
import java.util.Set;
4550
import java.util.concurrent.ConcurrentHashMap;
4651

4752
/**

‎models/spring-ai-zhipuai/src/main/java/org/springframework/ai/zhipuai/ZhiPuAiChatClient.java‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,14 @@
4444
import org.springframework.util.MimeType;
4545
import reactor.core.publisher.Flux;
4646

47-
import java.util.*;
47+
import java.util.ArrayList;
48+
import java.util.Base64;
49+
import java.util.HashMap;
50+
import java.util.HashSet;
51+
import java.util.List;
52+
import java.util.Map;
53+
import java.util.Optional;
54+
import java.util.Set;
4855
import java.util.concurrent.ConcurrentHashMap;
4956

5057
/**

‎models/spring-ai-zhipuai/src/main/java/org/springframework/ai/zhipuai/ZhiPuAiChatOptions.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@
1515
*/
1616
package org.springframework.ai.zhipuai;
1717

18+
import java.util.ArrayList;
19+
import java.util.HashSet;
20+
import java.util.List;
21+
import java.util.Set;
22+
1823
import com.fasterxml.jackson.annotation.JsonIgnore;
1924
import com.fasterxml.jackson.annotation.JsonInclude;
2025
import com.fasterxml.jackson.annotation.JsonInclude.Include;
@@ -28,8 +33,6 @@
2833
import org.springframework.boot.context.properties.NestedConfigurationProperty;
2934
import org.springframework.util.Assert;
3035

31-
import java.util.*;
32-
3336
/**
3437
* ZhiPuAiChatOptions represents the options for the ZhiPuAiChat model.
3538
*

0 commit comments

Comments
 (0)