mirror of
https://github.com/spring-projects/spring-boot.git
synced 2026-10-01 14:59:50 +00:00
Use instanceof pattern matching to avoid an explicit cast
See gh-51896 Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
This commit is contained in:
committed by
Phillip Webb
parent
e4b2ecf934
commit
68c321499a
+2
-2
@@ -402,8 +402,8 @@ class MetadataGenerationEnvironment {
|
||||
// continue
|
||||
}
|
||||
Element superType = this.typeUtils.asElement(element.getSuperclass());
|
||||
if (superType instanceof TypeElement && superType.asType().getKind() != TypeKind.NONE) {
|
||||
resolveFieldValuesFor(values, (TypeElement) superType);
|
||||
if (superType instanceof TypeElement typeElement && superType.asType().getKind() != TypeKind.NONE) {
|
||||
resolveFieldValuesFor(values, typeElement);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -80,9 +80,9 @@ class TypeElementMembers {
|
||||
processMethod(method);
|
||||
}
|
||||
Element superType = this.env.getTypeUtils().asElement(element.getSuperclass());
|
||||
if (superType instanceof TypeElement && !OBJECT_CLASS_NAME.equals(superType.toString())
|
||||
if (superType instanceof TypeElement typeElement && !OBJECT_CLASS_NAME.equals(superType.toString())
|
||||
&& !RECORD_CLASS_NAME.equals(superType.toString())) {
|
||||
process((TypeElement) superType);
|
||||
process(typeElement);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -56,8 +56,8 @@ public class DispatcherFilter implements Filter {
|
||||
@Override
|
||||
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
|
||||
throws IOException, ServletException {
|
||||
if (request instanceof HttpServletRequest && response instanceof HttpServletResponse) {
|
||||
doFilter((HttpServletRequest) request, (HttpServletResponse) response, chain);
|
||||
if (request instanceof HttpServletRequest req && response instanceof HttpServletResponse res) {
|
||||
doFilter(req, res, chain);
|
||||
}
|
||||
else {
|
||||
chain.doFilter(request, response);
|
||||
|
||||
+5
-5
@@ -357,11 +357,11 @@ public class Restarter {
|
||||
Field field = type.getDeclaredField(fieldName);
|
||||
field.setAccessible(true);
|
||||
Object instance = field.get(null);
|
||||
if (instance instanceof Set) {
|
||||
((Set<?>) instance).clear();
|
||||
if (instance instanceof Set<?> set) {
|
||||
set.clear();
|
||||
}
|
||||
if (instance instanceof Map) {
|
||||
((Map<?, ?>) instance).keySet().removeIf(this::isFromRestartClassLoader);
|
||||
if (instance instanceof Map<?, ?> map) {
|
||||
map.keySet().removeIf(this::isFromRestartClassLoader);
|
||||
}
|
||||
}
|
||||
catch (Exception ex) {
|
||||
@@ -372,7 +372,7 @@ public class Restarter {
|
||||
}
|
||||
|
||||
private boolean isFromRestartClassLoader(Object object) {
|
||||
return (object instanceof Class && ((Class<?>) object).getClassLoader() instanceof RestartClassLoader);
|
||||
return (object instanceof Class<?> cls && cls.getClassLoader() instanceof RestartClassLoader);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
+2
-2
@@ -104,8 +104,8 @@ public class DispatcherServletsMappingDescriptionProvider implements MappingDesc
|
||||
Map<String, DispatcherServlet> dispatcherServlets = new LinkedHashMap<>();
|
||||
context.getBeansOfType(ServletRegistrationBean.class).values().forEach((registration) -> {
|
||||
Servlet servlet = registration.getServlet();
|
||||
if (servlet instanceof DispatcherServlet && !dispatcherServlets.containsValue(servlet)) {
|
||||
dispatcherServlets.put(registration.getServletName(), (DispatcherServlet) servlet);
|
||||
if (servlet instanceof DispatcherServlet dispatcherServlet && !dispatcherServlets.containsValue(servlet)) {
|
||||
dispatcherServlets.put(registration.getServletName(), dispatcherServlet);
|
||||
}
|
||||
});
|
||||
context.getBeansOfType(DispatcherServlet.class).forEach((name, dispatcherServlet) -> {
|
||||
|
||||
Reference in New Issue
Block a user