Add java trigger samples

samples/samples-java/pom.xml

@@ -27,7 +27,7 @@
         <dependency>
             <groupId>com.microsoft.azure.functions</groupId>
             <artifactId>azure-functions-java-library-sql</artifactId>
-            <version>0.1.1</version>
+            <version>2.0.0-preview</version>
         </dependency>
 
         <dependency>
@@ -36,6 +36,12 @@
             <version>2.13.4.2</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.10.1</version>
+        </dependency>
+
         <!-- Test -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>

samples/samples-java/src/main/java/com/function/Common/SqlChangeOperation.java

@@ -0,0 +1,18 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ */
+
+package com.function.Common;
+
+import com.google.gson.annotations.SerializedName;
+
+public enum SqlChangeOperation {
+    @SerializedName("0")
+    Insert,
+    @SerializedName("1")
+    Update,
+    @SerializedName("2")
+    Delete
+}

samples/samples-java/src/main/java/com/function/Common/SqlChangeProduct.java

@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ */
+
+package com.function.Common;
+
+public class SqlChangeProduct {
+    private SqlChangeOperation Operation;
+    private Product Item;
+
+    public SqlChangeProduct() {
+    }
+
+    public SqlChangeProduct(SqlChangeOperation operation, Product item) {
+        this.Operation = operation;
+        this.Item = item;
+    }
+
+    public SqlChangeOperation getOperation() {
+        return Operation;
+    }
+
+    public void setOperation(SqlChangeOperation operation) {
+        this.Operation = operation;
+    }
+
+    public Product getItem() {
+        return Item;
+    }
+
+    public void setItem(Product item) {
+        this.Item = item;
+    }
+}

samples/samples-java/src/main/java/com/function/GetAndAddProducts.java

@@ -16,6 +16,7 @@
 import com.microsoft.azure.functions.annotation.FunctionName;
 import com.microsoft.azure.functions.annotation.HttpTrigger;
 import com.microsoft.azure.functions.sql.annotation.SQLInput;
+import com.microsoft.azure.functions.sql.annotation.CommandType;
 import com.microsoft.azure.functions.sql.annotation.SQLOutput;
 
 import java.util.Optional;
