Skip to content

Commit 7c2e11e

Browse files
philwebbphilwebb
committed
Restructure autoconfigure packages
Restructure modules packages so that all auto-configuration is organized under single top-level autoconfigure package.
1 parent 4b7d467 commit 7c2e11e

File tree

382 files changed

+422
-1557
lines changed

Some content is hidden

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

382 files changed

+422
-1557
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.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.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-amqp/src/main/java/org/springframework/boot/amqp/actuate/health/autoconfigure/package-info.java

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/metrics/autoconfigure/RabbitConnectionFactoryMetricsPostProcessor.java renamed to ‎spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitConnectionFactoryMetricsPostProcessor.java

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;
1818

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

‎spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/actuate/health/autoconfigure/RabbitHealthContributorAutoConfiguration.java renamed to ‎spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitHealthContributorAutoConfiguration.java

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

17-
package org.springframework.boot.amqp.actuate.health.autoconfigure;
17+
package org.springframework.boot.amqp.autoconfigure;
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;
2625
import org.springframework.boot.autoconfigure.AutoConfiguration;
2726
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2827
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;

‎spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/metrics/autoconfigure/RabbitMetricsAutoConfiguration.java renamed to ‎spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitMetricsAutoConfiguration.java

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

17-
package org.springframework.boot.amqp.metrics.autoconfigure;
17+
package org.springframework.boot.amqp.autoconfigure;
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;
2423
import org.springframework.boot.autoconfigure.AutoConfiguration;
2524
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2625
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;

‎spring-boot-project/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/metrics/autoconfigure/package-info.java

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎spring-boot-project/spring-boot-amqp/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
org.springframework.boot.amqp.actuate.health.autoconfigure.RabbitHealthContributorAutoConfiguration
21
org.springframework.boot.amqp.autoconfigure.RabbitAutoConfiguration
3-
org.springframework.boot.amqp.metrics.autoconfigure.RabbitMetricsAutoConfiguration
2+
org.springframework.boot.amqp.autoconfigure.RabbitHealthContributorAutoConfiguration
3+
org.springframework.boot.amqp.autoconfigure.RabbitMetricsAutoConfiguration

‎spring-boot-project/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/actuate/health/autoconfigure/RabbitHealthContributorAutoConfigurationTests.java renamed to ‎spring-boot-project/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/autoconfigure/RabbitHealthContributorAutoConfigurationTests.java

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

17-
package org.springframework.boot.amqp.actuate.health.autoconfigure;
17+
package org.springframework.boot.amqp.autoconfigure;
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;
2423
import org.springframework.boot.autoconfigure.AutoConfigurations;
2524
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
2625

‎spring-boot-project/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/metrics/autoconfigure/RabbitMetricsAutoConfigurationMeterBinderCycleIntegrationTests.java renamed to ‎spring-boot-project/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/autoconfigure/RabbitMetricsAutoConfigurationMeterBinderCycleIntegrationTests.java

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

17-
package org.springframework.boot.amqp.metrics.autoconfigure;
17+
package org.springframework.boot.amqp.autoconfigure;
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;
2625
import org.springframework.boot.metrics.autoconfigure.MetricsAutoConfiguration;
2726
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
2827
import org.springframework.context.annotation.Bean;

‎spring-boot-project/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/metrics/autoconfigure/RabbitMetricsAutoConfigurationTests.java renamed to ‎spring-boot-project/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/autoconfigure/RabbitMetricsAutoConfigurationTests.java

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

17-
package org.springframework.boot.amqp.metrics.autoconfigure;
17+
package org.springframework.boot.amqp.autoconfigure;
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;
2625
import org.springframework.boot.autoconfigure.AutoConfigurations;
2726
import org.springframework.boot.metrics.autoconfigure.MetricsAutoConfiguration;
2827
import org.springframework.boot.test.context.runner.ApplicationContextRunner;

