Skip to content

Commit 105425d

Browse files
philwebbwilkinsona
authored andcommitted
Restructure autoconfigure packages
Restructure modules packages so that all auto-configuration is organized under single top-level autoconfigure package. Issue: 46071
1 parent 5b286ed commit 105425d

File tree

499 files changed

+1129
-1460
lines changed

Some content is hidden

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

499 files changed

+1129
-1460
lines changed

spring-boot-project/spring-boot-actuator-docs/src/test/java/org/springframework/boot/actuate/docs/AbstractEndpointDocumentationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@
3737
import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
3838
import org.springframework.boot.http.converter.autoconfigure.HttpMessageConvertersAutoConfiguration;
3939
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
40-
import org.springframework.boot.webflux.actuate.autoconfigure.endpoint.web.WebFluxEndpointManagementContextConfiguration;
4140
import org.springframework.boot.webflux.autoconfigure.HttpHandlerAutoConfiguration;
4241
import org.springframework.boot.webflux.autoconfigure.WebFluxAutoConfiguration;
43-
import org.springframework.boot.webmvc.actuate.autoconfigure.endpoint.web.WebMvcEndpointManagementContextConfiguration;
42+
import org.springframework.boot.webflux.autoconfigure.actuate.web.WebFluxEndpointManagementContextConfiguration;
4443
import org.springframework.boot.webmvc.autoconfigure.DispatcherServletAutoConfiguration;
4544
import org.springframework.boot.webmvc.autoconfigure.WebMvcAutoConfiguration;
45+
import org.springframework.boot.webmvc.autoconfigure.actuate.web.WebMvcEndpointManagementContextConfiguration;
4646
import org.springframework.context.annotation.Bean;
4747
import org.springframework.context.annotation.Configuration;
4848
import org.springframework.context.annotation.Import;

spring-boot-project/spring-boot-actuator-docs/src/test/java/org/springframework/boot/actuate/docs/flyway/FlywayEndpointDocumentationTests.java

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

2626
import org.springframework.boot.actuate.docs.MockMvcEndpointDocumentationTests;
2727
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
28-
import org.springframework.boot.flyway.actuate.endpoint.FlywayEndpoint;
2928
import org.springframework.boot.flyway.autoconfigure.FlywayAutoConfiguration;
29+
import org.springframework.boot.flyway.endpoint.FlywayEndpoint;
3030
import org.springframework.boot.jdbc.EmbeddedDatabaseConnection;
3131
import org.springframework.context.ApplicationContext;
3232
import org.springframework.context.annotation.Bean;

spring-boot-project/spring-boot-actuator-docs/src/test/java/org/springframework/boot/actuate/docs/integration/IntegrationGraphEndpointDocumentationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import org.junit.jupiter.api.Test;
2020

2121
import org.springframework.boot.actuate.docs.MockMvcEndpointDocumentationTests;
22-
import org.springframework.boot.integration.actuate.endpoint.IntegrationGraphEndpoint;
22+
import org.springframework.boot.integration.endpoint.IntegrationGraphEndpoint;
2323
import org.springframework.context.annotation.Bean;
2424
import org.springframework.context.annotation.Configuration;
2525
import org.springframework.http.HttpStatus;

spring-boot-project/spring-boot-actuator-docs/src/test/java/org/springframework/boot/actuate/docs/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.docs.MockMvcEndpointDocumentationTests;
2525
import org.springframework.boot.jdbc.autoconfigure.EmbeddedDataSourceConfiguration;
26-
import org.springframework.boot.liquibase.actuate.endpoint.LiquibaseEndpoint;
2726
import org.springframework.boot.liquibase.autoconfigure.LiquibaseAutoConfiguration;
27+
import org.springframework.boot.liquibase.endpoint.LiquibaseEndpoint;
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-docs/src/test/java/org/springframework/boot/actuate/docs/quartz/QuartzEndpointDocumentationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@
5555
import org.springframework.boot.actuate.docs.MockMvcEndpointDocumentationTests;
5656
import org.springframework.boot.actuate.endpoint.Show;
5757
import org.springframework.boot.json.JsonWriter;
58-
import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpoint;
59-
import org.springframework.boot.quartz.actuate.endpoint.QuartzEndpointWebExtension;
58+
import org.springframework.boot.quartz.endpoint.QuartzEndpoint;
59+
import org.springframework.boot.quartz.endpoint.QuartzEndpointWebExtension;
6060
import org.springframework.context.annotation.Bean;
6161
import org.springframework.context.annotation.Configuration;
6262
import org.springframework.http.MediaType;

spring-boot-project/spring-boot-actuator-docs/src/test/java/org/springframework/boot/actuate/docs/session/SessionsEndpointDocumentationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
import org.springframework.boot.actuate.context.ShutdownEndpoint;
2828
import org.springframework.boot.actuate.docs.MockMvcEndpointDocumentationTests;
29-
import org.springframework.boot.session.actuate.endpoint.SessionsEndpoint;
29+
import org.springframework.boot.session.endpoint.SessionsEndpoint;
3030
import org.springframework.context.annotation.Bean;
3131
import org.springframework.context.annotation.Configuration;
3232
import org.springframework.http.HttpStatus;

spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/CachingConnectionFactoryConfigurer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
* @author Moritz Halbritter
3434
* @author Andy Wilkinson
3535
* @author Phillip Webb
36-
* @since 2.6.0
36+
* @since 4.0.0
3737
*/
3838
public class CachingConnectionFactoryConfigurer extends AbstractConnectionFactoryConfigurer<CachingConnectionFactory> {
3939

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.amqp.actuate.health.autoconfigure;
17+
package org.springframework.boot.amqp.autoconfigure.health;
1818

1919
import org.springframework.amqp.rabbit.core.RabbitTemplate;
2020
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
*/
1616

1717
/**
18-
* Auto-configuration for JDBC Metadata.
18+
* Auto-configuration for RabbitMQ health.
1919
*/
20-
package org.springframework.boot.jdbc.metadata.autoconfigure;
20+
package org.springframework.boot.amqp.autoconfigure.health;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.amqp.metrics.autoconfigure;
17+
package org.springframework.boot.amqp.autoconfigure.metrics;
1818

1919
import com.rabbitmq.client.ConnectionFactory;
2020
import com.rabbitmq.client.MetricsCollector;

0 commit comments

Comments
 (0)