Fix checkstyle execution.

ericbottard · ericbottard · commit 738c033c6f10 · 2025-12-11T14:08:27.000+01:00
Previously used the wrong phase verify instead of validate.

But on top of that, for whatever reason, there is no way to have
the checktyle goal run correctly after the javaformat goals.
Maybe this is because they're in a profile, maybe not.
This config DOES work, so using that after several attempts
of understanding the issue, to no avail.

Signed-off-by: Eric Bottard &lt;eric.bottard@broadcom.com&gt;
diff --git a/auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-redis/src/main/java/org/springframework/ai/model/chat/memory/redis/autoconfigure/RedisChatMemoryAutoConfiguration.java b/auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-redis/src/main/java/org/springframework/ai/model/chat/memory/redis/autoconfigure/RedisChatMemoryAutoConfiguration.java
@@ -13,21 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ai.model.chat.memory.redis.autoconfigure;
 
+import redis.clients.jedis.JedisPooled;
+
 import org.springframework.ai.chat.memory.ChatMemory;
 import org.springframework.ai.chat.memory.ChatMemoryRepository;
 import org.springframework.ai.chat.memory.repository.redis.RedisChatMemoryRepository;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.data.redis.autoconfigure.DataRedisAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.data.redis.autoconfigure.DataRedisAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.util.StringUtils;
 
