jrjackson 0.4.18-java → 0.4.19-java

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

@@ -1,291 +0,0 @@
-package com.jrjackson;
-
-import com.fasterxml.jackson.core.JsonGenerationException;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
-import org.jruby.RubyArray;
-import org.jruby.RubyClass;
-import org.jruby.RubyException;
-import org.jruby.RubyHash;
-import org.jruby.RubyNumeric;
-import org.jruby.RubyObject;
-import org.jruby.RubyString;
-import org.jruby.RubyStruct;
-import org.jruby.RubyTime;
-import org.jruby.ext.bigdecimal.RubyBigDecimal;
-import org.jruby.internal.runtime.methods.DynamicMethod;
-import org.jruby.java.proxies.JavaProxy;
-import org.jruby.runtime.ThreadContext;
-import org.jruby.runtime.builtin.IRubyObject;
-
-import java.io.IOException;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-
-
-public class RubyAnySerializer extends JsonSerializer<IRubyObject> {
-
-    /**
-     * Singleton instance to use.""
-     */
-    public static final RubyAnySerializer instance = new RubyAnySerializer();
-    private static final String HLT = "#<";
-    private static final String CSP = ": ";
-    private static final String GT = ">";
-
-    private static final RUBYCLASS[] CLASS_NAMES = RUBYCLASS.values();
-
-    public RubyAnySerializer() {
-//        super(IRubyObject.class);
-
-    }
-
-    private void serializeUnknownRubyObject(ThreadContext ctx, IRubyObject rubyObject, JsonGenerator jgen, SerializerProvider provider)
-            throws IOException, JsonGenerationException {
-        RubyClass meta = rubyObject.getMetaClass();
-
-        DynamicMethod method = meta.searchMethod("to_json_data");
-        if (!method.isUndefined()) {
-            RubyObject obj = (RubyObject) method.call(ctx, rubyObject, meta, "to_json_data");
-            if (obj instanceof RubyString) {
-                RubyUtils.writeBytes(obj, jgen);
-            } else {
-                serialize(obj, jgen, provider);
-            }
-            return;
-        }
-
-        method = meta.searchMethod("to_time");
-        if (!method.isUndefined()) {
-            RubyTime dt = (RubyTime) method.call(ctx, rubyObject, meta, "to_time");
-            serializeTime(dt, jgen, provider);
-            return;
-        }
-
-        method = meta.searchMethod("to_h");
-        if (!method.isUndefined()) {
-            RubyObject obj = (RubyObject) method.call(ctx, rubyObject, meta, "to_h");
-            serializeHash(obj, jgen, provider);
-            return;
-        }
-
-        method = meta.searchMethod("to_hash");
-        if (!method.isUndefined()) {
-            RubyObject obj = (RubyObject) method.call(ctx, rubyObject, meta, "to_hash");
-            serializeHash(obj, jgen, provider);
-            return;
-        }
-
-        method = meta.searchMethod("to_a");
-        if (!method.isUndefined()) {
-            RubyObject obj = (RubyObject) method.call(ctx, rubyObject, meta, "to_a");
-            serializeArray(obj, jgen, provider);
-            return;
-        }
-
-        method = meta.searchMethod("to_json");
-        if (!method.isUndefined()) {
-            RubyObject obj = (RubyObject) method.call(ctx, rubyObject, meta, "to_json");
-            if (obj instanceof RubyString) {
-                jgen.writeRawValue(obj.toString());
-            } else {
-                serialize(obj, jgen, provider);
-            }
-            return;
-        }
-
-        if (!RubyUtils.isBasicObjectOrSubclass(rubyObject) && rubyObject.respondsTo("to_s")) {
-            String result = rubyObject.toString();
-            jgen.writeString(result);
-        } else {
-            String name = meta.getRealClass().getName();
-            StringBuilder sb = new StringBuilder(2 + name.length());
-            sb.append(HLT).append(name).append(GT);
-            jgen.writeString(sb.toString());
-        }
-    }
-
-    @Override
-    public void serialize(IRubyObject value, JsonGenerator jgen, SerializerProvider provider)
-            throws IOException, JsonGenerationException {
-
-        String rubyClassName = value.getType().getName();
-
-        if (value.isNil()) {
-            jgen.writeNull(); // for RubyNil and NullObjects
-            return;
-        }
-
-        if (value instanceof JavaProxy) {
-            provider.defaultSerializeValue(((JavaProxy) value).getObject(), jgen);
-            return;
-        }
-
-        if (value instanceof RubyStruct) {
-            IRubyObject obj = value.callMethod(value.getRuntime().getCurrentContext(), "to_a");
-            serializeArray(obj, jgen, provider);
-            return;
-        }
-
-        if (value instanceof RubyException) {
-            RubyException re = (RubyException) value;
-            String msg = re.message(value.getRuntime().getCurrentContext()).toString();
-            StringBuilder sb = new StringBuilder(5 + rubyClassName.length() + msg.length());
-            sb.append(HLT).append(rubyClassName).append(CSP).append(msg).append(GT);
-            jgen.writeString(sb.toString());
-            return;
-        }
-
-        if (value.isClass() || value.isModule()) {
-            jgen.writeString(value.inspect().toString());
-            return;
-        }
-
-        RUBYCLASS clazz = null;
-
-        for(RUBYCLASS v : CLASS_NAMES) {
-            if(rubyClassName.equals(v.name())) {
-                clazz = v;
-                break;
-            }
-        }
-
-        if (clazz == null) {
-            serializeUnknownRubyObject(value.getRuntime().getCurrentContext(), value, jgen, provider);
-            return;
-        }
-
-        switch (clazz) {
-            case Hash:
-                serializeHash(value, jgen, provider);
-                break;
-            case Array:
-                serializeArray(value, jgen, provider);
-                break;
-            case String:
-                RubyUtils.writeBytes(value, jgen);
-                break;
-            case Symbol:
-            case Date:
-                // Date to_s -> yyyy-mm-dd
-                RubyString s = value.asString();
-                jgen.writeUTF8String(s.getBytes(), 0, s.size());
-                break;
-            case TrueClass:
-            case FalseClass:
-                jgen.writeBoolean(value.isTrue());
-                break;
-            case Float:
-                jgen.writeNumber(RubyNumeric.num2dbl(value));
-                break;
-            case Bignum:
-            case Fixnum:
-            case Integer:
-                if (value.getJavaClass() == long.class) {
-                    jgen.writeNumber(((RubyNumeric) value).getLongValue());
-                } else {
-                    jgen.writeNumber(((RubyNumeric) value).getBigIntegerValue());
-                }
-                break;
-            case BigDecimal:
-                jgen.writeNumber(((RubyBigDecimal) value).getBigDecimalValue());
-                break;
-            case Time:
-                serializeTime((RubyTime) value, jgen, provider);
-                break;
-            default:
-                serializeUnknownRubyObject(value.getRuntime().getCurrentContext(), value, jgen, provider);
-                break;
-        }
-    }
-
-    private void serializeArray(IRubyObject value, JsonGenerator jgen, SerializerProvider provider)
-            throws IOException, JsonGenerationException {
-//            System.err.println("----->> RubyArray");
-
-        RubyArray arr = (RubyArray) value;
-        IRubyObject[] a = arr.toJavaArray();
-        jgen.writeStartArray();
-        for (IRubyObject val : a) {
-            serialize(val, jgen, provider);
-        }
-        jgen.writeEndArray();
-    }
-
-    private void serializeHash(IRubyObject value, JsonGenerator jgen, SerializerProvider provider)
-            throws IOException, JsonGenerationException {
-//            System.err.println("----->> RubyHash");
-
-        RubyHash h = (RubyHash) value;
-        jgen.writeStartObject();
-        for (Object o : h.directEntrySet()) {
-            RubyHash.RubyHashEntry next = (RubyHash.RubyHashEntry) o;
-            serializeKey((IRubyObject) next.getKey(), jgen, provider);
-            serialize((IRubyObject) next.getValue(), jgen, provider);
-        }
-        jgen.writeEndObject();
-    }
-
-    private void serializeTime(RubyTime dt, JsonGenerator jgen, SerializerProvider provider)
-            throws IOException, JsonGenerationException {
-        DateFormat df = provider.getConfig().getDateFormat();
-        if (df == null) {
-            // DateFormat should always be set
-            provider.defaultSerializeDateValue(dt.getJavaDate(), jgen);
-        } // 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 clonedRubyDateFormat = (RubyDateFormat) df.clone();
-            jgen.writeString(clonedRubyDateFormat.format(dt.getJavaDate()));
-        } else {
-            jgen.writeString(df.format(dt.getJavaDate()));
-        }
-    }
-
-    private void serializeKey(IRubyObject key, JsonGenerator jgen, SerializerProvider provider)
-            throws IOException, JsonGenerationException {
-        if (key instanceof RubyString) {
-            jgen.writeFieldName(((RubyString) key).decodeString());
-        } else {
-            // includes RubySymbol and non RubyString objects
-            jgen.writeFieldName(key.toString());
-        }
-    }
-
-    /**
-     * Default implementation will write type prefix, call regular serialization method (since assumption is that value itself does not need JSON Array or Object start/end markers), and then write type suffix. This should work for most cases; some sub-classes may want to change this behavior.
-     *
-     * @param value
-     * @param jgen
-     * @param provider
-     * @param typeSer
-     * @throws java.io.IOException
-     * @throws com.fasterxml.jackson.core.JsonGenerationException
-     */
-    @Override
-    public void serializeWithType(IRubyObject value, JsonGenerator jgen, SerializerProvider provider, TypeSerializer typeSer)
-            throws IOException, JsonGenerationException {
-        typeSer.writeTypePrefixForScalar(value, jgen);
-        serialize(value, jgen, provider);
-        typeSer.writeTypeSuffixForScalar(value, jgen);
-    }
-
-    enum RUBYCLASS {
-        String,
-        Fixnum,
-        Integer,
-        Hash,
-        Array,
-        Float,
-        BigDecimal,
-        Time,
-        Bignum,
-        Date,
-        Symbol,
-        TrueClass,
-        FalseClass
-    }
-}

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

