azure_mgmt_resources 0.1.2 → 0.2.0

data/lib/azure_mgmt_resources/resource_groups.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# Code generated by Microsoft (R) AutoRest Code Generator 0.11.0.0
+# Code generated by Microsoft (R) AutoRest Code Generator 0.16.0.0
 # Changes may cause incorrect behavior and will be lost if the code is
 # regenerated.
 
@@ -24,6 +24,7 @@ module Azure::ARM::Resources
 
     #
     # Get all of the resources under a subscription.
+    #
     # @param resource_group_name [String] Query parameters. If null is passed
     # returns all resource groups.
     # @param filter [String] The filter to apply on the operation.
@@ -39,73 +40,44 @@ module Azure::ARM::Resources
       fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
       fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
       fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?
-      # Construct URL
-      path = "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/resources"
-      path['{resourceGroupName}'] = ERB::Util.url_encode(resource_group_name) if path.include?('{resourceGroupName}')
-      path['{subscriptionId}'] = ERB::Util.url_encode(@client.subscription_id) if path.include?('{subscriptionId}')
-      url = URI.join(@client.base_url, path)
-      properties = {}
-      properties['$filter'] = ERB::Util.url_encode(filter.to_s) unless filter.nil?
-      properties['$top'] = ERB::Util.url_encode(top.to_s) unless top.nil?
-      properties['api-version'] = ERB::Util.url_encode(@client.api_version.to_s) unless @client.api_version.nil?
-      unless url.query.nil?
-        url.query.split('&').each do |url_item|
-          url_items_parts = url_item.split('=')
-          properties[url_items_parts[0]] = url_items_parts[1]
-        end
-      end
-      properties.reject!{ |key, value| value.nil? }
-      url.query = properties.map{ |key, value| "#{key}=#{value}" }.compact.join('&')
-      fail URI::Error unless url.to_s =~ /\A#{URI::regexp}\z/
-      corrected_url = url.to_s.gsub(/([^:])\/\//, '\1/')
-      url = URI.parse(corrected_url)
-
-      connection = Faraday.new(:url => url) do |faraday|
-        faraday.use MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02
-        faraday.use :cookie_jar
-        faraday.adapter Faraday.default_adapter
-      end
-      request_headers = Hash.new
+      request_headers = {}
 
       # Set Headers
       request_headers['x-ms-client-request-id'] = SecureRandom.uuid
-      request_headers["accept-language"] = @client.accept_language unless @client.accept_language.nil?
-
-      unless custom_headers.nil?
-        custom_headers.each do |key, value|
-          request_headers[key] = value
-        end
-      end
-
-      # Send Request
-      promise = Concurrent::Promise.new do
-        connection.get do |request|
-          request.headers = request_headers
-          @client.credentials.sign_request(request) unless @client.credentials.nil?
-        end
+      request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
+      path_template = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/resources'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'resourceGroupName' => resource_group_name,'subscriptionId' => @client.subscription_id},
+          query_params: {'$filter' => filter,'$top' => top,'api-version' => @client.api_version},
+          headers: request_headers.merge(custom_headers || {})
+      }
+      request = MsRest::HttpOperationRequest.new(@base_url || @client.base_url, path_template, :get, options)
+      promise = request.run_promise do |req|
+        @client.credentials.sign_request(req) unless @client.credentials.nil?
       end
 
       promise = promise.then do |http_response|
         status_code = http_response.status
         response_content = http_response.body
-        unless (status_code == 200)
+        unless status_code == 200
           error_model = JSON.load(response_content)
-          fail MsRestAzure::AzureOperationError.new(connection, http_response, error_model)
+          fail MsRestAzure::AzureOperationError.new(request, http_response, error_model)
         end
 
         # Create Result
-        result = MsRestAzure::AzureOperationResponse.new(connection, http_response)
+        result = MsRestAzure::AzureOperationResponse.new(request, http_response)
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
         # Deserialize Response
         if status_code == 200
           begin
-            parsed_response = JSON.load(response_content) unless response_content.to_s.empty?
+            parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
             unless parsed_response.nil?
               parsed_response = ResourceListResult.deserialize_object(parsed_response)
             end
             result.body = parsed_response
           rescue Exception => e
-            fail MsRest::DeserializationError.new("Error occured in deserializing the response", e.message, e.backtrace, response_content)
+            fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
           end
         end
 
@@ -117,6 +89,7 @@ module Azure::ARM::Resources
 
     #
     # Checks whether resource group exists.
+    #
     # @param resource_group_name [String] The name of the resource group to check.
     # The name is case insensitive.
     # @param [Hash{String => String}] The hash of custom headers need to be
@@ -129,60 +102,33 @@ module Azure::ARM::Resources
       fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
       fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
       fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?
