diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index 833b4c1c0..01dfb533f 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -1,89 +1,90 @@ - - 4.0.0 + + 4.0.0 - spring-cloud-function-adapter-azure - jar + spring-cloud-function-adapter-azure + jar - spring-cloud-function-adapter-aws - Azure Function Adapter for Spring Cloud Function + spring-cloud-function-adapter-aws + Azure Function Adapter for Spring Cloud Function - - org.springframework.cloud - spring-cloud-function-adapter-parent - 2.0.0.BUILD-SNAPSHOT - + + org.springframework.cloud + spring-cloud-function-adapter-parent + 2.0.0.BUILD-SNAPSHOT + - - UTF-8 - UTF-8 - 1.8 - [1.0.0-beta-3,1.0.0) - + + UTF-8 + UTF-8 + 1.8 + 1.0.0-beta-5 + - - - org.springframework.cloud - spring-cloud-function-context - - - org.springframework.boot - spring-boot-starter - - - io.projectreactor - reactor-core - - - org.springframework.boot - spring-boot-starter-test - test - + + + org.springframework.cloud + spring-cloud-function-context + + + org.springframework.boot + spring-boot-starter + + + io.projectreactor + reactor-core + + + org.springframework.boot + spring-boot-starter-test + test + - - com.microsoft.azure - azure-functions-java-core - ${azure.functions.java.core.version} - + + com.microsoft.azure.functions + azure-functions-java-library + ${azure.functions.java.core.version} + - + - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - false - - - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - false - - - + + + spring-snapshots + Spring Snapshots + https://repo.spring.io/snapshot + + true + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + + + + spring-snapshots + Spring Snapshots + https://repo.spring.io/snapshot + + true + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + false + + + diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/java/org/springframework/cloud/function/adapter/azure/AzureSpringBootRequestHandler.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/java/org/springframework/cloud/function/adapter/azure/AzureSpringBootRequestHandler.java index 190ec0098..e2cb052c3 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/java/org/springframework/cloud/function/adapter/azure/AzureSpringBootRequestHandler.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/java/org/springframework/cloud/function/adapter/azure/AzureSpringBootRequestHandler.java @@ -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 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); diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/java/org/springframework/cloud/function/adapter/azure/AzureSpringFunctionInitializer.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/java/org/springframework/cloud/function/adapter/azure/AzureSpringFunctionInitializer.java index ed4c1d0e1..55d8c5dc0 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/java/org/springframework/cloud/function/adapter/azure/AzureSpringFunctionInitializer.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/main/java/org/springframework/cloud/function/adapter/azure/AzureSpringFunctionInitializer.java @@ -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 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()); } } diff --git a/spring-cloud-function-samples/function-sample-azure/src/main/java/example/FooHandler.java b/spring-cloud-function-samples/function-sample-azure/src/main/java/example/FooHandler.java index f43f8474c..7ef5e93b0 100644 --- a/spring-cloud-function-samples/function-sample-azure/src/main/java/example/FooHandler.java +++ b/spring-cloud-function-samples/function-sample-azure/src/main/java/example/FooHandler.java @@ -16,7 +16,7 @@ package example; -import com.microsoft.azure.serverless.functions.ExecutionContext; +import com.microsoft.azure.functions.ExecutionContext; import org.springframework.cloud.function.adapter.azure.AzureSpringBootRequestHandler;