tchekai704
/
src-spring-cloud-commons
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Swaps deprecated ConditionalOnEnabledEndpoint for updated annotation. 

Swaps with ConditionalOnAvailableEndpoint
pull/683/head
Spencer Gibb 5 years ago
parent
ec784b757e
commit
95186267e6
No known key found for this signature in database
GPG Key ID: 7788A47380690861
8 changed files with 42 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      spring-cloud-commons/src/main/java/org/springframework/cloud/client/CommonsClientAutoConfiguration.java
  2. 4
      spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/ServiceRegistryAutoConfiguration.java
  3. 8
      spring-cloud-commons/src/test/java/org/springframework/cloud/client/CommonsClientAutoConfigurationTests.java
  4. 25
      spring-cloud-commons/src/test/java/org/springframework/cloud/client/ReactiveCommonsClientAutoConfigurationTests.java
  5. 9
      spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshEndpointAutoConfiguration.java
  6. 6
      spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/WritableEnvironmentEndpointAutoConfiguration.java
  7. 12
      spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/LifecycleMvcAutoConfigurationTests.java
  8. 1
      spring-cloud-context/src/test/java/org/springframework/cloud/context/restart/RestartIntegrationTests.java

4
spring-cloud-commons/src/main/java/org/springframework/cloud/client/CommonsClientAutoConfiguration.java
Unescape View File

