Merge branch '2.19' into 2.17

pom.xml

@@ -330,19 +330,11 @@
               <release>11</release>
               <compilerArgs>
                 <arg>-parameters</arg>
-                <arg>--enable-preview</arg>
               </compilerArgs>
               <fork>true</fork>
               <useIncrementalCompilation>true</useIncrementalCompilation>
             </configuration>
           </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <argLine>--enable-preview</argLine>
-            </configuration>
-          </plugin>
         </plugins>
       </build>
     </profile>

release-notes/CREDITS-2.x

@@ -1850,6 +1850,11 @@ wrongwrong (@k163377)
  * Contributed fix for #2461: Nested `@JsonUnwrapped` property names not correctly handled
   (2.19.0)
 
+Geoffrey Grebert (@ggrebert)
+ * Contributed #2951: Allow inverting `@JsonProperty(access=)` so it can work differently
+   on server side and client side
+  (2.19.0)
+
 Konstantin Maliuga (@badoken)
  * Contributed #4674: Allow setting global enum naming strategy similar to property naming strategy
   (2.19.0)

release-notes/VERSION-2.x

@@ -9,14 +9,19 @@ Project: jackson-databind
 #2461: Nested `@JsonUnwrapped` property names not correctly handled
  (reported by @plovell)
  (fix contributed by @SandeepGaur2016)
+#2951: Allow inverting `@JsonProperty(access=)` with
+  `MapperFeature.INVERSE_READ_WRITE_ACCESS` to work differently on
+   server and client side
+ (requested by @qianlong)
+ (contributed by Geoffrey G)
 #4674: Allow setting global enum naming strategy similar to property naming strategy
  (requested by @hajdamak)
  (contributed by Konstantin M)
 #4676: Support other enum naming strategies than camelCase
  (requested by @hajdamak)
- (contributed by Lars 
+ (contributed by Lars B)
 
-2.18.1 (WIP-2024)
+2.18.1 (28-Oct-2024)
 
 #4741: When `Include.NON_DEFAULT` setting is used on POJO, empty values
   are not included in json if default is `null`

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

@@ -4,9 +4,9 @@
 import java.util.*;
 
 import com.fasterxml.jackson.annotation.*;
+
 import com.fasterxml.jackson.core.Version;
 import com.fasterxml.jackson.core.Versioned;
-
 import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.cfg.MapperConfig;

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

@@ -5,6 +5,7 @@
 import java.util.TimeZone;
 
 import com.fasterxml.jackson.annotation.*;
+
 import com.fasterxml.jackson.databind.cfg.DatatypeFeature;
 import com.fasterxml.jackson.databind.cfg.DatatypeFeatures;
 import com.fasterxml.jackson.databind.cfg.HandlerInstantiator;

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

@@ -21,10 +21,10 @@
 import com.fasterxml.jackson.databind.deser.impl.ObjectIdReader;
 import com.fasterxml.jackson.databind.deser.impl.ReadableObjectId;
 import com.fasterxml.jackson.databind.deser.impl.TypeWrappedDeserializer;
-import com.fasterxml.jackson.databind.exc.MismatchedInputException;
 import com.fasterxml.jackson.databind.exc.InvalidDefinitionException;
 import com.fasterxml.jackson.databind.exc.InvalidFormatException;
 import com.fasterxml.jackson.databind.exc.InvalidTypeIdException;
+import com.fasterxml.jackson.databind.exc.MismatchedInputException;
 import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException;
 import com.fasterxml.jackson.databind.exc.ValueInstantiationException;
 import com.fasterxml.jackson.databind.introspect.Annotated;

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

@@ -1,9 +1,9 @@
 package com.fasterxml.jackson.databind;
 
-import com.fasterxml.jackson.databind.util.NamingStrategyImpls;
-
 import java.util.Locale;
 
+import com.fasterxml.jackson.databind.util.NamingStrategyImpls;
+
 /**
  * A container class for implementations of the {@link EnumNamingStrategy} interface.
  *

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

@@ -4,7 +4,6 @@
 import java.util.Collection;
 
 import com.fasterxml.jackson.core.*;
-
 import com.fasterxml.jackson.databind.deser.*;
 import com.fasterxml.jackson.databind.deser.impl.ObjectIdReader;
 import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;

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

@@ -8,7 +8,6 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import com.fasterxml.jackson.core.*;
-
 import com.fasterxml.jackson.databind.util.ClassUtil;
 
 /**
@@ -320,9 +319,8 @@ public static JsonMappingException from(SerializerProvider ctxt, String msg) {
      * @since 2.7
      */
     public static JsonMappingException from(SerializerProvider ctxt, String msg, Throwable problem) {
-        /* 17-Aug-2015, tatu: As per [databind#903] this is bit problematic as
-         *   SerializerProvider instance does not currently hold on to generator...
-         */
+        // 17-Aug-2015, tatu: As per [databind#903] this is bit problematic as
+        //   SerializerProvider instance does not currently hold on to generator...
         return new JsonMappingException(_generator(ctxt), msg, problem);
     }
 
@@ -510,15 +508,7 @@ protected String _buildMessage()
             return msg;
         }
         StringBuilder sb = (msg == null) ? new StringBuilder() : new StringBuilder(msg);
