jrjackson 0.4.8-java → 0.4.13-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60ac61ae600aa8890e18f0fac4882158d5a61983a46f727a4110536dae859c15
-  data.tar.gz: dac5dde733b16e27bcd2ec7bf9be2e1a381df3f9f014e528f569a691f289d4a2
+  metadata.gz: 799f68c6ec2b93e3885852b5199fc80dd0853381077f2ffec91bca46b7a6e1c9
+  data.tar.gz: 395b7a89c872e08482f776efd73d742de211c9e21a3057b164d8ee346dab7a31
 SHA512:
-  metadata.gz: b676bb38063011d3a562b07eef490566e7eef568780f79f51904ab2ced4db8df5a05d4ad9b09db8db9c98a2f7a8b22694266ca43f6c8b1261fd651a077d6b717
-  data.tar.gz: ed12fc31c05a55c788b8b685059eb920698e05bd4423f8a5dfb21a7e2ab6ffd51e48b946ab1586877d9c1742856d70e3e3af84b4bcd73a8572e22e5494647efd
+  metadata.gz: aa9023edcaea82e6235f5133bd3e8dc99d0329eb4ed258d63d17b0f213c5c7f13aa138140cf175c9681d08d5fab4102841230a7e843ef9c4d3177c22a50dc8a9
+  data.tar.gz: 05d0049ee65f6ae86f1e0e45209b8d4a9bcbd987f7684b50922944fb1759c9235f48998a6be764facd9270537aa7199bfc8a365c25377421c45987f1ec4642a9

data/Gemfile

@@ -5,6 +5,10 @@ group :development do
   gem 'gson', '>= 0.6'
   gem 'json', '~> 1.8'
   gem 'benchmark-ips'
+  gem 'jar-dependencies'
+  gem 'ruby-maven'
+  gem 'rake'
+  gem 'test-unit'
 end
 
 gemspec

data/Rakefile

@@ -10,7 +10,7 @@ end
 
 desc "Run benchmarks"
 task :benchmark do
-  load 'benchmarking/benchmark.rb'
+  load 'benchmarking/benchmark_threaded.rb'
 end
 
 desc "Pack jar after compiling classes, use this to rebuild the pom.xml"

data/changelog.md

@@ -1,3 +1,23 @@
+v0.4.13
+  Bump jackson-databind to v2.9.10.6
+
+v0.4.12
+  Bump jackson-databind to v2.9.10.4
+
+v0.4.11
+  Bump Jackson to v2.9.10, and jackson-databind to v2.9.10.1
+
+v0.4.10
+  fix concurrency issue when serializing dates. 
+  Cache UTC TimeZone class to avoid unnecessary calls to synchronized method
+  Use a ThreadLocal to hold per-thread instances of SimpleDateFormat to avoid
+   unnecessary expensive clonings of that object
+  Replace unsafe call to setDateFormat on static ObjectMapper class by creating
+   an amended SerializationConfig
+
+v0.4.9
+  bump Jackson to v2.9.9, and jackson-databind to v2.9.9.3
+
 v0.4.8
   fix serialisation of big numbers as Ruby 2.4 unifies Fixnum and Bignum into Integer 
 

data/jrjackson.gemspec

@@ -18,13 +18,13 @@ Gem::Specification.new do |s|
   s.license     = 'Apache License 2.0'
   s.require_paths = ["lib"]
 
-  s.add_development_dependency 'bundler', '~> 1.10'
   s.add_development_dependency 'jar-dependencies', '< 2.0', '>= 0.3.2'
 
   jackson_version = JrJackson::BuildInfo.jackson_version
+  jackson_databind_version = JrJackson::BuildInfo.jackson_databind_version
   s.requirements << "jar com.fasterxml.jackson.core:jackson-core, #{jackson_version}"
   s.requirements << "jar com.fasterxml.jackson.core:jackson-annotations, #{jackson_version}"
-  s.requirements << "jar com.fasterxml.jackson.core:jackson-databind, #{jackson_version}"
+  s.requirements << "jar com.fasterxml.jackson.core:jackson-databind, #{jackson_databind_version}"
   s.requirements << "jar com.fasterxml.jackson.module:jackson-module-afterburner, #{jackson_version}"
 
   s.files = JrJackson::BuildInfo.files

data/lib/jrjackson/build_info.rb

@@ -1,11 +1,11 @@
 module JrJackson
   module BuildInfo
     def self.version
