jrjackson 0.4.18-java → 0.4.20-java

data/changelog.md

@@ -1,181 +0,0 @@
-v0.4.17
-  Bump jackson and jackson-databind to v2.14.1
-
-v0.4.16
-  Publish v0.4.15 again without world writable files
-
-v0.4.15
-  Bump jackson and jackson-databind to v2.13.3
-
-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
-
-v0.4.4
-  fix for issue 64
-    Ruby parse() null/nil handling
-
-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
-
-v0.4.0
-  Implement `to_s` and Exception serialization
-
-v0.3.9
-  Thanks to mkristian, now uses jar_dependencies
-    Upgrade to Jackson v2.7.1
-  fix for issue 51
-    dont create "new RubyJacksonModule()" when creating a Provider
-  fix for reports of symbol table overflow in Jackson when using JrJackson in very long running daemons (Logstash)
-    disable the FAIL_ON_SYMBOL_HASH_OVERFLOW setting
-
-v0.3.8
-  fix for issue 47
-    Update Jackson to v 2.6.3
-  Change error message to better report failure in issue 46
-
-v0.3.7
-  fix for issue 46
-    Add references to RubyAnySerializer so Jackson can
-    use it for Ruby objects nested in Java objects
-
-v0.3.6
-  fix for issue 45
-    use bytelist.begin instead of 0 generating from RubyString
-
-v0.3.5
-  give highest precedence to the to_json_data method
-
-v0.3.4
-  fix multi_json bug
-    not serializing non-string keys
-
-v0.3.3
-  fix bigdecimal bug
-    add require bigdecimal
-
-v0.3.2
-  update changelog
-
-v0.3.1
-  remove old jar
-
-v0.3.0
-  this is a major refactor.
-  parse and generate performance improvements.
-    see JrJackson::Ruby and JrJackson::Java modules
-  pretty generation support.
-  jruby 9.0.1.0 and 1.7.22
-  jackson 2.6.1
-
-v0.2.9
-  fix for issue 39
-    incorrect error when serializing BasicObject
-
-v0.2.8
-  fixes for issues-28,29,31
-    correction for Time#to_s
-    new options to control date serialization
-    optimizations suggested by @headius
-  jar compiled for jruby 1.7.17
-  jruby 1.7.17
-  jackson 2.4.4
-
-v0.2.7
-  fixes for issues-23,24
-    add to_time as option for serializing Time like objects
-  jar compiled for jruby 1.7.11
-
-v0.2.6
-  fix issue-20
-    allow jruby to convert Ruby StringIO into Java
-    by not type checking passed arg
-    this is because jruby 1.7.9 has changed the type of java object backing Ruby StringIO
-  jar compiled for jruby 1.7.8 (jruby 1.7.9 in the maven repo has an error in the pom.xml)
-  jruby 1.7.8, jruby 1.7.9 (tested)
-  jackson 2.3.0
-
-v0.2.5
-  fix issue-16
-    reduce the gem size by:
-      change pom.xml to only include relevant java jars
-      exclude benchmaking from the gemspec files
-  jruby 1.7.5
-  jackson 2.2.3
-
-v0.2.4
-  fix issue-15
-    return Ruby nil instead of Java null
-  fix issue-14
-    remove all usage of Ruby.getGlobalRuntime
-    pass the runtime from the calling Ruby ThreadContext into the deserializers and converters
-  jruby 1.7.5
-  jackson 2.2.3
-
-v0.2.3
-  fix issue-12
-    improve the serialization support for non Json Datatype Ruby objects
-    now has support for serializing via toJava, to_h, to_hash, to_a, to_json
-  fix for failing MultiJson unicode test
-  jruby 1.7.4
-  jackson 2.2.3
-
-v0.2.2
-  fix issue-13
-    compile Java for 1.6 compatibility
-  documentation tweaks
-  jruby 1.7.4
-  jackson 2.2.3
-
-v0.2.1
-  documentation tweaks
-  fix issue-7
-    add pluggable String and Symbol Converters for JSON values
-  jruby 1.7.4
-  jackson 2.2.3
-
-v0.2.0
-  extract all Java -> Ruby generation to reusable RubyUtils static class
-  support BigDecimal
-  remove JSON Api
-  fixes issues 5, 6, 8,
-
-  jruby 1.7.3
-  jackson 2.2.2
-
-v0.1.1
-  fix Time regex
-v0.1.0
-  MutiJson compatibility
-  switch to using almost all Java, i.e. define most of the ruby modules in Java
-  jruby 1.7.3
-  jackson 2.1.4
-v0.0.7
-  first release - minimal jruby wrapper around jackson 1.9.5 jars

