Skip to content

Commit 5192cef

Browse files
committed
refactor(security): replace HandlerInterceptorAdapter with HandlerInterceptor during upgrade of spring boot 3.0.x
Since `org.springframework.web.servlet.handler.HandlerInterceptorAdapter` has been deprecated in springframework 5.3.0 and removed in 6, replacing it with `org.springframework.web.servlet.HandlerInterceptor`. ``` Attached a portion of error logs for reference: gate/gate-web/src/main/groovy/com/netflix/spinnaker/gate/interceptors/RequestContextInterceptor.java:24: error: cannot find symbol import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; gate/gate-web/src/main/groovy/com/netflix/spinnaker/gate/interceptors/ResponseHeaderInterceptor.java:25: error: cannot find symbol import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; ``` Reference Links: spring-projects/spring-framework#25147
1 parent dc54204 commit 5192cef

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

gate/gate-web/src/main/groovy/com/netflix/spinnaker/gate/interceptors/RequestContextInterceptor.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
package com.netflix.spinnaker.gate.interceptors;
1818

1919
import com.netflix.spinnaker.security.AuthenticatedRequest;
20+
import jakarta.servlet.http.HttpServletRequest;
21+
import jakarta.servlet.http.HttpServletResponse;
2022
import java.util.regex.Matcher;
2123
import java.util.regex.Pattern;
22-
import javax.servlet.http.HttpServletRequest;
23-
import javax.servlet.http.HttpServletResponse;
24-
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
24+
import org.springframework.web.servlet.HandlerInterceptor;
2525

26-
public class RequestContextInterceptor extends HandlerInterceptorAdapter {
26+
public class RequestContextInterceptor implements HandlerInterceptor {
2727

2828
private static Pattern applicationPattern = Pattern.compile("/applications/([^/]+)");
2929
private static Pattern orchestrationMatch = Pattern.compile("/(?:tasks$|tasks/)");

gate/gate-web/src/main/groovy/com/netflix/spinnaker/gate/interceptors/ResponseHeaderInterceptor.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
import static com.netflix.spinnaker.kork.common.Header.REQUEST_ID;
2020

2121
import com.netflix.spinnaker.security.AuthenticatedRequest;
22+
import jakarta.servlet.http.HttpServletRequest;
23+
import jakarta.servlet.http.HttpServletResponse;
2224
import java.util.Optional;
23-
import javax.servlet.http.HttpServletRequest;
24-
import javax.servlet.http.HttpServletResponse;
25-
import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
25+
import org.springframework.web.servlet.HandlerInterceptor;
2626

2727
/**
2828
* Return values (e.g. X-SPINNAKER-*) stored in the AuthenticatedRequest (backed by MDC and set via
@@ -32,7 +32,7 @@
3232
* X-SPINNAKER-EXECUTION-ID is also absent. For other fields, no values are returned if they are
3333
* absent from AuthenticatedRequest.
3434
*/
35-
public class ResponseHeaderInterceptor extends HandlerInterceptorAdapter {
35+
public class ResponseHeaderInterceptor implements HandlerInterceptor {
3636

3737
private final ResponseHeaderInterceptorConfigurationProperties properties;
3838

0 commit comments

Comments
 (0)