[Preview] SDK types - BlobClient and BlobContainerClient

emulatedtests/Azure.Functions.Java.Tests.E2E/Azure.Functions.Java.Tests.E2E/Constants.cs

@@ -24,6 +24,8 @@ public static class Constants
         public static string TriggerInputBindingBlobContainer = "test-triggerinput-java-new";
         public static string InputBindingBlobContainer = "test-input-java-new";
         public static string OutputBindingBlobContainer = "test-output-java-new";
+        public static string TriggerInputBindingBlobClientSdk = "test-triggerinput-blobclient";
+        public static string TriggerInputBindingBlobContainerClientSdk = "test-triggerinput-blobcontclient";
 
         // Xunit Fixtures and Collections
         public const string FunctionAppCollectionName = "FunctionAppCollection";

emulatedtests/Azure.Functions.Java.Tests.E2E/Azure.Functions.Java.Tests.E2E/Helpers/StorageHelpers.cs

@@ -84,13 +84,17 @@ public async static Task ClearBlobContainers()
             await ClearBlobContainer(Constants.TriggerInputBindingBlobContainer);
             await ClearBlobContainer(Constants.InputBindingBlobContainer);
             await ClearBlobContainer(Constants.OutputBindingBlobContainer);
+            await ClearBlobContainer(Constants.TriggerInputBindingBlobClientSdk);
+            await ClearBlobContainer(Constants.TriggerInputBindingBlobContainerClientSdk);
         }
 
         public async static Task CreateBlobContainers()
         {
             await CreateBlobContainer(Constants.TriggerInputBindingBlobContainer);
             await CreateBlobContainer(Constants.InputBindingBlobContainer);
             await CreateBlobContainer(Constants.OutputBindingBlobContainer);
+            await CreateBlobContainer(Constants.TriggerInputBindingBlobClientSdk);
+            await CreateBlobContainer(Constants.TriggerInputBindingBlobContainerClientSdk);
         }
 
         public async static Task UpdloadFileToContainer(string containerName, string expectedFileName)

emulatedtests/Azure.Functions.Java.Tests.E2E/Azure.Functions.Java.Tests.E2E/StorageEndToEndTests.cs

@@ -110,5 +110,45 @@ public async Task BlobTriggerToBlob_Succeeds()
 
             Assert.Equal("Hello World", result);
         }
+
+        [Fact]
+        [Trait("Category", "SdkTypes")]
+        public async Task BlobTriggerToBlob_BlobClient_Succeeds()
+        {
+            string fileName = Guid.NewGuid().ToString();
+
+            //cleanup
+            await StorageHelpers.ClearBlobContainers();
+
+            //Setup
+            await StorageHelpers.CreateBlobContainers();
+
+            //Trigger
+            await StorageHelpers.UpdloadFileToContainer(Constants.TriggerInputBindingBlobClientSdk, fileName);
+
+            //Verify
+            string result = await StorageHelpers.DownloadFileFromContainer(Constants.OutputBindingBlobContainer, "testfile");
+            Assert.Equal("Hello World", result);
+        }
+
+        [Fact]
+        [Trait("Category", "SdkTypes")]
+        public async Task BlobTriggerToBlob_BlobContainerClient_Succeeds()
+        {
+            string fileName = Guid.NewGuid().ToString();
+
+            //cleanup
+            await StorageHelpers.ClearBlobContainers();
+
+            //Setup
+            await StorageHelpers.CreateBlobContainers();
+
+            //Trigger
+            await StorageHelpers.UpdloadFileToContainer(Constants.TriggerInputBindingBlobContainerClientSdk, fileName);
+
+            //Verify
+            string result = await StorageHelpers.DownloadFileFromContainer(Constants.OutputBindingBlobContainer, "testfile");
+            Assert.Equal("Hello World", result);
+        }
     }
 }

emulatedtests/pom.xml

@@ -21,14 +21,16 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
-		<azure.functions.maven.plugin.version>1.18.0</azure.functions.maven.plugin.version>
+		<azure.functions.maven.plugin.version>1.37.1</azure.functions.maven.plugin.version>
 		<azure.functions.java.library.version>3.1.0</azure.functions.java.library.version>
 		<azure.functions.java.library.sql.version>2.1.0</azure.functions.java.library.sql.version>
 		<durabletask.azure.functions>1.0.0-beta.1</durabletask.azure.functions>
 		<functionAppName>azure-functions-java-emulatedtests</functionAppName>
 		<functionAppRegion>westus</functionAppRegion>
 		<functionResourceGroup>java-functions-group</functionResourceGroup>
 		<start-class>com.microsoft.azure.functions.endtoend.springcloud.Config</start-class>
