From 701736da5d0da6364ae9beaf7d3af2beef178142 Mon Sep 17 00:00:00 2001 From: Robert Winch <362503+rwinch@users.noreply.github.com> Date: Mon, 23 Feb 2026 15:10:11 -0600 Subject: [PATCH] Fix checkstyle Issue gh-18354 Signed-off-by: Robert Winch <362503+rwinch@users.noreply.github.com> --- .../security/SerializationSamples.java | 71 +++++++++++++------ 1 file changed, 50 insertions(+), 21 deletions(-) diff --git a/config/src/test/java/org/springframework/security/SerializationSamples.java b/config/src/test/java/org/springframework/security/SerializationSamples.java index 4974eb3985..d98ea76d3e 100644 --- a/config/src/test/java/org/springframework/security/SerializationSamples.java +++ b/config/src/test/java/org/springframework/security/SerializationSamples.java @@ -246,7 +246,37 @@ import org.springframework.security.web.savedrequest.SimpleSavedRequest; import org.springframework.security.web.server.firewall.ServerExchangeRejectedException; import org.springframework.security.web.session.HttpSessionCreatedEvent; import org.springframework.security.web.session.HttpSessionIdChangedEvent; -import org.springframework.security.web.webauthn.api.*; +import org.springframework.security.web.webauthn.api.AttestationConveyancePreference; +import org.springframework.security.web.webauthn.api.AuthenticationExtensionsClientInputs; +import org.springframework.security.web.webauthn.api.AuthenticationExtensionsClientOutputs; +import org.springframework.security.web.webauthn.api.AuthenticatorAssertionResponse; +import org.springframework.security.web.webauthn.api.AuthenticatorAttachment; +import org.springframework.security.web.webauthn.api.AuthenticatorSelectionCriteria; +import org.springframework.security.web.webauthn.api.AuthenticatorTransport; +import org.springframework.security.web.webauthn.api.Bytes; +import org.springframework.security.web.webauthn.api.COSEAlgorithmIdentifier; +import org.springframework.security.web.webauthn.api.CredProtectAuthenticationExtensionsClientInput; +import org.springframework.security.web.webauthn.api.CredentialPropertiesOutput; +import org.springframework.security.web.webauthn.api.ImmutableAuthenticationExtensionsClientInput; +import org.springframework.security.web.webauthn.api.ImmutableAuthenticationExtensionsClientInputs; +import org.springframework.security.web.webauthn.api.ImmutableAuthenticationExtensionsClientOutputs; +import org.springframework.security.web.webauthn.api.ImmutablePublicKeyCredentialUserEntity; +import org.springframework.security.web.webauthn.api.PublicKeyCredential; +import org.springframework.security.web.webauthn.api.PublicKeyCredentialCreationOptions; +import org.springframework.security.web.webauthn.api.PublicKeyCredentialDescriptor; +import org.springframework.security.web.webauthn.api.PublicKeyCredentialParameters; +import org.springframework.security.web.webauthn.api.PublicKeyCredentialRequestOptions; +import org.springframework.security.web.webauthn.api.PublicKeyCredentialRpEntity; +import org.springframework.security.web.webauthn.api.PublicKeyCredentialType; +import org.springframework.security.web.webauthn.api.PublicKeyCredentialUserEntity; +import org.springframework.security.web.webauthn.api.ResidentKeyRequirement; +import org.springframework.security.web.webauthn.api.TestAuthenticationAssertionResponses; +import org.springframework.security.web.webauthn.api.TestBytes; +import org.springframework.security.web.webauthn.api.TestPublicKeyCredentialCreationOptions; +import org.springframework.security.web.webauthn.api.TestPublicKeyCredentialRequestOptions; +import org.springframework.security.web.webauthn.api.TestPublicKeyCredentialUserEntities; +import org.springframework.security.web.webauthn.api.TestPublicKeyCredentials; +import org.springframework.security.web.webauthn.api.UserVerificationRequirement; import org.springframework.security.web.webauthn.authentication.WebAuthnAuthentication; import org.springframework.security.web.webauthn.authentication.WebAuthnAuthenticationRequestToken; import org.springframework.security.web.webauthn.management.RelyingPartyAuthenticationRequest; @@ -862,33 +892,32 @@ final class SerializationSamples { AttestationConveyancePreference attestationConveyancePreference = AttestationConveyancePreference.DIRECT; ResidentKeyRequirement residentKeyRequirement = ResidentKeyRequirement.REQUIRED; AuthenticatorSelectionCriteria authenticatorSelectionCriteria = AuthenticatorSelectionCriteria.builder() - .authenticatorAttachment(AuthenticatorAttachment.PLATFORM) - .residentKey(residentKeyRequirement) - .userVerification(UserVerificationRequirement.REQUIRED) - .build(); + .authenticatorAttachment(AuthenticatorAttachment.PLATFORM) + .residentKey(residentKeyRequirement) + .userVerification(UserVerificationRequirement.REQUIRED) + .build(); PublicKeyCredentialParameters publicKeyCredentialParameters = PublicKeyCredentialParameters.RS256; - PublicKeyCredentialRpEntity publicKeyCredentialRpEntity = TestPublicKeyCredentialRpEntities.createRpEntity().build(); + PublicKeyCredentialRpEntity publicKeyCredentialRpEntity = TestPublicKeyCredentialRpEntities.createRpEntity() + .build(); generatorByClassName.put(AttestationConveyancePreference.class, (r) -> attestationConveyancePreference); generatorByClassName.put(ResidentKeyRequirement.class, (r) -> residentKeyRequirement); generatorByClassName.put(AuthenticatorSelectionCriteria.class, (r) -> authenticatorSelectionCriteria); - generatorByClassName.put(COSEAlgorithmIdentifier.class, (r -> COSEAlgorithmIdentifier.RS256)); + generatorByClassName.put(COSEAlgorithmIdentifier.class, ((r) -> COSEAlgorithmIdentifier.RS256)); generatorByClassName.put(PublicKeyCredentialParameters.class, (r) -> publicKeyCredentialParameters); generatorByClassName.put(PublicKeyCredentialRpEntity.class, (r) -> publicKeyCredentialRpEntity); - generatorByClassName.put(PublicKeyCredentialCreationOptions.class, (o) -> TestPublicKeyCredentialCreationOptions.createPublicKeyCredentialCreationOptions() - .extensions(inputs) - .attestation(attestationConveyancePreference) - .authenticatorSelection(authenticatorSelectionCriteria) - .challenge(TestBytes.get()) - .excludeCredentials(List.of(descriptor)) - .rp(publicKeyCredentialRpEntity) - .pubKeyCredParams(publicKeyCredentialParameters) - .timeout(Duration.ofMinutes(5)) - .user(TestPublicKeyCredentialUserEntities.userEntity() - .id(TestBytes.get()) - .build()) - .build() - ); + generatorByClassName.put(PublicKeyCredentialCreationOptions.class, + (o) -> TestPublicKeyCredentialCreationOptions.createPublicKeyCredentialCreationOptions() + .extensions(inputs) + .attestation(attestationConveyancePreference) + .authenticatorSelection(authenticatorSelectionCriteria) + .challenge(TestBytes.get()) + .excludeCredentials(List.of(descriptor)) + .rp(publicKeyCredentialRpEntity) + .pubKeyCredParams(publicKeyCredentialParameters) + .timeout(Duration.ofMinutes(5)) + .user(TestPublicKeyCredentialUserEntities.userEntity().id(TestBytes.get()).build()) + .build()); // One-Time Token DefaultOneTimeToken oneTimeToken = new DefaultOneTimeToken(UUID.randomUUID().toString(), "user",