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.

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

Support @ConditionalOnSingleCandidate on auto configuration of JdbcTemplate and DataSourceTransactionManager #6448 #6449

Closed

Conversation

kazuki43zoo
Copy link
Contributor

I've supported to ignore auto configuration of JdbcTemplate and DataSourceTransactionManager when detect multiple datasource. Please review #6448.

@spring-projects-issues spring-projects-issues added the status: waiting-for-triage An issue we've not yet triaged label Jul 24, 2016
@philwebb philwebb removed the status: waiting-for-triage An issue we've not yet triaged label Jul 25, 2016
@philwebb philwebb added this to the 1.4.0 milestone Jul 25, 2016
@philwebb philwebb self-assigned this Jul 25, 2016
philwebb pushed a commit that referenced this pull request Jul 26, 2016
Update auto-configuration logic so that a `DataSourceTransactionManager`
is only added when there is a single candidate DataSource bean.

See gh-6449
@philwebb philwebb closed this in 5ecb68b Jul 26, 2016
philwebb added a commit that referenced this pull request Jul 26, 2016
* multi-datasource:
  Add JdbcTemplate only on single DataSource
  Add TransactionManager only on single DataSource
@philwebb
Copy link
Member

Thanks! I've split changes into two distinct commits and made a few minor tweaks.

@kazuki43zoo
Copy link
Contributor Author

@philwebb thanks for polishing and merging !!

@kazuki43zoo kazuki43zoo deleted the multi-datasource branch July 26, 2016 00:08
kazuki43zoo added a commit to kazuki43zoo/spring-boot that referenced this pull request Aug 4, 2016
Update auto-configuration logic so that JPA components
are only added when there is a single candidate DataSource bean.
Related with spring-projectsgh-6449
kazuki43zoo added a commit to kazuki43zoo/spring-boot that referenced this pull request Aug 4, 2016
Update auto-configuration logic so that JPA components
are only added when there is a single candidate DataSource bean.
Related with spring-projectsgh-6449
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants