Skip to content

Commit b581bce

Browse files
committed
Refactor chat memory repository artifacts for clarity
- Rename the artifact ID of the chat memory repository artifacts: - `spring-ai-model-chat-memory-jdbc` -> `spring-ai-model-chat-memory-repository-jdbc` - `spring-ai-model-chat-memory-cassandra` -> `spring-ai-model-chat-memory-repository-cassandra` - `spring-ai-model-chat-memory-neo4j` -> `spring-ai-model-chat-memory-repository-neo4j` - Rename the package names to include "repository". Example: org.springframework.ai.chat.memory.repository.jdbc.JdbcChatMemoryRepository - This package renaming also requires to change the default schema location for the jdbc repository to include "repository" - Update the docs - Update the artifact IDs in the parent POM, BOM, autoconfiguration and starters - Update upgrade notes and docs to describe the changes Signed-off-by: Ilayaperumal Gopinathan <[email protected]>
1 parent 8f879aa commit b581bce

File tree

58 files changed

+88
-79
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+88
-79
lines changed

auto-configurations/models/chat/memory/repository/spring-ai-autoconfigure-model-chat-memory-repository-cassandra/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
<dependency>
2727
<groupId>org.springframework.ai</groupId>
28-
<artifactId>spring-ai-model-chat-memory-cassandra</artifactId>
28+
<artifactId>spring-ai-model-chat-memory-repository-cassandra</artifactId>
2929
<version>${project.parent.version}</version>
3030
</dependency>
3131

auto-configurations/models/chat/memory/repository/spring-ai-autoconfigure-model-chat-memory-repository-cassandra/src/main/java/org/springframework/ai/model/chat/memory/repository/cassandra/autoconfigure/CassandraChatMemoryRepositoryAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
import com.datastax.oss.driver.api.core.CqlSession;
2020

21-
import org.springframework.ai.chat.memory.cassandra.CassandraChatMemoryRepositoryConfig;
22-
import org.springframework.ai.chat.memory.cassandra.CassandraChatMemoryRepository;
21+
import org.springframework.ai.chat.memory.repository.cassandra.CassandraChatMemoryRepositoryConfig;
22+
import org.springframework.ai.chat.memory.repository.cassandra.CassandraChatMemoryRepository;
2323
import org.springframework.ai.model.chat.memory.autoconfigure.ChatMemoryAutoConfiguration;
2424
import org.springframework.boot.autoconfigure.AutoConfiguration;
2525
import org.springframework.boot.autoconfigure.cassandra.CassandraAutoConfiguration;

auto-configurations/models/chat/memory/repository/spring-ai-autoconfigure-model-chat-memory-repository-cassandra/src/main/java/org/springframework/ai/model/chat/memory/repository/cassandra/autoconfigure/CassandraChatMemoryRepositoryProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.slf4j.Logger;
2222
import org.slf4j.LoggerFactory;
2323

24-
import org.springframework.ai.chat.memory.cassandra.CassandraChatMemoryRepositoryConfig;
24+
import org.springframework.ai.chat.memory.repository.cassandra.CassandraChatMemoryRepositoryConfig;
2525
import org.springframework.boot.context.properties.ConfigurationProperties;
2626
import org.springframework.lang.Nullable;
2727

auto-configurations/models/chat/memory/repository/spring-ai-autoconfigure-model-chat-memory-repository-cassandra/src/test/java/org/springframework/ai/model/chat/memory/repository/cassandra/autoconfigure/CassandraChatMemoryRepositoryAutoConfigurationIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.testcontainers.junit.jupiter.Testcontainers;
2727
import org.testcontainers.utility.DockerImageName;
2828

29-
import org.springframework.ai.chat.memory.cassandra.CassandraChatMemoryRepository;
29+
import org.springframework.ai.chat.memory.repository.cassandra.CassandraChatMemoryRepository;
3030
import org.springframework.ai.chat.messages.AssistantMessage;
3131
import org.springframework.ai.chat.messages.MessageType;
3232
import org.springframework.ai.chat.messages.UserMessage;

auto-configurations/models/chat/memory/repository/spring-ai-autoconfigure-model-chat-memory-repository-cassandra/src/test/java/org/springframework/ai/model/chat/memory/repository/cassandra/autoconfigure/CassandraChatMemoryRepositoryPropertiesTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import org.junit.jupiter.api.Test;
2222

23-
import org.springframework.ai.chat.memory.cassandra.CassandraChatMemoryRepositoryConfig;
23+
import org.springframework.ai.chat.memory.repository.cassandra.CassandraChatMemoryRepositoryConfig;
2424

2525
import static org.assertj.core.api.Assertions.assertThat;
2626

auto-configurations/models/chat/memory/repository/spring-ai-autoconfigure-model-chat-memory-repository-jdbc/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
<dependency>
2727
<groupId>org.springframework.ai</groupId>
28-
<artifactId>spring-ai-model-chat-memory-jdbc</artifactId>
28+
<artifactId>spring-ai-model-chat-memory-repository-jdbc</artifactId>
2929
<version>${project.parent.version}</version>
3030
</dependency>
3131

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,8 @@
1818

