Remove the @EnableCircuitBreaker annotation and Hystrix dependencies s…

…pring-petclinic#117
omskiyyozh · Nov 20, 2019 · ee8fc02 · ee8fc02
1 parent 1ba7c64
commit ee8fc02
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/spring-petclinic-api-gateway/pom.xml b/spring-petclinic-api-gateway/pom.xml
@@ -77,6 +77,10 @@
                     <groupId>com.netflix.ribbon</groupId>
                     <artifactId>ribbon-eureka</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.springframework.cloud</groupId>
+                    <artifactId>spring-cloud-netflix-hystrix</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -87,16 +91,6 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-gateway</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.cloud</groupId>
-                    <artifactId>spring-cloud-netflix-ribbon</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
 
         <!-- Third parties -->
         <dependency>

diff --git a/...ateway/src/main/java/org/springframework/samples/petclinic/api/ApiGatewayApplication.java b/...ateway/src/main/java/org/springframework/samples/petclinic/api/ApiGatewayApplication.java
@@ -23,7 +23,6 @@
 import org.springframework.cloud.circuitbreaker.resilience4j.ReactiveResilience4JCircuitBreakerFactory;
 import org.springframework.cloud.circuitbreaker.resilience4j.Resilience4JConfigBuilder;
 import org.springframework.cloud.client.circuitbreaker.Customizer;
-import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.context.annotation.Bean;
@@ -44,7 +43,6 @@
  * @author Maciej Szarlinski
  */
 @EnableDiscoveryClient
-@EnableCircuitBreaker
 @SpringBootApplication
 public class ApiGatewayApplication {