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

Update Azure dependencies

Browse Source
This commit is contained in:
Dave Syer
2018-08-07 10:01:16 +01:00
parent 297c0471b1
commit 2c7144bc49
4 changed files with 87 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/java/org/springframework/cloud/function/adapter/azure/AzureSpringBootRequestHandler.java
View File

@@ -20,7 +20,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import com.microsoft.azure.serverless.functions.ExecutionContext;
import com.microsoft.azure.functions.ExecutionContext;
import org.reactivestreams.Publisher;
@@ -41,7 +41,7 @@ public class AzureSpringBootRequestHandler<I, O> extends AzureSpringFunctionInit
public O handleRequest(I foo, ExecutionContext context) {
if (context != null) {
context.getLogger().fine("Handler Java HTTP trigger processed a request.");
context.getLogger().fine("Handler trigger processed a request.");
}
initialize(context);

8
spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/java/org/springframework/cloud/function/adapter/azure/AzureSpringFunctionInitializer.java
View File

@@ -27,11 +27,12 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Function;
import java.util.jar.Manifest;
import com.microsoft.azure.serverless.functions.ExecutionContext;
import com.microsoft.azure.functions.ExecutionContext;
import org.reactivestreams.Publisher;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.cloud.function.context.FunctionCatalog;
@@ -89,7 +90,7 @@ public class AzureSpringFunctionInitializer implements Closeable {
ClassUtils.overrideThreadContextClassLoader(
AzureSpringFunctionInitializer.class.getClassLoader());
context = builder.web(false).run();
context = builder.web(WebApplicationType.NONE).run();
AzureSpringFunctionInitializer.context = context;
}
}
@@ -107,7 +108,8 @@ public class AzureSpringFunctionInitializer implements Closeable {
}
else {
Set<String> functionNames = this.catalog.getNames(Function.class);
this.function = this.catalog.lookup(Function.class, functionNames.iterator().next());
this.function = this.catalog.lookup(Function.class,
functionNames.iterator().next());
}
}