Skip to content

Fix MultiJson deprecation warnings in DefaultSerializer #3076

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SergiuLupaiescu wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix MultiJson deprecation warnings in DefaultSerializer #3076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion elasticsearch-api/lib/elasticsearch/api.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,19 @@ module Elasticsearch
module API
include Elasticsearch::API::Actions

DEFAULT_SERIALIZER = MultiJson
# Default JSON serializer. multi_json >= 1.21 deprecates the MultiJson constant and
# dump/load in favor of MultiJSON, generate/parse; use the new API when available.
module DefaultSerializer
def self.dump(object, options = {})
defined?(::MultiJSON) ? ::MultiJSON.generate(object, options) : ::MultiJson.dump(object, options)
end

def self.load(string, options = {})
defined?(::MultiJSON) ? ::MultiJSON.parse(string, options) : ::MultiJson.load(string, options)
end
end

DEFAULT_SERIALIZER = DefaultSerializer

HTTP_GET = 'GET'.freeze
HTTP_HEAD = 'HEAD'.freeze
Expand Down
11 changes: 10 additions & 1 deletion elasticsearch-api/spec/unit/api_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,16 @@
end

it 'has a default serializer' do
expect(Elasticsearch::API.serializer).to eq(MultiJson)
expect(Elasticsearch::API.serializer).to respond_to(:dump, :load)
end

it 'serializes and deserializes with the default serializer' do
serializer = Elasticsearch::API::DEFAULT_SERIALIZER
expect(serializer.load(serializer.dump({ 'a' => 1 }))).to eq({ 'a' => 1 })
end

it 'does not emit deprecation warnings' do
expect { Elasticsearch::API::DEFAULT_SERIALIZER.dump({ a: 1 }) }.not_to output.to_stderr
end

context 'when settings are changed' do
Expand Down