Skip to content

Commit 670bf8e

Browse files
tzolovtzolov
committed
Adhere to Spring Framework code sytle
 - Wildcard imports such as import java.util.* or import static org.assertj.core.api.Assertions.* are forbidden, even in test code. https://github.com/spring-projects/spring-framework/wiki/Code-Style#import-statements
1 parent 8a5f9df commit 670bf8e

File tree

19 files changed

+99
-22
lines changed

19 files changed

+99
-22
lines changed

‎models/spring-ai-anthropic/src/main/java/org/springframework/ai/anthropic/metadata/AnthropicChatResponseMetadata.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,11 @@
1616
package org.springframework.ai.anthropic.metadata;
1717

1818
import org.springframework.ai.anthropic.api.AnthropicApi;
19-
import org.springframework.ai.chat.metadata.*;
20-
19+
import org.springframework.ai.chat.metadata.ChatResponseMetadata;
20+
import org.springframework.ai.chat.metadata.EmptyRateLimit;
21+
import org.springframework.ai.chat.metadata.EmptyUsage;
22+
import org.springframework.ai.chat.metadata.RateLimit;
23+
import org.springframework.ai.chat.metadata.Usage;
2124
import org.springframework.lang.Nullable;
2225
import org.springframework.util.Assert;
2326

‎models/spring-ai-azure-openai/src/test/java/org/springframework/ai/azure/openai/metadata/AzureOpenAiChatClientMetadataTests.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@
2828
import org.springframework.ai.chat.ChatResponse;
2929
import org.springframework.ai.chat.Generation;
3030
import org.springframework.ai.chat.messages.AssistantMessage;
31-
import org.springframework.ai.chat.metadata.*;
31+
import org.springframework.ai.chat.metadata.ChatGenerationMetadata;
32+
import org.springframework.ai.chat.metadata.ChatResponseMetadata;
33+
import org.springframework.ai.chat.metadata.EmptyRateLimit;
34+
import org.springframework.ai.chat.metadata.PromptMetadata;
35+
import org.springframework.ai.chat.metadata.Usage;
3236
import org.springframework.ai.chat.prompt.Prompt;
3337
import org.springframework.beans.factory.annotation.Autowired;
3438
import org.springframework.boot.SpringBootConfiguration;

‎models/spring-ai-ollama/src/test/java/org/springframework/ai/ollama/aot/OllamaRuntimeHintsTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323

2424
import java.util.Set;
2525

26-
import static org.assertj.core.api.AssertionsForClassTypes.*;
26+
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
2727
import static org.springframework.ai.aot.AiRuntimeHints.findJsonAnnotatedClassesInPackage;
28-
import static org.springframework.aot.hint.predicate.RuntimeHintsPredicates.*;
28+
import static org.springframework.aot.hint.predicate.RuntimeHintsPredicates.reflection;
2929

