Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Solve ordering issue of record constructor parameters #169

Closed
wants to merge 8 commits into from
Closed

Solve ordering issue of record constructor parameters #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c3fdd3b
Solve ordering issue of record constructor parameters
Giovds Oct 18, 2024
4d0d628
Move test to not be excluded in build
Giovds Oct 18, 2024
16c9ff0
Only loop over constructor parameters once
Giovds Oct 18, 2024
87a43d9
Use .isEmpty() for JDK8
Giovds Oct 18, 2024
0ef1a88
Merge branch '2.19' into issue-167-solve-ordering-problem-of-record-c…
cowtowncoder Oct 21, 2024
4b26814
Merge branch '2.19' into issue-167-solve-ordering-problem-of-record-c…
cowtowncoder Oct 21, 2024
883c566
Merge branch '2.19' into issue-167-solve-ordering-problem-of-record-c…
cowtowncoder Oct 21, 2024
a800ee0
Merge branch '2.19' into issue-167-solve-ordering-problem-of-record-c…
cowtowncoder Oct 22, 2024
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
20 changes: 18 additions & 2 deletions jr-objects/src/main/java/com/fasterxml/jackson/jr/ob/impl/ValueReaderLocator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,18 @@ protected BeanReader _resolveBeanForDeser(Class<?> raw, POJODefinition beanDef)
final Map<String, BeanPropertyReader> propMap;
Map<String, String> aliasMapping = null;

boolean isRecord = RecordsHelpers.isRecordType(raw);
final Map<String, Integer> ctorParameterIndexMap = new HashMap<>();
cowtowncoder marked this conversation as resolved.
Show resolved Hide resolved
final boolean isRecord = RecordsHelpers.isRecordType(raw);
if (isRecord) {
final Parameter[] parameters = constructors._recordCtor.getParameters();
for (int i = 0; i < parameters.length; i++) {
Parameter parameter = parameters[i];
if (!parameter.getName().isEmpty()) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why such check? Does this happen? Isn't it an error condition?

And specifically if this happens wouldn't it just lead to an NPE when looking up the index?

Copy link
Author

@Giovds Giovds Oct 21, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, I think this is an irrelevant check, as you can not create a (record) instance variable without a name... It would lead to a NPE in the look-up part. I'd say just remove the check, as you can not test this as you'd get a compile error? WDYT?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, sounds good. But as per my note above, might be this part of code can be removed altogether.

ctorParameterIndexMap.put(parameter.getName(), i);
}
}
}

if (len == 0) {
propMap = Collections.emptyMap();
} else {
Expand Down Expand Up @@ -496,7 +507,12 @@ protected BeanReader _resolveBeanForDeser(Class<?> raw, POJODefinition beanDef)
}
}

propMap.put(rawProp.name, new BeanPropertyReader(rawProp.name, field, setter, i));
if (isRecord) {
final Integer ctorIndex = ctorParameterIndexMap.get(rawProp.name);
propMap.put(rawProp.name, new BeanPropertyReader(rawProp.name, field, setter, ctorIndex));
} else {
propMap.put(rawProp.name, new BeanPropertyReader(rawProp.name, field, setter, i));
}

// 25-Jan-2020, tatu: Aliases are a bit different because we can not tie them into
// specific reader instance, due to resolution of cyclic dependencies. Instead,
Expand Down
2 changes: 1 addition & 1 deletion ...7/java/jr/failing/RecordDeser167Test.java → ...est-jdk17/java/jr/RecordDeser167Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package jr.failing;
package jr;

import com.fasterxml.jackson.jr.ob.JSON;

Expand Down