From a0ef229dff1fd40716215b58dd77679f776b5d24 Mon Sep 17 00:00:00 2001 From: Henning Schmiedehausen Date: Fri, 20 Dec 2013 15:21:07 -0800 Subject: [PATCH 1/2] tab & checkstyle fixes --- .../com/nesscomputing/jackson/NessObjectMapperProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/nesscomputing/jackson/NessObjectMapperProvider.java b/src/main/java/com/nesscomputing/jackson/NessObjectMapperProvider.java index e117fb7..56a5b50 100644 --- a/src/main/java/com/nesscomputing/jackson/NessObjectMapperProvider.java +++ b/src/main/java/com/nesscomputing/jackson/NessObjectMapperProvider.java @@ -54,7 +54,7 @@ class NessObjectMapperProvider implements Provider { this.jsonFactory = jsonFactory; - // This needs to be set, otherwise the mapper will fail on every new property showing up. + // This needs to be set, otherwise the mapper will fail on every new property showing up. featureMap.put(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); // Don't write out nulls by default -- if you really want them, you can change it with setOptions later. From 5d85e777892d49a515c40a2d76e1548851d14f80 Mon Sep 17 00:00:00 2001 From: Henning Schmiedehausen Date: Mon, 27 Jan 2014 20:21:35 -0800 Subject: [PATCH 2/2] local fixes --- pom.xml | 27 ++----------------- .../JacksonFormatObjectMapperProvider.java | 1 + .../jackson/SerializerBinderBuilderImpl.java | 4 +-- ...TestJacksonFormatObjectMapperProvider.java | 4 +-- .../jackson/TestMapEntryDeserialization.java | 4 +-- .../jackson/TestNessJacksonModule.java | 4 +-- .../jackson/TestNessObjectMapperProvider.java | 5 ++-- .../jackson/TestSerializerBinderBuilder.java | 4 +-- .../datatype/TestCustomUuidModule.java | 6 ++--- 9 files changed, 19 insertions(+), 40 deletions(-) diff --git a/pom.xml b/pom.xml index cf128c1..0aab1c7 100644 --- a/pom.xml +++ b/pom.xml @@ -5,84 +5,61 @@ 4.0.0 com.nesscomputing - ness-oss-parent - 32 + ness-root + 1.0-SNAPSHOT - - scm:git:git://github.com/NessComputing/components-ness-jackson.git - scm:git:git@github.com:NessComputing/components-ness-jackson.git - http://github.com/NessComputing/components-ness-jackson - HEAD - - com.nesscomputing.components ness-jackson ness-jackson - 2.3.4-SNAPSHOT jar Jackson related code - - 2.2.3 - - com.nesscomputing.components ness-core - 1.6.0 com.nesscomputing.components ness-logging - 1.1.1 com.nesscomputing.components ness-config - 2.3.1 com.fasterxml.jackson.core jackson-annotations - ${dep.jackson.version} com.fasterxml.jackson.core jackson-core - ${dep.jackson.version} com.fasterxml.jackson.core jackson-databind - ${dep.jackson.version} com.fasterxml.jackson.dataformat jackson-dataformat-smile - ${dep.jackson.version} com.fasterxml.jackson.datatype jackson-datatype-joda - ${dep.jackson.version} com.fasterxml.jackson.module jackson-module-mrbean - ${dep.jackson.version} com.fasterxml.jackson.module jackson-module-afterburner - ${dep.jackson.version} com.fasterxml.jackson.datatype jackson-datatype-guava - ${dep.jackson.version} diff --git a/src/main/java/com/nesscomputing/jackson/JacksonFormatObjectMapperProvider.java b/src/main/java/com/nesscomputing/jackson/JacksonFormatObjectMapperProvider.java index d037ba0..ba84edb 100644 --- a/src/main/java/com/nesscomputing/jackson/JacksonFormatObjectMapperProvider.java +++ b/src/main/java/com/nesscomputing/jackson/JacksonFormatObjectMapperProvider.java @@ -19,6 +19,7 @@ import com.google.common.base.Preconditions; import com.google.inject.Inject; import com.google.inject.Provider; + import com.nesscomputing.logging.Log; /** diff --git a/src/main/java/com/nesscomputing/jackson/SerializerBinderBuilderImpl.java b/src/main/java/com/nesscomputing/jackson/SerializerBinderBuilderImpl.java index df8db89..a2580f7 100644 --- a/src/main/java/com/nesscomputing/jackson/SerializerBinderBuilderImpl.java +++ b/src/main/java/com/nesscomputing/jackson/SerializerBinderBuilderImpl.java @@ -31,11 +31,11 @@ import com.google.inject.Scopes; import com.google.inject.util.Types; +import com.nesscomputing.callback.Callback; + import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; -import com.nesscomputing.callback.Callback; - class SerializerBinderBuilderImpl implements SerializerBinderBuilder { private static final TypeReference BYTEA_TYPE = new TypeReference() {}; private static final TypeReference STRING_TYPE = new TypeReference() {}; diff --git a/src/test/java/com/nesscomputing/jackson/TestJacksonFormatObjectMapperProvider.java b/src/test/java/com/nesscomputing/jackson/TestJacksonFormatObjectMapperProvider.java index ff8b027..e32d075 100644 --- a/src/test/java/com/nesscomputing/jackson/TestJacksonFormatObjectMapperProvider.java +++ b/src/test/java/com/nesscomputing/jackson/TestJacksonFormatObjectMapperProvider.java @@ -25,11 +25,11 @@ import com.google.inject.Stage; import com.google.inject.name.Names; +import com.nesscomputing.config.ConfigModule; + import org.junit.Assert; import org.junit.Test; -import com.nesscomputing.config.ConfigModule; - public class TestJacksonFormatObjectMapperProvider { @Inject @JsonMapper diff --git a/src/test/java/com/nesscomputing/jackson/TestMapEntryDeserialization.java b/src/test/java/com/nesscomputing/jackson/TestMapEntryDeserialization.java index 00888f0..8a5efcd 100644 --- a/src/test/java/com/nesscomputing/jackson/TestMapEntryDeserialization.java +++ b/src/test/java/com/nesscomputing/jackson/TestMapEntryDeserialization.java @@ -25,11 +25,11 @@ import com.google.inject.Guice; import com.google.inject.Inject; +import com.nesscomputing.config.ConfigModule; + import org.junit.Before; import org.junit.Test; -import com.nesscomputing.config.ConfigModule; - public class TestMapEntryDeserialization { @Inject diff --git a/src/test/java/com/nesscomputing/jackson/TestNessJacksonModule.java b/src/test/java/com/nesscomputing/jackson/TestNessJacksonModule.java index bef9ce3..37ef4cc 100644 --- a/src/test/java/com/nesscomputing/jackson/TestNessJacksonModule.java +++ b/src/test/java/com/nesscomputing/jackson/TestNessJacksonModule.java @@ -21,12 +21,12 @@ import com.google.inject.Injector; import com.google.inject.Stage; +import com.nesscomputing.config.ConfigModule; + import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; -import com.nesscomputing.config.ConfigModule; - public class TestNessJacksonModule { @Test diff --git a/src/test/java/com/nesscomputing/jackson/TestNessObjectMapperProvider.java b/src/test/java/com/nesscomputing/jackson/TestNessObjectMapperProvider.java index a8ac28f..e8c6dff 100644 --- a/src/test/java/com/nesscomputing/jackson/TestNessObjectMapperProvider.java +++ b/src/test/java/com/nesscomputing/jackson/TestNessObjectMapperProvider.java @@ -16,6 +16,7 @@ package com.nesscomputing.jackson; import java.io.IOException; + import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonGenerator; @@ -41,11 +42,11 @@ import com.google.inject.Stage; import com.google.inject.util.Modules; +import com.nesscomputing.config.ConfigModule; + import org.junit.Assert; import org.junit.Test; -import com.nesscomputing.config.ConfigModule; - public class TestNessObjectMapperProvider { private ObjectMapper getObjectMapper(final Module module) diff --git a/src/test/java/com/nesscomputing/jackson/TestSerializerBinderBuilder.java b/src/test/java/com/nesscomputing/jackson/TestSerializerBinderBuilder.java index ca61663..976e863 100644 --- a/src/test/java/com/nesscomputing/jackson/TestSerializerBinderBuilder.java +++ b/src/test/java/com/nesscomputing/jackson/TestSerializerBinderBuilder.java @@ -23,11 +23,11 @@ import com.google.inject.Guice; import com.google.inject.Inject; -import org.junit.Test; - import com.nesscomputing.config.Config; import com.nesscomputing.config.ConfigModule; +import org.junit.Test; + public class TestSerializerBinderBuilder { @Inject diff --git a/src/test/java/com/nesscomputing/jackson/datatype/TestCustomUuidModule.java b/src/test/java/com/nesscomputing/jackson/datatype/TestCustomUuidModule.java index 48e6214..6120ca1 100644 --- a/src/test/java/com/nesscomputing/jackson/datatype/TestCustomUuidModule.java +++ b/src/test/java/com/nesscomputing/jackson/datatype/TestCustomUuidModule.java @@ -32,12 +32,12 @@ import com.google.inject.TypeLiteral; import com.google.inject.util.Modules; -import org.junit.Assert; -import org.junit.Test; - import com.nesscomputing.config.ConfigModule; import com.nesscomputing.jackson.NessJacksonModule; +import org.junit.Assert; +import org.junit.Test; + public class TestCustomUuidModule { // This test ensures that the CustomUuidModule is correctly installed