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

Merge pull request #1169 from deki/sjc-904

Browse Source 
avoid ClassCastException for non-web application contexts (e.g. webflux)
This commit is contained in:
Oleg Zhurakousky
2024-08-08 11:01:31 +02:00
committed by GitHub
parent a731b934b0 30d6ea9c21
commit 1686e24200
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
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.BeansException;
import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.InitializingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.web.context.ConfigurableWebServerApplicationContext;
import org.springframework.boot.web.server.WebServer; import org.springframework.boot.web.server.WebServer;
import org.springframework.boot.web.server.WebServerException; import org.springframework.boot.web.server.WebServerException;
import org.springframework.boot.web.servlet.ServletContextInitializer; import org.springframework.boot.web.servlet.ServletContextInitializer;
@@ -53,7 +52,7 @@ public class ServerlessAutoConfiguration {
public static class ServerlessServletWebServerFactory public static class ServerlessServletWebServerFactory
implements ServletWebServerFactory, ApplicationContextAware, InitializingBean { implements ServletWebServerFactory, ApplicationContextAware, InitializingBean {
private ConfigurableWebServerApplicationContext applicationContext; private ApplicationContext applicationContext;
@Override @Override
public WebServer getWebServer(ServletContextInitializer... initializers) { public WebServer getWebServer(ServletContextInitializer... initializers) {
@@ -77,28 +76,31 @@ public class ServerlessAutoConfiguration {
@Override @Override
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
this.applicationContext = (ConfigurableWebServerApplicationContext) applicationContext; this.applicationContext = applicationContext;
} }
@Override @Override
public void afterPropertiesSet() throws Exception { public void afterPropertiesSet() throws Exception {
if (applicationContext instanceof ServletWebServerApplicationContext servletApplicationContet) { if (applicationContext instanceof ServletWebServerApplicationContext servletApplicationContext) {
logger.info("Configuring Serverless Web Container"); logger.info("Configuring Serverless Web Container");
ServerlessServletContext servletContext = new ServerlessServletContext(); ServerlessServletContext servletContext = new ServerlessServletContext();
servletApplicationContet.setServletContext(servletContext); servletApplicationContext.setServletContext(servletContext);
DispatcherServlet dispatcher = applicationContext.getBean(DispatcherServlet.class); DispatcherServlet dispatcher = applicationContext.getBean(DispatcherServlet.class);
try { try {
logger.info("Initializing DispatcherServlet"); logger.info("Initializing DispatcherServlet");
dispatcher.init(new ProxyServletConfig(servletApplicationContet.getServletContext())); dispatcher.init(new ProxyServletConfig(servletApplicationContext.getServletContext()));
logger.info("Initalized DispatcherServlet"); logger.info("Initialized DispatcherServlet");
} }
catch (Exception e) { catch (Exception e) {
throw new IllegalStateException("Faild to create Spring MVC DispatcherServlet proxy", e); throw new IllegalStateException("Failed to create Spring MVC DispatcherServlet proxy", e);
} }
for (ServletContextInitializer initializer : new ServletContextInitializerBeans(this.applicationContext)) { for (ServletContextInitializer initializer : new ServletContextInitializerBeans(this.applicationContext)) {
initializer.onStartup(servletContext); initializer.onStartup(servletContext);
} }
} }
else {
logger.debug("Skipping Serverless configuration for " + this.applicationContext);
}
} }
} }
} }