minor test cleanup

Author: cowtowncoder

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

@@ -73,9 +73,9 @@ public abstract class TypeSerializer
      * 
      * @param value Value that will be serialized, for which type information is
      *   to be written
-     * @param jgen Generator to use for writing type information
+     * @param gen Generator to use for writing type information
      */
-    public abstract void writeTypePrefixForScalar(Object value, JsonGenerator jgen) throws IOException;
+    public abstract void writeTypePrefixForScalar(Object value, JsonGenerator gen) throws IOException;
 
     /**
      * Method called to write initial part of type information for given
@@ -86,9 +86,9 @@ public abstract class TypeSerializer
      * 
      * @param value Value that will be serialized, for which type information is
      *   to be written
-     * @param jgen Generator to use for writing type information
+     * @param gen Generator to use for writing type information
      */
-    public abstract void writeTypePrefixForObject(Object value, JsonGenerator jgen) throws IOException;
+    public abstract void writeTypePrefixForObject(Object value, JsonGenerator gen) throws IOException;
 
     /**
      * Method called to write initial part of type information for given
@@ -99,59 +99,59 @@ public abstract class TypeSerializer
      * 
      * @param value Value that will be serialized, for which type information is
      *   to be written
-     * @param jgen Generator to use for writing type information
+     * @param gen Generator to use for writing type information
      */
-    public abstract void writeTypePrefixForArray(Object value, JsonGenerator jgen) throws IOException;
+    public abstract void writeTypePrefixForArray(Object value, JsonGenerator gen) throws IOException;
 
     /**
      * Method called after value has been serialized, to close any scopes opened
      * by earlier matching call to {@link #writeTypePrefixForScalar}.
      * Actual action to take may depend on various factors, but has to match with
      * action {@link #writeTypePrefixForScalar} did (close array or object; or do nothing).
      */
-    public abstract void writeTypeSuffixForScalar(Object value, JsonGenerator jgen) throws IOException;
+    public abstract void writeTypeSuffixForScalar(Object value, JsonGenerator gen) throws IOException;
 
     /**
      * Method called after value has been serialized, to close any scopes opened
      * by earlier matching call to {@link #writeTypePrefixForObject}.
      * It needs to write closing END_OBJECT marker, and any other decoration
      * that needs to be matched.
      */
-    public abstract void writeTypeSuffixForObject(Object value, JsonGenerator jgen) throws IOException;
+    public abstract void writeTypeSuffixForObject(Object value, JsonGenerator gen) throws IOException;
 
     /**
      * Method called after value has been serialized, to close any scopes opened
      * by earlier matching call to {@link #writeTypeSuffixForScalar}.
      * It needs to write closing END_ARRAY marker, and any other decoration
      * that needs to be matched.
      */
-    public abstract void writeTypeSuffixForArray(Object value, JsonGenerator jgen) throws IOException;
+    public abstract void writeTypeSuffixForArray(Object value, JsonGenerator gen) throws IOException;
 
     /**
      * Alternative version of the prefix-for-scalar method, which is given
      * actual type to use (instead of using exact type of the value); typically
      * a super type of actual value type
      */
-    public void writeTypePrefixForScalar(Object value, JsonGenerator jgen, Class<?> type) throws IOException {
-        writeTypePrefixForScalar(value, jgen);
+    public void writeTypePrefixForScalar(Object value, JsonGenerator gen, Class<?> type) throws IOException {
+        writeTypePrefixForScalar(value, gen);
     }
 
     /**
      * Alternative version of the prefix-for-object method, which is given
      * actual type to use (instead of using exact type of the value); typically
      * a super type of actual value type
      */
-    public void writeTypePrefixForObject(Object value, JsonGenerator jgen, Class<?> type) throws IOException {
-        writeTypePrefixForObject(value, jgen);
+    public void writeTypePrefixForObject(Object value, JsonGenerator gen, Class<?> type) throws IOException {
+        writeTypePrefixForObject(value, gen);
     }
 
     /**
      * Alternative version of the prefix-for-array method, which is given
      * actual type to use (instead of using exact type of the value); typically
      * a super type of actual value type
      */
-    public void writeTypePrefixForArray(Object value, JsonGenerator jgen, Class<?> type) throws IOException {
-        writeTypePrefixForArray(value, jgen);
+    public void writeTypePrefixForArray(Object value, JsonGenerator gen, Class<?> type) throws IOException {
+        writeTypePrefixForArray(value, gen);
     }
 
     /*
@@ -170,10 +170,10 @@ public void writeTypePrefixForArray(Object value, JsonGenerator jgen, Class<?> t
      * 
      * @param value Value that will be serialized, for which type information is
      *   to be written
-     * @param jgen Generator to use for writing type information
+     * @param gen Generator to use for writing type information
      * @param typeId Exact type id to use
      */
-    public abstract void writeCustomTypePrefixForScalar(Object value, JsonGenerator jgen, String typeId) throws IOException, JsonProcessingException;
+    public abstract void writeCustomTypePrefixForScalar(Object value, JsonGenerator gen, String typeId) throws IOException;
 
     /**
      * Method called to write initial part of type information for given
@@ -185,16 +185,16 @@ public void writeTypePrefixForArray(Object value, JsonGenerator jgen, Class<?> t
      * 
      * @param value Value that will be serialized, for which type information is
      *   to be written
-     * @param jgen Generator to use for writing type information
+     * @param gen Generator to use for writing type information
      * @param typeId Exact type id to use
      */
-    public abstract void writeCustomTypePrefixForObject(Object value, JsonGenerator jgen, String typeId) throws IOException;
+    public abstract void writeCustomTypePrefixForObject(Object value, JsonGenerator gen, String typeId) throws IOException;
 
-    public abstract void writeCustomTypePrefixForArray(Object value, JsonGenerator jgen, String typeId) throws IOException;
+    public abstract void writeCustomTypePrefixForArray(Object value, JsonGenerator gen, String typeId) throws IOException;
 
-    public abstract void writeCustomTypeSuffixForScalar(Object value, JsonGenerator jgen, String typeId) throws IOException;
+    public abstract void writeCustomTypeSuffixForScalar(Object value, JsonGenerator gen, String typeId) throws IOException;
 
-    public abstract void writeCustomTypeSuffixForObject(Object value, JsonGenerator jgen, String typeId) throws IOException;
+    public abstract void writeCustomTypeSuffixForObject(Object value, JsonGenerator gen, String typeId) throws IOException;
 
-    public abstract void writeCustomTypeSuffixForArray(Object value, JsonGenerator jgen, String typeId) throws IOException;
+    public abstract void writeCustomTypeSuffixForArray(Object value, JsonGenerator gen, String typeId) throws IOException;
 }

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));
     }