Skip to content

Commit f17d4b8

Browse files
pragnagopapragnagopa
authored
Update azure.functions.maven.plugin.version 1.0.0-beta-8-SNAPSHOT (#230)
* Update E2E tests to use azure.functions.maven.plugin.version 1.0.0-beta-8-SNAPSHOT * Add Cardinality to EventHubTests * Add plugin repository
1 parent 5786b8b commit f17d4b8

File tree

5 files changed

+34
-65
lines changed

5 files changed

+34
-65
lines changed

‎endtoendtests/functionInputJson.json‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎endtoendtests/functionInputString.json‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎endtoendtests/pom.xml‎

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1515
<maven.compiler.source>1.8</maven.compiler.source>
1616
<maven.compiler.target>1.8</maven.compiler.target>
17-
<azure.functions.maven.plugin.version>1.0.0-beta-7</azure.functions.maven.plugin.version>
18-
<azure.functions.java.library.version>1.0.0-beta-7-SNAPSHOT</azure.functions.java.library.version>
17+
<azure.functions.maven.plugin.version>1.0.0-beta-8-SNAPSHOT</azure.functions.maven.plugin.version>
18+
<azure.functions.java.library.version>1.0.0-beta-7-SNAPSHOT</azure.functions.java.library.version>
1919
<functionAppName>azure-functions-java-endtoendtests</functionAppName>
2020
<functionAppRegion>westus</functionAppRegion>
2121
<functionResourceGroup>java-functions-group</functionResourceGroup>
@@ -24,18 +24,32 @@
2424
</properties>
2525

2626
<repositories>
27-
<repository>
28-
<id>maven.snapshots</id>
29-
<name>Maven Central Snapshot Repository</name>
30-
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
31-
<releases>
32-
<enabled>false</enabled>
33-
</releases>
34-
<snapshots>
35-
<enabled>true</enabled>
36-
</snapshots>
37-
</repository>
38-
</repositories>
27+
<repository>
28+
<id>maven.snapshots</id>
29+
<name>Maven Central Snapshot Repository</name>
30+
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
31+
<releases>
32+
<enabled>false</enabled>
33+
</releases>
34+
<snapshots>
35+
<enabled>true</enabled>
36+
</snapshots>
37+
</repository>
38+
</repositories>
39+
40+
<pluginRepositories>
41+
<pluginRepository>
42+
<id>maven.snapshots</id>
43+
<name>Maven Central Snapshot Repository</name>
44+
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
45+
<releases>
46+
<enabled>false</enabled>
47+
</releases>
48+
<snapshots>
49+
<enabled>true</enabled>
50+
</snapshots>
51+
</pluginRepository>
52+
</pluginRepositories>
3953

4054
<dependencyManagement>
4155
<dependencies>

‎endtoendtests/src/main/java/com/microsoft/azure/functions/endtoend/EventHubTriggerTests.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class EventHubTriggerTests {
1313
*/
1414
@FunctionName("EventHubTriggerAndOutputJSON")
1515
public void EventHubTriggerAndOutputJSON(
16-
@EventHubTrigger(name = "messages", eventHubName = "test-inputjson-java", connection = "AzureWebJobsEventHubSender") List<String> messages,
16+
@EventHubTrigger(name = "messages", eventHubName = "test-inputjson-java", connection = "AzureWebJobsEventHubSender", cardinality = Cardinality.MANY) List<String> messages,
1717
@EventHubOutput(name = "output", eventHubName = "test-outputjson-java", connection = "AzureWebJobsEventHubSender") OutputBinding<String> output,
1818
final ExecutionContext context
1919
) {
@@ -23,7 +23,7 @@ public void EventHubTriggerAndOutputJSON(
2323

2424
@FunctionName("EventHubTriggerAndOutputString")
2525
public void EventHubTriggerAndOutputString(
26-
@EventHubTrigger(name = "messages", eventHubName = "test-input-java", connection = "AzureWebJobsEventHubSender", dataType = "string") String[] messages,
26+
@EventHubTrigger(name = "messages", eventHubName = "test-input-java", connection = "AzureWebJobsEventHubSender", dataType = "string", cardinality = Cardinality.MANY) String[] messages,
2727
@EventHubOutput(name = "output", eventHubName = "test-output-java", connection = "AzureWebJobsEventHubSender") OutputBinding<String> output,
2828
final ExecutionContext context
2929
) {
@@ -33,7 +33,7 @@ public void EventHubTriggerAndOutputString(
3333

3434
@FunctionName("EventHubTriggerCardinalityOne")
3535
public void EventHubTriggerCardinalityOne(
36-
@EventHubTrigger(name = "message", eventHubName = "test-inputOne-java", connection = "AzureWebJobsEventHubSender", dataType = "string") String message,
36+
@EventHubTrigger(name = "message", eventHubName = "test-inputOne-java", connection = "AzureWebJobsEventHubSender", dataType = "string", cardinality = Cardinality.ONE) String message,
3737
@EventHubOutput(name = "output", eventHubName = "test-outputone-java", connection = "AzureWebJobsEventHubSender") OutputBinding<String> output,
3838
final ExecutionContext context
3939
) {
@@ -56,7 +56,7 @@ public void TestEventHubOutputJson(
5656

5757
@FunctionName("TestEventHubOutput")
5858
public void TestEventHubOutput(
59-
@EventHubTrigger(name = "message", eventHubName = "test-output-java", connection = "AzureWebJobsEventHubSender") String message,
59+
@EventHubTrigger(name = "message", eventHubName = "test-output-java", connection = "AzureWebJobsEventHubSender", cardinality = Cardinality.ONE) String message,
6060
@QueueOutput(name = "output", queueName = "test-eventhuboutput-java", connection = "AzureWebJobsStorage") OutputBinding<String> output,
6161
final ExecutionContext context
6262
) {
@@ -66,7 +66,7 @@ public void TestEventHubOutput(
6666

6767
@FunctionName("TestEventHubOutputInputOne")
6868
public void TestEventHubOutputInputOne(
69-
@EventHubTrigger(name = "message", eventHubName = "test-outputone-java", connection = "AzureWebJobsEventHubSender") String message,
69+
@EventHubTrigger(name = "message", eventHubName = "test-outputone-java", connection = "AzureWebJobsEventHubSender", cardinality = Cardinality.ONE) String message,
7070
@QueueOutput(name = "output", queueName = "test-eventhuboutputone-java", connection = "AzureWebJobsStorage") OutputBinding<String> output,
7171
final ExecutionContext context
7272
) {

‎setup-tests.ps1‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,4 @@ Push-Location -Path "./endtoendtests" -StackName javaWorkerDir
3636
Write-Host "Building azure-functions-maven-com.microsoft.azure.functions.endtoendtests"
3737
cmd.exe /c '.\..\mvnBuildSkipTests.bat'
3838
StopOnFailedExecution
39-
Pop-Location -StackName "javaWorkerDir"
40-
41-
Write-Host "Copying EventHubs function.json as temporary workaround...."
42-
Copy-Item ".\endtoendtests\functionInputJson.json" ".\endtoendtests\target\azure-functions\azure-functions-java-endtoendtests\EventHubTriggerAndOutputJSON\function.json"
43-
Copy-Item ".\endtoendtests\functionInputString.json" ".\endtoendtests\target\azure-functions\azure-functions-java-endtoendtests\EventHubTriggerAndOutputString\function.json"
39+
Pop-Location -StackName "javaWorkerDir"

0 commit comments

Comments
 (0)