additional fixes to address null servletContext

Signed-off-by: Oblio <oblio.leitch@vermont.gov>

Resolves #1335

Author: Oblio

spring-cloud-function-adapters/spring-cloud-function-adapter-azure-web/src/main/java/org/springframework/cloud/function/adapter/azure/web/AzureWebProxyInvoker.java

@@ -44,6 +44,7 @@
 import org.springframework.cloud.function.utils.FunctionClassUtils;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
+import org.springframework.web.context.WebApplicationContext;
 
 /**
  *
@@ -54,11 +55,11 @@
  */
 public class AzureWebProxyInvoker implements FunctionInstanceInjector {
 
-	private static Log logger = LogFactory.getLog(AzureWebProxyInvoker.class);
+	private static final Log LOGGER = LogFactory.getLog(AzureWebProxyInvoker.class);
 
 	private static final String AZURE_WEB_ADAPTER_NAME = "AzureWebAdapter";
 	private static final String AZURE_WEB_ADAPTER_ROUTE = AZURE_WEB_ADAPTER_NAME
-			+ "/{e?}/{e2?}/{e3?}/{e4?}/{e5?}/{e6?}/{e7?}/{e8?}/{e9?}/{e10?}/{e11?}/{e12?}/{e13?}/{e14?}/{e15?}";
+		+ "/{e?}/{e2?}/{e3?}/{e4?}/{e5?}/{e6?}/{e7?}/{e8?}/{e9?}/{e10?}/{e11?}/{e12?}/{e13?}/{e14?}/{e15?}";
 
 	private ServerlessMVC mvc;
 
@@ -77,6 +78,7 @@ public <T> T getInstance(Class<T> functionClass) throws Exception {
 	 * Because the getInstance is called by Azure Java Function on every function request we need to cache the Spring
 	 * context initialization on the first function call.
 	 * Double-Checked Locking Optimization was used to avoid unnecessary locking overhead.
+	 *
 	 * @throws ServletException error.
 	 */
 	private void initialize() throws ServletException {
@@ -86,6 +88,10 @@ private void initialize() throws ServletException {
 				if (mvc == null) {
 					Class<?> startClass = FunctionClassUtils.getStartClass();
 					this.mvc = ServerlessMVC.INSTANCE(startClass);
+					this.servletContext = this.mvc.getServletContext();
+					if (this.servletContext != null && this.servletContext.getAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE) == null) {
+						this.servletContext.setAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, this.mvc.getApplicationContext());
+					}
 				}
 			}
 			finally {
@@ -96,18 +102,25 @@ private void initialize() throws ServletException {
 
 	private HttpServletRequest prepareRequest(HttpRequestMessage<Optional<String>> request) {
 
+		if (this.servletContext == null) {
+			this.servletContext = this.mvc.getServletContext();
+			if (this.servletContext != null && this.servletContext.getAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE) == null) {
+				this.servletContext.setAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, this.mvc.getApplicationContext());
+			}
+		}
+
 		int pathOffset = request.getUri().getPath().indexOf(AZURE_WEB_ADAPTER_NAME) + AZURE_WEB_ADAPTER_NAME.length();
 
 		String path = request.getUri().getPath().substring(pathOffset);
 
 		ServerlessHttpServletRequest httpRequest = new ServerlessHttpServletRequest(servletContext,
-				request.getHttpMethod().toString(), path);
+			request.getHttpMethod().toString(), path);
 
 
 		request.getBody().ifPresent(body -> {
 			Charset charsetEncoding = request.getHeaders() != null && request.getHeaders().containsKey("content-encoding")
-					? Charset.forName(request.getHeaders().get("content-encoding"))
-							: StandardCharsets.UTF_8;
+				? Charset.forName(request.getHeaders().get("content-encoding"))
+				: StandardCharsets.UTF_8;
 			httpRequest.setContent(body.getBytes(charsetEncoding));
 		});
 
@@ -126,14 +139,14 @@ private HttpServletRequest prepareRequest(HttpRequestMessage<Optional<String>> r
 
 	@FunctionName(AZURE_WEB_ADAPTER_NAME)
 	public HttpResponseMessage execute(
-			@HttpTrigger(name = "req", methods = {
-				HttpMethod.GET,
-				HttpMethod.POST,
-				HttpMethod.PUT,
-				HttpMethod.DELETE,
-				HttpMethod.PATCH
-			}, authLevel = AuthorizationLevel.ANONYMOUS, route = AZURE_WEB_ADAPTER_ROUTE) HttpRequestMessage<Optional<String>> request,
-			ExecutionContext context) {
+		@HttpTrigger(name = "req", methods = {
+			HttpMethod.GET,
+			HttpMethod.POST,
+			HttpMethod.PUT,
+			HttpMethod.DELETE,
+			HttpMethod.PATCH
+		}, authLevel = AuthorizationLevel.ANONYMOUS, route = AZURE_WEB_ADAPTER_ROUTE) HttpRequestMessage<Optional<String>> request,
+		ExecutionContext context) {
 
 		context.getLogger().info("Request body is: " + request.getBody().orElse("[empty]"));
 
@@ -151,8 +164,8 @@ public HttpResponseMessage execute(
 
 			String responseString = httpResponse.getContentAsString(StandardCharsets.UTF_8);
 			if (StringUtils.hasText(responseString)) {
-				if (logger.isDebugEnabled()) {
-					logger.debug("Response: " + responseString);
+				if (LOGGER.isDebugEnabled()) {
+					LOGGER.debug("Response: " + responseString);
 				}
 				responseBuilder.body(responseString);
 			} // TODO: what to do with bodyless response?

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

@@ -56,6 +56,7 @@
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.context.ConfigurableWebApplicationContext;
+import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.servlet.DispatcherServlet;
 
 /**
@@ -97,6 +98,10 @@ public static ServerlessMVC INSTANCE(ServletWebServerApplicationContext applicat
 		ServerlessMVC mvc = new ServerlessMVC();
 		mvc.applicationContext = applicationContext;
 		mvc.dispatcher = mvc.applicationContext.getBean(DispatcherServlet.class);
+		ServletContext servletContext = mvc.dispatcher.getServletContext();
+		if (servletContext != null && servletContext.getAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE) == null) {
+			servletContext.setAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, mvc.applicationContext);
+		}
 		mvc.contextStartupLatch.countDown();
 		return mvc;
 	}
@@ -134,7 +139,11 @@ private void initContext(Class<?>... componentClasses) {
 			this.dispatcher = this.applicationContext.getBean(DispatcherServlet.class);
 		}
 		Assert.state(this.dispatcher != null, "DispatcherServlet bean was not initialized. "
-				+ "Ensure ServerlessAutoConfiguration is active and selected as the ServletWebServerFactory.");
+			+ "Ensure ServerlessAutoConfiguration is active and selected as the ServletWebServerFactory.");
+		ServletContext servletContext = this.dispatcher.getServletContext();
+		if (servletContext != null && servletContext.getAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE) == null) {
+			servletContext.setAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, this.applicationContext);
+		}
 	}
 
 	public ConfigurableWebApplicationContext getApplicationContext() {