From 2694941b9346258fdf828f43d27abac9f39e7d24 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 29 Aug 2014 14:35:20 +0200 Subject: [PATCH] Fix DataSourceMetadata location This commit complements 3dc932db8 and fix the package location of DataSourceMetadata. Fixes gh-1013 --- .../autoconfigure/MetricDataSourceAutoConfiguration.java | 4 ++-- .../boot/actuate/endpoint/DataSourcePublicMetrics.java | 7 +++---- .../autoconfigure}/jdbc/AbstractDataSourceMetadata.java | 2 +- .../autoconfigure}/jdbc/CommonsDbcpDataSourceMetadata.java | 2 +- .../jdbc/CompositeDataSourceMetadataProvider.java | 2 +- .../boot/autoconfigure}/jdbc/DataSourceMetadata.java | 2 +- .../autoconfigure}/jdbc/DataSourceMetadataProvider.java | 2 +- .../jdbc/DataSourceMetadataProvidersConfiguration.java | 2 +- .../boot/autoconfigure}/jdbc/HikariDataSourceMetadata.java | 2 +- .../boot/autoconfigure}/jdbc/TomcatDataSourceMetadata.java | 2 +- .../jdbc/AbstractDataSourceMetadataTests.java | 3 +-- .../jdbc/CommonsDbcpDataSourceMetadataTests.java | 2 +- .../jdbc/CompositeDataSourceMetadataProviderTests.java | 2 +- .../autoconfigure}/jdbc/HikariDataSourceMetadataTests.java | 2 +- .../autoconfigure}/jdbc/TomcatDataSourceMetadataTests.java | 2 +- 15 files changed, 18 insertions(+), 20 deletions(-) rename {spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics => spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure}/jdbc/AbstractDataSourceMetadata.java (96%) rename {spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics => spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure}/jdbc/CommonsDbcpDataSourceMetadata.java (95%) rename {spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics => spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure}/jdbc/CompositeDataSourceMetadataProvider.java (97%) rename {spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics => spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure}/jdbc/DataSourceMetadata.java (97%) rename {spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics => spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure}/jdbc/DataSourceMetadataProvider.java (95%) rename {spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics => spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure}/jdbc/DataSourceMetadataProvidersConfiguration.java (98%) rename {spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics => spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure}/jdbc/HikariDataSourceMetadata.java (98%) rename {spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics => spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure}/jdbc/TomcatDataSourceMetadata.java (96%) rename {spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics => spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure}/jdbc/AbstractDataSourceMetadataTests.java (96%) rename {spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics => spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure}/jdbc/CommonsDbcpDataSourceMetadataTests.java (97%) rename {spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics => spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure}/jdbc/CompositeDataSourceMetadataProviderTests.java (97%) rename {spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics => spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure}/jdbc/HikariDataSourceMetadataTests.java (96%) rename {spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics => spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure}/jdbc/TomcatDataSourceMetadataTests.java (96%) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricDataSourceAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricDataSourceAutoConfiguration.java index 7e6030261c..3aa10bd868 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricDataSourceAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricDataSourceAutoConfiguration.java @@ -19,13 +19,13 @@ package org.springframework.boot.actuate.autoconfigure; import javax.sql.DataSource; import org.springframework.boot.actuate.endpoint.DataSourcePublicMetrics; -import org.springframework.boot.actuate.metrics.jdbc.DataSourceMetadataProvider; -import org.springframework.boot.actuate.metrics.jdbc.DataSourceMetadataProvidersConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.boot.autoconfigure.jdbc.DataSourceMetadataProvider; +import org.springframework.boot.autoconfigure.jdbc.DataSourceMetadataProvidersConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Import; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/DataSourcePublicMetrics.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/DataSourcePublicMetrics.java index b860f9c475..7d57158ad1 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/DataSourcePublicMetrics.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/DataSourcePublicMetrics.java @@ -20,16 +20,15 @@ import java.util.Collection; import java.util.HashMap; import java.util.LinkedHashSet; import java.util.Map; - import javax.annotation.PostConstruct; import javax.sql.DataSource; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.metrics.Metric; -import org.springframework.boot.actuate.metrics.jdbc.CompositeDataSourceMetadataProvider; -import org.springframework.boot.actuate.metrics.jdbc.DataSourceMetadata; -import org.springframework.boot.actuate.metrics.jdbc.DataSourceMetadataProvider; +import org.springframework.boot.autoconfigure.jdbc.CompositeDataSourceMetadataProvider; +import org.springframework.boot.autoconfigure.jdbc.DataSourceMetadata; +import org.springframework.boot.autoconfigure.jdbc.DataSourceMetadataProvider; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Primary; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/jdbc/AbstractDataSourceMetadata.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/AbstractDataSourceMetadata.java similarity index 96% rename from spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/jdbc/AbstractDataSourceMetadata.java rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/AbstractDataSourceMetadata.java index 92b1587ebe..9adf8267f7 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/jdbc/AbstractDataSourceMetadata.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/AbstractDataSourceMetadata.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.actuate.metrics.jdbc; +package org.springframework.boot.autoconfigure.jdbc; import javax.sql.DataSource; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/jdbc/CommonsDbcpDataSourceMetadata.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/CommonsDbcpDataSourceMetadata.java similarity index 95% rename from spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/jdbc/CommonsDbcpDataSourceMetadata.java rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/CommonsDbcpDataSourceMetadata.java index 49f67955e2..8755c7ced2 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/jdbc/CommonsDbcpDataSourceMetadata.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/CommonsDbcpDataSourceMetadata.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.actuate.metrics.jdbc; +package org.springframework.boot.autoconfigure.jdbc; import org.apache.commons.dbcp.BasicDataSource; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/jdbc/CompositeDataSourceMetadataProvider.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/CompositeDataSourceMetadataProvider.java similarity index 97% rename from spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/jdbc/CompositeDataSourceMetadataProvider.java rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/CompositeDataSourceMetadataProvider.java index cf75b800dc..ffe98480fb 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/jdbc/CompositeDataSourceMetadataProvider.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/CompositeDataSourceMetadataProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.actuate.metrics.jdbc; +package org.springframework.boot.autoconfigure.jdbc; import java.util.ArrayList; import java.util.Collection; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/jdbc/DataSourceMetadata.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceMetadata.java similarity index 97% rename from spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/jdbc/DataSourceMetadata.java rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceMetadata.java index b3e67ab301..57489b0b54 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/jdbc/DataSourceMetadata.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceMetadata.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.actuate.metrics.jdbc; +package org.springframework.boot.autoconfigure.jdbc; import javax.sql.DataSource; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/jdbc/DataSourceMetadataProvider.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceMetadataProvider.java similarity index 95% rename from spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/jdbc/DataSourceMetadataProvider.java rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceMetadataProvider.java index 6d78238ed7..14b9220478 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/jdbc/DataSourceMetadataProvider.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceMetadataProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.actuate.metrics.jdbc; +package org.springframework.boot.autoconfigure.jdbc; import javax.sql.DataSource; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/jdbc/DataSourceMetadataProvidersConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceMetadataProvidersConfiguration.java similarity index 98% rename from spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/jdbc/DataSourceMetadataProvidersConfiguration.java rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceMetadataProvidersConfiguration.java index 156fc25a59..d54a536d7b 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/jdbc/DataSourceMetadataProvidersConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceMetadataProvidersConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.actuate.metrics.jdbc; +package org.springframework.boot.autoconfigure.jdbc; import javax.sql.DataSource; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/jdbc/HikariDataSourceMetadata.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/HikariDataSourceMetadata.java similarity index 98% rename from spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/jdbc/HikariDataSourceMetadata.java rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/HikariDataSourceMetadata.java index d2aaef2c80..e206d43455 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/jdbc/HikariDataSourceMetadata.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/HikariDataSourceMetadata.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.actuate.metrics.jdbc; +package org.springframework.boot.autoconfigure.jdbc; import com.zaxxer.hikari.HikariDataSource; import com.zaxxer.hikari.pool.HikariPool; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/jdbc/TomcatDataSourceMetadata.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/TomcatDataSourceMetadata.java similarity index 96% rename from spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/jdbc/TomcatDataSourceMetadata.java rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/TomcatDataSourceMetadata.java index 7b3adcf109..7bbe88a86c 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/jdbc/TomcatDataSourceMetadata.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/TomcatDataSourceMetadata.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.actuate.metrics.jdbc; +package org.springframework.boot.autoconfigure.jdbc; import org.apache.tomcat.jdbc.pool.ConnectionPool; import org.apache.tomcat.jdbc.pool.DataSource; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/jdbc/AbstractDataSourceMetadataTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/AbstractDataSourceMetadataTests.java similarity index 96% rename from spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/jdbc/AbstractDataSourceMetadataTests.java rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/AbstractDataSourceMetadataTests.java index 43cd8f8a76..e1d685f306 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/jdbc/AbstractDataSourceMetadataTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/AbstractDataSourceMetadataTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.actuate.metrics.jdbc; +package org.springframework.boot.autoconfigure.jdbc; import static org.junit.Assert.*; @@ -23,7 +23,6 @@ import java.sql.SQLException; import org.junit.Test; -import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder; import org.springframework.dao.DataAccessException; import org.springframework.jdbc.core.ConnectionCallback; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/jdbc/CommonsDbcpDataSourceMetadataTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/CommonsDbcpDataSourceMetadataTests.java similarity index 97% rename from spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/jdbc/CommonsDbcpDataSourceMetadataTests.java rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/CommonsDbcpDataSourceMetadataTests.java index bb823ee117..091eb4abaa 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/jdbc/CommonsDbcpDataSourceMetadataTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/CommonsDbcpDataSourceMetadataTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.actuate.metrics.jdbc; +package org.springframework.boot.autoconfigure.jdbc; import static org.junit.Assert.*; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/jdbc/CompositeDataSourceMetadataProviderTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/CompositeDataSourceMetadataProviderTests.java similarity index 97% rename from spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/jdbc/CompositeDataSourceMetadataProviderTests.java rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/CompositeDataSourceMetadataProviderTests.java index f0a16231e1..69992debb1 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/jdbc/CompositeDataSourceMetadataProviderTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/CompositeDataSourceMetadataProviderTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.actuate.metrics.jdbc; +package org.springframework.boot.autoconfigure.jdbc; import static org.junit.Assert.*; import static org.mockito.BDDMockito.*; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/jdbc/HikariDataSourceMetadataTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/HikariDataSourceMetadataTests.java similarity index 96% rename from spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/jdbc/HikariDataSourceMetadataTests.java rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/HikariDataSourceMetadataTests.java index 287b93396a..232d171fd5 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/jdbc/HikariDataSourceMetadataTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/HikariDataSourceMetadataTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.actuate.metrics.jdbc; +package org.springframework.boot.autoconfigure.jdbc; import com.zaxxer.hikari.HikariDataSource; import org.junit.Before; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/jdbc/TomcatDataSourceMetadataTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/TomcatDataSourceMetadataTests.java similarity index 96% rename from spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/jdbc/TomcatDataSourceMetadataTests.java rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/TomcatDataSourceMetadataTests.java index 095fdb81fd..daa7a29e05 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/jdbc/TomcatDataSourceMetadataTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/TomcatDataSourceMetadataTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.actuate.metrics.jdbc; +package org.springframework.boot.autoconfigure.jdbc; import org.apache.tomcat.jdbc.pool.DataSource; import org.junit.Before;