-      '0.4.8'
+      '0.4.13'
     end
 
     def self.release_date
-      '2019-05-01'
+      '2020-10-26'
     end
 
     def self.files
@@ -13,11 +13,15 @@ module JrJackson
     end
 
     def self.jackson_version
-      '2.9.7'
+      '2.9.10'
+    end
+
+    def self.jackson_databind_version
+      '2.9.10.6'
     end
 
     def self.jar_version
-      '1.2.26'
+      '1.2.31'
     end
 
     private
@@ -34,7 +38,7 @@ module JrJackson
       [
         "lib/com/fasterxml/jackson/core/jackson-annotations/#{jackson_version}/jackson-annotations-#{jackson_version}.jar",
         "lib/com/fasterxml/jackson/core/jackson-core/#{jackson_version}/jackson-core-#{jackson_version}.jar",
-        "lib/com/fasterxml/jackson/core/jackson-databind/#{jackson_version}/jackson-databind-#{jackson_version}.jar",
+        "lib/com/fasterxml/jackson/core/jackson-databind/#{jackson_databind_version}/jackson-databind-#{jackson_databind_version}.jar",
         "lib/com/fasterxml/jackson/module/jackson-module-afterburner/#{jackson_version}/jackson-module-afterburner-#{jackson_version}.jar",
         "lib/jrjackson/jars/jrjackson-#{jar_version}.jar"
       ]

data/src/main/java/com/jrjackson/RubyAnySerializer.java

@@ -234,13 +234,13 @@ public class RubyAnySerializer extends JsonSerializer<IRubyObject> {
         if (df == null) {
             // DateFormat should always be set
             provider.defaultSerializeDateValue(dt.getJavaDate(), jgen);
-        } else if (df instanceof RubyDateFormat) {
+        } // RWB Note: I believe this is no longer used
+        else if (df instanceof RubyDateFormat) {
             // why another branch? I thought there was an easy win on to_s
             // maybe with jruby 9000
-            RubyDateFormat rdf = (RubyDateFormat) df.clone();
-            jgen.writeString(rdf.format(dt.getJavaDate()));
+            RubyDateFormat clonedRubyDateFormat = (RubyDateFormat) df.clone();
+            jgen.writeString(clonedRubyDateFormat.format(dt.getJavaDate()));
         } else {
-            SimpleDateFormat sdf = (SimpleDateFormat) df.clone();
             jgen.writeString(df.format(dt.getJavaDate()));
         }
     }

data/src/main/java/com/jrjackson/RubyJacksonModule.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.core.Version;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.SerializationConfig;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.ser.DefaultSerializerProvider;
 import com.fasterxml.jackson.module.afterburner.AfterburnerModule;