-      # Construct URL
-      path = "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}"
-      path['{resourceGroupName}'] = ERB::Util.url_encode(resource_group_name) if path.include?('{resourceGroupName}')
-      path['{subscriptionId}'] = ERB::Util.url_encode(@client.subscription_id) if path.include?('{subscriptionId}')
-      url = URI.join(@client.base_url, path)
-      properties = {}
-      properties['api-version'] = ERB::Util.url_encode(@client.api_version.to_s) unless @client.api_version.nil?
-      unless url.query.nil?
-        url.query.split('&').each do |url_item|
-          url_items_parts = url_item.split('=')
-          properties[url_items_parts[0]] = url_items_parts[1]
-        end
-      end
-      properties.reject!{ |key, value| value.nil? }
-      url.query = properties.map{ |key, value| "#{key}=#{value}" }.compact.join('&')
-      fail URI::Error unless url.to_s =~ /\A#{URI::regexp}\z/
-      corrected_url = url.to_s.gsub(/([^:])\/\//, '\1/')
-      url = URI.parse(corrected_url)
-
-      connection = Faraday.new(:url => url) do |faraday|
-        faraday.use MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02
-        faraday.use :cookie_jar
-        faraday.adapter Faraday.default_adapter
-      end
-      request_headers = Hash.new
+      request_headers = {}
 
       # Set Headers
       request_headers['x-ms-client-request-id'] = SecureRandom.uuid
-      request_headers["accept-language"] = @client.accept_language unless @client.accept_language.nil?
-
-      unless custom_headers.nil?
-        custom_headers.each do |key, value|
-          request_headers[key] = value
-        end
-      end
-
-      # Send Request
-      promise = Concurrent::Promise.new do
-        connection.head do |request|
-          request.headers = request_headers
-          @client.credentials.sign_request(request) unless @client.credentials.nil?
-        end
+      request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
+      path_template = '/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'resourceGroupName' => resource_group_name,'subscriptionId' => @client.subscription_id},
+          query_params: {'api-version' => @client.api_version},
+          headers: request_headers.merge(custom_headers || {})
+      }
+      request = MsRest::HttpOperationRequest.new(@base_url || @client.base_url, path_template, :head, options)
+      promise = request.run_promise do |req|
+        @client.credentials.sign_request(req) unless @client.credentials.nil?
       end
 
       promise = promise.then do |http_response|
         status_code = http_response.status
         response_content = http_response.body
-        unless (status_code == 204 || status_code == 404)
+        unless status_code == 204 || status_code == 404
           error_model = JSON.load(response_content)
-          fail MsRestAzure::AzureOperationError.new(connection, http_response, error_model)
+          fail MsRestAzure::AzureOperationError.new(request, http_response, error_model)
         end
 
         # Create Result
-        result = MsRestAzure::AzureOperationResponse.new(connection, http_response)
+        result = MsRestAzure::AzureOperationResponse.new(request, http_response)
         result.body = (status_code == 204)
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
 
@@ -194,41 +140,7 @@ module Azure::ARM::Resources
 
     #
     # Create a resource group.
-    # @param resource_group_name [String] The name of the resource group to be
-    # created or updated.
-    # @param parameters [ResourceGroup] Parameters supplied to the create or
-    # update resource group service operation.
-    # @param @client.api_version [String] Client Api Version.
-    # @param @client.subscription_id [String] Gets subscription credentials which
-    # uniquely identify Microsoft Azure subscription. The subscription ID forms
-    # part of the URI for every service call.
-    # @param @client.accept_language [String] Gets or sets the preferred language
-    # for the response.
-    #
-    # @return [Concurrent::Promise] promise which provides async access to http
-    # response.
     #
-    def create_or_update(resource_group_name, parameters, custom_headers = nil)
-      # Send request
-      promise = begin_create_or_update(resource_group_name, parameters, custom_headers)
-
-      promise = promise.then do |response|
-        # Defining deserialization method.
-        deserialize_method = lambda do |parsed_response|
-          unless parsed_response.nil?
-            parsed_response = ResourceGroup.deserialize_object(parsed_response)
-          end
-        end
-
-        # Waiting for response.
-        @client.get_put_operation_result(response, custom_headers, deserialize_method)
-      end
-
-      promise
-    end
-
-    #
-    # Create a resource group.
     # @param resource_group_name [String] The name of the resource group to be
     # created or updated.
     # @param parameters [ResourceGroup] Parameters supplied to the create or
@@ -239,97 +151,70 @@ module Azure::ARM::Resources
     # @return [Concurrent::Promise] Promise object which allows to get HTTP
     # response.
     #
