Merge branch 'master' into ng-3.0

Author: cowtowncoder

release-notes/VERSION

@@ -11,6 +11,8 @@ Project: jackson-databind
  (reported by ctytgat@github)
 #1730: InvalidFormatException` for `JsonToken.VALUE_EMBEDDED_OBJECT`
  (reported by zigzago@github)
+#1744: StdDateFormat: add option to serialize timezone offset with a colon
+ (contributed by Bertrand R)
 #1745: StdDateFormat: accept and truncate millis larger than 3 digits
  (suggested by Bertrand R)
 #1749: StdDateFormat: performance improvement of '_format(..)' method 

src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java

@@ -945,7 +945,7 @@ public ObjectMapper registerModules(Module... modules)
      * 
      * @since 2.2
      */
-    public ObjectMapper registerModules(Iterable<Module> modules)
+    public ObjectMapper registerModules(Iterable<? extends Module> modules)
     {
         for (Module module : modules) {
             registerModule(module);

src/main/java/com/fasterxml/jackson/databind/introspect/AnnotatedMember.java

@@ -2,6 +2,7 @@
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Member;
+import java.util.Collections;
 
 import com.fasterxml.jackson.databind.util.ClassUtil;
 
@@ -84,6 +85,10 @@ public boolean hasOneOf(Class<? extends Annotation>[] annoClasses) {
         return _annotations.hasOneOf(annoClasses);
     }
 
+    /**
+     * @deprecated Since 3.0
+     */
+    @Deprecated
     public AnnotationMap getAllAnnotations() { // alas, used by at least one module, hence public
         return _annotations;
     }

src/main/java/com/fasterxml/jackson/databind/util/StdDateFormat.java

@@ -143,6 +143,13 @@ public class StdDateFormat
 
     private transient DateFormat _formatRFC1123;
 
+    /** 
+     * Whether the TZ offset must be formatted with a colon between hours and minutes ({@code HH:mm} format)
+     *
+     * @since 2.9.1
+     */
+    private boolean _tzSerializedWithColon = false;
+    
     /*
     /**********************************************************
     /* Life cycle, accessing singleton "standard" formats
@@ -154,9 +161,18 @@ public StdDateFormat() {
     }
 
     protected StdDateFormat(TimeZone tz, Locale loc, Boolean lenient) {
+        this(tz, loc, lenient, false);
+    }
+
+    /**
+     * @since 2.9.1
+     */
+    protected StdDateFormat(TimeZone tz, Locale loc, Boolean lenient,
+            boolean formatTzOffsetWithColon) {
         _timezone = tz;
         _locale = loc;
         _lenient = lenient;
+        _tzSerializedWithColon = formatTzOffsetWithColon;
     }
 
     public static TimeZone getDefaultTimeZone() {
@@ -174,31 +190,61 @@ public StdDateFormat withTimeZone(TimeZone tz) {
         if ((tz == _timezone) || tz.equals(_timezone)) {
             return this;
         }
-        return new StdDateFormat(tz, _locale, _lenient);
+        return new StdDateFormat(tz, _locale, _lenient, _tzSerializedWithColon);
     }
 
+    /**
+     * "Mutant factory" method that will return an instance that uses specified
+     * {@code Locale}:
+     * either {@code this} instance (if setting would not change), or newly
+     * constructed instance with different {@code Locale} to use.
+     */
     public StdDateFormat withLocale(Locale loc) {
         if (loc.equals(_locale)) {
             return this;
         }
-        return new StdDateFormat(_timezone, loc, _lenient);
+        return new StdDateFormat(_timezone, loc, _lenient, _tzSerializedWithColon);
     }
 
     /**
+     * "Mutant factory" method that will return an instance that has specified leniency
+     * setting: either {@code this} instance (if setting would not change), or newly
+     * constructed instance.
+     *
      * @since 2.9
      */
     public StdDateFormat withLenient(Boolean b) {
         if (_equals(b, _lenient)) {
             return this;
         }
-        return new StdDateFormat(_timezone, _locale, b);
+        return new StdDateFormat(_timezone, _locale, b, _tzSerializedWithColon);
     }
 
+    /**
+     * "Mutant factory" method that will return an instance that has specified
+     * handling of colon when serializing timezone (timezone either written
+     * like {@code +0500} or {@code +05:00}):
+     * either {@code this} instance (if setting would not change), or newly
+     * constructed instance with desired setting for colon inclusion.
+     *<p>
+     * NOTE: does NOT affect deserialization as colon is optional accepted
+     * but not required -- put another way, either serialization is accepted
+     * by this class.
+     *
+     * @since 2.9.1
+     */
+    public StdDateFormat withColonInTimeZone(boolean b) {
+        if (_tzSerializedWithColon == b) {
+            return this;
+        }
+        return new StdDateFormat(_timezone, _locale, _lenient, b);
+     }
+    
     @Override
     public StdDateFormat clone() {
         // Although there is that much state to share, we do need to
         // orchestrate a bit, mostly since timezones may be changed
-        return new StdDateFormat(_timezone, _locale, _lenient);
+        return new StdDateFormat(_timezone, _locale, _lenient, _tzSerializedWithColon);
     }
 
     /*
@@ -245,6 +291,24 @@ public boolean isLenient() {
         return (_lenient == null) || _lenient.booleanValue();
     }
 
+    /**
+     * Accessor for checking whether this instance would include colon
+     * within timezone serialization or not: if {code true}, timezone offset
+     * is serialized like {@code -06:00}; if {code false} as {@code -0600}.
+     *<p>
+     * NOTE: only relevant for serialization (formatting), as deserialization
+     * (parsing) always accepts optional colon but does not require it, regardless
+     * of this setting.
+     *
+     * @return {@code true} if a colon is to be inserted between the hours and minutes 
+     * of the TZ offset when serializing as String; otherwise {@code false}
+     *
+     * @since 2.9.1
+     */
+    public boolean isColonIncludedInTimeZone() {
+        return _tzSerializedWithColon;
+    }
+
     /*
     /**********************************************************
     /* Public API, parsing
@@ -363,15 +427,20 @@ protected void _format(TimeZone tz, Locale loc, Date date,
             int minutes = Math.abs((offset / (60 * 1000)) % 60);
             buffer.append(offset < 0 ? '-' : '+');
             pad2(buffer, hours);
-            // 24-Jun-2017, tatu: To add colon or not to add colon? Both are legal...
-            //   tests appear to expect no colon so let's go with that.
-//            formatted.append(':');
+            if( _tzSerializedWithColon ) {
+            		buffer.append(':');
+            }
             pad2(buffer, minutes);
         } else {
             // 24-Jun-2017, tatu: While `Z` would be conveniently short, older specs
             //   mandate use of full `+0000`
 //            formatted.append('Z');
-            buffer.append("+0000");
+	        	if( _tzSerializedWithColon ) {
+	            buffer.append("+00:00");
+	        	}
+	        	else {
+	        		buffer.append("+0000");
+	        	}
         }
     }