Skip to content

Commit 4be5bf4

Browse files
committed
Revert "try to fix test"
This reverts commit 1001f25.
1 parent 1001f25 commit 4be5bf4

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -437,17 +437,17 @@ protected void collectAll()
437437
LinkedHashMap<String, POJOPropertyBuilder> props = new LinkedHashMap<String, POJOPropertyBuilder>();
438438

439439
// First: gather basic data
440-
final boolean isRecord = isRecordType();
440+
441441
// 15-Jan-2023, tatu: [databind#3736] Let's avoid detecting fields of Records
442442
// altogether (unless we find a good reason to detect them)
443443
// 17-Apr-2023: Need Records' fields for serialization for cases like [databind#3895] & [databind#3628]
444-
if (!isRecord || _forSerialization) {
444+
if (!isRecordType() || _forSerialization) {
445445
_addFields(props); // note: populates _fieldRenameMappings
446446
}
447447
_addMethods(props);
448448
// 25-Jan-2016, tatu: Avoid introspecting (constructor-)creators for non-static
449449
// inner classes, see [databind#1502]
450-
if (!_classDef.isNonStaticInnerClass() && !isRecord) {
450+
if (!_classDef.isNonStaticInnerClass()) {
451451
_addCreators(props);
452452
}
453453

src/test-jdk14/java/com/fasterxml/jackson/databind/records/RecordSerializationOrderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public void testSerializationOrderWithJsonProperty() throws Exception {
3232
NestedRecordOneWithJsonProperty nestedRecordOne =
3333
new NestedRecordOneWithJsonProperty("1", "[email protected]", nestedRecordTwo);
3434
final String output = MAPPER.writeValueAsString(nestedRecordOne);
35-
final String expected = "{\"id\":\"1\",\"email\":\"[email protected]\",\"nestedProperty\":{\"id\":\"2\",\"passport\":\"111110\"}}";
35+
final String expected = "{\"id\":\"1\",\"email\":\"[email protected]\",\"nestedRecordTwo\":{\"id\":\"2\",\"passport\":\"111110\"}}";
3636
assertEquals(expected, output);
3737
}
3838
}

0 commit comments

Comments
 (0)