Skip to content

Commit 9ceb4f6

Browse files
tzolovolegz
authored andcommitted
Fix the http trigger signatures in tests, samples and docs. Upgrade the azure maven version
Resolves #1088
1 parent c3cb561 commit 9ceb4f6

File tree

5 files changed

+23
-11
lines changed

5 files changed

+23
-11
lines changed

docs/modules/ROOT/pages/adapters/azure-intro.adoc

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,19 @@ public class MyAzureFunction {
7474
7575
@FunctionName("spring") // <3>
7676
public String plainBean( // <4>
77-
@HttpTrigger(name = "req", authLevel = AuthorizationLevel.ANONYMOUS) HttpRequestMessage<Optional<String>> request,
78-
ExecutionContext context) {
77+
@HttpTrigger(name = "req",
78+
methods = { HttpMethod.POST },
79+
authLevel = AuthorizationLevel.ANONYMOUS) HttpRequestMessage<Optional<String>> request,
80+
ExecutionContext context) {
7981
8082
return this.uppercase.apply(request.getBody().get());
8183
}
8284
8385
@FunctionName("scf") // <3>
8486
public String springCloudFunction( // <5>
85-
@HttpTrigger(name = "req", authLevel = AuthorizationLevel.ANONYMOUS) HttpRequestMessage<Optional<String>> request,
87+
@HttpTrigger(name = "req",
88+
methods = { HttpMethod.POST },
89+
authLevel = AuthorizationLevel.ANONYMOUS) HttpRequestMessage<Optional<String>> request,
8690
ExecutionContext context) {
8791
8892
// Use SCF composition. Composed functions are not just spring beans but SCF such.
@@ -154,8 +158,10 @@ For that purpose the `AzureFunctionUtil.enhanceInputIfNecessary` allow you to ad
154158
----
155159
@FunctionName("myfunction")
156160
public String execute(
157-
@HttpTrigger(name = "req", authLevel = AuthorizationLevel.ANONYMOUS) HttpRequestMessage<Optional<String>> request,
158-
ExecutionContext context) {
161+
@HttpTrigger(name = "req",
162+
methods = { HttpMethod.POST },
163+
authLevel = AuthorizationLevel.ANONYMOUS) HttpRequestMessage<Optional<String>> request,
164+
ExecutionContext context) {
159165
160166
Message message =
161167
(Message) AzureFunctionUtil.enhanceInputIfNecessary(request.getBody().get(), context); // <1>

spring-cloud-function-adapters/spring-cloud-function-adapter-azure/src/test/java/org/springframework/cloud/function/adapter/azure/injector/AzureFunctionInstanceInjectorTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.util.function.Function;
2121

2222
import com.microsoft.azure.functions.ExecutionContext;
23+
import com.microsoft.azure.functions.HttpMethod;
2324
import com.microsoft.azure.functions.HttpRequestMessage;
2425
import com.microsoft.azure.functions.annotation.AuthorizationLevel;
2526
import com.microsoft.azure.functions.annotation.FunctionName;
@@ -80,7 +81,8 @@ public static class MyAzureFunction {
8081

8182
@FunctionName("hello")
8283
public String execute(
83-
@HttpTrigger(name = "req", authLevel = AuthorizationLevel.ANONYMOUS) HttpRequestMessage<Optional<String>> request,
84+
@HttpTrigger(name = "req", methods = { HttpMethod.GET,
85+
HttpMethod.POST }, authLevel = AuthorizationLevel.ANONYMOUS) HttpRequestMessage<Optional<String>> request,
8486
ExecutionContext context) {
8587

8688
Message<String> enhancedRequest = (Message<String>) AzureFunctionUtil.enhanceInputIfNecessary(

spring-cloud-function-samples/function-sample-azure-http-trigger/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<start-class>com.example.azure.di.httptriggerdemo.HttpTriggerDemoApplication</start-class>
2525

2626
<!-- AZURE FUNCTION CONFIG -->
27-
<azure.functions.maven.plugin.version>1.22.0</azure.functions.maven.plugin.version>
27+
<azure.functions.maven.plugin.version>1.28.0</azure.functions.maven.plugin.version>
2828
<functionAppName>spring-cloud-function-samples</functionAppName>
2929
<functionAppRegion>westus</functionAppRegion>
3030
<functionResourceGroup>java-functions-group</functionResourceGroup>
@@ -69,6 +69,7 @@
6969
<pricingTier>${functionPricingTier}</pricingTier>
7070

7171
<hostJson>${project.basedir}/src/main/resources/host.json</hostJson>
72+
<localSettingsJson>${project.basedir}/src/main/resources/local.settings.json</localSettingsJson>
7273

7374
<runtime>
7475
<os>linux</os>

spring-cloud-function-samples/function-sample-azure-http-trigger/src/main/java/com/example/azure/di/httptriggerdemo/MyAzureFunction.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,17 @@ public class MyAzureFunction {
5353

5454
@FunctionName("bean")
5555
public String plainBeans(
56-
@HttpTrigger(name = "req", authLevel = AuthorizationLevel.ANONYMOUS) HttpRequestMessage<Optional<String>> request,
56+
@HttpTrigger(name = "req", methods = {
57+
HttpMethod.POST }, authLevel = AuthorizationLevel.ANONYMOUS) HttpRequestMessage<Optional<String>> request,
5758
ExecutionContext context) {
5859

5960
return echo.andThen(uppercase).apply(request.getBody().get());
6061
}
6162

6263
@FunctionName("scf")
6364
public String springCloudFunction(
64-
@HttpTrigger(name = "req", authLevel = AuthorizationLevel.ANONYMOUS) HttpRequestMessage<Optional<String>> request,
65+
@HttpTrigger(name = "req", methods = {
66+
HttpMethod.POST }, authLevel = AuthorizationLevel.ANONYMOUS) HttpRequestMessage<Optional<String>> request,
6567
ExecutionContext context) {
6668

6769
// Use SCF composition. Composed functions are not just spring beans but SCF such.

spring-cloud-function-samples/function-sample-azure-http-trigger/src/main/resources/host.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"version": "2.0",
33
"extensionBundle": {
44
"id": "Microsoft.Azure.Functions.ExtensionBundle",
5-
"version": "[3.*, 4.0.0)"
6-
}
5+
"version": "[4.*, 5.2.0)"
6+
},
7+
"functionTimeout": "00:10:00"
78
}

0 commit comments

Comments
 (0)