+		<!-- Empty by default: no exclusion -->
+		<excludedClassPattern>**/___noop___.java</excludedClassPattern>
 	</properties>
 
 	<repositories>
@@ -112,6 +114,11 @@
 			<artifactId>spring-cloud-starter-function-web</artifactId>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.azure</groupId>
+			<artifactId>azure-storage-blob</artifactId>
+			<version>12.29.0</version>
+		</dependency>
 	</dependencies>
 
 	<dependencyManagement>
@@ -136,6 +143,9 @@
 					<source>${java.version}</source>
 					<target>${java.version}</target>
 					<encoding>${project.build.sourceEncoding}</encoding>
+					<excludes>
+						<exclude>${excludedClassPattern}</exclude>
+					</excludes>
 				</configuration>
 			</plugin>
 			<plugin>

emulatedtests/src/main/java/com/microsoft/azure/functions/endtoend/BlobTriggerSdkTypesTests.java

@@ -0,0 +1,59 @@
+package com.microsoft.azure.functions.endtoend;
+
+import com.azure.storage.blob.BlobClient;
+import com.azure.storage.blob.BlobContainerClient;
+import com.microsoft.azure.functions.ExecutionContext;
+import com.microsoft.azure.functions.OutputBinding;
+import com.microsoft.azure.functions.annotation.*;
+
+import java.io.ByteArrayOutputStream;
+
+/**
+ * Azure Functions with Azure Storage Blob.
+ */
+public class BlobTriggerSdkTypesTests {
+    /**
+     * This function will be invoked when a new or updated blob is detected at the specified path. The blob contents are provided as input to this function.
+     */
+    @FunctionName("BlobTriggerUsingBlobClientToBlobTest")
+    @StorageAccount("AzureWebJobsStorage")
+    public void BlobTriggerToBlobTest_BlobClient(
+            @BlobTrigger(name = "triggerBlob", path = "test-triggerinput-blobclient/{name}", dataType = "binary") BlobClient triggerBlobClient,
+            @BindingName("name") String fileName,
+            @BlobOutput(name = "outputBlob", path = "test-output-java-new/testfile.txt", dataType = "binary") OutputBinding<byte[]> outputBlob,
+            final ExecutionContext context
+    ) {
+        context.getLogger().info("BlobTriggerUsingBlobClient triggered for blob: " + fileName);
+
+        // Download the blob content
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        triggerBlobClient.downloadStream(outputStream);
+
+        // Set the downloaded content as output
+        outputBlob.setValue(outputStream.toByteArray());
+        context.getLogger().info("Uploaded blob " + fileName + " to container test-output-java-new/testfile.txt");
+    }
+
+    /**
+     * This function will be invoked when a new or updated blob is detected at the specified path. The blob contents are provided as input to this function.
+     */
+    @FunctionName("BlobTriggerUsingBlobContainerClientToBlobTest")
+    @StorageAccount("AzureWebJobsStorage")
+    public void BlobTriggerToBlobTest_BlobContainerClient(
+            @BlobTrigger(name = "triggerBlob", path = "test-triggerinput-blobcontclient/{name}", dataType = "binary") BlobContainerClient triggerBlobContainerClient,
+            @BindingName("name") String fileName,
+            @BlobOutput(name = "outputBlob", path = "test-output-java-new/testfile.txt", dataType = "binary") OutputBinding<byte[]> outputBlob,
+            final ExecutionContext context
+    ) {
+        context.getLogger().info("BlobTriggerUsingBlobContainerClient triggered for blob: " + fileName);
+
+        // Download the blob content
+        BlobClient triggerBlobClient = triggerBlobContainerClient.getBlobClient(fileName);
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        triggerBlobClient.downloadStream(outputStream);
+
+        // Set the downloaded content as output
+        outputBlob.setValue(outputStream.toByteArray());
+        context.getLogger().info("Uploaded blob " + fileName + " to container test-output-java-new/testfile.txt");
+    }
+}