‎spring-boot-project/spring-boot-batch/src/main/java/org/springframework/boot/batch/autoconfigure/observation/BatchObservationAutoConfiguration.java renamed to ‎spring-boot-project/spring-boot-batch/src/main/java/org/springframework/boot/batch/autoconfigure/BatchObservationAutoConfiguration.java

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.observation;
17+
package org.springframework.boot.batch.autoconfigure;
1818

1919
import io.micrometer.observation.ObservationRegistry;
2020

‎spring-boot-project/spring-boot-batch/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

Lines changed: 1 addition & 1 deletion
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.observation.BatchObservationAutoConfiguration
2+
org.springframework.boot.batch.autoconfigure.BatchObservationAutoConfiguration

‎spring-boot-project/spring-boot-batch/src/test/java/org/springframework/boot/batch/autoconfigure/observation/BatchObservationAutoConfigurationTests.java renamed to ‎spring-boot-project/spring-boot-batch/src/test/java/org/springframework/boot/batch/autoconfigure/BatchObservationAutoConfigurationTests.java

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.observation;
17+
package org.springframework.boot.batch.autoconfigure;
1818

1919
import io.micrometer.observation.tck.TestObservationRegistry;
2020
import org.junit.jupiter.api.Test;

‎spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/actuate/endpoint/autoconfigure/package-info.java

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/metrics/autoconfigure/CacheMeterBinderProvidersConfiguration.java renamed to ‎spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/autoconfigure/CacheMeterBinderProvidersConfiguration.java

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.metrics.autoconfigure;
17+
package org.springframework.boot.cache.autoconfigure;
1818

1919
import com.hazelcast.core.Hazelcast;
2020
import com.hazelcast.spring.cache.HazelcastCache;

‎spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/metrics/autoconfigure/CacheMetricsAutoConfiguration.java renamed to ‎spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/autoconfigure/CacheMetricsAutoConfiguration.java

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

17-
package org.springframework.boot.cache.metrics.autoconfigure;
17+
package org.springframework.boot.cache.autoconfigure;
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;
2625
import org.springframework.cache.Cache;
2726
import org.springframework.cache.CacheManager;
2827
import org.springframework.context.annotation.Import;

‎spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/metrics/autoconfigure/CacheMetricsRegistrarConfiguration.java renamed to ‎spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/autoconfigure/CacheMetricsRegistrarConfiguration.java

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.metrics.autoconfigure;
17+
package org.springframework.boot.cache.autoconfigure;
1818

1919
import java.util.Collection;
2020
import java.util.Map;

‎spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/actuate/endpoint/autoconfigure/CachesEndpointAutoConfiguration.java renamed to ‎spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/autoconfigure/CachesEndpointAutoConfiguration.java

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.cache.actuate.endpoint.autoconfigure;
17+
package org.springframework.boot.cache.autoconfigure;
1818

1919
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
2020
import org.springframework.beans.factory.support.SimpleAutowireCandidateResolver;
@@ -27,7 +27,6 @@
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;
3130
import org.springframework.cache.CacheManager;
3231
import org.springframework.context.annotation.Bean;
3332

‎spring-boot-project/spring-boot-cache/src/main/java/org/springframework/boot/cache/metrics/autoconfigure/package-info.java

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎spring-boot-project/spring-boot-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
org.springframework.boot.cache.actuate.endpoint.autoconfigure.CachesEndpointAutoConfiguration
21
org.springframework.boot.cache.autoconfigure.CacheAutoConfiguration
3-
org.springframework.boot.cache.metrics.autoconfigure.CacheMetricsAutoConfiguration
2+
org.springframework.boot.cache.autoconfigure.CacheMetricsAutoConfiguration
3+
org.springframework.boot.cache.autoconfigure.CachesEndpointAutoConfiguration

‎spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/cache/CacheMetricsAutoConfigurationTests.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.autoconfigure.AutoConfigurations;
2828
import org.springframework.boot.cache.autoconfigure.CacheAutoConfiguration;
29-
import org.springframework.boot.cache.metrics.autoconfigure.CacheMetricsAutoConfiguration;
29+
import org.springframework.boot.cache.autoconfigure.CacheMetricsAutoConfiguration;
3030
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
3131
import org.springframework.cache.CacheManager;
3232
import org.springframework.cache.annotation.CachingConfigurer;