1919
import javax.sql.DataSource;
2020

21-
import org.slf4j.Logger;
22-
import org.slf4j.LoggerFactory;
23-
24-
import org.springframework.ai.chat.memory.jdbc.JdbcChatMemoryDialect;
25-
import org.springframework.ai.chat.memory.jdbc.JdbcChatMemoryRepository;
21+
import org.springframework.ai.chat.memory.repository.jdbc.JdbcChatMemoryDialect;
22+
import org.springframework.ai.chat.memory.repository.jdbc.JdbcChatMemoryRepository;
2623
import org.springframework.ai.model.chat.memory.autoconfigure.ChatMemoryAutoConfiguration;
2724
import org.springframework.boot.autoconfigure.AutoConfiguration;
2825
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;

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/JdbcChatMemoryRepositoryProperties.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ public class JdbcChatMemoryRepositoryProperties {
3636

3737
/**
3838
* Locations of schema (DDL) scripts. Supports comma-separated list. Default is
39-
* classpath:org/springframework/ai/chat/memory/jdbc/schema-@@platform@@.sql
39+
* classpath:org/springframework/ai/chat/memory/repository/jdbc/schema-@@platform@@.sql
4040
*/
41-
private String schema = "classpath:org/springframework/ai/chat/memory/jdbc/schema-@@platform@@.sql";
41+
private String schema = "classpath:org/springframework/ai/chat/memory/repository/jdbc/schema-@@platform@@.sql";
4242

4343
public DatabaseInitializationMode getInitializeSchema() {
4444
return this.initializeSchema;

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/JdbcChatMemoryRepositorySchemaInitializer.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
*/
3535
class JdbcChatMemoryRepositorySchemaInitializer extends DataSourceScriptDatabaseInitializer {
3636

37-
private static final String DEFAULT_SCHEMA_LOCATION = "classpath:org/springframework/ai/chat/memory/jdbc/schema-@@platform@@.sql";
37+
private static final String DEFAULT_SCHEMA_LOCATION = "classpath:org/springframework/ai/chat/memory/repository/jdbc/schema-@@platform@@.sql";
3838

3939
JdbcChatMemoryRepositorySchemaInitializer(DataSource dataSource, JdbcChatMemoryRepositoryProperties properties) {
4040
super(dataSource, getSettings(dataSource, properties));
@@ -51,7 +51,8 @@ static DatabaseInitializationSettings getSettings(DataSource dataSource,
5151
try {
5252
String url = dataSource.getConnection().getMetaData().getURL().toLowerCase();
5353
if (url.contains("hsqldb")) {
54-
schemaLocations = List.of("classpath:org/springframework/ai/chat/memory/jdbc/schema-hsqldb.sql");
54+
schemaLocations = List
55+
.of("classpath:org/springframework/ai/chat/memory/repository/jdbc/schema-hsqldb.sql");
5556
}
5657
else if (StringUtils.hasText(schemaProp)) {
5758
schemaLocations = resolver.resolveAll(dataSource, schemaProp);

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/JdbcChatMemoryHsqldbAutoConfigurationIT.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.junit.Test;
2323
import org.junit.runner.RunWith;
2424

25+
import org.springframework.ai.chat.memory.repository.jdbc.JdbcChatMemoryRepository;
2526
import org.springframework.ai.chat.messages.AssistantMessage;
2627
import org.springframework.ai.chat.messages.Message;
2728
import org.springframework.ai.chat.messages.UserMessage;
@@ -130,7 +131,7 @@ public void useAutoConfiguredChatMemoryWithJdbc() {
130131
try {
131132
java.util.Enumeration<java.net.URL> resources = Thread.currentThread()
132133
.getContextClassLoader()
133-
.getResources("org/springframework/ai/chat/memory/jdbc/schema-hsqldb.sql");
134+
.getResources("org/springframework/ai/chat/memory/repository/jdbc/schema-hsqldb.sql");
134135
System.out.println("--- schema-hsqldb.sql resources found on classpath ---");
135136
while (resources.hasMoreElements()) {
136137
System.out.println(resources.nextElement());
@@ -157,7 +158,7 @@ public void useAutoConfiguredChatMemoryWithJdbc() {
157158

158159
// Now test the ChatMemory functionality
159160
assertThat(context.getBean(org.springframework.ai.chat.memory.ChatMemory.class)).isNotNull();
160-
assertThat(context.getBean(org.springframework.ai.chat.memory.jdbc.JdbcChatMemoryRepository.class)).isNotNull();
161+
assertThat(context.getBean(JdbcChatMemoryRepository.class)).isNotNull();
161162

162163
var chatMemory = context.getBean(org.springframework.ai.chat.memory.ChatMemory.class);
163164
var conversationId = java.util.UUID.randomUUID().toString();

0 commit comments

Comments
 (0)