-    def begin_create_or_update(resource_group_name, parameters, custom_headers = nil)
+    def create_or_update(resource_group_name, parameters, custom_headers = nil)
       fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
       fail ArgumentError, 'parameters is nil' if parameters.nil?
       parameters.validate unless parameters.nil?
       fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
       fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?
-      # Construct URL
-      path = "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}"
-      path['{resourceGroupName}'] = ERB::Util.url_encode(resource_group_name) if path.include?('{resourceGroupName}')
-      path['{subscriptionId}'] = ERB::Util.url_encode(@client.subscription_id) if path.include?('{subscriptionId}')
-      url = URI.join(@client.base_url, path)
-      properties = {}
-      properties['api-version'] = ERB::Util.url_encode(@client.api_version.to_s) unless @client.api_version.nil?
-      unless url.query.nil?
-        url.query.split('&').each do |url_item|
-          url_items_parts = url_item.split('=')
-          properties[url_items_parts[0]] = url_items_parts[1]
-        end
-      end
-      properties.reject!{ |key, value| value.nil? }
-      url.query = properties.map{ |key, value| "#{key}=#{value}" }.compact.join('&')
-      fail URI::Error unless url.to_s =~ /\A#{URI::regexp}\z/
-      corrected_url = url.to_s.gsub(/([^:])\/\//, '\1/')
-      url = URI.parse(corrected_url)
-
-      connection = Faraday.new(:url => url) do |faraday|
-        faraday.use MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02
-        faraday.use :cookie_jar
-        faraday.adapter Faraday.default_adapter
-      end
-      request_headers = Hash.new
+      request_headers = {}
 
       # Set Headers
       request_headers['x-ms-client-request-id'] = SecureRandom.uuid
-      request_headers["accept-language"] = @client.accept_language unless @client.accept_language.nil?
-
-      unless custom_headers.nil?
-        custom_headers.each do |key, value|
-          request_headers[key] = value
-        end
-      end
+      request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
 
       # Serialize Request
-      request_headers['Content-Type'] = 'application/json'
+      request_headers['Content-Type'] = 'application/json; charset=utf-8'
       unless parameters.nil?
         parameters = ResourceGroup.serialize_object(parameters)
       end
       request_content = JSON.generate(parameters, quirks_mode: true)
-
-      # Send Request
-      promise = Concurrent::Promise.new do
-        connection.put do |request|
-          request.headers = request_headers
-          request.body = request_content
-          @client.credentials.sign_request(request) unless @client.credentials.nil?
-        end
+      path_template = '/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'resourceGroupName' => resource_group_name,'subscriptionId' => @client.subscription_id},
+          query_params: {'api-version' => @client.api_version},
+          body: request_content,
+          headers: request_headers.merge(custom_headers || {})
+      }
+      request = MsRest::HttpOperationRequest.new(@base_url || @client.base_url, path_template, :put, options)
+      promise = request.run_promise do |req|
+        @client.credentials.sign_request(req) unless @client.credentials.nil?
       end
 
       promise = promise.then do |http_response|
         status_code = http_response.status
         response_content = http_response.body
-        unless (status_code == 201 || status_code == 200 || status_code == 202)
+        unless status_code == 201 || status_code == 200
           error_model = JSON.load(response_content)
-          fail MsRestAzure::AzureOperationError.new(connection, http_response, error_model)
+          fail MsRestAzure::AzureOperationError.new(request, http_response, error_model)
         end
 
         # Create Result
-        result = MsRestAzure::AzureOperationResponse.new(connection, http_response)
+        result = MsRestAzure::AzureOperationResponse.new(request, http_response)
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
         # Deserialize Response
         if status_code == 201
           begin
-            parsed_response = JSON.load(response_content) unless response_content.to_s.empty?
+            parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
             unless parsed_response.nil?
               parsed_response = ResourceGroup.deserialize_object(parsed_response)
             end
             result.body = parsed_response
           rescue Exception => e
-            fail MsRest::DeserializationError.new("Error occured in deserializing the response", e.message, e.backtrace, response_content)
+            fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
           end
         end
         # Deserialize Response
         if status_code == 200
           begin
-            parsed_response = JSON.load(response_content) unless response_content.to_s.empty?
+            parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
             unless parsed_response.nil?
               parsed_response = ResourceGroup.deserialize_object(parsed_response)
             end
             result.body = parsed_response
           rescue Exception => e
-            fail MsRest::DeserializationError.new("Error occured in deserializing the response", e.message, e.backtrace, response_content)
+            fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
           end
         end
 
@@ -342,6 +227,7 @@ module Azure::ARM::Resources
     #
     # Begin deleting resource group.To determine whether the operation has
     # finished processing the request, call GetLongRunningOperationStatus.
