Minor tweaks wrt earlier fix

Author: cowtowncoder

datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/ser/JSR310FormattedSerializerBase.java

@@ -102,13 +102,14 @@ protected abstract JSR310FormattedSerializerBase<?> withFormat(Boolean useTimest
     /**
      * @since 2.8
      */
+    @Deprecated // since 2.9.5
     protected JSR310FormattedSerializerBase<?> withFeatures(Boolean writeZoneId) {
         // 01-Jul-2016, tatu: Sub-classes need to override
         return this;
     }
 
     /**
-     * @since 2.9
+     * @since 2.9.5
      */
     protected JSR310FormattedSerializerBase<?> withFeatures(Boolean writeZoneId,
             Boolean writeNanoseconds) {
@@ -153,7 +154,7 @@ public JsonSerializer<?> createContextual(SerializerProvider prov,
             }
             Boolean writeZoneId = format.getFeature(JsonFormat.Feature.WRITE_DATES_WITH_ZONE_ID);
             Boolean writeNanoseconds = format.getFeature(JsonFormat.Feature.WRITE_DATE_TIMESTAMPS_AS_NANOSECONDS);
-            if (writeZoneId != null || writeNanoseconds != null) {
+            if ((writeZoneId != null) || (writeNanoseconds != null)) {
                 ser = ser.withFeatures(writeZoneId, writeNanoseconds);
             }
             return ser;
@@ -195,7 +196,7 @@ protected void _acceptTimestampVisitor(JsonFormatVisitorWrapper visitor, JavaTyp
 
     protected boolean useTimestamp(SerializerProvider provider) {
         if (_useTimestamp != null) {
-            return _useTimestamp;
+            return _useTimestamp.booleanValue();
         }
         if (_shape != null) {
             if (_shape == Shape.STRING) {
@@ -211,14 +212,14 @@ protected boolean useTimestamp(SerializerProvider provider) {
 
     protected boolean _useTimestampExplicitOnly(SerializerProvider provider) {
         if (_useTimestamp != null) {
-            return _useTimestamp;
+            return _useTimestamp.booleanValue();
         }
         return false;
     }
 
     protected boolean useNanoseconds(SerializerProvider provider) {
         if (_useNanoseconds != null) {
-            return _useNanoseconds;
+            return _useNanoseconds.booleanValue();
         }
         if (_shape != null) {
             if (_shape == Shape.NUMBER_INT) {

datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/ser/LocalDateTimeSerializer.java

@@ -118,7 +118,7 @@ private final void _serializeAsArrayContents(LocalDateTime value, JsonGenerator
             }
         }
     }
-    
+
     @Override // since 2.9
     protected JsonToken serializationShape(SerializerProvider provider) {
         return useTimestamp(provider) ? JsonToken.START_ARRAY : JsonToken.VALUE_STRING;

datetime/src/main/java/com/fasterxml/jackson/datatype/jsr310/ser/ZonedDateTimeSerializer.java

@@ -55,6 +55,7 @@ protected JSR310FormattedSerializerBase<?> withFormat(
     }
 
     @Override
+    @Deprecated
     protected JSR310FormattedSerializerBase<?> withFeatures(Boolean writeZoneId) {
         return new ZonedDateTimeSerializer(this, _useTimestamp, _formatter, writeZoneId);
     }