@@ -1,18 +0,0 @@
-package com.jrjackson;
-
-import com.fasterxml.jackson.core.JsonParser;
-import java.io.IOException;
-import org.jruby.Ruby;
-import org.jruby.RubyObject;
-
-/**
- *
- * @author Guy Boertje
- */
-public class RubyBigDecimalValueConverter implements RubyConverter {
-
-    @Override
-    public RubyObject convert(Ruby ruby, JsonParser jp) throws IOException {
-        return RubyUtils.rubyBigDecimal(ruby, jp.getDecimalValue());
-    }
-}

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

@@ -1,21 +0,0 @@
-package com.jrjackson;
-
-import com.fasterxml.jackson.core.JsonParser;
-import java.io.IOException;
-import org.jruby.Ruby;
-import org.jruby.RubyObject;
-
-/**
- *
- * @author Guy Boertje
- */
-public class RubyBigIntValueConverter implements RubyConverter {
-
-    @Override
-    public RubyObject convert(Ruby ruby, JsonParser jp) throws IOException {
-        if (jp.getNumberType() == JsonParser.NumberType.BIG_INTEGER) {
-            return RubyUtils.rubyBignum(ruby, jp.getBigIntegerValue());
-        }
-        return RubyUtils.rubyFixnum(ruby, jp.getLongValue());
-    }
-}

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

