From fd8a8c9cf9253223eec24d0e7505a4fa1dd1c029 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Thu, 14 Mar 2024 10:06:04 +0100 Subject: [PATCH 1/5] Add property spring.data.jdbc.dialect The class valued property allows to configure a dialect, without relying on a database connection to determine it. --- .../data/jdbc/JdbcDataProperties.java | 44 +++++++++++++++++++ .../JdbcRepositoriesAutoConfiguration.java | 21 ++++++++- ...dbcRepositoriesAutoConfigurationTests.java | 14 ++++++ 3 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcDataProperties.java 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 new file mode 100644 index 000000000000..568265f784e2 --- /dev/null +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcDataProperties.java @@ -0,0 +1,44 @@ +/* + * 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 + */ +@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 b17bd3bf40f1..8d11e3d2bb58 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 @@ -16,9 +16,11 @@ 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.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; @@ -28,6 +30,7 @@ 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; @@ -59,6 +62,7 @@ * @author Andy Wilkinson * @author Stephane Nicoll * @author Mark Paluch + * @author Jens Schauder * @since 2.1.0 * @see EnableJdbcRepositories */ @@ -67,6 +71,7 @@ @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) @@ -82,8 +87,11 @@ static class SpringBootJdbcConfiguration extends AbstractJdbcConfiguration { private final ApplicationContext applicationContext; - SpringBootJdbcConfiguration(ApplicationContext applicationContext) { + private final JdbcDataProperties properties; + + SpringBootJdbcConfiguration(ApplicationContext applicationContext, JdbcDataProperties properties) { this.applicationContext = applicationContext; + this.properties = properties; } @Override @@ -141,6 +149,17 @@ public DataAccessStrategy dataAccessStrategyBean(NamedParameterJdbcOperations op @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); + } + } 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 064d5d34c5aa..b798f3421a63 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,6 +40,7 @@ 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; @@ -58,6 +59,7 @@ * @author Andy Wilkinson * @author Stephane Nicoll * @author Mark Paluch + * @author Jens Schauder */ class JdbcRepositoriesAutoConfigurationTests { @@ -181,6 +183,18 @@ void allowsUserToDefineCustomDialect() { 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, From fb896a87214e33d1ec2080707eb296ffa5c99b34 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Mon, 18 Mar 2024 14:32:38 +0100 Subject: [PATCH 2/5] Move to enum representation of dialect values. --- .../data/jdbc/JdbcDataProperties.java | 7 +- .../data/jdbc/JdbcDatabaseDialect.java | 89 +++++++++++++++++++ .../JdbcRepositoriesAutoConfiguration.java | 13 +-- ...dbcRepositoriesAutoConfigurationTests.java | 2 +- 4 files changed, 96 insertions(+), 15 deletions(-) create mode 100644 spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcDatabaseDialect.java 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 index 568265f784e2..ad84b9336bf6 100644 --- 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 @@ -31,14 +31,13 @@ public class JdbcDataProperties { /** * Dialect to use. By default, the dialect is determined by inspecting the database connection. */ - private Class dialect; + private JdbcDatabaseDialect dialect; - public Class getDialect() { + public JdbcDatabaseDialect getDialect() { return this.dialect; } - public void setDialect(Class dialect) { + public void setDialect(JdbcDatabaseDialect dialect) { this.dialect = dialect; } - } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcDatabaseDialect.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcDatabaseDialect.java new file mode 100644 index 000000000000..fc4f48a542e2 --- /dev/null +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcDatabaseDialect.java @@ -0,0 +1,89 @@ +/* + * Copyright 2012-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 java.util.function.Supplier; + +import org.springframework.data.jdbc.core.dialect.JdbcDb2Dialect; +import org.springframework.data.jdbc.core.dialect.JdbcMySqlDialect; +import org.springframework.data.jdbc.core.dialect.JdbcPostgresDialect; +import org.springframework.data.jdbc.core.dialect.JdbcSqlServerDialect; +import org.springframework.data.relational.core.dialect.Db2Dialect; +import org.springframework.data.relational.core.dialect.Dialect; +import org.springframework.data.relational.core.dialect.H2Dialect; +import org.springframework.data.relational.core.dialect.HsqlDbDialect; +import org.springframework.data.relational.core.dialect.MariaDbDialect; +import org.springframework.data.relational.core.dialect.OracleDialect; + +/** + * List of database dialects that can be configured in Boot for use with Spring Data JDBC. + * + * @author Jens Schauder + * @since 3.3 + */ +public enum JdbcDatabaseDialect implements Supplier { + + DB2 { + @Override + public Dialect get() { + return JdbcDb2Dialect.INSTANCE; + } + }, + H2{ + @Override + public Dialect get() { + return H2Dialect.INSTANCE; + } + }, + HSQL{ + @Override + public Dialect get() { + return HsqlDbDialect.INSTANCE; + } + }, + MARIA{ + @Override + public Dialect get() { + return MariaDbDialect.INSTANCE; + } + }, + MYSQL{ + @Override + public Dialect get() { + return JdbcMySqlDialect.INSTANCE; + } + }, + ORACLE{ + @Override + public Dialect get() { + return OracleDialect.INSTANCE; + + } + }, + POSTGRESQL{ + @Override + public Dialect get() { + return JdbcPostgresDialect.INSTANCE; + } + }, + SQL_SERVER{ + @Override + public Dialect get() { + return JdbcSqlServerDialect.INSTANCE; + } + } +} 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 8d11e3d2bb58..3d9a8cc50462 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 @@ -149,16 +149,9 @@ public DataAccessStrategy dataAccessStrategyBean(NamedParameterJdbcOperations op @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); - } + JdbcDatabaseDialect dialectEnum = this.properties.getDialect(); + if (dialectEnum != null) { + return dialectEnum.get(); } 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 b798f3421a63..a84291bd9607 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 @@ -186,7 +186,7 @@ void allowsUserToDefineCustomDialect() { @Test void allowsConfigurationOfDialectByProperty() { this.contextRunner.with(database()) - .withPropertyValues("spring.data.jdbc.dialect:" + JdbcPostgresDialect.class.getName()) + .withPropertyValues("spring.data.jdbc.dialect=postgresql" ) .withConfiguration(AutoConfigurations.of(JdbcTemplateAutoConfiguration.class, DataSourceTransactionManagerAutoConfiguration.class)) .withUserConfiguration(TestConfiguration.class) From 40d90aa1315982b693563d987ddf5ac600484e51 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Tue, 19 Mar 2024 08:32:47 +0100 Subject: [PATCH 3/5] Formatting applied. --- .../data/jdbc/JdbcDataProperties.java | 4 +++- .../data/jdbc/JdbcDatabaseDialect.java | 15 ++++++++------- .../JdbcRepositoriesAutoConfigurationTests.java | 14 +++++++------- 3 files changed, 18 insertions(+), 15 deletions(-) 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 index ad84b9336bf6..f9efba5b179e 100644 --- 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 @@ -29,7 +29,8 @@ 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 JdbcDatabaseDialect dialect; @@ -40,4 +41,5 @@ public JdbcDatabaseDialect getDialect() { public void setDialect(JdbcDatabaseDialect dialect) { this.dialect = dialect; } + } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcDatabaseDialect.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcDatabaseDialect.java index fc4f48a542e2..fc356b480f74 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcDatabaseDialect.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcDatabaseDialect.java @@ -43,47 +43,48 @@ public Dialect get() { return JdbcDb2Dialect.INSTANCE; } }, - H2{ + H2 { @Override public Dialect get() { return H2Dialect.INSTANCE; } }, - HSQL{ + HSQL { @Override public Dialect get() { return HsqlDbDialect.INSTANCE; } }, - MARIA{ + MARIA { @Override public Dialect get() { return MariaDbDialect.INSTANCE; } }, - MYSQL{ + MYSQL { @Override public Dialect get() { return JdbcMySqlDialect.INSTANCE; } }, - ORACLE{ + ORACLE { @Override public Dialect get() { return OracleDialect.INSTANCE; } }, - POSTGRESQL{ + POSTGRESQL { @Override public Dialect get() { return JdbcPostgresDialect.INSTANCE; } }, - SQL_SERVER{ + SQL_SERVER { @Override public Dialect get() { return JdbcSqlServerDialect.INSTANCE; } } + } 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 a84291bd9607..c7d477b49078 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 @@ -186,13 +186,13 @@ void allowsUserToDefineCustomDialect() { @Test void allowsConfigurationOfDialectByProperty() { this.contextRunner.with(database()) - .withPropertyValues("spring.data.jdbc.dialect=postgresql" ) - .withConfiguration(AutoConfigurations.of(JdbcTemplateAutoConfiguration.class, - DataSourceTransactionManagerAutoConfiguration.class)) - .withUserConfiguration(TestConfiguration.class) - .run((context) -> { - assertThat(context).hasSingleBean(JdbcPostgresDialect.class); - }); + .withPropertyValues("spring.data.jdbc.dialect=postgresql") + .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) { From 04f370770cede1d5bd8bcac1d1d113c3da9914e7 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Tue, 19 Mar 2024 10:58:28 +0100 Subject: [PATCH 4/5] Fix checkstyle issue. --- .../data/jdbc/JdbcRepositoriesAutoConfigurationTests.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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 c7d477b49078..27353b77961f 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 @@ -190,9 +190,7 @@ void allowsConfigurationOfDialectByProperty() { .withConfiguration(AutoConfigurations.of(JdbcTemplateAutoConfiguration.class, DataSourceTransactionManagerAutoConfiguration.class)) .withUserConfiguration(TestConfiguration.class) - .run((context) -> { - assertThat(context).hasSingleBean(JdbcPostgresDialect.class); - }); + .run((context) -> assertThat(context).hasSingleBean(JdbcPostgresDialect.class)); } private void allowsUserToDefineCustomBean(Class configuration, Class beanType, String beanName) { From f87218fc126bf33d101c03d563df17d05066d547 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Tue, 19 Mar 2024 12:21:09 +0100 Subject: [PATCH 5/5] Fix checkstyle issues. --- .../data/jdbc/JdbcDataProperties.java | 1 - .../data/jdbc/JdbcDatabaseDialect.java | 32 ++++++++++++++++++- .../JdbcRepositoriesAutoConfiguration.java | 2 -- 3 files changed, 31 insertions(+), 4 deletions(-) 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 index f9efba5b179e..4c3a5808bfa8 100644 --- 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 @@ -17,7 +17,6 @@ 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. diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcDatabaseDialect.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcDatabaseDialect.java index fc356b480f74..721914f1a9d6 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcDatabaseDialect.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcDatabaseDialect.java @@ -22,7 +22,6 @@ import org.springframework.data.jdbc.core.dialect.JdbcMySqlDialect; import org.springframework.data.jdbc.core.dialect.JdbcPostgresDialect; import org.springframework.data.jdbc.core.dialect.JdbcSqlServerDialect; -import org.springframework.data.relational.core.dialect.Db2Dialect; import org.springframework.data.relational.core.dialect.Dialect; import org.springframework.data.relational.core.dialect.H2Dialect; import org.springframework.data.relational.core.dialect.HsqlDbDialect; @@ -37,36 +36,59 @@ */ public enum JdbcDatabaseDialect implements Supplier { + /** + * Provides an instance of {@link JdbcDb2Dialect}. + */ DB2 { @Override public Dialect get() { return JdbcDb2Dialect.INSTANCE; } }, + + /** + * Provides an instance of {@link H2Dialect}. + */ H2 { @Override public Dialect get() { return H2Dialect.INSTANCE; } }, + + /** + * Provides an instance of {@link HsqlDbDialect}. + */ HSQL { @Override public Dialect get() { return HsqlDbDialect.INSTANCE; } }, + + /** + * Provides an instance of {@link MariaDbDialect}. + */ MARIA { @Override public Dialect get() { return MariaDbDialect.INSTANCE; } }, + + /** + * Provides an instance of {@link JdbcMySqlDialect}. + */ MYSQL { @Override public Dialect get() { return JdbcMySqlDialect.INSTANCE; } }, + + /** + * Provides an instance of {@link OracleDialect}. + */ ORACLE { @Override public Dialect get() { @@ -74,12 +96,20 @@ public Dialect get() { } }, + + /** + * Provides an instance of {@link JdbcPostgresDialect}. + */ POSTGRESQL { @Override public Dialect get() { return JdbcPostgresDialect.INSTANCE; } }, + + /** + * Provides an instance of {@link JdbcSqlServerDialect}. + */ SQL_SERVER { @Override public Dialect get() { 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 3d9a8cc50462..6438e20b0aaf 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 @@ -16,11 +16,9 @@ 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.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;