emulatedtests/src/main/java/com/microsoft/azure/functions/endtoend/BlobTriggerTests.java

@@ -2,9 +2,6 @@
 
 import com.microsoft.azure.functions.annotation.*;
 
-import java.util.List;
-import java.util.Optional;
-
 import com.microsoft.azure.functions.*;
 
 /**
@@ -56,7 +53,7 @@ public void BlobTriggerStringTest(
         context.getLogger().info("Java Blob trigger function BlobTriggerStringTest processed a blob.\n Name: " + fileName + "\n Content: " + triggerBlobText);
         outputBlob.setValue(triggerBlobText);
     }
-    
+
     public static class TestBlobData {
       public String blobText;
   }

eng/ci/public-build.yml

@@ -24,6 +24,11 @@ resources:
       name: 1ESPipelineTemplates/1ESPipelineTemplates
       ref: refs/tags/release
 
+parameters:
+  - name: runSdkTypesTests
+    type: boolean
+    default: false
+
 extends:
   template: v1/1ES.Unofficial.PipelineTemplate.yml@1es
   parameters:
@@ -55,10 +60,12 @@ extends:
           - template: /eng/ci/templates/jobs/run-emulated-tests-windows.yml@self
             parameters:
               poolName: 1es-pool-azfunc-public
+              runSdkTypesTests: ${{ parameters.runSdkTypesTests }}
 
       - stage: TestLinux
         dependsOn: Build
         jobs:
           - template: /eng/ci/templates/jobs/run-emulated-tests-linux.yml@self
             parameters:
               poolName: 1es-pool-azfunc-public
+              runSdkTypesTests: ${{ parameters.runSdkTypesTests }}

eng/ci/templates/jobs/build.yml

@@ -14,6 +14,9 @@ jobs:
     - pwsh: |
         java -version
       displayName: 'Check default java version'
+    - pwsh: |
+        .\installLibsLocally.ps1
+      displayName: 'Install java-additions locally'
     - pwsh: |
         mvn clean package
       displayName: 'Build java worker'

eng/ci/templates/jobs/run-emulated-tests-linux.yml

@@ -1,5 +1,10 @@
 parameters:
-  poolName: ''
+  - name: poolName
+    type: string
+    default: ''
+  - name: runSdkTypesTests
+    type: boolean
+    default: false
 
 jobs:
   - job: "TestLinux"
@@ -57,18 +62,6 @@ jobs:
       - pwsh: |
           java -version
         displayName: 'Check default java version'
-      - pwsh: |
-          if ("$(isTag)"){
-            $buildNumber="$(Build.SourceBranchName)"
-            Write-Host "Found git tag."
-          }
-          else {
-            $buildNumber="$(Build.BuildNumber)-v4"
-            Write-Host "git tag not found. Setting package suffix to '$buildNumber'"
-          }
-          Write-Host "##vso[task.setvariable variable=buildNumber;isOutput=true;]$buildNumber"
-          .\package-pipeline.ps1 -buildNumber $buildNumber
-        displayName: 'Executing build script'
       - task: UseDotNet@2
         displayName: 'Install .NET 6'
         inputs:
@@ -87,6 +80,30 @@ jobs:
           jdkDestinationDirectory: "$(downloadPath)/externals"
           cleanDestinationDirectory: true
         displayName: 'Setup Java for Linux'
+      - bash: |
+          docker compose -f emulatedtests/utils/docker-compose.yml pull
+          docker compose -f emulatedtests/utils/docker-compose.yml up -d
+        displayName: 'Install Azurite and Start Emulators'
+      - pwsh: |
+          .\installLibsLocally.ps1
+        displayName: 'Install java-additions locally'
+      - pwsh: |
+          if ("$(isTag)"){
+            $buildNumber="$(Build.SourceBranchName)"
+            Write-Host "Found git tag."
+          }
+          else {
+            $buildNumber="$(Build.BuildNumber)-v4"
+            Write-Host "git tag not found. Setting package suffix to '$buildNumber'"
+          }
+          Write-Host "##vso[task.setvariable variable=buildNumber;isOutput=true;]$buildNumber"
+          .\package-pipeline.ps1 -buildNumber $buildNumber
+        displayName: 'Executing build script'
+      - pwsh: |
+          cd ./emulatedtests
+          mvn clean package -DexcludedClassPattern="**/BlobTriggerSdkTypesTests.java" `-Dmaven`.javadoc`.skip=true `-Dmaven`.test`.skip `-Dorg`.slf4j`.simpleLogger`.log`.org`.apache`.maven`.cli`.transfer`.Slf4jMavenTransferListener=warn `-B
+          Copy-Item "confluent_cloud_cacert.pem" "./target/azure-functions/azure-functions-java-emulatedtests"
+        displayName: 'Package Java for E2E'
       - pwsh: |
           .\setup-tests-pipeline.ps1
         displayName: 'Setup test environment -- Install the Core Tools'