data/profiling/profiled.rb

@@ -1,15 +0,0 @@
-require 'rubygems'
-require 'jruby-prof'
-require 'jrjackson_r'
-
-js = %({"one":1,"two":"deux","three":[333.333,66.666]})
-
-result = JRubyProf.profile do
-  JrJackson::Json.parse js
-end
-
-JRubyProf.print_flat_text result, "flat.txt"
-JRubyProf.print_graph_text result, "graph.txt"
-JRubyProf.print_graph_html result, "graph.html"
-JRubyProf.print_call_tree result, "call_tree.txt"
-JRubyProf.print_tree_html result, "call_tree.html"

data/run_all_individual_bench.sh

@@ -1,25 +0,0 @@
-#!/bin/sh
-
-chruby-exec ruby-2.2.2 -- ruby benchmarking/individual/json-mri-sourced.rb
-chruby-exec ruby-2.2.2 -- ruby benchmarking/individual/oj-mri-sourced.rb
-
-chruby-exec jruby-9.2.0.0 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/gson-jr-sourced.rb
-chruby-exec jruby-9.2.0.0 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/json-jr-sourced.rb
-
-chruby-exec jruby-9.2.0.0 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/string-jr-sourced.rb
-chruby-exec jruby-9.2.0.0 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/str-bd-jr-sourced.rb
-
-chruby-exec jruby-9.2.0.0 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/symbol-jr-sourced.rb
-chruby-exec jruby-9.2.0.0 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/sym-bd-jr-sourced.rb
-
-chruby-exec jruby-9.2.0.0 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/raw-jr-sourced.rb
-chruby-exec jruby-9.2.0.0 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/raw-bd-jr-sourced.rb
-
-chruby-exec jruby-9.2.0.0 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/sj-jr-sourced.rb
-
-chruby-exec ruby-2.2.2 -- ruby benchmarking/individual/json-gen-mri-sourced.rb
-chruby-exec ruby-2.2.2 -- ruby benchmarking/individual/oj-gen-mri-sourced.rb
-
-chruby-exec jruby-9.2.0.0 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/json-gen-jr-sourced.rb
-chruby-exec jruby-9.2.0.0 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/gson-gen-jr-sourced.rb
-chruby-exec jruby-9.2.0.0 -- ruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/raw-gen-jr-sourced.rb

data/run_jruby_individual_bench.sh

@@ -1,20 +0,0 @@
-#!/bin/sh
-
-jruby -J-Xmn1024m -J-Xms4096m -J-Xmx4096m -S ./benchmarking/individual/json-gen-jr-sourced.rb 
-jruby -J-Xmn1024m -J-Xms4096m -J-Xmx4096m -S ./benchmarking/individual/gson-gen-jr-sourced.rb 
-jruby -J-Xmn1024m -J-Xms4096m -J-Xmx4096m -S ./benchmarking/individual/raw-gen-jr-sourced.rb 
-
-# jruby -J-Xmn1024m -J-Xms4096m -J-Xmx4096m -S ./benchmarking/individual/gson-jr-sourced.rb
-jruby -J-Xmn1024m -J-Xms4096m -J-Xmx4096m -S ./benchmarking/individual/json-jr-sourced.rb
-
-jruby -J-Xmn1024m -J-Xms4096m -J-Xmx4096m -S ./benchmarking/individual/string-jr-sourced.rb
-jruby -J-Xmn1024m -J-Xms4096m -J-Xmx4096m -S ./benchmarking/individual/str-bd-jr-sourced.rb
-
-jruby -J-Xmn1024m -J-Xms4096m -J-Xmx4096m -S ./benchmarking/individual/symbol-jr-sourced.rb
-jruby -J-Xmn1024m -J-Xms4096m -J-Xmx4096m -S ./benchmarking/individual/sym-bd-jr-sourced.rb
-
-jruby -J-Xmn1024m -J-Xms4096m -J-Xmx4096m -S ./benchmarking/individual/raw-jr-sourced.rb
-jruby -J-Xmn1024m -J-Xms4096m -J-Xmx4096m -S ./benchmarking/individual/raw-bd-jr-sourced.rb
-
-jruby -J-Xmn1024m -J-Xms4096m -J-Xmx4096m -S ./benchmarking/individual/sj-jr-sourced.rb
-

data/run_mri_individual_bench.sh

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-ruby ./benchmarking/individual/json-mri-sourced.rb
-ruby ./benchmarking/individual/oj-mri-sourced.rb
-
-ruby ./benchmarking/individual/json-gen-mri-sourced.rb
-ruby ./benchmarking/individual/oj-gen-mri-sourced.rb

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

