From 890ee2d77ec981ef5bdef58182381eff62008fdb Mon Sep 17 00:00:00 2001
From: andreossido <andreossido@gmail.com>
Date: Wed, 12 Nov 2025 10:04:10 +0100
Subject: [PATCH] fix: added missing main class to SpringApplicationBuilder
 (#1580) fix: replaced `AnnotationConfigServletWebServerApplicationContext`
 with `ConfigurableWebApplicationContext` (#1580)

---
 .../proxy/spring/SpringBootLambdaContainerHandler.java     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/aws-serverless-java-container-springboot3/src/main/java/com/amazonaws/serverless/proxy/spring/SpringBootLambdaContainerHandler.java b/aws-serverless-java-container-springboot3/src/main/java/com/amazonaws/serverless/proxy/spring/SpringBootLambdaContainerHandler.java
index 6b3dd5ca2..cf4e5842f 100644
--- a/aws-serverless-java-container-springboot3/src/main/java/com/amazonaws/serverless/proxy/spring/SpringBootLambdaContainerHandler.java
+++ b/aws-serverless-java-container-springboot3/src/main/java/com/amazonaws/serverless/proxy/spring/SpringBootLambdaContainerHandler.java
@@ -18,7 +18,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext;
+import org.springframework.web.context.ConfigurableWebApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
 
 import com.amazonaws.serverless.exceptions.ContainerInitializationException;
@@ -192,12 +192,15 @@ public void initialize()
 
         SpringApplicationBuilder builder = new SpringApplicationBuilder(getEmbeddedContainerClasses())
                 .web(springWebApplicationType); // .REACTIVE, .SERVLET
+        if(springBootInitializer != null) {
+            builder.main(springBootInitializer);
+        }
         if (springProfiles != null) {
             builder.profiles(springProfiles);
         }
         applicationContext = builder.run();
         if (springWebApplicationType == WebApplicationType.SERVLET) {
-            ((AnnotationConfigServletWebServerApplicationContext)applicationContext).setServletContext(getServletContext());
+            ((ConfigurableWebApplicationContext)applicationContext).setServletContext(getServletContext());
             AwsServletRegistration reg = (AwsServletRegistration)getServletContext().getServletRegistration(DISPATCHER_SERVLET_REGISTRATION_NAME);
             if (reg != null) {
                 reg.setLoadOnStartup(1);