diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcDataProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcDataProperties.java deleted file mode 100644 index 25b93c7368..0000000000 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcDataProperties.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2024 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.boot.autoconfigure.data.jdbc; - -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.data.relational.core.dialect.Dialect; - -/** - * Configuration properties for Spring Data JDBC. - * - * @author Jens Schauder - * @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. - */ - private Class dialect; - - public Class getDialect() { - return this.dialect; - } - - public void setDialect(Class dialect) { - this.dialect = dialect; - } - -} diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfiguration.java index 760d338b17..b17bd3bf40 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfiguration.java @@ -19,7 +19,6 @@ package org.springframework.boot.autoconfigure.data.jdbc; import java.util.Optional; import java.util.Set; -import org.springframework.beans.BeanUtils; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; @@ -29,7 +28,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.domain.EntityScanner; import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration; import org.springframework.boot.autoconfigure.jdbc.JdbcTemplateAutoConfiguration; -import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -61,7 +59,6 @@ import org.springframework.transaction.PlatformTransactionManager; * @author Andy Wilkinson * @author Stephane Nicoll * @author Mark Paluch - * @author Jens Schauder * @since 2.1.0 * @see EnableJdbcRepositories */ @@ -70,7 +67,6 @@ import org.springframework.transaction.PlatformTransactionManager; @ConditionalOnClass({ NamedParameterJdbcOperations.class, AbstractJdbcConfiguration.class }) @ConditionalOnProperty(prefix = "spring.data.jdbc.repositories", name = "enabled", havingValue = "true", matchIfMissing = true) -@EnableConfigurationProperties(JdbcDataProperties.class) public class JdbcRepositoriesAutoConfiguration { @Configuration(proxyBeanMethods = false) @@ -86,11 +82,8 @@ public class JdbcRepositoriesAutoConfiguration { private final ApplicationContext applicationContext; - private final JdbcDataProperties properties; - - SpringBootJdbcConfiguration(ApplicationContext applicationContext, JdbcDataProperties properties) { + SpringBootJdbcConfiguration(ApplicationContext applicationContext) { this.applicationContext = applicationContext; - this.properties = properties; } @Override @@ -148,9 +141,6 @@ public class JdbcRepositoriesAutoConfiguration { @Bean @ConditionalOnMissingBean public Dialect jdbcDialect(NamedParameterJdbcOperations operations) { - if (this.properties.getDialect() != null) { - return BeanUtils.instantiateClass(this.properties.getDialect(), Dialect.class); - } return super.jdbcDialect(operations); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfigurationTests.java index ad37e9df5f..064d5d34c5 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfigurationTests.java @@ -40,7 +40,6 @@ import org.springframework.data.jdbc.core.JdbcAggregateTemplate; import org.springframework.data.jdbc.core.convert.DataAccessStrategy; import org.springframework.data.jdbc.core.convert.JdbcConverter; import org.springframework.data.jdbc.core.convert.JdbcCustomConversions; -import org.springframework.data.jdbc.core.dialect.JdbcPostgresDialect; import org.springframework.data.jdbc.core.mapping.JdbcMappingContext; import org.springframework.data.jdbc.repository.config.AbstractJdbcConfiguration; import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories; @@ -59,7 +58,6 @@ import static org.mockito.Mockito.mock; * @author Andy Wilkinson * @author Stephane Nicoll * @author Mark Paluch - * @author Jens Schauder */ class JdbcRepositoriesAutoConfigurationTests { @@ -183,16 +181,6 @@ class JdbcRepositoriesAutoConfigurationTests { allowsUserToDefineCustomBean(DialectConfiguration.class, Dialect.class, "customDialect"); } - @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)); - } - private void allowsUserToDefineCustomBean(Class configuration, Class beanType, String beanName) { this.contextRunner.with(database()) .withConfiguration(AutoConfigurations.of(JdbcTemplateAutoConfiguration.class,