@@ -1,53 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package com.jrjackson;
-
-import com.fasterxml.jackson.core.JsonParser;
-import java.io.IOException;
-
-/**
- *
- * @author guy
- * @param <T>
- * @param <U>
- * @param <V>
- */
-public interface IParseHandler<T, U, V> {
-
-    void addValue(T value);
-
-    void arrayAppend(U array, T value);
-
-    void arrayEnd();
-
-    T arrayStart();
-
-    T falseValue();
-
-    T getResult();
-
-    void hashEnd();
-
-    T hashKey(String key);
-
-    void hashSet(V hash, T key, T value);
-
-    T hashStart();
-
-    void raiseError(String e);
-
-    T treatFloat(JsonParser jp) throws IOException;
-
-    T treatInt(JsonParser jp) throws IOException;
-
-    T treatNull();
-
-    T treatString(JsonParser jp) throws IOException;
-
-    T trueValue();
-
-
-}

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

@@ -1,17 +0,0 @@
-package com.jrjackson;
-
-import com.fasterxml.jackson.core.JsonParser;
-import java.io.IOException;
-import java.math.BigDecimal;
-
-/**
- *
- * @author Guy Boertje
- */
-public class JavaBigDecimalValueConverter implements JavaConverter {
-
-    @Override
-    public BigDecimal convert(JsonParser jp) throws IOException {
-        return jp.getDecimalValue();
-    }
-}

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

@@ -1,17 +0,0 @@
-package com.jrjackson;
-
-import com.fasterxml.jackson.core.JsonParser;
-import java.io.IOException;
-import java.math.BigInteger;
-
-/**
- *
- * @author Guy Boertje
- */
-public class JavaBigIntValueConverter implements JavaConverter {
-
-    @Override
-    public BigInteger convert(JsonParser jp) throws IOException {
-        return jp.getBigIntegerValue();
-    }
-}

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

@@ -1,10 +0,0 @@
-package com.jrjackson;
-
-import com.fasterxml.jackson.core.*;
-
-import java.io.IOException;
-
-public interface JavaConverter {
-
-    public Object convert(JsonParser jp) throws IOException;
-}

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

@@ -1,16 +0,0 @@
-package com.jrjackson;
-
-import com.fasterxml.jackson.core.JsonParser;
-import java.io.IOException;
-
-/**
- *
- * @author Guy Boertje
- */
-public class JavaFloatValueConverter implements JavaConverter {
-
-    @Override
-    public Double convert(JsonParser jp) throws IOException {
-        return jp.getDoubleValue();
-    }
-}

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

@@ -1,118 +0,0 @@
-package com.jrjackson;
-
-import com.fasterxml.jackson.core.JsonParser;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-
-
-/**
- *
- * @author Guy Boertje
- */
-
-/*
- Long -> Integer
- Double -> Float
- JavaMath::BigDecimal -> BigDecimal
- JavaMath::BigInteger -> Bignum
- JavaUtil::ArrayList -> Array
- JavaUtil::LinkedHashMap -> Hash
- String -> String
- */
-
-public class JavaHandler implements IParseHandler<Object, ArrayList<Object>, HashMap<String, Object>> {
-
-    private Object _result;
-    private final JavaConverter _intConv;
-    private final JavaConverter _floatConv;
-
-    public JavaHandler(
-            JavaConverter intConverter,
-            JavaConverter floatConverter) {
-
-        _intConv = intConverter;
-        _floatConv = floatConverter;
-
-    }
-
-    @Override
-    public void addValue(Object value) {
-        _result = value;
-    }
-
-    @Override
-    public Object hashStart() {
-        return new HashMap<String, Object>();
-    }
-
-    @Override
-    public void hashEnd() {
-
-    }
-
-    @Override
-    public Object hashKey(String key) {
-        return key;
-    }
-
-    @Override
-    public void hashSet(HashMap<String, Object> hash, Object key, Object value) {
-        hash.put((String)key, value);
-    }
-
-    @Override
-    public Object arrayStart() {
-        return new ArrayList<Object>();
-    }
-
-    @Override
-    public void arrayEnd() {
-
-    }
-
-    @Override
-    public void arrayAppend(ArrayList<Object> array, Object value) {
-        array.add(value);
-    }
-
-    @Override
-    public Object treatNull() {
-        return null;
-    }
-
-    @Override
-    public Object treatInt(JsonParser jp) throws IOException {
-        return _intConv.convert(jp);
-    }
-
-    @Override
-    public Object treatFloat(JsonParser jp) throws IOException {
-        return _floatConv.convert(jp);
-    }
-
-    @Override
-    public Object treatString(JsonParser jp) throws IOException {
-        return jp.getText();
-    }
-
-    @Override
-    public Object trueValue() {
-        return true;
-    }
-
-    @Override
-    public Object falseValue() {
-        return false;
-    }
-
-    @Override
-    public Object getResult() {
-        return _result;
-    }
-
-    @Override
-    public void raiseError(String e) {
-
-    }
-}

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

