Merge branch '2.7' into 2.8

Author: cowtowncoder

.gitattributes

@@ -1,3 +1,7 @@
 # Do not merge `pom.xml` from older version, as it will typically conflict
+#
+# note: also need:
+# git config --global merge.ours.driver true
+# (and if ever need to disable change `true` to `false`
 
 pom.xml merge=ours

release-notes/VERSION

@@ -91,7 +91,7 @@ Project: jackson-databind
 #1277: Add caching of resolved generic types for `TypeFactory`
  (requested by Andriy P)
 
-2.7.8 (not yet released)
+2.7.8 (26-Sep-2016)
 
 #877: @JsonIgnoreProperties`: ignoring the "cause" property of `Throwable` on GAE
 #1359: Improve `JsonNode` deserializer to create `FloatNode` if parser supports

src/main/java/com/fasterxml/jackson/databind/jsontype/TypeSerializer.java

@@ -102,7 +102,7 @@ public abstract class TypeSerializer
      * @param g Generator to use for writing type information
      */
     public abstract void writeTypePrefixForArray(Object value, JsonGenerator g) throws IOException;
-    
+
     /**
      * Method called after value has been serialized, to close any scopes opened
      * by earlier matching call to {@link #writeTypePrefixForScalar}.
@@ -173,8 +173,8 @@ public void writeTypePrefixForArray(Object value, JsonGenerator g, Class<?> type
      * @param g Generator to use for writing type information
      * @param typeId Exact type id to use
      */
-    public abstract void writeCustomTypePrefixForScalar(Object value, JsonGenerator g, String typeId) throws IOException, JsonProcessingException;
-    
+    public abstract void writeCustomTypePrefixForScalar(Object value, JsonGenerator g, String typeId) throws IOException;
+
     /**
      * Method called to write initial part of type information for given
      * value, when it will be output as JSON Object value (not as JSON

src/test/java/com/fasterxml/jackson/databind/jsontype/TestDefaultForObject.java

@@ -11,12 +11,6 @@
 public class TestDefaultForObject
     extends BaseMapTest
 {
-    /*
-    /**********************************************************
-    /* Helper types
-    /**********************************************************
-     */
-
     static abstract class AbstractBean { }
 
     static class StringBean extends AbstractBean { // ha, punny!
@@ -42,7 +36,6 @@ enum ComplexChoice {
         public String toString() { return String.valueOf(state); }
     }
 
-    // [JACKSON-311]
     static class PolymorphicType {
         public String foo;
         public Object bar;
@@ -70,7 +63,6 @@ public ObjectHolder() { }
         public ObjectHolder(Object v) { value = v; }
     }
 
-    // [JACKSON-352]
     static class DomainBean {
         public int weight;
     }

src/test/java/com/fasterxml/jackson/databind/ser/TestJsonValue.java

@@ -249,7 +249,7 @@ public void testInList() throws Exception {
         assertEquals(json, "{\"values\":[{\"i\":1},{\"i\":2}]}");
     }
 
-    // [Issue#167]
+    // [databind#167]
     public void testPolymorphicSerdeWithDelegate() throws Exception
     {
 	    AdditionInterface adder = new AdditionInterfaceImpl(1);
@@ -262,7 +262,7 @@ public void testPolymorphicSerdeWithDelegate() throws Exception
 	    adder = new NegatingAdditionInterface(adder);
 	    assertEquals(0, adder.add(1));
 	    json = MAPPER.writeValueAsString(adder);
-	    
+
 	    assertEquals("{\"boingo\":\"boopsy\",\"toAdd\":1}", json);
 	    assertEquals(2, MAPPER.readValue(json, AdditionInterface.class).add(1));
     }