Merge pull request #481 from Azure/luczhan/javaname

Add name to java binding interface

Author: lucyzhang929

java-library/pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>com.microsoft.azure.functions</groupId>
   <artifactId>azure-functions-java-library-sql</artifactId>
-  <version>0.1.0</version> <!-- Update the dependency version in samples-java/pom.xml too if this version is updated. -->
+  <version>0.1.1</version> <!-- Update the dependency version in samples-java/pom.xml too if this version is updated. -->
   <packaging>jar</packaging>
 
   <parent>

java-library/src/main/java/com/microsoft/azure/functions/sql/annotation/SQLInput.java

@@ -15,8 +15,13 @@
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.PARAMETER)
-@CustomBinding(direction = "in", name = "sql", type = "sql")
+@CustomBinding(direction = "in", name = "", type = "sql")
 public @interface SQLInput {
+    /**
+     * The variable name used in function.json.
+     */
+    String name();
+
     /**
      * Query string or name of stored procedure to be run.
      */

java-library/src/main/java/com/microsoft/azure/functions/sql/annotation/SQLOutput.java

@@ -16,8 +16,13 @@
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.PARAMETER, ElementType.METHOD })
-@CustomBinding(direction = "out", name = "sql", type = "sql")
+@CustomBinding(direction = "out", name = "", type = "sql")
 public @interface SQLOutput {
+    /**
+     * The variable name used in function.json.
+     */
+    String name();
+
     /**
      * Name of the table to upsert data to.
      */

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.0</version>
+            <version>0.1.1</version>
         </dependency>
 
         <dependency>

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

@@ -33,6 +33,7 @@ public HttpResponseMessage run(
                 route = "addproduct")
                 HttpRequestMessage<Optional<String>> request,
             @SQLOutput(
+                name = "product",
                 commandText = "Products",
                 connectionStringSetting = "SqlConnectionString")
                 OutputBinding<Product> product) throws JsonParseException, JsonMappingException, IOException {

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

@@ -29,6 +29,7 @@ public HttpResponseMessage run(
                 route = "addproduct-params")
                 HttpRequestMessage<Optional<String>> request,
             @SQLOutput(
+                name = "product",
                 commandText = "Products",
                 connectionStringSetting = "SqlConnectionString")
                 OutputBinding<Product> product) {

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

@@ -23,6 +23,7 @@
 public class AddProductReturnValue {
     @FunctionName("AddProductReturnValue")
     @SQLOutput(
+        name = "product",
         commandText = "Products",
         connectionStringSetting = "SqlConnectionString")
     public Product run(

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

@@ -0,0 +1,54 @@
+/**
+ * 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.HttpMethod;
+import com.microsoft.azure.functions.HttpRequestMessage;
+import com.microsoft.azure.functions.HttpResponseMessage;
+import com.microsoft.azure.functions.HttpStatus;
+import com.microsoft.azure.functions.OutputBinding;
+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.SQLOutput;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.function.Common.Product;
+
+import java.io.IOException;
+import java.util.Optional;
+
+public class AddProductToTwoTables {
+    @FunctionName("AddProductToTwoTables")
+    public HttpResponseMessage run(
+            @HttpTrigger(
+                name = "req",
+                methods = {HttpMethod.POST},
+                authLevel = AuthorizationLevel.ANONYMOUS,
+                route = "addproducttotwotables")
+                HttpRequestMessage<Optional<String>> request,
+            @SQLOutput(
+                name = "product",
+                commandText = "Products",
+                connectionStringSetting = "SqlConnectionString")
+                OutputBinding<Product> product,
+            @SQLOutput(
+                name = "productWithIdentity",
+                commandText = "ProductsWithIdentity",
+                connectionStringSetting = "SqlConnectionString")
+                OutputBinding<Product> productWithIdentity) throws JsonParseException, JsonMappingException, IOException {
+
+        String json = request.getBody().get();
+        ObjectMapper mapper = new ObjectMapper();
+        Product p = mapper.readValue(json, Product.class);
+        product.setValue(p);
+        productWithIdentity.setValue(p);
+
+        return request.createResponseBuilder(HttpStatus.OK).header("Content-Type", "application/json").body(product).build();
+    }
+}

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

@@ -33,6 +33,7 @@ public HttpResponseMessage run(
                 route = "addproductwithdefaultpk")
                 HttpRequestMessage<Optional<String>> request,
             @SQLOutput(
+                name = "product",
                 commandText = "dbo.ProductsWithDefaultPK",
                 connectionStringSetting = "SqlConnectionString")
                 OutputBinding<ProductWithDefaultPK> product) throws JsonParseException, JsonMappingException, IOException {

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

@@ -28,6 +28,7 @@ public HttpResponseMessage run(
                 route = "addproductwithidentitycolumn")
                 HttpRequestMessage<Optional<String>> request,
             @SQLOutput(
+                name = "product",
                 commandText = "ProductsWithIdentity",
                 connectionStringSetting = "SqlConnectionString")
                 OutputBinding<ProductWithoutId> product) {