diff --git a/acl/src/main/java/org/springframework/security/acls/AclEntryVoter.java b/acl/src/main/java/org/springframework/security/acls/AclEntryVoter.java index f4145d4b98..6ff37fded9 100644 --- a/acl/src/main/java/org/springframework/security/acls/AclEntryVoter.java +++ b/acl/src/main/java/org/springframework/security/acls/AclEntryVoter.java @@ -83,14 +83,14 @@ import org.springframework.util.StringUtils; * Alternatively, you could have used a common superclass or interface for the * {@link #processDomainObjectClass} if both BankAccount and * Customer had common parents. - *

+ * *

* If the principal does not have sufficient permissions, the voter will vote to deny * access. - *

+ * *

* All comparisons and prefixes are case sensitive. - *

+ * * * @author Ben Alex */ diff --git a/config/src/main/java/org/springframework/security/config/annotation/SecurityConfigurerAdapter.java b/config/src/main/java/org/springframework/security/config/annotation/SecurityConfigurerAdapter.java index 5aaf2e25de..6262955a20 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/SecurityConfigurerAdapter.java +++ b/config/src/main/java/org/springframework/security/config/annotation/SecurityConfigurerAdapter.java @@ -58,7 +58,7 @@ public abstract class SecurityConfigurerAdapter> * Gets the {@link SecurityBuilder}. Cannot be null. * * @return the {@link SecurityBuilder} - * @throw {@link IllegalStateException} if {@link SecurityBuilder} is null + * @throws IllegalStateException if {@link SecurityBuilder} is null */ protected final B getBuilder() { if (securityBuilder == null) { diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/ProviderManagerBuilder.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/ProviderManagerBuilder.java index 7db4b5edde..6685ce29a1 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/authentication/ProviderManagerBuilder.java +++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/ProviderManagerBuilder.java @@ -36,9 +36,10 @@ public interface ProviderManagerBuilder> ext * customizations must be done externally and the {@link ProviderManagerBuilder} is * returned immediately. * + * Note that an Exception is thrown if an error occurs when adding the {@link AuthenticationProvider}. + * * @return a {@link ProviderManagerBuilder} to allow further authentication to be * provided to the {@link ProviderManagerBuilder} - * @throws Exception if an error occurs when adding the {@link AuthenticationProvider} */ B authenticationProvider(AuthenticationProvider authenticationProvider); } diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/builders/AuthenticationManagerBuilder.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/builders/AuthenticationManagerBuilder.java index 98139ffc61..653a8a4864 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/authentication/builders/AuthenticationManagerBuilder.java +++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/builders/AuthenticationManagerBuilder.java @@ -61,7 +61,7 @@ public class AuthenticationManagerBuilder /** * Creates a new instance - * @param the {@link ObjectPostProcessor} instance to use. + * @param objectPostProcessor the {@link ObjectPostProcessor} instance to use. */ public AuthenticationManagerBuilder(ObjectPostProcessor objectPostProcessor) { super(objectPostProcessor, true); @@ -196,7 +196,6 @@ public class AuthenticationManagerBuilder *

* This method does NOT ensure that a {@link UserDetailsService} is available * for the {@link #getDefaultUserDetailsService()} method. - *

* * @return a {@link LdapAuthenticationProviderConfigurer} to allow customization of * the LDAP authentication @@ -216,11 +215,11 @@ public class AuthenticationManagerBuilder *

* This method does NOT ensure that the {@link UserDetailsService} is available * for the {@link #getDefaultUserDetailsService()} method. - *

+ * + * Note that an {@link Exception} might be thrown if an error occurs when adding the {@link AuthenticationProvider}. * * @return a {@link AuthenticationManagerBuilder} to allow further authentication to * be provided to the {@link AuthenticationManagerBuilder} - * @throws Exception if an error occurs when adding the {@link AuthenticationProvider} */ public AuthenticationManagerBuilder authenticationProvider( AuthenticationProvider authenticationProvider) { diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/InMemoryUserDetailsManagerConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/InMemoryUserDetailsManagerConfigurer.java index 2aa384e206..8a097bee4a 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/InMemoryUserDetailsManagerConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/InMemoryUserDetailsManagerConfigurer.java @@ -27,7 +27,7 @@ import org.springframework.security.provisioning.InMemoryUserDetailsManager; * to have in memory authentication. It also allows easily adding users to the in memory * authentication. * - * @param the type of the {@link SecurityBuilder} that is being configured + * @param the type of the {@link ProviderManagerBuilder} that is being configured * * @author Rob Winch * @since 3.2 diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/JdbcUserDetailsManagerConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/JdbcUserDetailsManagerConfigurer.java index b47fc8e082..506a21ff39 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/JdbcUserDetailsManagerConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/JdbcUserDetailsManagerConfigurer.java @@ -38,7 +38,6 @@ import org.springframework.security.provisioning.JdbcUserDetailsManager; *

* The only required method is the {@link #dataSource(javax.sql.DataSource)} all other * methods have reasonable defaults. - *

* * @param the type of the {@link ProviderManagerBuilder} that is being configured * @@ -82,7 +81,7 @@ public class JdbcUserDetailsManagerConfigurer * @param query The query to use for selecting the username, password, and if the user * is enabled by username. Must contain a single parameter for the username. - * @return The {@link JdbcUserDetailsManagerRegistry} used for additional + * @return The {@link JdbcUserDetailsManagerConfigurer} used for additional * customizations * @throws Exception */ @@ -102,7 +101,7 @@ public class JdbcUserDetailsManagerConfigurer withDefaultSchema() { diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/UserDetailsManagerConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/UserDetailsManagerConfigurer.java index 92c02291de..0f413fb921 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/UserDetailsManagerConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/UserDetailsManagerConfigurer.java @@ -80,9 +80,6 @@ public class UserDetailsManagerConfigurer, C /** * Builds the user to be added. At minimum the username, password, and authorities * should provided. The remaining attributes have reasonable defaults. - * - * @param the type of {@link UserDetailsManagerConfigurer} to return for chaining - * methods. */ public class UserDetailsBuilder { private String username; @@ -103,11 +100,10 @@ public class UserDetailsManagerConfigurer, C } /** - * Returns the {@link UserDetailsManagerRegistry} for method chaining (i.e. to add + * Returns the {@link UserDetailsManagerConfigurer} for method chaining (i.e. to add * another user) * - * @return the {@link UserDetailsManagerRegistry} for method chaining (i.e. to add - * another user) + * @return the {@link UserDetailsManagerConfigurer} for method chaining */ public C and() { return builder; diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/userdetails/UserDetailsServiceConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/userdetails/UserDetailsServiceConfigurer.java index f29174b59a..0522edeae3 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/userdetails/UserDetailsServiceConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/userdetails/UserDetailsServiceConfigurer.java @@ -27,8 +27,8 @@ import org.springframework.security.core.userdetails.UserDetailsService; * @author Rob Winch * @since 3.2 * - * @param the type of the {@link SecurityBuilder} - * @param the {@link SecurityConfigurer} (or this) + * @param the type of the {@link ProviderManagerBuilder} + * @param the {@link UserDetailsServiceConfigurer} (or this) * @param the type of UserDetailsService being used to allow for returning the * concrete UserDetailsService. */ diff --git a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/EnableGlobalMethodSecurity.java b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/EnableGlobalMethodSecurity.java index d76d289497..defd6bde07 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/EnableGlobalMethodSecurity.java +++ b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/EnableGlobalMethodSecurity.java @@ -29,9 +29,8 @@ import org.springframework.security.config.annotation.configuration.ObjectPostPr /** *

- * Enables Spring Security global method security similar to the + * Enables Spring Security global method security similar to the <global-method-security> * xml support. - *

* *

* More advanced configurations may wish to extend diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/HttpSecurityBuilder.java b/config/src/main/java/org/springframework/security/config/annotation/web/HttpSecurityBuilder.java index b36e3379ef..df730416f9 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/HttpSecurityBuilder.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/HttpSecurityBuilder.java @@ -142,11 +142,11 @@ public interface HttpSecurityBuilder> extends *

  • {@link LogoutFilter}
    • *
  • {@link X509AuthenticationFilter}
    • *
  • {@link AbstractPreAuthenticatedProcessingFilter}
    • - *
  • {@link org.springframework.security.cas.web.CasAuthenticationFilter}
    • + *
  • CasAuthenticationFilter
    • *
  • {@link UsernamePasswordAuthenticationFilter}
    • *
  • {@link ConcurrentSessionFilter}
    • *
  • {@link OpenIDAuthenticationFilter}
    • - *
  • {@link DefaultLoginPageGeneratingFilter}
    • + *
  • {@link org.springframework.security.web.authentication.ui.DefaultLoginPageGeneratingFilter}
    • *
  • {@link ConcurrentSessionFilter}
    • *
  • {@link DigestAuthenticationFilter}
    • *
  • {@link BasicAuthenticationFilter}
    • diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java b/config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java index d387d25874..8fc3eeadfc 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java @@ -71,7 +71,7 @@ import org.springframework.security.web.util.matcher.RequestMatcher; import org.springframework.util.Assert; /** - * A {@link HttpSecurity} is similar to Spring Security's XML element in the + * A {@link HttpSecurity} is similar to Spring Security's XML <http> element in the * namespace configuration. It allows configuring web based security for specific http * requests. By default it will be applied to all requests, but can be restricted using * {@link #requestMatcher(RequestMatcher)} or other similar methods. @@ -283,7 +283,7 @@ public final class HttpSecurity extends * * @return * @throws Exception - * @see {@link HeadersConfigurer} + * @see HeadersConfigurer */ public HeadersConfigurer headers() throws Exception { return getOrApply(new HeadersConfigurer()); @@ -326,8 +326,8 @@ public final class HttpSecurity extends * * 
     	 * <listener>
-	 *      <listener-class>org.springframework.security.web.session.HttpSessionEventPublisher</listener-class>
-	 * </listener>
+	 *      <listener-class>org.springframework.security.web.session.HttpSessionEventPublisher</listener-class>
+	 * </listener>
 	 *
    * * Alternatively, @@ -378,7 +378,7 @@ public final class HttpSecurity extends * * @return the {@link PortMapperConfigurer} for further customizations * @throws Exception - * @see {@link #requiresChannel()} + * @see #requiresChannel() */ public PortMapperConfigurer portMapper() throws Exception { return getOrApply(new PortMapperConfigurer()); @@ -716,7 +716,7 @@ public final class HttpSecurity extends * {@link org.springframework.security.authentication.AnonymousAuthenticationToken} * and contain the role "ROLE_ANONYMOUS". * - *

    Example Configuration

    Example Configuration * * The following configuration demonstrates how to specify that anonymous users should * contain the role "ROLE_ANON" instead. @@ -908,6 +908,10 @@ public final class HttpSecurity extends return getOrApply(new HttpBasicConfigurer()); } + public void setSharedObject(Class sharedType, C object) { + super.setSharedObject(sharedType, object); + } + @Override protected void beforeConfigure() throws Exception { setSharedObject(AuthenticationManager.class, getAuthenticationRegistry().build()); diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebMvcSecurityConfiguration.java b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebMvcSecurityConfiguration.java index 97abb5c21f..b2dc796cca 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebMvcSecurityConfiguration.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebMvcSecurityConfiguration.java @@ -29,7 +29,7 @@ import java.util.List; /** * Used to add a {@link RequestDataValueProcessor} for Spring MVC and Spring Security CSRF * integration. This configuration is added whenever {@link EnableWebMvc} is added by - * {@link SpringWebMvcImportSelector} and the DispatcherServlet is present on the + * SpringWebMvcImportSelector and the DispatcherServlet is present on the * classpath. It also adds the {@link AuthenticationPrincipalArgumentResolver} as a * {@link HandlerMethodArgumentResolver}. * diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfigurerAdapter.java b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfigurerAdapter.java index b2d9af370d..1f83cf7b54 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfigurerAdapter.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfigurerAdapter.java @@ -262,7 +262,7 @@ public abstract class WebSecurityConfigurerAdapter implements * {@link #userDetailsService()} instead * @return * @throws Exception - * @see {@link #userDetailsService()} + * @see #userDetailsService() */ public UserDetailsService userDetailsServiceBean() throws Exception { AuthenticationManagerBuilder globalAuthBuilder = context @@ -273,7 +273,7 @@ public abstract class WebSecurityConfigurerAdapter implements /** * Allows modifying and accessing the {@link UserDetailsService} from - * {@link #userDetailsServiceBean()()} without interacting with the + * {@link #userDetailsServiceBean()} without interacting with the * {@link ApplicationContext}. Developers should override this method when changing * the instance of {@link #userDetailsServiceBean()}. * 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 a539364245..fca1b61e0c 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 @@ -178,8 +178,8 @@ public abstract class AbstractAuthenticationFilterConfigurer *
  • - * {@link org.springframework.security.config.annotation.web.builders.HttpSecurity#getAuthenticationManager()} + * {@link AuthenticationManager} *
    • * * @@ -115,7 +115,7 @@ abstract class AbstractInterceptUrlConfigurer> * @param accessDeniedUrl the URL to the access denied page (i.e. /errors/401) * @return the {@link ExceptionHandlingConfigurer} for further customization * @see AccessDeniedHandlerImpl - * @see {@link #accessDeniedHandler(org.springframework.security.web.access.AccessDeniedHandler)} + * @see #accessDeniedHandler(org.springframework.security.web.access.AccessDeniedHandler) */ public ExceptionHandlingConfigurer accessDeniedPage(String accessDeniedUrl) { AccessDeniedHandlerImpl accessDeniedHandler = new AccessDeniedHandlerImpl(); diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurer.java index cf9fc82a01..aedc77ef4d 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurer.java @@ -70,7 +70,7 @@ import org.springframework.util.StringUtils; * * @author Rob Winch * @since 3.2 - * @see {@link org.springframework.security.config.annotation.web.builders.HttpSecurity#authorizeRequests()} + * @see org.springframework.security.config.annotation.web.builders.HttpSecurity#authorizeRequests() */ public final class ExpressionUrlAuthorizationConfigurer> extends @@ -339,7 +339,7 @@ public final class ExpressionUrlAuthorizationConfigurer - *
  • {@link AuthenticationManager}
    • + *
  • {@link org.springframework.security.authentication.AuthenticationManager}
    • *
  • {@link RememberMeServices} - is optionally used. See {@link RememberMeConfigurer}
    • *
  • {@link SessionAuthenticationStrategy} - is optionally used. See * {@link SessionManagementConfigurer}
    • diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HeadersConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HeadersConfigurer.java index 71402ad2be..9334b04259 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HeadersConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HeadersConfigurer.java @@ -186,7 +186,7 @@ public class HeadersConfigurer> extends * X-XSS-Protection: 1 * * - * or if {@link #setBlock(boolean)} is true + * or if {@link XXssProtectionHeaderWriter#setBlock(boolean)} of the given {@link XXssProtectionHeaderWriter} is true * * * 
    diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HttpBasicConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HttpBasicConfigurer.java
index d6b5bcd1da..78d14308a5 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HttpBasicConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HttpBasicConfigurer.java
@@ -83,7 +83,7 @@ public final class HttpBasicConfigurer> extends
 	/**
 	 * Creates a new instance
 	 * @throws Exception
-	 * @see {@link HttpSecurity#httpBasic()}
+	 * @see HttpSecurity#httpBasic()
 	 */
 	public HttpBasicConfigurer() throws Exception {
 		realmName(DEFAULT_REALM);
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/JeeConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/JeeConfigurer.java
index 09a2a3ccf6..e0119e89e8 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/JeeConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/JeeConfigurer.java
@@ -187,7 +187,7 @@ public final class JeeConfigurer> extends
 	 * Populates a {@link PreAuthenticatedAuthenticationProvider} into
 	 * {@link HttpSecurity#authenticationProvider(org.springframework.security.authentication.AuthenticationProvider)}
 	 * and a {@link Http403ForbiddenEntryPoint} into
-	 * {@link HttpSecurity#authenticationEntryPoint(org.springframework.security.web.AuthenticationEntryPoint)}
+	 * {@link HttpSecurityBuilder#setSharedObject(Class, Object)}
 	 *
 	 * @see org.springframework.security.config.annotation.SecurityConfigurerAdapter#init(org.springframework.security.config.annotation.SecurityBuilder)
 	 */
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/LogoutConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/LogoutConfigurer.java
index 49e16260b8..cf73917b0b 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/LogoutConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/LogoutConfigurer.java
@@ -35,7 +35,7 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
 
 /**
  * Adds logout support. Other {@link SecurityConfigurer} instances may invoke
- * {@link #addLogoutHandler(LogoutHandler)} in the {@link #init(HttpSecurity)} phase.
+ * {@link #addLogoutHandler(LogoutHandler)} in the {@link #init(HttpSecurityBuilder)} phase.
  *
  * 
    Security Filters
    
  *
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 f9fe860f31..cf1f8eec98 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
@@ -199,7 +199,7 @@ public final class OpenIDLoginConfigurer>
 	 * {@link HttpServletRequest} matches this URL the {@link OpenIDAuthenticationFilter}
 	 * will attempt to authenticate the request. The default is "/login/openid".
 	 *
-	 * @param loginUrl the URL used to perform authentication
+	 * @param loginProcessingUrl the URL used to perform authentication
 	 * @return the {@link OpenIDLoginConfigurer} for additional customization
 	 */
 	public OpenIDLoginConfigurer loginProcessingUrl(String loginProcessingUrl) {
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/messaging/MessageSecurityMetadataSourceRegistry.java b/config/src/main/java/org/springframework/security/config/annotation/web/messaging/MessageSecurityMetadataSourceRegistry.java
index 4bf9de75a3..4bdcd67bc6 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/messaging/MessageSecurityMetadataSourceRegistry.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/messaging/MessageSecurityMetadataSourceRegistry.java
@@ -105,7 +105,7 @@ public class MessageSecurityMetadataSourceRegistry {
 	 * {@link MessageSecurityMetadataSourceRegistry#simpDestPathMatcher(PathMatcher)} .
 	 *
 	 * @return the {@link Constraint} that is associated to the {@link MessageMatcher}
-	 * @see {@link MessageSecurityMetadataSourceRegistry#simpDestPathMatcher(PathMatcher)}
+	 * @see MessageSecurityMetadataSourceRegistry#simpDestPathMatcher(PathMatcher)
 	 */
 	public Constraint simpDestMatchers(String... patterns) {
 		return simpDestMatchers(null, patterns);
@@ -122,7 +122,7 @@ public class MessageSecurityMetadataSourceRegistry {
 	 * {@link MessageSecurityMetadataSourceRegistry#simpDestPathMatcher(PathMatcher)}.
 	 *
 	 * @return the {@link Constraint} that is associated to the {@link MessageMatcher}
-	 * @see {@link MessageSecurityMetadataSourceRegistry#simpDestPathMatcher(PathMatcher)}
+	 * @see MessageSecurityMetadataSourceRegistry#simpDestPathMatcher(PathMatcher)
 	 */
 	public Constraint simpMessageDestMatchers(String... patterns) {
 		return simpDestMatchers(SimpMessageType.MESSAGE, patterns);
@@ -139,7 +139,7 @@ public class MessageSecurityMetadataSourceRegistry {
 	 * {@link MessageSecurityMetadataSourceRegistry#simpDestPathMatcher(PathMatcher)}.
 	 *
 	 * @return the {@link Constraint} that is associated to the {@link MessageMatcher}
-	 * @see {@link MessageSecurityMetadataSourceRegistry#simpDestPathMatcher(PathMatcher)}
+	 * @see MessageSecurityMetadataSourceRegistry#simpDestPathMatcher(PathMatcher)
 	 */
 	public Constraint simpSubscribeDestMatchers(String... patterns) {
 		return simpDestMatchers(SimpMessageType.SUBSCRIBE, patterns);
@@ -353,7 +353,7 @@ public class MessageSecurityMetadataSourceRegistry {
 		 *
 		 * @return the {@link MessageSecurityMetadataSourceRegistry} for further
 		 * customization
-		 * @see {@link RememberMeConfigurer}
+		 * @see RememberMeConfigurer
 		 */
 		public MessageSecurityMetadataSourceRegistry rememberMe() {
 			return access(rememberMe);
@@ -385,7 +385,7 @@ public class MessageSecurityMetadataSourceRegistry {
 		 *
 		 * @return the {@link MessageSecurityMetadataSourceRegistry} for further
 		 * customization
-		 * @see {@link RememberMeConfigurer}
+		 * @see RememberMeConfigurer
 		 */
 		public MessageSecurityMetadataSourceRegistry fullyAuthenticated() {
 			return access(fullyAuthenticated);
diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/servlet/configuration/WebMvcSecurityConfiguration.java b/config/src/main/java/org/springframework/security/config/annotation/web/servlet/configuration/WebMvcSecurityConfiguration.java
index 84084634a3..e50b5f284a 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/servlet/configuration/WebMvcSecurityConfiguration.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/servlet/configuration/WebMvcSecurityConfiguration.java
@@ -30,7 +30,7 @@ import org.springframework.web.servlet.support.RequestDataValueProcessor;
 /**
  * Used to add a {@link RequestDataValueProcessor} for Spring MVC and Spring Security CSRF
  * integration. This configuration is added whenever {@link EnableWebMvc} is added by
- * {@link SpringWebMvcImportSelector} and the DispatcherServlet is present on the
+ * SpringWebMvcImportSelector and the DispatcherServlet is present on the
  * classpath. It also adds the {@link AuthenticationPrincipalArgumentResolver} as a
  * {@link HandlerMethodArgumentResolver}.
  *
diff --git a/config/src/main/java/org/springframework/security/config/authentication/PasswordEncoderParser.java b/config/src/main/java/org/springframework/security/config/authentication/PasswordEncoderParser.java
index 21ba9a483a..3682c68d5e 100644
--- a/config/src/main/java/org/springframework/security/config/authentication/PasswordEncoderParser.java
+++ b/config/src/main/java/org/springframework/security/config/authentication/PasswordEncoderParser.java
@@ -25,7 +25,7 @@ import org.springframework.util.xml.DomUtils;
 import org.w3c.dom.Element;
 
 /**
- * Stateful parser for the  element.
+ * Stateful parser for the <password-encoder> element.
  *
  * Will produce a PasswordEncoder and (optionally) a SaltSource.
  *
diff --git a/core/src/main/java/org/springframework/security/access/expression/SecurityExpressionOperations.java b/core/src/main/java/org/springframework/security/access/expression/SecurityExpressionOperations.java
index fb2c48747b..f6c2da0973 100644
--- a/core/src/main/java/org/springframework/security/access/expression/SecurityExpressionOperations.java
+++ b/core/src/main/java/org/springframework/security/access/expression/SecurityExpressionOperations.java
@@ -45,7 +45,7 @@ public interface SecurityExpressionOperations {
 	 * is converted may depend on the implementation settings.
 	 * 
    
 	 *
-	 * @param authority the authority to test (i.e. "USER")
+	 * @param role the authority to test (i.e. "USER")
 	 * @return true if the authority is found, else false
 	 */
 	boolean hasRole(String role);
@@ -62,7 +62,7 @@ public interface SecurityExpressionOperations {
 	 * is converted may depend on the implementation settings.
 	 * 
    
 	 *
-	 * @param authorities the authorities to test (i.e. "USER", "ADMIN")
+	 * @param roles the authorities to test (i.e. "USER", "ADMIN")
 	 * @return true if any of the authorities is found, else false
 	 */
 	boolean hasAnyRole(String... roles);
diff --git a/core/src/main/java/org/springframework/security/access/expression/method/DefaultMethodSecurityExpressionHandler.java b/core/src/main/java/org/springframework/security/access/expression/method/DefaultMethodSecurityExpressionHandler.java
index e4bdc39248..eaed83bac8 100644
--- a/core/src/main/java/org/springframework/security/access/expression/method/DefaultMethodSecurityExpressionHandler.java
+++ b/core/src/main/java/org/springframework/security/access/expression/method/DefaultMethodSecurityExpressionHandler.java
@@ -195,8 +195,8 @@ public class DefaultMethodSecurityExpressionHandler extends
 
 	/**
 	 * 
    
-	 * Sets the default prefix to be added to {@link #hasAnyRole(String...)} or
-	 * {@link #hasRole(String)}. For example, if hasRole("ADMIN") or hasRole("ROLE_ADMIN")
+	 * Sets the default prefix to be added to {@link org.springframework.security.access.expression.SecurityExpressionRoot#hasAnyRole(String...)} or
+	 * {@link org.springframework.security.access.expression.SecurityExpressionRoot#hasRole(String)}. For example, if hasRole("ADMIN") or hasRole("ROLE_ADMIN")
 	 * is passed in, then the role ROLE_ADMIN will be used when the defaultRolePrefix is
 	 * "ROLE_" (default).
 	 * 
    
diff --git a/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchy.java b/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchy.java
index bc538c4bad..dd31746921 100755
--- a/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchy.java
+++ b/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchy.java
@@ -32,7 +32,7 @@ public interface RoleHierarchy {
 	 * that are (transitively) reachable from them in the role hierarchy.
 	 * 
    
 	 * Example:
    
-	 * Role hierarchy: ROLE_A > ROLE_B and ROLE_B > ROLE_C.
    
+	 * Role hierarchy: ROLE_A > ROLE_B and ROLE_B > ROLE_C.
    
 	 * Directly assigned authority: ROLE_A.
    
 	 * Reachable authorities: ROLE_A, ROLE_B, ROLE_C.
 	 *
diff --git a/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImpl.java b/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImpl.java
index c04d1ca35c..cee1716a6a 100755
--- a/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImpl.java
+++ b/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImpl.java
@@ -27,7 +27,7 @@ import java.util.regex.Pattern;
 /**
  * 
    
  * This class defines a role hierarchy for use with the UserDetailsServiceWrapper.
- * 
    
+ *
  * 
    
  * Here is an example configuration of a role hierarchy (hint: read the ">" sign as
  * "includes"):
@@ -41,19 +41,18 @@ import java.util.regex.Pattern;
  *             </value>
  *         </property>
  *
    - * - *

    + * *

    * Explanation of the above:
    * In effect every user with ROLE_A also has ROLE_B, ROLE_AUTHENTICATED and * ROLE_UNAUTHENTICATED;
    * every user with ROLE_B also has ROLE_AUTHENTICATED and ROLE_UNAUTHENTICATED;
    * every user with ROLE_AUTHENTICATED also has ROLE_UNAUTHENTICATED. - *

    + * *

    * Hierarchical Roles will dramatically shorten your access rules (and also make the * access rules much more elegant). - *

    + * *

    * Consider this access rule for Spring Security's RoleVoter (background: every user that * is authenticated should be able to log out):
    @@ -62,10 +61,8 @@ import java.util.regex.Pattern; * /logout.html=ROLE_AUTHENTICATED
    * In addition to shorter rules this will also make your access rules more readable and * your intentions clearer. - *

    * * @author Michael Mayr - * */ public class RoleHierarchyImpl implements RoleHierarchy { diff --git a/core/src/main/java/org/springframework/security/access/intercept/package-info.java b/core/src/main/java/org/springframework/security/access/intercept/package-info.java index 43b81cdf64..d01283a80b 100644 --- a/core/src/main/java/org/springframework/security/access/intercept/package-info.java +++ b/core/src/main/java/org/springframework/security/access/intercept/package-info.java @@ -8,7 +8,7 @@ * security facilities provided for it by Spring Security. * For example, one secure object would be MethodInvocation, * whilst another would be HTTP - * {@link org.springframework.security.web.FilterInvocation}. Note these are + * {@code org.springframework.security.web.FilterInvocation}. Note these are * infrastructure objects and their design allows them to represent a large * variety of actual resources that might need to be secured, such as business * objects or HTTP request URLs. diff --git a/core/src/main/java/org/springframework/security/access/method/MapBasedMethodSecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/method/MapBasedMethodSecurityMetadataSource.java index 0751f94bb3..1956fb8534 100644 --- a/core/src/main/java/org/springframework/security/access/method/MapBasedMethodSecurityMetadataSource.java +++ b/core/src/main/java/org/springframework/security/access/method/MapBasedMethodSecurityMetadataSource.java @@ -107,7 +107,7 @@ public class MapBasedMethodSecurityMetadataSource extends /** * Add configuration attributes for a secure method. Method names can end or start - * with * for matching multiple methods. + * with * for matching multiple methods. * * @param name type and method name, separated by a dot * @param attr the security attributes associated with the method @@ -131,7 +131,7 @@ public class MapBasedMethodSecurityMetadataSource extends /** * Add configuration attributes for a secure method. Mapped method names can end or - * start with * for matching multiple methods. + * start with * for matching multiple methods. * * @param javaType target interface or class the security configuration attribute * applies to diff --git a/core/src/main/java/org/springframework/security/access/vote/AbstractAccessDecisionManager.java b/core/src/main/java/org/springframework/security/access/vote/AbstractAccessDecisionManager.java index 4242aa64ed..fd7eecae67 100644 --- a/core/src/main/java/org/springframework/security/access/vote/AbstractAccessDecisionManager.java +++ b/core/src/main/java/org/springframework/security/access/vote/AbstractAccessDecisionManager.java @@ -33,11 +33,11 @@ import org.springframework.util.Assert; /** * Abstract implementation of {@link AccessDecisionManager}. - *

    + * + *

    * Handles configuration of a bean context defined list of {@link AccessDecisionVoter}s * and the access control behaviour if all voters abstain from voting (defaults to deny * access). - *

    */ public abstract class AbstractAccessDecisionManager implements AccessDecisionManager, InitializingBean, MessageSourceAware { @@ -101,10 +101,9 @@ public abstract class AbstractAccessDecisionManager implements AccessDecisionMan /** * Iterates through all AccessDecisionVoters and ensures each can support * the presented class. - *

    + *

    * If one or more voters cannot support the presented class, false is * returned. - *

    * * @param clazz the type of secured object being presented * @return true if this type is supported diff --git a/core/src/main/java/org/springframework/security/authentication/encoding/ShaPasswordEncoder.java b/core/src/main/java/org/springframework/security/authentication/encoding/ShaPasswordEncoder.java index 08f79463fc..6eaa2744f6 100644 --- a/core/src/main/java/org/springframework/security/authentication/encoding/ShaPasswordEncoder.java +++ b/core/src/main/java/org/springframework/security/authentication/encoding/ShaPasswordEncoder.java @@ -24,7 +24,7 @@ package org.springframework.security.authentication.encoding; *

    *

    * As SHA is a one-way hash, the salt can contain any characters. The default strength for - * the SHA encoding is SHA-1. If you wish to use higher strengths use the argumented + * the SHA encoding is SHA-1. If you wish to use higher strengths use the parametrised * constructor. {@link #ShaPasswordEncoder(int strength)} *

    *

    @@ -32,7 +32,7 @@ package org.springframework.security.authentication.encoding; * * 

      * <bean id="passwordEncoder" class="org.springframework.security.authentication.encoding.ShaPasswordEncoder">
- *     <constructor-arg value="256"/>
+ *     <constructor-arg value="256"/>
  * </bean>
  *
    * diff --git a/core/src/main/java/org/springframework/security/authentication/jaas/AbstractJaasAuthenticationProvider.java b/core/src/main/java/org/springframework/security/authentication/jaas/AbstractJaasAuthenticationProvider.java index 8f86b86aa3..bd2f0b9f4f 100644 --- a/core/src/main/java/org/springframework/security/authentication/jaas/AbstractJaasAuthenticationProvider.java +++ b/core/src/main/java/org/springframework/security/authentication/jaas/AbstractJaasAuthenticationProvider.java @@ -51,7 +51,7 @@ import org.springframework.util.ObjectUtils; * This AuthenticationProvider is capable of validating * {@link org.springframework.security.authentication.UsernamePasswordAuthenticationToken} * requests contain the correct username and password. - *

    + * *

    * This implementation is backed by a + * *

    * {@link JaasAuthenticationCallbackHandler}s are passed to the * AbstractJaasAuthenticationProvider through the @@ -84,8 +84,7 @@ import org.springframework.util.ObjectUtils; * </list> * </property> * - * - *

    + * *

    * After calling LoginContext.login(), the AbstractJaasAuthenticationProvider will * retrieve the returned Principals from the Subject @@ -95,7 +94,7 @@ import org.springframework.util.ObjectUtils; * Authorization a role, it returns that role name from it's * {@link AuthorityGranter#grant(java.security.Principal)} method. The returned role will * be applied to the Authorization object as a {@link GrantedAuthority}. - *

    + * *

    * AuthorityGranters are configured in spring xml as follows... * diff --git a/core/src/main/java/org/springframework/security/authentication/jaas/JaasAuthenticationProvider.java b/core/src/main/java/org/springframework/security/authentication/jaas/JaasAuthenticationProvider.java index db45da03f0..05f0a4dad0 100644 --- a/core/src/main/java/org/springframework/security/authentication/jaas/JaasAuthenticationProvider.java +++ b/core/src/main/java/org/springframework/security/authentication/jaas/JaasAuthenticationProvider.java @@ -61,8 +61,7 @@ import java.security.Security; * <value>/WEB-INF/login.conf</value> * </property> * - * - *

    + * *

    * The loginContextName should coincide with a given index in the loginConfig specifed. * The loginConfig file used in the JUnit tests appears as the following... @@ -80,7 +79,6 @@ import java.security.Security; * <property name="loginContextName"> <value>JAASTest</value> </property> * * - *

    *

    * When using JAAS login modules as the authentication source, sometimes the + * *

    * {@link JaasAuthenticationCallbackHandler}s are passed to the JaasAuthenticationProvider * through the @@ -108,7 +106,6 @@ import java.security.Security; * </property> * * - *

    *

    * After calling LoginContext.login(), the JaasAuthenticationProvider will retrieve the * returned Principals from the Subject (LoginContext.getSubject().getPrincipals). Each @@ -130,10 +127,9 @@ import java.security.Security; * * * A configuration note: The JaasAuthenticationProvider uses the security properites - * "e;login.config.url.X"e; to configure jaas. If you would like to customize the + * "login.config.url.X" to configure jaas. If you would like to customize the * way Jaas gets configured, create a subclass of this and override the * {@link #configureJaas(Resource)} method. - *

    * * @author Ray Krueger * @author Rob Winch diff --git a/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextExecutorService.java b/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextExecutorService.java index 5786869bab..de7950d79b 100644 --- a/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextExecutorService.java +++ b/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextExecutorService.java @@ -55,7 +55,7 @@ public class DelegatingSecurityContextExecutorService extends * Creates a new {@link DelegatingSecurityContextExecutorService} that uses the * current {@link SecurityContext} from the {@link SecurityContextHolder}. * - * @param delegateTaskExecutor the {@link TaskExecutor} to delegate to. Cannot be + * @param delegate the {@link ExecutorService} to delegate to. Cannot be * null. */ public DelegatingSecurityContextExecutorService(ExecutorService delegate) { diff --git a/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextRunnable.java b/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextRunnable.java index 30f9d58f29..95d3c76920 100644 --- a/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextRunnable.java +++ b/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextRunnable.java @@ -70,13 +70,13 @@ public final class DelegatingSecurityContextRunnable implements Runnable { } /** - * Determines if the SecurityContext should be transfered if {@link #call()} + * Determines if the SecurityContext should be transfered if {@link #run()} * is invoked on the same {@link Thread} the * {@link DelegatingSecurityContextCallable} was created on. * * @param enableOnOriginalThread * if false (default), will only transfer the - * {@link SecurityContext} if {@link #call()} is invoked on a + * {@link SecurityContext} if {@link #run()} is invoked on a * different {@link Thread} than the * {@link DelegatingSecurityContextCallable} was created on. * @since 4.0.2 diff --git a/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextScheduledExecutorService.java b/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextScheduledExecutorService.java index eec7b5b079..9e6c2f024f 100644 --- a/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextScheduledExecutorService.java +++ b/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextScheduledExecutorService.java @@ -51,7 +51,7 @@ public final class DelegatingSecurityContextScheduledExecutorService extends * Creates a new {@link DelegatingSecurityContextScheduledExecutorService} that uses * the current {@link SecurityContext} from the {@link SecurityContextHolder}. * - * @param delegateTaskExecutor the {@link TaskExecutor} to delegate to. Cannot be + * @param delegate the {@link ScheduledExecutorService} to delegate to. Cannot be * null. */ public DelegatingSecurityContextScheduledExecutorService( diff --git a/core/src/main/java/org/springframework/security/core/annotation/AuthenticationPrincipal.java b/core/src/main/java/org/springframework/security/core/annotation/AuthenticationPrincipal.java index ce2b2acb8d..fa2eae57eb 100644 --- a/core/src/main/java/org/springframework/security/core/annotation/AuthenticationPrincipal.java +++ b/core/src/main/java/org/springframework/security/core/annotation/AuthenticationPrincipal.java @@ -30,7 +30,9 @@ import org.springframework.security.core.Authentication; * @author Rob Winch * @since 4.0 * - * @see org.springframework.security.messaging.context.AuthenticationPrincipalArgumentResolver + * See:     + * AuthenticationPrincipalArgumentResolver + * */ @Target({ ElementType.PARAMETER, ElementType.ANNOTATION_TYPE }) @Retention(RetentionPolicy.RUNTIME) 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 786055be9a..37bd473266 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 @@ -40,7 +40,7 @@ import org.springframework.util.ReflectionUtils; * 
      * import org.springframework.security.access.method.P;
  * 
- * @PostAuthorize("#to == returnObject.to")
+ * {@code @PostAuthorize("#to == returnObject.to")}
  * public Message findMessageByTo(@P("to") String to);
  *
    * @@ -70,7 +70,7 @@ import org.springframework.util.ReflectionUtils; * 
      * import org.springframework.security.access.method.P;
  * 
- * @PostAuthorize("#to == returnObject.to")
+ * {@code @PostAuthorize("#to == returnObject.to")}
  * public Message findMessageByToAndFrom(@P("to") User to, User from);
  *
    * diff --git a/core/src/main/java/org/springframework/security/core/session/SessionRegistryImpl.java b/core/src/main/java/org/springframework/security/core/session/SessionRegistryImpl.java index e6d8fd3bea..3bee6070ae 100644 --- a/core/src/main/java/org/springframework/security/core/session/SessionRegistryImpl.java +++ b/core/src/main/java/org/springframework/security/core/session/SessionRegistryImpl.java @@ -32,9 +32,8 @@ import java.util.concurrent.CopyOnWriteArraySet; * SessionDestroyedEvent}s published in the Spring application context. *

    * For this class to function correctly in a web application, it is important that you - * register an {@link org.springframework.security.web.session.HttpSessionEventPublisher - * HttpSessionEventPublisher} in the web.xml file so that this class is notified - * of sessions that expire. + * register an HttpSessionEventPublisher + * in the web.xml file so that this class is notified of sessions that expire. * * @author Ben Alex * @author Luke Taylor diff --git a/core/src/main/java/org/springframework/security/core/token/KeyBasedPersistenceTokenService.java b/core/src/main/java/org/springframework/security/core/token/KeyBasedPersistenceTokenService.java index 5add4fd067..ea5c34246f 100644 --- a/core/src/main/java/org/springframework/security/core/token/KeyBasedPersistenceTokenService.java +++ b/core/src/main/java/org/springframework/security/core/token/KeyBasedPersistenceTokenService.java @@ -145,7 +145,7 @@ public class KeyBasedPersistenceTokenService implements TokenService, Initializi } /** - * @param pseudoRandomNumberBytes changes the number of bytes issued (must be >= 0; + * @param pseudoRandomNumberBytes changes the number of bytes issued (must be >= 0; * defaults to 256) */ public void setPseudoRandomNumberBytes(int pseudoRandomNumberBytes) { diff --git a/core/src/main/java/org/springframework/security/core/token/TokenService.java b/core/src/main/java/org/springframework/security/core/token/TokenService.java index 53aa217511..7989423386 100644 --- a/core/src/main/java/org/springframework/security/core/token/TokenService.java +++ b/core/src/main/java/org/springframework/security/core/token/TokenService.java @@ -38,7 +38,7 @@ public interface TokenService { Token allocateToken(String extendedInformation); /** - * Permits verification the <{@link Token#getKey()} was issued by this + * Permits verification the {@link Token#getKey()} was issued by this * TokenService and reconstructs the corresponding Token. * * @param key as obtained from {@link Token#getKey()} and created by this diff --git a/core/src/main/java/org/springframework/security/core/userdetails/jdbc/JdbcDaoImpl.java b/core/src/main/java/org/springframework/security/core/userdetails/jdbc/JdbcDaoImpl.java index cd922e42d7..88b4e1e45d 100644 --- a/core/src/main/java/org/springframework/security/core/userdetails/jdbc/JdbcDaoImpl.java +++ b/core/src/main/java/org/springframework/security/core/userdetails/jdbc/JdbcDaoImpl.java @@ -47,7 +47,7 @@ import org.springframework.util.Assert; * * This table contains the login name, password and enabled status of the user. * - * + *
    * * * @@ -64,7 +64,7 @@ import org.springframework.util.Assert; * *

    The Authorities Table

    * - *
    Column
    + *
    * * * diff --git a/core/src/main/java/org/springframework/security/core/userdetails/memory/UserAttribute.java b/core/src/main/java/org/springframework/security/core/userdetails/memory/UserAttribute.java index 06bde8f9b9..84c6733aed 100644 --- a/core/src/main/java/org/springframework/security/core/userdetails/memory/UserAttribute.java +++ b/core/src/main/java/org/springframework/security/core/userdetails/memory/UserAttribute.java @@ -23,7 +23,7 @@ import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; /** - * Used by {@link InMemoryDaoImpl} to temporarily store the attributes associated with a + * Used by {@link org.springframework.security.provisioning.InMemoryUserDetailsManager} to temporarily store the attributes associated with a * user. * * @author Ben Alex @@ -50,7 +50,7 @@ public class UserAttribute { /** * Set all authorities for this user. * - * @param authorities {@link List} <{@link GrantedAuthority}> + * @param authorities {@link List} <{@link GrantedAuthority}> * @since 1.1 */ public void setAuthorities(List authorities) { @@ -61,7 +61,7 @@ public class UserAttribute { * Set all authorities for this user from String values. It will create the necessary * {@link GrantedAuthority} objects. * - * @param authoritiesAsStrings {@link List} <{@link String}> + * @param authoritiesAsStrings {@link List} <{@link String}> * @since 1.1 */ public void setAuthoritiesAsString(List authoritiesAsStrings) { diff --git a/core/src/main/java/org/springframework/security/task/DelegatingSecurityContextTaskExecutor.java b/core/src/main/java/org/springframework/security/task/DelegatingSecurityContextTaskExecutor.java index 8506bace35..22cdd8d0e2 100644 --- a/core/src/main/java/org/springframework/security/task/DelegatingSecurityContextTaskExecutor.java +++ b/core/src/main/java/org/springframework/security/task/DelegatingSecurityContextTaskExecutor.java @@ -45,7 +45,7 @@ public class DelegatingSecurityContextTaskExecutor extends * Creates a new {@link DelegatingSecurityContextTaskExecutor} that uses the current * {@link SecurityContext} from the {@link SecurityContextHolder}. * - * @param delegateTaskExecutor the {@link TaskExecutor} to delegate to. Cannot be + * @param delegate the {@link TaskExecutor} to delegate to. Cannot be * null. */ public DelegatingSecurityContextTaskExecutor(TaskExecutor delegate) { diff --git a/crypto/src/main/java/org/springframework/security/crypto/bcrypt/BCrypt.java b/crypto/src/main/java/org/springframework/security/crypto/bcrypt/BCrypt.java index ee06fd80e8..77a0592ce3 100644 --- a/crypto/src/main/java/org/springframework/security/crypto/bcrypt/BCrypt.java +++ b/crypto/src/main/java/org/springframework/security/crypto/bcrypt/BCrypt.java @@ -31,25 +31,25 @@ import java.security.SecureRandom; * with a random salt, like this: *

    * - * String pw_hash = BCrypt.hashpw(plain_password, BCrypt.gensalt());
    + * String pw_hash = BCrypt.hashpw(plain_password, BCrypt.gensalt());
    *     *

    * To check whether a plaintext password matches one that has been hashed previously, use * the checkpw method: *

    * - * if (BCrypt.checkpw(candidate_password, stored_hash))
    - *     System.out.println("It matches");
    - * else
    - *     System.out.println("It does not match");
    + * if (BCrypt.checkpw(candidate_password, stored_hash))
    + *     System.out.println("It matches");
    + * else
    + *     System.out.println("It does not match");
    *     *

    * The gensalt() method takes an optional parameter (log_rounds) that determines the * computational complexity of the hashing: *

    * - * String strong_salt = BCrypt.gensalt(10)
    - * String stronger_salt = BCrypt.gensalt(12)
    + * String strong_salt = BCrypt.gensalt(10)
    + * String stronger_salt = BCrypt.gensalt(12)
    *     *

    * The amount of work increases exponentially (2**log_rounds), so each increment is twice diff --git a/data/src/main/java/org/springframework/security/data/repository/query/SecurityEvaluationContextExtension.java b/data/src/main/java/org/springframework/security/data/repository/query/SecurityEvaluationContextExtension.java index f74d192eef..d94022db70 100644 --- a/data/src/main/java/org/springframework/security/data/repository/query/SecurityEvaluationContextExtension.java +++ b/data/src/main/java/org/springframework/security/data/repository/query/SecurityEvaluationContextExtension.java @@ -29,41 +29,39 @@ import java.util.Map; *

    * By defining this object as a Bean, Spring Security is exposed as SpEL expressions for * creating Spring Data queries. - *

    * *

    * With Java based configuration, we can define the bean using the following: - *

    * *

    * For example, if you return a UserDetails that extends the following User object: - *

    * * 
    - * @Entity
+ * @Entity
  * public class User {
- *     @GeneratedValue(strategy = GenerationType.AUTO)
- *     @Id
+ *     @GeneratedValue(strategy = GenerationType.AUTO)
+ *     @Id
  *     private Long id;
  * 
  *     ...
+ * }
  *
    * *

    * And you have a Message object that looks like the following: - *

    * * 
    - * @Entity
+ * @Entity
  * public class Message {
- *     @Id
- *     @GeneratedValue(strategy = GenerationType.AUTO)
+ *     @Id
+ *     @GeneratedValue(strategy = GenerationType.AUTO)
  *     private Long id;
  * 
- *     @OneToOne
+ *     @OneToOne
  *     private User to;
  * 
  *     ...
+ * }
  *
    * * You can use the following {@code Query} annotation to search for only messages that are diff --git a/ldap/src/main/java/org/springframework/security/ldap/DefaultSpringSecurityContextSource.java b/ldap/src/main/java/org/springframework/security/ldap/DefaultSpringSecurityContextSource.java index 2fe357ecb2..4d4e2376ef 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/DefaultSpringSecurityContextSource.java +++ b/ldap/src/main/java/org/springframework/security/ldap/DefaultSpringSecurityContextSource.java @@ -40,7 +40,7 @@ public class DefaultSpringSecurityContextSource extends LdapContextSource { * you want to use more than one server for fail-over, rather use the * {@link #DefaultSpringSecurityContextSource(List, String)} constructor. * - * @param providerUrl an LDAP URL of the form ldap://localhost:389/base_dn + * @param providerUrl an LDAP URL of the form ldap://localhost:389/base_dn */ public DefaultSpringSecurityContextSource(String providerUrl) { Assert.hasLength(providerUrl, "An LDAP connection URL must be supplied."); diff --git a/ldap/src/main/java/org/springframework/security/ldap/search/LdapUserSearch.java b/ldap/src/main/java/org/springframework/security/ldap/search/LdapUserSearch.java index af21a05be9..e367e69cf4 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/search/LdapUserSearch.java +++ b/ldap/src/main/java/org/springframework/security/ldap/search/LdapUserSearch.java @@ -22,8 +22,7 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException; * Obtains a user's information from the LDAP directory given a login name. *

    * May be optionally used to configure the LDAP authentication implementation when a more - * sophisticated approach is required than just using a simple username->DN mapping. - *

    + * sophisticated approach is required than just using a simple username->DN mapping. * * @author Luke Taylor */ diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulator.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulator.java index fcd30a8a91..b10d00ebe9 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulator.java +++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulator.java @@ -75,15 +75,15 @@ import java.util.Set; * * 
      * <bean id="ldapAuthoritiesPopulator"
- *       class="org.springframework.security.ldap.userdetails.DefaultLdapAuthoritiesPopulator">
- *   <constructor-arg ref="contextSource"/>
- *   <constructor-arg value="ou=groups"/>
- *   <property name="groupRoleAttribute" value="ou"/>
- * <!-- the following properties are shown with their default values -->
- *   <property name="searchSubtree" value="false"/>
- *   <property name="rolePrefix" value="ROLE_"/>
- *   <property name="convertToUpperCase" value="true"/>
- * </bean>
+ *       class="org.springframework.security.ldap.userdetails.DefaultLdapAuthoritiesPopulator">
+ *   <constructor-arg ref="contextSource"/>
+ *   <constructor-arg value="ou=groups"/>
+ *   <property name="groupRoleAttribute" value="ou"/>
+ * <!-- the following properties are shown with their default values -->
+ *   <property name="searchSubtree" value="false"/>
+ *   <property name="rolePrefix" value="ROLE_"/>
+ *   <property name="convertToUpperCase" value="true"/>
+ * </bean>
  *
    * * A search for roles for user "uid=ben,ou=people,dc=springframework,dc=org" would return @@ -292,7 +292,7 @@ public class DefaultLdapAuthoritiesPopulator implements LdapAuthoritiesPopulator /** * Sets the prefix which will be prepended to the values loaded from the directory. - * Defaults to "ROLE_" for compatibility with RoleVoter/tt>. + * Defaults to "ROLE_" for compatibility with RoleVoter. */ public void setRolePrefix(String rolePrefix) { Assert.notNull(rolePrefix, "rolePrefix must not be null"); @@ -326,7 +326,7 @@ public class DefaultLdapAuthoritiesPopulator implements LdapAuthoritiesPopulator * Returns the current LDAP template. Method available so that classes extending this * can override the template used * @return the LDAP template - * @see {@link org.springframework.security.ldap.SpringSecurityLdapTemplate} + * @see org.springframework.security.ldap.SpringSecurityLdapTemplate */ protected SpringSecurityLdapTemplate getLdapTemplate() { return ldapTemplate; @@ -336,7 +336,7 @@ public class DefaultLdapAuthoritiesPopulator implements LdapAuthoritiesPopulator * Returns the attribute name of the LDAP attribute that will be mapped to the role * name Method available so that classes extending this can override * @return the attribute name used for role mapping - * @see {@link #setGroupRoleAttribute(String)} + * @see #setGroupRoleAttribute(String) */ protected final String getGroupRoleAttribute() { return groupRoleAttribute; @@ -346,7 +346,7 @@ public class DefaultLdapAuthoritiesPopulator implements LdapAuthoritiesPopulator * Returns the search filter configured for this populator Method available so that * classes extending this can override * @return the search filter - * @see {@link #setGroupSearchFilter(String)} + * @see #setGroupSearchFilter(String) */ protected final String getGroupSearchFilter() { return groupSearchFilter; @@ -356,7 +356,7 @@ public class DefaultLdapAuthoritiesPopulator implements LdapAuthoritiesPopulator * Returns the role prefix used by this populator Method available so that classes * extending this can override * @return the role prefix - * @see {@link #setRolePrefix(String)} + * @see #setRolePrefix(String) */ protected final String getRolePrefix() { return rolePrefix; @@ -366,7 +366,7 @@ public class DefaultLdapAuthoritiesPopulator implements LdapAuthoritiesPopulator * Returns true if role names are converted to uppercase Method available so that * classes extending this can override * @return true if role names are converted to uppercase. - * @see {@link #setConvertToUpperCase(boolean)} + * @see #setConvertToUpperCase(boolean) */ protected final boolean isConvertToUpperCase() { return convertToUpperCase; @@ -376,7 +376,7 @@ public class DefaultLdapAuthoritiesPopulator implements LdapAuthoritiesPopulator * Returns the default role Method available so that classes extending this can * override * @return the default role used - * @see {@link #setDefaultRole(String)} + * @see #setDefaultRole(String) */ private GrantedAuthority getDefaultRole() { return defaultRole; diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/NestedLdapAuthoritiesPopulator.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/NestedLdapAuthoritiesPopulator.java index dd7fce5553..dfc6530121 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/NestedLdapAuthoritiesPopulator.java +++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/NestedLdapAuthoritiesPopulator.java @@ -110,9 +110,6 @@ import java.util.*; * ou: jdeveloper * member: uid=scaladude,ou=people,dc=springframework,dc=org * * - * - * - *

    * * @author Filip Hanik */ diff --git a/messaging/src/main/java/org/springframework/security/messaging/access/expression/ExpressionBasedMessageSecurityMetadataSourceFactory.java b/messaging/src/main/java/org/springframework/security/messaging/access/expression/ExpressionBasedMessageSecurityMetadataSourceFactory.java index 2fa7b0d8d9..85e5724681 100644 --- a/messaging/src/main/java/org/springframework/security/messaging/access/expression/ExpressionBasedMessageSecurityMetadataSourceFactory.java +++ b/messaging/src/main/java/org/springframework/security/messaging/access/expression/ExpressionBasedMessageSecurityMetadataSourceFactory.java @@ -45,7 +45,7 @@ public final class ExpressionBasedMessageSecurityMetadataSourceFactory { * For example: * * 
    -	 *     LinkedHashMap matcherToExpression = new LinkedHashMap();
+	 *     LinkedHashMap<MessageMatcher<?>,String> matcherToExpression = new LinkedHashMap<MessageMatcher<Object>,String>();
 	 *     matcherToExpression.put(new SimDestinationMessageMatcher("/public/**"), "permitAll");
 	 *     matcherToExpression.put(new SimDestinationMessageMatcher("/admin/**"), "hasRole('ROLE_ADMIN')");
 	 *     matcherToExpression.put(new SimDestinationMessageMatcher("/**"), "authenticated");
@@ -57,11 +57,9 @@ public final class ExpressionBasedMessageSecurityMetadataSourceFactory {
 	 * If our destination is "/public/hello", it would match on "/public/**" and on "/**".
 	 * However, only "/public/**" would be used since it is the first entry. That means
 	 * that a destination of "/public/hello" will be mapped to "permitAll".
-	 * 
    
 	 *
 	 * 
    
 	 * For a complete listing of expressions see {@link MessageSecurityExpressionRoot}
-	 * 
    
 	 *
 	 * @param matcherToExpression an ordered mapping of {@link MessageMatcher} to Strings
 	 * that are turned into an Expression using
@@ -81,7 +79,7 @@ public final class ExpressionBasedMessageSecurityMetadataSourceFactory {
 	 * For example:
 	 *
 	 * 
    -	 *     LinkedHashMap matcherToExpression = new LinkedHashMap();
+	 *     LinkedHashMap<MessageMatcher<?>,String> matcherToExpression = new LinkedHashMap<MessageMatcher<Object>,String>();
 	 *     matcherToExpression.put(new SimDestinationMessageMatcher("/public/**"), "permitAll");
 	 *     matcherToExpression.put(new SimDestinationMessageMatcher("/admin/**"), "hasRole('ROLE_ADMIN')");
 	 *     matcherToExpression.put(new SimDestinationMessageMatcher("/**"), "authenticated");
diff --git a/messaging/src/main/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptor.java b/messaging/src/main/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptor.java
index 0250fd0882..c3a967cb19 100644
--- a/messaging/src/main/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptor.java
+++ b/messaging/src/main/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptor.java
@@ -30,12 +30,10 @@ import org.springframework.util.Assert;
  * 
    
  * The SecurityMetadataSource required by this security interceptor is of
  * type {@link MessageSecurityMetadataSource}.
- * 
    
  * 
    
  * Refer to {@link AbstractSecurityInterceptor} for details on the workflow.
- * 
    
  *
- * @see 4.0
+ * @since 4.0
  * @author Rob Winch
  */
 public final class ChannelSecurityInterceptor extends AbstractSecurityInterceptor
diff --git a/messaging/src/main/java/org/springframework/security/messaging/context/AuthenticationPrincipalArgumentResolver.java b/messaging/src/main/java/org/springframework/security/messaging/context/AuthenticationPrincipalArgumentResolver.java
index f2e3267683..7c43b0093e 100644
--- a/messaging/src/main/java/org/springframework/security/messaging/context/AuthenticationPrincipalArgumentResolver.java
+++ b/messaging/src/main/java/org/springframework/security/messaging/context/AuthenticationPrincipalArgumentResolver.java
@@ -32,12 +32,13 @@ import org.springframework.stereotype.Controller;
  * {@link Controller}:
  *
  * 
    - * @Controller
+ * @Controller
  * public class MyController {
- *     @MessageMapping("/im")
+ *     @MessageMapping("/im")
  *     public void im(@AuthenticationPrincipal CustomUser customUser) {
  *         // do something with CustomUser
  *     }
+ * }
  * 
    
  *
  * 
    
@@ -47,11 +48,9 @@ import org.springframework.stereotype.Controller;
  * match, null will be returned unless
  * {@link AuthenticationPrincipal#errorOnInvalidType()} is true in which case a
  * {@link ClassCastException} will be thrown.
- * 
    
  *
  * 
    
  * Alternatively, users can create a custom meta annotation as shown below:
- * 
    
  *
  * 
      * @Target({ ElementType.PARAMETER })
@@ -63,15 +62,15 @@ import org.springframework.stereotype.Controller;
  *
  * 
    
  * The custom annotation can then be used instead. For example:
- * 
    
  *
  * 
    - * @Controller
+ * @Controller
  * public class MyController {
- *     @MessageMapping("/im")
+ *     @MessageMapping("/im")
  *     public void im(@CurrentUser CustomUser customUser) {
  *         // do something with CustomUser
  *     }
+ * }
  * 
    
  *
  * @author Rob Winch
diff --git a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/SimpDestinationMessageMatcher.java b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/SimpDestinationMessageMatcher.java
index 5471ce3115..bc46d2cb34 100644
--- a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/SimpDestinationMessageMatcher.java
+++ b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/SimpDestinationMessageMatcher.java
@@ -55,7 +55,6 @@ public final class SimpDestinationMessageMatcher implements MessageMatcher
 	 *
 	 * 
    
 	 * The mapping matches destinations despite the using the following rules:
@@ -87,7 +86,6 @@ public final class SimpDestinationMessageMatcher implements MessageMatcher
 	 * Creates a new instance with the specified pattern and {@link PathMatcher}.
-	 * 
    
 	 *
 	 * @param pattern the pattern to use
 	 * @param pathMatcher the {@link PathMatcher} to use.
@@ -100,7 +98,6 @@ public final class SimpDestinationMessageMatcher implements MessageMatcher
 	 * Creates a new instance with the specified pattern, {@link SimpMessageType}, and
 	 * {@link PathMatcher}.
-	 * 
    
 	 *
 	 * @param pattern the pattern to use
 	 * @param type the {@link SimpMessageType} to match on or null if any
@@ -155,10 +152,9 @@ public final class SimpDestinationMessageMatcher implements MessageMatcher
 	 * Creates a new instance with the specified pattern,
 	 * {@code SimpMessageType.SUBSCRIBE}, and {@link PathMatcher}.
-	 * 
    
 	 *
 	 * @param pattern the pattern to use
-	 * @param pathMatcher the {@link PathMatcher} to use.
+	 * @param matcher the {@link PathMatcher} to use.
 	 */
 	public static SimpDestinationMessageMatcher createSubscribeMatcher(String pattern,
 			PathMatcher matcher) {
@@ -170,10 +166,9 @@ public final class SimpDestinationMessageMatcher implements MessageMatcher
 	 * Creates a new instance with the specified pattern, {@code SimpMessageType.MESSAGE},
 	 * and {@link PathMatcher}.
-	 * 
    
 	 *
 	 * @param pattern the pattern to use
-	 * @param pathMatcher the {@link PathMatcher} to use.
+	 * @param matcher the {@link PathMatcher} to use.
 	 */
 	public static SimpDestinationMessageMatcher createMessageMatcher(String pattern,
 			PathMatcher matcher) {
diff --git a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationFilter.java b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationFilter.java
index 9562c110e5..91a240272b 100644
--- a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationFilter.java
+++ b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationFilter.java
@@ -246,17 +246,17 @@ public class OpenIDAuthenticationFilter extends AbstractAuthenticationProcessing
 
 	/**
 	 * Maps the return_to url to a realm, for example:
-	 * 
+	 *
 	 * 
    -	 * http://www.example.com/login/openid -> http://www.example.com/realm
+	 * http://www.example.com/login/openid -> http://www.example.com/realm
 	 * 
    
-	 * 
+	 *
 	 * If no mapping is provided then the returnToUrl will be parsed to extract the
 	 * protocol, hostname and port followed by a trailing slash. This means that
 	 * http://www.example.com/login/openid will automatically become
 	 * http://www.example.com:80/
 	 *
-	 * @param realmMapping containing returnToUrl -> realm mappings
+	 * @param realmMapping containing returnToUrl -> realm mappings
 	 */
 	public void setRealmMapping(Map realmMapping) {
 		this.realmMapping = realmMapping;
diff --git a/remoting/src/main/java/org/springframework/security/remoting/dns/DnsResolver.java b/remoting/src/main/java/org/springframework/security/remoting/dns/DnsResolver.java
index 461c870474..1485c11895 100644
--- a/remoting/src/main/java/org/springframework/security/remoting/dns/DnsResolver.java
+++ b/remoting/src/main/java/org/springframework/security/remoting/dns/DnsResolver.java
@@ -39,12 +39,11 @@ public interface DnsResolver {
 	/**
 	 * 
    
 	 * Resolves the host name for the specified service in the specified domain
-	 * 
    
+	 *
 	 * 
    
 	 * For example, if you need the host name for an LDAP server running in the domain
 	 * springsource.com, you would call resolveServiceEntry("ldap",
 	 * "springsource.com").
-	 * 
    
 	 *
 	 * 
    
 	 * The DNS server needs to provide the service records for this, in the example above,
@@ -59,7 +58,6 @@ public interface DnsResolver {
 	 * priority, it will return the one with the highest weight. You will find more
 	 * informatione about DNS service records at Wikipedia.
-	 * 
    
 	 *
 	 * @param serviceType The service type you are searching for, e.g. ldap, kerberos, ...
 	 * @param domain The domain, in which you are searching for the service
diff --git a/samples/servletapi-xml/src/main/java/org/springframework/security/samples/servletapi/mvc/ServletApiController.java b/samples/servletapi-xml/src/main/java/org/springframework/security/samples/servletapi/mvc/ServletApiController.java
index 17c113f253..41431bf469 100644
--- a/samples/servletapi-xml/src/main/java/org/springframework/security/samples/servletapi/mvc/ServletApiController.java
+++ b/samples/servletapi-xml/src/main/java/org/springframework/security/samples/servletapi/mvc/ServletApiController.java
@@ -41,7 +41,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
  * {@link HttpServletRequest#authenticate(HttpServletResponse)}
  * 
  • {@link #login(HttpServletRequest, HttpServletResponse, LoginForm, BindingResult)} -
  * Integration with {@link HttpServletRequest#login(String, String)}
    • 
- * 
  • {@link #logout(HttpServletRequest, HttpServletResponse)} - Integration with
+ * 
  • {@link #logout(HttpServletRequest, HttpServletResponse, RedirectAttributes)} - Integration with
  * {@link HttpServletRequest#logout()}
    • 
  * 
  • {@link #remoteUser(HttpServletRequest)} - Integration with
  * {@link HttpServletRequest#getRemoteUser()}
    • 
diff --git a/taglibs/src/main/java/org/springframework/security/taglibs/authz/AbstractAuthorizeTag.java b/taglibs/src/main/java/org/springframework/security/taglibs/authz/AbstractAuthorizeTag.java
index 1ccaeb601f..dcdf1de0b8 100644
--- a/taglibs/src/main/java/org/springframework/security/taglibs/authz/AbstractAuthorizeTag.java
+++ b/taglibs/src/main/java/org/springframework/security/taglibs/authz/AbstractAuthorizeTag.java
@@ -45,7 +45,7 @@ import org.springframework.web.context.support.WebApplicationContextUtils;
  * technology (JSP, Facelets). It treats tag attributes as simple strings rather than
  * strings that may contain expressions with the exception of the "access" attribute,
  * which is always expected to contain a Spring EL expression.
- * 
    
+ * 
    
  * Subclasses are expected to extract tag attribute values from the specific rendering
  * technology, evaluate them as expressions if necessary, and set the String-based
  * attributes of this class.
diff --git a/test/src/main/java/org/springframework/security/test/context/support/WithUserDetails.java b/test/src/main/java/org/springframework/security/test/context/support/WithUserDetails.java
index cf28e5bd56..32e5e42e04 100644
--- a/test/src/main/java/org/springframework/security/test/context/support/WithUserDetails.java
+++ b/test/src/main/java/org/springframework/security/test/context/support/WithUserDetails.java
@@ -40,9 +40,7 @@ import org.springframework.test.web.servlet.MockMvc;
  * 
  • The {@link SecurityContext} created with be that of
  * {@link SecurityContextHolder#createEmptyContext()}
    • 
  * 
  • It will be populated with an {@link UsernamePasswordAuthenticationToken} that uses
- * the username of either {@link #value()} or {@link #username()},
- * {@link GrantedAuthority} that are specified by {@link #roles()}, and a password
- * specified by {@link #password()}.
+ * the username of {@link #value()}.
  * 
  *
  * @see WithMockUser
diff --git a/test/src/main/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessors.java b/test/src/main/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessors.java
index e45755fa00..c5e28a9ec4 100644
--- a/test/src/main/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessors.java
+++ b/test/src/main/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessors.java
@@ -168,7 +168,7 @@ public final class SecurityMockMvcRequestPostProcessors {
 	 * for the {@link Authentication#getPrincipal()} and a custom {@link UserDetails}. All
 	 * details are declarative and do not require that the user actually exists.
 	 *
-	 * @param user the UserDetails to populate
+	 * @param authentication the Authentication to populate
 	 * @return the {@link RequestPostProcessor} to use
 	 */
 	public static RequestPostProcessor authentication(Authentication authentication) {
@@ -635,10 +635,10 @@ public final class SecurityMockMvcRequestPostProcessors {
 		 * {@link #authorities(GrantedAuthority...)}, but just not as flexible.
 		 *
 		 * @param roles The roles to populate. Note that if the role does not start with
-		 * {@link #rolePrefix(String)} it will automatically be prepended. This means by
+		 * {@link #ROLE_PREFIX} it will automatically be prepended. This means by
 		 * default {@code roles("ROLE_USER")} and {@code roles("USER")} are equivalent.
 		 * @see #authorities(GrantedAuthority...)
-		 * @see #rolePrefix(String)
+		 * @see #ROLE_PREFIX
 		 * @return the UserRequestPostProcessor for further customizations
 		 */
 		public UserRequestPostProcessor roles(String... roles) {
diff --git a/test/src/main/java/org/springframework/security/test/web/servlet/response/SecurityMockMvcResultMatchers.java b/test/src/main/java/org/springframework/security/test/web/servlet/response/SecurityMockMvcResultMatchers.java
index c44a930efe..7078514dd9 100644
--- a/test/src/main/java/org/springframework/security/test/web/servlet/response/SecurityMockMvcResultMatchers.java
+++ b/test/src/main/java/org/springframework/security/test/web/servlet/response/SecurityMockMvcResultMatchers.java
@@ -202,7 +202,7 @@ public final class SecurityMockMvcResultMatchers {
 		/**
 		 * Specifies the {@link Authentication#getAuthorities()}
 		 *
-		 * @param expected the roles. Each value is automatically prefixed with "ROLE_"
+		 * @param roles the roles. Each value is automatically prefixed with "ROLE_"
 		 * @return the {@link AuthenticatedMatcher} for further customization
 		 */
 		public AuthenticatedMatcher withRoles(String... roles) {
diff --git a/test/src/main/java/org/springframework/security/test/web/support/WebTestUtils.java b/test/src/main/java/org/springframework/security/test/web/support/WebTestUtils.java
index 96f7c1f830..360d51d005 100644
--- a/test/src/main/java/org/springframework/security/test/web/support/WebTestUtils.java
+++ b/test/src/main/java/org/springframework/security/test/web/support/WebTestUtils.java
@@ -69,8 +69,6 @@ public abstract class WebTestUtils {
 	 * @param request the {@link HttpServletRequest} to obtain the
 	 * {@link SecurityContextRepository}
 	 * @param securityContextRepository the {@link SecurityContextRepository} to set
-	 * @return the {@link SecurityContextRepository} for the specified
-	 * {@link HttpServletRequest}
 	 */
 	public static void setSecurityContextRepository(HttpServletRequest request,
 			SecurityContextRepository securityContextRepository) {
diff --git a/web/src/main/java/org/springframework/security/web/FilterChainProxy.java b/web/src/main/java/org/springframework/security/web/FilterChainProxy.java
index b3345730d4..841a85b2cd 100644
--- a/web/src/main/java/org/springframework/security/web/FilterChainProxy.java
+++ b/web/src/main/java/org/springframework/security/web/FilterChainProxy.java
@@ -59,14 +59,14 @@ import java.util.*;
  * requests which match the pattern. An example configuration might look like this:
  *
  * 
    - *  <bean id="myfilterChainProxy" class="org.springframework.security.util.FilterChainProxy">
- *      <constructor-arg>
- *          <util:list>
- *              <security:filter-chain pattern="/do/not/filter*" filters="none"/>
- *              <security:filter-chain pattern="/**" filters="filter1,filter2,filter3"/>
- *          </util:list>
- *      </constructor-arg>
- *  </bean>
+ *  <bean id="myfilterChainProxy" class="org.springframework.security.util.FilterChainProxy">
+ *      <constructor-arg>
+ *          <util:list>
+ *              <security:filter-chain pattern="/do/not/filter*" filters="none"/>
+ *              <security:filter-chain pattern="/**" filters="filter1,filter2,filter3"/>
+ *          </util:list>
+ *      </constructor-arg>
+ *  </bean>
  * 
    
  *
  * The names "filter1", "filter2", "filter3" should be the bean names of {@code Filter}
diff --git a/web/src/main/java/org/springframework/security/web/PortMapperImpl.java b/web/src/main/java/org/springframework/security/web/PortMapperImpl.java
index 74f20ee371..b81976994f 100644
--- a/web/src/main/java/org/springframework/security/web/PortMapperImpl.java
+++ b/web/src/main/java/org/springframework/security/web/PortMapperImpl.java
@@ -50,7 +50,7 @@ public class PortMapperImpl implements PortMapper {
 	// ========================================================================================================
 
 	/**
-	 * Returns the translated (Integer -> Integer) version of the original port mapping
+	 * Returns the translated (Integer -> Integer) version of the original port mapping
 	 * specified via setHttpsPortMapping()
 	 */
 	public Map getTranslatedPortMappings() {
@@ -77,12 +77,12 @@ public class PortMapperImpl implements PortMapper {
 	 * like this:
 	 * 
 	 * 
    -	 *  <property name="portMappings">
-	 *      <map>
-	 *          <entry key="80"><value>443</value></entry>
-	 *          <entry key="8080"><value>8443</value></entry>
-	 *      </map>
-	 * </property>
+	 *  <property name="portMappings">
+	 *      <map>
+	 *          <entry key="80"><value>443</value></entry>
+	 *          <entry key="8080"><value>8443</value></entry>
+	 *      </map>
+	 * </property>
 	 * 
    
 	 *
 	 * @param newMappings A Map consisting of String keys and String values, where for
diff --git a/web/src/main/java/org/springframework/security/web/access/channel/ChannelProcessingFilter.java b/web/src/main/java/org/springframework/security/web/access/channel/ChannelProcessingFilter.java
index e3d8312166..de992b8bb1 100644
--- a/web/src/main/java/org/springframework/security/web/access/channel/ChannelProcessingFilter.java
+++ b/web/src/main/java/org/springframework/security/web/access/channel/ChannelProcessingFilter.java
@@ -50,30 +50,30 @@ import org.springframework.web.filter.GenericFilterBean;
  * 
  * 
      *
- * <bean id="channelProcessingFilter" class="org.springframework.security.web.access.channel.ChannelProcessingFilter">
- *   <property name="channelDecisionManager" ref="channelDecisionManager"/>
- *   <property name="securityMetadataSource">
- *     <security:filter-security-metadata-source request-matcher="regex">
- *       <security:intercept-url pattern="\A/secure/.*\Z" access="REQUIRES_SECURE_CHANNEL"/>
- *       <security:intercept-url pattern="\A/login.jsp.*\Z" access="REQUIRES_SECURE_CHANNEL"/>
- *       <security:intercept-url pattern="\A/.*\Z" access="ANY_CHANNEL"/>
- *     </security:filter-security-metadata-source>
- *   </property>
- * </bean>
+ * <bean id="channelProcessingFilter" class="org.springframework.security.web.access.channel.ChannelProcessingFilter">
+ *   <property name="channelDecisionManager" ref="channelDecisionManager"/>
+ *   <property name="securityMetadataSource">
+ *     <security:filter-security-metadata-source request-matcher="regex">
+ *       <security:intercept-url pattern="\A/secure/.*\Z" access="REQUIRES_SECURE_CHANNEL"/>
+ *       <security:intercept-url pattern="\A/login.jsp.*\Z" access="REQUIRES_SECURE_CHANNEL"/>
+ *       <security:intercept-url pattern="\A/.*\Z" access="ANY_CHANNEL"/>
+ *     </security:filter-security-metadata-source>
+ *   </property>
+ * </bean>
  * 
- * <bean id="channelDecisionManager" class="org.springframework.security.web.access.channel.ChannelDecisionManagerImpl">
- *   <property name="channelProcessors">
- *     <list>
- *     <ref bean="secureChannelProcessor"/>
- *     <ref bean="insecureChannelProcessor"/>
- *     </list>
- *   </property>
- * </bean>
+ * <bean id="channelDecisionManager" class="org.springframework.security.web.access.channel.ChannelDecisionManagerImpl">
+ *   <property name="channelProcessors">
+ *     <list>
+ *     <ref bean="secureChannelProcessor"/>
+ *     <ref bean="insecureChannelProcessor"/>
+ *     </list>
+ *   </property>
+ * </bean>
  * 
  * <bean id="secureChannelProcessor"
- *   class="org.springframework.security.web.access.channel.SecureChannelProcessor"/>
+ *   class="org.springframework.security.web.access.channel.SecureChannelProcessor"/>
  * <bean id="insecureChannelProcessor"
- *   class="org.springframework.security.web.access.channel.InsecureChannelProcessor"/>
+ *   class="org.springframework.security.web.access.channel.InsecureChannelProcessor"/>
  * 
  * 
    
  * 
diff --git a/web/src/main/java/org/springframework/security/web/access/expression/DefaultWebSecurityExpressionHandler.java b/web/src/main/java/org/springframework/security/web/access/expression/DefaultWebSecurityExpressionHandler.java
index 55d9e1c494..2b4ff7d89c 100644
--- a/web/src/main/java/org/springframework/security/web/access/expression/DefaultWebSecurityExpressionHandler.java
+++ b/web/src/main/java/org/springframework/security/web/access/expression/DefaultWebSecurityExpressionHandler.java
@@ -46,8 +46,8 @@ public class DefaultWebSecurityExpressionHandler extends
 
 	/**
 	 * 
    
-	 * Sets the default prefix to be added to {@link #hasAnyRole(String...)} or
-	 * {@link #hasRole(String)}. For example, if hasRole("ADMIN") or hasRole("ROLE_ADMIN")
+	 * Sets the default prefix to be added to {@link org.springframework.security.access.expression.SecurityExpressionRoot#hasAnyRole(String...)} or
+	 * {@link org.springframework.security.access.expression.SecurityExpressionRoot#hasRole(String)}. For example, if hasRole("ADMIN") or hasRole("ROLE_ADMIN")
 	 * is passed in, then the role ROLE_ADMIN will be used when the defaultRolePrefix is
 	 * "ROLE_" (default).
 	 * 
    
diff --git a/web/src/main/java/org/springframework/security/web/authentication/SavedRequestAwareAuthenticationSuccessHandler.java b/web/src/main/java/org/springframework/security/web/authentication/SavedRequestAwareAuthenticationSuccessHandler.java
index f971e83cdb..6dc2b7713f 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/SavedRequestAwareAuthenticationSuccessHandler.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/SavedRequestAwareAuthenticationSuccessHandler.java
@@ -10,15 +10,14 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.web.access.ExceptionTranslationFilter;
-import org.springframework.security.web.savedrequest.HttpSessionRequestCache;
-import org.springframework.security.web.savedrequest.RequestCache;
-import org.springframework.security.web.savedrequest.SavedRequest;
-import org.springframework.security.web.savedrequest.DefaultSavedRequest;
 import org.springframework.util.StringUtils;
+import org.springframework.security.web.savedrequest.SavedRequest;
+import org.springframework.security.web.savedrequest.RequestCache;
+import org.springframework.security.web.savedrequest.HttpSessionRequestCache;
 
 /**
  * An authentication success strategy which can make use of the
- * {@link DefaultSavedRequest} which may have been stored in the session by the
+ * {@link org.springframework.security.web.savedrequest.DefaultSavedRequest} which may have been stored in the session by the
  * {@link ExceptionTranslationFilter}. When such a request is intercepted and requires
  * authentication, the request data is stored to record the original destination before
  * the authentication process commenced, and to allow the request to be reconstructed when
@@ -36,15 +35,15 @@ import org.springframework.util.StringUtils;
  * If the {@code targetUrlParameter} has been set on the request, the value will be used
  * as the destination. Any {@code DefaultSavedRequest} will again be removed.
    • 
  * 
  • 
- * If a {@link SavedRequest} is found in the {@code RequestCache} (as set by the
+ * If a {@link org.springframework.security.web.savedrequest.SavedRequest} is found in the {@code RequestCache} (as set by the
  * {@link ExceptionTranslationFilter} to record the original destination before the
  * authentication process commenced), a redirect will be performed to the Url of that
  * original destination. The {@code SavedRequest} object will remain cached and be picked
  * up when the redirected request is received (See
- * {@link org.springframework.security.web.savedrequest.SavedRequestAwareWrapper
- * SavedRequestAwareWrapper}).
    • 
+ * SavedRequestAwareWrapper).
+ * 
  * 
  • 
- * If no {@code SavedRequest} is found, it will delegate to the base class.
    • 
+ * If no {@link org.springframework.security.web.savedrequest.SavedRequest} is found, it will delegate to the base class.
  * 
  *
  * @author Luke Taylor
diff --git a/web/src/main/java/org/springframework/security/web/authentication/session/ChangeSessionIdAuthenticationStrategy.java b/web/src/main/java/org/springframework/security/web/authentication/session/ChangeSessionIdAuthenticationStrategy.java
index 6b08a9a1c9..f84a6c90f1 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/session/ChangeSessionIdAuthenticationStrategy.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/session/ChangeSessionIdAuthenticationStrategy.java
@@ -23,7 +23,7 @@ import javax.servlet.http.HttpSession;
 import org.springframework.util.ReflectionUtils;
 
 /**
- * Uses {@link HttpServletRequest#changeSessionId()} to protect against session fixation
+ * Uses {@code HttpServletRequest.changeSessionId()} to protect against session fixation
  * attacks. This is the default implementation for Servlet 3.1+.
  *
  * @author Rob Winch
diff --git a/web/src/main/java/org/springframework/security/web/authentication/session/RegisterSessionAuthenticationStrategy.java b/web/src/main/java/org/springframework/security/web/authentication/session/RegisterSessionAuthenticationStrategy.java
index 9febfde5f4..bb178306fb 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/session/RegisterSessionAuthenticationStrategy.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/session/RegisterSessionAuthenticationStrategy.java
@@ -16,13 +16,12 @@ import org.springframework.util.Assert;
  * {@link RegisterSessionAuthenticationStrategy} is typically used in combination with
  * {@link CompositeSessionAuthenticationStrategy} and
  * {@link ConcurrentSessionControlAuthenticationStrategy}, but can be used on its own if
- * tracking of sessions is desired but no need to control concurrency.
    
  * NOTE: When using a {@link SessionRegistry} it is important that all sessions (including
  * timed out sessions) are removed. This is typically done by adding
  * {@link HttpSessionEventPublisher}.
- * 
    
  *
  * @see CompositeSessionAuthenticationStrategy
  *
diff --git a/web/src/main/java/org/springframework/security/web/authentication/session/SessionFixationProtectionStrategy.java b/web/src/main/java/org/springframework/security/web/authentication/session/SessionFixationProtectionStrategy.java
index 78526f4450..061b4b34ff 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/session/SessionFixationProtectionStrategy.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/session/SessionFixationProtectionStrategy.java
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpSession;
 import org.springframework.util.Assert;
 
 /**
- * The default implementation of {@link SessionAuthenticationStrategy} when using <
+ * The default implementation of {@link SessionAuthenticationStrategy} when using <
  * Servlet 3.1.
  * 
    
  * Creates a new session for the newly authenticated user if they already have a session
diff --git a/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserFilter.java b/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserFilter.java
index cdc23a4152..52d51fe5bb 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserFilter.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserFilter.java
@@ -92,12 +92,12 @@ import org.springframework.web.filter.GenericFilterBean;
  * correct constraints to the switchUserUrl. Example:
  * 
  * 
    - * <bean id="switchUserProcessingFilter" class="org.springframework.security.web.authentication.switchuser.SwitchUserFilter">
- *    <property name="userDetailsService" ref="userDetailsService" />
- *    <property name="switchUserUrl" value="/login/impersonate" />
- *    <property name="exitUserUrl" value="/logout/impersonate" />
- *    <property name="targetUrl" value="/index.jsp" />
- * </bean>
+ * <bean id="switchUserProcessingFilter" class="org.springframework.security.web.authentication.switchuser.SwitchUserFilter">
+ *    <property name="userDetailsService" ref="userDetailsService" />
+ *    <property name="switchUserUrl" value="/login/impersonate" />
+ *    <property name="exitUserUrl" value="/logout/impersonate" />
+ *    <property name="targetUrl" value="/index.jsp" />
+ * </bean>
  * 
    
  *
  * @author Mark St.Godard
diff --git a/web/src/main/java/org/springframework/security/web/bind/support/AuthenticationPrincipalArgumentResolver.java b/web/src/main/java/org/springframework/security/web/bind/support/AuthenticationPrincipalArgumentResolver.java
index 25e36a1713..e1083756d7 100644
--- a/web/src/main/java/org/springframework/security/web/bind/support/AuthenticationPrincipalArgumentResolver.java
+++ b/web/src/main/java/org/springframework/security/web/bind/support/AuthenticationPrincipalArgumentResolver.java
@@ -34,13 +34,14 @@ import org.springframework.web.method.support.ModelAndViewContainer;
  * {@link Controller}:
  *
  * 
    - * @Controller
+ * @Controller
  * public class MyController {
- *     @RequestMapping("/user/current/show")
+ *     @RequestMapping("/user/current/show")
  *     public String show(@AuthenticationPrincipal CustomUser customUser) {
  *         // do something with CustomUser
  *         return "view";
  *     }
+ * }
  * 
    
  *
  * 
    
@@ -50,11 +51,9 @@ import org.springframework.web.method.support.ModelAndViewContainer;
  * match, null will be returned unless
  * {@link AuthenticationPrincipal#errorOnInvalidType()} is true in which case a
  * {@link ClassCastException} will be thrown.
- * 
    
  *
  * 
    
  * Alternatively, users can create a custom meta annotation as shown below:
- * 
    
  *
  * 
      * @Target({ ElementType.PARAMETER })
@@ -66,16 +65,16 @@ import org.springframework.web.method.support.ModelAndViewContainer;
  *
  * 
    
  * The custom annotation can then be used instead. For example:
- * 
    
  *
  * 
    - * @Controller
+ * @Controller
  * public class MyController {
- *     @RequestMapping("/user/current/show")
+ *     @RequestMapping("/user/current/show")
  *     public String show(@CurrentUser CustomUser customUser) {
  *         // do something with CustomUser
  *         return "view";
  *     }
+ * }
  * 
    
  *
  * @deprecated use org.springframework.security.web.method.annotation.
diff --git a/web/src/main/java/org/springframework/security/web/context/AbstractSecurityWebApplicationInitializer.java b/web/src/main/java/org/springframework/security/web/context/AbstractSecurityWebApplicationInitializer.java
index f329c1269d..0254d38a1e 100644
--- a/web/src/main/java/org/springframework/security/web/context/AbstractSecurityWebApplicationInitializer.java
+++ b/web/src/main/java/org/springframework/security/web/context/AbstractSecurityWebApplicationInitializer.java
@@ -267,7 +267,7 @@ public abstract class AbstractSecurityWebApplicationInitializer implements
 	}
 
 	/**
-	 * Return the  to use the DispatcherServlet's
+	 * Return the <servlet-name> to use the DispatcherServlet's
 	 * {@link WebApplicationContext} to find the {@link DelegatingFilterProxy} or null to
 	 * use the parent {@link ApplicationContext}.
 	 *
@@ -278,7 +278,7 @@ public abstract class AbstractSecurityWebApplicationInitializer implements
 	 * {@link WebApplicationContext}.
 	 * 
    
 	 *
-	 * @return the  of the DispatcherServlet to use its
+	 * @return the <servlet-name> of the DispatcherServlet to use its
 	 * {@link WebApplicationContext} or null (default) to use the parent
 	 * {@link ApplicationContext}.
 	 */
diff --git a/web/src/main/java/org/springframework/security/web/csrf/InvalidCsrfTokenException.java b/web/src/main/java/org/springframework/security/web/csrf/InvalidCsrfTokenException.java
index ab4577a607..63a9b0e3aa 100644
--- a/web/src/main/java/org/springframework/security/web/csrf/InvalidCsrfTokenException.java
+++ b/web/src/main/java/org/springframework/security/web/csrf/InvalidCsrfTokenException.java
@@ -28,7 +28,8 @@ import javax.servlet.http.HttpServletRequest;
 public class InvalidCsrfTokenException extends CsrfException {
 
 	/**
-	 * @param msg
+	 * @param expectedAccessToken
+	 * @param actualAccessToken
 	 */
 	public InvalidCsrfTokenException(CsrfToken expectedAccessToken,
 			String actualAccessToken) {
diff --git a/web/src/main/java/org/springframework/security/web/header/writers/XXssProtectionHeaderWriter.java b/web/src/main/java/org/springframework/security/web/header/writers/XXssProtectionHeaderWriter.java
index 429a74c1fb..1ed6d44329 100644
--- a/web/src/main/java/org/springframework/security/web/header/writers/XXssProtectionHeaderWriter.java
+++ b/web/src/main/java/org/springframework/security/web/header/writers/XXssProtectionHeaderWriter.java
@@ -85,7 +85,7 @@ public final class XXssProtectionHeaderWriter implements HeaderWriter {
 	 * If false, will not specify the mode as blocked. In this instance, any content will
 	 * be attempted to be fixed. If true, the content will be replaced with "#".
 	 *
-	 * @param enabled the new value
+	 * @param block the new value
 	 */
 	public void setBlock(boolean block) {
 		if (!enabled && block) {
diff --git a/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/RegExpAllowFromStrategy.java b/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/RegExpAllowFromStrategy.java
index 9badedbe9f..d7e8a102d0 100644
--- a/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/RegExpAllowFromStrategy.java
+++ b/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/RegExpAllowFromStrategy.java
@@ -7,7 +7,7 @@ import java.util.regex.Pattern;
 /**
  * Implementation which uses a regular expression to validate the supplied origin. If the
  * value of the HTTP parameter matches the pattern, then the the result will be ALLOW-FROM
- * .
+ * <paramter-value>.
  *
  * @author Marten Deinum
  * @since 3.2
diff --git a/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/XFrameOptionsHeaderWriter.java b/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/XFrameOptionsHeaderWriter.java
index ab3ff499c1..1c9c32b1ca 100644
--- a/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/XFrameOptionsHeaderWriter.java
+++ b/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/XFrameOptionsHeaderWriter.java
@@ -50,7 +50,7 @@ public final class XFrameOptionsHeaderWriter implements HeaderWriter {
 	 *
 	 * @param frameOptionsMode the {@link XFrameOptionsMode} to use. If using
 	 * {@link XFrameOptionsMode#ALLOW_FROM}, use
-	 * {@link #FrameOptionsHeaderWriter(AllowFromStrategy)} instead.
+	 * {@link #XFrameOptionsHeaderWriter(AllowFromStrategy)} instead.
 	 */
 	public XFrameOptionsHeaderWriter(XFrameOptionsMode frameOptionsMode) {
 		Assert.notNull(frameOptionsMode, "frameOptionsMode cannot be null");
diff --git a/web/src/main/java/org/springframework/security/web/method/annotation/AuthenticationPrincipalArgumentResolver.java b/web/src/main/java/org/springframework/security/web/method/annotation/AuthenticationPrincipalArgumentResolver.java
index ba56970760..5261658ea8 100644
--- a/web/src/main/java/org/springframework/security/web/method/annotation/AuthenticationPrincipalArgumentResolver.java
+++ b/web/src/main/java/org/springframework/security/web/method/annotation/AuthenticationPrincipalArgumentResolver.java
@@ -34,12 +34,13 @@ import org.springframework.web.method.support.ModelAndViewContainer;
  * {@link Controller}:
  *
  * 
    - * @Controller
+ * @Controller
  * public class MyController {
- *     @MessageMapping("/im")
+ *     @MessageMapping("/im")
  *     public void im(@AuthenticationPrincipal CustomUser customUser) {
  *         // do something with CustomUser
  *     }
+ * }
  * 
    
  *
  * 
    
@@ -49,11 +50,9 @@ import org.springframework.web.method.support.ModelAndViewContainer;
  * match, null will be returned unless
  * {@link AuthenticationPrincipal#errorOnInvalidType()} is true in which case a
  * {@link ClassCastException} will be thrown.
- * 
    
  *
  * 
    
  * Alternatively, users can create a custom meta annotation as shown below:
- * 
    
  *
  * 
      * @Target({ ElementType.PARAMETER })
@@ -65,15 +64,15 @@ import org.springframework.web.method.support.ModelAndViewContainer;
  *
  * 
    
  * The custom annotation can then be used instead. For example:
- * 
    
  *
  * 
    - * @Controller
+ * @Controller
  * public class MyController {
- *     @MessageMapping("/im")
+ *     @MessageMapping("/im")
  *     public void im(@CurrentUser CustomUser customUser) {
  *         // do something with CustomUser
  *     }
+ * }
  * 
    
  *
  * @author Rob Winch
diff --git a/web/src/main/java/org/springframework/security/web/savedrequest/SavedRequestAwareWrapper.java b/web/src/main/java/org/springframework/security/web/savedrequest/SavedRequestAwareWrapper.java
index 21480decec..1c213c06bf 100644
--- a/web/src/main/java/org/springframework/security/web/savedrequest/SavedRequestAwareWrapper.java
+++ b/web/src/main/java/org/springframework/security/web/savedrequest/SavedRequestAwareWrapper.java
@@ -43,7 +43,6 @@ import org.apache.commons.logging.LogFactory;
  * wrapper. Nevertheless, the important data from the original request is emulated and
  * this should prove adequate for most purposes (in particular standard HTTP GET and POST
  * operations).
- * 
    
  *
  * 
    
  * Added into a request by
diff --git a/web/src/main/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestFilter.java b/web/src/main/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestFilter.java
index ad6712a348..cf638c33e2 100644
--- a/web/src/main/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestFilter.java
+++ b/web/src/main/java/org/springframework/security/web/servletapi/SecurityContextHolderAwareRequestFilter.java
@@ -155,7 +155,7 @@ public class SecurityContextHolderAwareRequestFilter extends GenericFilterBean {
 	 * when invoking {@link HttpServletRequest#logout()}.
 	 * 
    
 	 *
-	 * @param logoutHandlers the {@link List}s when invoking
+	 * @param logoutHandlers the {@code List<LogoutHandler>}s when invoking
 	 * {@link HttpServletRequest#logout()}.
 	 *
 	 * @throws IllegalStateException if the Servlet 3 APIs are not found on the classpath
diff --git a/web/src/main/java/org/springframework/security/web/util/ThrowableAnalyzer.java b/web/src/main/java/org/springframework/security/web/util/ThrowableAnalyzer.java
index 90a0239b3d..34b88f0870 100755
--- a/web/src/main/java/org/springframework/security/web/util/ThrowableAnalyzer.java
+++ b/web/src/main/java/org/springframework/security/web/util/ThrowableAnalyzer.java
@@ -102,8 +102,11 @@ public class ThrowableAnalyzer {
 	/**
 	 * Initializes associations between Throwables and
 	 * ThrowableCauseExtractors. The default implementation performs the
-	 * following registrations: 
  • {@link #DEFAULT_EXTRACTOR} for {@link Throwable}
    • 
-	 * 
  • {@link #INVOCATIONTARGET_EXTRACTOR} for {@link InvocationTargetException}
    •  
    
+	 * following registrations:
+	 * 
      
+	 * 
    • {@link #DEFAULT_EXTRACTOR} for {@link Throwable}
      • 
+	 * 
    • {@link #INVOCATIONTARGET_EXTRACTOR} for {@link InvocationTargetException}
      • 
+	 * 

    
 	 * Subclasses overriding this method are encouraged to invoke the super method to
 	 * perform the default registrations. They can register additional extractors as
 	 * required.
    Column