@@ -1,12 +0,0 @@
-package com.jrjackson;
-
-import com.fasterxml.jackson.core.*;
-
-import java.io.IOException;
-import org.jruby.Ruby;
-import org.jruby.RubyObject;
-
-public interface RubyConverter {
-
-    public RubyObject convert(Ruby ruby, JsonParser jp) throws IOException;
-}

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

@@ -1,34 +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 java.text.DateFormatSymbols;
-import java.text.SimpleDateFormat;
-import java.util.Locale;
-
-/**
- *
- * @author guy
- */
-public class RubyDateFormat extends SimpleDateFormat{
-
-    public RubyDateFormat() {
-    }
-
-    public RubyDateFormat(String pattern) {
-        super(pattern);
-    }
-
-    public RubyDateFormat(String pattern, Locale locale) {
-        super(pattern, locale);
-    }
-
-    public RubyDateFormat(String pattern, DateFormatSymbols formatSymbols) {
-
-        super(pattern, formatSymbols);
-    }
-
-}

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

@@ -1,18 +0,0 @@
-package com.jrjackson;
-
-import com.fasterxml.jackson.core.JsonParser;
-import java.io.IOException;
-import org.jruby.Ruby;
-import org.jruby.RubyObject;
-
-/**
- *
- * @author Guy Boertje
- */
-public class RubyFloatValueConverter implements RubyConverter {
-
-    @Override
-    public RubyObject convert(Ruby ruby, JsonParser jp) throws IOException {
-        return RubyUtils.rubyFloat(ruby, jp.getDoubleValue());
-    }
-}

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

