Merge branch '2.18' into 2.19

FasterXML · Nov 5, 2024 · d77c6c6 · d77c6c6
2 parents ba20fc2 + 44c5656
commit d77c6c6
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 1 deletion.
diff --git a/jr-objects/src/main/java/com/fasterxml/jackson/jr/ob/impl/RecordsHelpers.java b/jr-objects/src/main/java/com/fasterxml/jackson/jr/ob/impl/RecordsHelpers.java
@@ -1,9 +1,12 @@
 package com.fasterxml.jackson.jr.ob.impl;
 
 import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import com.fasterxml.jackson.jr.ob.impl.POJODefinition.PropBuilder;
 
@@ -80,6 +83,12 @@ static boolean isRecordType(Class<?> cls) {
         return (parent != null) && "java.lang.Record".equals(parent.getName());
     }
 
+    static List<String> recordPropertyNames(Class<?> cls) {
+        // Let's base this on public fields
+        return Arrays.asList(cls.getDeclaredFields()).stream().map(Field::getName)
+                .collect(Collectors.toList());
+    }
+
     private static Class<?>[] componentTypes(Class<?> recordType)
         throws ReflectiveOperationException
     {

diff --git a/jr-objects/src/main/java/com/fasterxml/jackson/jr/ob/impl/ValueReaderLocator.java b/jr-objects/src/main/java/com/fasterxml/jackson/jr/ob/impl/ValueReaderLocator.java
@@ -456,6 +456,8 @@ protected BeanReader _resolveBeanForDeser(Class<?> raw, POJODefinition beanDef)
         if (len == 0) {
             propMap = Collections.emptyMap();
         } else {
+            Set<String> recordProps = isRecord
+                    ? new HashSet<>(RecordsHelpers.recordPropertyNames(raw)) : null;
             propMap = caseInsensitive
                     ? new TreeMap<>(String.CASE_INSENSITIVE_ORDER)
                     // 13-May-2021, tatu: Let's retain ordering here:
@@ -475,6 +477,11 @@ protected BeanReader _resolveBeanForDeser(Class<?> raw, POJODefinition beanDef)
                     }
                 }
                 if (isRecord) {
+                    // Records can only deserialize propreties that are declared in the record;
+                    // other virtual properties (getter methods) need to be ignored
+                    if (!recordProps.contains(rawProp.name)) {
+                        continue;
+                    }
                     try {
                         field = raw.getDeclaredField(rawProp.name);
                     } catch (NoSuchFieldException e) {

diff --git a/...7/java/jr/failing/RecordDeser172Test.java → ...est-jdk17/java/jr/RecordDeser172Test.java b/...7/java/jr/failing/RecordDeser172Test.java → ...est-jdk17/java/jr/RecordDeser172Test.java
@@ -1,4 +1,4 @@
-package jr.failing;
+package jr;
 
 import java.time.Instant;
 import java.time.ZoneId;

diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -16,6 +16,11 @@ Modules:
 #171: Add a `JSON.Feature.WRITE_RECORD_FIELDS_IN_DECLARATION_ORDER` for
   retaining Serialization order of Java Records (instead of alphabetic)
 
+2.18.2 (not yet released)
+
+#172: Record deserialisation with instance methods fails
+ (reported by Giovanni V-d-S)
+
 2.18.1 (28-Oct-2024)
 
 #167: Deserialization of record fails on constructor parameter ordering