Addresses warnings

Author: picandocodigo

elasticsearch-api/Gemfile

@@ -32,8 +32,8 @@ group :development do
   else
     gem 'debug'
   end
-  # Related to https://github.com/ruby-i18n/i18n/issues/735
-  # Keeping here for compatiblity with JRuby 9.x
+  # TODO: Related to https://github.com/ruby-i18n/i18n/issues/735
+  # TODO: Keeping here for compatiblity with JRuby 9.x
   if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.2') &&
      Gem::Version.new(RUBY_VERSION) > Gem::Version.new('2.6')
     gem 'i18n', '1.14'

elasticsearch-api/lib/elasticsearch/api.rb

@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-require 'cgi'
+require 'cgi/escape'
 require 'multi_json'
 require 'elasticsearch/api/version'
 require 'elasticsearch/api/utils'

elasticsearch-api/spec/integration/integration_helper.rb

@@ -21,7 +21,9 @@
 
 CERTS_PATH = File.expand_path('./../../../.buildkite/certs', __dir__)
 host = ENV['TEST_ES_SERVER'] || 'http://localhost:9200'
-raise URI::InvalidURIError unless host =~ /\A#{URI::DEFAULT_PARSER.make_regexp}\z/
+# TODO: For compatiblity with JRuby 9.3
+parser = defined?(URI::RFC2396_PARSER) ? URI::RFC2396_PARSER : URI::DEFAULT_PARSER
+raise URI::InvalidURIError unless host =~ /\A#{parser.make_regexp}\z/
 
 password = ENV['ELASTIC_PASSWORD'] || 'changeme'
 HOST_URI = URI.parse(host)

elasticsearch/spec/integration/client_integration_spec.rb

@@ -15,7 +15,9 @@
 # specific language governing permissions and limitations
 # under the License.
 ELASTICSEARCH_URL = ENV['TEST_ES_SERVER'] || "http://localhost:#{(ENV['PORT'] || 9200)}"
-raise URI::InvalidURIError unless ELASTICSEARCH_URL =~ /\A#{URI::DEFAULT_PARSER.make_regexp}\z/
+# TODO: For compatiblity with JRuby 9.3
+parser = defined?(URI::RFC2396_PARSER) ? URI::RFC2396_PARSER : URI::DEFAULT_PARSER
+raise URI::InvalidURIError unless ELASTICSEARCH_URL =~ /\A#{parser.make_regexp}\z/
 
 require 'spec_helper'
 require 'logger'
@@ -49,7 +51,7 @@
     it 'Reports es service name and gem version' do
       headers = CLIENT.transport.connections.first.connection.headers
       version = Class.new.extend(Elastic::Transport::MetaHeader).send(:client_meta_version, Elasticsearch::VERSION)
-      expect(headers['x-elastic-client-meta']).to match /^es=#{version}/
+      expect(headers['x-elastic-client-meta']).to match(/^es=#{version}/)
     end
   end
 end

elasticsearch/spec/integration/helpers/bulk_helper_spec.rb

@@ -113,7 +113,7 @@
     context 'JSON File helper' do
       let(:file) { Tempfile.new('test-data.json') }
       let(:json) do
-        json = <<~JSON
+        <<~JSON
         [
           {
             "character_name": "Anallese Lonie",
@@ -168,7 +168,7 @@
 
       context 'with data not in root of JSON file' do
         let(:json) do
-          json = <<~JSON
+          <<~JSON
           {
             "field": "value",
             "status": 200,

elasticsearch/spec/spec_helper.rb

@@ -45,7 +45,9 @@ def jruby?
 
 CERTS_PATH = File.expand_path('../../.buildkite/certs', __dir__)
 host = ENV['TEST_ES_SERVER'] || 'http://localhost:9200'
-raise URI::InvalidURIError unless host =~ /\A#{URI::DEFAULT_PARSER.make_regexp}\z/
+# TODO: For compatiblity with JRuby 9.3
+parser = defined?(URI::RFC2396_PARSER) ? URI::RFC2396_PARSER : URI::DEFAULT_PARSER
+raise URI::InvalidURIError unless host =~ /\A#{parser.make_regexp}\z/
 
 password = ENV['ELASTIC_PASSWORD'] || 'changeme'
 HOST_URI = URI.parse(host)