SpringCloud/spring-cloud-gateway
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

removes references to hystrix

Browse Source
This commit is contained in:
spencergibb
2020-09-25 21:01:32 -04:00
parent 3b179daa26
commit 1bf65d4c34
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/config/conditional/OnEnabledFilterTests.java
View File

@@ -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<String> 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);

7
spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/support/NameUtilsTests.java
View File

@@ -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<String> resultNames = predicates.stream()
.map(NameUtils::normalizeFilterFactoryName).collect(Collectors.toList());
List<String> 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<String> resultNames = predicates.stream()
@@ -109,7 +106,7 @@ class NameUtilsTests {
.collect(Collectors.toList());
List<String> expectedNames = Arrays.asList("add-request-header",
"dedupe-response-header", "fallback-headers", "hystrix",
"dedupe-response-header", "fallback-headers",
"map-request-header");
assertThat(resultNames).isEqualTo(expectedNames);