@@ -1,16 +0,0 @@
-package com.jrjackson;
-
-import com.fasterxml.jackson.core.JsonParser;
-import java.io.IOException;
-
-/**
- *
- * @author Guy Boertje
- */
-public class JavaLongValueConverter implements JavaConverter {
-
-    @Override
-    public Long convert(JsonParser jp) throws IOException {
-        return jp.getLongValue();
-    }
-}

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

@@ -1,139 +0,0 @@
-package com.jrjackson;
-
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonStreamContext;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-
-/**
- *
- * @author Guy Boertje
- */
-public class JjParse {
-
-    private final JavaHandler _handler;
-    private final HashMap<JsonStreamContext, Object> _objectMap = new HashMap<>();
-    private JsonStreamContext _deepestContext;
-
-    public JjParse(JavaHandler handler) {
-        _handler = handler;
-    }
-
-    public void deserialize(JsonParser jp) throws IOException {
-        try {
-
-            while (jp.nextValue() != null) {
-                handleJavaToken(jp);
-            }
-        } catch (IOException e) {
-            _handler.raiseError(e.getLocalizedMessage());
-        }
-    }
-
-    private void addJavaValue(JsonStreamContext x) {
-        JsonStreamContext px = x.getParent();
-        Object dtarget = _objectMap.get(_deepestContext);
-
-        if (px == null) {
-            _handler.addValue(dtarget);
-            return;
-        }
-
-        Object value = _objectMap.get(x);
-
-        if (x.inArray()) {
-            _handler.arrayAppend(
-                    (ArrayList<Object>)value, dtarget);
-        } else if (x.inObject()) {
-            _handler.hashSet(
-                    (HashMap<String, Object>)value, getJavaHashKey(x), dtarget);
-
-        } else {
-            _handler.addValue(value);
-        }
-    }
-
-    private void addJavaValue(JsonStreamContext x, Object val) {
-        if (x.inArray()) {
-            ArrayList<Object> a = (ArrayList<Object>)_objectMap.get(x);
-            _handler.arrayAppend(a, val);
-        } else if (x.inObject()) {
-            HashMap<String, Object> h = (HashMap<String, Object>)_objectMap.get(x);
-            _handler.hashSet(h, getJavaHashKey(x), val);
-
-        } else {
-            _handler.addValue(val);
-        }
-    }
-
-    private String getJavaHashKey(JsonStreamContext x) {
-        String k = x.getCurrentName();
-        if (k == null) {
-            return null;
-        }
-        return (String)_handler.hashKey(k);
-    }
-
-    protected void handleJavaToken(JsonParser jp)
-            throws IOException {
-
-        JsonStreamContext cx = jp.getParsingContext();
-
-        switch (jp.getCurrentToken()) {
-            case START_OBJECT:
-                _deepestContext = cx;
-                _objectMap.put(cx, _handler.hashStart());
-                break;
-
-            case START_ARRAY:
-                _deepestContext = cx;
-                _objectMap.put(cx, _handler.arrayStart());
-
-            case FIELD_NAME:
-                break;
-
-            case VALUE_EMBEDDED_OBJECT:
-                System.out.println("-------- VALUE_EMBEDDED_OBJECT ????????? --------");
-                System.out.println(jp.getEmbeddedObject());
-                break;
-
-            case VALUE_STRING:
-                addJavaValue(cx, _handler.treatString(jp));
-                break;
-
-            case VALUE_NUMBER_INT:
-                addJavaValue(cx, _handler.treatInt(jp));
-                break;
-
-            case VALUE_NUMBER_FLOAT:
-                addJavaValue(cx, _handler.treatFloat(jp));
-                break;
-
-            case VALUE_TRUE:
-                addJavaValue(cx, _handler.trueValue());
-                break;
-
-            case VALUE_FALSE:
-                addJavaValue(cx, _handler.falseValue());
-                break;
-
-            case VALUE_NULL: // should not get this but...
-                addJavaValue(cx, _handler.treatNull());
-                break;
-
-            case END_ARRAY:
-                _handler.arrayEnd();
-                addJavaValue(cx);
-                _deepestContext = cx;
-                break;
-
-            case END_OBJECT:
-                _handler.hashEnd();
-                addJavaValue(cx);
-                _deepestContext = cx;
-                break;
-        }
-    }
-}