+    #
     # @param resource_group_name [String] The name of the resource group to be
     # deleted. The name is case insensitive.
     # @return [Concurrent::Promise] promise which provides async access to http
@@ -357,7 +243,7 @@ module Azure::ARM::Resources
         end
 
        # Waiting for response.
-       @client.get_post_or_delete_operation_result(response, nil, deserialize_method)
+       @client.get_post_or_delete_operation_result(response, deserialize_method)
       end
 
       promise
@@ -366,6 +252,7 @@ module Azure::ARM::Resources
     #
     # Begin deleting resource group.To determine whether the operation has
     # finished processing the request, call GetLongRunningOperationStatus.
+    #
     # @param resource_group_name [String] The name of the resource group to be
     # deleted. The name is case insensitive.
     # @param [Hash{String => String}] The hash of custom headers need to be
@@ -378,59 +265,33 @@ module Azure::ARM::Resources
       fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
       fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
       fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?
-      # Construct URL
-      path = "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}"
-      path['{resourceGroupName}'] = ERB::Util.url_encode(resource_group_name) if path.include?('{resourceGroupName}')
-      path['{subscriptionId}'] = ERB::Util.url_encode(@client.subscription_id) if path.include?('{subscriptionId}')
-      url = URI.join(@client.base_url, path)
-      properties = {}
-      properties['api-version'] = ERB::Util.url_encode(@client.api_version.to_s) unless @client.api_version.nil?
-      unless url.query.nil?
-        url.query.split('&').each do |url_item|
-          url_items_parts = url_item.split('=')
-          properties[url_items_parts[0]] = url_items_parts[1]
-        end
-      end
-      properties.reject!{ |key, value| value.nil? }
-      url.query = properties.map{ |key, value| "#{key}=#{value}" }.compact.join('&')
-      fail URI::Error unless url.to_s =~ /\A#{URI::regexp}\z/
-      corrected_url = url.to_s.gsub(/([^:])\/\//, '\1/')
-      url = URI.parse(corrected_url)
-
-      connection = Faraday.new(:url => url) do |faraday|
-        faraday.use MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02
-        faraday.use :cookie_jar
-        faraday.adapter Faraday.default_adapter
-      end
-      request_headers = Hash.new
+      request_headers = {}
 
       # Set Headers
       request_headers['x-ms-client-request-id'] = SecureRandom.uuid
-      request_headers["accept-language"] = @client.accept_language unless @client.accept_language.nil?
-
-      unless custom_headers.nil?
-        custom_headers.each do |key, value|
-          request_headers[key] = value
-        end
-      end
-
-      # Send Request
-      promise = Concurrent::Promise.new do
-        connection.delete do |request|
-          request.headers = request_headers
-          @client.credentials.sign_request(request) unless @client.credentials.nil?
-        end
+      request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
+      path_template = '/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'resourceGroupName' => resource_group_name,'subscriptionId' => @client.subscription_id},
+          query_params: {'api-version' => @client.api_version},
+          headers: request_headers.merge(custom_headers || {})
+      }
+      request = MsRest::HttpOperationRequest.new(@base_url || @client.base_url, path_template, :delete, options)
+      promise = request.run_promise do |req|
+        @client.credentials.sign_request(req) unless @client.credentials.nil?
       end
 
       promise = promise.then do |http_response|
         status_code = http_response.status
         response_content = http_response.body
-        unless (status_code == 202 || status_code == 200)
-          fail MsRestAzure::AzureOperationError.new(connection, http_response)
+        unless status_code == 202 || status_code == 200
+          error_model = JSON.load(response_content)
+          fail MsRestAzure::AzureOperationError.new(request, http_response, error_model)
         end
 
         # Create Result
-        result = MsRestAzure::AzureOperationResponse.new(connection, http_response)
+        result = MsRestAzure::AzureOperationResponse.new(request, http_response)
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
 
         result
@@ -441,6 +302,7 @@ module Azure::ARM::Resources
 
     #
     # Get a resource group.
+    #
     # @param resource_group_name [String] The name of the resource group to get.
     # The name is case insensitive.
     # @param [Hash{String => String}] The hash of custom headers need to be
@@ -453,71 +315,44 @@ module Azure::ARM::Resources
       fail ArgumentError, 'resource_group_name is nil' if resource_group_name.nil?
       fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
       fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?
