Skip to content

Allow using JDBC and R2DBC repositories in a single application #1143

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 9 commits into from
Closed

Allow using JDBC and R2DBC repositories in a single application #1143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c5df8f3
Prepare 2.4 M1 (2021.2.0).
christophstrobl Jan 14, 2022
38a8089
Release version 2.4 M1 (2021.2.0).
christophstrobl Jan 14, 2022
51ffa1c
Prepare next development iteration.
christophstrobl Jan 14, 2022
cb5e327
After release cleanups.
christophstrobl Jan 14, 2022
d879f21
Prepare 2.4 M2 (2021.2.0).
christophstrobl Jan 18, 2022
76ece50
Release version 2.4 M2 (2021.2.0).
christophstrobl Jan 18, 2022
dce0e36
Prepare next development iteration.
christophstrobl Jan 18, 2022
eee773e
After release cleanups.
christophstrobl Jan 18, 2022
fa86ba8
chore: qualify jdbcMappingContext for expected behaviour when using r…
Jan 26, 2022
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: 2 additions & 1 deletion ...main/java/org/springframework/data/jdbc/repository/support/JdbcRepositoryFactoryBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.ApplicationEventPublisherAware;
import org.springframework.data.jdbc.core.convert.DataAccessStrategy;
Expand Down Expand Up @@ -96,7 +97,7 @@ protected RepositoryFactorySupport doCreateRepositoryFactory() {
}

@Autowired
public void setMappingContext(RelationalMappingContext mappingContext) {
public void setMappingContext(@Qualifier("jdbcMappingContext") RelationalMappingContext mappingContext) {

Assert.notNull(mappingContext, "MappingContext must not be null");

Expand Down
4 changes: 3 additions & 1 deletion src/main/resources/notice.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Spring Data JDBC 2.3 GA (2021.1.0)
Spring Data JDBC 2.4 M2 (2021.2.0)
Copyright (c) [2017-2019] Pivotal Software, Inc.

This product is licensed to you under the Apache License, Version 2.0 (the "License").
Expand Down Expand Up @@ -29,6 +29,8 @@ conditions of the subcomponent's license, as noted in the LICENSE file.