-import redis.clients.jedis.JedisPooled;
-
 /**
  * Auto-configuration for Redis-based chat memory implementation.
  *
@@ -81,4 +82,4 @@ public RedisChatMemoryRepository redisChatMemory(JedisPooled jedisClient, RedisC
 		return builder.build();
 	}
 
-}
+}
diff --git a/auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-redis/src/main/java/org/springframework/ai/model/chat/memory/redis/autoconfigure/RedisChatMemoryProperties.java b/auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-redis/src/main/java/org/springframework/ai/model/chat/memory/redis/autoconfigure/RedisChatMemoryProperties.java
@@ -13,14 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ai.model.chat.memory.redis.autoconfigure;
 
 import java.time.Duration;
 import java.util.List;
 import java.util.Map;
 
-import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.ai.chat.memory.repository.redis.RedisChatMemoryConfig;
+import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
  * Configuration properties for Redis-based chat memory.
@@ -82,75 +83,75 @@ public class RedisChatMemoryProperties {
 	private List<Map<String, String>> metadataFields;
 
 	public String getHost() {
-		return host;
+		return this.host;
 	}
 
 	public void setHost(String host) {
 		this.host = host;
 	}
 
 	public int getPort() {
-		return port;
+		return this.port;
 	}
 
 	public void setPort(int port) {
 		this.port = port;
 	}
 
 	public String getIndexName() {
-		return indexName;
+		return this.indexName;
 	}
 
 	public void setIndexName(String indexName) {
 		this.indexName = indexName;
 	}
 
 	public String getKeyPrefix() {
-		return keyPrefix;
+		return this.keyPrefix;
 	}
 
 	public void setKeyPrefix(String keyPrefix) {
 		this.keyPrefix = keyPrefix;
 	}
 
 	public Duration getTimeToLive() {
-		return timeToLive;
+		return this.timeToLive;
 	}
 
 	public void setTimeToLive(Duration timeToLive) {
 		this.timeToLive = timeToLive;
 	}
 
 	public Boolean getInitializeSchema() {
-		return initializeSchema;
+		return this.initializeSchema;
 	}
 
 	public void setInitializeSchema(Boolean initializeSchema) {
 		this.initializeSchema = initializeSchema;
 	}
 
 	public Integer getMaxConversationIds() {
-		return maxConversationIds;
+		return this.maxConversationIds;
 	}
 
 	public void setMaxConversationIds(Integer maxConversationIds) {
 		this.maxConversationIds = maxConversationIds;
 	}
 
 	public Integer getMaxMessagesPerConversation() {
-		return maxMessagesPerConversation;
+		return this.maxMessagesPerConversation;
 	}
 
 	public void setMaxMessagesPerConversation(Integer maxMessagesPerConversation) {
 		this.maxMessagesPerConversation = maxMessagesPerConversation;
 	}
 
 	public List<Map<String, String>> getMetadataFields() {
-		return metadataFields;
+		return this.metadataFields;
 	}
 
 	public void setMetadataFields(List<Map<String, String>> metadataFields) {
 		this.metadataFields = metadataFields;
 	}
 
-}
+}
diff --git a/auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-redis/src/test/java/org/springframework/ai/model/chat/memory/redis/autoconfigure/RedisChatMemoryAutoConfigurationIT.java b/auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-redis/src/test/java/org/springframework/ai/model/chat/memory/redis/autoconfigure/RedisChatMemoryAutoConfigurationIT.java
@@ -17,19 +17,18 @@
 package org.springframework.ai.model.chat.memory.redis.autoconfigure;
 
 import com.redis.testcontainers.RedisStackContainer;
-
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.ai.chat.memory.ChatMemory;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+
 import org.springframework.ai.chat.memory.ChatMemoryRepository;
 import org.springframework.ai.chat.memory.repository.redis.RedisChatMemoryRepository;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.data.redis.autoconfigure.DataRedisAutoConfiguration;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.testcontainers.junit.jupiter.Container;
-import org.testcontainers.junit.jupiter.Testcontainers;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/auto-configurations/vector-stores/spring-ai-autoconfigure-vector-store-redis/src/main/java/org/springframework/ai/vectorstore/redis/autoconfigure/RedisVectorStoreAutoConfiguration.java b/auto-configurations/vector-stores/spring-ai-autoconfigure-vector-store-redis/src/main/java/org/springframework/ai/vectorstore/redis/autoconfigure/RedisVectorStoreAutoConfiguration.java
@@ -17,6 +17,11 @@
 package org.springframework.ai.vectorstore.redis.autoconfigure;
 
 import io.micrometer.observation.ObservationRegistry;
+import redis.clients.jedis.DefaultJedisClientConfig;
+import redis.clients.jedis.HostAndPort;
+import redis.clients.jedis.JedisClientConfig;
+import redis.clients.jedis.JedisPooled;
+
 import org.springframework.ai.embedding.BatchingStrategy;
 import org.springframework.ai.embedding.EmbeddingModel;
 import org.springframework.ai.embedding.TokenCountBatchingStrategy;
@@ -33,10 +38,6 @@
 import org.springframework.boot.data.redis.autoconfigure.DataRedisAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
-import redis.clients.jedis.DefaultJedisClientConfig;
-import redis.clients.jedis.HostAndPort;
-import redis.clients.jedis.JedisClientConfig;
-import redis.clients.jedis.JedisPooled;
 
 /**
  * {@link AutoConfiguration Auto-configuration} for Redis Vector Store.
diff --git a/auto-configurations/vector-stores/spring-ai-autoconfigure-vector-store-redis/src/test/java/org/springframework/ai/vectorstore/redis/autoconfigure/RedisVectorStoreAutoConfigurationIT.java b/auto-configurations/vector-stores/spring-ai-autoconfigure-vector-store-redis/src/test/java/org/springframework/ai/vectorstore/redis/autoconfigure/RedisVectorStoreAutoConfigurationIT.java
@@ -154,4 +154,4 @@ public EmbeddingModel embeddingModel() {
 
 	}
 
-}
+}
diff --git a/memory/repository/spring-ai-model-chat-memory-repository-redis/src/main/java/org/springframework/ai/chat/memory/repository/redis/RedisChatMemoryConfig.java b/memory/repository/spring-ai-model-chat-memory-repository-redis/src/main/java/org/springframework/ai/chat/memory/repository/redis/RedisChatMemoryConfig.java
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.ai.chat.memory.repository.redis;
 
 import java.time.Duration;
@@ -268,4 +269,4 @@ public RedisChatMemoryConfig build() {
 
 	}
 
-}
+}
diff --git a/models/spring-ai-anthropic/src/main/java/org/springframework/ai/anthropic/AnthropicChatOptions.java b/models/spring-ai-anthropic/src/main/java/org/springframework/ai/anthropic/AnthropicChatOptions.java
@@ -652,4 +652,4 @@ public AnthropicChatOptions build() {
 
 	}
 
-}
+}
diff --git a/models/spring-ai-anthropic/src/main/java/org/springframework/ai/anthropic/api/AnthropicApi.java b/models/spring-ai-anthropic/src/main/java/org/springframework/ai/anthropic/api/AnthropicApi.java
@@ -2318,4 +2318,4 @@ public AnthropicApi build() {
 
 	}
 
-}
+}
diff --git a/models/spring-ai-oci-genai/src/main/java/org/springframework/ai/oci/cohere/OCICohereChatModel.java b/models/spring-ai-oci-genai/src/main/java/org/springframework/ai/oci/cohere/OCICohereChatModel.java
@@ -19,7 +19,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 
 import com.oracle.bmc.generativeaiinference.GenerativeAiInference;
 import com.oracle.bmc.generativeaiinference.model.BaseChatRequest;
diff --git a/pom.xml b/pom.xml
@@ -681,11 +681,11 @@
 
 		</profile>
 		<profile>
-			<!-- Moving this plugin in an always active profile that appears *after* the
-			conditional javaformat -->
 			<id>checkstyle-check</id>
 			<activation>
-				<activeByDefault>true</activeByDefault>
+				<property>
+					<name>!env.BOGUS</name>
+				</property>
 			</activation>
 			<build>
 				<plugins>
@@ -708,7 +708,7 @@
 						<executions>
 							<execution>
 								<id>checkstyle-validation</id>
-								<phase>verify</phase>
+								<phase>process-sources</phase>
 								<inherited>true</inherited>
 								<configuration>
 									<skip>${disable.checks}</skip>
diff --git a/spring-ai-model/src/main/java/org/springframework/ai/aot/SpringAiCoreRuntimeHints.java b/spring-ai-model/src/main/java/org/springframework/ai/aot/SpringAiCoreRuntimeHints.java
@@ -21,6 +21,7 @@
 import org.slf4j.LoggerFactory;
 import org.slf4j.helpers.NOP_FallbackServiceProvider;
 import org.slf4j.helpers.SubstituteServiceProvider;
+
 import org.springframework.ai.chat.messages.AbstractMessage;
 import org.springframework.ai.chat.messages.AssistantMessage;
 import org.springframework.ai.chat.messages.Message;
diff --git a/spring-ai-model/src/test/java/org/springframework/ai/aot/SpringAiCoreRuntimeHintsTests.java b/spring-ai-model/src/test/java/org/springframework/ai/aot/SpringAiCoreRuntimeHintsTests.java
@@ -20,6 +20,7 @@
 import org.slf4j.LoggerFactory;
 import org.slf4j.helpers.NOP_FallbackServiceProvider;
 import org.slf4j.helpers.SubstituteServiceProvider;
+
 import org.springframework.ai.chat.messages.AbstractMessage;
 import org.springframework.ai.chat.messages.AssistantMessage;
 import org.springframework.ai.chat.messages.Message;
@@ -82,4 +83,4 @@ void registerHints() {
 			.anyMatch(include -> include.getPattern().contains("embedding-model-dimensions.properties")));
 	}
 
-}
+}
diff --git a/spring-ai-model/src/test/java/org/springframework/ai/tool/method/MethodToolCallbackExceptionHandlingTest.java b/spring-ai-model/src/test/java/org/springframework/ai/tool/method/MethodToolCallbackExceptionHandlingTest.java
@@ -1,18 +1,19 @@
 /*
-* Copyright 2025 - 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.
-*/
+ * Copyright 2025-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.tool.method;
 
 import java.util.List;

