Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Restructure autoconfigure packages

Browse Source 
Restructure modules packages so that all auto-configuration is
organized under single top-level autoconfigure package.
This commit is contained in:
Phillip Webb
2025-06-11 16:29:17 -07:00
parent e60af6a8c7
commit 3de1e27b64
499 changed files with 1133 additions and 1464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-data-commons/src/main/java/org/springframework/boot/data/metrics/autoconfigure/DataMetricsProperties.java → spring-boot-project/spring-boot-data-commons/src/main/java/org/springframework/boot/data/autoconfigure/metrics/DataMetricsProperties.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.data.metrics.autoconfigure;
package org.springframework.boot.data.autoconfigure.metrics;
import org.springframework.boot.context.properties.ConfigurationProperties;

2
spring-boot-project/spring-boot-data-commons/src/main/java/org/springframework/boot/data/metrics/autoconfigure/MetricsRepositoryMethodInvocationListenerBeanPostProcessor.java → spring-boot-project/spring-boot-data-commons/src/main/java/org/springframework/boot/data/autoconfigure/metrics/MetricsRepositoryMethodInvocationListenerBeanPostProcessor.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.data.metrics.autoconfigure;
package org.springframework.boot.data.autoconfigure.metrics;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.BeanPostProcessor;

4
spring-boot-project/spring-boot-data-commons/src/main/java/org/springframework/boot/data/metrics/autoconfigure/PropertiesAutoTimer.java → spring-boot-project/spring-boot-data-commons/src/main/java/org/springframework/boot/data/autoconfigure/metrics/PropertiesAutoTimer.java
View File

@@ -14,12 +14,12 @@
* limitations under the License.
*/
package org.springframework.boot.data.metrics.autoconfigure;
package org.springframework.boot.data.autoconfigure.metrics;
import io.micrometer.core.instrument.Timer.Builder;
import org.springframework.boot.data.autoconfigure.metrics.DataMetricsProperties.Repository.Autotime;
import org.springframework.boot.data.metrics.AutoTimer;
import org.springframework.boot.data.metrics.autoconfigure.DataMetricsProperties.Repository.Autotime;
/**
* {@link AutoTimer} whose behavior is configured by {@link Autotime} properties.

8
spring-boot-project/spring-boot-data-commons/src/main/java/org/springframework/boot/data/metrics/autoconfigure/RepositoryMetricsAutoConfiguration.java → spring-boot-project/spring-boot-data-commons/src/main/java/org/springframework/boot/data/autoconfigure/metrics/SpringDataRepositoryMetricsAutoConfiguration.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.data.metrics.autoconfigure;
package org.springframework.boot.data.autoconfigure.metrics;
import io.micrometer.core.instrument.MeterRegistry;
@@ -25,10 +25,10 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.data.autoconfigure.metrics.DataMetricsProperties.Repository;
import org.springframework.boot.data.metrics.DefaultRepositoryTagsProvider;
import org.springframework.boot.data.metrics.MetricsRepositoryMethodInvocationListener;
import org.springframework.boot.data.metrics.RepositoryTagsProvider;
import org.springframework.boot.data.metrics.autoconfigure.DataMetricsProperties.Repository;
import org.springframework.context.annotation.Bean;
import org.springframework.util.function.SingletonSupplier;
@@ -45,11 +45,11 @@ import org.springframework.util.function.SingletonSupplier;
@ConditionalOnClass(org.springframework.data.repository.Repository.class)
@ConditionalOnBean(MeterRegistry.class)
@EnableConfigurationProperties(DataMetricsProperties.class)
public class RepositoryMetricsAutoConfiguration {
public class SpringDataRepositoryMetricsAutoConfiguration {
private final DataMetricsProperties properties;
public RepositoryMetricsAutoConfiguration(DataMetricsProperties properties) {
public SpringDataRepositoryMetricsAutoConfiguration(DataMetricsProperties properties) {
this.properties = properties;
}

2
spring-boot-project/spring-boot-data-commons/src/main/java/org/springframework/boot/data/metrics/autoconfigure/package-info.java → spring-boot-project/spring-boot-data-commons/src/main/java/org/springframework/boot/data/autoconfigure/metrics/package-info.java
View File

@@ -17,4 +17,4 @@
/**
* Auto-configuration for Spring Data repository metrics.
*/
package org.springframework.boot.data.metrics.autoconfigure;
package org.springframework.boot.data.autoconfigure.metrics;

4
spring-boot-project/spring-boot-data-commons/src/main/java/org/springframework/boot/data/web/autoconfigure/SpringDataWebAutoConfiguration.java → spring-boot-project/spring-boot-data-commons/src/main/java/org/springframework/boot/data/autoconfigure/web/SpringDataWebAutoConfiguration.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.data.web.autoconfigure;
package org.springframework.boot.data.autoconfigure.web;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -23,7 +23,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.data.web.autoconfigure.SpringDataWebProperties.Pageable;
import org.springframework.boot.data.autoconfigure.web.SpringDataWebProperties.Pageable;
import org.springframework.context.annotation.Bean;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.web.PageableHandlerMethodArgumentResolver;

2
spring-boot-project/spring-boot-data-commons/src/main/java/org/springframework/boot/data/web/autoconfigure/SpringDataWebProperties.java → spring-boot-project/spring-boot-data-commons/src/main/java/org/springframework/boot/data/autoconfigure/web/SpringDataWebProperties.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.data.web.autoconfigure;
package org.springframework.boot.data.autoconfigure.web;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.data.web.config.EnableSpringDataWebSupport.PageSerializationMode;

