Skip to content

Commit 55af0bd

Browse files
committed
!fixup Restructure autoconfigure packages
1 parent 7c2e11e commit 55af0bd

File tree

366 files changed

+1360
-556
lines changed

Some content is hidden

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

366 files changed

+1360
-556
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
@@ -39,10 +39,10 @@
3939
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
4040
import org.springframework.boot.webflux.autoconfigure.HttpHandlerAutoConfiguration;
4141
import org.springframework.boot.webflux.autoconfigure.WebFluxAutoConfiguration;
42-
import org.springframework.boot.webflux.autoconfigure.actuate.WebFluxEndpointManagementContextConfiguration;
42+
import org.springframework.boot.webflux.autoconfigure.actuate.web.WebFluxEndpointManagementContextConfiguration;
4343
import org.springframework.boot.webmvc.autoconfigure.DispatcherServletAutoConfiguration;
4444
import org.springframework.boot.webmvc.autoconfigure.WebMvcAutoConfiguration;
45-
import org.springframework.boot.webmvc.autoconfigure.actuate.WebMvcEndpointManagementContextConfiguration;
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: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,15 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.boot.amqp.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;
2121
import org.springframework.boot.actuate.autoconfigure.health.CompositeHealthContributorConfiguration;
2222
import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
2323
import org.springframework.boot.actuate.health.HealthContributor;
2424
import org.springframework.boot.amqp.actuate.health.RabbitHealthIndicator;
25+
import org.springframework.boot.amqp.autoconfigure.RabbitAutoConfiguration;
2526
import org.springframework.boot.autoconfigure.AutoConfiguration;
2627
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2728
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/*
2+
* Copyright 2012-2019 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
/**
18+
* Auto-configuration for RabbitMQ health.
19+
*/
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.autoconfigure;
17+
package org.springframework.boot.amqp.autoconfigure.metrics;
1818

1919
import com.rabbitmq.client.ConnectionFactory;
2020
import com.rabbitmq.client.MetricsCollector;
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@
1414
* limitations under the License.
1515
*/
1616

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

1919
import com.rabbitmq.client.ConnectionFactory;
2020
import io.micrometer.core.instrument.MeterRegistry;
2121

2222
import org.springframework.amqp.rabbit.connection.AbstractConnectionFactory;
23+
import org.springframework.boot.amqp.autoconfigure.RabbitAutoConfiguration;
2324
import org.springframework.boot.autoconfigure.AutoConfiguration;
2425
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2526
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/*
2+
* Copyright 2012-2019 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
/**
18+
* Auto-configuration for RabbitMQ metrics.
19+
*/
20+
package org.springframework.boot.amqp.autoconfigure.metrics;
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
org.springframework.boot.amqp.autoconfigure.RabbitAutoConfiguration
2-
org.springframework.boot.amqp.autoconfigure.RabbitHealthContributorAutoConfiguration
3-
org.springframework.boot.amqp.autoconfigure.RabbitMetricsAutoConfiguration
2+
org.springframework.boot.amqp.autoconfigure.health.RabbitHealthContributorAutoConfiguration
3+
org.springframework.boot.amqp.autoconfigure.metrics.RabbitMetricsAutoConfiguration
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@
1414
* limitations under the License.
1515
*/
1616

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

1919
import org.junit.jupiter.api.Test;
2020

2121
import org.springframework.boot.actuate.autoconfigure.health.HealthContributorAutoConfiguration;
2222
import org.springframework.boot.amqp.actuate.health.RabbitHealthIndicator;
23+
import org.springframework.boot.amqp.autoconfigure.RabbitAutoConfiguration;
2324
import org.springframework.boot.autoconfigure.AutoConfigurations;
2425
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
2526

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

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

1919
import io.micrometer.core.instrument.MeterRegistry;
2020
import io.micrometer.core.instrument.binder.MeterBinder;
2121
import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
2222
import org.junit.jupiter.api.Test;
2323

2424
import org.springframework.amqp.rabbit.core.RabbitTemplate;
25+
import org.springframework.boot.amqp.autoconfigure.RabbitAutoConfiguration;
2526
import org.springframework.boot.metrics.autoconfigure.MetricsAutoConfiguration;
2627
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
2728
import org.springframework.context.annotation.Bean;
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,15 @@
1414
* limitations under the License.
1515
*/
1616

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

1919
import io.micrometer.core.instrument.MeterRegistry;
2020
import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
2121
import org.junit.jupiter.api.Test;
2222

2323
import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
2424
import org.springframework.amqp.rabbit.connection.ConnectionFactory;
25+
import org.springframework.boot.amqp.autoconfigure.RabbitAutoConfiguration;
2526
import org.springframework.boot.autoconfigure.AutoConfigurations;
2627
import org.springframework.boot.metrics.autoconfigure.MetricsAutoConfiguration;
2728
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
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.batch.autoconfigure;
17+
package org.springframework.boot.batch.autoconfigure.observation;
1818

1919
import io.micrometer.observation.ObservationRegistry;
2020

Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
org.springframework.boot.batch.autoconfigure.BatchAutoConfiguration
2-
org.springframework.boot.batch.autoconfigure.BatchObservationAutoConfiguration
2+
org.springframework.boot.batch.autoconfigure.observation.BatchObservationAutoConfiguration
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.batch.autoconfigure;
17+
package org.springframework.boot.batch.autoconfigure.observation;
1818

