Skip to content

Commit 9fc83c5

Browse files
committed
Create spring-boot-jdbc module
1 parent 937ec2f commit 9fc83c5

File tree

221 files changed

+462
-545
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

221 files changed

+462
-545
lines changed

settings.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ include "spring-boot-project:spring-boot-devtools"
5252
include "spring-boot-project:spring-boot-docker-compose"
5353
include "spring-boot-project:spring-boot-docs"
5454
include "spring-boot-project:spring-boot-jackson"
55+
include "spring-boot-project:spring-boot-jdbc"
5556
include "spring-boot-project:spring-boot-jetty"
5657
include "spring-boot-project:spring-boot-jms"
5758
include "spring-boot-project:spring-boot-jsonb"

spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ dependencies {
2121
optional(project(":spring-boot-project:spring-boot-amqp"))
2222
optional(project(":spring-boot-project:spring-boot-artemis"))
2323
optional(project(":spring-boot-project:spring-boot-jackson"))
24+
optional(project(":spring-boot-project:spring-boot-jdbc"))
2425
optional(project(":spring-boot-project:spring-boot-jetty"))
2526
optional(project(":spring-boot-project:spring-boot-jsonb"))
2627
optional(project(":spring-boot-project:spring-boot-mail"))

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/jdbc/DataSourceHealthContributorAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
4141
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
4242
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
43-
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
4443
import org.springframework.boot.context.properties.EnableConfigurationProperties;
44+
import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
4545
import org.springframework.boot.jdbc.metadata.CompositeDataSourcePoolMetadataProvider;
4646
import org.springframework.boot.jdbc.metadata.DataSourcePoolMetadata;
4747
import org.springframework.boot.jdbc.metadata.DataSourcePoolMetadataProvider;

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/jdbc/DataSourcePoolMetricsAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
4242
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
4343
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
44-
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
4544
import org.springframework.boot.jdbc.DataSourceUnwrapper;
45+
import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
4646
import org.springframework.boot.jdbc.metadata.DataSourcePoolMetadataProvider;
4747
import org.springframework.context.annotation.Bean;
4848
import org.springframework.context.annotation.Configuration;

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/health/HealthEndpointDocumentationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
import org.springframework.boot.actuate.jdbc.DataSourceHealthIndicator;
4646
import org.springframework.boot.actuate.system.DiskSpaceHealthIndicator;
4747
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
48-
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
48+
import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
4949
import org.springframework.context.annotation.Bean;
5050
import org.springframework.context.annotation.Configuration;
5151
import org.springframework.http.MediaType;

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/jdbc/DataSourceHealthContributorAutoConfigurationTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@
3535
import org.springframework.boot.actuate.health.NamedContributor;
3636
import org.springframework.boot.actuate.jdbc.DataSourceHealthIndicator;
3737
import org.springframework.boot.autoconfigure.AutoConfigurations;
38-
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
39-
import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration;
40-
import org.springframework.boot.autoconfigure.jdbc.metadata.DataSourcePoolMetadataProvidersConfiguration;
4138
import org.springframework.boot.context.properties.ConfigurationProperties;
4239
import org.springframework.boot.context.properties.EnableConfigurationProperties;
4340
import org.springframework.boot.jdbc.DataSourceBuilder;
41+
import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
42+
import org.springframework.boot.jdbc.autoconfigure.EmbeddedDataSourceConfiguration;
43+
import org.springframework.boot.jdbc.metadata.autoconfigure.DataSourcePoolMetadataProvidersConfiguration;
4444
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
4545
import org.springframework.context.annotation.Bean;
4646
import org.springframework.context.annotation.Configuration;

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/liquibase/LiquibaseEndpointDocumentationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323

2424
import org.springframework.boot.actuate.autoconfigure.endpoint.web.documentation.MockMvcEndpointDocumentationTests;
2525
import org.springframework.boot.actuate.liquibase.LiquibaseEndpoint;
26-
import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration;
2726
import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration;
27+
import org.springframework.boot.jdbc.autoconfigure.EmbeddedDataSourceConfiguration;
2828
import org.springframework.context.ApplicationContext;
2929
import org.springframework.context.annotation.Bean;
3030
import org.springframework.context.annotation.Configuration;

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/data/RepositoryMetricsAutoConfigurationIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
import org.springframework.boot.autoconfigure.AutoConfigurations;
2828
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
2929
import org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration;
30-
import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration;
3130
import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
31+
import org.springframework.boot.jdbc.autoconfigure.EmbeddedDataSourceConfiguration;
3232
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
3333
import org.springframework.context.annotation.Bean;
3434
import org.springframework.context.annotation.Configuration;

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/jdbc/DataSourcePoolMetricsAutoConfigurationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
import org.springframework.boot.LazyInitializationBeanFactoryPostProcessor;
3434
import org.springframework.boot.actuate.autoconfigure.metrics.test.MetricsRun;
3535
import org.springframework.boot.autoconfigure.AutoConfigurations;
36-
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
37-
import org.springframework.boot.autoconfigure.jdbc.DataSourceInitializationAutoConfiguration;
3836
import org.springframework.boot.jdbc.DataSourceBuilder;
37+
import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
38+
import org.springframework.boot.jdbc.autoconfigure.DataSourceInitializationAutoConfiguration;
3939
import org.springframework.boot.jdbc.metadata.DataSourcePoolMetadataProvider;
4040
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
4141
import org.springframework.context.annotation.Bean;

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/orm/jpa/HibernateMetricsAutoConfigurationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434

3535
import org.springframework.boot.actuate.autoconfigure.metrics.test.MetricsRun;
3636
import org.springframework.boot.autoconfigure.AutoConfigurations;
37-
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
38-
import org.springframework.boot.autoconfigure.jdbc.DataSourceInitializationAutoConfiguration;
3937
import org.springframework.boot.autoconfigure.orm.jpa.EntityManagerFactoryBuilderCustomizer;
4038
import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
39+
import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
40+
import org.springframework.boot.jdbc.autoconfigure.DataSourceInitializationAutoConfiguration;
4141
import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
4242
import org.springframework.boot.test.context.FilteredClassLoader;
4343
import org.springframework.boot.test.context.runner.ApplicationContextRunner;

0 commit comments

Comments
 (0)