Skip to content

Commit a2e2696

Browse files
ilayaperumalgilayaperumalg
committed
Fix checkstyle errors
1 parent 3c14fa6 commit a2e2696

File tree

12 files changed

+52
-33
lines changed

12 files changed

+52
-33
lines changed

‎spring-ai-core/src/main/java/org/springframework/ai/rag/analysis/query/expansion/MultiQueryExpander.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public List<Query> expand(Query query) {
102102

103103
var response = this.chatClient.prompt()
104104
.user(user -> user.text(this.promptTemplate.getTemplate())
105-
.param("number", numberOfQueries)
105+
.param("number", this.numberOfQueries)
106106
.param("query", query.text()))
107107
.call()
108108
.content();

‎spring-ai-core/src/main/java/org/springframework/ai/rag/analysis/query/transformation/TranslationQueryTransformer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public Query transform(Query query) {
8686

8787
var translatedQuery = this.chatClient.prompt()
8888
.user(user -> user.text(this.promptTemplate.getTemplate())
89-
.param("targetLanguage", targetLanguage)
89+
.param("targetLanguage", this.targetLanguage)
9090
.param("query", query.text()))
9191
.options(ChatOptionsBuilder.builder().withTemperature(0.0).build())
9292
.call()

‎spring-ai-core/src/test/java/org/springframework/ai/rag/analysis/query/expansion/MultiQueryExpanderTests.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16+
1617
package org.springframework.ai.rag.analysis.query.expansion;
1718

1819
import org.junit.jupiter.api.Test;
20+
1921
import org.springframework.ai.chat.client.ChatClient;
2022
import org.springframework.ai.chat.prompt.PromptTemplate;
2123

‎spring-ai-core/src/test/java/org/springframework/ai/rag/analysis/query/transformation/TranslationQueryTransformerTests.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16+
1617
package org.springframework.ai.rag.analysis.query.transformation;
1718

1819
import org.junit.jupiter.api.Test;
20+
1921
import org.springframework.ai.chat.client.ChatClient;
2022
import org.springframework.ai.chat.prompt.PromptTemplate;
2123

‎spring-ai-integration-tests/src/test/java/org/springframework/ai/integration/tests/TestApplication.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16+
1617
package org.springframework.ai.integration.tests;
1718

1819
import org.springframework.boot.autoconfigure.SpringBootApplication;

‎spring-ai-integration-tests/src/test/java/org/springframework/ai/integration/tests/TestcontainersConfiguration.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,14 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16+
1617
package org.springframework.ai.integration.tests;
1718

19+
import org.testcontainers.containers.PostgreSQLContainer;
20+
1821
import org.springframework.boot.test.context.TestConfiguration;
1922
import org.springframework.boot.testcontainers.service.connection.ServiceConnection;
2023
import org.springframework.context.annotation.Bean;
21-
import org.testcontainers.containers.PostgreSQLContainer;
2224

2325
/**
2426
* Test configuration for Testcontainers-based Dev Services.

‎spring-ai-integration-tests/src/test/java/org/springframework/ai/integration/tests/client/advisor/RetrievalAugmentationAdvisorIT.java‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,16 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16+
1617
package org.springframework.ai.integration.tests.client.advisor;
1718

19+
import java.util.List;
20+
1821
import org.junit.jupiter.api.AfterEach;
1922
import org.junit.jupiter.api.BeforeEach;
2023
import org.junit.jupiter.api.Test;
2124
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
25+
2226
import org.springframework.ai.chat.client.ChatClient;
2327
import org.springframework.ai.chat.client.advisor.RetrievalAugmentationAdvisor;
2428
import org.springframework.ai.chat.model.ChatResponse;
@@ -39,8 +43,6 @@
3943
import org.springframework.boot.test.context.SpringBootTest;
4044
import org.springframework.core.io.Resource;
4145

42-
import java.util.List;
43-
4446
import static org.assertj.core.api.Assertions.assertThat;
4547

4648
/**
@@ -65,26 +67,26 @@ class RetrievalAugmentationAdvisorIT {
6567

6668
@BeforeEach
6769
void setUp() {
68-
DocumentReader markdownReader = new MarkdownDocumentReader(knowledgeBaseResource,
70+
DocumentReader markdownReader = new MarkdownDocumentReader(this.knowledgeBaseResource,
6971
MarkdownDocumentReaderConfig.defaultConfig());
70-
knowledgeBaseDocuments = markdownReader.read();
71-
pgVectorStore.add(knowledgeBaseDocuments);
72+
this.knowledgeBaseDocuments = markdownReader.read();
73+
this.pgVectorStore.add(this.knowledgeBaseDocuments);
7274
}
7375

7476
@AfterEach
7577
void tearDown() {
76-
pgVectorStore.delete(knowledgeBaseDocuments.stream().map(Document::getId).toList());
78+
this.pgVectorStore.delete(this.knowledgeBaseDocuments.stream().map(Document::getId).toList());
7779
}
7880

7981
@Test
8082
void ragBasic() {
8183
String question = "Where does the adventure of Anacletus and Birba take place?";
8284

8385
RetrievalAugmentationAdvisor ragAdvisor = RetrievalAugmentationAdvisor.builder()
84-
.documentRetriever(VectorStoreDocumentRetriever.builder().vectorStore(pgVectorStore).build())
86+
.documentRetriever(VectorStoreDocumentRetriever.builder().vectorStore(this.pgVectorStore).build())
8587
.build();
8688

87-
ChatResponse chatResponse = ChatClient.builder(openAiChatModel)
89+
ChatResponse chatResponse = ChatClient.builder(this.openAiChatModel)
8890
.build()
8991
.prompt(question)
9092
.advisors(ragAdvisor)
@@ -106,13 +108,13 @@ void ragWithTranslation() {
106108

107109
RetrievalAugmentationAdvisor ragAdvisor = RetrievalAugmentationAdvisor.builder()
108110
.queryTransformers(TranslationQueryTransformer.builder()
109-
.chatClientBuilder(ChatClient.builder(openAiChatModel))
111+
.chatClientBuilder(ChatClient.builder(this.openAiChatModel))
110112
.targetLanguage("english")
111113
.build())
112-
.documentRetriever(VectorStoreDocumentRetriever.builder().vectorStore(pgVectorStore).build())
114+
.documentRetriever(VectorStoreDocumentRetriever.builder().vectorStore(this.pgVectorStore).build())
113115
.build();
114116

115-
ChatResponse chatResponse = ChatClient.builder(openAiChatModel)
117+
ChatResponse chatResponse = ChatClient.builder(this.openAiChatModel)
116118
.build()
117119
.prompt(question)
118120
.advisors(ragAdvisor)
@@ -132,7 +134,7 @@ private void evaluateRelevancy(String question, ChatResponse chatResponse) {
132134
EvaluationRequest evaluationRequest = new EvaluationRequest(question,
133135
chatResponse.getMetadata().get(RetrievalAugmentationAdvisor.DOCUMENT_CONTEXT),
134136
chatResponse.getResult().getOutput().getContent());
135-
RelevancyEvaluator evaluator = new RelevancyEvaluator(ChatClient.builder(openAiChatModel));
137+
RelevancyEvaluator evaluator = new RelevancyEvaluator(ChatClient.builder(this.openAiChatModel));
136138
EvaluationResponse evaluationResponse = evaluator.evaluate(evaluationRequest);
137139
assertThat(evaluationResponse.isPass()).isTrue();
138140
}

‎spring-ai-integration-tests/src/test/java/org/springframework/ai/integration/tests/rag/analysis/query/expansion/MultiQueryExpanderIT.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,14 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16+
1617
package org.springframework.ai.integration.tests.rag.analysis.query.expansion;
1718

19+
import java.util.List;
20+
1821
import org.junit.jupiter.api.Test;
1922
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
23+
2024
import org.springframework.ai.chat.client.ChatClient;
2125
import org.springframework.ai.integration.tests.TestApplication;
2226
import org.springframework.ai.openai.OpenAiChatModel;
@@ -26,8 +30,6 @@
2630
import org.springframework.beans.factory.annotation.Autowired;
2731
import org.springframework.boot.test.context.SpringBootTest;
2832

29-
import java.util.List;
30-
3133
import static org.assertj.core.api.Assertions.assertThat;
3234

3335
/**
@@ -46,7 +48,7 @@ class MultiQueryExpanderIT {
4648
void whenExpanderWithDefaults() {
4749
Query query = new Query("What is the weather in Rome?");
4850
QueryExpander queryExpander = MultiQueryExpander.builder()
49-
.chatClientBuilder(ChatClient.builder(openAiChatModel))
51+
.chatClientBuilder(ChatClient.builder(this.openAiChatModel))
5052
.build();
5153

5254
List<Query> queries = queryExpander.apply(query);
@@ -60,7 +62,7 @@ void whenExpanderWithDefaults() {
6062
void whenExpanderWithCustomQueryNumber() {
6163
Query query = new Query("What is the weather in Rome?");
6264
QueryExpander queryExpander = MultiQueryExpander.builder()
63-
.chatClientBuilder(ChatClient.builder(openAiChatModel))
65+
.chatClientBuilder(ChatClient.builder(this.openAiChatModel))
6466
.numberOfQueries(4)
6567
.build();
6668

@@ -75,7 +77,7 @@ void whenExpanderWithCustomQueryNumber() {
7577
void whenExpanderWithOriginalQueryIncluded() {
7678
Query query = new Query("What is the weather in Rome?");
7779
QueryExpander queryExpander = MultiQueryExpander.builder()
78-
.chatClientBuilder(ChatClient.builder(openAiChatModel))
80+
.chatClientBuilder(ChatClient.builder(this.openAiChatModel))
7981
.numberOfQueries(3)
8082
.includeOriginal(true)
8183
.build();

‎spring-ai-integration-tests/src/test/java/org/springframework/ai/integration/tests/rag/analysis/query/transformation/TranslationQueryTransformerIT.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,12 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16+
1617
package org.springframework.ai.integration.tests.rag.analysis.query.transformation;
1718

1819
import org.junit.jupiter.api.Test;
1920
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
21+
2022
import org.springframework.ai.chat.client.ChatClient;
2123
import org.springframework.ai.integration.tests.TestApplication;
2224
import org.springframework.ai.openai.OpenAiChatModel;
@@ -44,7 +46,7 @@ class TranslationQueryTransformerIT {
4446
void whenTransformerWithDefaults() {
4547
Query query = new Query("Hvad er Danmarks hovedstad?");
4648
QueryTransformer queryTransformer = TranslationQueryTransformer.builder()
47-
.chatClientBuilder(ChatClient.builder(openAiChatModel))
49+
.chatClientBuilder(ChatClient.builder(this.openAiChatModel))
4850
.targetLanguage("english")
4951
.build();
5052

‎spring-ai-integration-tests/src/test/java/org/springframework/ai/integration/tests/rag/augmentation/ContextualQueryAugmentorIT.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,14 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16+
1617
package org.springframework.ai.integration.tests.rag.augmentation;
1718

19+
import java.util.List;
20+
1821
import org.junit.jupiter.api.Test;
1922
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
23+
2024
import org.springframework.ai.document.Document;
2125
import org.springframework.ai.integration.tests.TestApplication;
2226
import org.springframework.ai.openai.OpenAiChatModel;
@@ -26,8 +30,6 @@
2630
import org.springframework.beans.factory.annotation.Autowired;
2731
import org.springframework.boot.test.context.SpringBootTest;
2832

29-
import java.util.List;
30-
3133
import static org.assertj.core.api.Assertions.assertThat;
3234

3335
/**
@@ -51,7 +53,7 @@ void whenContextIsProvided() {
5153
"Iorek loved to explore the snowy landscape and dreamt of one day going on an adventure around the North Pole."));
5254

5355
Query augmentedQuery = queryAugmentor.augment(query, documents);
54-
String response = openAiChatModel.call(augmentedQuery.text());
56+
String response = this.openAiChatModel.call(augmentedQuery.text());
5557

5658
assertThat(response).isNotEmpty();
5759
System.out.println(response);
@@ -66,7 +68,7 @@ void whenAllowEmptyContext() {
6668
Query query = new Query("What is Iorek's dream?");
6769
List<Document> documents = List.of();
6870
Query augmentedQuery = queryAugmentor.augment(query, documents);
69-
String response = openAiChatModel.call(augmentedQuery.text());
71+
String response = this.openAiChatModel.call(augmentedQuery.text());
7072

7173
assertThat(response).isNotEmpty();
7274
System.out.println(response);
@@ -79,7 +81,7 @@ void whenNotAllowEmptyContext() {
7981
Query query = new Query("What is Iorek's dream?");
8082
List<Document> documents = List.of();
8183
Query augmentedQuery = queryAugmentor.augment(query, documents);
82-
String response = openAiChatModel.call(augmentedQuery.text());
84+
String response = this.openAiChatModel.call(augmentedQuery.text());
8385

8486
assertThat(response).isNotEmpty();
8587
System.out.println(response);

0 commit comments

Comments
 (0)