diff --git a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/config/conditional/OnEnabledFilterTests.java b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/config/conditional/OnEnabledFilterTests.java index ca0f42a2..857cf7cd 100644 --- a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/config/conditional/OnEnabledFilterTests.java +++ b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/config/conditional/OnEnabledFilterTests.java @@ -28,7 +28,6 @@ import org.springframework.cloud.gateway.filter.factory.AddRequestHeaderGatewayF import org.springframework.cloud.gateway.filter.factory.DedupeResponseHeaderGatewayFilterFactory; import org.springframework.cloud.gateway.filter.factory.FallbackHeadersGatewayFilterFactory; import org.springframework.cloud.gateway.filter.factory.GatewayFilterFactory; -import org.springframework.cloud.gateway.filter.factory.HystrixGatewayFilterFactory; import org.springframework.cloud.gateway.filter.factory.MapRequestHeaderGatewayFilterFactory; import org.springframework.cloud.gateway.filter.factory.SpringCloudCircuitBreakerResilience4JFilterFactory; @@ -49,7 +48,6 @@ class OnEnabledFilterTests { AddRequestHeaderGatewayFilterFactory.class, DedupeResponseHeaderGatewayFilterFactory.class, FallbackHeadersGatewayFilterFactory.class, - HystrixGatewayFilterFactory.class, MapRequestHeaderGatewayFilterFactory.class, SpringCloudCircuitBreakerResilience4JFilterFactory.class); @@ -59,7 +57,7 @@ class OnEnabledFilterTests { List expectedNames = Stream .of("add-request-header", "dedupe-response-header", "fallback-headers", - "hystrix", "map-request-header", "circuit-breaker") + "map-request-header", "circuit-breaker") .map(s -> "filter." + s).collect(Collectors.toList()); assertThat(resultNames).isEqualTo(expectedNames); diff --git a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/support/NameUtilsTests.java b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/support/NameUtilsTests.java index 91a5a96f..3ee33009 100644 --- a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/support/NameUtilsTests.java +++ b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/support/NameUtilsTests.java @@ -30,7 +30,6 @@ import org.springframework.cloud.gateway.filter.factory.AddRequestHeaderGatewayF import org.springframework.cloud.gateway.filter.factory.DedupeResponseHeaderGatewayFilterFactory; import org.springframework.cloud.gateway.filter.factory.FallbackHeadersGatewayFilterFactory; import org.springframework.cloud.gateway.filter.factory.GatewayFilterFactory; -import org.springframework.cloud.gateway.filter.factory.HystrixGatewayFilterFactory; import org.springframework.cloud.gateway.filter.factory.MapRequestHeaderGatewayFilterFactory; import org.springframework.cloud.gateway.handler.predicate.AfterRoutePredicateFactory; import org.springframework.cloud.gateway.handler.predicate.CloudFoundryRouteServiceRoutePredicateFactory; @@ -83,14 +82,13 @@ class NameUtilsTests { AddRequestHeaderGatewayFilterFactory.class, DedupeResponseHeaderGatewayFilterFactory.class, FallbackHeadersGatewayFilterFactory.class, - HystrixGatewayFilterFactory.class, MapRequestHeaderGatewayFilterFactory.class); List resultNames = predicates.stream() .map(NameUtils::normalizeFilterFactoryName).collect(Collectors.toList()); List expectedNames = Arrays.asList("AddRequestHeader", - "DedupeResponseHeader", "FallbackHeaders", "Hystrix", "MapRequestHeader"); + "DedupeResponseHeader", "FallbackHeaders", "MapRequestHeader"); assertThat(resultNames).isEqualTo(expectedNames); } @@ -101,7 +99,6 @@ class NameUtilsTests { AddRequestHeaderGatewayFilterFactory.class, DedupeResponseHeaderGatewayFilterFactory.class, FallbackHeadersGatewayFilterFactory.class, - HystrixGatewayFilterFactory.class, MapRequestHeaderGatewayFilterFactory.class); List resultNames = predicates.stream() @@ -109,7 +106,7 @@ class NameUtilsTests { .collect(Collectors.toList()); List expectedNames = Arrays.asList("add-request-header", - "dedupe-response-header", "fallback-headers", "hystrix", + "dedupe-response-header", "fallback-headers", "map-request-header"); assertThat(resultNames).isEqualTo(expectedNames);