github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 22:57:16 -04:00
Code Issues Projects Releases Packages Wiki Activity

Bump JrJackson gem to 0.3.5 and make adjustments to use it

Browse source
This commit is contained in:
guyboertje 2015-10-07 20:27:18 +01:00 • committed by Suyog Rao
parent 4e300a8a41
commit 26fb4bdbe0
3 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Gemfile.jruby-1.9.lock
View file

@ -8,7 +8,7 @@ PATH
filesize (= 0.0.4) filesize (= 0.0.4)
gems (~> 0.8.3) gems (~> 0.8.3)
i18n (= 0.6.9) i18n (= 0.6.9)
jrjackson (~> 0.2.9) jrjackson (~> 0.3.5)
minitar (~> 0.5.4) minitar (~> 0.5.4)
pry (~> 0.10.1) pry (~> 0.10.1)
stud (~> 0.0.19) stud (~> 0.0.19)
@ -66,10 +66,10 @@ GEM
domain_name (~> 0.5) domain_name (~> 0.5)
i18n (0.6.9) i18n (0.6.9)
insist (1.0.0) insist (1.0.0)
jrjackson (0.2.9) jrjackson (0.3.5)
json (1.8.3-java) json (1.8.2-java)
kramdown (1.9.0) kramdown (1.8.0)
logstash-devutils (0.0.18-java) logstash-devutils (0.0.15-java)
gem_publisher gem_publisher
insist (= 1.0.0) insist (= 1.0.0)
kramdown kramdown

12
lib/logstash/json.rb
View file

@ -32,15 +32,23 @@ module LogStash
### JRuby ### JRuby
def jruby_load(data, options = {}) def jruby_load(data, options = {})
options[:symbolize_keys] ? JrJackson::Raw.parse_sym(data) : JrJackson::Raw.parse_raw(data) # TODO [guyboertje] remove these comments in 5.0
# options[:symbolize_keys] ? JrJackson::Raw.parse_sym(data) : JrJackson::Raw.parse_raw(data)
JrJackson::Ruby.parse(data, options)
rescue JrJackson::ParseError => e rescue JrJackson::ParseError => e
raise LogStash::Json::ParserError.new(e.message) raise LogStash::Json::ParserError.new(e.message)
end end
def jruby_dump(o) def jruby_dump(o)
# TODO [guyboertje] remove these comments in 5.0
# test for enumerable here to work around an omission in JrJackson::Json.dump to # test for enumerable here to work around an omission in JrJackson::Json.dump to
# also look for Java::JavaUtil::ArrayList, see TODO submit issue # also look for Java::JavaUtil::ArrayList, see TODO submit issue
o.is_a?(Enumerable) ? JrJackson::Raw.generate(o) : JrJackson::Json.dump(o) # o.is_a?(Enumerable) ? JrJackson::Raw.generate(o) : JrJackson::Json.dump(o)
JrJackson::Base.generate(o, {})
rescue => e rescue => e
raise LogStash::Json::GeneratorError.new(e.message) raise LogStash::Json::GeneratorError.new(e.message)
end end

2
logstash-core.gemspec
View file

@ -39,7 +39,7 @@ Gem::Specification.new do |gem|
if RUBY_PLATFORM == 'java' if RUBY_PLATFORM == 'java'
gem.platform = RUBY_PLATFORM gem.platform = RUBY_PLATFORM
gem.add_runtime_dependency "jrjackson", "~> 0.2.9" #(Apache 2.0 license) gem.add_runtime_dependency "jrjackson", "~> 0.3.5" #(Apache 2.0 license)
else else
gem.add_runtime_dependency "oj" #(MIT-style license) gem.add_runtime_dependency "oj" #(MIT-style license)
end end