From 0aa73a406adfb54f0de9f2bc0e4b0df3b9bd0e06 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Tue, 27 Jul 2021 22:13:22 -0400 Subject: [PATCH] formatting --- .../config/GatewayRedisAutoConfigurationTests.java | 8 ++------ .../route/RedisRouteDefinitionRepositoryTests.java | 6 ++++++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/config/GatewayRedisAutoConfigurationTests.java b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/config/GatewayRedisAutoConfigurationTests.java index a00d1710..d9d88da0 100644 --- a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/config/GatewayRedisAutoConfigurationTests.java +++ b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/config/GatewayRedisAutoConfigurationTests.java @@ -16,8 +16,6 @@ package org.springframework.cloud.gateway.config; -import java.util.function.Predicate; - import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.testcontainers.containers.GenericContainer; @@ -28,13 +26,11 @@ import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.gateway.filter.ratelimit.RedisRateLimiter; -import org.springframework.cloud.gateway.handler.predicate.AbstractRoutePredicateFactory; import org.springframework.cloud.gateway.route.RedisRouteDefinitionRepository; import org.springframework.cloud.gateway.route.RedisRouteDefinitionRepositoryTests; import org.springframework.context.annotation.Bean; import org.springframework.data.redis.core.script.RedisScript; import org.springframework.test.annotation.DirtiesContext; -import org.springframework.web.server.ServerWebExchange; import static org.assertj.core.api.Assertions.assertThat; @@ -43,6 +39,7 @@ public class GatewayRedisAutoConfigurationTests { @SpringBootConfiguration @EnableAutoConfiguration protected static class Config { + // TODO: figure out why I need these @Bean RedisRouteDefinitionRepositoryTests.TestGatewayFilterFactory testGatewayFilterFactory() { @@ -58,10 +55,9 @@ public class GatewayRedisAutoConfigurationTests { RedisRouteDefinitionRepositoryTests.TestRoutePredicateFactory testRoutePredicateFactory() { return new RedisRouteDefinitionRepositoryTests.TestRoutePredicateFactory(); } + } - - @Nested @SpringBootTest(classes = Config.class) class EnabledByDefault { diff --git a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/route/RedisRouteDefinitionRepositoryTests.java b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/route/RedisRouteDefinitionRepositoryTests.java index 526b101b..9329df03 100644 --- a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/route/RedisRouteDefinitionRepositoryTests.java +++ b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/route/RedisRouteDefinitionRepositoryTests.java @@ -136,13 +136,16 @@ public class RedisRouteDefinitionRepositoryTests { TestRoutePredicateFactory testRoutePredicateFactory() { return new TestRoutePredicateFactory(); } + } public static class TestGatewayFilterFactory extends AbstractGatewayFilterFactory { + @Override public GatewayFilter apply(Object config) { return (exchange, chain) -> chain.filter(exchange); } + } public static class TestFilterGatewayFilterFactory extends TestGatewayFilterFactory { @@ -150,6 +153,7 @@ public class RedisRouteDefinitionRepositoryTests { } public static class TestRoutePredicateFactory extends AbstractRoutePredicateFactory { + public TestRoutePredicateFactory() { super(Object.class); } @@ -158,5 +162,7 @@ public class RedisRouteDefinitionRepositoryTests { public Predicate apply(Object config) { return exchange -> true; } + } + }