-      # Construct URL
-      path = "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}"
-      path['{resourceGroupName}'] = ERB::Util.url_encode(resource_group_name) if path.include?('{resourceGroupName}')
-      path['{subscriptionId}'] = ERB::Util.url_encode(@client.subscription_id) if path.include?('{subscriptionId}')
-      url = URI.join(@client.base_url, path)
-      properties = {}
-      properties['api-version'] = ERB::Util.url_encode(@client.api_version.to_s) unless @client.api_version.nil?
-      unless url.query.nil?
-        url.query.split('&').each do |url_item|
-          url_items_parts = url_item.split('=')
-          properties[url_items_parts[0]] = url_items_parts[1]
-        end
-      end
-      properties.reject!{ |key, value| value.nil? }
-      url.query = properties.map{ |key, value| "#{key}=#{value}" }.compact.join('&')
-      fail URI::Error unless url.to_s =~ /\A#{URI::regexp}\z/
-      corrected_url = url.to_s.gsub(/([^:])\/\//, '\1/')
-      url = URI.parse(corrected_url)
-
-      connection = Faraday.new(:url => url) do |faraday|
-        faraday.use MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02
-        faraday.use :cookie_jar
-        faraday.adapter Faraday.default_adapter
-      end
-      request_headers = Hash.new
+      request_headers = {}
 
       # Set Headers
       request_headers['x-ms-client-request-id'] = SecureRandom.uuid
-      request_headers["accept-language"] = @client.accept_language unless @client.accept_language.nil?
-
-      unless custom_headers.nil?
-        custom_headers.each do |key, value|
-          request_headers[key] = value
-        end
-      end
-
-      # Send Request
-      promise = Concurrent::Promise.new do
-        connection.get do |request|
-          request.headers = request_headers
-          @client.credentials.sign_request(request) unless @client.credentials.nil?
-        end
+      request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
+      path_template = '/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'resourceGroupName' => resource_group_name,'subscriptionId' => @client.subscription_id},
+          query_params: {'api-version' => @client.api_version},
+          headers: request_headers.merge(custom_headers || {})
+      }
+      request = MsRest::HttpOperationRequest.new(@base_url || @client.base_url, path_template, :get, options)
+      promise = request.run_promise do |req|
+        @client.credentials.sign_request(req) unless @client.credentials.nil?
       end
 
       promise = promise.then do |http_response|
         status_code = http_response.status
         response_content = http_response.body
-        unless (status_code == 200)
+        unless status_code == 200
           error_model = JSON.load(response_content)
-          fail MsRestAzure::AzureOperationError.new(connection, http_response, error_model)
+          fail MsRestAzure::AzureOperationError.new(request, http_response, error_model)
         end
 
         # Create Result
-        result = MsRestAzure::AzureOperationResponse.new(connection, http_response)
+        result = MsRestAzure::AzureOperationResponse.new(request, http_response)
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
         # Deserialize Response
         if status_code == 200
           begin
-            parsed_response = JSON.load(response_content) unless response_content.to_s.empty?
+            parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
             unless parsed_response.nil?
               parsed_response = ResourceGroup.deserialize_object(parsed_response)
             end
             result.body = parsed_response
           rescue Exception => e
-            fail MsRest::DeserializationError.new("Error occured in deserializing the response", e.message, e.backtrace, response_content)
+            fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
           end
         end
 
@@ -532,6 +367,7 @@ module Azure::ARM::Resources
     # address. The format of the request is the same as that for creating a
     # resource groups, though if a field is unspecified current value will be
     # carried over.
+    #
     # @param resource_group_name [String] The name of the resource group to be
     # created or updated. The name is case insensitive.
     # @param parameters [ResourceGroup] Parameters supplied to the update state
@@ -548,79 +384,52 @@ module Azure::ARM::Resources
       parameters.validate unless parameters.nil?
       fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
       fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?
