Nio output stream open options (Azure#18735)

* Updated the flags

* Added tests

* Changelog

Author: rickle-msft

sdk/storage/azure-storage-blob-nio/CHANGELOG.md

@@ -3,6 +3,7 @@
 ## 12.0.0-beta.3 (Unreleased)
 - Added support for FileSystemProvider.checkAccess method
 - Added support for file key on AzureBasicFileAttributes and AzureBlobFileAttributes
+- Adjusted the required flags for opening an outputstream
 
 ## 12.0.0-beta.2 (2020-08-13)
 - Added checks to ensure file system has not been closed before operating on data

sdk/storage/azure-storage-blob-nio/src/main/java/com/azure/storage/blob/nio/AzureFileSystemProvider.java

@@ -372,11 +372,16 @@ public OutputStream newOutputStream(Path path, OpenOption... options) throws IOE
             }
         }
 
-        // Write and truncate must be specified
+        /*
+        Write must be specified. Either create_new or truncate must be specified. This is to ensure that no edits or
+        appends are allowed.
+         */
         if (!optionsList.contains(StandardOpenOption.WRITE)
-            || !optionsList.contains(StandardOpenOption.TRUNCATE_EXISTING)) {
+            || !(optionsList.contains(StandardOpenOption.TRUNCATE_EXISTING)
+            || optionsList.contains(StandardOpenOption.CREATE_NEW))) {
             throw LoggingUtility.logError(logger,
-                new IllegalArgumentException("Write and TruncateExisting must be specified to open an OutputStream"));
+                new IllegalArgumentException("Write and either CreateNew or TruncateExisting must be specified to open "
+                    + "an OutputStream"));
         }
 
         AzureResource resource = new AzureResource(path);

sdk/storage/azure-storage-blob-nio/src/test/java/com/azure/storage/blob/nio/AzureFileSystemProviderTest.groovy

@@ -931,7 +931,7 @@ class AzureFileSystemProviderTest extends APISpec {
 
     def "OutputStream options create"() {
         // Create works both on creating new and opening existing. We test these scenarios above.
-        // Here we assert that we cannot create without this option
+        // Here we assert that we cannot create without this option (i.e. you are only allowed to overwrite, not create)
         setup:
         def fs = createFS(config)
 
@@ -982,12 +982,25 @@ class AzureFileSystemProviderTest extends APISpec {
         then:
         thrown(IllegalArgumentException)
 
-        when: "Missing TRUNCATE_EXISTING"
+        when: "Missing TRUNCATE_EXISTING and CREATE_NEW"
         fs.provider().newOutputStream(fs.getPath(generateBlobName()), StandardOpenOption.WRITE)
 
         then:
         thrown(IllegalArgumentException)
 
+        when: "Missing only TRUNCATE_EXISTING"
+        fs.provider().newOutputStream(fs.getPath(generateBlobName()), StandardOpenOption.WRITE,
+            StandardOpenOption.CREATE_NEW)
+
+        then:
+        notThrown(IllegalArgumentException)
+
+        when: "Missing only CREATE_NEW"
+        fs.provider().newOutputStream(fs.getPath(generateBlobName()), StandardOpenOption.WRITE,
+            StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.CREATE)
+
+        then:
+        notThrown(IllegalArgumentException)
     }
 
     @Unroll

sdk/storage/azure-storage-blob-nio/src/test/java/com/azure/storage/blob/nio/CompositeTest.groovy

@@ -1,6 +1,7 @@
 package com.azure.storage.blob.nio
 
 import java.nio.file.Files
+import java.nio.file.StandardCopyOption
 
 /**
  * This test class is for testing static helper methods provided by the JDK. Customers often rely on these methods
@@ -27,4 +28,38 @@ class CompositeTest extends APISpec {
         Files.isDirectory(fs.getPath('mydir1/mydir2'))
         Files.isDirectory(fs.getPath('mydir1/mydir2/mydir3'))
     }
+
+    def "Files copy"() {
+        setup:
+        def fs = createFS(config)
+        def dest = fs.getPath("dest")
+        def resultArr = new byte[defaultDataSize]
+
+        when:
+        Files.copy(defaultInputStream.get(), dest)
+        fs.provider().newInputStream(dest).read(resultArr)
+
+        then:
+        resultArr == defaultData.array()
+
+        when:
+        def dest2 = fs.getPath("dest2")
+        def outStream = fs.provider().newOutputStream(dest2)
+        Files.copy(dest, outStream)
+        outStream.close()
+        resultArr = new byte[defaultDataSize]
+        fs.provider().newInputStream(dest2).read(resultArr)
+
+        then:
+        resultArr == defaultData.array()
+
+        when:
+        def dest3 = fs.getPath("dest3")
+        Files.copy(dest, dest3, StandardCopyOption.COPY_ATTRIBUTES)
+        resultArr = new byte[defaultDataSize]
+        fs.provider().newInputStream(dest3).read(resultArr)
+
+        then:
+        resultArr == defaultData.array()
+    }
 }