@@ -1,119 +0,0 @@
-package com.jrjackson;
-
-import com.fasterxml.jackson.core.JsonParser;
-import java.io.IOException;
-import org.jruby.Ruby;
-import org.jruby.RubyArray;
-import org.jruby.RubyHash;
-import org.jruby.runtime.ThreadContext;
-import org.jruby.runtime.builtin.IRubyObject;
-
-/**
- *
- * @author Guy Boertje
- */
-public class RubyHandler implements IParseHandler<IRubyObject, RubyArray, RubyHash> {
-
-    private final Ruby _ruby;
-    private final ThreadContext _ctx;
-    private final RubyNameConverter _keyConv;
-    private final RubyConverter _intConv;
-    private final RubyConverter _floatConv;
-    private final RubyConverter _strConv;
-    private IRubyObject _result;
-
-    public RubyHandler(ThreadContext ctx,
-            RubyNameConverter keyConverter,
-            RubyConverter intConverter,
-            RubyConverter floatConverter) {
-
-        _ctx = ctx;
-        _ruby = ctx.runtime;
-        _keyConv = keyConverter;
-        _intConv = intConverter;
-        _floatConv = floatConverter;
-        _strConv = new RubyStringConverter();
-    }
-
-    @Override
-    public void addValue(IRubyObject value) {
-
-        _result = value;
-    }
-
-    @Override
-    public IRubyObject hashStart() {
-        return RubyHash.newHash(_ruby);
-    }
-
-    @Override
-    public void hashEnd() {
-
-    }
-
-    @Override
-    public IRubyObject hashKey(String key) {
-        return _keyConv.convert(_ruby, key);
-    }
-
-    @Override
-    public void hashSet(RubyHash hash, IRubyObject key, IRubyObject value) {
-        hash.fastASet(key, value);
-    }
-
-    @Override
-    public IRubyObject arrayStart() {
-        return RubyArray.newArray(_ruby);
-    }
-
-    @Override
-    public void arrayEnd() {
-
-    }
-
-    @Override
-    public void arrayAppend(RubyArray array, IRubyObject value) {
-        array.append(value);
-    }
-
-    @Override
-    public IRubyObject treatNull() {
-        return _ctx.nil;
-    }
-
-    @Override
-    public IRubyObject treatInt(JsonParser jp) throws IOException {
-        return _intConv.convert(_ruby, jp);
-    }
-
-    @Override
-    public IRubyObject treatFloat(JsonParser jp) throws IOException {
-        return _floatConv.convert(_ruby, jp);
-    }
-
-    @Override
-    public IRubyObject treatString(JsonParser jp) throws IOException {
-        return _strConv.convert(_ruby, jp);
-    }
-
-    @Override
-    public IRubyObject trueValue() {
-        return _ruby.newBoolean(true);
-    }
-
-    @Override
-    public IRubyObject falseValue() {
-        return _ruby.newBoolean(false);
-    }
-
-    @Override
-    public IRubyObject getResult() {
-        return _result == null ? _ctx.nil : _result;
-    }
-
-    @Override
-    public void raiseError(String e) {
-        throw ParseError.newParseError(_ruby, e);
-    }
-
-}

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

@@ -1,18 +0,0 @@
-package com.jrjackson;
-
-import com.fasterxml.jackson.core.JsonParser;
-import java.io.IOException;
-import org.jruby.Ruby;
-import org.jruby.RubyObject;
-
-/**
- *
- * @author Guy Boertje
- */
-public class RubyIntValueConverter implements RubyConverter {
-
-    @Override
-    public RubyObject convert(Ruby ruby, JsonParser jp) throws IOException {
-        return RubyUtils.rubyFixnum(ruby, jp.getLongValue());
-    }
-}

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

@@ -1,80 +0,0 @@
-package com.jrjackson;
-
-import com.fasterxml.jackson.core.JsonFactory;
-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;
-import org.jruby.Ruby;
-import org.jruby.runtime.builtin.IRubyObject;
-
-import java.text.SimpleDateFormat;
-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(
-                IRubyObject.class, RubyAnySerializer.instance
-        ));
-        static_mapper.registerModule(new AfterburnerModule());
-        static_mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
-    }
-
-    private RubyJacksonModule() {
-        super("JrJacksonStrModule", new Version(1, 2, 28, "0", "com.jrjackson.jruby", "jrjackson"));
-    }
-
-    public static ObjectMapper mapperWith(Ruby ruby, RubyKeyConverter nameConverter,
-            RubyConverter intConverter, RubyConverter floatConverter) {
-
-        return static_mapper.copy().registerModule(
-                new RubyJacksonModule().addDeserializer(
-                        Object.class,
-                        new RubyObjectDeserializer().with(ruby, nameConverter, intConverter, floatConverter)
-                )
-        );
-    }
-
-    public static ObjectMapper rawMapper() {
-        return static_mapper;
-    }
-
-    public static DefaultSerializerProvider createProvider(SimpleDateFormat 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(
-                config,
-                static_mapper.getSerializerFactory()
-        );
-    }
-
-    public static DefaultSerializerProvider createProvider() {
-        return createProvider(dateFormat.get());
-    }
-
-    public static ObjectMapper rawBigNumberMapper() {
-        static_mapper.enable(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS);
-        static_mapper.enable(DeserializationFeature.USE_BIG_INTEGER_FOR_INTS);
-        return static_mapper;
-    }
-
-}

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

@@ -1,12 +0,0 @@
-package com.jrjackson;
-
-import com.fasterxml.jackson.core.*;
-
-import java.io.IOException;
-import org.jruby.Ruby;
-import org.jruby.RubyObject;
-
-public interface RubyKeyConverter {
-
-    public RubyObject convert(Ruby ruby, JsonParser jp) throws IOException;
-}

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

@@ -1,9 +0,0 @@
-package com.jrjackson;
-
-import org.jruby.Ruby;
-import org.jruby.RubyObject;
-
-public interface RubyNameConverter {
-
-    public RubyObject convert(Ruby ruby, String name);
-}