1919
import io.micrometer.observation.tck.TestObservationRegistry;
2020
import org.junit.jupiter.api.Test;
Lines changed: 2 additions & 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.cache.autoconfigure;
17+
package org.springframework.boot.cache.autoconfigure.endpoint;
1818

1919
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
2020
import org.springframework.beans.factory.support.SimpleAutowireCandidateResolver;
@@ -27,6 +27,7 @@
2727
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2828
import org.springframework.boot.cache.actuate.endpoint.CachesEndpoint;
2929
import org.springframework.boot.cache.actuate.endpoint.CachesEndpointWebExtension;
30+
import org.springframework.boot.cache.autoconfigure.CacheAutoConfiguration;
3031
import org.springframework.cache.CacheManager;
3132
import org.springframework.context.annotation.Bean;
3233

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/*
2+
* Copyright 2012-2025 the original author or authors.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
/**
18+
* Auto-configuration for the cache abstraction endpoints.
19+
*/
20+
package org.springframework.boot.cache.autoconfigure.endpoint;
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.cache.autoconfigure;
17+
package org.springframework.boot.cache.autoconfigure.metrics;
1818

1919
import com.hazelcast.core.Hazelcast;
2020
import com.hazelcast.spring.cache.HazelcastCache;
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,15 @@
1414
* limitations under the License.
1515
*/
1616

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

1919
import io.micrometer.core.instrument.MeterRegistry;
2020

2121
import org.springframework.boot.autoconfigure.AutoConfiguration;
2222
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2323
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
2424
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
25+
import org.springframework.boot.cache.autoconfigure.CacheAutoConfiguration;
2526
import org.springframework.cache.Cache;
2627
import org.springframework.cache.CacheManager;
2728
import org.springframework.context.annotation.Import;
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.cache.autoconfigure;
17+
package org.springframework.boot.cache.autoconfigure.metrics;
1818

1919
import java.util.Collection;
2020
import java.util.Map;
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 LDAP health integration.
18+
* Auto-configuration for the cache abstraction metrics.
1919
*/
20-
package org.springframework.boot.ldap.actuate.health.autoconfigure;
20+
package org.springframework.boot.cache.autoconfigure.metrics;
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
org.springframework.boot.cache.autoconfigure.CacheAutoConfiguration
2-
org.springframework.boot.cache.autoconfigure.CacheMetricsAutoConfiguration
3-
org.springframework.boot.cache.autoconfigure.CachesEndpointAutoConfiguration
2+
org.springframework.boot.cache.autoconfigure.endpoint.CachesEndpointAutoConfiguration
3+
org.springframework.boot.cache.autoconfigure.metrics.CacheMetricsAutoConfiguration
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.cache.autoconfigure;
17+
package org.springframework.boot.cache.autoconfigure.endpoint;
1818

1919
import org.junit.jupiter.api.Test;
2020

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

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

1919
import java.util.Collections;
2020
import java.util.List;
@@ -26,7 +26,6 @@
2626

2727
import org.springframework.boot.autoconfigure.AutoConfigurations;
2828
import org.springframework.boot.cache.autoconfigure.CacheAutoConfiguration;
29-
import org.springframework.boot.cache.autoconfigure.CacheMetricsAutoConfiguration;
3029
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
3130
import org.springframework.cache.CacheManager;
3231
import org.springframework.cache.annotation.CachingConfigurer;
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

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

1919
import com.datastax.oss.driver.api.core.CqlSession;
2020

@@ -23,7 +23,8 @@
2323
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2424
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2525
import org.springframework.boot.cassandra.actuate.health.CassandraDriverHealthIndicator;
26-
import org.springframework.boot.cassandra.autoconfigure.CassandraHealthContributorConfigurations.CassandraDriverConfiguration;
26+
import org.springframework.boot.cassandra.autoconfigure.CassandraAutoConfiguration;
27+
import org.springframework.boot.cassandra.autoconfigure.health.CassandraHealthContributorConfigurations.CassandraDriverConfiguration;
2728
import org.springframework.context.annotation.Import;
2829

2930
/**
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.cassandra.autoconfigure;
17+
package org.springframework.boot.cassandra.autoconfigure.health;
1818

1919
import java.util.Map;
2020

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

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

1919
import com.datastax.oss.driver.api.core.CqlSession;
2020
import reactor.core.publisher.Flux;
@@ -24,7 +24,8 @@
2424
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2525
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2626
import org.springframework.boot.cassandra.actuate.health.CassandraDriverReactiveHealthIndicator;
27-
import org.springframework.boot.cassandra.autoconfigure.CassandraHealthContributorConfigurations.CassandraReactiveDriverConfiguration;
27+
import org.springframework.boot.cassandra.autoconfigure.CassandraAutoConfiguration;
28+
import org.springframework.boot.cassandra.autoconfigure.health.CassandraHealthContributorConfigurations.CassandraReactiveDriverConfiguration;
2829
import org.springframework.context.annotation.Import;
2930

3031
/**

0 commit comments

Comments
 (0)