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

cache intialisation. add test

Browse Source
This commit is contained in:
Christian Tzolov
2023-03-03 09:03:11 +01:00
committed by Oleg Zhurakousky
parent a039054c3c
commit ee777a796b
5 changed files with 259 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
spring-cloud-function-adapters/spring-cloud-function-adapter-azure-web/src/main/java/org/springframework/cloud/function/adapter/azure/web/WebProxyInvoker.java → spring-cloud-function-adapters/spring-cloud-function-adapter-azure-web/src/main/java/org/springframework/cloud/function/adapter/azure/web/AzureWebProxyInvoker.java
View File

@@ -57,9 +57,9 @@ import org.springframework.web.servlet.DispatcherServlet;
* @author Oleg Zhurakousky
*
*/
public class WebProxyInvoker implements FunctionInstanceInjector {
public class AzureWebProxyInvoker implements FunctionInstanceInjector {
private static Log logger = LogFactory.getLog(WebProxyInvoker.class);
private static Log logger = LogFactory.getLog(AzureWebProxyInvoker.class);
private ProxyMvc mvc;
@@ -69,28 +69,38 @@ public class WebProxyInvoker implements FunctionInstanceInjector {
@Override
public <T> T getInstance(Class<T> functionClass) throws Exception {
System.setProperty("MAIN_CLASS", "oz.spring.petstore.PetStoreSpringAppConfig");
// TODO: Cache the initialization as the getInstance is called before each function invokatoin
// System.setProperty("MAIN_CLASS", "oz.spring.petstore.PetStoreSpringAppConfig");
this.initialize();
return (T) this;
}
public void initialize() throws ServletException {
Class<?> startClass = FunctionClassUtils.getStartClass();
AnnotationConfigWebApplicationContext applicationContext = new AnnotationConfigWebApplicationContext();
applicationContext.register(startClass);
/**
* 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.
* @throws ServletException error.
*/
private void initialize() throws ServletException {
synchronized (AzureWebProxyInvoker.class.getName()) {
if (this.servletContext == null) {
Class<?> startClass = FunctionClassUtils.getStartClass();
AnnotationConfigWebApplicationContext applicationContext = new AnnotationConfigWebApplicationContext();
applicationContext.register(startClass);
this.servletContext = new ProxyServletContext();
ServletConfig servletConfig = new ProxyServletConfig(this.servletContext);
this.servletContext = new ProxyServletContext();
ServletConfig servletConfig = new ProxyServletConfig(this.servletContext);
DispatcherServlet servlet = new DispatcherServlet(applicationContext);
servlet.init(servletConfig);
this.mvc = new ProxyMvc(servlet,
applicationContext.getBeansOfType(Filter.class).values().toArray(new Filter[0]));
DispatcherServlet servlet = new DispatcherServlet(applicationContext);
servlet.init(servletConfig);
this.mvc = new ProxyMvc(servlet,
applicationContext.getBeansOfType(Filter.class).values().toArray(new Filter[0]));
}
}
}
private HttpServletRequest prepareRequest(HttpRequestMessage<Optional<String>> request) {
// Note: Currently this is the only way to pass the the application
// route (e.g. the execution REST url)
String path = request.getQueryParameters().get("path");
if (!StringUtils.hasText(path)) {
@@ -99,16 +109,18 @@ public class WebProxyInvoker implements FunctionInstanceInjector {
ProxyHttpServletRequest httpRequest = new ProxyHttpServletRequest(servletContext,
request.getHttpMethod().toString(), path);
if (request.getBody().isPresent()) {
httpRequest.setContent(request.getBody().get().getBytes());
}
request.getBody().ifPresent(body -> {
httpRequest.setContent(body.getBytes());
});
if (!CollectionUtils.isEmpty(request.getQueryParameters())) {
httpRequest.setParameters(request.getQueryParameters());
}
for (Entry<String, String> entry : request.getHeaders().entrySet()) {
httpRequest.addHeader(entry.getKey(), entry.getValue());
if (!CollectionUtils.isEmpty(request.getHeaders())) {
for (Entry<String, String> entry : request.getHeaders().entrySet()) {
httpRequest.addHeader(entry.getKey(), entry.getValue());
}
}
return httpRequest;

2
spring-cloud-function-adapters/spring-cloud-function-adapter-azure-web/src/main/resources/META-INF/services/com.microsoft.azure.functions.spi.inject.FunctionInstanceInjector
View File

@@ -1 +1 @@
org.springframework.cloud.function.adapter.azure.web.WebProxyInvoker
org.springframework.cloud.function.adapter.azure.web.AzureWebProxyInvoker