@@ -17,6 +18,16 @@ import java.util.TimeZone;
 public class RubyJacksonModule extends SimpleModule {
     public static final ObjectMapper static_mapper = new ObjectMapper();
     public static final JsonFactory factory = new JsonFactory(static_mapper).disable(JsonFactory.Feature.FAIL_ON_SYMBOL_HASH_OVERFLOW);
+    private static final TimeZone utcTimeZone = TimeZone.getTimeZone("UTC");
+
+    private static final ThreadLocal<SimpleDateFormat>  dateFormat = new ThreadLocal<SimpleDateFormat> ()  {
+        @Override
+        protected SimpleDateFormat initialValue() {
+            SimpleDateFormat rdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z");
+            rdf.setTimeZone(utcTimeZone);
+            return rdf;
+        }
+    };
 
     static {
         static_mapper.registerModule(new RubyJacksonModule().addSerializer(
@@ -27,7 +38,7 @@ public class RubyJacksonModule extends SimpleModule {
     }
 
     private RubyJacksonModule() {
-        super("JrJacksonStrModule", new Version(1, 2, 18, "0", "com.jrjackson.jruby", "jrjackson"));
+        super("JrJacksonStrModule", new Version(1, 2, 28, "0", "com.jrjackson.jruby", "jrjackson"));
     }
 
     public static ObjectMapper mapperWith(Ruby ruby, RubyKeyConverter nameConverter,
@@ -46,17 +57,18 @@ public class RubyJacksonModule extends SimpleModule {
     }
 
     public static DefaultSerializerProvider createProvider(SimpleDateFormat sdf) {
-        static_mapper.setDateFormat(sdf);
+        // Use a copy of the SerializationConfig to avoid calling setDateFormat on the static ObjectMapper
+        // object, removing its thread safety properties. In future, we might want to think about doing
+        // a refactor to use ObjectWriters instead of modifying serialization configs.
+        SerializationConfig config = static_mapper.getSerializationConfig().with(sdf);
         return ((DefaultSerializerProvider) static_mapper.getSerializerProvider()).createInstance(
-                static_mapper.getSerializationConfig(),
+                config,
                 static_mapper.getSerializerFactory()
         );
     }
 
     public static DefaultSerializerProvider createProvider() {
-        SimpleDateFormat rdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z");
-        rdf.setTimeZone(TimeZone.getTimeZone("UTC"));
-        return createProvider(rdf);
+        return createProvider(dateFormat.get());
     }
 
     public static ObjectMapper rawBigNumberMapper() {

data/test/jrjackson_test.rb

@@ -548,6 +548,21 @@ class JrJacksonTest < Test::Unit::TestCase
     assert_equal "{\"foo\":9223372036854775808,\"bar\":65536}", actual
   end
 
+
+  # This test failed more often than not before fixing the underlying code
+  # and would fail every time if `100_000.times` was changed to `loop`
+  def test_concurrent_dump
+    now = Time.now
+    num_threads = 100
+
+    threads = num_threads.times.map do |i|
+      Thread.new do
+        100_000.times { JrJackson::Json.dump("a" => now) }
+      end
+    end
+    threads.each(&:join)
+  end
+
   # -----------------------------
 
   def assert_bigdecimal_equal(expected, actual)

metadata

@@ -1,49 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: jrjackson
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.13
 platform: java
 authors:
 - Guy Boertje
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-05-01 00:00:00.000000000 Z
+date: 2020-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-  name: bundler
-  prerelease: false
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+        version: 0.3.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.2
   name: jar-dependencies
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: A mostly native JRuby wrapper for the java jackson json processor jar
 email:
 - guyboertje@gmail.com
@@ -60,13 +46,13 @@ files:
 - alt_bench.rb
 - changelog.md
 - jrjackson.gemspec
-- lib/com/fasterxml/jackson/core/jackson-annotations/2.9.7/jackson-annotations-2.9.7.jar
-- lib/com/fasterxml/jackson/core/jackson-core/2.9.7/jackson-core-2.9.7.jar
-- lib/com/fasterxml/jackson/core/jackson-databind/2.9.7/jackson-databind-2.9.7.jar
-- lib/com/fasterxml/jackson/module/jackson-module-afterburner/2.9.7/jackson-module-afterburner-2.9.7.jar
+- lib/com/fasterxml/jackson/core/jackson-annotations/2.9.10/jackson-annotations-2.9.10.jar
+- lib/com/fasterxml/jackson/core/jackson-core/2.9.10/jackson-core-2.9.10.jar
+- lib/com/fasterxml/jackson/core/jackson-databind/2.9.10.6/jackson-databind-2.9.10.6.jar
+- lib/com/fasterxml/jackson/module/jackson-module-afterburner/2.9.10/jackson-module-afterburner-2.9.10.jar
 - lib/jrjackson.rb
 - lib/jrjackson/build_info.rb
-- lib/jrjackson/jars/jrjackson-1.2.26.jar
+- lib/jrjackson/jars/jrjackson-1.2.31.jar
 - lib/jrjackson/jrjackson.rb
 - lib/jrjackson_jars.rb
 - lib/require_relative_patch.rb
@@ -134,12 +120,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- jar com.fasterxml.jackson.core:jackson-core, 2.9.7
-- jar com.fasterxml.jackson.core:jackson-annotations, 2.9.7
-- jar com.fasterxml.jackson.core:jackson-databind, 2.9.7
-- jar com.fasterxml.jackson.module:jackson-module-afterburner, 2.9.7
-rubyforge_project:
-rubygems_version: 2.7.6
+- jar com.fasterxml.jackson.core:jackson-core, 2.9.10
+- jar com.fasterxml.jackson.core:jackson-annotations, 2.9.10
+- jar com.fasterxml.jackson.core:jackson-databind, 2.9.10.6
+- jar com.fasterxml.jackson.module:jackson-module-afterburner, 2.9.10
+rubygems_version: 3.0.6
 signing_key:
 specification_version: 4
 summary: A JRuby wrapper for the java jackson json processor jar