Update SDK with latest 1.0.1 runtime (#14)

* Update SDK with latest 1.0.1 runtime
* Fix GetFile bugs.

Author: xingwu1

gulpfile.js

@@ -24,7 +24,7 @@ gulp.task('default', function() {
 
 var specRoot = args['spec-root'] || "https://raw.githubusercontent.com/Azure/azure-rest-api-specs/master";
 var projects = 'batchService'; // default
-var autoRestVersion = '1.0.0-Nightly20170129'; // default
+var autoRestVersion = '1.0.1-20170329-2300-nightly'; // default
 if (args['autorest'] !== undefined) {
     autoRestVersion = args['autorest'];
 }
@@ -36,14 +36,10 @@ var autoRestArgs = args['autorest-args'];
 var autoRestExe;
 
 gulp.task('codegen', function(cb) {
-    var nugetSource = 'https://www.myget.org/F/autorest/api/v2';
-    if (autoRestVersion.match(/[0-9]+\.[0-9]+\.[0-9]+.*/)) {
-        autoRestExe = 'packages\\autorest.' + autoRestVersion + '\\tools\\AutoRest.exe';
-        exec('tools\\nuget.exe install AutoRest -Source ' + nugetSource + ' -Version ' + autoRestVersion + ' -o packages', function(err, stdout, stderr) {
-            console.log(stdout);
-            console.error(stderr);
-            handleInput(projects, cb);
-        });
+    if (autoRestVersion.match(/[0-9]+\.[0-9]+\.[0-9]+.*/) ||
+        autoRestVersion == 'latest') {
+        autoRestExe = 'autorest ---version=' + autoRestVersion;
+        handleInput(projects, cb);
     } else {
         autoRestExe = autoRestVersion + "/src/core/AutoRest/bin/Debug/netcoreapp1.0/AutoRest.dll";
         autoRestExe = "dotnet " + autoRestExe;

pom.xml

@@ -44,7 +44,7 @@
     <dependency>
       <groupId>com.microsoft.azure</groupId>
       <artifactId>azure-client-runtime</artifactId>
-      <version>1.0.0</version>
+      <version>1.0.1</version>
     </dependency>
     <dependency>
       <groupId>com.microsoft.azure</groupId>

src/main/java/com/microsoft/azure/batch/ComputeNodeOperations.java

@@ -6,13 +6,11 @@
 
 package com.microsoft.azure.batch;
 
-import com.google.common.io.CharStreams;
 import com.microsoft.azure.batch.protocol.models.*;
 import org.joda.time.DateTime;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.util.Collection;
 import java.util.List;
 
@@ -441,14 +439,11 @@ public String getComputeNodeRemoteDesktop(String poolId, String nodeId, Iterable
         BehaviorManager bhMgr = new BehaviorManager(this.customBehaviors(), additionalBehaviors);
         bhMgr.applyRequestBehaviors(options);
 
-        InputStream response = this._parentBatchClient.protocolLayer().computeNodes().getRemoteDesktop(poolId, nodeId, options);
-
-        if (response != null) {
-            return CharStreams.toString(new InputStreamReader(response, "UTF-8"));
-        }
-        else {
-            return null;
-        }
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        this._parentBatchClient.protocolLayer().computeNodes().getRemoteDesktop(poolId, nodeId, options, outputStream);
+        String rdpContent = outputStream.toString("UTF-8");
+        outputStream.close();
+        return rdpContent;
     }
 
     /**

src/main/java/com/microsoft/azure/batch/FileOperations.java

@@ -20,8 +20,6 @@
 import com.microsoft.azure.batch.protocol.models.FileProperties;
 import com.microsoft.azure.batch.protocol.models.NodeFile;
 import com.microsoft.rest.ServiceResponseWithHeaders;
-import rx.exceptions.Exceptions;
-import rx.functions.Func1;
 
 import java.io.*;
 import java.util.Collection;
@@ -261,12 +259,12 @@ public void deleteFileFromComputeNode(String poolId, String nodeId, String fileN
      * @param jobId The ID of the job containing the task.
      * @param taskId The ID of the task.
      * @param fileName The name of the file to download.
-     * @return A stream into which the file contents will be written.
+     * @param outputStream A stream into which the file contents will be written.
      * @throws BatchErrorException Exception thrown when an error response is received from the Batch service.
      * @throws IOException Exception thrown when there is an error in serialization/deserialization of data sent to/received from the Batch service.
      */
-    public InputStream getFileFromTask(String jobId, String taskId, String fileName) throws BatchErrorException, IOException {
-        return getFileFromTask(jobId, taskId, fileName, null);
+    public void getFileFromTask(String jobId, String taskId, String fileName, OutputStream outputStream) throws BatchErrorException, IOException {
+        getFileFromTask(jobId, taskId, fileName, null, outputStream);
     }
 
     /**
@@ -276,36 +274,16 @@ public InputStream getFileFromTask(String jobId, String taskId, String fileName)
      * @param taskId The ID of the task.
      * @param fileName The name of the file to download.
      * @param additionalBehaviors A collection of {@link BatchClientBehavior} instances that are applied to the Batch service request.
-     * @return A stream into which the file contents will be written.
+     * @param outputStream A stream into which the file contents will be written.
      * @throws BatchErrorException Exception thrown when an error response is received from the Batch service.
      * @throws IOException Exception thrown when there is an error in serialization/deserialization of data sent to/received from the Batch service.
      */
-    public InputStream getFileFromTask(String jobId, String taskId, String fileName, Iterable<BatchClientBehavior> additionalBehaviors) throws BatchErrorException, IOException {
+    public void getFileFromTask(String jobId, String taskId, String fileName, Iterable<BatchClientBehavior> additionalBehaviors, OutputStream outputStream) throws BatchErrorException, IOException {
         FileGetFromTaskOptions options = new FileGetFromTaskOptions();
         BehaviorManager bhMgr = new BehaviorManager(this.customBehaviors(), additionalBehaviors);
         bhMgr.applyRequestBehaviors(options);
 
-        // Duplicate the stream due to AutoRest issue https://github.com/Azure/autorest/issues/1385
-        ByteArrayOutputStream output = this._parentBatchClient.protocolLayer().files().getFromTaskAsync(jobId, taskId, fileName, options)
-                .map(new Func1<InputStream, ByteArrayOutputStream>() {
-            @Override
-            public ByteArrayOutputStream call(InputStream input) {
-                ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-                byte[] data = new byte[16384];
-                int nRead;
-                try {
-                    while ((nRead = input.read(data, 0, data.length)) != -1) {
-                        buffer.write(data, 0, nRead);
-                    }
-                    buffer.flush();
-                    return buffer;
-                } catch (IOException e) {
-                    throw Exceptions.propagate(e);
-                }
-            }
-        }).toBlocking().single();
-
-        return new ByteArrayInputStream(output.toByteArray());
+        this._parentBatchClient.protocolLayer().files().getFromTask(jobId, taskId, fileName, options, outputStream);
     }
 
     /**
@@ -314,12 +292,12 @@ public ByteArrayOutputStream call(InputStream input) {
      * @param poolId The ID of the pool that contains the compute node.
      * @param nodeId The ID of the compute node.
      * @param fileName The name of the file to download.
-     * @return A stream into which the file contents will be written.
+     * @param outputStream A stream into which the file contents will be written.
      * @throws BatchErrorException Exception thrown when an error response is received from the Batch service.
      * @throws IOException Exception thrown when there is an error in serialization/deserialization of data sent to/received from the Batch service.
      */
-    public InputStream getFileFromComputeNode(String poolId, String nodeId, String fileName) throws BatchErrorException, IOException {
-        return getFileFromComputeNode(poolId, nodeId, fileName, null);
+    public void getFileFromComputeNode(String poolId, String nodeId, String fileName, OutputStream outputStream) throws BatchErrorException, IOException {
+        getFileFromComputeNode(poolId, nodeId, fileName, null, outputStream);
     }
 
     /**
@@ -329,36 +307,16 @@ public InputStream getFileFromComputeNode(String poolId, String nodeId, String f
      * @param nodeId The ID of the compute node.
      * @param fileName The name of the file to download.
      * @param additionalBehaviors A collection of {@link BatchClientBehavior} instances that are applied to the Batch service request.
-     * @return A stream into which the file contents will be written.
+     * @param outputStream A stream into which the file contents will be written.
      * @throws BatchErrorException Exception thrown when an error response is received from the Batch service.
      * @throws IOException Exception thrown when there is an error in serialization/deserialization of data sent to/received from the Batch service.
      */
-    public InputStream getFileFromComputeNode(String poolId, String nodeId, String fileName, Iterable<BatchClientBehavior> additionalBehaviors) throws BatchErrorException, IOException {
+    public void getFileFromComputeNode(String poolId, String nodeId, String fileName, Iterable<BatchClientBehavior> additionalBehaviors, OutputStream outputStream) throws BatchErrorException, IOException {
         FileGetFromComputeNodeOptions options = new FileGetFromComputeNodeOptions();
         BehaviorManager bhMgr = new BehaviorManager(this.customBehaviors(), additionalBehaviors);
         bhMgr.applyRequestBehaviors(options);
 
-        // Duplicate the stream due to AutoRest issue https://github.com/Azure/autorest/issues/1385
-        ByteArrayOutputStream output = this._parentBatchClient.protocolLayer().files().getFromComputeNodeAsync(poolId, nodeId, fileName, options)
-                .map(new Func1<InputStream, ByteArrayOutputStream>() {
-            @Override
-            public ByteArrayOutputStream call(InputStream input) {
-                ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-                byte[] data = new byte[16384];
-                int nRead;
-                try {
-                    while ((nRead = input.read(data, 0, data.length)) != -1) {
-                        buffer.write(data, 0, nRead);
-                    }
-                    buffer.flush();
-                    return buffer;
-                } catch (IOException e) {
-                    throw Exceptions.propagate(e);
-                }
-            }
-        }).toBlocking().single();
-
-        return new ByteArrayInputStream(output.toByteArray());
+        this._parentBatchClient.protocolLayer().files().getFromComputeNode(poolId, nodeId, fileName, options, outputStream);
     }
 
     /**

src/main/java/com/microsoft/azure/batch/protocol/ComputeNodes.java

@@ -47,6 +47,7 @@
 import com.microsoft.rest.ServiceResponseWithHeaders;
 import java.io.InputStream;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.util.List;
 import rx.Observable;
 
@@ -940,12 +941,12 @@ public interface ComputeNodes {
      *
      * @param poolId The ID of the pool that contains the compute node.
      * @param nodeId The ID of the compute node for which you want to get the Remote Desktop Protocol file.
+     * @param outputStream The OutputStream object which data will be written to if successful.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws BatchErrorException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the InputStream object if successful.
      */
-    InputStream getRemoteDesktop(String poolId, String nodeId);
+    void getRemoteDesktop(String poolId, String nodeId, OutputStream outputStream);
 
     /**
      * Gets the Remote Desktop Protocol file for the specified compute node.
@@ -987,12 +988,12 @@ public interface ComputeNodes {
      * @param poolId The ID of the pool that contains the compute node.
      * @param nodeId The ID of the compute node for which you want to get the Remote Desktop Protocol file.
      * @param computeNodeGetRemoteDesktopOptions Additional parameters for the operation
+     * @param outputStream The OutputStream object which data will be written to if successful.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws BatchErrorException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the InputStream object if successful.
      */
-    InputStream getRemoteDesktop(String poolId, String nodeId, ComputeNodeGetRemoteDesktopOptions computeNodeGetRemoteDesktopOptions);
+    void getRemoteDesktop(String poolId, String nodeId, ComputeNodeGetRemoteDesktopOptions computeNodeGetRemoteDesktopOptions, OutputStream outputStream);
 
     /**
      * Gets the Remote Desktop Protocol file for the specified compute node.

src/main/java/com/microsoft/azure/batch/protocol/Files.java

@@ -36,6 +36,7 @@
 import com.microsoft.rest.ServiceResponseWithHeaders;
 import java.io.InputStream;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.util.List;
 import rx.Observable;
 
@@ -149,12 +150,12 @@ public interface Files {
      * @param jobId The ID of the job that contains the task.
      * @param taskId The ID of the task whose file you want to retrieve.
      * @param filePath The path to the task file that you want to get the content of.
+     * @param outputStream The OutputStream object which data will be written to if successful.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws BatchErrorException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the InputStream object if successful.
      */
-    InputStream getFromTask(String jobId, String taskId, String filePath);
+    void getFromTask(String jobId, String taskId, String filePath, OutputStream outputStream);
 
     /**
      * Returns the content of the specified task file.
@@ -196,12 +197,12 @@ public interface Files {
      * @param taskId The ID of the task whose file you want to retrieve.
      * @param filePath The path to the task file that you want to get the content of.
      * @param fileGetFromTaskOptions Additional parameters for the operation
+     * @param outputStream The OutputStream object which data will be written to if successful.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws BatchErrorException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the InputStream object if successful.
      */
-    InputStream getFromTask(String jobId, String taskId, String filePath, FileGetFromTaskOptions fileGetFromTaskOptions);
+    void getFromTask(String jobId, String taskId, String filePath, FileGetFromTaskOptions fileGetFromTaskOptions, OutputStream outputStream);
 
     /**
      * Returns the content of the specified task file.
@@ -440,12 +441,12 @@ public interface Files {
      * @param poolId The ID of the pool that contains the compute node.
      * @param nodeId The ID of the compute node that contains the file.
      * @param filePath The path to the task file that you want to get the content of.
+     * @param outputStream The OutputStream object which data will be written to if successful.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws BatchErrorException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the InputStream object if successful.
      */
-    InputStream getFromComputeNode(String poolId, String nodeId, String filePath);
+    void getFromComputeNode(String poolId, String nodeId, String filePath, OutputStream outputStream);
 
     /**
      * Returns the content of the specified task file.
@@ -487,12 +488,12 @@ public interface Files {
      * @param nodeId The ID of the compute node that contains the file.
      * @param filePath The path to the task file that you want to get the content of.
      * @param fileGetFromComputeNodeOptions Additional parameters for the operation
+     * @param outputStream The OutputStream object which data will be written to if successful.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @throws BatchErrorException thrown if the request is rejected by server
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
-     * @return the InputStream object if successful.
      */
-    InputStream getFromComputeNode(String poolId, String nodeId, String filePath, FileGetFromComputeNodeOptions fileGetFromComputeNodeOptions);
+    void getFromComputeNode(String poolId, String nodeId, String filePath, FileGetFromComputeNodeOptions fileGetFromComputeNodeOptions, OutputStream outputStream);
 
     /**
      * Returns the content of the specified task file.