More renaming to be explicit about Chat memory repository

ilayaperumalg · ilayaperumalg · commit 54832fea8254 · 2025-05-12T17:19:52.000+01:00
Signed-off-by: Ilayaperumal Gopinathan &lt;ilayaperumal.gopinathan@broadcom.com&gt;
diff --git a/auto-configurations/models/chat/memory/repository/spring-ai-autoconfigure-model-chat-memory-repository-jdbc/src/main/java/org/springframework/ai/model/chat/memory/repository/jdbc/autoconfigure/JdbcChatMemoryRepositoryAutoConfiguration.java b/auto-configurations/models/chat/memory/repository/spring-ai-autoconfigure-model-chat-memory-repository-jdbc/src/main/java/org/springframework/ai/model/chat/memory/repository/jdbc/autoconfigure/JdbcChatMemoryRepositoryAutoConfiguration.java
@@ -18,7 +18,7 @@
 
 import javax.sql.DataSource;
 
-import org.springframework.ai.chat.memory.repository.jdbc.JdbcChatMemoryDialect;
+import org.springframework.ai.chat.memory.repository.jdbc.JdbcChatMemoryRepositoryDialect;
 import org.springframework.ai.chat.memory.repository.jdbc.JdbcChatMemoryRepository;
 import org.springframework.ai.model.chat.memory.autoconfigure.ChatMemoryAutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
