Skip to content

Commit 3b95dfd

Browse files
ilayaperumalgilayaperumalg
committed
Fix checkstyle errors
1 parent 3812d2e commit 3b95dfd

File tree

11 files changed

+85
-47
lines changed

11 files changed

+85
-47
lines changed

‎models/spring-ai-anthropic/src/main/java/org/springframework/ai/anthropic/api/AnthropicApi.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,8 @@ public enum ChatModel implements ChatModelDescription {
261261
/**
262262
* The CLAUDE_INSTANT_1_2
263263
*/
264-
@Deprecated CLAUDE_INSTANT_1_2("claude-instant-1.2");
264+
@Deprecated
265+
CLAUDE_INSTANT_1_2("claude-instant-1.2");
265266
// @formatter:on
266267

267268
private final String value;

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

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,34 @@
2424
import java.util.Map;
2525
import java.util.Optional;
2626
import java.util.Set;
27-
import java.util.concurrent.ConcurrentHashMap;
2827
import java.util.concurrent.atomic.AtomicBoolean;
2928

3029
import com.azure.ai.openai.OpenAIAsyncClient;
3130
import com.azure.ai.openai.OpenAIClient;
3231
import com.azure.ai.openai.OpenAIClientBuilder;
33-
import com.azure.ai.openai.models.*;
32+
import com.azure.ai.openai.models.ChatChoice;
33+
import com.azure.ai.openai.models.ChatCompletions;
34+
import com.azure.ai.openai.models.ChatCompletionsFunctionToolCall;
35+
import com.azure.ai.openai.models.ChatCompletionsFunctionToolDefinition;
36+
import com.azure.ai.openai.models.ChatCompletionsFunctionToolDefinitionFunction;
37+
import com.azure.ai.openai.models.ChatCompletionsJsonResponseFormat;
38+
import com.azure.ai.openai.models.ChatCompletionsOptions;
39+
import com.azure.ai.openai.models.ChatCompletionsResponseFormat;
40+
import com.azure.ai.openai.models.ChatCompletionsTextResponseFormat;
41+
import com.azure.ai.openai.models.ChatCompletionsToolCall;
42+
import com.azure.ai.openai.models.ChatCompletionsToolDefinition;
43+
import com.azure.ai.openai.models.ChatMessageContentItem;
44+
import com.azure.ai.openai.models.ChatMessageImageContentItem;
45+
import com.azure.ai.openai.models.ChatMessageImageUrl;
46+
import com.azure.ai.openai.models.ChatMessageTextContentItem;
47+
import com.azure.ai.openai.models.ChatRequestAssistantMessage;
48+
import com.azure.ai.openai.models.ChatRequestMessage;
49+
import com.azure.ai.openai.models.ChatRequestSystemMessage;
50+
import com.azure.ai.openai.models.ChatRequestToolMessage;
51+
import com.azure.ai.openai.models.ChatRequestUserMessage;
52+
import com.azure.ai.openai.models.CompletionsFinishReason;
53+
import com.azure.ai.openai.models.ContentFilterResultsForPrompt;
54+
import com.azure.ai.openai.models.FunctionCall;
3455
import com.azure.core.util.BinaryData;
3556
import io.micrometer.observation.Observation;
3657
import io.micrometer.observation.ObservationRegistry;

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

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,24 @@
1-
package org.springframework.ai.azure.openai;
1+
/*
2+
* Copyright 2023-2024 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
216

3-
import com.azure.ai.openai.OpenAIClientBuilder;
17+
package org.springframework.ai.azure.openai;
418

519
import java.util.List;
620

21+
import com.azure.ai.openai.OpenAIClientBuilder;
722
import org.junit.jupiter.api.Test;
823
import org.junit.jupiter.api.extension.ExtendWith;
924
import org.mockito.Mock;
@@ -35,8 +50,8 @@ public void createAzureOpenAiChatModelTest() {
3550

3651
List<FunctionCallback> functionCallbacks = List.of(new TestFunctionCallback(callbackFromConstructorParam));
3752

38-
AzureOpenAiChatModel openAiChatModel = new AzureOpenAiChatModel(mockClient, chatOptions,
39-
functionCallbackContext, functionCallbacks);
53+
AzureOpenAiChatModel openAiChatModel = new AzureOpenAiChatModel(this.mockClient, chatOptions,
54+
this.functionCallbackContext, functionCallbacks);
4055

4156
assert 2 == openAiChatModel.getFunctionCallbackRegister().size();
4257

@@ -53,13 +68,13 @@ private class TestFunctionCallback implements FunctionCallback {
5368

5469
private final String name;
5570

56-
public TestFunctionCallback(String name) {
71+
TestFunctionCallback(String name) {
5772
this.name = name;
5873
}
5974

6075
@Override
6176
public String getName() {
62-
return name;
77+
return this.name;
6378
}
6479

6580
@Override
@@ -79,4 +94,4 @@ public String call(String functionInput) {
7994

8095
}
8196

82-
}
97+
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import io.micrometer.observation.tck.TestObservationRegistry;
2525
import io.micrometer.observation.tck.TestObservationRegistryAssert;
2626
import org.junit.jupiter.api.Test;
27-
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
2827

2928
import org.springframework.ai.document.MetadataMode;
3029
import org.springframework.ai.embedding.EmbeddingRequest;

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@
1616

1717
package org.springframework.ai.ollama;
1818

19-
import static org.junit.jupiter.api.Assertions.assertEquals;
20-
import static org.junit.jupiter.api.Assertions.assertThrows;
21-
import static org.mockito.BDDMockito.given;
22-
2319
import java.time.Duration;
2420

2521
import org.junit.jupiter.api.Test;
@@ -32,6 +28,10 @@
3228
import org.springframework.ai.ollama.api.OllamaModel;
3329
import org.springframework.ai.ollama.api.OllamaOptions;
3430

31+
import static org.junit.jupiter.api.Assertions.assertEquals;
32+
import static org.junit.jupiter.api.Assertions.assertThrows;
33+
import static org.mockito.BDDMockito.given;
34+
3535
/**
3636
* @author Jihoon Kim
3737
* @since 1.0.0
@@ -49,7 +49,7 @@ public class OllamaChatModelTests {
4949
public void buildOllamaChatModel() {
5050
Exception exception = assertThrows(IllegalArgumentException.class,
5151
() -> OllamaChatModel.builder()
52-
.withOllamaApi(ollamaApi)
52+
.withOllamaApi(this.ollamaApi)
5353
.withDefaultOptions(OllamaOptions.create().withModel(OllamaModel.LLAMA2))
5454
.withModelManagementOptions(null)
5555
.build());
@@ -64,12 +64,12 @@ public void buildChatResponseMetadata() {
6464
Duration promptEvalDuration = Duration.ofSeconds(8);
6565
Integer promptEvalCount = 808;
6666

67-
given(response.evalDuration()).willReturn(evalDuration);
68-
given(response.evalCount()).willReturn(evalCount);
69-
given(response.promptEvalDuration()).willReturn(promptEvalDuration);
70-
given(response.promptEvalCount()).willReturn(promptEvalCount);
67+
given(this.response.evalDuration()).willReturn(evalDuration);
68+
given(this.response.evalCount()).willReturn(evalCount);
69+
given(this.response.promptEvalDuration()).willReturn(promptEvalDuration);
70+
given(this.response.promptEvalCount()).willReturn(promptEvalCount);
7171

72-
ChatResponseMetadata metadata = OllamaChatModel.from(response);
72+
ChatResponseMetadata metadata = OllamaChatModel.from(this.response);
7373

7474
assertEquals(evalDuration, metadata.get("eval-duration"));
7575
assertEquals(evalCount, metadata.get("eval-count"));

‎spring-ai-core/src/test/java/org/springframework/ai/prompt/PromptTests.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import org.springframework.ai.chat.prompt.SystemPromptTemplate;
3131

3232
import static org.assertj.core.api.Assertions.assertThat;
33-
import static org.junit.Assert.assertNotSame;
3433

3534
@SuppressWarnings("unchecked")
3635
class PromptTests {
@@ -145,9 +144,9 @@ public void testPromptCopy() {
145144
Prompt prompt = promptTemplate.create(model, chatOptions);
146145

147146
Prompt copiedPrompt = prompt.copy();
148-
assertNotSame(prompt, copiedPrompt);
149-
assertNotSame(prompt.getOptions(), copiedPrompt.getOptions());
150-
assertNotSame(prompt.getInstructions(), copiedPrompt.getInstructions());
147+
assertThat(prompt).isNotSameAs(copiedPrompt);
148+
assertThat(prompt.getOptions()).isNotSameAs(copiedPrompt.getOptions());
149+
assertThat(prompt.getInstructions()).isNotSameAs(copiedPrompt.getInstructions());
151150
}
152151

153152
}

‎spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/vectorstore/opensearch/OpenSearchVectorStoreAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import org.opensearch.client.transport.aws.AwsSdk2Transport;
3131
import org.opensearch.client.transport.aws.AwsSdk2TransportOptions;
3232
import org.opensearch.client.transport.httpclient5.ApacheHttpClient5TransportBuilder;
33-
import org.springframework.util.StringUtils;
3433
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
3534
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
3635
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
@@ -51,6 +50,7 @@
5150
import org.springframework.boot.context.properties.EnableConfigurationProperties;
5251
import org.springframework.context.annotation.Bean;
5352
import org.springframework.context.annotation.Configuration;
53+
import org.springframework.util.StringUtils;
5454

5555
@AutoConfiguration
5656
@ConditionalOnClass({ OpenSearchVectorStore.class, EmbeddingModel.class, OpenSearchClient.class })
@@ -188,7 +188,7 @@ static class PropertiesAwsOpenSearchConnectionDetails implements AwsOpenSearchCo
188188

189189
private final OpenSearchVectorStoreProperties.Aws aws;
190190

191-
public PropertiesAwsOpenSearchConnectionDetails(OpenSearchVectorStoreProperties properties) {
191+
PropertiesAwsOpenSearchConnectionDetails(OpenSearchVectorStoreProperties properties) {
192192
this.aws = properties.getAws();
193193
}
194194

‎spring-ai-spring-boot-docker-compose/src/test/java/org/springframework/ai/docker/compose/service/connection/opensearch/AwsOpenSearchDockerComposeConnectionDetailsFactoryTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@
1717
package org.springframework.ai.docker.compose.service.connection.opensearch;
1818

1919
import org.junit.jupiter.api.Test;
20+
import org.testcontainers.utility.DockerImageName;
21+
2022
import org.springframework.ai.autoconfigure.vectorstore.opensearch.AwsOpenSearchConnectionDetails;
2123
import org.springframework.boot.docker.compose.service.connection.test.AbstractDockerComposeIntegrationTests;
22-
import org.testcontainers.utility.DockerImageName;
2324

2425
import static org.assertj.core.api.Assertions.assertThat;
2526

‎spring-ai-spring-boot-testcontainers/src/main/java/org/springframework/ai/testcontainers/service/connection/opensearch/AwsOpenSearchContainerConnectionDetailsFactory.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@
1616

1717
package org.springframework.ai.testcontainers.service.connection.opensearch;
1818

19+
import org.testcontainers.containers.localstack.LocalStackContainer;
20+
1921
import org.springframework.ai.autoconfigure.vectorstore.opensearch.AwsOpenSearchConnectionDetails;
2022
import org.springframework.boot.testcontainers.service.connection.ContainerConnectionDetailsFactory;
2123
import org.springframework.boot.testcontainers.service.connection.ContainerConnectionSource;
22-
import org.testcontainers.containers.localstack.LocalStackContainer;
2324

2425
/**
2526
* @author Eddú Meléndez

‎spring-ai-spring-boot-testcontainers/src/test/java/org/springframework/ai/testcontainers/service/connection/opensearch/AwsOpenSearchContainerConnectionDetailsFactoryTest.java

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,22 @@
1616

1717
package org.springframework.ai.testcontainers.service.connection.opensearch;
1818

19+
import java.io.IOException;
20+
import java.nio.charset.StandardCharsets;
21+
import java.time.Duration;
22+
import java.util.List;
23+
import java.util.Map;
24+
1925
import com.jayway.jsonpath.JsonPath;
2026
import net.minidev.json.JSONArray;
2127
import org.awaitility.Awaitility;
2228
import org.junit.jupiter.api.BeforeAll;
2329
import org.junit.jupiter.api.Test;
30+
import org.testcontainers.containers.localstack.LocalStackContainer;
31+
import org.testcontainers.junit.jupiter.Container;
32+
import org.testcontainers.junit.jupiter.Testcontainers;
33+
import org.testcontainers.utility.DockerImageName;
34+
2435
import org.springframework.ai.autoconfigure.vectorstore.opensearch.OpenSearchVectorStoreAutoConfiguration;
2536
import org.springframework.ai.document.Document;
2637
import org.springframework.ai.embedding.EmbeddingModel;
@@ -35,16 +46,6 @@
3546
import org.springframework.core.io.DefaultResourceLoader;
3647
import org.springframework.test.context.TestPropertySource;
3748
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
38-
import org.testcontainers.containers.localstack.LocalStackContainer;
39-
import org.testcontainers.junit.jupiter.Container;
40-
import org.testcontainers.junit.jupiter.Testcontainers;
41-
import org.testcontainers.utility.DockerImageName;
42-
43-
import java.io.IOException;
44-
import java.nio.charset.StandardCharsets;
45-
import java.time.Duration;
46-
import java.util.List;
47-
import java.util.Map;
4849

4950
import static org.assertj.core.api.Assertions.assertThat;
5051
import static org.awaitility.Awaitility.await;

0 commit comments

Comments
 (0)