‎spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/actuate/endpoint/autoconfigure/CachesEndpointAutoConfigurationTests.java renamed to ‎spring-boot-project/spring-boot-cache/src/test/java/org/springframework/boot/cache/autoconfigure/CachesEndpointAutoConfigurationTests.java

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.actuate.endpoint.autoconfigure;
17+
package org.springframework.boot.cache.autoconfigure;
1818

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

‎spring-boot-project/spring-boot-cassandra/src/main/java/org/springframework/boot/cassandra/actuate/health/autoconfigure/CassandraHealthContributorAutoConfiguration.java renamed to ‎spring-boot-project/spring-boot-cassandra/src/main/java/org/springframework/boot/cassandra/autoconfigure/CassandraHealthContributorAutoConfiguration.java

Lines changed: 2 additions & 3 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.actuate.health.autoconfigure;
17+
package org.springframework.boot.cassandra.autoconfigure;
1818

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

@@ -23,8 +23,7 @@
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.actuate.health.autoconfigure.CassandraHealthContributorConfigurations.CassandraDriverConfiguration;
27-
import org.springframework.boot.cassandra.autoconfigure.CassandraAutoConfiguration;
26+
import org.springframework.boot.cassandra.autoconfigure.CassandraHealthContributorConfigurations.CassandraDriverConfiguration;
2827
import org.springframework.context.annotation.Import;
2928

3029
/**

‎spring-boot-project/spring-boot-cassandra/src/main/java/org/springframework/boot/cassandra/actuate/health/autoconfigure/CassandraHealthContributorConfigurations.java renamed to ‎spring-boot-project/spring-boot-cassandra/src/main/java/org/springframework/boot/cassandra/autoconfigure/CassandraHealthContributorConfigurations.java

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

1919
import java.util.Map;
2020

‎spring-boot-project/spring-boot-cassandra/src/main/java/org/springframework/boot/cassandra/actuate/health/autoconfigure/CassandraReactiveHealthContributorAutoConfiguration.java renamed to ‎spring-boot-project/spring-boot-cassandra/src/main/java/org/springframework/boot/cassandra/autoconfigure/CassandraReactiveHealthContributorAutoConfiguration.java

Lines changed: 2 additions & 3 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.actuate.health.autoconfigure;
17+
package org.springframework.boot.cassandra.autoconfigure;
1818

1919
import com.datastax.oss.driver.api.core.CqlSession;
2020
import reactor.core.publisher.Flux;
@@ -24,8 +24,7 @@
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.actuate.health.autoconfigure.CassandraHealthContributorConfigurations.CassandraReactiveDriverConfiguration;
28-
import org.springframework.boot.cassandra.autoconfigure.CassandraAutoConfiguration;
27+
import org.springframework.boot.cassandra.autoconfigure.CassandraHealthContributorConfigurations.CassandraReactiveDriverConfiguration;
2928
import org.springframework.context.annotation.Import;
3029

3130
/**

‎spring-boot-project/spring-boot-cassandra/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
org.springframework.boot.cassandra.actuate.health.autoconfigure.CassandraHealthContributorAutoConfiguration
2-
org.springframework.boot.cassandra.actuate.health.autoconfigure.CassandraReactiveHealthContributorAutoConfiguration
31
org.springframework.boot.cassandra.autoconfigure.CassandraAutoConfiguration
2+
org.springframework.boot.cassandra.autoconfigure.CassandraHealthContributorAutoConfiguration
3+
org.springframework.boot.cassandra.autoconfigure.CassandraReactiveHealthContributorAutoConfiguration

‎spring-boot-project/spring-boot-cassandra/src/test/java/org/springframework/boot/cassandra/actuate/health/autoconfigure/CassandraHealthContributorAutoConfigurationTests.java renamed to ‎spring-boot-project/spring-boot-cassandra/src/test/java/org/springframework/boot/cassandra/autoconfigure/CassandraHealthContributorAutoConfigurationTests.java

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

1919
import com.datastax.oss.driver.api.core.CqlSession;
2020
import org.junit.jupiter.api.Test;

‎spring-boot-project/spring-boot-cassandra/src/test/java/org/springframework/boot/cassandra/actuate/health/autoconfigure/CassandraReactiveHealthContributorAutoConfigurationTests.java renamed to ‎spring-boot-project/spring-boot-cassandra/src/test/java/org/springframework/boot/cassandra/autoconfigure/CassandraReactiveHealthContributorAutoConfigurationTests.java

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

1919
import com.datastax.oss.driver.api.core.CqlSession;
2020
import org.junit.jupiter.api.Test;

‎spring-boot-project/spring-boot-cloudfoundry/src/main/java/org/springframework/boot/cloudfoundry/actuate/autoconfigure/servlet/CloudFoundryActuatorAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
* @since 4.0.0
7777
*/
7878
@AutoConfiguration(after = { HealthEndpointAutoConfiguration.class, InfoEndpointAutoConfiguration.class },
79-
afterName = "org.springframework.boot.servlet.actuate.autoconfigure.ServletManagementContextAutoConfiguration")
79+
afterName = "org.springframework.boot.servlet.autoconfigure.actuate.ServletManagementContextAutoConfiguration")
8080
@ConditionalOnBooleanProperty(name = "management.cloudfoundry.enabled", matchIfMissing = true)
8181
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
8282
@ConditionalOnClass(DispatcherServlet.class)

