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

Clean up async execution logic in ProxyMVC

Browse Source
This commit is contained in:
Oleg Zhurakousky
2023-06-14 16:47:24 +02:00
parent 7a1980db1e
commit a67d80b218
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -634,6 +634,7 @@ public class ProxyHttpServletRequest implements HttpServletRequest {
@Override @Override
public AsyncContext startAsync(ServletRequest request, @Nullable ServletResponse response) { public AsyncContext startAsync(ServletRequest request, @Nullable ServletResponse response) {
Assert.state(this.asyncSupported, "Async not supported"); Assert.state(this.asyncSupported, "Async not supported");
this.dispatcherType = DispatcherType.ASYNC;
this.asyncStarted = true; this.asyncStarted = true;
this.asyncContext = this.asyncContext == null ? new ProxyAsyncContext(request, response) : this.asyncContext; this.asyncContext = this.asyncContext == null ? new ProxyAsyncContext(request, response) : this.asyncContext;
return this.asyncContext; return this.asyncContext;

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

@@ -25,6 +25,7 @@ import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import jakarta.servlet.AsyncContext;
import jakarta.servlet.Filter; import jakarta.servlet.Filter;
import jakarta.servlet.FilterChain; import jakarta.servlet.FilterChain;
import jakarta.servlet.FilterConfig; import jakarta.servlet.FilterConfig;
@@ -49,8 +50,6 @@ import org.springframework.util.Assert;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.springframework.web.context.ConfigurableWebApplicationContext; import org.springframework.web.context.ConfigurableWebApplicationContext;
import org.springframework.web.context.request.async.WebAsyncManager;
import org.springframework.web.context.request.async.WebAsyncUtils;
import org.springframework.web.servlet.DispatcherServlet; import org.springframework.web.servlet.DispatcherServlet;
/** /**
@@ -143,15 +142,25 @@ public final class ProxyMvc {
public void service(HttpServletRequest request, HttpServletResponse response, CountDownLatch latch) throws Exception { public void service(HttpServletRequest request, HttpServletResponse response, CountDownLatch latch) throws Exception {
((ProxyHttpServletRequest) request).setAsyncStarted(true);
ProxyFilterChain filterChain = new ProxyFilterChain(this.dispatcher); ProxyFilterChain filterChain = new ProxyFilterChain(this.dispatcher);
filterChain.doFilter(request, response); filterChain.doFilter(request, response);
WebAsyncManager asyncManager = WebAsyncUtils.getAsyncManager(request); AsyncContext asyncContext = request.getAsyncContext();
if (asyncManager.isConcurrentHandlingStarted()) { if (asyncContext != null) {
this.dispatcher.service(request, response); filterChain = new ProxyFilterChain(this.dispatcher);
((ProxyAsyncContext) asyncContext).addDispatchHandler(() -> {
try {
new ProxyFilterChain(this.dispatcher).doFilter(request, response);
asyncContext.complete();
}
catch (Exception e) {
throw new IllegalStateException(e);
}
});
} }
if (latch != null) { if (latch != null) {
latch.countDown(); latch.countDown();
} }