Original file line number	Diff line number	Diff line change
`@@ -13,14 +13,15 @@`
`13`	`13`	`* See the License for the specific language governing permissions and`
`14`	`14`	`* limitations under the License.`
`15`	`15`	`*/`
	`16`	`+`
`16`	`17`	`package org.springframework.ai.model.chat.memory.redis.autoconfigure;`
`17`	`18`
`18`	`19`	`import java.time.Duration;`
`19`	`20`	`import java.util.List;`
`20`	`21`	`import java.util.Map;`
`21`	`22`
`22`		`-import org.springframework.boot.context.properties.ConfigurationProperties;`
`23`	`23`	`import org.springframework.ai.chat.memory.repository.redis.RedisChatMemoryConfig;`
	`24`	`+import org.springframework.boot.context.properties.ConfigurationProperties;`
`24`	`25`
`25`	`26`	`/**`
`26`	`27`	`* Configuration properties for Redis-based chat memory.`
`@@ -82,75 +83,75 @@ public class RedisChatMemoryProperties {`
`82`	`83`	`private List<Map<String, String>> metadataFields;`
`83`	`84`
`84`	`85`	`public String getHost() {`
`85`		`- return host;`
	`86`	`+ return this.host;`
`86`	`87`	`}`
`87`	`88`
`88`	`89`	`public void setHost(String host) {`
`89`	`90`	`this.host = host;`
`90`	`91`	`}`
`91`	`92`
`92`	`93`	`public int getPort() {`
`93`		`- return port;`
	`94`	`+ return this.port;`