@@ -45,7 +45,7 @@ public class JdbcChatMemoryRepositoryAutoConfiguration {
 	@Bean
 	@ConditionalOnMissingBean
 	JdbcChatMemoryRepository jdbcChatMemoryRepository(JdbcTemplate jdbcTemplate, DataSource dataSource) {
-		JdbcChatMemoryDialect dialect = JdbcChatMemoryDialect.from(dataSource);
+		JdbcChatMemoryRepositoryDialect dialect = JdbcChatMemoryRepositoryDialect.from(dataSource);
 		return JdbcChatMemoryRepository.builder().jdbcTemplate(jdbcTemplate).dialect(dialect).build();
 	}
 
diff --git a/auto-configurations/models/chat/memory/repository/spring-ai-autoconfigure-model-chat-memory-repository-jdbc/src/test/java/org/springframework/ai/model/chat/memory/repository/jdbc/autoconfigure/JdbcChatMemoryRepositoryHsqldbAutoConfigurationIT.java b/auto-configurations/models/chat/memory/repository/spring-ai-autoconfigure-model-chat-memory-repository-jdbc/src/test/java/org/springframework/ai/model/chat/memory/repository/jdbc/autoconfigure/JdbcChatMemoryRepositoryHsqldbAutoConfigurationIT.java
@@ -40,7 +40,7 @@
 import static org.assertj.core.api.Assertions.fail;
 
 @RunWith(SpringRunner.class)
-@SpringBootTest(classes = JdbcChatMemoryHsqldbAutoConfigurationIT.TestConfig.class,
+@SpringBootTest(classes = JdbcChatMemoryRepositoryHsqldbAutoConfigurationIT.TestConfig.class,
 		properties = { "spring.datasource.url=jdbc:hsqldb:mem:chat_memory_auto_configuration_test;DB_CLOSE_DELAY=-1",
 				"spring.datasource.username=sa", "spring.datasource.password=",
 				"spring.datasource.driver-class-name=org.hsqldb.jdbcDriver",
@@ -55,7 +55,7 @@
 		org.springframework.boot.autoconfigure.jdbc.JdbcTemplateAutoConfiguration.class,
 		org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration.class,
 		SqlInitializationAutoConfiguration.class })
-public class JdbcChatMemoryHsqldbAutoConfigurationIT {
+public class JdbcChatMemoryRepositoryHsqldbAutoConfigurationIT {
 
 	@Autowired
 	private ApplicationContext context;
diff --git a/auto-configurations/models/chat/memory/repository/spring-ai-autoconfigure-model-chat-memory-repository-jdbc/src/test/java/org/springframework/ai/model/chat/memory/repository/jdbc/autoconfigure/JdbcChatMemoryRepositoryPostgresqlAutoConfigurationIT.java b/auto-configurations/models/chat/memory/repository/spring-ai-autoconfigure-model-chat-memory-repository-jdbc/src/test/java/org/springframework/ai/model/chat/memory/repository/jdbc/autoconfigure/JdbcChatMemoryRepositoryPostgresqlAutoConfigurationIT.java
@@ -40,7 +40,7 @@
  * @author Linar Abzaltdinov
  * @author Yanming Zhou
  */
-class JdbcChatMemoryPostgresqlAutoConfigurationIT {
+class JdbcChatMemoryRepositoryPostgresqlAutoConfigurationIT {
 
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
 		.withConfiguration(AutoConfigurations.of(JdbcChatMemoryRepositoryAutoConfiguration.class,
diff --git a/auto-configurations/models/chat/memory/repository/spring-ai-autoconfigure-model-chat-memory-repository-jdbc/src/test/java/org/springframework/ai/model/chat/memory/repository/jdbc/autoconfigure/JdbcChatMemoryRepositorySqlServerAutoConfigurationIT.java b/auto-configurations/models/chat/memory/repository/spring-ai-autoconfigure-model-chat-memory-repository-jdbc/src/test/java/org/springframework/ai/model/chat/memory/repository/jdbc/autoconfigure/JdbcChatMemoryRepositorySqlServerAutoConfigurationIT.java
@@ -27,7 +27,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 @Testcontainers
-class JdbcChatMemorySqlServerAutoConfigurationIT {
+class JdbcChatMemoryRepositorySqlServerAutoConfigurationIT {
 
 	static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName
 		.parse("mcr.microsoft.com/mssql/server:2022-latest");
diff --git a/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/main/java/org/springframework/ai/chat/memory/repository/jdbc/HsqldbChatMemoryRepositoryDialect.java b/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/main/java/org/springframework/ai/chat/memory/repository/jdbc/HsqldbChatMemoryRepositoryDialect.java
@@ -19,7 +19,7 @@
 /**
  * HSQLDB-specific SQL dialect for chat memory repository.
  */
-public class HsqldbChatMemoryDialect implements JdbcChatMemoryDialect {
+public class HsqldbChatMemoryRepositoryDialect implements JdbcChatMemoryRepositoryDialect {
 
 	@Override
 	public String getSelectMessagesSql() {
diff --git a/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/main/java/org/springframework/ai/chat/memory/repository/jdbc/JdbcChatMemoryRepository.java b/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/main/java/org/springframework/ai/chat/memory/repository/jdbc/JdbcChatMemoryRepository.java
@@ -51,9 +51,9 @@ public class JdbcChatMemoryRepository implements ChatMemoryRepository {
 
 	private final JdbcTemplate jdbcTemplate;
 
-	private final JdbcChatMemoryDialect dialect;
+	private final JdbcChatMemoryRepositoryDialect dialect;
 
-	private JdbcChatMemoryRepository(JdbcTemplate jdbcTemplate, JdbcChatMemoryDialect dialect) {
+	private JdbcChatMemoryRepository(JdbcTemplate jdbcTemplate, JdbcChatMemoryRepositoryDialect dialect) {
 		Assert.notNull(jdbcTemplate, "jdbcTemplate cannot be null");
 		Assert.notNull(dialect, "dialect cannot be null");
 		this.jdbcTemplate = jdbcTemplate;
@@ -146,7 +146,7 @@ public static class Builder {
 
 		private JdbcTemplate jdbcTemplate;
 
-		private JdbcChatMemoryDialect dialect;
+		private JdbcChatMemoryRepositoryDialect dialect;
 
 		private Builder() {
 		}
@@ -156,7 +156,7 @@ public Builder jdbcTemplate(JdbcTemplate jdbcTemplate) {
 			return this;
 		}
 
-		public Builder dialect(JdbcChatMemoryDialect dialect) {
+		public Builder dialect(JdbcChatMemoryRepositoryDialect dialect) {
 			this.dialect = dialect;
 			return this;
 		}
diff --git a/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/main/java/org/springframework/ai/chat/memory/repository/jdbc/JdbcChatMemoryRepositoryDialect.java b/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/main/java/org/springframework/ai/chat/memory/repository/jdbc/JdbcChatMemoryRepositoryDialect.java
@@ -21,7 +21,7 @@
 /**
  * Abstraction for database-specific SQL for chat memory repository.
  */
-public interface JdbcChatMemoryDialect {
+public interface JdbcChatMemoryRepositoryDialect {
 
 	/**
 	 * Returns the SQL to fetch messages for a conversation, ordered by timestamp, with
@@ -51,25 +51,25 @@ public interface JdbcChatMemoryDialect {
 	/**
 	 * Detects the dialect from the DataSource or JDBC URL.
 	 */
-	static JdbcChatMemoryDialect from(DataSource dataSource) {
+	static JdbcChatMemoryRepositoryDialect from(DataSource dataSource) {
 		// Simple detection (could be improved)
 		try {
 			String url = dataSource.getConnection().getMetaData().getURL().toLowerCase();
 			if (url.contains("postgresql"))
-				return new PostgresChatMemoryDialect();
+				return new PostgresChatMemoryRepositoryDialect();
 			if (url.contains("mysql"))
-				return new MysqlChatMemoryDialect();
+				return new MysqlChatMemoryRepositoryDialect();
 			if (url.contains("mariadb"))
-				return new MysqlChatMemoryDialect();
+				return new MysqlChatMemoryRepositoryDialect();
 			if (url.contains("sqlserver"))
-				return new SqlServerChatMemoryDialect();
+				return new SqlServerChatMemoryRepositoryDialect();
 			if (url.contains("hsqldb"))
-				return new HsqldbChatMemoryDialect();
+				return new HsqldbChatMemoryRepositoryDialect();
 			// Add more as needed
 		}
 		catch (Exception ignored) {
 		}
-		return new PostgresChatMemoryDialect(); // default
+		return new PostgresChatMemoryRepositoryDialect(); // default
 	}
 
 }
diff --git a/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/main/java/org/springframework/ai/chat/memory/repository/jdbc/MysqlChatMemoryRepositoryDialect.java b/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/main/java/org/springframework/ai/chat/memory/repository/jdbc/MysqlChatMemoryRepositoryDialect.java
@@ -22,7 +22,7 @@
  * @author Mark Pollack
  * @since 1.0.0
  */
-public class MysqlChatMemoryDialect implements JdbcChatMemoryDialect {
+public class MysqlChatMemoryRepositoryDialect implements JdbcChatMemoryRepositoryDialect {
 
 	@Override
 	public String getSelectMessagesSql() {
diff --git a/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/main/java/org/springframework/ai/chat/memory/repository/jdbc/PostgresChatMemoryRepositoryDialect.java b/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/main/java/org/springframework/ai/chat/memory/repository/jdbc/PostgresChatMemoryRepositoryDialect.java
@@ -22,7 +22,7 @@
  * @author Mark Pollack
  * @since 1.0.0
  */
-public class PostgresChatMemoryDialect implements JdbcChatMemoryDialect {
+public class PostgresChatMemoryRepositoryDialect implements JdbcChatMemoryRepositoryDialect {
 
 	@Override
 	public String getSelectMessagesSql() {
diff --git a/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/main/java/org/springframework/ai/chat/memory/repository/jdbc/SqlServerChatMemoryRepositoryDialect.java b/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/main/java/org/springframework/ai/chat/memory/repository/jdbc/SqlServerChatMemoryRepositoryDialect.java
@@ -22,7 +22,7 @@
  * @author Mark Pollack
  * @since 1.0.0
  */
-public class SqlServerChatMemoryDialect implements JdbcChatMemoryDialect {
+public class SqlServerChatMemoryRepositoryDialect implements JdbcChatMemoryRepositoryDialect {
 
 	@Override
 	public String getSelectMessagesSql() {
diff --git a/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/test/java/org/springframework/ai/chat/memory/repository/jdbc/JdbcChatMemoryRepositoryPostgresqlIT.java b/memory/repository/spring-ai-model-chat-memory-repository-jdbc/src/test/java/org/springframework/ai/chat/memory/repository/jdbc/JdbcChatMemoryRepositoryPostgresqlIT.java
@@ -164,7 +164,7 @@ static class TestConfiguration {
 		ChatMemoryRepository chatMemoryRepository(JdbcTemplate jdbcTemplate, DataSource dataSource) {
 			return JdbcChatMemoryRepository.builder()
 				.jdbcTemplate(jdbcTemplate)
-				.dialect(JdbcChatMemoryDialect.from(dataSource))
+				.dialect(JdbcChatMemoryRepositoryDialect.from(dataSource))
 				.build();
 		}
 
diff --git a/spring-ai-docs/src/main/antora/modules/ROOT/pages/api/chat-memory.adoc b/spring-ai-docs/src/main/antora/modules/ROOT/pages/api/chat-memory.adoc
@@ -105,7 +105,7 @@ ChatMemory chatMemory = MessageWindowChatMemory.builder()
     .build();
 ----
 
-If you'd rather create the `JdbcChatMemoryRepository` manually, you can do so by providing a `JdbcTemplate` instance and optionally a custom `JdbcChatMemoryDialect`:
+If you'd rather create the `JdbcChatMemoryRepository` manually, you can do so by providing a `JdbcTemplate` instance and optionally a custom `JdbcChatMemoryRepositoryDialect`:
 
 [source,java]
 ----
@@ -129,7 +129,7 @@ Spring AI supports multiple relational databases via a dialect abstraction. The
 - SQL Server
 - HSQLDB
 
-The correct dialect is auto-detected from the JDBC URL. You can extend support for other databases by implementing the `JdbcChatMemoryDialect` interface.
+The correct dialect is auto-detected from the JDBC URL. You can extend support for other databases by implementing the `JdbcChatMemoryRepositoryDialect` interface.
 
 ==== Configuration Properties
 
@@ -162,7 +162,7 @@ spring.ai.chat.memory.repository.jdbc.schema=classpath:/custom/path/schema-mysql
 
 ==== Extending Dialects
 
-To add support for a new database, implement the `JdbcChatMemoryDialect` interface and provide SQL for selecting, inserting, and deleting messages. You can then pass your custom dialect to the repository builder.
+To add support for a new database, implement the `JdbcChatMemoryRepositoryDialect` interface and provide SQL for selecting, inserting, and deleting messages. You can then pass your custom dialect to the repository builder.
 
 [source,java]
 ----
