From baad377db63e3ad3b82b8cfc9baee16596469d6e Mon Sep 17 00:00:00 2001 From: spencergibb Date: Thu, 19 Jan 2023 13:45:49 -0500 Subject: [PATCH] Removes jetbrains imports Fixes gh-2793 --- .../cloud/gateway/filter/headers/ForwardedHeadersFilter.java | 3 --- .../cloud/gateway/filter/ratelimit/RedisRateLimiter.java | 2 -- .../gateway/filter/ReactiveLoadBalancerClientFilterTests.java | 2 -- .../cloud/gateway/filter/WeightCalculatorWebFilterTests.java | 2 -- .../gateway/route/RedisRouteDefinitionRepositoryTests.java | 2 -- 5 files changed, 11 deletions(-) diff --git a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/headers/ForwardedHeadersFilter.java b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/headers/ForwardedHeadersFilter.java index b5036b22..788d305c 100644 --- a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/headers/ForwardedHeadersFilter.java +++ b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/headers/ForwardedHeadersFilter.java @@ -25,8 +25,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.jetbrains.annotations.Nullable; - import org.springframework.core.Ordered; import org.springframework.http.HttpHeaders; import org.springframework.http.server.reactive.ServerHttpRequest; @@ -70,7 +68,6 @@ public class ForwardedHeadersFilter implements HttpHeadersFilter, Ordered { return forwarded; } - @Nullable /* for testing */ static LinkedCaseInsensitiveMap splitIntoCaseInsensitiveMap(String[] pairs) { if (ObjectUtils.isEmpty(pairs)) { return null; diff --git a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/ratelimit/RedisRateLimiter.java b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/ratelimit/RedisRateLimiter.java index d1edc66c..a5446899 100644 --- a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/ratelimit/RedisRateLimiter.java +++ b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/filter/ratelimit/RedisRateLimiter.java @@ -27,7 +27,6 @@ import javax.validation.constraints.Min; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jetbrains.annotations.NotNull; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -298,7 +297,6 @@ public class RedisRateLimiter extends AbstractRateLimiter getHeaders(Config config, Long tokensLeft) { Map headers = new HashMap<>(); if (isIncludeHeaders()) { diff --git a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/ReactiveLoadBalancerClientFilterTests.java b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/ReactiveLoadBalancerClientFilterTests.java index 6c08b199..c4587f51 100644 --- a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/ReactiveLoadBalancerClientFilterTests.java +++ b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/ReactiveLoadBalancerClientFilterTests.java @@ -21,7 +21,6 @@ import java.util.HashMap; import java.util.LinkedHashSet; import java.util.Map; -import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -419,7 +418,6 @@ class ReactiveLoadBalancerClientFilterTests { return serverWebExchange; } - @NotNull private Map buildHints(String hint) { Map hints = new HashMap<>(); hints.put("default", hint); diff --git a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/WeightCalculatorWebFilterTests.java b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/WeightCalculatorWebFilterTests.java index 892b339f..4ed37d6c 100644 --- a/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/WeightCalculatorWebFilterTests.java +++ b/spring-cloud-gateway-server/src/test/java/org/springframework/cloud/gateway/filter/WeightCalculatorWebFilterTests.java @@ -21,7 +21,6 @@ import java.util.List; import java.util.Map; import java.util.Random; -import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnJre; @@ -92,7 +91,6 @@ public class WeightCalculatorWebFilterTests { } } - @NotNull private String route(int i) { return "route" + i; } 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 5a5be605..f3d6d3ef 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 @@ -21,7 +21,6 @@ import java.util.Arrays; import java.util.List; import java.util.function.Predicate; -import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; @@ -109,7 +108,6 @@ public class RedisRouteDefinitionRepositoryTests { assertThat(redisRouteDefinitionRepository.getRouteDefinitions().collectList().block().size()).isEqualTo(0); } - @NotNull private RouteDefinition defaultTestRoute() { RouteDefinition testRouteDefinition = new RouteDefinition(); testRouteDefinition.setId("test-route");