diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/SpringCloudApplication.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/SpringCloudApplication.java index 38741f1e..1d341997 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/SpringCloudApplication.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/SpringCloudApplication.java @@ -24,19 +24,23 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; /** * @author Spencer Gibb + * @deprecated This annotation has been deprecated as of the 3.0.1 release. + * @EnableDiscoveryClient is no longer needed, discovery client + * implementations are enabled as long as an implementation is on the classpath. + * @EnableCircuitBreaker is no longer used now that Hystrix has been removed + * from Spring Cloud. */ +@Deprecated @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) @Documented @Inherited @SpringBootApplication @EnableDiscoveryClient -@EnableCircuitBreaker public @interface SpringCloudApplication { } diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/circuitbreaker/EnableCircuitBreaker.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/circuitbreaker/EnableCircuitBreaker.java index e4812f2f..7587e5ff 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/circuitbreaker/EnableCircuitBreaker.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/circuitbreaker/EnableCircuitBreaker.java @@ -28,8 +28,11 @@ import org.springframework.context.annotation.Import; /** * Annotation to enable a CircuitBreaker implementation. * https://martinfowler.com/bliki/CircuitBreaker.html + * @deprecated as of the 3.0.1 release. Hystrix has been removed from Spring Cloud Netflix + * and it was the only implementation using this annotation. * @author Spencer Gibb */ +@Deprecated @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) @Documented