Minor tweaks to #79

Author: cowtowncoder

pom.xml

@@ -8,7 +8,7 @@
   <groupId>com.fasterxml.jackson.datatype</groupId>
   <artifactId>jackson-datatype-guava</artifactId>
   <name>Jackson-datatype-Guava</name>
-  <version>2.6.2-SNAPSHOT</version>
+  <version>2.7.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <description>Add-on datatype-support module for Jackson (https://github.com/FasterXML/jackson) that handles
 Guava (http://code.google.com/p/guava-libraries/) types (currently mostly just collection ones)
@@ -29,7 +29,7 @@ Guava (http://code.google.com/p/guava-libraries/) types (currently mostly just c
   </contributors>
 
   <properties>
-    <version.jackson>2.6.1</version.jackson>
+    <version.jackson.core>2.7.0-SNAPSHOT</version.jackson.core>
 
     <version.guava>15.0</version.guava>
     <version.guava.osgi>${version.guava}.0</version.guava.osgi>
@@ -66,12 +66,12 @@ com.fasterxml.jackson.databind.util
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>${version.jackson}</version>
+      <version>${version.jackson.core}</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>${version.jackson}</version>
+      <version>${version.jackson.core}</version>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>

release-notes/CREDITS

@@ -20,3 +20,7 @@ Alexey Kobyakov (akobiakov@github)
   * Reported #64: `@JsonUnwrapped` annotation is ignored when a field is an Optional
    (2.6.0)
 
+Jonathan Rodrigues de Oliveira (jorool@github)
+
+  * Contributed #79: New configuration for Guava Range default bound type.
+   (2.7.0)

release-notes/VERSION

@@ -4,6 +4,11 @@ Project: jackson-datatype-guava
 === Releases ===
 ------------------------------------------------------------------------
 
+2.7.0 (not yet released)
+
+#79: New configuration for Guava Range default bound type.
+ (contributed by Jonathan R-d-O)
+
 2.6.1 (09-Aug-2015)
 
 No changes since 2.6.0

src/main/java/com/fasterxml/jackson/datatype/guava/GuavaDeserializers.java

@@ -25,7 +25,11 @@
 public class GuavaDeserializers
     extends Deserializers.Base
 {
-    private BoundType _defaultBoundType;
+    protected BoundType _defaultBoundType;
+
+    public GuavaDeserializers() {
+        this(null);
+    }
 
     public GuavaDeserializers(BoundType defaultBoundType) {
         _defaultBoundType = defaultBoundType;

src/main/java/com/fasterxml/jackson/datatype/guava/GuavaModule.java

@@ -3,7 +3,6 @@
 import com.fasterxml.jackson.core.Version;
 
 import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.cfg.PackageVersion;
 import com.fasterxml.jackson.datatype.guava.ser.GuavaBeanSerializerModifier;
 import com.google.common.collect.BoundType;
 

src/main/java/com/fasterxml/jackson/datatype/guava/deser/RangeDeserializer.java

@@ -40,10 +40,18 @@ public class RangeDeserializer
     /* Life-cycle
     /**********************************************************
      */
+
+    /**
+     * @deprecated Since 2.7
+     */
+    @Deprecated // since 2.7
+    public RangeDeserializer(JavaType rangeType) {
+        this(null, rangeType);
+    }
 
     public RangeDeserializer(BoundType defaultBoundType, JavaType rangeType) {
         this(rangeType, null);
-        this._defaultBoundType = defaultBoundType;
+        _defaultBoundType = defaultBoundType;
     }
 
     @SuppressWarnings("unchecked")
@@ -90,14 +98,14 @@ public JsonDeserializer<?> createContextual(DeserializationContext ctxt,
     @Override
     public Object deserializeWithType(JsonParser jp, DeserializationContext ctxt,
             TypeDeserializer typeDeserializer)
-        throws IOException, JsonProcessingException
+        throws IOException
     {
         return typeDeserializer.deserializeTypedFromObject(jp, ctxt);
     }
 
     @Override
     public Range<?> deserialize(JsonParser parser, DeserializationContext context)
-            throws IOException, JsonProcessingException
+            throws IOException
     {
         // NOTE: either START_OBJECT _or_ FIELD_NAME fine; latter for polymorphic cases
         JsonToken t = parser.getCurrentToken();
@@ -107,43 +115,32 @@ public Range<?> deserialize(JsonParser parser, DeserializationContext context)
 
         Comparable<?> lowerEndpoint = null;
         Comparable<?> upperEndpoint = null;
-        BoundType lowerBoundType = null;
-        BoundType upperBoundType = null;
+        BoundType lowerBoundType = _defaultBoundType;
+        BoundType upperBoundType = _defaultBoundType;
 
         for (; t != JsonToken.END_OBJECT; t = parser.nextToken()) {
             expect(parser, JsonToken.FIELD_NAME, t);
             String fieldName = parser.getCurrentName();
             try {
                 if (fieldName.equals("lowerEndpoint")) {
-                    Preconditions.checkState(lowerEndpoint == null, "'lowerEndpoint' field included multiple times.");
                     parser.nextToken();
                     lowerEndpoint = deserializeEndpoint(parser, context);
                 } else if (fieldName.equals("upperEndpoint")) {
-                    Preconditions.checkState(upperEndpoint == null, "'upperEndpoint' field included multiple times.");
                     parser.nextToken();
                     upperEndpoint = deserializeEndpoint(parser, context);
                 } else if (fieldName.equals("lowerBoundType")) {
-                    Preconditions.checkState(lowerBoundType == null, "'lowerBoundType' field included multiple times.");
                     parser.nextToken();
                     lowerBoundType = deserializeBoundType(parser);
                 } else if (fieldName.equals("upperBoundType")) {
-                    Preconditions.checkState(upperBoundType == null, "'upperBoundType' field included multiple times.");
                     parser.nextToken();
                     upperBoundType = deserializeBoundType(parser);
                 } else {
                     throw context.mappingException("Unexpected Range field: " + fieldName);
                 }
             } catch (IllegalStateException e) {
-                throw new JsonMappingException(e.getMessage());
+                throw JsonMappingException.from(parser, e.getMessage());
             }
         }
-
-        if (lowerBoundType == null)
-            lowerBoundType = _defaultBoundType;
-
-        if (upperBoundType == null)
-            upperBoundType = _defaultBoundType;
-
         try {
             if ((lowerEndpoint != null) && (upperEndpoint != null)) {
                 Preconditions.checkState(lowerEndpoint.getClass() == upperEndpoint.getClass(),
@@ -164,7 +161,7 @@ public Range<?> deserialize(JsonParser parser, DeserializationContext context)
             }
             return RangeFactory.all();
         } catch (IllegalStateException e) {
-            throw new JsonMappingException(e.getMessage());
+            throw JsonMappingException.from(parser, e.getMessage());
         }
     }
 
@@ -190,10 +187,10 @@ private Comparable<?> deserializeEndpoint(JsonParser parser, DeserializationCont
         return (Comparable<?>) obj;
     }
 
-    private void expect(JsonParser jp, JsonToken expected, JsonToken actual) throws JsonMappingException
+    private void expect(JsonParser p, JsonToken expected, JsonToken actual) throws JsonMappingException
     {
         if (actual != expected) {
-            throw new JsonMappingException("Expecting " + expected + ", found " + actual, jp.getCurrentLocation());
+            throw JsonMappingException.from(p, "Expecting " + expected + ", found " + actual);
         }
     }
 }

src/test/java/com/fasterxml/jackson/datatype/guava/TestVersions.java

@@ -31,8 +31,7 @@ public void testPackageVersion()
     private void assertVersion(Versioned vers)
     {
         final Version v = vers.version();
-        assertFalse("Should find version information (got "+v+")", v.isUknownVersion());
+        assertFalse("Should find version information (got "+v+")", v.isUnknownVersion());
         assertEquals(PackageVersion.VERSION, v);
     }
 }
-