Merge branch '6.2.x' into 6.3.x

This commit is contained in:
Josh Cummings 2024-07-10 17:12:55 -06:00
commit 8951b6e0e1
No known key found for this signature in database
GPG Key ID: A306A51F43B8E5A5

View File

@ -45,8 +45,8 @@ public final class RelyingPartyRegistrations {
* Return a {@link RelyingPartyRegistration.Builder} based off of the given SAML 2.0 * Return a {@link RelyingPartyRegistration.Builder} based off of the given SAML 2.0
* Asserting Party (IDP) metadata location. * Asserting Party (IDP) metadata location.
* *
* Valid locations can be classpath- or file-based or they can be HTTP endpoints. Some * Valid locations can be classpath- or file-based or they can be HTTPS endpoints.
* valid endpoints might include: * Some valid endpoints might include:
* *
* <pre> * <pre>
* metadataLocation = "classpath:asserting-party-metadata.xml"; * metadataLocation = "classpath:asserting-party-metadata.xml";
@ -69,8 +69,8 @@ public final class RelyingPartyRegistrations {
* about the asserting party. Thus, you will need to remember to still populate * about the asserting party. Thus, you will need to remember to still populate
* anything about the relying party, like any private keys the relying party will use * anything about the relying party, like any private keys the relying party will use
* for signing AuthnRequests. * for signing AuthnRequests.
* @param metadataLocation The classpath- or file-based locations or HTTP endpoints of * @param metadataLocation The classpath- or file-based locations or HTTPS endpoints
* the asserting party metadata file * of the asserting party metadata file
* @return the {@link RelyingPartyRegistration.Builder} for further configuration * @return the {@link RelyingPartyRegistration.Builder} for further configuration
*/ */
public static RelyingPartyRegistration.Builder fromMetadataLocation(String metadataLocation) { public static RelyingPartyRegistration.Builder fromMetadataLocation(String metadataLocation) {
@ -130,8 +130,8 @@ public final class RelyingPartyRegistrations {
* Return a {@link Collection} of {@link RelyingPartyRegistration.Builder}s based off * Return a {@link Collection} of {@link RelyingPartyRegistration.Builder}s based off
* of the given SAML 2.0 Asserting Party (IDP) metadata location. * of the given SAML 2.0 Asserting Party (IDP) metadata location.
* *
* Valid locations can be classpath- or file-based or they can be HTTP endpoints. Some * Valid locations can be classpath- or file-based or they can be HTTPS endpoints.
* valid endpoints might include: * Some valid endpoints might include:
* *
* <pre> * <pre>
* metadataLocation = "classpath:asserting-party-metadata.xml"; * metadataLocation = "classpath:asserting-party-metadata.xml";
@ -155,7 +155,7 @@ public final class RelyingPartyRegistrations {
* about the asserting party. Thus, you will need to remember to still populate * about the asserting party. Thus, you will need to remember to still populate
* anything about the relying party, like any private keys the relying party will use * anything about the relying party, like any private keys the relying party will use
* for signing AuthnRequests. * for signing AuthnRequests.
* @param location The classpath- or file-based locations or HTTP endpoints of the * @param location The classpath- or file-based locations or HTTPS endpoints of the
* asserting party metadata file * asserting party metadata file
* @return the {@link Collection} of {@link RelyingPartyRegistration.Builder}s for * @return the {@link Collection} of {@link RelyingPartyRegistration.Builder}s for
* further configuration * further configuration