Skip to content

Commit d7cab65

Browse files
committed
Merge branch '2.19'
2 parents c5350fe + 13e3130 commit d7cab65

File tree

3 files changed

+20
-13
lines changed

3 files changed

+20
-13
lines changed

.github/workflows/cifuzz.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
dry-run: false
3131
language: jvm
3232
- name: Upload Crash
33-
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
33+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
3434
if: failure() && steps.build.outcome == 'success'
3535
with:
3636
name: artifacts

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ jobs:
2727

2828
# Initializes the CodeQL tools for scanning.
2929
- name: Initialize CodeQL
30-
uses: github/codeql-action/init@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
30+
uses: github/codeql-action/init@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
3131
with:
3232
languages: ${{ matrix.language }}
3333

3434
- name: Autobuild
35-
uses: github/codeql-action/autobuild@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
35+
uses: github/codeql-action/autobuild@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
3636

3737
- name: Perform CodeQL Analysis
38-
uses: github/codeql-action/analyze@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
38+
uses: github/codeql-action/analyze@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13

src/test/java/tools/jackson/databind/records/RecordWithReadOnlyTest.java

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ record RecordWithReadOnly(int id, @JsonProperty(access = Access.READ_ONLY) Strin
1717
}
1818

1919
record RecordWithReadOnlyNamedProperty(int id,
20-
@JsonProperty(value = "name", access = Access.READ_ONLY) String name) {
20+
@JsonProperty(value = "name", access = Access.READ_ONLY) String name) {
2121
}
2222

2323
record RecordWithReadOnlyAccessor(int id, String name) {
@@ -29,8 +29,9 @@ public String name() {
2929
}
3030
}
3131

32-
record RecordWithReadOnlyComponentOverriddenAccessor(int id, @JsonProperty(access = Access.READ_ONLY) String name) {
33-
32+
record RecordWithReadOnlyComponentOverriddenAccessor(int id,
33+
@JsonProperty(access = Access.READ_ONLY) String name)
34+
{
3435
// @JsonProperty on overridden method is not automatically inherited by overriding method
3536
@Override
3637
public String name() {
@@ -88,12 +89,14 @@ public void testSerializeReadOnlyNamedProperty() throws Exception {
8889
}
8990

9091
/**
91-
* Currently documents a bug where a property was NOT ignored during deserialization if given an explicit name.
92+
* Currently documents a bug where a property was NOT ignored during deserialization
93+
* if given an explicit name.
9294
* Also reproducible in 2.14.x.
9395
*/
9496
@Test
9597
public void testDeserializeReadOnlyNamedProperty() throws Exception {
96-
RecordWithReadOnlyNamedProperty value = MAPPER.readValue(a2q("{'id':123,'name':'Bob'}"), RecordWithReadOnlyNamedProperty.class);
98+
RecordWithReadOnlyNamedProperty value = MAPPER.readValue(a2q("{'id':123,'name':'Bob'}"),
99+
RecordWithReadOnlyNamedProperty.class);
97100
assertEquals(new RecordWithReadOnlyNamedProperty(123, "Bob"), value); // BUG: should be `null` instead of "Bob"
98101
}
99102

@@ -120,7 +123,8 @@ public void testDeserializeReadOnlyAccessor() throws Exception {
120123

121124
/*
122125
/**********************************************************************
123-
/* Test methods, JsonProperty.access=READ_ONLY component, but accessor method was overridden without re-annotating with JsonProperty.access=READ_ONLY
126+
/* Test methods, JsonProperty.access=READ_ONLY component, but accessor
127+
* method was overridden without re-annotating with JsonProperty.access=READ_ONLY
124128
/**********************************************************************
125129
*/
126130

@@ -153,7 +157,8 @@ public void testSerializeReadOnlyPrimitiveTypeProperty() throws Exception {
153157

154158
@Test
155159
public void testDeserializeReadOnlyPrimitiveTypeProperty() throws Exception {
156-
RecordWithReadOnlyPrimitiveType value = MAPPER.readValue(a2q("{'id':123,'name':'Bob'}"), RecordWithReadOnlyPrimitiveType.class);
160+
RecordWithReadOnlyPrimitiveType value = MAPPER.readValue(a2q("{'id':123,'name':'Bob'}"),
161+
RecordWithReadOnlyPrimitiveType.class);
157162
assertEquals(new RecordWithReadOnlyPrimitiveType(0, "Bob"), value);
158163
}
159164

@@ -171,7 +176,8 @@ public void testSerializeReadOnlyAllProperties() throws Exception {
171176

172177
@Test
173178
public void testDeserializeReadOnlyAllProperties() throws Exception {
174-
RecordWithReadOnlyAll value = MAPPER.readValue(a2q("{'id':123,'name':'Bob'}"), RecordWithReadOnlyAll.class);
179+
RecordWithReadOnlyAll value = MAPPER.readValue(a2q("{'id':123,'name':'Bob'}"),
180+
RecordWithReadOnlyAll.class);
175181
assertEquals(new RecordWithReadOnlyAll(0, null), value);
176182
}
177183

@@ -183,7 +189,8 @@ public void testSerializeReadOnlyAllProperties_WithNoArgConstructor() throws Exc
183189

184190
@Test
185191
public void testDeserializeReadOnlyAllProperties_WithNoArgConstructor() throws Exception {
186-
RecordWithReadOnlyAllAndNoArgConstructor value = MAPPER.readValue(a2q("{'id':123,'name':'Bob'}"), RecordWithReadOnlyAllAndNoArgConstructor.class);
192+
RecordWithReadOnlyAllAndNoArgConstructor value = MAPPER.readValue(a2q("{'id':123,'name':'Bob'}"),
193+
RecordWithReadOnlyAllAndNoArgConstructor.class);
187194
assertEquals(new RecordWithReadOnlyAllAndNoArgConstructor(0, null), value);
188195
}
189196
}

0 commit comments

Comments
 (0)