4
spring-boot-project/spring-boot-data-commons/src/main/java/org/springframework/boot/data/web/autoconfigure/package-info.java → spring-boot-project/spring-boot-data-commons/src/main/java/org/springframework/boot/data/autoconfigure/web/package-info.java
View File

@@ -15,6 +15,6 @@
*/
/**
* Auto-configuration for Spring Data's Web Support.
* Auto-configuration for Spring Data web.
*/
package org.springframework.boot.data.web.autoconfigure;
package org.springframework.boot.data.autoconfigure.web;

4
spring-boot-project/spring-boot-data-commons/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
View File

@@ -1,2 +1,2 @@
org.springframework.boot.data.metrics.autoconfigure.RepositoryMetricsAutoConfiguration
org.springframework.boot.data.web.autoconfigure.SpringDataWebAutoConfiguration
org.springframework.boot.data.autoconfigure.metrics.SpringDataRepositoryMetricsAutoConfiguration
org.springframework.boot.data.autoconfigure.web.SpringDataWebAutoConfiguration

2
spring-boot-project/spring-boot-data-commons/src/test/java/org/springframework/boot/data/metrics/autoconfigure/MetricsRepositoryMethodInvocationListenerBeanPostProcessorTests.java → spring-boot-project/spring-boot-data-commons/src/test/java/org/springframework/boot/data/autoconfigure/metrics/MetricsRepositoryMethodInvocationListenerBeanPostProcessorTests.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.data.metrics.autoconfigure;
package org.springframework.boot.data.autoconfigure.metrics;
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;

6
spring-boot-project/spring-boot-data-commons/src/test/java/org/springframework/boot/data/metrics/autoconfigure/RepositoryMetricsAutoConfigurationIntegrationTests.java → spring-boot-project/spring-boot-data-commons/src/test/java/org/springframework/boot/data/autoconfigure/metrics/RepositoryMetricsAutoConfigurationIntegrationTests.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.data.metrics.autoconfigure;
package org.springframework.boot.data.autoconfigure.metrics;
import io.micrometer.core.instrument.Gauge;
import io.micrometer.core.instrument.MeterRegistry;
@@ -40,7 +40,7 @@ import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
import static org.assertj.core.api.Assertions.assertThat;
/**
* Integration tests for {@link RepositoryMetricsAutoConfiguration}.
* Integration tests for {@link SpringDataRepositoryMetricsAutoConfiguration}.
*
* @author Phillip Webb
*/
@@ -56,7 +56,7 @@ class RepositoryMetricsAutoConfigurationIntegrationTests {
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.withBean(SimpleMeterRegistry.class)
.withConfiguration(AutoConfigurations.of(PropertyPlaceholderAutoConfiguration.class,
RepositoryMetricsAutoConfiguration.class, JdbcTemplateAutoConfiguration.class,
SpringDataRepositoryMetricsAutoConfiguration.class, JdbcTemplateAutoConfiguration.class,
DataSourceAutoConfiguration.class, DataSourceTransactionManagerAutoConfiguration.class,
DataSourceInitializationAutoConfiguration.class))
.withUserConfiguration(TestConfig.class);

10
spring-boot-project/spring-boot-data-commons/src/test/java/org/springframework/boot/data/metrics/autoconfigure/RepositoryMetricsAutoConfigurationTests.java → spring-boot-project/spring-boot-data-commons/src/test/java/org/springframework/boot/data/autoconfigure/metrics/RepositoryMetricsAutoConfigurationTests.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.boot.data.metrics.autoconfigure;
package org.springframework.boot.data.autoconfigure.metrics;
import java.util.Collection;
import java.util.Collections;
@@ -52,7 +52,7 @@ import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.mock;
/**
* Tests for {@link RepositoryMetricsAutoConfiguration}.
* Tests for {@link SpringDataRepositoryMetricsAutoConfiguration}.
*
* @author Phillip Webb
*/
@@ -60,14 +60,14 @@ class RepositoryMetricsAutoConfigurationTests {
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.withBean(SimpleMeterRegistry.class)
.withConfiguration(
AutoConfigurations.of(MetricsAutoConfiguration.class, RepositoryMetricsAutoConfiguration.class))
.withConfiguration(AutoConfigurations.of(MetricsAutoConfiguration.class,
SpringDataRepositoryMetricsAutoConfiguration.class))
.withPropertyValues("management.metrics.use-global-registry=false");
@Test
void backsOffWhenMeterRegistryIsMissing() {
new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(RepositoryMetricsAutoConfiguration.class))
.withConfiguration(AutoConfigurations.of(SpringDataRepositoryMetricsAutoConfiguration.class))
.run((context) -> assertThat(context).doesNotHaveBean(RepositoryTagsProvider.class));
}

4
spring-boot-project/spring-boot-data-commons/src/test/java/org/springframework/boot/data/web/autoconfigure/SpringDataWebAutoConfigurationTests.java → spring-boot-project/spring-boot-data-commons/src/test/java/org/springframework/boot/data/autoconfigure/metrics/web/SpringDataWebAutoConfigurationTests.java
View File

@@ -14,11 +14,13 @@
* limitations under the License.
*/
package org.springframework.boot.data.web.autoconfigure;
package org.springframework.boot.data.autoconfigure.metrics.web;
import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.data.autoconfigure.web.SpringDataWebAutoConfiguration;
import org.springframework.boot.data.autoconfigure.web.SpringDataWebProperties;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
import org.springframework.data.domain.PageRequest;