Skip to content

Commit b68cd2e

Browse files
mhalbrittermhalbritter
committed
Merge branch 'mh/29907' into 2.7.x
Closes gh-29907
2 parents 57cd34b + fd36215 commit b68cd2e

File tree

198 files changed

+756
-737
lines changed

Some content is hidden

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

198 files changed

+756
-737
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
2525
import org.springframework.boot.actuate.health.HealthContributor;
2626
import org.springframework.boot.autoconfigure.AutoConfiguration;
27-
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
2827
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2928
import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration;
3029
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -38,11 +37,10 @@
3837
* @author Christian Dupuis
3938
* @since 2.0.0
4039
*/
41-
@AutoConfiguration
40+
@AutoConfiguration(after = RabbitAutoConfiguration.class)
4241
@ConditionalOnClass(RabbitTemplate.class)
4342
@ConditionalOnBean(RabbitTemplate.class)
4443
@ConditionalOnEnabledHealthIndicator("rabbit")
45-
@AutoConfigureAfter(RabbitAutoConfiguration.class)
4644
public class RabbitHealthContributorAutoConfiguration
4745
extends CompositeHealthContributorConfiguration<RabbitHealthIndicator, RabbitTemplate> {
4846

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/audit/AuditEventsEndpointAutoConfiguration.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.springframework.boot.actuate.audit.AuditEventsEndpoint;
2121
import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnAvailableEndpoint;
2222
import org.springframework.boot.autoconfigure.AutoConfiguration;
23-
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
2423
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2524
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
2625
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -34,8 +33,7 @@
3433
* @author Vedran Pavic
3534
* @since 2.0.0
3635
*/
37-
@AutoConfiguration
38-
@AutoConfigureAfter(AuditAutoConfiguration.class)
36+
@AutoConfiguration(after = AuditAutoConfiguration.class)
3937
@ConditionalOnAvailableEndpoint(endpoint = AuditEventsEndpoint.class)
4038
public class AuditEventsEndpointAutoConfiguration {
4139

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/availability/AvailabilityHealthContributorAutoConfiguration.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.springframework.boot.actuate.availability.LivenessStateHealthIndicator;
2121
import org.springframework.boot.actuate.availability.ReadinessStateHealthIndicator;
2222
import org.springframework.boot.autoconfigure.AutoConfiguration;
23-
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
2423
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2524
import org.springframework.boot.autoconfigure.availability.ApplicationAvailabilityAutoConfiguration;
2625
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -35,8 +34,7 @@
3534
* @author Brian Clozel
3635
* @since 2.3.2
3736
*/
38-
@AutoConfiguration
39-
@AutoConfigureAfter(ApplicationAvailabilityAutoConfiguration.class)
37+
@AutoConfiguration(after = ApplicationAvailabilityAutoConfiguration.class)
4038
public class AvailabilityHealthContributorAutoConfiguration {
4139

4240
@Bean

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/availability/AvailabilityProbesAutoConfiguration.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import org.springframework.boot.actuate.availability.LivenessStateHealthIndicator;
2020
import org.springframework.boot.actuate.availability.ReadinessStateHealthIndicator;
2121
import org.springframework.boot.autoconfigure.AutoConfiguration;
22-
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
2322
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2423
import org.springframework.boot.autoconfigure.availability.ApplicationAvailabilityAutoConfiguration;
2524
import org.springframework.boot.autoconfigure.condition.ConditionMessage;
@@ -41,10 +40,9 @@
4140
* @author Phillip Webb
4241
* @since 2.3.0
4342
*/
44-
@AutoConfiguration
45-
@Conditional(AvailabilityProbesAutoConfiguration.ProbesCondition.class)
46-
@AutoConfigureAfter({ AvailabilityHealthContributorAutoConfiguration.class,
43+
@AutoConfiguration(after = { AvailabilityHealthContributorAutoConfiguration.class,
4744
ApplicationAvailabilityAutoConfiguration.class })
45+
@Conditional(AvailabilityProbesAutoConfiguration.ProbesCondition.class)
4846
public class AvailabilityProbesAutoConfiguration {
4947

5048
@Bean

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.springframework.boot.actuate.cache.CachesEndpoint;
2424
import org.springframework.boot.actuate.cache.CachesEndpointWebExtension;
2525
import org.springframework.boot.autoconfigure.AutoConfiguration;
26-
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
2726
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2827
import org.springframework.boot.autoconfigure.cache.CacheAutoConfiguration;
2928
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -39,10 +38,9 @@
3938
* @author Stephane Nicoll
4039
* @since 2.1.0
4140
*/
42-
@AutoConfiguration
41+
@AutoConfiguration(after = CacheAutoConfiguration.class)
4342
@ConditionalOnClass(CacheManager.class)
4443
@ConditionalOnAvailableEndpoint(endpoint = CachesEndpoint.class)
45-
@AutoConfigureAfter(CacheAutoConfiguration.class)
4644
public class CachesEndpointAutoConfiguration {
4745

4846
@Bean

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
2323
import org.springframework.boot.actuate.cassandra.CassandraDriverHealthIndicator;
2424
import org.springframework.boot.autoconfigure.AutoConfiguration;
25-
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
2625
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2726
import org.springframework.boot.autoconfigure.cassandra.CassandraAutoConfiguration;
2827
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -37,11 +36,10 @@
3736
* @author Stephane Nicoll
3837
* @since 2.1.0
3938
*/
40-
@AutoConfiguration
39+
@AutoConfiguration(after = { CassandraAutoConfiguration.class, CassandraDataAutoConfiguration.class,
40+
CassandraReactiveHealthContributorAutoConfiguration.class })
4141
@ConditionalOnClass(CqlSession.class)
4242
@ConditionalOnEnabledHealthIndicator("cassandra")
43-
@AutoConfigureAfter({ CassandraAutoConfiguration.class, CassandraDataAutoConfiguration.class,
44-
CassandraReactiveHealthContributorAutoConfiguration.class })
4543
@Import(CassandraDriverConfiguration.class)
4644
public class CassandraHealthContributorAutoConfiguration {
4745

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
2424
import org.springframework.boot.actuate.cassandra.CassandraDriverReactiveHealthIndicator;
2525
import org.springframework.boot.autoconfigure.AutoConfiguration;
26-
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
2726
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2827
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2928
import org.springframework.boot.autoconfigure.data.cassandra.CassandraReactiveDataAutoConfiguration;
@@ -37,10 +36,9 @@
3736
* @author Stephane Nicoll
3837
* @since 2.1.0
3938
*/
40-
@AutoConfiguration
39+
@AutoConfiguration(after = CassandraReactiveDataAutoConfiguration.class)
4140
@ConditionalOnClass({ CqlSession.class, Flux.class })
4241
@ConditionalOnEnabledHealthIndicator("cassandra")
43-
@AutoConfigureAfter(CassandraReactiveDataAutoConfiguration.class)
4442
@Import(CassandraReactiveDriverConfiguration.class)
4543
public class CassandraReactiveHealthContributorAutoConfiguration {
4644

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundryActuatorAutoConfiguration.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
import org.springframework.boot.actuate.info.InfoEndpoint;
4646
import org.springframework.boot.actuate.info.InfoPropertiesInfoContributor;
4747
import org.springframework.boot.autoconfigure.AutoConfiguration;
48-
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
4948
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
5049
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
5150
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -76,9 +75,8 @@
7675
* @author Madhura Bhave
7776
* @since 2.0.0
7877
*/
79-
@AutoConfiguration
78+
@AutoConfiguration(after = { HealthEndpointAutoConfiguration.class, InfoEndpointAutoConfiguration.class })
8079
@ConditionalOnProperty(prefix = "management.cloudfoundry", name = "enabled", matchIfMissing = true)
81-
@AutoConfigureAfter({ HealthEndpointAutoConfiguration.class, InfoEndpointAutoConfiguration.class })
8280
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE)
8381
@ConditionalOnCloudPlatform(CloudPlatform.CLOUD_FOUNDRY)
8482
public class ReactiveCloudFoundryActuatorAutoConfiguration {

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
import org.springframework.boot.actuate.info.InfoEndpoint;
4545
import org.springframework.boot.actuate.info.InfoPropertiesInfoContributor;
4646
import org.springframework.boot.autoconfigure.AutoConfiguration;
47-
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
4847
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
4948
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
5049
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -77,10 +76,9 @@
7776
* @author Madhura Bhave
7877
* @since 2.0.0
7978
*/
80-
@AutoConfiguration
81-
@ConditionalOnProperty(prefix = "management.cloudfoundry", name = "enabled", matchIfMissing = true)
82-
@AutoConfigureAfter({ ServletManagementContextAutoConfiguration.class, HealthEndpointAutoConfiguration.class,
79+
@AutoConfiguration(after = { ServletManagementContextAutoConfiguration.class, HealthEndpointAutoConfiguration.class,
8380
InfoEndpointAutoConfiguration.class })
81+
@ConditionalOnProperty(prefix = "management.cloudfoundry", name = "enabled", matchIfMissing = true)
8482
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
8583
@ConditionalOnClass(DispatcherServlet.class)
8684
@ConditionalOnBean(DispatcherServlet.class)

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/couchbase/CouchbaseHealthContributorAutoConfiguration.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.springframework.boot.actuate.couchbase.CouchbaseHealthIndicator;
2626
import org.springframework.boot.actuate.health.HealthContributor;
2727
import org.springframework.boot.autoconfigure.AutoConfiguration;
28-
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
2928
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
3029
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
3130
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -42,11 +41,11 @@
4241
* @author Andy Wilkinson Nicoll
4342
* @since 2.0.0
4443
*/
45-
@AutoConfiguration
44+
@AutoConfiguration(
45+
after = { CouchbaseAutoConfiguration.class, CouchbaseReactiveHealthContributorAutoConfiguration.class })
4646
@ConditionalOnClass(Cluster.class)
4747
@ConditionalOnBean(Cluster.class)
4848
@ConditionalOnEnabledHealthIndicator("couchbase")
49-
@AutoConfigureAfter({ CouchbaseAutoConfiguration.class, CouchbaseReactiveHealthContributorAutoConfiguration.class })
5049
public class CouchbaseHealthContributorAutoConfiguration
5150
extends CompositeHealthContributorConfiguration<CouchbaseHealthIndicator, Cluster> {
5251

0 commit comments

Comments
 (0)