@@ -36,7 +37,7 @@ public HttpResponseMessage run(
             @SQLInput(
                 name = "products",
                 commandText = "SELECT * FROM Products WHERE Cost = @Cost",
-                commandType = "Text",
+                commandType = CommandType.Text,
                 parameters = "@Cost={cost}",
                 connectionStringSetting = "SqlConnectionString")
                 Product[] products,

samples/samples-java/src/main/java/com/function/GetProductNamesView.java

@@ -14,6 +14,7 @@
 import com.microsoft.azure.functions.annotation.AuthorizationLevel;
 import com.microsoft.azure.functions.annotation.FunctionName;
 import com.microsoft.azure.functions.annotation.HttpTrigger;
+import com.microsoft.azure.functions.sql.annotation.CommandType;
 import com.microsoft.azure.functions.sql.annotation.SQLInput;
 
 import java.util.Optional;
@@ -30,7 +31,7 @@ public HttpResponseMessage run(
             @SQLInput(
                 name = "productNames",
                 commandText = "SELECT * FROM ProductNames",
-                commandType = "Text",
+                commandType = CommandType.Text,
                 connectionStringSetting = "SqlConnectionString")
                 ProductName[] products) {
 

samples/samples-java/src/main/java/com/function/GetProducts.java

@@ -14,6 +14,7 @@
 import com.microsoft.azure.functions.annotation.AuthorizationLevel;
 import com.microsoft.azure.functions.annotation.FunctionName;
 import com.microsoft.azure.functions.annotation.HttpTrigger;
+import com.microsoft.azure.functions.sql.annotation.CommandType;
 import com.microsoft.azure.functions.sql.annotation.SQLInput;
 
 import java.util.Optional;
@@ -30,7 +31,7 @@ public HttpResponseMessage run(
             @SQLInput(
                 name = "products",
                 commandText = "SELECT * FROM Products WHERE Cost = @Cost",
-                commandType = "Text",
+                commandType = CommandType.Text,
                 parameters = "@Cost={cost}",
                 connectionStringSetting = "SqlConnectionString")
                 Product[] products) {

samples/samples-java/src/main/java/com/function/GetProductsFromTwoTables.java

@@ -14,6 +14,7 @@
 import com.microsoft.azure.functions.annotation.AuthorizationLevel;
 import com.microsoft.azure.functions.annotation.FunctionName;
 import com.microsoft.azure.functions.annotation.HttpTrigger;
+import com.microsoft.azure.functions.sql.annotation.CommandType;
 import com.microsoft.azure.functions.sql.annotation.SQLInput;
 
 import java.util.Optional;
@@ -34,14 +35,14 @@ public HttpResponseMessage run(
             @SQLInput(
                 name = "products",
                 commandText = "SELECT * FROM Products WHERE Cost = @Cost",
-                commandType = "Text",
+                commandType = CommandType.Text,
                 parameters = "@Cost={cost}",
                 connectionStringSetting = "SqlConnectionString")
                 Product[] products,
             @SQLInput(
                 name = "productsWithIdentity",
                 commandText = "SELECT * FROM ProductsWithIdentity WHERE Cost = @Cost",
-                commandType = "Text",
+                commandType = CommandType.Text,
                 parameters = "@Cost={cost}",
                 connectionStringSetting = "SqlConnectionString")
                 Product[] productsWithIdentity) {

samples/samples-java/src/main/java/com/function/GetProductsNameEmpty.java

@@ -14,6 +14,7 @@
 import com.microsoft.azure.functions.annotation.AuthorizationLevel;
 import com.microsoft.azure.functions.annotation.FunctionName;
 import com.microsoft.azure.functions.annotation.HttpTrigger;
+import com.microsoft.azure.functions.sql.annotation.CommandType;
 import com.microsoft.azure.functions.sql.annotation.SQLInput;
 
 import java.util.Optional;
@@ -30,7 +31,7 @@ public HttpResponseMessage run(
             @SQLInput(
                 name = "products",
                 commandText = "SELECT * FROM Products WHERE Cost = @Cost and Name = @Name",
-                commandType = "Text",
+                commandType = CommandType.Text,
                 parameters = "@Cost={cost},@Name=",
                 connectionStringSetting = "SqlConnectionString")
                 Product[] products) {

samples/samples-java/src/main/java/com/function/GetProductsStoredProcedure.java

@@ -14,6 +14,7 @@
 import com.microsoft.azure.functions.annotation.AuthorizationLevel;
 import com.microsoft.azure.functions.annotation.FunctionName;
 import com.microsoft.azure.functions.annotation.HttpTrigger;
+import com.microsoft.azure.functions.sql.annotation.CommandType;
 import com.microsoft.azure.functions.sql.annotation.SQLInput;
 
 import java.util.Optional;
@@ -30,7 +31,7 @@ public HttpResponseMessage run(
             @SQLInput(
                 name = "products",
                 commandText = "SelectProductsCost",
-                commandType = "StoredProcedure",
+                commandType = CommandType.StoredProcedure,
                 parameters = "@Cost={cost}",
                 connectionStringSetting = "SqlConnectionString")
                 Product[] products) {

samples/samples-java/src/main/java/com/function/GetProductsStoredProcedureFromAppSetting.java

@@ -14,6 +14,7 @@
 import com.microsoft.azure.functions.annotation.AuthorizationLevel;
 import com.microsoft.azure.functions.annotation.FunctionName;
 import com.microsoft.azure.functions.annotation.HttpTrigger;
+import com.microsoft.azure.functions.sql.annotation.CommandType;
 import com.microsoft.azure.functions.sql.annotation.SQLInput;
 
 import java.util.Optional;
@@ -30,7 +31,7 @@ public HttpResponseMessage run(
             @SQLInput(
                 name = "products",
                 commandText = "%Sp_SelectCost%",
-                commandType = "StoredProcedure",
+                commandType = CommandType.StoredProcedure,
                 parameters = "@Cost=%ProductCost%",
                 connectionStringSetting = "SqlConnectionString")
                 Product[] products) {

samples/samples-java/src/main/java/com/function/ProductsTrigger.java

@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ */
+
+package com.function;
+
+import com.microsoft.azure.functions.ExecutionContext;
+import com.microsoft.azure.functions.annotation.FunctionName;
+import com.microsoft.azure.functions.sql.annotation.SQLTrigger;
+import com.function.Common.SqlChangeProduct;
+import com.google.gson.Gson;
+
+import java.util.logging.Level;
+
+public class ProductsTrigger {
+    @FunctionName("ProductsTrigger")
+    public void run(
+            @SQLTrigger(
+                name = "changes",
+                tableName = "[dbo].[Products]",
+                connectionStringSetting = "SqlConnectionString")
+                SqlChangeProduct[] changes,
+            ExecutionContext context) {
+
+        context.getLogger().log(Level.INFO, "SQL Changes: " + new Gson().toJson(changes));
+    }
+}

test/Integration/SqlTriggerBindingIntegrationTests.cs

@@ -31,7 +31,7 @@ public SqlTriggerBindingIntegrationTests(ITestOutputHelper output = null) : base
         /// </summary>
         [Theory]
         [SqlInlineData()]
-        [UnsupportedLanguages(SupportedLanguages.Java, SupportedLanguages.CSharpscript)]
+        [UnsupportedLanguages(SupportedLanguages.CSharpscript)]
         public async Task SingleOperationTriggerTest(SupportedLanguages lang)
         {
             this.SetChangeTrackingForTable("Products");
@@ -80,7 +80,7 @@ await this.WaitForProductChanges(
         /// </summary>
         [Theory]
         [SqlInlineData()]
-        [UnsupportedLanguages(SupportedLanguages.Java, SupportedLanguages.CSharpscript)]
+        [UnsupportedLanguages(SupportedLanguages.CSharpscript)]
         public async Task BatchSizeOverrideTriggerTest(SupportedLanguages lang)
         {
             // Use enough items to require 4 batches to be processed but then
@@ -124,7 +124,7 @@ await this.WaitForProductChanges(
         /// </summary>
         [Theory]
         [SqlInlineData()]
-        [UnsupportedLanguages(SupportedLanguages.Java, SupportedLanguages.CSharpscript)]
+        [UnsupportedLanguages(SupportedLanguages.CSharpscript)]
         public async Task MaxBatchSizeOverrideTriggerTest(SupportedLanguages lang)
         {
             // Use enough items to require 4 batches to be processed but then
@@ -168,7 +168,7 @@ await this.WaitForProductChanges(
         /// </summary>
         [Theory]
         [SqlInlineData()]
-        [UnsupportedLanguages(SupportedLanguages.Java, SupportedLanguages.OutOfProc, SupportedLanguages.CSharpscript)]
+        [UnsupportedLanguages(SupportedLanguages.OutOfProc, SupportedLanguages.CSharpscript)]
         public async Task PollingIntervalOverrideTriggerTest(SupportedLanguages lang)
         {
             const int firstId = 1;
@@ -211,7 +211,7 @@ await this.WaitForProductChanges(
         /// </summary>
         [Theory]
         [SqlInlineData()]
-        [UnsupportedLanguages(SupportedLanguages.Java, SupportedLanguages.CSharpscript)]
+        [UnsupportedLanguages(SupportedLanguages.CSharpscript)]
         public async Task MultiOperationTriggerTest(SupportedLanguages lang)
         {
             int firstId = 1;
@@ -293,7 +293,7 @@ await this.WaitForProductChanges(
         /// </summary>
         [Theory]
         [SqlInlineData()]
-        [UnsupportedLanguages(SupportedLanguages.Java, SupportedLanguages.OutOfProc, SupportedLanguages.CSharpscript)]
+        [UnsupportedLanguages(SupportedLanguages.OutOfProc, SupportedLanguages.CSharpscript)]
         public async Task MultiFunctionTriggerTest(SupportedLanguages lang)
         {
             const string Trigger1Changes = "Trigger1 Changes: ";
@@ -420,7 +420,7 @@ public async Task MultiFunctionTriggerTest(SupportedLanguages lang)
         /// </summary>
         [Theory]
         [SqlInlineData()]
-        [UnsupportedLanguages(SupportedLanguages.Java, SupportedLanguages.CSharpscript)]
+        [UnsupportedLanguages(SupportedLanguages.CSharpscript)]
         public async Task MultiHostTriggerTest(SupportedLanguages lang)
         {
             this.SetChangeTrackingForTable("Products");
@@ -472,7 +472,7 @@ await this.WaitForProductChanges(
         /// </summary>
         [Theory]
         [SqlInlineData()]
-        [UnsupportedLanguages(SupportedLanguages.Java, SupportedLanguages.OutOfProc, SupportedLanguages.CSharpscript)]
+        [UnsupportedLanguages(SupportedLanguages.OutOfProc, SupportedLanguages.CSharpscript)]
         public void TableNotPresentTriggerTest(SupportedLanguages lang)
         {
             this.StartFunctionHostAndWaitForError(
@@ -487,7 +487,7 @@ public void TableNotPresentTriggerTest(SupportedLanguages lang)
         /// </summary>
         [Theory]
         [SqlInlineData()]
-        [UnsupportedLanguages(SupportedLanguages.Java, SupportedLanguages.OutOfProc, SupportedLanguages.CSharpscript)]
+        [UnsupportedLanguages(SupportedLanguages.OutOfProc, SupportedLanguages.CSharpscript)]
         public void PrimaryKeyNotCreatedTriggerTest(SupportedLanguages lang)
         {
             this.StartFunctionHostAndWaitForError(
@@ -503,7 +503,7 @@ public void PrimaryKeyNotCreatedTriggerTest(SupportedLanguages lang)
         /// </summary>
         [Theory]
         [SqlInlineData()]
-        [UnsupportedLanguages(SupportedLanguages.Java, SupportedLanguages.OutOfProc, SupportedLanguages.CSharpscript)]
+        [UnsupportedLanguages(SupportedLanguages.OutOfProc, SupportedLanguages.CSharpscript)]
         public void ReservedPrimaryKeyColumnNamesTriggerTest(SupportedLanguages lang)
         {
             this.StartFunctionHostAndWaitForError(
@@ -519,7 +519,7 @@ public void ReservedPrimaryKeyColumnNamesTriggerTest(SupportedLanguages lang)
         /// </summary>
         [Theory]
         [SqlInlineData()]
-        [UnsupportedLanguages(SupportedLanguages.Java, SupportedLanguages.OutOfProc, SupportedLanguages.CSharpscript)]
+        [UnsupportedLanguages(SupportedLanguages.OutOfProc, SupportedLanguages.CSharpscript)]
         public void UnsupportedColumnTypesTriggerTest(SupportedLanguages lang)
         {
             this.StartFunctionHostAndWaitForError(
@@ -535,7 +535,7 @@ public void UnsupportedColumnTypesTriggerTest(SupportedLanguages lang)
         /// </summary>
         [Theory]
         [SqlInlineData()]
-        [UnsupportedLanguages(SupportedLanguages.Java, SupportedLanguages.CSharpscript)]
+        [UnsupportedLanguages(SupportedLanguages.CSharpscript)]
         public void ChangeTrackingNotEnabledTriggerTest(SupportedLanguages lang)
         {
             this.StartFunctionHostAndWaitForError(
@@ -570,7 +570,7 @@ public async void GetMetricsTest()
         /// </summary>
         [Theory]
         [SqlInlineData()]
-        [UnsupportedLanguages(SupportedLanguages.Java, SupportedLanguages.CSharpscript)]
+        [UnsupportedLanguages(SupportedLanguages.CSharpscript)]
         public void UnsupportedDatabaseThrows(SupportedLanguages lang)
         {
             // Change database compat level to unsupported version

test/Integration/test-java/ProductsTriggerWithValidation.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ */
+
+package com.function;
+
+import com.function.Common.SqlChangeProduct;
+import com.google.gson.Gson;
+import com.microsoft.azure.functions.ExecutionContext;
+import com.microsoft.azure.functions.annotation.FunctionName;
+import com.microsoft.azure.functions.sql.annotation.SQLTrigger;
+
+import java.util.logging.Level;
+
+public class ProductsTriggerWithValidation {
+    @FunctionName("ProductsTriggerWithValidation")
+    public void run(
+            @SQLTrigger(
+                name = "changes",
+                tableName = "[dbo].[Products]",
+                connectionStringSetting = "SqlConnectionString")
+                SqlChangeProduct[] changes,
+            ExecutionContext context) throws Exception {
+
+        int expectedMaxBatchSize = Integer.parseInt(System.getenv("TEST_EXPECTED_MAX_BATCH_SIZE"));
+        if (expectedMaxBatchSize != changes.length) {
+            throw new Exception("Invalid max batch size, got " + changes.length + " changes but expected " + expectedMaxBatchSize);
+        }
+        context.getLogger().log(Level.INFO, "SQL Changes: " + new Gson().toJson(changes));
+    }
+}