[chore] Remove pre Rack 2.2 parameter type error compatibility logic

Author: chadlwilson

src/main/ruby/rack/handler/servlet/servlet_env.rb

@@ -51,12 +51,6 @@ def load_env_key(env, key)
         # @private
         POST_PARAM_METHODS = [ 'POST', 'PUT', 'DELETE' ].freeze
 
-        if defined? Rack::Utils::ParameterTypeError
-          ParameterTypeError = Rack::Utils::ParameterTypeError
-        else
-          ParameterTypeError = TypeError
-        end
-
         # Load parameters into the (Rack) env from the Servlet API.
         # using javax.servlet.http.HttpServletRequest#getParameterMap
         def load_parameters
@@ -188,8 +182,8 @@ def parse_query_string
         end
 
         def mark_parameter_error(msg)
-          raise ParameterTypeError, msg
-        rescue ParameterTypeError => e
+          raise Rack::Utils::ParameterTypeError, msg
+        rescue Rack::Utils::ParameterTypeError => e
           @parameter_error = e
         end
 

src/spec/ruby/rack/handler/servlet_spec.rb

@@ -473,16 +473,9 @@ def getAttributeNames
       env = servlet.create_env(@servlet_env)
       rack_request = Rack::Request.new(env)
 
-      # Rack::Utils::ParameterTypeError (< TypeError) since 1.6.0
-      if Rack::Utils.const_defined? :ParameterTypeError
-        error = Rack::Utils::ParameterTypeError
-      else
-        error = TypeError
-      end
-
-      expect { rack_request.GET }.to raise_error(error, "expected Hash (got Array) for param `foo'")
+      expect { rack_request.GET }.to raise_error(Rack::Utils::ParameterTypeError, "expected Hash (got Array) for param `foo'")
       expect(rack_request.POST).to eq({})
-      expect { rack_request.params }.to raise_error(error, "expected Hash (got Array) for param `foo'")
+      expect { rack_request.params }.to raise_error(Rack::Utils::ParameterTypeError, "expected Hash (got Array) for param `foo'")
 
       expect(rack_request.query_string).to eq 'foo[]=0&foo[bar]=1'
     end