Remove deprecations in JdbcChatMemory

* Remove deprecated APIs for JdbcChatMemory.
* Improve documentation about chat memory vs. chat history.
* Fix mismatch between docs vs code for max messages in MessageWindowChatMemory.

Signed-off-by: Thomas Vitale <[email protected]>

Author: ThomasVitale

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

@@ -21,24 +21,15 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.springframework.ai.chat.memory.ChatMemory;
-import org.springframework.ai.chat.memory.MessageWindowChatMemory;
-import org.springframework.ai.chat.memory.jdbc.JdbcChatMemory;
-import org.springframework.ai.chat.memory.jdbc.JdbcChatMemoryConfig;
 import org.springframework.ai.chat.memory.jdbc.JdbcChatMemoryRepository;
 import org.springframework.ai.model.chat.memory.autoconfigure.ChatMemoryAutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionMessage;
-import org.springframework.boot.autoconfigure.condition.ConditionOutcome;
-import org.springframework.boot.autoconfigure.condition.SpringBootCondition;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.jdbc.JdbcTemplateAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ConditionContext;
-import org.springframework.context.annotation.Conditional;
-import org.springframework.core.type.AnnotatedTypeMetadata;
 import org.springframework.jdbc.core.JdbcTemplate;
 
 /**
@@ -59,55 +50,13 @@ JdbcChatMemoryRepository chatMemoryRepository(JdbcTemplate jdbcTemplate) {
 		return JdbcChatMemoryRepository.builder().jdbcTemplate(jdbcTemplate).build();
 	}
 
-	/**
-	 * @deprecated in favor of building a {@link MessageWindowChatMemory} (or other
-	 * {@link ChatMemory} implementations) with a {@link JdbcChatMemoryRepository}
-	 * instance.
-	 */
 	@Bean
 	@ConditionalOnMissingBean
-	@Deprecated
-	JdbcChatMemory chatMemory(JdbcTemplate jdbcTemplate) {
-		var config = JdbcChatMemoryConfig.builder().jdbcTemplate(jdbcTemplate).build();
-		return JdbcChatMemory.create(config);
-	}
-
-	@Bean
-	@ConditionalOnMissingBean
-	@Conditional(OnSchemaInitializationEnabledCondition.class)
+	@ConditionalOnProperty(prefix = JdbcChatMemoryProperties.CONFIG_PREFIX, name = "initialize-schema",
+			havingValue = "true", matchIfMissing = true)
 	JdbcChatMemoryDataSourceScriptDatabaseInitializer jdbcChatMemoryScriptDatabaseInitializer(DataSource dataSource) {
 		logger.debug("Initializing schema for JdbcChatMemoryRepository");
 		return new JdbcChatMemoryDataSourceScriptDatabaseInitializer(dataSource);
 	}
 
-	/**
-	 * Condition to check if the schema initialization is enabled, supporting both
-	 * deprecated and new property.
-	 *
-	 * @deprecated to be removed in 1.0.0-RC1.
-	 */
-	@Deprecated
-	static class OnSchemaInitializationEnabledCondition extends SpringBootCondition {
-
-		@Override
-		public ConditionOutcome getMatchOutcome(ConditionContext context, AnnotatedTypeMetadata metadata) {
-			Boolean initializeSchemaEnabled = context.getEnvironment()
-				.getProperty("spring.ai.chat.memory.jdbc.initialize-schema", Boolean.class);
-
-			if (initializeSchemaEnabled != null) {
-				return new ConditionOutcome(initializeSchemaEnabled,
-						ConditionMessage.forCondition("Enable JDBC Chat Memory Schema Initialization")
-							.because("spring.ai.chat.memory.jdbc.initialize-schema is " + initializeSchemaEnabled));
-			}
-
-			initializeSchemaEnabled = context.getEnvironment()
-				.getProperty(JdbcChatMemoryProperties.CONFIG_PREFIX + ".initialize-schema", Boolean.class, true);
-
-			return new ConditionOutcome(initializeSchemaEnabled, ConditionMessage
-				.forCondition("Enable JDBC Chat Memory Schema Initialization")
-				.because(JdbcChatMemoryProperties.CONFIG_PREFIX + ".initialize-schema is " + initializeSchemaEnabled));
-		}
-
-	}
-
 }

auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-jdbc/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -22,7 +22,6 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.ai.chat.memory.ChatMemory;
-import org.springframework.ai.chat.memory.jdbc.JdbcChatMemory;
 import org.springframework.ai.chat.memory.jdbc.JdbcChatMemoryRepository;
 import org.springframework.ai.chat.messages.AssistantMessage;
 import org.springframework.ai.chat.messages.Message;
@@ -57,58 +56,16 @@ void jdbcChatMemoryScriptDatabaseInitializer_shouldBeLoaded() {
 
 	@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.repository.jdbc.initialize-schema=false")
 			.run(context -> assertThat(context.containsBean("jdbcChatMemoryScriptDatabaseInitializer")).isFalse());
 	}
 
 	@Test
-	void initializeSchemaEnabledWithDeprecatedProperty() {
-		this.contextRunner
-			.withPropertyValues("spring.ai.chat.memory.jdbc.initialize-schema=true",
-					"spring.ai.chat.memory.repository.jdbc.initialize-schema=false")
-			.run(context -> assertThat(context.containsBean("jdbcChatMemoryScriptDatabaseInitializer")).isTrue());
-	}
-
-	@Test
-	void initializeSchemaEnabledWithNewProperty() {
+	void initializeSchemaEnabledWithProperty() {
 		this.contextRunner.withPropertyValues("spring.ai.chat.memory.repository.jdbc.initialize-schema=true")
 			.run(context -> assertThat(context.containsBean("jdbcChatMemoryScriptDatabaseInitializer")).isTrue());
 	}
 
-	@Test
-	void addGetAndClear_shouldAllExecute() {
-		this.contextRunner.withPropertyValues("spring.ai.chat.memory.jdbc.initialize-schema=true").run(context -> {
-			var chatMemory = context.getBean(JdbcChatMemory.class);
-			var conversationId = UUID.randomUUID().toString();
-			var userMessage = new UserMessage("Message from the user");
-
-			chatMemory.add(conversationId, userMessage);
-
-			assertThat(chatMemory.get(conversationId, Integer.MAX_VALUE)).hasSize(1);
-			assertThat(chatMemory.get(conversationId, Integer.MAX_VALUE)).isEqualTo(List.of(userMessage));
-
-			var assistantMessage = new AssistantMessage("Message from the assistant");
-
-			chatMemory.add(conversationId, List.of(assistantMessage));
-
-			assertThat(chatMemory.get(conversationId)).hasSize(2);
-			assertThat(chatMemory.get(conversationId)).isEqualTo(List.of(userMessage, assistantMessage));
-			chatMemory.clear(conversationId);
-
-			assertThat(chatMemory.get(conversationId, Integer.MAX_VALUE)).isEmpty();
-
-			var multipleMessages = List.<Message>of(new UserMessage("Message from the user 1"),
-					new AssistantMessage("Message from the assistant 1"));
-
-			chatMemory.add(conversationId, multipleMessages);
-
-			assertThat(chatMemory.get(conversationId, Integer.MAX_VALUE)).hasSize(multipleMessages.size());
-			assertThat(chatMemory.get(conversationId, Integer.MAX_VALUE)).isEqualTo(multipleMessages);
-		});
-	}
-
 	@Test
 	void useAutoConfiguredJdbcChatMemoryRepository() {
 		this.contextRunner.run(context -> {