Refactor code a bit post #169

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/datatype/joda/cfg/JacksonJodaDateFormat.java

@@ -243,12 +243,11 @@ public DateTimeFormatter rawFormatter() {
     }
 
     /**
-     * @deprecated since 2.20 Use {@link #createFormatter(SerializerProvider, DateTimeZone)} instead
+     * Creates a formatter with settings this format object has.
      */
-    @Deprecated // since 2.20
     public DateTimeFormatter createFormatter(SerializerProvider ctxt)
     {
-        return createFormatter(ctxt, null);
+        return createFormatterWithTimeZoneOverride(ctxt, null);
     }
 
     /**
@@ -258,7 +257,7 @@ public DateTimeFormatter createFormatter(SerializerProvider ctxt)
      *
      * @since 2.20
      */
-    public DateTimeFormatter createFormatter(SerializerProvider ctxt, DateTimeZone valueTimeZone)
+    public DateTimeFormatter createFormatterWithTimeZoneOverride(SerializerProvider ctxt, DateTimeZone tzOverride)
     {
         DateTimeFormatter formatter = createFormatterWithLocale(ctxt);
         if (!_explicitTimezone) {
@@ -267,10 +266,11 @@ public DateTimeFormatter createFormatter(SerializerProvider ctxt, DateTimeZone v
                 formatter = formatter.withZone(DateTimeZone.forTimeZone(tz));
             }
         }
-        if (!ctxt.isEnabled(SerializationFeature.WRITE_DATES_WITH_CONTEXT_TIME_ZONE)) {
-            if ((valueTimeZone != null)
-                    && ((_jdkTimezone == null) || !valueTimeZone.toTimeZone().equals(_jdkTimezone))) {
-                formatter = formatter.withZone(valueTimeZone);
+        if (tzOverride != null) {
+            if (!ctxt.isEnabled(SerializationFeature.WRITE_DATES_WITH_CONTEXT_TIME_ZONE)) {
+                if ((_jdkTimezone == null) || !tzOverride.toTimeZone().equals(_jdkTimezone)) {
+                    formatter = formatter.withZone(tzOverride);
+                }
             }
         }
         return formatter;

src/main/java/com/fasterxml/jackson/datatype/joda/ser/DateTimeSerializer.java

@@ -52,7 +52,7 @@ public void serialize(DateTime value, JsonGenerator gen, SerializerProvider prov
             if (numeric) {
                 gen.writeNumber(value.getMillis());
             } else {
-                gen.writeString(_format.createFormatter(provider, value.getZone()).print(value));
+                gen.writeString(_format.createFormatterWithTimeZoneOverride(provider, value.getZone()).print(value));
             }
         } else {
             // and then as per [datatype-joda#44], optional TimeZone inclusion