Further work on deferring forcing of access (to reduce likelihood of unnecessary calls), this time for serialization side

Author: cowtowncoder

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

@@ -133,9 +133,12 @@ public final boolean addIfNotPresent(Annotation a) {
      * @since 2.7
      */
     public final void fixAccess(boolean force) {
-        ClassUtil.checkAndFixAccess(getMember(), force);
+        Member m = getMember();
+        if (m != null) { // may be null for virtual members
+            ClassUtil.checkAndFixAccess(m, force);
+        }
     }
-    
+
     /**
      * @deprecated Since 2.7 use {@link #fixAccess(boolean)} instead
      */

src/main/java/com/fasterxml/jackson/databind/ser/AnyGetterWriter.java

@@ -24,7 +24,7 @@ public class AnyGetterWriter
     protected JsonSerializer<Object> _serializer;
 
     protected MapSerializer _mapSerializer;
-    
+
     @SuppressWarnings("unchecked")
     public AnyGetterWriter(BeanProperty property,
             AnnotatedMember accessor, JsonSerializer<?> serializer)
@@ -37,6 +37,14 @@ public AnyGetterWriter(BeanProperty property,
         }
     }
 
+    /**
+     * @since 0.8.3
+     */
+    public void fixAccess(SerializationConfig config) {
+        _accessor.fixAccess(
+                config.isEnabled(MapperFeature.OVERRIDE_PUBLIC_ACCESS_MODIFIERS));
+    }
+
     public void getAndSerialize(Object bean, JsonGenerator gen, SerializerProvider provider)
         throws Exception
     {

src/main/java/com/fasterxml/jackson/databind/ser/BeanPropertyWriter.java

@@ -406,6 +406,17 @@ public void setNonTrivialBaseType(JavaType t) {
         _nonTrivialBaseType = t;
     }
 
+    /**
+     * Method called to ensure that the mutator has proper access rights to
+     * be called, as per configuration. Overridden by implementations that
+     * have mutators that require access, fields and setters.
+     *
+     * @since 2.8.3
+     */
+    public void fixAccess(SerializationConfig config) {
+        _member.fixAccess(config.isEnabled(MapperFeature.OVERRIDE_PUBLIC_ACCESS_MODIFIERS));
+    }
+
     /*
     /***********************************************************
     /* JDK Serializability

src/main/java/com/fasterxml/jackson/databind/ser/BeanSerializerBuilder.java

@@ -179,11 +179,24 @@ public JsonSerializer<?> build()
             properties = NO_PROPERTIES;
         } else {
             properties = _properties.toArray(new BeanPropertyWriter[_properties.size()]);
+            if (_config.isEnabled(MapperFeature.CAN_OVERRIDE_ACCESS_MODIFIERS)) {
+                for (int i = 0, end = properties.length; i < end; ++i) {
+                    properties[i].fixAccess(_config);
+                }
+            }
+        }
+        if (_anyGetter != null) {
+            _anyGetter.fixAccess(_config);
+        }
+        if (_typeId != null) {
+            if (_config.isEnabled(MapperFeature.CAN_OVERRIDE_ACCESS_MODIFIERS)) {
+                _typeId.fixAccess(_config.isEnabled(MapperFeature.OVERRIDE_PUBLIC_ACCESS_MODIFIERS));
+            }
         }
         return new BeanSerializer(_beanDesc.getType(), this,
                 properties, _filteredProperties);
     }
-    
+
     /**
      * Factory method for constructing an "empty" serializer; one that
      * outputs no properties (but handles JSON objects properly, including

src/main/java/com/fasterxml/jackson/databind/ser/BeanSerializerFactory.java

@@ -425,9 +425,6 @@ protected JsonSerializer<Object> constructBeanSerializer(SerializerProvider prov
 
         AnnotatedMember anyGetter = beanDesc.findAnyGetter();
         if (anyGetter != null) {
-            if (config.canOverrideAccessModifiers()) {
-                anyGetter.fixAccess(config.isEnabled(MapperFeature.OVERRIDE_PUBLIC_ACCESS_MODIFIERS));
-            }
             JavaType type = anyGetter.getType();
             // copied from BasicSerializerFactory.buildMapSerializer():
             boolean staticTyping = config.isEnabled(MapperFeature.USE_STATIC_TYPING);
@@ -586,16 +583,11 @@ protected List<BeanPropertyWriter> findBeanProperties(SerializerProvider prov,
         PropertyBuilder pb = constructPropertyBuilder(config, beanDesc);
 
         ArrayList<BeanPropertyWriter> result = new ArrayList<BeanPropertyWriter>(properties.size());
-        final boolean fixAccess = config.canOverrideAccessModifiers();
-        final boolean forceAccess = fixAccess && config.isEnabled(MapperFeature.OVERRIDE_PUBLIC_ACCESS_MODIFIERS);
         for (BeanPropertyDefinition property : properties) {
             final AnnotatedMember accessor = property.getAccessor();
             // Type id? Requires special handling:
             if (property.isTypeId()) {
-                if (accessor != null) { // only add if we can access... but otherwise?
-                    if (fixAccess) {
-                        accessor.fixAccess(forceAccess);
-                    }
+                if (accessor != null) {
                     builder.setTypeId(accessor);
                 }
                 continue;
@@ -790,9 +782,6 @@ protected BeanPropertyWriter _constructWriter(SerializerProvider prov,
         throws JsonMappingException
     {
         final PropertyName name = propDef.getFullName();
-        if (prov.canOverrideAccessModifiers()) {
-            accessor.fixAccess(prov.isEnabled(MapperFeature.OVERRIDE_PUBLIC_ACCESS_MODIFIERS));
-        }
         JavaType type = accessor.getType();
         BeanProperty.Std property = new BeanProperty.Std(name, type, propDef.getWrapperName(),
                 pb.getClassAnnotations(), accessor, propDef.getMetadata());

src/main/java/com/fasterxml/jackson/databind/ser/PropertyBuilder.java

@@ -120,11 +120,15 @@ protected BeanPropertyWriter buildWriter(SerializerProvider prov,
         switch (inclusion) {
         case NON_DEFAULT:
             // 11-Nov-2015, tatu: This is tricky because semantics differ between cases,
-            //    so that if enclosing class has this, we may need to values of property,
+            //    so that if enclosing class has this, we may need to access values of property,
             //    whereas for global defaults OR per-property overrides, we have more
             //    static definition. Sigh.
             // First: case of class specifying it; try to find POJO property defaults
             if (_defaultInclusion.getValueInclusion() == JsonInclude.Include.NON_DEFAULT) {
+                // 07-Sep-2016, tatu: may also need to front-load access forcing now
+                if (prov.isEnabled(MapperFeature.CAN_OVERRIDE_ACCESS_MODIFIERS)) {
+                    am.fixAccess(_config.isEnabled(MapperFeature.OVERRIDE_PUBLIC_ACCESS_MODIFIERS));
+                }
                 valueToSuppress = getPropertyDefaultValue(propDef.getName(), am, actualType);
             } else {
                 valueToSuppress = getDefaultValue(actualType);