Polish Formatting

Issue gh-10799

Author: jzheaux

saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/core/TestSaml2X509Credentials.java

@@ -64,7 +64,8 @@ public static Saml2X509Credential relyingPartyDecryptingCredential() {
 	}
 
 	public static Saml2X509Credential altPublicCredential() {
-		return new Saml2X509Credential(altCertificate(), Saml2X509CredentialType.VERIFICATION, Saml2X509CredentialType.ENCRYPTION);
+		return new Saml2X509Credential(altCertificate(), Saml2X509CredentialType.VERIFICATION,
+				Saml2X509CredentialType.ENCRYPTION);
 	}
 
 	public static Saml2X509Credential altPrivateCredential() {
@@ -185,7 +186,7 @@ private static PrivateKey spPrivateKey() {
 
 	private static X509Certificate altCertificate() {
 		return certificate(
-				"-----BEGIN CERTIFICATE-----\n"	+ "MIICkDCCAfkCFEstVfmWSFQp/j88GaMUwqVK72adMA0GCSqGSIb3DQEBCwUAMIGG\n"
+				"-----BEGIN CERTIFICATE-----\n" + "MIICkDCCAfkCFEstVfmWSFQp/j88GaMUwqVK72adMA0GCSqGSIb3DQEBCwUAMIGG\n"
 						+ "MQswCQYDVQQGEwJVUzETMBEGA1UECAwKV2FzaGluZ3RvbjESMBAGA1UEBwwJVmFu\n"
 						+ "Y291dmVyMR0wGwYDVQQKDBRTcHJpbmcgU2VjdXJpdHkgU0FNTDEMMAoGA1UECwwD\n"
 						+ "YWx0MSEwHwYDVQQDDBhhbHQuc3ByaW5nLnNlY3VyaXR5LnNhbWwwHhcNMjIwMjEw\n"
@@ -203,7 +204,7 @@ private static X509Certificate altCertificate() {
 
 	private static PrivateKey altPrivateKey() {
 		return privateKey(
-				"-----BEGIN PRIVATE KEY-----\n"	+ "MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAL1kZaNM8OzKZAIk\n"
+				"-----BEGIN PRIVATE KEY-----\n" + "MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAL1kZaNM8OzKZAIk\n"
 						+ "vTjinLjEuwEj9L1G/M15H2gP+0fKjEIT5hnON/Q/IG3CorOQpaoI9/hcZRgd8SmQ\n"
 						+ "zmQljAJbxOw7Hl+fAshDB6I+qNisGv87QiMcypgb0eVH+uizuIG3hpsQZS78H3Ji\n"
 						+ "DVhFg/EpDpM0/cAP720FPxOwUXKPAgMBAAECgYEApYKslAZ0cer5dSoYNzNLFOnQ\n"
@@ -215,8 +216,8 @@ private static PrivateKey altPrivateKey() {
 						+ "DHV1LwJAW4xaV37Eo4z9B7Kr4Hzd1MA1ueW5QQDt+Q4vN/r7z4/1FHyFzh0Xcucd\n"
 						+ "7nZX7qj0CkmgzOVG+Rb0P5LOxJA7gQJBAK1KQ2qNct375qPM9bEGSVGchH6k5X7+\n"
 						+ "q4ztHdpFgTb/EzdbZiTG935GpjC1rwJuinTnrHOnkwv4j7iDRm24GF8CQQDqPvrQ\n"
-						+ "GcItR6UUy0q/B8UxLzlE6t+HiznfiJKfyGgCHU56Y4/ZhzSQz2MZHz9SK4DsUL9s\n"
-						+ "bOYrWq8VY2fyjV1t\n" + "-----END PRIVATE KEY-----");
+						+ "GcItR6UUy0q/B8UxLzlE6t+HiznfiJKfyGgCHU56Y4/ZhzSQz2MZHz9SK4DsUL9s\n" + "bOYrWq8VY2fyjV1t\n"
+						+ "-----END PRIVATE KEY-----");
 	}
 
 }

saml2/saml2-service-provider/src/test/java/org/springframework/security/saml2/provider/service/registration/RelyingPartyRegistrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -82,9 +82,9 @@ public void buildWhenUsingDefaultsThenAssertionConsumerServiceBindingDefaultsToP
 		RelyingPartyRegistration relyingPartyRegistration = RelyingPartyRegistration.withRegistrationId("id")
 				.entityId("entity-id").assertionConsumerServiceLocation("location")
 				.assertingPartyDetails((assertingParty) -> assertingParty.entityId("entity-id")
-						.singleSignOnServiceLocation("location")
-						.verificationX509Credentials((c) -> c.add(TestSaml2X509Credentials.relyingPartyVerifyingCredential()))
-				).build();
+						.singleSignOnServiceLocation("location").verificationX509Credentials(
+								(c) -> c.add(TestSaml2X509Credentials.relyingPartyVerifyingCredential())))
+				.build();
 		assertThat(relyingPartyRegistration.getAssertionConsumerServiceBinding()).isEqualTo(Saml2MessageBinding.POST);
 	}
 
@@ -99,36 +99,51 @@ public void buildPreservesCredentialsOrder() {
 
 		// Test with the alt credentials first
 		RelyingPartyRegistration relyingPartyRegistration = TestRelyingPartyRegistrations.noCredentials()
-				.assertingPartyDetails((assertingParty) -> assertingParty
-						.verificationX509Credentials((c) -> { c.add(altApCredential); c.add(verifyingCredential); })
-						.encryptionX509Credentials((c) -> { c.add(altApCredential); c.add(encryptingCredential); }))
-				.signingX509Credentials(c -> { c.add(altRpCredential); c.add(signingCredential); })
-				.decryptionX509Credentials(c -> { c.add(altRpCredential); c.add(decryptionCredential); })
-				.build();
-		assertThat(relyingPartyRegistration.getSigningX509Credentials())
-				.containsExactly(altRpCredential, signingCredential);
-		assertThat(relyingPartyRegistration.getDecryptionX509Credentials())
-				.containsExactly(altRpCredential, decryptionCredential);
+				.assertingPartyDetails((assertingParty) -> assertingParty.verificationX509Credentials((c) -> {
+					c.add(altApCredential);
+					c.add(verifyingCredential);
+				}).encryptionX509Credentials((c) -> {
+					c.add(altApCredential);
+					c.add(encryptingCredential);
+				})).signingX509Credentials((c) -> {
+					c.add(altRpCredential);
+					c.add(signingCredential);
+				}).decryptionX509Credentials((c) -> {
+					c.add(altRpCredential);
+					c.add(decryptionCredential);
+				}).build();
+		assertThat(relyingPartyRegistration.getSigningX509Credentials()).containsExactly(altRpCredential,
+				signingCredential);
+		assertThat(relyingPartyRegistration.getDecryptionX509Credentials()).containsExactly(altRpCredential,
+				decryptionCredential);
 		assertThat(relyingPartyRegistration.getAssertingPartyDetails().getVerificationX509Credentials())
 				.containsExactly(altApCredential, verifyingCredential);
 		assertThat(relyingPartyRegistration.getAssertingPartyDetails().getEncryptionX509Credentials())
 				.containsExactly(altApCredential, encryptingCredential);
 
 		// Test with the alt credentials last
 		relyingPartyRegistration = TestRelyingPartyRegistrations.noCredentials()
-				.assertingPartyDetails((assertingParty) -> assertingParty
-						.verificationX509Credentials((c) -> { c.add(verifyingCredential); c.add(altApCredential); })
-						.encryptionX509Credentials((c) -> { c.add(encryptingCredential); c.add(altApCredential); }))
-				.signingX509Credentials(c -> { c.add(signingCredential); c.add(altRpCredential); })
-				.decryptionX509Credentials(c -> { c.add(decryptionCredential); c.add(altRpCredential); })
-				.build();
-		assertThat(relyingPartyRegistration.getSigningX509Credentials())
-				.containsExactly(signingCredential, altRpCredential);
-		assertThat(relyingPartyRegistration.getDecryptionX509Credentials())
-				.containsExactly(decryptionCredential, altRpCredential);
+				.assertingPartyDetails((assertingParty) -> assertingParty.verificationX509Credentials((c) -> {
+					c.add(verifyingCredential);
+					c.add(altApCredential);
+				}).encryptionX509Credentials((c) -> {
+					c.add(encryptingCredential);
+					c.add(altApCredential);
+				})).signingX509Credentials((c) -> {
+					c.add(signingCredential);
+					c.add(altRpCredential);
+				}).decryptionX509Credentials((c) -> {
+					c.add(decryptionCredential);
+					c.add(altRpCredential);
+				}).build();
+		assertThat(relyingPartyRegistration.getSigningX509Credentials()).containsExactly(signingCredential,
+				altRpCredential);
+		assertThat(relyingPartyRegistration.getDecryptionX509Credentials()).containsExactly(decryptionCredential,
+				altRpCredential);
 		assertThat(relyingPartyRegistration.getAssertingPartyDetails().getVerificationX509Credentials())
 				.containsExactly(verifyingCredential, altApCredential);
 		assertThat(relyingPartyRegistration.getAssertingPartyDetails().getEncryptionX509Credentials())
 				.containsExactly(encryptingCredential, altApCredential);
 	}
+
 }