Updated to SB 3.2.0

multi-ctx-app-builder/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.alex.demo.ctx</groupId>
 		<artifactId>multi-ctx-app</artifactId>
-		<version>1.3.1</version>
+		<version>1.3.2</version>
 	</parent>
 
 	<artifactId>multi-ctx-app-builder</artifactId>

multi-ctx-app-embed/README.md

@@ -18,8 +18,8 @@ public AnnotationConfigServletWebServerApplicationContext createChildContext(App
 ```
 
 It's exposed on port 8082 while actuator is exposed on port 8081.
-Most of the logic used for child context creation is taken from: `org.springframework.boot.actuate.autoconfigure.web.servlet.WebMvcEndpointChildContextConfiguration`.
-So, child and actuator contexts are very similar.
+Most of the logic used for child context creation is taken from: `org.springframework.boot.actuate.autoconfigure.web.server.ChildManagementContextInitializer` and `org.springframework.boot.actuate.autoconfigure.web.ManagementContextFactory`.
+So, child and actuator contexts are very similar in case child context is child of parent context.
 
 This demo application provides two options:
 * child context is standalone (not child of parent web context). This is default.

multi-ctx-app-embed/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.alex.demo.ctx</groupId>
 		<artifactId>multi-ctx-app</artifactId>
-		<version>1.3.1</version>
+		<version>1.3.2</version>
 	</parent>
 
 	<artifactId>multi-ctx-app-embed</artifactId>

multi-ctx-app-embed/src/main/java/com/alex/demo/ctx/child/ChildCtxConfig.java

@@ -2,13 +2,11 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 import java.util.Optional;
 
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
+import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryUtils;
+import org.springframework.beans.factory.HierarchicalBeanFactory;
 import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -47,6 +45,9 @@
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.mvc.support.DefaultHandlerExceptionResolver;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 /**
  * @see org.springframework.boot.actuate.autoconfigure.web.servlet.WebMvcEndpointChildContextConfiguration
  */
@@ -211,12 +212,9 @@ public ModelAndView handle(HttpServletRequest request, HttpServletResponse respo
 			return null;
 		}
 
-		/**
-	    * @deprecated
-	    */
-		@SuppressWarnings("deprecation")
 		@Override
-		@Deprecated
+		@Deprecated(since = "2.4.9", forRemoval = false)
+		@SuppressWarnings("deprecation")
 		public long getLastModified(HttpServletRequest request, Object handler) {
 			Optional<HandlerAdapter> adapter = getAdapter(handler);
 			return adapter.map((handlerAdapter) -> handlerAdapter.getLastModified(request, handler)).orElse(0L);
@@ -245,28 +243,43 @@ class CompositeHandlerExceptionResolver implements HandlerExceptionResolver {
 		@Autowired
 		private ListableBeanFactory beanFactory;
 
-		private List<HandlerExceptionResolver> resolvers;
+		private volatile List<HandlerExceptionResolver> resolvers;
 
 		@Override
 		public ModelAndView resolveException(HttpServletRequest request, HttpServletResponse response, Object handler,
 				Exception ex) {
-			if (this.resolvers == null) {
-				this.resolvers = extractResolvers();
+			for (HandlerExceptionResolver resolver : getResolvers()) {
+				ModelAndView resolved = resolver.resolveException(request, response, handler, ex);
+				if (resolved != null) {
+					return resolved;
+				}
 			}
-			return this.resolvers.stream().map((resolver) -> resolver.resolveException(request, response, handler, ex))
-					.filter(Objects::nonNull).findFirst().orElse(null);
+			return null;
 		}
 
-		private List<HandlerExceptionResolver> extractResolvers() {
-			List<HandlerExceptionResolver> list = new ArrayList<>(
-					this.beanFactory.getBeansOfType(HandlerExceptionResolver.class).values());
-			list.remove(this);
-			AnnotationAwareOrderComparator.sort(list);
-			if (list.isEmpty()) {
-				list.add(new DefaultErrorAttributes());
-				list.add(new DefaultHandlerExceptionResolver());
+		private List<HandlerExceptionResolver> getResolvers() {
+			List<HandlerExceptionResolver> resolvers = this.resolvers;
+			if (resolvers == null) {
+				resolvers = new ArrayList<>();
+				collectResolverBeans(resolvers, this.beanFactory);
+				resolvers.remove(this);
+				AnnotationAwareOrderComparator.sort(resolvers);
+				if (resolvers.isEmpty()) {
+					resolvers.add(new DefaultErrorAttributes());
+					resolvers.add(new DefaultHandlerExceptionResolver());
+				}
+				this.resolvers = resolvers;
+			}
+			return resolvers;
+		}
+
+		private void collectResolverBeans(List<HandlerExceptionResolver> resolvers, BeanFactory beanFactory) {
+			if (beanFactory instanceof ListableBeanFactory listableBeanFactory) {
+				resolvers.addAll(listableBeanFactory.getBeansOfType(HandlerExceptionResolver.class).values());
+			}
+			if (beanFactory instanceof HierarchicalBeanFactory hierarchicalBeanFactory) {
+				collectResolverBeans(resolvers, hierarchicalBeanFactory.getParentBeanFactory());
 			}
-			return list;
 		}
 	}
 }

multi-ctx-app-servlets/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.alex.demo.ctx</groupId>
 		<artifactId>multi-ctx-app</artifactId>
-		<version>1.3.1</version>
+		<version>1.3.2</version>
 	</parent>
 
 	<artifactId>multi-ctx-app-servlets</artifactId>

pom.xml

@@ -6,13 +6,13 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.1.5</version>
+		<version>3.2.0</version>
 		<relativePath />
 	</parent>
 
 	<groupId>com.alex.demo.ctx</groupId>
 	<artifactId>multi-ctx-app</artifactId>
-	<version>1.3.1</version>
+	<version>1.3.2</version>
 	<packaging>pom</packaging>
 
 	<name>Multi Context App</name>