‎spring-boot-project/spring-boot-cloudfoundry/src/test/java/org/springframework/boot/cloudfoundry/actuate/autoconfigure/servlet/CloudFoundryActuatorAutoConfigurationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
4444
import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration;
4545
import org.springframework.boot.security.autoconfigure.servlet.SecurityAutoConfiguration;
46-
import org.springframework.boot.servlet.actuate.autoconfigure.ServletManagementContextAutoConfiguration;
46+
import org.springframework.boot.servlet.autoconfigure.actuate.ServletManagementContextAutoConfiguration;
4747
import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext;
4848
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
4949
import org.springframework.boot.webmvc.autoconfigure.DispatcherServletAutoConfiguration;

‎spring-boot-project/spring-boot-cloudfoundry/src/test/java/org/springframework/boot/cloudfoundry/actuate/autoconfigure/servlet/CloudFoundryHealthEndpointWebExtensionTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
3535
import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration;
3636
import org.springframework.boot.security.autoconfigure.servlet.SecurityAutoConfiguration;
37-
import org.springframework.boot.servlet.actuate.autoconfigure.ServletManagementContextAutoConfiguration;
37+
import org.springframework.boot.servlet.autoconfigure.actuate.ServletManagementContextAutoConfiguration;
3838
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
3939
import org.springframework.boot.webmvc.autoconfigure.DispatcherServletAutoConfiguration;
4040
import org.springframework.boot.webmvc.autoconfigure.WebMvcAutoConfiguration;

‎spring-boot-project/spring-boot-cloudfoundry/src/test/java/org/springframework/boot/cloudfoundry/actuate/autoconfigure/servlet/CloudFoundryInfoEndpointWebExtensionTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
3434
import org.springframework.boot.restclient.autoconfigure.RestTemplateAutoConfiguration;
3535
import org.springframework.boot.security.autoconfigure.servlet.SecurityAutoConfiguration;
36-
import org.springframework.boot.servlet.actuate.autoconfigure.ServletManagementContextAutoConfiguration;
36+
import org.springframework.boot.servlet.autoconfigure.actuate.ServletManagementContextAutoConfiguration;
3737
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
3838
import org.springframework.boot.testsupport.classpath.resources.WithResource;
3939
import org.springframework.boot.webmvc.autoconfigure.DispatcherServletAutoConfiguration;

0 commit comments

Comments
 (0)