-      # Construct URL
-      path = "/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}"
-      path['{resourceGroupName}'] = ERB::Util.url_encode(resource_group_name) if path.include?('{resourceGroupName}')
-      path['{subscriptionId}'] = ERB::Util.url_encode(@client.subscription_id) if path.include?('{subscriptionId}')
-      url = URI.join(@client.base_url, path)
-      properties = {}
-      properties['api-version'] = ERB::Util.url_encode(@client.api_version.to_s) unless @client.api_version.nil?
-      unless url.query.nil?
-        url.query.split('&').each do |url_item|
-          url_items_parts = url_item.split('=')
-          properties[url_items_parts[0]] = url_items_parts[1]
-        end
-      end
-      properties.reject!{ |key, value| value.nil? }
-      url.query = properties.map{ |key, value| "#{key}=#{value}" }.compact.join('&')
-      fail URI::Error unless url.to_s =~ /\A#{URI::regexp}\z/
-      corrected_url = url.to_s.gsub(/([^:])\/\//, '\1/')
-      url = URI.parse(corrected_url)
-
-      connection = Faraday.new(:url => url) do |faraday|
-        faraday.use MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02
-        faraday.use :cookie_jar
-        faraday.adapter Faraday.default_adapter
-      end
-      request_headers = Hash.new
+      request_headers = {}
 
       # Set Headers
       request_headers['x-ms-client-request-id'] = SecureRandom.uuid
-      request_headers["accept-language"] = @client.accept_language unless @client.accept_language.nil?
-
-      unless custom_headers.nil?
-        custom_headers.each do |key, value|
-          request_headers[key] = value
-        end
-      end
+      request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
 
       # Serialize Request
-      request_headers['Content-Type'] = 'application/json'
+      request_headers['Content-Type'] = 'application/json; charset=utf-8'
       unless parameters.nil?
         parameters = ResourceGroup.serialize_object(parameters)
       end
       request_content = JSON.generate(parameters, quirks_mode: true)
-
-      # Send Request
-      promise = Concurrent::Promise.new do
-        connection.patch do |request|
-          request.headers = request_headers
-          request.body = request_content
-          @client.credentials.sign_request(request) unless @client.credentials.nil?
-        end
+      path_template = '/subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'resourceGroupName' => resource_group_name,'subscriptionId' => @client.subscription_id},
+          query_params: {'api-version' => @client.api_version},
+          body: request_content,
+          headers: request_headers.merge(custom_headers || {})
+      }
+      request = MsRest::HttpOperationRequest.new(@base_url || @client.base_url, path_template, :patch, options)
+      promise = request.run_promise do |req|
+        @client.credentials.sign_request(req) unless @client.credentials.nil?
       end
 
       promise = promise.then do |http_response|
         status_code = http_response.status
         response_content = http_response.body
-        unless (status_code == 200)
+        unless status_code == 200
           error_model = JSON.load(response_content)
-          fail MsRestAzure::AzureOperationError.new(connection, http_response, error_model)
+          fail MsRestAzure::AzureOperationError.new(request, http_response, error_model)
         end
 
         # Create Result
-        result = MsRestAzure::AzureOperationResponse.new(connection, http_response)
+        result = MsRestAzure::AzureOperationResponse.new(request, http_response)
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
         # Deserialize Response
         if status_code == 200
           begin
-            parsed_response = JSON.load(response_content) unless response_content.to_s.empty?
+            parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
             unless parsed_response.nil?
               parsed_response = ResourceGroup.deserialize_object(parsed_response)
             end
             result.body = parsed_response
           rescue Exception => e
-            fail MsRest::DeserializationError.new("Error occured in deserializing the response", e.message, e.backtrace, response_content)
+            fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
           end
         end
 
@@ -632,6 +441,7 @@ module Azure::ARM::Resources
 
     #
     # Gets a collection of resource groups.
+    #
     # @param filter [String] The filter to apply on the operation.
     # @param top [Integer] Query parameters. If null is passed returns all
     # resource groups.
@@ -644,72 +454,44 @@ module Azure::ARM::Resources
     def list(filter = nil, top = nil, custom_headers = nil)
       fail ArgumentError, '@client.api_version is nil' if @client.api_version.nil?
       fail ArgumentError, '@client.subscription_id is nil' if @client.subscription_id.nil?
-      # Construct URL
-      path = "/subscriptions/{subscriptionId}/resourcegroups"
-      path['{subscriptionId}'] = ERB::Util.url_encode(@client.subscription_id) if path.include?('{subscriptionId}')
-      url = URI.join(@client.base_url, path)
-      properties = {}
-      properties['$filter'] = ERB::Util.url_encode(filter.to_s) unless filter.nil?
-      properties['$top'] = ERB::Util.url_encode(top.to_s) unless top.nil?
-      properties['api-version'] = ERB::Util.url_encode(@client.api_version.to_s) unless @client.api_version.nil?
-      unless url.query.nil?
-        url.query.split('&').each do |url_item|
-          url_items_parts = url_item.split('=')
-          properties[url_items_parts[0]] = url_items_parts[1]
-        end
-      end
-      properties.reject!{ |key, value| value.nil? }
-      url.query = properties.map{ |key, value| "#{key}=#{value}" }.compact.join('&')
-      fail URI::Error unless url.to_s =~ /\A#{URI::regexp}\z/
-      corrected_url = url.to_s.gsub(/([^:])\/\//, '\1/')
-      url = URI.parse(corrected_url)
-
-      connection = Faraday.new(:url => url) do |faraday|
-        faraday.use MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02
-        faraday.use :cookie_jar
-        faraday.adapter Faraday.default_adapter
-      end
-      request_headers = Hash.new
+      request_headers = {}
 
       # Set Headers
       request_headers['x-ms-client-request-id'] = SecureRandom.uuid
-      request_headers["accept-language"] = @client.accept_language unless @client.accept_language.nil?
-
-      unless custom_headers.nil?
-        custom_headers.each do |key, value|
-          request_headers[key] = value
-        end
-      end
-
-      # Send Request
-      promise = Concurrent::Promise.new do
-        connection.get do |request|
-          request.headers = request_headers
-          @client.credentials.sign_request(request) unless @client.credentials.nil?
-        end
+      request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
+      path_template = '/subscriptions/{subscriptionId}/resourcegroups'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          path_params: {'subscriptionId' => @client.subscription_id},
+          query_params: {'$filter' => filter,'$top' => top,'api-version' => @client.api_version},
+          headers: request_headers.merge(custom_headers || {})
+      }
+      request = MsRest::HttpOperationRequest.new(@base_url || @client.base_url, path_template, :get, options)
+      promise = request.run_promise do |req|
+        @client.credentials.sign_request(req) unless @client.credentials.nil?
       end
 
       promise = promise.then do |http_response|
         status_code = http_response.status
         response_content = http_response.body