3030
class OllamaRuntimeHintsTests {
3131

‎models/spring-ai-openai/src/main/java/org/springframework/ai/openai/OpenAiAudioSpeechClient.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@
2323
import org.springframework.ai.openai.api.OpenAiAudioApi;
2424
import org.springframework.ai.openai.api.OpenAiAudioApi.SpeechRequest.AudioResponseFormat;
2525
import org.springframework.ai.openai.api.common.OpenAiApiException;
26-
import org.springframework.ai.openai.audio.speech.*;
26+
import org.springframework.ai.openai.audio.speech.Speech;
27+
import org.springframework.ai.openai.audio.speech.SpeechClient;
28+
import org.springframework.ai.openai.audio.speech.SpeechPrompt;
29+
import org.springframework.ai.openai.audio.speech.SpeechResponse;
30+
import org.springframework.ai.openai.audio.speech.StreamingSpeechClient;
2731
import org.springframework.ai.openai.metadata.audio.OpenAiAudioSpeechResponseMetadata;
2832
import org.springframework.ai.openai.metadata.support.OpenAiResponseHeaderExtractor;
2933
import org.springframework.http.ResponseEntity;

‎models/spring-ai-openai/src/main/java/org/springframework/ai/openai/metadata/OpenAiChatResponseMetadata.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@
1515
*/
1616
package org.springframework.ai.openai.metadata;
1717

18-
import org.springframework.ai.chat.metadata.*;
18+
import org.springframework.ai.chat.metadata.ChatResponseMetadata;
19+
import org.springframework.ai.chat.metadata.EmptyRateLimit;
20+
import org.springframework.ai.chat.metadata.EmptyUsage;
21+
import org.springframework.ai.chat.metadata.RateLimit;
22+
import org.springframework.ai.chat.metadata.Usage;
1923
import org.springframework.ai.openai.api.OpenAiApi;
2024
import org.springframework.lang.Nullable;
2125
import org.springframework.util.Assert;

‎models/spring-ai-openai/src/test/java/org/springframework/ai/openai/audio/speech/OpenAiSpeechClientWithSpeechResponseMetadataTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@
3737
import java.time.Duration;
3838

3939
import static org.assertj.core.api.Assertions.assertThat;
40-
import static org.springframework.test.web.client.match.MockRestRequestMatchers.*;
40+
import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo;
41+
import static org.springframework.test.web.client.match.MockRestRequestMatchers.method;
42+
import static org.springframework.test.web.client.match.MockRestRequestMatchers.header;
4143
import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess;
4244

4345
/**

‎models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/OpenAiChatClientWithChatResponseMetadataTests.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,11 @@
2121
import org.junit.jupiter.api.Test;
2222

2323
import org.springframework.ai.chat.ChatResponse;
24-
import org.springframework.ai.chat.metadata.*;
24+
import org.springframework.ai.chat.metadata.ChatGenerationMetadata;
25+
import org.springframework.ai.chat.metadata.ChatResponseMetadata;
26+
import org.springframework.ai.chat.metadata.PromptMetadata;
27+
import org.springframework.ai.chat.metadata.RateLimit;
28+
import org.springframework.ai.chat.metadata.Usage;
2529
import org.springframework.ai.openai.api.OpenAiApi;
2630
import org.springframework.ai.openai.OpenAiChatClient;
2731
import org.springframework.ai.openai.metadata.support.OpenAiApiResponseHeaders;

‎models/spring-ai-openai/src/test/java/org/springframework/ai/openai/image/OpenAiImageClientIT.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,12 @@
1818
import org.assertj.core.api.Assertions;
1919
import org.junit.jupiter.api.Test;
2020
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
21-
import org.springframework.ai.image.*;
21+
22+
import org.springframework.ai.image.Image;
23+
import org.springframework.ai.image.ImageOptionsBuilder;
24+
import org.springframework.ai.image.ImagePrompt;
25+
import org.springframework.ai.image.ImageResponse;
26+
import org.springframework.ai.image.ImageResponseMetadata;
2227
import org.springframework.ai.openai.OpenAiTestConfiguration;
2328
import org.springframework.ai.openai.metadata.OpenAiImageGenerationMetadata;
2429
import org.springframework.ai.openai.testutils.AbstractIT;

‎models/spring-ai-openai/src/test/java/org/springframework/ai/openai/image/OpenAiImageClientWithImageResponseMetadataTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@
3737
import java.util.List;
3838

3939
import static org.assertj.core.api.Assertions.assertThat;
40-
import static org.springframework.test.web.client.match.MockRestRequestMatchers.*;
40+
import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo;
41+
import static org.springframework.test.web.client.match.MockRestRequestMatchers.method;
42+
import static org.springframework.test.web.client.match.MockRestRequestMatchers.header;
4143
import static org.springframework.test.web.client.response.MockRestResponseCreators.withSuccess;
4244

4345
/**

‎models/spring-ai-stability-ai/src/test/java/org/springframework/ai/stabilityai/StabilityAiImageClientIT.java

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

1818
import org.junit.jupiter.api.Test;
1919
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
20-
import org.springframework.ai.image.*;
20+
21+
import org.springframework.ai.image.Image;
22+
import org.springframework.ai.image.ImageClient;
23+
import org.springframework.ai.image.ImageGeneration;
24+
import org.springframework.ai.image.ImagePrompt;
25+
import org.springframework.ai.image.ImageResponse;
2126
import org.springframework.ai.stabilityai.api.StabilityAiImageOptions;
2227
import org.springframework.beans.factory.annotation.Autowired;
2328
import org.springframework.boot.test.context.SpringBootTest;

0 commit comments

Comments
 (0)