@@ -96,23 +113,57 @@ jobs:
           export PATH=$PATH:./Azure.Functions.Cli
           func --version
         displayName: 'Setup Core Tools - Linux'
-      - pwsh: |
-          cd ./emulatedtests
-          mvn clean package `-Dmaven`.javadoc`.skip=true `-Dmaven`.test`.skip `-Dorg`.slf4j`.simpleLogger`.log`.org`.apache`.maven`.cli`.transfer`.Slf4jMavenTransferListener=warn `-B
-          Copy-Item "confluent_cloud_cacert.pem" "./target/azure-functions/azure-functions-java-emulatedtests"
-        displayName: 'Package Java for E2E'
-      - bash: |
-          docker compose -f emulatedtests/utils/docker-compose.yml pull
-          docker compose -f emulatedtests/utils/docker-compose.yml up -d
-        displayName: 'Install Azurite and Start Emulators'
       - task: DotNetCoreCLI@2
         retryCountOnTaskFailure: 3
         inputs:
           command: 'test'
           projects: |
             emulatedtests/Azure.Functions.Java.Tests.E2E/Azure.Functions.Java.Tests.E2E/Azure.Functions.Java.Tests.E2E.csproj
+          arguments: '--filter "Category!=SdkTypes"'
         env:
           JAVA_HOME: $(JavaHome)
           AzureWebJobsStorage: "UseDevelopmentStorage=true"
         displayName: 'Build & Run tests'
-        continueOnError: false
+        continueOnError: false
+      # ------------------------------------------
+      # Conditionally run an additional set of steps for "SDK types" scenario
+      # ------------------------------------------
+      - ${{ if eq(parameters.runSdkTypesTests, true) }}:
+          - pwsh: |
+              if ("$(isTag)"){
+                $buildNumber="$(Build.SourceBranchName)"
+                Write-Host "Found git tag."
+              }
+              else {
+                $buildNumber="$(Build.BuildNumber)-v4"
+                Write-Host "git tag not found. Setting package suffix to '$buildNumber'"
+              }
+              Write-Host "##vso[task.setvariable variable=buildNumber;isOutput=true;]$buildNumber"
+              .\package-pipeline.ps1 -buildNumber $buildNumber
+            displayName: 'Executing build script'
+          - pwsh: |
+              cd ./emulatedtests
+              mvn clean package `-Dmaven`.javadoc`.skip=true `-Dmaven`.test`.skip `-Dorg`.slf4j`.simpleLogger`.log`.org`.apache`.maven`.cli`.transfer`.Slf4jMavenTransferListener=warn `-B
+              Copy-Item "confluent_cloud_cacert.pem" "./target/azure-functions/azure-functions-java-emulatedtests"
+            displayName: 'Package Java for E2E'
+          - pwsh: |
+              .\setup-tests-pipeline.ps1
+            displayName: 'Setup test environment -- Install the Core Tools'
+          - bash: |
+              chmod +x ./Azure.Functions.Cli/func
+              chmod +x ./Azure.Functions.Cli/gozip
+              export PATH=$PATH:./Azure.Functions.Cli
+              func --version
+            displayName: 'Setup Core Tools - Linux'
+          - task: DotNetCoreCLI@2
+            retryCountOnTaskFailure: 3
+            inputs:
+              command: 'test'
+              projects: |
+                emulatedtests/Azure.Functions.Java.Tests.E2E/Azure.Functions.Java.Tests.E2E/Azure.Functions.Java.Tests.E2E.csproj
+            env:
+              JAVA_HOME: $(JavaHome)
+              AzureWebJobsStorage: "UseDevelopmentStorage=true"
+              ENABLE_SDK_TYPES: "true"
+            displayName: 'Build & Run tests'
+            continueOnError: false