root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Polish "Add property spring.data.jdbc.dialect" 

See gh-39941
This commit is contained in:
Moritz Halbritter 2024-03-15 11:47:35 +01:00
parent b3ddb22f75
commit 148c5e8ed5
3 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcDataProperties.java
View File

@ -23,13 +23,14 @@ import org.springframework.data.relational.core.dialect.Dialect;
* Configuration properties for Spring Data JDBC.
*
* @author Jens Schauder
* @since 3.3
* @since 3.3.0
*/
@ConfigurationProperties(prefix = "spring.data.jdbc")
public class JdbcDataProperties {
/**
* Dialect to use. By default, the dialect is determined by inspecting the database connection.
* Dialect to use. By default, the dialect is determined by inspecting the database
* connection.
*/
private Class<? extends Dialect> dialect;

15
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfiguration.java
View File

@ -16,11 +16,10 @@
package org.springframework.boot.autoconfigure.data.jdbc;
import java.lang.reflect.InvocationTargetException;
import java.util.Optional;
import java.util.Set;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.BeanUtils;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@ -149,16 +148,8 @@ public class JdbcRepositoriesAutoConfiguration {
@Bean
@ConditionalOnMissingBean
public Dialect jdbcDialect(NamedParameterJdbcOperations operations) {
if (this.properties.getDialect() != null
) {
Class<?> dialectType = this.properties.getDialect();
try {
return (Dialect)dialectType.getDeclaredConstructor().newInstance();
}
catch (InstantiationException | IllegalAccessException |
InvocationTargetException | NoSuchMethodException e) {
throw new BeanCreationException("Couldn't create instance of type " + dialectType, e);
}
if (this.properties.getDialect() != null) {
return BeanUtils.instantiateClass(this.properties.getDialect(), Dialect.class);
}
return super.jdbcDialect(operations);
}

12
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfigurationTests.java
View File

@ -186,13 +186,11 @@ class JdbcRepositoriesAutoConfigurationTests {
@Test
void allowsConfigurationOfDialectByProperty() {
this.contextRunner.with(database())
.withPropertyValues("spring.data.jdbc.dialect:" + JdbcPostgresDialect.class.getName())
.withConfiguration(AutoConfigurations.of(JdbcTemplateAutoConfiguration.class,
DataSourceTransactionManagerAutoConfiguration.class))
.withUserConfiguration(TestConfiguration.class)
.run((context) -> {
assertThat(context).hasSingleBean(JdbcPostgresDialect.class);
});
.withPropertyValues("spring.data.jdbc.dialect:" + JdbcPostgresDialect.class.getName())
.withConfiguration(AutoConfigurations.of(JdbcTemplateAutoConfiguration.class,
DataSourceTransactionManagerAutoConfiguration.class))
.withUserConfiguration(TestConfiguration.class)
.run((context) -> assertThat(context).hasSingleBean(JdbcPostgresDialect.class));
}
private void allowsUserToDefineCustomBean(Class<?> configuration, Class<?> beanType, String beanName) {