SpringCloud/spring-cloud-function
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-1138 Fix serverless web container initialization

Browse Source 
Resolves #1138
This commit is contained in:
Oleg Zhurakousky
2024-04-25 16:14:35 +02:00
parent d38ab942bd
commit bee5e0b163
6 changed files with 46 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
spring-cloud-function-adapters/spring-cloud-function-serverless-web/src/main/java/org/springframework/cloud/function/serverless/web/ServerlessAutoConfiguration.java
View File

@@ -22,7 +22,6 @@ import org.apache.commons.logging.LogFactory;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletRegistrationBean;
import org.springframework.boot.web.context.ConfigurableWebServerApplicationContext;
import org.springframework.boot.web.server.WebServer;
import org.springframework.boot.web.server.WebServerException;
@@ -67,16 +66,6 @@ public class ServerlessAutoConfiguration {
@Override
public void start() throws WebServerException {
if (applicationContext instanceof ServletWebServerApplicationContext servletApplicationContet) {
DispatcherServlet dispatcher = applicationContext.getBean(DispatcherServlet.class);
try {
dispatcher.init(new ProxyServletConfig(servletApplicationContet.getServletContext()));
logger.info("Initalized DispatcherServlet");
}
catch (Exception e) {
throw new IllegalStateException("Faild to create Spring MVC DispatcherServlet proxy", e);
}
}
}
@Override
@@ -97,10 +86,18 @@ public class ServerlessAutoConfiguration {
logger.info("Configuring Serverless Web Container");
ServerlessServletContext servletContext = new ServerlessServletContext();
servletApplicationContet.setServletContext(servletContext);
for (ServletContextInitializer beans : new ServletContextInitializerBeans(this.applicationContext)) {
if (!(beans instanceof DispatcherServletRegistrationBean)) {
beans.onStartup(servletContext);
}
DispatcherServlet dispatcher = applicationContext.getBean(DispatcherServlet.class);
try {
logger.info("Initializing DispatcherServlet");
dispatcher.init(new ProxyServletConfig(servletApplicationContet.getServletContext()));
logger.info("Initalized DispatcherServlet");
}
catch (Exception e) {
throw new IllegalStateException("Faild to create Spring MVC DispatcherServlet proxy", e);
}
for (ServletContextInitializer initializer : new ServletContextInitializerBeans(this.applicationContext)) {
System.out.println("==> INITIALIZING " + initializer);
initializer.onStartup(servletContext);
}
}
}

7
spring-cloud-function-adapters/spring-cloud-function-serverless-web/src/main/java/org/springframework/cloud/function/serverless/web/ServerlessMVC.java
View File

@@ -29,6 +29,7 @@ import java.util.stream.Stream;
import jakarta.servlet.AsyncContext;
import jakarta.servlet.DispatcherType;
import jakarta.servlet.Filter;
import jakarta.servlet.FilterChain;
import jakarta.servlet.FilterConfig;
@@ -156,8 +157,6 @@ public final class ServerlessMVC {
* @see org.springframework.test.web.servlet.result.MockMvcResultMatchers
*/
public void service(HttpServletRequest request, HttpServletResponse response) throws Exception {
//this.waitForContext();
//contextStartupLatch.await(this.initializatioinTimeout, TimeUnit.MILLISECONDS);
Assert.state(this.waitForContext(), "Failed to initialize Application within the specified time of " + this.initializatioinTimeout + " milliseconds. "
+ "If you need to increase it, please set " + INIT_TIMEOUT + " environment variable");
this.service(request, response, (CountDownLatch) null);
@@ -269,6 +268,10 @@ public final class ServerlessMVC {
this.request = request;
this.response = response;
if (!response.isCommitted() && request.getDispatcherType() != DispatcherType.ASYNC) {
response.flushBuffer();
}
}
/**

8
spring-cloud-function-adapters/spring-cloud-function-serverless-web/src/test/java/org/springframework/cloud/function/serverless/web/RequestResponseTests.java
View File

@@ -57,6 +57,14 @@ public class RequestResponseTests {
this.mvc.stop();
}
@Test
public void validateFreemarker() throws Exception {
HttpServletRequest request = new ServerlessHttpServletRequest(null, "GET", "/index");
ServerlessHttpServletResponse response = new ServerlessHttpServletResponse();
mvc.service(request, response);
assertThat(response.getContentAsString()).contains("<h1> hello from freemarker </h1>");
}
@Test
public void validateAccessDeniedWithCustomHandler() throws Exception {
HttpServletRequest request = new ServerlessHttpServletRequest(null, "GET", "/foo/deny");

2
spring-cloud-function-adapters/spring-cloud-function-serverless-web/src/test/java/org/springframework/cloud/function/test/app/PetStoreSpringAppConfig.java
View File

@@ -53,7 +53,7 @@ import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandl
@Configuration
@Import({ PetsController.class })
@Import({ PetsController.class, FreemarkerController.class })
@EnableWebSecurity
@EnableAutoConfiguration
public class PetStoreSpringAppConfig {

5
spring-cloud-function-adapters/spring-cloud-function-serverless-web/src/test/resources/templates/index.ftlh Normal file
View File

@@ -0,0 +1,5 @@
<h1> hello from freemarker </h1>
<#list 1..10 as x>
${x}
</#list>