minor code cleanup, renaming

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/ser/impl/UnwrappingBeanPropertyWriter.java

@@ -69,9 +69,9 @@ public UnwrappingBeanPropertyWriter rename(NameTransformer transformer)
     public boolean isUnwrapping() {
         return true;
     }
-    
+
     @Override
-    public void serializeAsField(Object bean, JsonGenerator jgen, SerializerProvider prov)
+    public void serializeAsField(Object bean, JsonGenerator gen, SerializerProvider prov)
             throws Exception
     {
         final Object value = get(bean);
@@ -100,20 +100,20 @@ public void serializeAsField(Object bean, JsonGenerator jgen, SerializerProvider
         }
         // For non-nulls, first: simple check for direct cycles
         if (value == bean) {
-            if (_handleSelfReference(bean, jgen, prov, ser)) {
+            if (_handleSelfReference(bean, gen, prov, ser)) {
                 return;
             }
         }
 
         // note: must verify we are using unwrapping serializer; if not, will write field name
         if (!ser.isUnwrappingSerializer()) {
-            jgen.writeFieldName(_name);
+            gen.writeFieldName(_name);
         }
 
         if (_typeSerializer == null) {
-            ser.serialize(value, jgen, prov);
+            ser.serialize(value, gen, prov);
         } else {
-            ser.serializeWithType(value, jgen, prov, _typeSerializer);
+            ser.serializeWithType(value, gen, prov, _typeSerializer);
         }
     }
 

src/main/java/com/fasterxml/jackson/databind/ser/impl/UnwrappingBeanSerializer.java

@@ -47,12 +47,12 @@ public UnwrappingBeanSerializer(UnwrappingBeanSerializer src,
         super(src, objectIdWriter, filterId);
         _nameTransformer = src._nameTransformer;
     }
-    
+
     protected UnwrappingBeanSerializer(UnwrappingBeanSerializer src, String[] toIgnore) {
         super(src, toIgnore);
         _nameTransformer = src._nameTransformer;
     }
-    
+
     /*
     /**********************************************************
     /* Life-cycle: factory methods, fluent factories
@@ -79,7 +79,7 @@ public BeanSerializerBase withObjectIdWriter(ObjectIdWriter objectIdWriter) {
     protected BeanSerializerBase withFilterId(Object filterId) {
         return new UnwrappingBeanSerializer(this, _objectIdWriter, filterId);
     }
-    
+
     @Override
     protected BeanSerializerBase withIgnorals(String[] toIgnore) {
         return new UnwrappingBeanSerializer(this, toIgnore);

src/main/java/com/fasterxml/jackson/databind/ser/impl/WritableObjectId.java

@@ -4,7 +4,6 @@
 
 import com.fasterxml.jackson.annotation.ObjectIdGenerator;
 
-import com.fasterxml.jackson.core.JsonGenerationException;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.SerializableString;
 
@@ -21,20 +20,19 @@ public final class WritableObjectId
     public Object id;
 
     protected boolean idWritten = false;
-    
+
     public WritableObjectId(ObjectIdGenerator<?> generator) {
         this.generator = generator;
     }
-    
-    public boolean writeAsId(JsonGenerator jgen, SerializerProvider provider, ObjectIdWriter w)
-        throws IOException, JsonGenerationException
+
+    public boolean writeAsId(JsonGenerator gen, SerializerProvider provider, ObjectIdWriter w) throws IOException
     {
         if (id != null && (idWritten || w.alwaysAsId)) {
             // 03-Aug-2013, tatu: Prefer Native Object Ids if available
-            if (jgen.canWriteObjectId()) {
-                jgen.writeObjectRef(String.valueOf(id));
+            if (gen.canWriteObjectId()) {
+                gen.writeObjectRef(String.valueOf(id));
             } else {
-                w.serializer.serialize(id, jgen, provider);
+                w.serializer.serialize(id, gen, provider);
             }
             return true;
         }
@@ -48,23 +46,22 @@ public Object generateId(Object forPojo) {
     /**
      * Method called to output Object Id as specified.
      */
-    public void writeAsField(JsonGenerator jgen, SerializerProvider provider,
-            ObjectIdWriter w)
-        throws IOException, JsonGenerationException
+    public void writeAsField(JsonGenerator gen, SerializerProvider provider,
+            ObjectIdWriter w) throws IOException
     {
         idWritten = true;
 
         // 03-Aug-2013, tatu: Prefer Native Object Ids if available
-        if (jgen.canWriteObjectId()) {
+        if (gen.canWriteObjectId()) {
             // Need to assume String(ified) ids, for now... could add 'long' variant?
-            jgen.writeObjectId(String.valueOf(id));
+            gen.writeObjectId(String.valueOf(id));
             return;
         }
 
         SerializableString name = w.propertyName;
         if (name != null) {
-            jgen.writeFieldName(name);
-            w.serializer.serialize(id, jgen, provider);
+            gen.writeFieldName(name);
+            w.serializer.serialize(id, gen, provider);
         }
     }
 }