Miscellaneous checkstyle fixes

Signed-off-by: Soby Chacko <[email protected]>

Author: sobychacko

advisors/spring-ai-advisors-vector-store/src/main/java/org/springframework/ai/chat/client/advisor/vectorstore/QuestionAnswerAdvisor.java

@@ -21,17 +21,17 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+import reactor.core.scheduler.Schedulers;
+
 import org.springframework.ai.chat.client.advisor.api.AdvisedRequest;
 import org.springframework.ai.chat.client.advisor.api.AdvisedResponse;
 import org.springframework.ai.chat.client.advisor.api.AdvisedResponseStreamUtils;
 import org.springframework.ai.chat.client.advisor.api.CallAroundAdvisor;
 import org.springframework.ai.chat.client.advisor.api.CallAroundAdvisorChain;
 import org.springframework.ai.chat.client.advisor.api.StreamAroundAdvisor;
 import org.springframework.ai.chat.client.advisor.api.StreamAroundAdvisorChain;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-import reactor.core.scheduler.Schedulers;
-
 import org.springframework.ai.chat.model.ChatResponse;
 import org.springframework.ai.chat.prompt.PromptTemplate;
 import org.springframework.ai.document.Document;

auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-jdbc/src/main/java/org/springframework/ai/model/chat/memory/jdbc/autoconfigure/JdbcChatMemoryDataSourceScriptDatabaseInitializer.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2024-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.springframework.ai.model.chat.memory.jdbc.autoconfigure;
 
 import java.util.List;
@@ -13,7 +29,7 @@ class JdbcChatMemoryDataSourceScriptDatabaseInitializer extends DataSourceScript
 
 	private static final String SCHEMA_LOCATION = "classpath:org/springframework/ai/chat/memory/jdbc/schema-@@platform@@.sql";
 
