diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBean.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBean.java index b5a97bea6a..5985cce4ce 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBean.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2019 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. @@ -51,7 +51,7 @@ import org.springframework.context.annotation.Conditional; * already contained in the {@link BeanFactory}. *

* The condition can only match the bean definitions that have been processed by the - * application context so far and, as such, it is strongly recommended using this + * application context so far and, as such, it is strongly recommended to use this * condition on auto-configuration classes only. If a candidate bean may be created by * another auto-configuration, make sure that the one using this condition runs after. * diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBean.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBean.java index 6a473743dc..e7acf5deae 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBean.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2019 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. @@ -51,7 +51,7 @@ import org.springframework.context.annotation.Conditional; * already contained in the {@link BeanFactory}. *

* The condition can only match the bean definitions that have been processed by the - * application context so far and, as such, it is strongly recommended using this + * application context so far and, as such, it is strongly recommended to use this * condition on auto-configuration classes only. If a candidate bean may be created by * another auto-configuration, make sure that the one using this condition runs after. * diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnSingleCandidate.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnSingleCandidate.java index 2d2ce2874c..b077dcee2c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnSingleCandidate.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnSingleCandidate.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2019 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. @@ -35,7 +35,7 @@ import org.springframework.context.annotation.Conditional; * condition match if auto-wiring a bean with the defined type will succeed. *

* The condition can only match the bean definitions that have been processed by the - * application context so far and, as such, it is strongly recommended using this + * application context so far and, as such, it is strongly recommended to use this * condition on auto-configuration classes only. If a candidate bean may be created by * another auto-configuration, make sure that the one using this condition runs after. * diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/saml2/Saml2LoginConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/saml2/Saml2LoginConfiguration.java index b74eea2cd1..8376adcafd 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/saml2/Saml2LoginConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/saml2/Saml2LoginConfiguration.java @@ -26,8 +26,8 @@ import org.springframework.security.saml2.provider.service.registration.RelyingP import org.springframework.security.web.SecurityFilterChain; /** - * {@link WebSecurityConfigurerAdapter} configuration for Spring Security's relying on - * party SAML support. + * {@link WebSecurityConfigurerAdapter} configuration for Spring Security's relying party + * SAML support. * * @author Madhura Bhave */ diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/saml2/Saml2RelyingPartyProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/saml2/Saml2RelyingPartyProperties.java index 53ab635034..1958ca4a77 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/saml2/Saml2RelyingPartyProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/saml2/Saml2RelyingPartyProperties.java @@ -27,7 +27,7 @@ import org.springframework.core.io.Resource; import org.springframework.security.saml2.provider.service.registration.Saml2MessageBinding; /** - * SAML2 relying on party properties. + * SAML2 relying party properties. * * @author Madhura Bhave * @author Phillip Webb @@ -37,7 +37,7 @@ import org.springframework.security.saml2.provider.service.registration.Saml2Mes public class Saml2RelyingPartyProperties { /** - * SAML2 relying on party registrations. + * SAML2 relying party registrations. */ private final Map registration = new LinkedHashMap<>(); @@ -46,13 +46,13 @@ public class Saml2RelyingPartyProperties { } /** - * Represents a SAML Relying on Party. + * Represents a SAML Relying Party. */ public static class Registration { /** - * Relying on party's entity ID. The value may contain a number of placeholders. - * They are "baseUrl", "registrationId", "baseScheme", "baseHost", and "basePort". + * Relying party's entity ID. The value may contain a number of placeholders. They + * are "baseUrl", "registrationId", "baseScheme", "baseHost", and "basePort". */ private String entityId = "{baseUrl}/saml2/service-provider-metadata/{registrationId}"; @@ -149,7 +149,7 @@ public class Saml2RelyingPartyProperties { private Resource privateKeyLocation; /** - * Relying on Party X509Certificate shared with the identity provider. + * Relying Party X509Certificate shared with the identity provider. */ private Resource certificateLocation; @@ -198,7 +198,7 @@ public class Saml2RelyingPartyProperties { private Resource privateKeyLocation; /** - * Relying on Party X509Certificate shared with the identity provider. + * Relying Party X509Certificate shared with the identity provider. */ private Resource certificateLocation; diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/saml2/Saml2RelyingPartyRegistrationConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/saml2/Saml2RelyingPartyRegistrationConfiguration.java index fc056fb5a8..f795bae223 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/saml2/Saml2RelyingPartyRegistrationConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/saml2/Saml2RelyingPartyRegistrationConfiguration.java @@ -49,7 +49,7 @@ import org.springframework.util.StringUtils; /** * {@link Configuration @Configuration} used to map {@link Saml2RelyingPartyProperties} to - * relying on party registrations in a {@link RelyingPartyRegistrationRepository}. + * relying party registrations in a {@link RelyingPartyRegistrationRepository}. * * @author Madhura Bhave * @author Phillip Webb