@ -21,7 +21,7 @@ import java.util.List;
import org.springframework.beans.factory.ObjectProvider; import org.springframework.beans.factory.ObjectProvider;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint; import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnAvailableEndpoint;
import org.springframework.boot.actuate.endpoint.annotation.Endpoint; import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
import org.springframework.boot.actuate.health.HealthIndicator; import org.springframework.boot.actuate.health.HealthIndicator;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@ -93,7 +93,7 @@ public class CommonsClientAutoConfiguration {
private List<HasFeatures> hasFeatures = new ArrayList<>(); private List<HasFeatures> hasFeatures = new ArrayList<>();
@Bean @Bean
@ConditionalOnEnabledEndpoint @ConditionalOnAvailableEndpoint
public FeaturesEndpoint featuresEndpoint() { public FeaturesEndpoint featuresEndpoint() {
return new FeaturesEndpoint(this.hasFeatures); return new FeaturesEndpoint(this.hasFeatures);
} }

4
spring-cloud-commons/src/main/java/org/springframework/cloud/client/serviceregistry/ServiceRegistryAutoConfiguration.java
Unescape View File

@ -17,7 +17,7 @@
package org.springframework.cloud.client.serviceregistry; package org.springframework.cloud.client.serviceregistry;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint; import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnAvailableEndpoint;
import org.springframework.boot.actuate.endpoint.annotation.Endpoint; import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@ -39,7 +39,7 @@ public class ServiceRegistryAutoConfiguration {
private Registration registration; private Registration registration;
@Bean @Bean
@ConditionalOnEnabledEndpoint @ConditionalOnAvailableEndpoint
public ServiceRegistryEndpoint serviceRegistryEndpoint( public ServiceRegistryEndpoint serviceRegistryEndpoint(
ServiceRegistry serviceRegistry) { ServiceRegistry serviceRegistry) {
ServiceRegistryEndpoint endpoint = new ServiceRegistryEndpoint( ServiceRegistryEndpoint endpoint = new ServiceRegistryEndpoint(

8
spring-cloud-commons/src/test/java/org/springframework/cloud/client/CommonsClientAutoConfigurationTests.java
Unescape View File

@ -51,6 +51,7 @@ public class CommonsClientAutoConfigurationTests {
applicationContextRunner applicationContextRunner
.withConfiguration( .withConfiguration(
AutoConfigurations.of(HealthEndpointAutoConfiguration.class)) AutoConfigurations.of(HealthEndpointAutoConfiguration.class))
.withPropertyValues("management.endpoints.web.exposure.include=features")
.run(ctxt -> { .run(ctxt -> {
then(ctxt.getBean(DiscoveryClientHealthIndicator.class)).isNotNull(); then(ctxt.getBean(DiscoveryClientHealthIndicator.class)).isNotNull();
then(ctxt.getBean(DiscoveryCompositeHealthContributor.class)) then(ctxt.getBean(DiscoveryCompositeHealthContributor.class))
@ -63,7 +64,9 @@ public class CommonsClientAutoConfigurationTests {
@Test @Test
public void disableAll() { public void disableAll() {
applicationContextRunner applicationContextRunner
.withPropertyValues("spring.cloud.discovery.enabled=false").run(ctxt -> { .withPropertyValues("spring.cloud.discovery.enabled=false",
"management.endpoints.web.exposure.include=features")
.run(ctxt -> {
assertThat(ctxt) assertThat(ctxt)
.doesNotHaveBean(DiscoveryClientHealthIndicator.class); .doesNotHaveBean(DiscoveryClientHealthIndicator.class);
assertThat(ctxt) assertThat(ctxt)
@ -77,7 +80,8 @@ public class CommonsClientAutoConfigurationTests {
@Test @Test
public void disableBlocking() { public void disableBlocking() {
applicationContextRunner applicationContextRunner
.withPropertyValues("spring.cloud.discovery.blocking.enabled=false") .withPropertyValues("spring.cloud.discovery.blocking.enabled=false",
"management.endpoints.web.exposure.include=features")
.run(ctxt -> { .run(ctxt -> {
assertThat(ctxt) assertThat(ctxt)
.doesNotHaveBean(DiscoveryClientHealthIndicator.class); .doesNotHaveBean(DiscoveryClientHealthIndicator.class);

25
spring-cloud-commons/src/test/java/org/springframework/cloud/client/ReactiveCommonsClientAutoConfigurationTests.java
Unescape View File

@ -46,20 +46,24 @@ public class ReactiveCommonsClientAutoConfigurationTests {
@Test @Test
public void beansCreatedNormally() { public void beansCreatedNormally() {
applicationContextRunner.run(context -> { applicationContextRunner
then(context.getBean(ReactiveDiscoveryClientHealthIndicator.class)) .withPropertyValues("management.endpoints.web.exposure.include=features")
.isNotNull(); .run(context -> {
then(context.getBean(ReactiveDiscoveryCompositeHealthContributor.class)) then(context.getBean(ReactiveDiscoveryClientHealthIndicator.class))
.isNotNull(); .isNotNull();
then(context.getBean(FeaturesEndpoint.class)).isNotNull(); then(context
then(context.getBeansOfType(HasFeatures.class).values()).isNotEmpty(); .getBean(ReactiveDiscoveryCompositeHealthContributor.class))
}); .isNotNull();
then(context.getBean(FeaturesEndpoint.class)).isNotNull();
then(context.getBeansOfType(HasFeatures.class).values()).isNotEmpty();
});
} }
@Test @Test
public void disableAll() { public void disableAll() {
applicationContextRunner applicationContextRunner
.withPropertyValues("spring.cloud.discovery.enabled=false") .withPropertyValues("spring.cloud.discovery.enabled=false",
"management.endpoints.web.exposure.include=features")
.run(context -> { .run(context -> {
assertThat(context).doesNotHaveBean( assertThat(context).doesNotHaveBean(
ReactiveDiscoveryClientHealthIndicator.class); ReactiveDiscoveryClientHealthIndicator.class);
@ -74,7 +78,8 @@ public class ReactiveCommonsClientAutoConfigurationTests {
@Test @Test
public void disableReactive() { public void disableReactive() {
applicationContextRunner applicationContextRunner
.withPropertyValues("spring.cloud.discovery.reactive.enabled=false") .withPropertyValues("spring.cloud.discovery.reactive.enabled=false",
"management.endpoints.web.exposure.include=features")
.run(context -> { .run(context -> {
assertThat(context).doesNotHaveBean( assertThat(context).doesNotHaveBean(
ReactiveDiscoveryClientHealthIndicator.class); ReactiveDiscoveryClientHealthIndicator.class);

9
spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshEndpointAutoConfiguration.java
Unescape View File

@ -20,7 +20,6 @@ import org.springframework.beans.factory.ObjectProvider;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.actuate.autoconfigure.endpoint.EndpointAutoConfiguration; import org.springframework.boot.actuate.autoconfigure.endpoint.EndpointAutoConfiguration;
import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnAvailableEndpoint; import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnAvailableEndpoint;
import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint;
import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator; import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
import org.springframework.boot.actuate.health.Health; import org.springframework.boot.actuate.health.Health;
import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.AutoConfigureAfter;
@ -87,7 +86,7 @@ class RestartEndpointWithIntegrationConfiguration {
private IntegrationMBeanExporter exporter; private IntegrationMBeanExporter exporter;
@Bean @Bean
@ConditionalOnEnabledEndpoint @ConditionalOnAvailableEndpoint
@ConditionalOnMissingBean @ConditionalOnMissingBean
public RestartEndpoint restartEndpoint() { public RestartEndpoint restartEndpoint() {
RestartEndpoint endpoint = new RestartEndpoint(); RestartEndpoint endpoint = new RestartEndpoint();
@ -104,7 +103,7 @@ class RestartEndpointWithIntegrationConfiguration {
class RestartEndpointWithoutIntegrationConfiguration { class RestartEndpointWithoutIntegrationConfiguration {
@Bean @Bean
@ConditionalOnEnabledEndpoint @ConditionalOnAvailableEndpoint
@ConditionalOnMissingBean @ConditionalOnMissingBean
public RestartEndpoint restartEndpointWithoutIntegration() { public RestartEndpoint restartEndpointWithoutIntegration() {
return new RestartEndpoint(); return new RestartEndpoint();
@ -118,7 +117,7 @@ class PauseResumeEndpointsConfiguration {
@Bean @Bean
@ConditionalOnBean(RestartEndpoint.class) @ConditionalOnBean(RestartEndpoint.class)
@ConditionalOnMissingBean @ConditionalOnMissingBean
@ConditionalOnEnabledEndpoint @ConditionalOnAvailableEndpoint
public RestartEndpoint.PauseEndpoint pauseEndpoint(RestartEndpoint restartEndpoint) { public RestartEndpoint.PauseEndpoint pauseEndpoint(RestartEndpoint restartEndpoint) {
return restartEndpoint.getPauseEndpoint(); return restartEndpoint.getPauseEndpoint();
} }
@ -126,7 +125,7 @@ class PauseResumeEndpointsConfiguration {
@Bean @Bean
@ConditionalOnBean(RestartEndpoint.class) @ConditionalOnBean(RestartEndpoint.class)
@ConditionalOnMissingBean @ConditionalOnMissingBean
@ConditionalOnEnabledEndpoint @ConditionalOnAvailableEndpoint
public RestartEndpoint.ResumeEndpoint resumeEndpoint( public RestartEndpoint.ResumeEndpoint resumeEndpoint(
RestartEndpoint restartEndpoint) { RestartEndpoint restartEndpoint) {
return restartEndpoint.getResumeEndpoint(); return restartEndpoint.getResumeEndpoint();

6
spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/WritableEnvironmentEndpointAutoConfiguration.java
Unescape View File

@ -16,7 +16,7 @@
package org.springframework.cloud.autoconfigure; package org.springframework.cloud.autoconfigure;
import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint; import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnAvailableEndpoint;
import org.springframework.boot.actuate.autoconfigure.env.EnvironmentEndpointAutoConfiguration; import org.springframework.boot.actuate.autoconfigure.env.EnvironmentEndpointAutoConfiguration;
import org.springframework.boot.actuate.autoconfigure.env.EnvironmentEndpointProperties; import org.springframework.boot.actuate.autoconfigure.env.EnvironmentEndpointProperties;
import org.springframework.boot.actuate.env.EnvironmentEndpoint; import org.springframework.boot.actuate.env.EnvironmentEndpoint;
@ -61,7 +61,7 @@ public class WritableEnvironmentEndpointAutoConfiguration {
@Bean @Bean
@ConditionalOnMissingBean @ConditionalOnMissingBean
@ConditionalOnEnabledEndpoint @ConditionalOnAvailableEndpoint
public WritableEnvironmentEndpoint environmentEndpoint(Environment environment) { public WritableEnvironmentEndpoint environmentEndpoint(Environment environment) {
WritableEnvironmentEndpoint endpoint = new WritableEnvironmentEndpoint( WritableEnvironmentEndpoint endpoint = new WritableEnvironmentEndpoint(
environment); environment);
@ -73,7 +73,7 @@ public class WritableEnvironmentEndpointAutoConfiguration {
} }
@Bean @Bean
@ConditionalOnEnabledEndpoint @ConditionalOnAvailableEndpoint
public WritableEnvironmentEndpointWebExtension environmentEndpointWebExtension( public WritableEnvironmentEndpointWebExtension environmentEndpointWebExtension(
WritableEnvironmentEndpoint endpoint, EnvironmentManager environment) { WritableEnvironmentEndpoint endpoint, EnvironmentManager environment) {
return new WritableEnvironmentEndpointWebExtension(endpoint, environment); return new WritableEnvironmentEndpointWebExtension(endpoint, environment);

12
spring-cloud-context/src/test/java/org/springframework/cloud/autoconfigure/LifecycleMvcAutoConfigurationTests.java
Unescape View File

@ -63,7 +63,8 @@ public class LifecycleMvcAutoConfigurationTests {
@Test @Test
public void environmentWebEndpointExtensionEnabled() { public void environmentWebEndpointExtensionEnabled() {
beanCreated("environmentEndpointWebExtension", beanCreated("environmentEndpointWebExtension",
"management.endpoint.env.enabled=true"); "management.endpoint.env.enabled=true",
"management.endpoints.web.exposure.include=env");
} }
// restartEndpoint // restartEndpoint
@ -80,7 +81,8 @@ public class LifecycleMvcAutoConfigurationTests {
@Test @Test
public void restartEndpointEnabled() { public void restartEndpointEnabled() {
beanCreatedAndEndpointEnabled("restartEndpoint", RestartEndpoint.class, beanCreatedAndEndpointEnabled("restartEndpoint", RestartEndpoint.class,
RestartEndpoint::restart, "management.endpoint.restart.enabled=true"); RestartEndpoint::restart, "management.endpoint.restart.enabled=true",
"management.endpoints.web.exposure.include=restart");
} }
// pauseEndpoint // pauseEndpoint
@ -105,6 +107,7 @@ public class LifecycleMvcAutoConfigurationTests {
beanCreatedAndEndpointEnabled("pauseEndpoint", beanCreatedAndEndpointEnabled("pauseEndpoint",
RestartEndpoint.PauseEndpoint.class, RestartEndpoint.PauseEndpoint::pause, RestartEndpoint.PauseEndpoint.class, RestartEndpoint.PauseEndpoint::pause,
"management.endpoint.restart.enabled=true", "management.endpoint.restart.enabled=true",
"management.endpoints.web.exposure.include=restart,pause",
"management.endpoint.pause.enabled=true"); "management.endpoint.pause.enabled=true");
} }
@ -112,12 +115,14 @@ public class LifecycleMvcAutoConfigurationTests {
@Test @Test
public void resumeEndpointDisabled() { public void resumeEndpointDisabled() {
beanNotCreated("resumeEndpoint", "management.endpoint.restart.enabled=true", beanNotCreated("resumeEndpoint", "management.endpoint.restart.enabled=true",
"management.endpoints.web.exposure.include=restart",
"management.endpoint.resume.enabled=false"); "management.endpoint.resume.enabled=false");
} }
@Test @Test
public void resumeEndpointRestartDisabled() { public void resumeEndpointRestartDisabled() {
beanNotCreated("resumeEndpoint", "management.endpoint.restart.enabled=false", beanNotCreated("resumeEndpoint", "management.endpoint.restart.enabled=false",
"management.endpoints.web.exposure.include=resume",
"management.endpoint.resume.enabled=true"); "management.endpoint.resume.enabled=true");
} }
@ -132,7 +137,8 @@ public class LifecycleMvcAutoConfigurationTests {
RestartEndpoint.ResumeEndpoint.class, RestartEndpoint.ResumeEndpoint.class,
RestartEndpoint.ResumeEndpoint::resume, RestartEndpoint.ResumeEndpoint::resume,
"management.endpoint.restart.enabled=true", "management.endpoint.restart.enabled=true",
"management.endpoint.resume.enabled=true"); "management.endpoint.resume.enabled=true",
"management.endpoints.web.exposure.include=restart,resume");
} }
private void beanNotCreated(String beanName, String... contextProperties) { private void beanNotCreated(String beanName, String... contextProperties) {

1
spring-cloud-context/src/test/java/org/springframework/cloud/context/restart/RestartIntegrationTests.java
Unescape View File

@ -47,6 +47,7 @@ public class RestartIntegrationTests {
this.context = SpringApplication.run(TestConfiguration.class, this.context = SpringApplication.run(TestConfiguration.class,
"--management.endpoint.restart.enabled=true", "--server.port=0", "--management.endpoint.restart.enabled=true", "--server.port=0",
"--management.endpoints.web.exposure.include=restart",
"--spring.liveBeansView.mbeanDomain=livebeans"); "--spring.liveBeansView.mbeanDomain=livebeans");
RestartEndpoint endpoint = this.context.getBean(RestartEndpoint.class); RestartEndpoint endpoint = this.context.getBean(RestartEndpoint.class);

Write Preview
Loading…
Cancel
Save