Skip to content
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

feat: allow Spanner and Datastore Transaction Manager in same project #1412

Merged
merged 7 commits into from
May 20, 2023
Merged

feat: allow Spanner and Datastore Transaction Manager in same project #1412

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4b56b5f
Changes conditional for Spanner and Datastore Transaction Manager
bijukunjummen Dec 24, 2022
102c748
merge main
JoeWang1127 May 1, 2023
1dd15bf
Adds information about disambiguating the right transaction manager bean
bijukunjummen May 3, 2023
0b13809
Adds in sample to demonstrate using the relevant transaction managers
bijukunjummen May 9, 2023
3fdb5ea
Fixes license header
bijukunjummen May 10, 2023
da4a86a
Adds readme about transactions with multi-module
bijukunjummen May 10, 2023
68ba8b5
fix: rewording on doc additions.
zhumin8 May 19, 2023
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
3 changes: 1 addition & 2 deletions ...le/cloud/spring/autoconfigure/datastore/DatastoreTransactionManagerAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import org.springframework.boot.autoconfigure.transaction.TransactionManagerCustomizers;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.transaction.PlatformTransactionManager;

/**
* Auto-configuration for {@link DatastoreTransactionManager}.
Expand Down Expand Up @@ -55,7 +54,7 @@ static class DatastoreTransactionManagerConfiguration {
}

@Bean
@ConditionalOnMissingBean(PlatformTransactionManager.class)
@ConditionalOnMissingBean
public DatastoreTransactionManager datastoreTransactionManager() {
DatastoreTransactionManager transactionManager =
new DatastoreTransactionManager(this.datastore);
Expand Down
3 changes: 1 addition & 2 deletions ...google/cloud/spring/autoconfigure/spanner/SpannerTransactionManagerAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import org.springframework.boot.autoconfigure.transaction.TransactionManagerCustomizers;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.transaction.PlatformTransactionManager;

/**
* Auto-configuration for {@link SpannerTransactionManager}.
Expand Down Expand Up @@ -57,7 +56,7 @@ static class DatabaseClientTransactionManagerConfiguration {
}

@Bean
@ConditionalOnMissingBean(PlatformTransactionManager.class)
@ConditionalOnMissingBean
public SpannerTransactionManager spannerTransactionManager() {
SpannerTransactionManager transactionManager =
new SpannerTransactionManager(this.databaseClientProvider);
Expand Down