Minor fix/improvement to PropertyMetadata construction, was NPEing under some conditions

Author: cowtowncoder

release-notes/VERSION

@@ -6,6 +6,7 @@ Project: jackson-databind
 2.8.8 (not yet released)
 
 #1533: `AsPropertyTypeDeserializer` ignores `DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT`
+- Minor fix to creation of `PropertyMetadata`, had one path that could lead to NPE
 
 2.8.7 (21-Feb-2017)
 

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

@@ -72,14 +72,29 @@ public static PropertyMetadata construct(boolean req, String desc) {
         return construct(req, desc, null, null);
     }
 
+    /**
+     * @since 2.8.8
+     */
+    public static PropertyMetadata construct(Boolean req, String desc, Integer index,
+            String defaultValue) {
+        if ((desc != null) || (index != null) || (defaultValue != null)) {
+            return new PropertyMetadata(req, desc, index, defaultValue);
+        }
+        if (req == null) {
+            return STD_REQUIRED_OR_OPTIONAL;
+        }
+        return req ? STD_REQUIRED : STD_OPTIONAL;
+    }
+
+    @Deprecated // since 2.8.8
     public static PropertyMetadata construct(boolean req, String desc, Integer index,
             String defaultValue) {
         if (desc != null || index != null || defaultValue != null) {
             return new PropertyMetadata(req, desc, index, defaultValue);
         }
         return req ? STD_REQUIRED : STD_OPTIONAL;
     }
-    
+
     /**
      * Minor optimization: let's canonicalize back to placeholders in cases
      * where there is no real data to consider

src/main/java/com/fasterxml/jackson/databind/deser/BasicDeserializerFactory.java

@@ -844,11 +844,10 @@ protected SettableBeanProperty constructCreatorProperty(DeserializationContext c
                 metadata = PropertyMetadata.STD_REQUIRED_OR_OPTIONAL;
             } else {
                 Boolean b = intr.hasRequiredMarker(param);
-                boolean req = (b != null && b.booleanValue());
                 String desc = intr.findPropertyDescription(param);
                 Integer idx = intr.findPropertyIndex(param);
                 String def = intr.findPropertyDefaultValue(param);
-                metadata = PropertyMetadata.construct(req, desc, idx, def);
+                metadata = PropertyMetadata.construct(b, desc, idx, def);
             }
         }
         JavaType type = resolveMemberAndTypeAnnotations(ctxt, param, param.getType());

src/main/java/com/fasterxml/jackson/databind/deser/SettableBeanProperty.java

@@ -133,7 +133,7 @@ protected SettableBeanProperty(String propName, JavaType type, PropertyName wrap
             boolean isRequired)
     {
         this(new PropertyName(propName), type, wrapper, typeDeser, contextAnnotations,
-                PropertyMetadata.construct(isRequired, null, null, null));
+                PropertyMetadata.construct(Boolean.valueOf(isRequired), null, null, null));
     }
 
     protected SettableBeanProperty(PropertyName propName, JavaType type, PropertyName wrapper,

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

@@ -500,7 +500,7 @@ public PropertyMetadata getMetadata() {
             return (desc == null) ? PropertyMetadata.STD_REQUIRED_OR_OPTIONAL
                     : PropertyMetadata.STD_REQUIRED_OR_OPTIONAL.withDescription(desc);
         }
-        return PropertyMetadata.construct(b.booleanValue(), desc, idx, def);
+        return PropertyMetadata.construct(b, desc, idx, def);
     }
 
     protected Boolean _findRequired() {