-        /* 18-Feb-2009, tatu: initially there was a linefeed between
-         *    message and path reference; but unfortunately many systems
-         *   (loggers, junit) seem to assume linefeeds are only added to
-         *   separate stack trace.
-         */
-        sb.append(" (through reference chain: ");
-        sb = getPathReference(sb);
-        sb.append(')');
-        return sb.toString();
+        return _appendReferenceChain(sb).toString();
     }
 
     @Override
@@ -533,6 +523,26 @@ public String toString()
     /**********************************************************************
      */
 
+    /**
+     * Method that is called to add reference chain
+     * information to message, but may be overridden to customize
+     * handling, including appending other information or removing
+     * the reference chain altogether.
+     *
+     * @since 2.18.2
+     */
+    protected StringBuilder _appendReferenceChain(StringBuilder sb)
+    {
+        // 18-Feb-2009, tatu: initially there was a linefeed between
+        //    message and path reference; but unfortunately many systems
+        //   (loggers, junit) seem to assume linefeeds are only added to
+        //   separate stack trace.
+        sb.append(" (through reference chain: ");
+        sb = getPathReference(sb);
+        sb.append(')');
+        return sb;
+    }
+
     protected void _appendPathDesc(StringBuilder sb)
     {
         if (_path == null) {

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

@@ -6,7 +6,6 @@
 import java.util.*;
 
 import com.fasterxml.jackson.core.*;
-
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeType;
 import com.fasterxml.jackson.databind.node.MissingNode;

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

@@ -5,7 +5,6 @@
 import java.util.Set;
 
 import com.fasterxml.jackson.core.*;
-
 import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitable;
 import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
 import com.fasterxml.jackson.databind.jsontype.TypeSerializer;

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

@@ -1,5 +1,6 @@
 package com.fasterxml.jackson.databind;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.cfg.ConfigFeature;
 
@@ -280,6 +281,16 @@ public enum MapperFeature implements ConfigFeature
      */
     OVERRIDE_PUBLIC_ACCESS_MODIFIERS(true),
 
+    /**
+     * Feature that inverse logic in {@link JsonProperty#access}
+     * for <code>READ_ONLY</code> and <code>WRITE_ONLY</code>.
+     *<p>
+     * Feature is disabled by default.
+     *
+     * @since 2.19
+     */
+    INVERSE_READ_WRITE_ACCESS(false),
+
     /*
     /******************************************************
     /* Type-handling features

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

@@ -1,6 +1,7 @@
 package com.fasterxml.jackson.databind;
 
 import java.util.Collection;
+import java.util.Collections;
 
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.databind.cfg.MutableConfigOverride;
@@ -15,7 +16,6 @@
 import com.fasterxml.jackson.databind.ser.Serializers;
 import com.fasterxml.jackson.databind.type.TypeFactory;
 import com.fasterxml.jackson.databind.type.TypeModifier;
-import java.util.Collections;
 
 /**
  * Simple interface for extensions that can be registered with {@link ObjectMapper}

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

@@ -12,6 +12,7 @@
 import java.util.function.Consumer;
 
 import com.fasterxml.jackson.annotation.*;
+
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.exc.StreamReadException;
 import com.fasterxml.jackson.core.exc.StreamWriteException;

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

@@ -13,7 +13,6 @@
 import com.fasterxml.jackson.core.filter.TokenFilter.Inclusion;
 import com.fasterxml.jackson.core.type.ResolvedType;
 import com.fasterxml.jackson.core.type.TypeReference;
-
 import com.fasterxml.jackson.databind.cfg.ContextAttributes;
 import com.fasterxml.jackson.databind.cfg.DatatypeFeature;
 import com.fasterxml.jackson.databind.deser.DataFormatReaders;

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

@@ -1,6 +1,7 @@
 package com.fasterxml.jackson.databind;
 
 import com.fasterxml.jackson.annotation.Nulls;
+
 import com.fasterxml.jackson.databind.introspect.AnnotatedMember;
 
 /**

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

@@ -1,13 +1,13 @@
 package com.fasterxml.jackson.databind;
 
+import java.util.Objects;
+
 import com.fasterxml.jackson.core.SerializableString;
 import com.fasterxml.jackson.core.io.SerializedString;
 import com.fasterxml.jackson.core.util.InternCache;
 import com.fasterxml.jackson.databind.cfg.MapperConfig;
 import com.fasterxml.jackson.databind.util.ClassUtil;
 
-import java.util.Objects;
-
 /**
  * Simple value class used for containing names of properties as defined
  * by annotations (and possibly other configuration sources).

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

@@ -1,12 +1,12 @@
 package com.fasterxml.jackson.databind;
 
+import java.util.logging.Logger;
+
 import com.fasterxml.jackson.databind.cfg.MapperConfig;
 import com.fasterxml.jackson.databind.introspect.AnnotatedField;
 import com.fasterxml.jackson.databind.introspect.AnnotatedMethod;
 import com.fasterxml.jackson.databind.introspect.AnnotatedParameter;
 
-import java.util.logging.Logger;
-
 /**
  * Class that defines how names of JSON properties ("external names")
  * are derived from names of POJO methods and fields ("internal names"),

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

@@ -8,7 +8,6 @@
 import com.fasterxml.jackson.core.json.JsonWriteFeature;
 import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
 import com.fasterxml.jackson.core.util.Instantiatable;
-
 import com.fasterxml.jackson.databind.cfg.*;
 import com.fasterxml.jackson.databind.introspect.SimpleMixInResolver;
 import com.fasterxml.jackson.databind.jsontype.SubtypeResolver;

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

@@ -9,6 +9,7 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.ObjectIdGenerator;
+
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.ObjectCodec;
 import com.fasterxml.jackson.databind.cfg.ContextAttributes;

src/main/java/com/fasterxml/jackson/databind/annotation/EnumNaming.java

@@ -1,12 +1,12 @@
 package com.fasterxml.jackson.databind.annotation;
 
-import com.fasterxml.jackson.databind.EnumNamingStrategy;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import com.fasterxml.jackson.databind.EnumNamingStrategy;
+
 /**
  * Annotation that can be used to indicate a {@link EnumNamingStrategy}
  * to use for annotated class.

src/main/java/com/fasterxml/jackson/databind/annotation/JsonAppend.java

@@ -6,6 +6,7 @@
 import java.lang.annotation.Target;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+
 import com.fasterxml.jackson.databind.ser.VirtualBeanPropertyWriter;
 
 /**

src/main/java/com/fasterxml/jackson/databind/annotation/JsonTypeIdResolver.java

@@ -5,8 +5,8 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-
 import com.fasterxml.jackson.annotation.JacksonAnnotation;
+
 import com.fasterxml.jackson.databind.jsontype.TypeIdResolver;
 
 /**

src/main/java/com/fasterxml/jackson/databind/cfg/BaseSettings.java

@@ -5,7 +5,6 @@
 import java.util.TimeZone;
 
 import com.fasterxml.jackson.core.Base64Variant;
-
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.introspect.AccessorNamingStrategy;
 import com.fasterxml.jackson.databind.introspect.AnnotationIntrospectorPair;

src/main/java/com/fasterxml/jackson/databind/cfg/ConfigOverrides.java

@@ -5,6 +5,7 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonSetter;
+
 import com.fasterxml.jackson.databind.introspect.VisibilityChecker;
 
 /**

src/main/java/com/fasterxml/jackson/databind/cfg/HandlerInstantiator.java

@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.ObjectIdGenerator;
 import com.fasterxml.jackson.annotation.ObjectIdResolver;
+
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.deser.ValueInstantiator;
 import com.fasterxml.jackson.databind.introspect.Annotated;

src/main/java/com/fasterxml/jackson/databind/cfg/MapperBuilder.java

@@ -11,6 +11,7 @@
 import com.fasterxml.jackson.annotation.JsonSetter;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
+
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.ObjectMapper.DefaultTyping;

src/main/java/com/fasterxml/jackson/databind/cfg/MapperConfig.java

@@ -10,7 +10,6 @@
 import com.fasterxml.jackson.core.SerializableString;
 import com.fasterxml.jackson.core.io.SerializedString;
 import com.fasterxml.jackson.core.type.TypeReference;
-
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.introspect.AccessorNamingStrategy;
 import com.fasterxml.jackson.databind.introspect.Annotated;

src/main/java/com/fasterxml/jackson/databind/cfg/MapperConfigBase.java

@@ -5,13 +5,13 @@
 
 import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
-import com.fasterxml.jackson.core.Base64Variant;
 
+import com.fasterxml.jackson.core.Base64Variant;
 import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.introspect.ClassIntrospector;
-import com.fasterxml.jackson.databind.introspect.ClassIntrospector.MixInResolver;
 import com.fasterxml.jackson.databind.introspect.AccessorNamingStrategy;
 import com.fasterxml.jackson.databind.introspect.AnnotatedClass;
+import com.fasterxml.jackson.databind.introspect.ClassIntrospector;
+import com.fasterxml.jackson.databind.introspect.ClassIntrospector.MixInResolver;
 import com.fasterxml.jackson.databind.introspect.SimpleMixInResolver;
 import com.fasterxml.jackson.databind.introspect.VisibilityChecker;
 import com.fasterxml.jackson.databind.jsontype.SubtypeResolver;

src/main/java/com/fasterxml/jackson/databind/cfg/MutableCoercionConfig.java

@@ -1,10 +1,10 @@
 package com.fasterxml.jackson.databind.cfg;
 
+import java.util.function.Consumer;
+
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.databind.type.LogicalType;
 
-import java.util.function.Consumer;
-
 /**
  * Mutable version of {@link CoercionConfig} (or rather, extended API)
  * exposed during configuration phase of {@link com.fasterxml.jackson.databind.ObjectMapper}