Proper fix for lro timeout (#162)

Author: jianghaolu

azure-client-runtime/src/main/java/com/microsoft/azure/AzureClient.java

@@ -34,10 +34,10 @@ public final class AzureClient extends AzureServiceClient {
     private static final String LOGGING_HEADER = "x-ms-logging-context";
 
     /**
-     * The interval time between two long running operation polls. Default is
-     * used if null.
+     * The interval time between two long running operation polls. Default is 30 seconds.
      */
-    private Integer longRunningOperationRetryTimeout;
+    private int longRunningOperationRetryTimeout = -1;
+
     /**
      * The executor for asynchronous requests.
      */
@@ -63,16 +63,20 @@ public AzureClient(AzureServiceClient serviceClient) {
      *
      * @return the time in seconds.
      */
-    public Integer getLongRunningOperationRetryTimeout() {
+    public Integer longRunningOperationRetryTimeout() {
         return longRunningOperationRetryTimeout;
     }
 
     /**
-     * Sets the interval time between two long running operation polls.
+     * Sets the interval time between two long running operation polls. Default is 30 seconds.
+     * Set to any negative value to let AzureClient ignore this setting.
      *
-     * @param longRunningOperationRetryTimeout the time in seconds.
+     * @param longRunningOperationRetryTimeout the time in seconds. Set to any negative value to let AzureClient ignore this setting.
      */
-    public void withLongRunningOperationRetryTimeout(Integer longRunningOperationRetryTimeout) {
+    public void setLongRunningOperationRetryTimeout(int longRunningOperationRetryTimeout) {
+        if (longRunningOperationRetryTimeout < 0) {
+            throw new IllegalArgumentException("Invalid timeout for long running operations : " + longRunningOperationRetryTimeout);
+        }
         this.longRunningOperationRetryTimeout = longRunningOperationRetryTimeout;
     }
 
@@ -137,7 +141,7 @@ public Observable<ServiceResponse<T>> call(Response<ResponseBody> response) {
                     }
 
                     try {
-                        final PollingState<T> pollingState = new PollingState<>(response, getLongRunningOperationRetryTimeout(), resourceType, restClient().serializerAdapter());
+                        final PollingState<T> pollingState = new PollingState<>(response, longRunningOperationRetryTimeout(), resourceType, restClient().serializerAdapter());
                         final String url = response.raw().request().url().toString();
 
                         // Task runner will take it from here
@@ -294,7 +298,7 @@ public Observable<ServiceResponse<T>> call(Response<ResponseBody> response) {
                     }
 
                     try {
-                        final PollingState<T> pollingState = new PollingState<>(response, getLongRunningOperationRetryTimeout(), resourceType, restClient().serializerAdapter());
+                        final PollingState<T> pollingState = new PollingState<>(response, longRunningOperationRetryTimeout(), resourceType, restClient().serializerAdapter());
                         return Observable.just(pollingState)
                             .subscribeOn(Schedulers.io())
                             // Emit a polling task intermittently

azure-client-runtime/src/main/java/com/microsoft/azure/PollingState.java

@@ -29,7 +29,7 @@ final class PollingState<T> {
     /** The link in 'Location' Header. */
     private String locationHeaderLink;
     /** The timeout interval between two polling operations. */
-    private Integer retryTimeout;
+    private int retryTimeout;
     /** The response resource object. */
     private T resource;
     /** The type of the response resource object. */
@@ -48,7 +48,7 @@ final class PollingState<T> {
      * @param serializerAdapter the adapter for the Jackson object mapper
      * @throws IOException thrown by deserialization
      */
-    PollingState(Response<ResponseBody> response, Integer retryTimeout, Type resourceType, SerializerAdapter<?> serializerAdapter) throws IOException {
+    PollingState(Response<ResponseBody> response, int retryTimeout, Type resourceType, SerializerAdapter<?> serializerAdapter) throws IOException {
         this.retryTimeout = retryTimeout;
         this.withResponse(response);
         this.resourceType = resourceType;
@@ -140,7 +140,7 @@ void updateFromResponseOnDeletePost(Response<ResponseBody> response) throws IOEx
      * @return the delay in milliseconds.
      */
     int delayInMilliseconds() {
-        if (this.retryTimeout != null) {
+        if (this.retryTimeout >= 0) {
             return this.retryTimeout * 1000;
         }
         if (this.response != null && response.headers().get("Retry-After") != null) {