-        unless (status_code == 200)
+        unless status_code == 200
           error_model = JSON.load(response_content)
-          fail MsRestAzure::AzureOperationError.new(connection, http_response, error_model)
+          fail MsRestAzure::AzureOperationError.new(request, http_response, error_model)
         end
 
         # Create Result
-        result = MsRestAzure::AzureOperationResponse.new(connection, http_response)
+        result = MsRestAzure::AzureOperationResponse.new(request, http_response)
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
         # Deserialize Response
         if status_code == 200
           begin
-            parsed_response = JSON.load(response_content) unless response_content.to_s.empty?
+            parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
             unless parsed_response.nil?
               parsed_response = ResourceGroupListResult.deserialize_object(parsed_response)
             end
             result.body = parsed_response
           rescue Exception => e
-            fail MsRest::DeserializationError.new("Error occured in deserializing the response", e.message, e.backtrace, response_content)
+            fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
           end
         end
 
@@ -721,6 +503,7 @@ module Azure::ARM::Resources
 
     #
     # Get all of the resources under a subscription.
+    #
     # @param next_page_link [String] The NextLink from the previous successful
     # call to List operation.
     # @param [Hash{String => String}] The hash of custom headers need to be
@@ -731,69 +514,43 @@ module Azure::ARM::Resources
     #
     def list_resources_next(next_page_link, custom_headers = nil)
       fail ArgumentError, 'next_page_link is nil' if next_page_link.nil?
-      # Construct URL
-      path = "{nextLink}"
-      path['{nextLink}'] = next_page_link if path.include?('{nextLink}')
-      url = URI.parse(path)
-      properties = {}
-      unless url.query.nil?
-        url.query.split('&').each do |url_item|
-          url_items_parts = url_item.split('=')
-          properties[url_items_parts[0]] = url_items_parts[1]
-        end
-      end
-      properties.reject!{ |key, value| value.nil? }
-      url.query = properties.map{ |key, value| "#{key}=#{value}" }.compact.join('&')
-      fail URI::Error unless url.to_s =~ /\A#{URI::regexp}\z/
-      corrected_url = url.to_s.gsub(/([^:])\/\//, '\1/')
-      url = URI.parse(corrected_url)
-
-      connection = Faraday.new(:url => url) do |faraday|
-        faraday.use MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02
-        faraday.use :cookie_jar
-        faraday.adapter Faraday.default_adapter
-      end
-      request_headers = Hash.new
+      request_headers = {}
 
       # Set Headers
       request_headers['x-ms-client-request-id'] = SecureRandom.uuid
-      request_headers["accept-language"] = @client.accept_language unless @client.accept_language.nil?
-
-      unless custom_headers.nil?
-        custom_headers.each do |key, value|
-          request_headers[key] = value
-        end
-      end
-
-      # Send Request
-      promise = Concurrent::Promise.new do
-        connection.get do |request|
-          request.headers = request_headers
-          @client.credentials.sign_request(request) unless @client.credentials.nil?
-        end
+      request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
+      path_template = '{nextLink}'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          skip_encoding_path_params: {'nextLink' => next_page_link},
+          headers: request_headers.merge(custom_headers || {})
+      }
+      request = MsRest::HttpOperationRequest.new(@base_url || @client.base_url, path_template, :get, options)
+      promise = request.run_promise do |req|
+        @client.credentials.sign_request(req) unless @client.credentials.nil?
       end
 
       promise = promise.then do |http_response|
         status_code = http_response.status
         response_content = http_response.body
-        unless (status_code == 200)
+        unless status_code == 200
           error_model = JSON.load(response_content)
-          fail MsRestAzure::AzureOperationError.new(connection, http_response, error_model)
+          fail MsRestAzure::AzureOperationError.new(request, http_response, error_model)
         end
 
         # Create Result
