From d3ef340b2623c11a229c4ad56040c49b3dbb6508 Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Thu, 3 Dec 2020 11:03:54 +0100 Subject: [PATCH] Fix typos --- .../web/configurers/AbstractAuthenticationFilterConfigurer.java | 2 +- .../config/annotation/web/configurers/FormLoginConfigurer.java | 2 +- .../web/configurers/openid/OpenIDLoginConfigurer.java | 2 +- .../core/parameters/AnnotationParameterNameDiscoverer.java | 2 +- .../docs/asciidoc/_includes/servlet/authentication/jaas.adoc | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractAuthenticationFilterConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractAuthenticationFilterConfigurer.java index 34cd345311..0837de2a7f 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractAuthenticationFilterConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractAuthenticationFilterConfigurer.java @@ -299,7 +299,7 @@ public abstract class AbstractAuthenticationFilterConfigurer * *

- * If a URL is specified or this is not being used in conjuction with + * If a URL is specified or this is not being used in conjunction with * {@link WebSecurityConfigurerAdapter}, users are required to process the specified * URL to generate a login page. *

diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/FormLoginConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/FormLoginConfigurer.java index 32ff40beea..32db2e8f16 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/FormLoginConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/FormLoginConfigurer.java @@ -89,7 +89,7 @@ public final class FormLoginConfigurer> extends *

* *

- * If a URL is specified or this is not being used in conjuction with + * If a URL is specified or this is not being used in conjunction with * {@link WebSecurityConfigurerAdapter}, users are required to process the specified * URL to generate a login page. In general, the login page should create a form that * submits a request with the following requirements to work with diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/openid/OpenIDLoginConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/openid/OpenIDLoginConfigurer.java index e54c2863a8..0d618ce01e 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/openid/OpenIDLoginConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/openid/OpenIDLoginConfigurer.java @@ -234,7 +234,7 @@ public final class OpenIDLoginConfigurer> *

* *

- * If a URL is specified or this is not being used in conjuction with + * If a URL is specified or this is not being used in conjunction with * {@link WebSecurityConfigurerAdapter}, users are required to process the specified * URL to generate a login page. *

diff --git a/core/src/main/java/org/springframework/security/core/parameters/AnnotationParameterNameDiscoverer.java b/core/src/main/java/org/springframework/security/core/parameters/AnnotationParameterNameDiscoverer.java index 18d8099705..18847e0a28 100644 --- a/core/src/main/java/org/springframework/security/core/parameters/AnnotationParameterNameDiscoverer.java +++ b/core/src/main/java/org/springframework/security/core/parameters/AnnotationParameterNameDiscoverer.java @@ -54,7 +54,7 @@ import org.springframework.util.ReflectionUtils; * * *

- * It is common for users to use {@link AnnotationParameterNameDiscoverer} in conjuction + * It is common for users to use {@link AnnotationParameterNameDiscoverer} in conjunction * with {@link PrioritizedParameterNameDiscoverer}. In fact, Spring Security's * {@link DefaultSecurityParameterNameDiscoverer} (which is used by default with method * level security) extends {@link PrioritizedParameterNameDiscoverer} and will diff --git a/docs/manual/src/docs/asciidoc/_includes/servlet/authentication/jaas.adoc b/docs/manual/src/docs/asciidoc/_includes/servlet/authentication/jaas.adoc index c77f1935ac..3a1864ca89 100644 --- a/docs/manual/src/docs/asciidoc/_includes/servlet/authentication/jaas.adoc +++ b/docs/manual/src/docs/asciidoc/_includes/servlet/authentication/jaas.adoc @@ -66,7 +66,7 @@ For details, refer to the class level javadoc of `InMemoryConfiguration`. [[jaas-djap-config]] ==== DefaultJaasAuthenticationProvider Example Configuration -While the Spring configuration for `InMemoryConfiguration` can be more verbose than the standarad JAAS configuration files, using it in conjuction with `DefaultJaasAuthenticationProvider` is more flexible than `JaasAuthenticationProvider` since it not dependant on the default `Configuration` implementation. +While the Spring configuration for `InMemoryConfiguration` can be more verbose than the standard JAAS configuration files, using it in conjunction with `DefaultJaasAuthenticationProvider` is more flexible than `JaasAuthenticationProvider` since it not dependant on the default `Configuration` implementation. An example configuration of `DefaultJaasAuthenticationProvider` using `InMemoryConfiguration` is provided below. Note that custom implementations of `Configuration` can easily be injected into `DefaultJaasAuthenticationProvider` as well.