JSON -> Json and HTTP -> Http (#317)

Author: mullermp

gems/smithy-client/lib/smithy-client/handler_context.rb

@@ -9,8 +9,8 @@ class HandlerContext
       # @option options [Base] :client (nil)
       # @option options [Hash] :params ({})
       # @option options [Configuration] :config (nil)
-      # @option options [HTTP::Request] :http_request (HTTP::Request.new)
-      # @option options [HTTP::Response] :http_response (HTTP::Response.new)
+      # @option options [Http::Request] :http_request (Http::Request.new)
+      # @option options [Http::Response] :http_response (Http::Response.new)
       # @option options [Hash] :auth (nil)
       # @option options [Hash] :metadata ({})
       def initialize(options = {})
@@ -19,8 +19,8 @@ def initialize(options = {})
         @client = options[:client]
         @params = options[:params] || {}
         @config = options[:config]
-        @http_request = options[:http_request] || HTTP::Request.new
-        @http_response = options[:http_response] || HTTP::Response.new
+        @http_request = options[:http_request] || Http::Request.new
+        @http_response = options[:http_response] || Http::Response.new
         @auth = options[:auth]
         @retries = 0
         @metadata = {}
@@ -41,10 +41,10 @@ def initialize(options = {})
       # @return [Struct] The client configuration.
       attr_accessor :config
 
-      # @return [HTTP::Request]
+      # @return [Http::Request]
       attr_accessor :http_request
 
-      # @return [HTTP::Response]
+      # @return [Http::Response]
       attr_accessor :http_response
 
       # @return [Hash]

gems/smithy-client/lib/smithy-client/http/error_inspector.rb

@@ -4,7 +4,7 @@
 
 module Smithy
   module Client
-    module HTTP
+    module Http
       # An HTTP error inspector, using hints from status code and headers.
       class ErrorInspector
         def initialize(error, http_response)

gems/smithy-client/lib/smithy-client/http/headers.rb

@@ -2,12 +2,12 @@
 
 module Smithy
   module Client
-    module HTTP
+    module Http
       # Provides a Hash-like interface for HTTP headers.  Header names
       # are treated indifferently as lower-cased strings.  Header values
       # are cast to strings.
       #
-      #     headers = HTTP::Headers.new
+      #     headers = Http::Headers.new
       #     headers['Content-Length'] = 100
       #     headers[:Authorization] = 'Abc'
       #

gems/smithy-client/lib/smithy-client/http/request.rb

@@ -4,7 +4,7 @@
 
 module Smithy
   module Client
-    module HTTP
+    module Http
       # Represents an HTTP request.
       class Request
         # @option options [String, URI::HTTP, URI::HTTPS, nil] :endpoint (nil)

gems/smithy-client/lib/smithy-client/http/response.rb

@@ -4,7 +4,7 @@
 
 module Smithy
   module Client
-    module HTTP
+    module Http
       # Represents an HTTP Response.
       class Response
         # @option options [Integer] :status_code (0)

gems/smithy-client/lib/smithy-client/net_http/handler.rb

@@ -25,8 +25,8 @@ def call(context)
         private
 
         # @param [Configuration] config
-        # @param [HTTP::Request] req
-        # @param [HTTP::Response] resp
+        # @param [Http::Request] req
+        # @param [Http::Response] resp
         # @return [void]
         def transmit(config, req, resp)
           # Monkey patch default content-type set by Net::HTTP
@@ -85,7 +85,7 @@ def verify_bytes_received(resp, bytes_received)
         end
 
         # @param [Configuration] config
-        # @param [HTTP::Request] req
+        # @param [Http::Request] req
         # @yieldparam [Net::HTTP] http
         def session(config, req, &)
           pool_for(config).session_for(req.endpoint, &)
@@ -106,9 +106,9 @@ def pool_options(config)
           end
         end
 
-        # Constructs and returns a Net::HTTP::Request object from a {HTTP::Request}.
-        # @param [HTTP::Request] request
-        # @return [Net::HTTP::Request]
+        # Constructs and returns a Net::Http::Request object from a {Http::Request}.
+        # @param [Http::Request] request
+        # @return [Net::Http::Request]
         def build_net_request(request)
           request_class = net_http_request_class(request)
           req = request_class.new(request.endpoint.request_uri, net_headers_for(request))
@@ -122,9 +122,9 @@ def build_net_request(request)
           req
         end
 
-        # @param [HTTP::Request] request
+        # @param [Http::Request] request
         # @raise [ArgumentError]
-        # @return Returns a base `Net::HTTP::Request` class, e.g.,
+        # @return Returns a base `Net::Http::Request` class, e.g.,
         #  `Net::HTTP::Get`, `Net::HTTP::Post`, etc.
         def net_http_request_class(request)
           Net::HTTP.const_get(request.http_method.capitalize)
@@ -134,7 +134,7 @@ def net_http_request_class(request)
         end
 
         # Validate that fields are not trailers and return a hash of headers.
-        # @param [HTTP::Request] request
+        # @param [Http::Request] request
         # @return [Hash<String, String>]
         def net_headers_for(request)
           # Net::HTTP adds a default header for accept-encoding (2.0.0+).
@@ -149,7 +149,7 @@ def net_headers_for(request)
           headers
         end
 
-        # @param [Net::HTTP::Response] response
+        # @param [Net::Http::Response] response
         # @return [Hash<String, String>]
         def extract_headers(response)
           response.to_hash.transform_values(&:first)

gems/smithy-client/lib/smithy-client/plugins/retry_errors.rb

@@ -88,7 +88,7 @@ def handle(context, retry_strategy, token)
             if (error = response.error)
               return response unless retryable?(context.http_request)
 
-              error_info = HTTP::ErrorInspector.new(error, context.http_response)
+              error_info = Http::ErrorInspector.new(error, context.http_response)
               token = retry_strategy.refresh_retry_token(token, error_info)
               return response unless token
 

gems/smithy-client/lib/smithy-client/stubbing/null_protocol.rb

@@ -6,11 +6,11 @@ module Stubbing
       # @api private
       class NullProtocol
         def stub_data(_config, _operation, _data)
-          HTTP::Response.new
+          Http::Response.new
         end
 
         def stub_error(_config, _error_code)
-          HTTP::Response.new
+          Http::Response.new
         end
       end
     end

gems/smithy-client/lib/smithy-client/stubbing/rpc_v2_cbor.rb

@@ -6,7 +6,7 @@ module Stubbing
       # @api private
       class RpcV2Cbor
         def stub_data(config, operation, data)
-          response = HTTP::Response.new
+          response = Http::Response.new
           response.status_code = 200
           response.headers['Smithy-Protocol'] = 'rpc-v2-cbor'
           response.headers['Content-Type'] = 'application/cbor'
@@ -15,7 +15,7 @@ def stub_data(config, operation, data)
         end
 
         def stub_error(_config, error_code)
-          response = HTTP::Response.new
+          response = Http::Response.new
           response.status_code = 400
           response.headers['Smithy-Protocol'] = 'rpc-v2-cbor'
           response.headers['Content-Type'] = 'application/cbor'

gems/smithy-client/lib/smithy-client/stubs.rb

@@ -194,7 +194,7 @@ def http_response_stub(operation_name, data)
       end
 
       def hash_to_http_response(data)
-        http_response = HTTP::Response.new
+        http_response = Http::Response.new
         http_response.status_code = data[:status_code]
         http_response.headers.update(data[:headers])
         http_response.body = data[:body]