-        result = MsRestAzure::AzureOperationResponse.new(connection, http_response)
+        result = MsRestAzure::AzureOperationResponse.new(request, http_response)
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
         # Deserialize Response
         if status_code == 200
           begin
-            parsed_response = JSON.load(response_content) unless response_content.to_s.empty?
+            parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
             unless parsed_response.nil?
               parsed_response = ResourceListResult.deserialize_object(parsed_response)
             end
             result.body = parsed_response
           rescue Exception => e
-            fail MsRest::DeserializationError.new("Error occured in deserializing the response", e.message, e.backtrace, response_content)
+            fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
           end
         end
 
@@ -805,6 +562,7 @@ module Azure::ARM::Resources
 
     #
     # Gets a collection of resource groups.
+    #
     # @param next_page_link [String] The NextLink from the previous successful
     # call to List operation.
     # @param [Hash{String => String}] The hash of custom headers need to be
@@ -815,69 +573,43 @@ module Azure::ARM::Resources
     #
     def list_next(next_page_link, custom_headers = nil)
       fail ArgumentError, 'next_page_link is nil' if next_page_link.nil?
-      # Construct URL
-      path = "{nextLink}"
-      path['{nextLink}'] = next_page_link if path.include?('{nextLink}')
-      url = URI.parse(path)
-      properties = {}
-      unless url.query.nil?
-        url.query.split('&').each do |url_item|
-          url_items_parts = url_item.split('=')
-          properties[url_items_parts[0]] = url_items_parts[1]
-        end
-      end
-      properties.reject!{ |key, value| value.nil? }
-      url.query = properties.map{ |key, value| "#{key}=#{value}" }.compact.join('&')
-      fail URI::Error unless url.to_s =~ /\A#{URI::regexp}\z/
-      corrected_url = url.to_s.gsub(/([^:])\/\//, '\1/')
-      url = URI.parse(corrected_url)
-
-      connection = Faraday.new(:url => url) do |faraday|
-        faraday.use MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02
-        faraday.use :cookie_jar
-        faraday.adapter Faraday.default_adapter
-      end
-      request_headers = Hash.new
+      request_headers = {}
 
       # Set Headers
       request_headers['x-ms-client-request-id'] = SecureRandom.uuid
-      request_headers["accept-language"] = @client.accept_language unless @client.accept_language.nil?
-
-      unless custom_headers.nil?
-        custom_headers.each do |key, value|
-          request_headers[key] = value
-        end
-      end
-
-      # Send Request
-      promise = Concurrent::Promise.new do
-        connection.get do |request|
-          request.headers = request_headers
-          @client.credentials.sign_request(request) unless @client.credentials.nil?
-        end
+      request_headers['accept-language'] = @client.accept_language unless @client.accept_language.nil?
+      path_template = '{nextLink}'
+      options = {
+          middlewares: [[MsRest::RetryPolicyMiddleware, times: 3, retry: 0.02], [:cookie_jar]],
+          skip_encoding_path_params: {'nextLink' => next_page_link},
+          headers: request_headers.merge(custom_headers || {})
+      }
+      request = MsRest::HttpOperationRequest.new(@base_url || @client.base_url, path_template, :get, options)
+      promise = request.run_promise do |req|
+        @client.credentials.sign_request(req) unless @client.credentials.nil?
       end
 
       promise = promise.then do |http_response|
         status_code = http_response.status
         response_content = http_response.body
-        unless (status_code == 200)
+        unless status_code == 200
           error_model = JSON.load(response_content)
-          fail MsRestAzure::AzureOperationError.new(connection, http_response, error_model)
+          fail MsRestAzure::AzureOperationError.new(request, http_response, error_model)
         end
 
         # Create Result
-        result = MsRestAzure::AzureOperationResponse.new(connection, http_response)
+        result = MsRestAzure::AzureOperationResponse.new(request, http_response)
         result.request_id = http_response['x-ms-request-id'] unless http_response['x-ms-request-id'].nil?
         # Deserialize Response
         if status_code == 200
           begin
-            parsed_response = JSON.load(response_content) unless response_content.to_s.empty?
+            parsed_response = response_content.to_s.empty? ? nil : JSON.load(response_content)
             unless parsed_response.nil?
               parsed_response = ResourceGroupListResult.deserialize_object(parsed_response)
             end
             result.body = parsed_response
           rescue Exception => e
-            fail MsRest::DeserializationError.new("Error occured in deserializing the response", e.message, e.backtrace, response_content)
+            fail MsRest::DeserializationError.new('Error occurred in deserializing the response', e.message, e.backtrace, result)
           end
         end