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

Imporovement of serverless web integration

Browse Source
This commit is contained in:
Oleg Zhurakousky
2023-05-19 06:52:43 +02:00
parent f4d4eba233
commit 571d00c107
5 changed files with 33 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,8 +72,6 @@ public class ProxyMvc {
private ServletContext servletContext;
private volatile boolean initialized;
public ConfigurableWebApplicationContext getApplicationContext() {
return this.applicationContext;
}
@@ -83,15 +81,7 @@ public class ProxyMvc {
}
public static ProxyMvc INSTANCE(ConfigurableWebApplicationContext applpicationContext) {
ProxyServletContext servletContext = new ProxyServletContext();
applpicationContext.setServletContext(servletContext);
DispatcherServlet dispatcher = new DispatcherServlet(applpicationContext);
ServletRegistration.Dynamic reg = servletContext.addServlet("dispatcherServlet", dispatcher);
reg.setLoadOnStartup(1);
ProxyMvc mvc = new ProxyMvc(dispatcher, applpicationContext);
mvc.servletContext = servletContext;
return mvc;
return new ProxyMvc(applpicationContext);
}
public static ProxyMvc INSTANCE(Class<?>... componentClasses) {
@@ -103,12 +93,26 @@ public class ProxyMvc {
return INSTANCE(applpicationContext);
}
/**
* Private constructor, not for direct instantiation.
*/
ProxyMvc(DispatcherServlet dispatcher, ConfigurableWebApplicationContext applicationContext) {
ProxyMvc(ConfigurableWebApplicationContext applicationContext) {
this.applicationContext = applicationContext;
this.dispatcher = dispatcher;
ProxyServletContext servletContext = new ProxyServletContext();
this.applicationContext.setServletContext(servletContext);
this.dispatcher = new DispatcherServlet(this.applicationContext);
this.dispatcher.setDetectAllHandlerMappings(false);
ServletRegistration.Dynamic reg = servletContext.addServlet("dispatcherServlet", dispatcher);
reg.setLoadOnStartup(1);
this.servletContext = applicationContext.getServletContext();
try {
this.dispatcher.init(new ProxyServletConfig(this.servletContext));
}
catch (Exception e) {
throw new IllegalStateException(e);
}
}
public void stop() {
@@ -131,13 +135,6 @@ public class ProxyMvc {
}
public void service(HttpServletRequest request, HttpServletResponse response, CountDownLatch latch) throws Exception {
synchronized (this) {
if (!this.initialized) {
this.dispatcher.init(new ProxyServletConfig(this.servletContext));
this.initialized = true;
}
}
ProxyFilterChain filterChain = new ProxyFilterChain(this.dispatcher);
filterChain.doFilter(request, response);