Skip to content

Migrate legacy reflection properties to use MethodHandles, take 2 #5090

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 22 commits into from
May 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
f04fb75
Migrate legacy reflection properties to use MethodHandles, attempt #2
stevenschlansker Mar 20, 2019
3d7f064
Merge branch '3.x' into methodhandle-hacking
cowtowncoder Apr 12, 2025
a850b8f
Merge branch '3.x' into methodhandle-hacking
cowtowncoder Apr 12, 2025
5c293b7
Merge branch '3.x' into methodhandle-hacking
cowtowncoder Apr 14, 2025
a47d8d5
Merge branch '3.x' into methodhandle-hacking
cowtowncoder Apr 15, 2025
4bf7a68
Merge branch '3.x' into methodhandle-hacking
cowtowncoder Apr 16, 2025
7bf2c86
Merge branch '3.x' into methodhandle-hacking
cowtowncoder Apr 26, 2025
a9bc8db
Merge branch '3.x' into methodhandle-hacking
cowtowncoder Apr 28, 2025
4f3a1bc
Merge branch '3.x' into methodhandle-hacking
cowtowncoder Apr 28, 2025
ab1134e
Merge branch '3.x' into methodhandle-hacking
cowtowncoder Apr 29, 2025
8de5ca7
Merge branch '3.x' into methodhandle-hacking
cowtowncoder Apr 30, 2025
a214c96
Merge branch '3.x' into methodhandle-hacking
cowtowncoder May 2, 2025
60f9e1c
Merge branch '3.x' into methodhandle-hacking
cowtowncoder May 3, 2025
91b0636
Merge branch '3.x' into methodhandle-hacking
cowtowncoder May 6, 2025
b889483
Merge branch '3.x' into methodhandle-hacking
cowtowncoder May 6, 2025
25bf4e0
Minor tweak, added a comment
cowtowncoder May 6, 2025
a181528
Merge branch '3.x' into methodhandle-hacking
cowtowncoder May 6, 2025
07dece9
Merge branch '3.x' into methodhandle-hacking
cowtowncoder May 7, 2025
d6c7bba
Merge branch '3.x' into methodhandle-hacking
cowtowncoder May 7, 2025
c79e00c
Merge branch '3.x' into methodhandle-hacking
cowtowncoder May 8, 2025
d9775c9
Merge branch '3.x' into methodhandle-hacking
cowtowncoder May 8, 2025
ed4a250
UnreflectHandleSupplier: drop serializable
stevenschlansker May 9, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package tools.jackson.databind.deser;

import java.lang.reflect.Modifier;
import java.util.*;

import com.fasterxml.jackson.annotation.*;
Expand Down Expand Up @@ -938,19 +939,16 @@ protected SettableBeanProperty constructSettableProperty(DeserializationContext
JavaType type = resolveMemberAndTypeAnnotations(ctxt, mutator, propType0);
// Does the Method specify the deserializer to use? If so, let's use it.
TypeDeserializer typeDeser = (TypeDeserializer) type.getTypeHandler();
SettableBeanProperty prop;
if (mutator instanceof AnnotatedMethod) {
prop = new MethodProperty(propDef, type, typeDeser,
beanDescRef.getClassAnnotations(), (AnnotatedMethod) mutator);
} else {
// 08-Sep-2016, tatu: wonder if we should verify it is `AnnotatedField` to be safe?
prop = new FieldProperty(propDef, type, typeDeser,
beanDescRef.getClassAnnotations(), (AnnotatedField) mutator);
// 05-May-2025, tatu: [databind#5090]/[databind#2083] Need to skip these for some reason
if (isFinalField(mutator)) {
return null;
}
ValueDeserializer<?> deser = findDeserializerFromAnnotation(ctxt, mutator);
if (deser == null) {
deser = (ValueDeserializer<?>) type.getValueHandler();
}
SettableBeanProperty prop = new MethodProperty(propDef, type, typeDeser,
beanDescRef.getClassAnnotations(), mutator);
if (deser != null) {
deser = ctxt.handlePrimaryContextualization(deser, prop, type);
prop = prop.withValueDeserializer(deser);
Expand All @@ -967,6 +965,11 @@ protected SettableBeanProperty constructSettableProperty(DeserializationContext
return prop;
}

private boolean isFinalField(AnnotatedMember am) {
return am instanceof AnnotatedField
&& Modifier.isFinal(am.getMember().getModifiers());
}

/**
* Method that will construct a regular bean property setter using
* the given setter method.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,7 @@ protected void _throwAsJacksonE(JsonParser p, Throwable e, Object value)

protected void _throwAsJacksonE(JsonParser p, Throwable e) throws JacksonException
{
ClassUtil.throwIfError(e);
ClassUtil.throwIfRTE(e);
ClassUtil.throwIfJacksonE(e);

Expand Down
213 changes: 0 additions & 213 deletions src/main/java/tools/jackson/databind/deser/impl/FieldProperty.java

This file was deleted.

Loading