Skip to content

JdbcChatMemoryRepository should use the provided JdbcTemplate #3201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
+29 −10
Closed

JdbcChatMemoryRepository should use the provided JdbcTemplate #3201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 17 additions & 10 deletions ...ain/java/org/springframework/ai/chat/memory/repository/jdbc/JdbcChatMemoryRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,6 @@
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
import org.springframework.lang.Nullable;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.TransactionException;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.AbstractPlatformTransactionManager;
import org.springframework.transaction.support.DefaultTransactionStatus;
import org.springframework.transaction.support.TransactionTemplate;
import org.springframework.util.Assert;
import org.slf4j.Logger;
Expand All @@ -54,6 +49,7 @@
* @author Thomas Vitale
* @author Linar Abzaltdinov
* @author Mark Pollack
* @author Yanming Zhou
* @since 1.0.0
*/
public class JdbcChatMemoryRepository implements ChatMemoryRepository {
Expand All @@ -66,14 +62,14 @@ public class JdbcChatMemoryRepository implements ChatMemoryRepository {

private static final Logger logger = LoggerFactory.getLogger(JdbcChatMemoryRepository.class);

private JdbcChatMemoryRepository(DataSource dataSource, JdbcChatMemoryRepositoryDialect dialect,
private JdbcChatMemoryRepository(JdbcTemplate jdbcTemplate, JdbcChatMemoryRepositoryDialect dialect,
PlatformTransactionManager txManager) {
Assert.notNull(dataSource, "dataSource cannot be null");
Assert.notNull(jdbcTemplate, "jdbcTemplate cannot be null");
Assert.notNull(dialect, "dialect cannot be null");
this.jdbcTemplate = new JdbcTemplate(dataSource);
this.jdbcTemplate = jdbcTemplate;
this.dialect = dialect;
this.transactionTemplate = new TransactionTemplate(
txManager != null ? txManager : new DataSourceTransactionManager(dataSource));
txManager != null ? txManager : new DataSourceTransactionManager(jdbcTemplate.getDataSource()));
}

@Override
Expand Down Expand Up @@ -200,7 +196,18 @@ public Builder transactionManager(PlatformTransactionManager txManager) {
public JdbcChatMemoryRepository build() {
DataSource effectiveDataSource = resolveDataSource();
JdbcChatMemoryRepositoryDialect effectiveDialect = resolveDialect(effectiveDataSource);
return new JdbcChatMemoryRepository(effectiveDataSource, effectiveDialect, this.platformTransactionManager);
return new JdbcChatMemoryRepository(resolveJdbcTemplate(), effectiveDialect,
this.platformTransactionManager);
}

private JdbcTemplate resolveJdbcTemplate() {
if (this.jdbcTemplate != null) {
return this.jdbcTemplate;
}
if (this.dataSource != null) {
return new JdbcTemplate(this.dataSource);
}
throw new IllegalArgumentException("DataSource must be set (either via dataSource() or jdbcTemplate())");
}

private DataSource resolveDataSource() {
Expand Down
12 changes: 12 additions & 0 deletions .../springframework/ai/chat/memory/repository/jdbc/JdbcChatMemoryRepositoryBuilderTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

import org.junit.jupiter.api.Test;

import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.transaction.PlatformTransactionManager;

import static org.assertj.core.api.Assertions.assertThat;
Expand All @@ -34,6 +35,7 @@
* Tests for {@link JdbcChatMemoryRepository.Builder}.
*
* @author Mark Pollack
* @author Yanming Zhou
*/
public class JdbcChatMemoryRepositoryBuilderTests {

Expand Down Expand Up @@ -223,4 +225,14 @@ void testBuilderPreferenceForExplicitDialect() throws SQLException {
// for this)
}

@Test
void repositoryShouldUseProvidedJdbcTemplate() throws SQLException {
DataSource dataSource = mock(DataSource.class);
JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);

JdbcChatMemoryRepository repository = JdbcChatMemoryRepository.builder().jdbcTemplate(jdbcTemplate).build();

assertThat(repository).extracting("jdbcTemplate").isSameAs(jdbcTemplate);
}

}