aligned over bson4jackson 2.8.0 which should fix weird date deseriali…

…zation errors

pom.xml

@@ -84,7 +84,7 @@

        <!-- Mongo modules -->
        <mongo-java-driver.version>3.4.0</mongo-java-driver.version>
        <bson4jackson.version>2.7.0</bson4jackson.version>
        <bson4jackson.version>2.8.0</bson4jackson.version>
        <jongo.version>1.3.0</jongo.version>
        <de.flapdoodle.embed.version>1.42</de.flapdoodle.embed.version>

restx-jongo-java8/src/main/java/restx/jongo/BsonJSR310Module.java

@@ -1,13 +1,14 @@
package restx.jongo;

import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
import com.fasterxml.jackson.databind.module.SimpleModule;
import de.undercouch.bson4jackson.BsonGenerator;
import de.undercouch.bson4jackson.serializers.BsonSerializer;

import java.io.IOException;
import java.time.Instant;
@@ -17,14 +18,20 @@
    public BsonJSR310Module() {
        super("BsonJSR310Module");

        addSerializer(Instant.class, new BsonSerializer<Instant>() {
        addSerializer(Instant.class, new JsonSerializer<Instant>() {
            @Override
            public void serialize(Instant date, BsonGenerator bsonGenerator, SerializerProvider serializerProvider)
            public void serialize(Instant date, JsonGenerator gen, SerializerProvider provider)
                    throws IOException {
                if (date == null) {
                    serializerProvider.defaultSerializeNull(bsonGenerator);
                    provider.defaultSerializeNull(gen);
                } else {
                    bsonGenerator.writeDateTime(new Date(date.toEpochMilli()));
                    long epochMillis = date.toEpochMilli();
                    if (gen instanceof BsonGenerator) {
                        BsonGenerator bgen = (BsonGenerator)gen;
                        bgen.writeDateTime(new Date(epochMillis));
                    } else {
                        gen.writeNumber(epochMillis);
                    }
                }
            }
        });

restx-jongo/module.ivy

@@ -22,7 +22,7 @@
        <dependency org="com.fasterxml.jackson.core" name="jackson-annotations" rev="2.8.10" conf="default" />
        <dependency org="com.fasterxml.jackson.core" name="jackson-databind" rev="2.8.10" conf="default" />
        <dependency org="com.fasterxml.jackson.datatype" name="jackson-datatype-joda" rev="2.8.10" conf="default" />
        <dependency org="de.undercouch" name="bson4jackson" rev="2.7.0" conf="default" />
        <dependency org="de.undercouch" name="bson4jackson" rev="2.8.0" conf="default" />
        <dependency org="org.mongodb" name="mongo-java-driver" rev="3.4.0" conf="default" />
        <dependency org="org.jongo" name="jongo" rev="1.3.0" conf="default" />
        <dependency org="org.slf4j" name="slf4j-api" rev="1.7.5" conf="default" />

restx-jongo/src/main/java/restx/jackson/BsonJodaTimeModule.java

@@ -1,13 +1,15 @@
package restx.jackson;

import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
import com.fasterxml.jackson.databind.module.SimpleModule;
import de.undercouch.bson4jackson.BsonGenerator;
import de.undercouch.bson4jackson.serializers.BsonSerializer;
import org.joda.time.DateMidnight;
import org.joda.time.DateTime;
import org.joda.time.DateTimeZone;

@@ -23,25 +25,31 @@
    public BsonJodaTimeModule() {
        super("BsonJodaTimeModule");

        addSerializer(org.joda.time.DateMidnight.class, new BsonSerializer<org.joda.time.DateMidnight>() {
        addSerializer(org.joda.time.DateMidnight.class, new JsonSerializer<DateMidnight>() {
            @Override
            public void serialize(org.joda.time.DateMidnight date, BsonGenerator bsonGenerator, SerializerProvider serializerProvider)
            public void serialize(org.joda.time.DateMidnight date, JsonGenerator gen, SerializerProvider provider)
                    throws IOException {
                if (date == null) {
                    serializerProvider.defaultSerializeNull(bsonGenerator);
                    provider.defaultSerializeNull(gen);
                } else if (gen instanceof BsonGenerator) {
                    BsonGenerator bgen = (BsonGenerator)gen;
                    bgen.writeDateTime(date.toDate());
                } else {
                    bsonGenerator.writeDateTime(date.toDate());
                    gen.writeNumber(date.getMillis());
                }
            }
        });
        addSerializer(DateTime.class, new BsonSerializer<DateTime>() {
        addSerializer(DateTime.class, new JsonSerializer<DateTime>() {
            @Override
            public void serialize(DateTime date, BsonGenerator bsonGenerator, SerializerProvider serializerProvider)
            public void serialize(DateTime date, JsonGenerator gen, SerializerProvider provider)
                    throws IOException {
                if (date == null) {
                    serializerProvider.defaultSerializeNull(bsonGenerator);
                    provider.defaultSerializeNull(gen);
                } else if (gen instanceof BsonGenerator) {
                    BsonGenerator bgen = (BsonGenerator)gen;
                    bgen.writeDateTime(date.toDate());
                } else {
                    bsonGenerator.writeDateTime(date.toDate());
                    gen.writeNumber(date.getMillis());
                }
            }
        });

restx.build.properties.json

@@ -28,7 +28,7 @@
    "javax.inject.version": "1",

    "mongo-java-driver.version": "3.4.0",
    "bson4jackson.version": "2.7.0",
    "bson4jackson.version": "2.8.0",
    "jongo.version": "1.3.0",

    "servlet-api.version": "2.5",