From 7a871ff117ed550cab6000eab53f7b3631a0f63a Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 28 Sep 2026 14:12:14 -0700 Subject: [PATCH] Polish 'Use instanceof pattern matching to avoid an explicit cast' See gh-51896 --- .../boot/devtools/remote/server/DispatcherFilter.java | 5 +++-- .../org/springframework/boot/devtools/restart/Restarter.java | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/module/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/DispatcherFilter.java b/module/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/DispatcherFilter.java index 8466b44ad97..92fa59871a5 100644 --- a/module/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/DispatcherFilter.java +++ b/module/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/DispatcherFilter.java @@ -56,8 +56,9 @@ public class DispatcherFilter implements Filter { @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { - if (request instanceof HttpServletRequest req && response instanceof HttpServletResponse res) { - doFilter(req, res, chain); + if (request instanceof HttpServletRequest httpServletRequest + && response instanceof HttpServletResponse httpServletResponse) { + doFilter(httpServletRequest, httpServletResponse, chain); } else { chain.doFilter(request, response); diff --git a/module/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/Restarter.java b/module/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/Restarter.java index 7d7efe053ee..9507606aa90 100644 --- a/module/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/Restarter.java +++ b/module/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/Restarter.java @@ -371,8 +371,9 @@ public class Restarter { } } - private boolean isFromRestartClassLoader(Object object) { - return (object instanceof Class cls && cls.getClassLoader() instanceof RestartClassLoader); + private boolean isFromRestartClassLoader(Object candidate) { + return (candidate instanceof Class candidateClass + && candidateClass.getClassLoader() instanceof RestartClassLoader); } /**