jrjackson 0.4.9-java → 0.4.14-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 518b60237a4fb88e239f4423e47314a5fe4a09cdf0901415db7afad5a35b9a57
-  data.tar.gz: 0e08b62e3ad49c5babbe2a00da87ad8b54bab271a37de33b33c83882320cac68
+  metadata.gz: 0f2727a3a05643d0112024c0b77e7ef313e0aa00a6ec2b210ff33e1f8ab664fc
+  data.tar.gz: ac5449253916c384b2ec2813bb9742f4ecc23ad5e14f5a20b931584c45f93d4c
 SHA512:
-  metadata.gz: 040d69f72e5f414bbddf870c3181bd6e41795b3d774df5524b0a9023a8905c7afc3dcb54d04a239ea4d56934270d9a40c5936929636cce3d7abd3144326ec411
-  data.tar.gz: 50f202d3f5236d76dac6b3eace958553ba4013055f98215411f7998730348a97d1c5902f6dcc6eadccd6fd52c39788e934952fe0f57cc29f39c294c554491fa0
+  metadata.gz: 14ee252756aed46df8d924eef3cf14185085809465b8e28fd3afaf3c8787bc029144fe09f61bb189907923d873eb7156e084ac5d413fdefb77eb21b9d27845e9
+  data.tar.gz: 70e5bfded1449381236fcad1764a882a50b99381b8accca5ef326c856ae014ec7b8b17371008dd39fea6c558df118cea6d590c465f7c1c734aaf5a7c47ce8616

data/Mavenfile

@@ -14,7 +14,7 @@ properties 'project.build.sourceEncoding' => 'UTF-8',
 
 jar 'junit:junit', '4.11', :scope => :test
 
-jar 'org.jruby:jruby', '9.2.4.0', :scope => :provided
+jar 'org.jruby:jruby', '9.2.13.0', :scope => :provided
 
 plugin :compiler, '3.1', :source => '1.8', :target => '1.8',
        :showDeprecation => false,
@@ -23,9 +23,3 @@ plugin :compiler, '3.1', :source => '1.8', :target => '1.8',
        :fork => true
 
 plugin :surefire, '2.17', :skipTests => true
-
-# since bundle install does not vendor our jars we need to it manually
-plugin 'org.torquebox.mojo:jruby9-exec-maven-plugin', '0.3.1' do
-  execute_goal :exec, :id => 'vendor-jars', :phase => 'prepare-package',
-               :script => "require 'jars/installer';Jars::Installer.vendor_jars!"
-end

data/Rakefile

@@ -10,12 +10,19 @@ 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"
 task :compile do
   RubyMaven.exec('prepare-package')
+  # after packaging the jrjackson-x.y.z.jar vendor jar dependencies
+  Rake::Task['vendor_jars'].invoke
+end
+
+task :vendor_jars do
+  require 'jars/installer'
+  Jars::Installer.vendor_jars!
 end
 
 desc "Clean build"
@@ -30,4 +37,3 @@ Gem::PackageTask.new( eval File.read( 'jrjackson.gemspec' ) ) do
   desc 'Pack gem'
   task :package => [:compile]
 end
-

data/changelog.md

@@ -1,8 +1,28 @@
+v0.4.14
+  Bump jackson-databind to v2.9.10.8
+
+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 
+  fix serialisation of big numbers as Ruby 2.4 unifies Fixnum and Bignum into Integer
 
 v0.4.4
   fix for issue 64
@@ -11,7 +31,7 @@ v0.4.4
 v0.4.3
   bump Jackson to v2.9.1
   make static_mapper public
-  
+
 v0.4.1
   fix for issue 55
     Refactor AnySerializer acceptable class detection that does not use an exception

data/lib/jrjackson/build_info.rb

@@ -1,11 +1,11 @@
 module JrJackson
   module BuildInfo
     def self.version
-      '0.4.9'
+      '0.4.14'
     end
 
     def self.release_date
-      '2019-08-09'
+      '2021-01-06'
     end
 
     def self.files
@@ -13,15 +13,15 @@ module JrJackson
     end
 
     def self.jackson_version
-      '2.9.9'
+      '2.9.10'
     end
 
     def self.jackson_databind_version
-      '2.9.9.3'
+      '2.9.10.8'
     end
 
     def self.jar_version
-      '1.2.27'
+      '1.2.32'
     end
 
     private

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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jrjackson
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.14
 platform: java
 authors:
 - Guy Boertje
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-09 00:00:00.000000000 Z
+date: 2021-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -17,8 +17,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.10'
   name: bundler
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -27,23 +27,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !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'
   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 +60,13 @@ files:
 - alt_bench.rb
 - changelog.md
 - jrjackson.gemspec
-- lib/com/fasterxml/jackson/core/jackson-annotations/2.9.9/jackson-annotations-2.9.9.jar
-- lib/com/fasterxml/jackson/core/jackson-core/2.9.9/jackson-core-2.9.9.jar
-- lib/com/fasterxml/jackson/core/jackson-databind/2.9.9.3/jackson-databind-2.9.9.3.jar
-- lib/com/fasterxml/jackson/module/jackson-module-afterburner/2.9.9/jackson-module-afterburner-2.9.9.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.8/jackson-databind-2.9.10.8.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.27.jar
+- lib/jrjackson/jars/jrjackson-1.2.32.jar
 - lib/jrjackson/jrjackson.rb
 - lib/jrjackson_jars.rb
 - lib/require_relative_patch.rb
@@ -134,12 +134,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- jar com.fasterxml.jackson.core:jackson-core, 2.9.9
-- jar com.fasterxml.jackson.core:jackson-annotations, 2.9.9
-- jar com.fasterxml.jackson.core:jackson-databind, 2.9.9.3
-- jar com.fasterxml.jackson.module:jackson-module-afterburner, 2.9.9
-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.8
+- 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