-	public JdbcChatMemoryDataSourceScriptDatabaseInitializer(DataSource dataSource) {
+	JdbcChatMemoryDataSourceScriptDatabaseInitializer(DataSource dataSource) {
 		super(dataSource, getSettings(dataSource));
 	}
 

auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-jdbc/src/test/java/org/springframework/ai/model/chat/memory/jdbc/autoconfigure/JdbcChatMemoryAutoConfigurationIT.java

@@ -60,16 +60,14 @@ class JdbcChatMemoryAutoConfigurationIT {
 
 	@Test
 	void jdbcChatMemoryScriptDatabaseInitializer_shouldBeLoaded() {
-		this.contextRunner.withPropertyValues("spring.ai.chat.memory.jdbc.initialize-schema=true").run(context -> {
-			assertThat(context.containsBean("jdbcChatMemoryScriptDatabaseInitializer")).isTrue();
-		});
+		this.contextRunner.withPropertyValues("spring.ai.chat.memory.jdbc.initialize-schema=true")
+			.run(context -> assertThat(context.containsBean("jdbcChatMemoryScriptDatabaseInitializer")).isTrue());
 	}
 
 	@Test
 	void jdbcChatMemoryScriptDatabaseInitializer_shouldNotBeLoaded() {
-		this.contextRunner.withPropertyValues("spring.ai.chat.memory.jdbc.initialize-schema=false").run(context -> {
-			assertThat(context.containsBean("jdbcChatMemoryScriptDatabaseInitializer")).isFalse();
-		});
+		this.contextRunner.withPropertyValues("spring.ai.chat.memory.jdbc.initialize-schema=false")
+			.run(context -> assertThat(context.containsBean("jdbcChatMemoryScriptDatabaseInitializer")).isFalse());
 	}
 
 	@Test

auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-jdbc/src/test/java/org/springframework/ai/model/chat/memory/jdbc/autoconfigure/JdbcChatMemoryDataSourceScriptDatabaseInitializerTests.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2024-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.springframework.ai.model.chat.memory.jdbc.autoconfigure;
 
 import javax.sql.DataSource;

auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-neo4j/src/main/java/org/springframework/ai/model/chat/memory/neo4j/autoconfigure/Neo4jChatMemoryAutoConfiguration.java

@@ -17,6 +17,7 @@
 package org.springframework.ai.model.chat.memory.neo4j.autoconfigure;
 
 import org.neo4j.driver.Driver;
+
 import org.springframework.ai.chat.memory.neo4j.Neo4jChatMemory;
 import org.springframework.ai.chat.memory.neo4j.Neo4jChatMemoryConfig;
 import org.springframework.boot.autoconfigure.AutoConfiguration;

auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-neo4j/src/main/java/org/springframework/ai/model/chat/memory/neo4j/autoconfigure/Neo4jChatMemoryProperties.java

@@ -42,31 +42,31 @@ public class Neo4jChatMemoryProperties {
 	private String mediaLabel = Neo4jChatMemoryConfig.DEFAULT_MEDIA_LABEL;
 
 	public String getSessionLabel() {
-		return sessionLabel;
+		return this.sessionLabel;
 	}
 
 	public void setSessionLabel(String sessionLabel) {
 		this.sessionLabel = sessionLabel;
 	}
 
 	public String getToolCallLabel() {
-		return toolCallLabel;
+		return this.toolCallLabel;
 	}
 
 	public String getMetadataLabel() {
-		return metadataLabel;
+		return this.metadataLabel;
 	}
 
 	public String getMessageLabel() {
-		return messageLabel;
+		return this.messageLabel;
 	}
 
 	public String getToolResponseLabel() {
-		return toolResponseLabel;
+		return this.toolResponseLabel;
 	}
 
 	public String getMediaLabel() {
-		return mediaLabel;
+		return this.mediaLabel;
 	}
 
 	public void setToolCallLabel(String toolCallLabel) {

auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-neo4j/src/test/java/org/springframework/ai/model/chat/memory/neo4j/autoconfigure/Neo4jChatMemoryPropertiesTest.java

@@ -17,6 +17,7 @@
 package org.springframework.ai.model.chat.memory.neo4j.autoconfigure;
 
 import org.junit.jupiter.api.Test;
+
 import org.springframework.ai.chat.memory.neo4j.Neo4jChatMemoryConfig;
 
 import static org.assertj.core.api.Assertions.assertThat;

auto-configurations/models/spring-ai-autoconfigure-model-anthropic/src/main/java/org/springframework/ai/model/anthropic/autoconfigure/AnthropicChatAutoConfiguration.java

@@ -20,16 +20,16 @@
 
 import org.springframework.ai.anthropic.AnthropicChatModel;
 import org.springframework.ai.anthropic.api.AnthropicApi;
+import org.springframework.ai.chat.observation.ChatModelObservationConvention;
 import org.springframework.ai.model.SpringAIModelProperties;
 import org.springframework.ai.model.SpringAIModels;
-import org.springframework.ai.model.tool.autoconfigure.ToolCallingAutoConfiguration;
-import org.springframework.ai.retry.autoconfigure.SpringAiRetryAutoConfiguration;
-import org.springframework.ai.chat.observation.ChatModelObservationConvention;
 import org.springframework.ai.model.function.DefaultFunctionCallbackResolver;
 import org.springframework.ai.model.function.FunctionCallbackResolver;
 import org.springframework.ai.model.tool.DefaultToolExecutionEligibilityPredicate;
 import org.springframework.ai.model.tool.ToolCallingManager;
 import org.springframework.ai.model.tool.ToolExecutionEligibilityPredicate;
+import org.springframework.ai.model.tool.autoconfigure.ToolCallingAutoConfiguration;
+import org.springframework.ai.retry.autoconfigure.SpringAiRetryAutoConfiguration;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;

auto-configurations/models/spring-ai-autoconfigure-model-anthropic/src/test/java/org/springframework/ai/model/anthropic/autoconfigure/AnthropicModelConfigurationTests.java

@@ -37,9 +37,7 @@ public class AnthropicModelConfigurationTests {
 
 	@Test
 	void chatModelActivation() {
-		this.contextRunner.run(context -> {
-			assertThat(context.getBeansOfType(AnthropicChatModel.class)).isNotEmpty();
-		});
+		this.contextRunner.run(context -> assertThat(context.getBeansOfType(AnthropicChatModel.class)).isNotEmpty());
 
 		this.contextRunner.withPropertyValues("spring.ai.model.chat=none").run(context -> {
 			assertThat(context.getBeansOfType(AnthropicChatProperties.class)).isEmpty();

auto-configurations/models/spring-ai-autoconfigure-model-anthropic/src/test/java/org/springframework/ai/model/anthropic/autoconfigure/AnthropicPropertiesTests.java

@@ -121,9 +121,7 @@ public void chatCompletionDisabled() {
 		new ApplicationContextRunner().withPropertyValues("spring.ai.model.chat=none")
 			.withConfiguration(AutoConfigurations.of(SpringAiRetryAutoConfiguration.class,
 					RestClientAutoConfiguration.class, AnthropicChatAutoConfiguration.class))
-			.run(context -> {
-				assertThat(context.getBeansOfType(AnthropicChatModel.class)).isEmpty();
-			});
+			.run(context -> assertThat(context.getBeansOfType(AnthropicChatModel.class)).isEmpty());
 	}
 
 }