Skip to content

DATAJDBC-288 - Make JdbcConfiguration methods public. #100

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

DATAJDBC-288 - Make JdbcConfiguration methods public. #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb97a13
DATAJDBC-288 - Prepare branch
gregturn Nov 2, 2018
b0579cb
DATAJDBC-288 - Make JdbcConfiguration methods public.
gregturn Nov 2, 2018
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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>org.springframework.data</groupId>
<artifactId>spring-data-relational-parent</artifactId>
<version>1.1.0.BUILD-SNAPSHOT</version>
<version>1.1.0.DATAJDBC-288-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Spring Data Relational Parent</name>
Expand Down
4 changes: 2 additions & 2 deletions spring-data-jdbc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>spring-data-jdbc</artifactId>
<version>1.1.0.BUILD-SNAPSHOT</version>
<version>1.1.0.DATAJDBC-288-SNAPSHOT</version>

<name>Spring Data JDBC</name>
<description>Spring Data module for JDBC repositories.</description>
Expand All @@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-relational-parent</artifactId>
<version>1.1.0.BUILD-SNAPSHOT</version>
<version>1.1.0.DATAJDBC-288-SNAPSHOT</version>
</parent>

<properties>
Expand Down
10 changes: 5 additions & 5 deletions ...jdbc/src/main/java/org/springframework/data/jdbc/repository/config/JdbcConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
*/
package org.springframework.data.jdbc.repository.config;

import java.util.Optional;

import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.convert.converter.Converter;
Expand All @@ -27,6 +25,8 @@
import org.springframework.data.relational.core.mapping.NamingStrategy;
import org.springframework.data.relational.core.mapping.RelationalMappingContext;

import java.util.Optional;

/**
* Beans that must be registered for Spring Data JDBC to work.
*
Expand All @@ -46,7 +46,7 @@ public class JdbcConfiguration {
* @return must not be {@literal null}.
*/
@Bean
protected JdbcMappingContext jdbcMappingContext(Optional<NamingStrategy> namingStrategy) {
public JdbcMappingContext jdbcMappingContext(Optional<NamingStrategy> namingStrategy) {

JdbcMappingContext mappingContext = new JdbcMappingContext(namingStrategy.orElse(NamingStrategy.INSTANCE));
mappingContext.setSimpleTypeHolder(jdbcCustomConversions().getSimpleTypeHolder());
Expand All @@ -63,7 +63,7 @@ protected JdbcMappingContext jdbcMappingContext(Optional<NamingStrategy> namingS
* @return must not be {@literal null}.
*/
@Bean
protected RelationalConverter relationalConverter(RelationalMappingContext mappingContext) {
public RelationalConverter relationalConverter(RelationalMappingContext mappingContext) {
return new BasicJdbcConverter(mappingContext, jdbcCustomConversions());
}

Expand All @@ -75,7 +75,7 @@ protected RelationalConverter relationalConverter(RelationalMappingContext mappi
* @return must not be {@literal null}.
*/
@Bean
protected JdbcCustomConversions jdbcCustomConversions() {
public JdbcCustomConversions jdbcCustomConversions() {
return new JdbcCustomConversions();
}
}
4 changes: 2 additions & 2 deletions spring-data-relational/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>spring-data-relational</artifactId>
<version>1.1.0.BUILD-SNAPSHOT</version>
<version>1.1.0.DATAJDBC-288-SNAPSHOT</version>

<name>Spring Data Relational</name>
<description>Spring Data Relational support</description>

<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-relational-parent</artifactId>
<version>1.1.0.BUILD-SNAPSHOT</version>
<version>1.1.0.DATAJDBC-288-SNAPSHOT</version>
</parent>

<properties>
Expand Down