From b8428f8276f39f83e28dceb7f951c1136e42dedf Mon Sep 17 00:00:00 2001 From: Abdelhak Zaaim Date: Thu, 17 Oct 2024 13:08:53 +0100 Subject: [PATCH 1/2] Replace manual casts on pattern with instanceof --- .../src/main/java/com/netflix/eureka/RateLimitingFilter.java | 3 +-- .../main/java/com/netflix/eureka/ServerRequestAuthFilter.java | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/eureka-core/src/main/java/com/netflix/eureka/RateLimitingFilter.java b/eureka-core/src/main/java/com/netflix/eureka/RateLimitingFilter.java index 317d1d5633..8c6d6949d1 100644 --- a/eureka-core/src/main/java/com/netflix/eureka/RateLimitingFilter.java +++ b/eureka-core/src/main/java/com/netflix/eureka/RateLimitingFilter.java @@ -149,8 +149,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha private static Target getTarget(ServletRequest request) { Target target = Target.Other; - if (request instanceof HttpServletRequest) { - HttpServletRequest httpRequest = (HttpServletRequest) request; + if (request instanceof HttpServletRequest httpRequest) { String pathInfo = httpRequest.getRequestURI(); if ("GET".equals(httpRequest.getMethod()) && pathInfo != null) { diff --git a/eureka-core/src/main/java/com/netflix/eureka/ServerRequestAuthFilter.java b/eureka-core/src/main/java/com/netflix/eureka/ServerRequestAuthFilter.java index 26a4a217d1..0412901bff 100644 --- a/eureka-core/src/main/java/com/netflix/eureka/ServerRequestAuthFilter.java +++ b/eureka-core/src/main/java/com/netflix/eureka/ServerRequestAuthFilter.java @@ -59,9 +59,7 @@ public void destroy() { protected void logAuth(ServletRequest request) { if (serverConfig.shouldLogIdentityHeaders()) { - if (request instanceof HttpServletRequest) { - HttpServletRequest httpRequest = (HttpServletRequest) request; - + if (request instanceof HttpServletRequest httpRequest) { String clientName = getHeader(httpRequest, AbstractEurekaIdentity.AUTH_NAME_HEADER_KEY); String clientVersion = getHeader(httpRequest, AbstractEurekaIdentity.AUTH_VERSION_HEADER_KEY); From d141698215e708e4eb3f4c3a8d0ce3bc8f1c2740 Mon Sep 17 00:00:00 2001 From: Abdelhak Zaaim Date: Thu, 17 Oct 2024 14:13:07 +0100 Subject: [PATCH 2/2] Update RateLimitingFilter.java --- .../src/main/java/com/netflix/eureka/RateLimitingFilter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eureka-core/src/main/java/com/netflix/eureka/RateLimitingFilter.java b/eureka-core/src/main/java/com/netflix/eureka/RateLimitingFilter.java index 8c6d6949d1..5b4d5c6107 100644 --- a/eureka-core/src/main/java/com/netflix/eureka/RateLimitingFilter.java +++ b/eureka-core/src/main/java/com/netflix/eureka/RateLimitingFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2014 Netflix, Inc. + * Copyright 2014, 2024 Netflix, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.