`94`	`95`	`}`
`95`	`96`
`96`	`97`	`public void setPort(int port) {`
`97`	`98`	`this.port = port;`
`98`	`99`	`}`
`99`	`100`
`100`	`101`	`public String getIndexName() {`
`101`		`- return indexName;`
	`102`	`+ return this.indexName;`
`102`	`103`	`}`
`103`	`104`
`104`	`105`	`public void setIndexName(String indexName) {`
`105`	`106`	`this.indexName = indexName;`
`106`	`107`	`}`
`107`	`108`
`108`	`109`	`public String getKeyPrefix() {`
`109`		`- return keyPrefix;`
	`110`	`+ return this.keyPrefix;`
`110`	`111`	`}`
`111`	`112`
`112`	`113`	`public void setKeyPrefix(String keyPrefix) {`
`113`	`114`	`this.keyPrefix = keyPrefix;`
`114`	`115`	`}`
`115`	`116`
`116`	`117`	`public Duration getTimeToLive() {`
`117`		`- return timeToLive;`
	`118`	`+ return this.timeToLive;`
`118`	`119`	`}`
`119`	`120`
`120`	`121`	`public void setTimeToLive(Duration timeToLive) {`
`121`	`122`	`this.timeToLive = timeToLive;`
`122`	`123`	`}`
`123`	`124`
`124`	`125`	`public Boolean getInitializeSchema() {`
`125`		`- return initializeSchema;`
	`126`	`+ return this.initializeSchema;`
`126`	`127`	`}`
`127`	`128`
`128`	`129`	`public void setInitializeSchema(Boolean initializeSchema) {`
`129`	`130`	`this.initializeSchema = initializeSchema;`
`130`	`131`	`}`
`131`	`132`
`132`	`133`	`public Integer getMaxConversationIds() {`
`133`		`- return maxConversationIds;`
	`134`	`+ return this.maxConversationIds;`
`134`	`135`	`}`
`135`	`136`
`136`	`137`	`public void setMaxConversationIds(Integer maxConversationIds) {`
`137`	`138`	`this.maxConversationIds = maxConversationIds;`
`138`	`139`	`}`
`139`	`140`
`140`	`141`	`public Integer getMaxMessagesPerConversation() {`
`141`		`- return maxMessagesPerConversation;`
	`142`	`+ return this.maxMessagesPerConversation;`
`142`	`143`	`}`
`143`	`144`
`144`	`145`	`public void setMaxMessagesPerConversation(Integer maxMessagesPerConversation) {`
`145`	`146`	`this.maxMessagesPerConversation = maxMessagesPerConversation;`
`146`	`147`	`}`
`147`	`148`
`148`	`149`	`public List<Map<String, String>> getMetadataFields() {`
`149`		`- return metadataFields;`
	`150`	`+ return this.metadataFields;`
`150`	`151`	`}`
`151`	`152`
`152`	`153`	`public void setMetadataFields(List<Map<String, String>> metadataFields) {`
`153`	`154`	`this.metadataFields = metadataFields;`
`154`	`155`	`}`
`155`	`156`
`156`		`-}`
	`157`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -154,4 +154,4 @@ public EmbeddingModel embeddingModel() {`
`154`	`154`
`155`	`155`	`}`
`156`	`156`
`157`		`-}`
	`157`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -652,4 +652,4 @@ public AnthropicChatOptions build() {`
`652`	`652`
`653`	`653`	`}`
`654`	`654`
`655`		`-}`
	`655`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -2318,4 +2318,4 @@ public AnthropicApi build() {`
`2318`	`2318`
`2319`	`2319`	`}`
`2320`	`2320`
`2321`		`-}`
	`2321`	`+}`