Use getServletPath instead of getPathInfo for jakarta servlets

Netflix · May 8, 2024 · 80bc276 · 80bc276
1 parent 5c86608
commit 80bc276
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/...a/src/main/java/com/netflix/concurrency/limits/servlet/jakarta/ServletLimiterBuilder.java b/...a/src/main/java/com/netflix/concurrency/limits/servlet/jakarta/ServletLimiterBuilder.java
@@ -71,7 +71,7 @@ public ServletLimiterBuilder partitionByParameter(String name) {
      * @return Chainable builder
      */
     public ServletLimiterBuilder partitionByPathInfo(Function<String, String> pathToGroup) {
-        return partitionResolver(request -> Optional.ofNullable(request.getPathInfo()).map(pathToGroup).orElse(null));
+        return partitionResolver(request -> Optional.ofNullable(request.getServletPath()).map(pathToGroup).orElse(null));
     }
 
     /**
@@ -129,7 +129,7 @@ public ServletLimiterBuilder bypassLimitByParameter(String name, String value) {
      * @return Chainable builder
      */
     public ServletLimiterBuilder bypassLimitByPathInfo(String pathInfo) {
-        return bypassLimitResolver((context) -> pathInfo.equals(context.getPathInfo()));
+        return bypassLimitResolver((context) -> pathInfo.equals(context.getServletPath()));
     }
 
     /**

diff --git a/...karta/src/test/java/com/netflix/concurrency/limits/ConcurrencyLimitServletFilterTest.java b/...karta/src/test/java/com/netflix/concurrency/limits/ConcurrencyLimitServletFilterTest.java
@@ -119,7 +119,7 @@ public void testDoFilterBypassCheckPassedForPath() throws ServletException, IOEx
 
         MockHttpServletRequest request = new MockHttpServletRequest();
         request.setMethod("POST");
-        request.setPathInfo("/admin/health");
+        request.setServletPath("/admin/health");
         MockHttpServletResponse response = new MockHttpServletResponse();
         MockFilterChain filterChain = new MockFilterChain();
 

diff --git a/...servlet-jakarta/src/test/java/com/netflix/concurrency/limits/GroupServletLimiterTest.java b/...servlet-jakarta/src/test/java/com/netflix/concurrency/limits/GroupServletLimiterTest.java
@@ -166,7 +166,7 @@ private HttpServletRequest createMockRequestWithPrincipal(String name) {
     private HttpServletRequest createMockRequestWithPathInfo(String name) {
         HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
 
-        Mockito.when(request.getPathInfo()).thenReturn(name);
+        Mockito.when(request.getServletPath()).thenReturn(name);
         return request;
     }
 }