spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-30 14:19:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.1.x'

Browse Source 
Closes gh-51898
This commit is contained in:
Phillip Webb
2026-09-28 14:20:27 -07:00
parent a39d2a0700 a5bc294685
commit ab8d5266fb
5 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configuration-metadata/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/MetadataGenerationEnvironment.java
+2 -2
View File
@@ -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);
}
}
configuration-metadata/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeElementMembers.java
+2 -2
View File
@@ -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);
}
}
module/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/DispatcherFilter.java
+3 -2
View File
@@ -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 && response instanceof HttpServletResponse) {
doFilter((HttpServletRequest) request, (HttpServletResponse) response, chain);
if (request instanceof HttpServletRequest httpServletRequest
&& response instanceof HttpServletResponse httpServletResponse) {
doFilter(httpServletRequest, httpServletResponse, chain);
}
else {
chain.doFilter(request, response);
module/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/Restarter.java
+7 -6
View File
@@ -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) {
@@ -371,8 +371,9 @@ public class Restarter {
}
}
private boolean isFromRestartClassLoader(Object object) {
return (object instanceof Class && ((Class<?>) object).getClassLoader() instanceof RestartClassLoader);
private boolean isFromRestartClassLoader(Object candidate) {
return (candidate instanceof Class<?> candidateClass
&& candidateClass.getClassLoader() instanceof RestartClassLoader);
}
/**
module/spring-boot-webmvc/src/main/java/org/springframework/boot/webmvc/actuate/web/mappings/DispatcherServletsMappingDescriptionProvider.java
+2 -2
View File
@@ -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) -> {