Skip to content

Commit ecc9f50

Browse files
committed
Make Jackson option PROPAGATE_TRANSIENT_MARKER not needed
1 parent 618eb6b commit ecc9f50

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

NEWS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@ New features:
1414
* Updated README and JavaDoc to use the "passkey" term and provide more guidance
1515
around passkey use cases.
1616

17+
Fixes:
18+
19+
* Made Jackson setting `PROPAGATE_TRANSIENT_MARKER` unnecessary for JSON
20+
serialization with Jackson version 2.15.0-rc1 and later.
21+
1722

1823
== Version 2.4.1 ==
1924

webauthn-server-core/src/main/java/com/yubico/webauthn/data/AuthenticatorAttestationResponse.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,10 @@ public class AuthenticatorAttestationResponse implements AuthenticatorResponse {
8282
private final SortedSet<AuthenticatorTransport> transports;
8383

8484
/** The {@link #attestationObject} parsed as a domain object. */
85-
@NonNull @JsonIgnore private final transient AttestationObject attestation;
85+
@NonNull
86+
@JsonIgnore
87+
@Getter(onMethod = @__({@JsonIgnore}))
88+
private final transient AttestationObject attestation;
8689

8790
@NonNull
8891
@JsonIgnore

yubico-util/src/main/java/com/yubico/internal/util/JacksonCodecs.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import com.fasterxml.jackson.annotation.JsonInclude.Include;
44
import com.fasterxml.jackson.core.Base64Variants;
55
import com.fasterxml.jackson.databind.DeserializationFeature;
6-
import com.fasterxml.jackson.databind.MapperFeature;
76
import com.fasterxml.jackson.databind.ObjectMapper;
87
import com.fasterxml.jackson.databind.json.JsonMapper;
98
import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -22,7 +21,6 @@ public static ObjectMapper cbor() {
2221
public static ObjectMapper json() {
2322
return JsonMapper.builder()
2423
.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, true)
25-
.configure(MapperFeature.PROPAGATE_TRANSIENT_MARKER, true)
2624
.serializationInclusion(Include.NON_ABSENT)
2725
.defaultBase64Variant(Base64Variants.MODIFIED_FOR_URL)
2826
.addModule(new Jdk8Module())

0 commit comments

Comments
 (0)