diff --git a/core/src/main/java/org/springframework/security/config/FormLoginBeanDefinitionParser.java b/core/src/main/java/org/springframework/security/config/FormLoginBeanDefinitionParser.java
index fe40306d2c..3bd9d41b4a 100644
--- a/core/src/main/java/org/springframework/security/config/FormLoginBeanDefinitionParser.java
+++ b/core/src/main/java/org/springframework/security/config/FormLoginBeanDefinitionParser.java
@@ -137,18 +137,18 @@ public class FormLoginBeanDefinitionParser implements BeanDefinitionParser {
filterBuilder.addPropertyValue("filterProcessesUrl", loginUrl);
if (StringUtils.hasText(successHandlerRef)) {
- filterBuilder.addPropertyReference("successHandler", successHandlerRef);
+ filterBuilder.addPropertyReference("authenticationSuccessHandler", successHandlerRef);
} else {
BeanDefinitionBuilder successHandler = BeanDefinitionBuilder.rootBeanDefinition(SavedRequestAwareAuthenticationSuccessHandler.class);
if ("true".equals(alwaysUseDefault)) {
successHandler.addPropertyValue("alwaysUseDefaultTargetUrl", Boolean.TRUE);
}
successHandler.addPropertyValue("defaultTargetUrl", StringUtils.hasText(defaultTargetUrl) ? defaultTargetUrl : DEF_FORM_LOGIN_TARGET_URL);
- filterBuilder.addPropertyValue("successHandler", successHandler.getBeanDefinition());
+ filterBuilder.addPropertyValue("authenticationSuccessHandler", successHandler.getBeanDefinition());
}
if (StringUtils.hasText(failureHandlerRef)) {
- filterBuilder.addPropertyReference("failureHandler", failureHandlerRef);
+ filterBuilder.addPropertyReference("authenticationFailureHandler", failureHandlerRef);
} else {
BeanDefinitionBuilder failureHandler = BeanDefinitionBuilder.rootBeanDefinition(SimpleUrlAuthenticationFailureHandler.class);
if (!StringUtils.hasText(authenticationFailureUrl)) {
@@ -160,7 +160,7 @@ public class FormLoginBeanDefinitionParser implements BeanDefinitionParser {
}
}
failureHandler.addPropertyValue("defaultFailureUrl", authenticationFailureUrl);
- filterBuilder.addPropertyValue("failureHandler", failureHandler.getBeanDefinition());
+ filterBuilder.addPropertyValue("authenticationFailureHandler", failureHandler.getBeanDefinition());
}
return (RootBeanDefinition) filterBuilder.getBeanDefinition();
diff --git a/core/src/main/java/org/springframework/security/ui/AbstractProcessingFilter.java b/core/src/main/java/org/springframework/security/ui/AbstractProcessingFilter.java
index 876c090ea1..073ef22410 100644
--- a/core/src/main/java/org/springframework/security/ui/AbstractProcessingFilter.java
+++ b/core/src/main/java/org/springframework/security/ui/AbstractProcessingFilter.java
@@ -61,7 +61,7 @@ import org.springframework.util.Assert;
*
* If authentication is successful, the resulting {@link Authentication} object will be placed into the
* SecurityContext for the current thread, which is guaranteed to have already been created by an earlier
- * filter. The configured {@link #setSuccessHandler(AuthenticationSuccessHandler) AuthenticationSuccessHandler} will
+ * filter. The configured {@link #setAuthenticationSuccessHandler(AuthenticationSuccessHandler) AuthenticationSuccessHandler} will
* then be called to take the redirect to the appropriate destination after a successful login. The default behaviour
* is implemented in a {@link SavedRequestAwareAuthenticationSuccessHandler} which will make use of any
* SavedRequest set by the ExceptionTranslationFilter and redirect the user to the URL contained
@@ -427,12 +427,12 @@ public abstract class AbstractProcessingFilter extends SpringSecurityFilter impl
* Sets the strategy used to handle a successful authentication.
* By default a {@link SavedRequestAwareAuthenticationSuccessHandler} is used.
*/
- public void setSuccessHandler(AuthenticationSuccessHandler successHandler) {
+ public void setAuthenticationSuccessHandler(AuthenticationSuccessHandler successHandler) {
Assert.notNull(successHandler, "successHandler cannot be null");
this.successHandler = successHandler;
}
- public void setFailureHandler(AuthenticationFailureHandler failureHandler) {
+ public void setAuthenticationFailureHandler(AuthenticationFailureHandler failureHandler) {
Assert.notNull(failureHandler, "failureHandler cannot be null");
this.failureHandler = failureHandler;
}
diff --git a/core/src/test/java/org/springframework/security/ui/AbstractProcessingFilterTests.java b/core/src/test/java/org/springframework/security/ui/AbstractProcessingFilterTests.java
index 7ddbdedb58..49405473f8 100644
--- a/core/src/test/java/org/springframework/security/ui/AbstractProcessingFilterTests.java
+++ b/core/src/test/java/org/springframework/security/ui/AbstractProcessingFilterTests.java
@@ -136,7 +136,7 @@ public class AbstractProcessingFilterTests extends TestCase {
// Setup our test object, to deny access
MockAbstractProcessingFilter filter = new MockAbstractProcessingFilter(false);
- filter.setFailureHandler(failureHandler);
+ filter.setAuthenticationFailureHandler(failureHandler);
// Test
executeFilterInContainerSimulator(config, filter, request, response, chain);
@@ -147,7 +147,7 @@ public class AbstractProcessingFilterTests extends TestCase {
//Prepare again, this time using the exception mapping
filter = new MockAbstractProcessingFilter(new AccountExpiredException("You're account is expired"));
ExceptionMappingAuthenticationFailureHandler failureHandler = new ExceptionMappingAuthenticationFailureHandler();
- filter.setFailureHandler(failureHandler);
+ filter.setAuthenticationFailureHandler(failureHandler);
Properties exceptionMappings = new Properties();
exceptionMappings.setProperty(AccountExpiredException.class.getName(), "/accountExpired.jsp");
failureHandler.setExceptionMappings(exceptionMappings);
@@ -176,7 +176,7 @@ public class AbstractProcessingFilterTests extends TestCase {
// Setup our test object, to grant access
MockAbstractProcessingFilter filter = new MockAbstractProcessingFilter(true);
filter.setFilterProcessesUrl("/j_OTHER_LOCATION");
- filter.setSuccessHandler(successHandler);
+ filter.setAuthenticationSuccessHandler(successHandler);
// Test
executeFilterInContainerSimulator(config, filter, request, response, chain);
@@ -234,8 +234,8 @@ public class AbstractProcessingFilterTests extends TestCase {
MockAbstractProcessingFilter filter = new MockAbstractProcessingFilter(true);
filter.setFilterProcessesUrl("/j_mock_post");
- filter.setSuccessHandler(successHandler);
- filter.setFailureHandler(failureHandler);
+ filter.setAuthenticationSuccessHandler(successHandler);
+ filter.setAuthenticationFailureHandler(failureHandler);
filter.setAuthenticationManager(new MockAuthenticationManager(true));
filter.afterPropertiesSet();
@@ -250,9 +250,9 @@ public class AbstractProcessingFilterTests extends TestCase {
public void testStartupDetectsInvalidAuthenticationManager() throws Exception {
AbstractProcessingFilter filter = new MockAbstractProcessingFilter();
- filter.setFailureHandler(failureHandler);
+ filter.setAuthenticationFailureHandler(failureHandler);
successHandler.setDefaultTargetUrl("/");
- filter.setSuccessHandler(successHandler);
+ filter.setAuthenticationSuccessHandler(successHandler);
filter.setFilterProcessesUrl("/j_spring_security_check");
try {
@@ -265,9 +265,9 @@ public class AbstractProcessingFilterTests extends TestCase {
public void testStartupDetectsInvalidFilterProcessesUrl() throws Exception {
AbstractProcessingFilter filter = new MockAbstractProcessingFilter();
- filter.setFailureHandler(failureHandler);
+ filter.setAuthenticationFailureHandler(failureHandler);
filter.setAuthenticationManager(new MockAuthenticationManager());
- filter.setSuccessHandler(successHandler);
+ filter.setAuthenticationSuccessHandler(successHandler);
filter.setFilterProcessesUrl(null);
try {
@@ -292,7 +292,7 @@ public class AbstractProcessingFilterTests extends TestCase {
// Setup our test object, to grant access
MockAbstractProcessingFilter filter = new MockAbstractProcessingFilter(true);
filter.setFilterProcessesUrl("/j_mock_post");
- filter.setSuccessHandler(successHandler);
+ filter.setAuthenticationSuccessHandler(successHandler);
// Test
executeFilterInContainerSimulator(config, filter, request, response, chain);
@@ -309,7 +309,7 @@ public class AbstractProcessingFilterTests extends TestCase {
// Setup our test object, to deny access
filter = new MockAbstractProcessingFilter(false);
filter.setFilterProcessesUrl("/j_mock_post");
- filter.setFailureHandler(failureHandler);
+ filter.setAuthenticationFailureHandler(failureHandler);
// Test
executeFilterInContainerSimulator(config, filter, request, response, chain);
@@ -336,7 +336,7 @@ public class AbstractProcessingFilterTests extends TestCase {
assertFalse(successHandler.isAlwaysUseDefaultTargetUrl()); // check default
successHandler.setAlwaysUseDefaultTargetUrl(true);
assertTrue(successHandler.isAlwaysUseDefaultTargetUrl()); // check changed
- filter.setSuccessHandler(successHandler);
+ filter.setAuthenticationSuccessHandler(successHandler);
// Test
executeFilterInContainerSimulator(config, filter, request, response, chain);
@@ -380,7 +380,7 @@ public class AbstractProcessingFilterTests extends TestCase {
MockAbstractProcessingFilter filter = new MockAbstractProcessingFilter(true);
successHandler.setDefaultTargetUrl("https://monkeymachine.co.uk/");
successHandler.setAlwaysUseDefaultTargetUrl(true);
- filter.setSuccessHandler(successHandler);
+ filter.setAuthenticationSuccessHandler(successHandler);
executeFilterInContainerSimulator(config, filter, request, response, chain);
assertEquals("https://monkeymachine.co.uk/", response.getRedirectedUrl());
@@ -400,7 +400,7 @@ public class AbstractProcessingFilterTests extends TestCase {
MockAbstractProcessingFilter filter = new MockAbstractProcessingFilter(true);
filter.setInvalidateSessionOnSuccessfulAuthentication(true);
successHandler.setDefaultTargetUrl("http://monkeymachine.co.uk/");
- filter.setSuccessHandler(successHandler);
+ filter.setAuthenticationSuccessHandler(successHandler);
executeFilterInContainerSimulator(config, filter, request, response, chain);
@@ -420,7 +420,7 @@ public class AbstractProcessingFilterTests extends TestCase {
filter.setInvalidateSessionOnSuccessfulAuthentication(true);
filter.setMigrateInvalidatedSessionAttributes(false);
successHandler.setDefaultTargetUrl("http://monkeymachine.co.uk/");
- filter.setSuccessHandler(successHandler);
+ filter.setAuthenticationSuccessHandler(successHandler);
executeFilterInContainerSimulator(config, filter, request, response, chain);
@@ -442,9 +442,9 @@ public class AbstractProcessingFilterTests extends TestCase {
// Reject authentication, so exception would normally be stored in session
MockAbstractProcessingFilter filter = new MockAbstractProcessingFilter(false);
filter.setAllowSessionCreation(false);
- filter.setFailureHandler(failureHandler);
+ filter.setAuthenticationFailureHandler(failureHandler);
successHandler.setDefaultTargetUrl("http://monkeymachine.co.uk/");
- filter.setSuccessHandler(successHandler);
+ filter.setAuthenticationSuccessHandler(successHandler);
executeFilterInContainerSimulator(config, filter, request, response, chain);
@@ -463,7 +463,7 @@ public class AbstractProcessingFilterTests extends TestCase {
MockAbstractProcessingFilter filter = new MockAbstractProcessingFilter(false);
successHandler.setDefaultTargetUrl("http://monkeymachine.co.uk/");
- filter.setSuccessHandler(successHandler);
+ filter.setAuthenticationSuccessHandler(successHandler);
executeFilterInContainerSimulator(config, filter, request, response, chain);
@@ -482,8 +482,8 @@ public class AbstractProcessingFilterTests extends TestCase {
MockAbstractProcessingFilter filter = new MockAbstractProcessingFilter(false);
successHandler.setDefaultTargetUrl("http://monkeymachine.co.uk/");
- filter.setSuccessHandler(successHandler);
- filter.setFailureHandler(failureHandler);
+ filter.setAuthenticationSuccessHandler(successHandler);
+ filter.setAuthenticationFailureHandler(failureHandler);
failureHandler.setUseForward(true);
failureHandler.setDefaultFailureUrl("/error");
@@ -504,10 +504,10 @@ public class AbstractProcessingFilterTests extends TestCase {
MockHttpServletResponse response = new MockHttpServletResponse();
MockAbstractProcessingFilter filter = new MockAbstractProcessingFilter(true);
- filter.setSuccessHandler(successHandler);
+ filter.setAuthenticationSuccessHandler(successHandler);
successHandler.setDefaultTargetUrl("http://monkeymachine.co.uk/");
successHandler.setTargetUrlParameter("targetUrl");
- filter.setFailureHandler(failureHandler);
+ filter.setAuthenticationFailureHandler(failureHandler);
executeFilterInContainerSimulator(config, filter, request, response, chain);
diff --git a/openid/src/test/java/org/springframework/security/ui/openid/OpenIDAuthenticationProcessingFilterTests.java b/openid/src/test/java/org/springframework/security/ui/openid/OpenIDAuthenticationProcessingFilterTests.java
index b40796d989..a0603fdce4 100644
--- a/openid/src/test/java/org/springframework/security/ui/openid/OpenIDAuthenticationProcessingFilterTests.java
+++ b/openid/src/test/java/org/springframework/security/ui/openid/OpenIDAuthenticationProcessingFilterTests.java
@@ -23,7 +23,7 @@ public class OpenIDAuthenticationProcessingFilterTests extends TestCase {
filter = new OpenIDAuthenticationProcessingFilter();
filter.setConsumer(new MockOpenIDConsumer(REDIRECT_URL));
SavedRequestAwareAuthenticationSuccessHandler successHandler = new SavedRequestAwareAuthenticationSuccessHandler();
- filter.setSuccessHandler(new SavedRequestAwareAuthenticationSuccessHandler());
+ filter.setAuthenticationSuccessHandler(new SavedRequestAwareAuthenticationSuccessHandler());
successHandler.setDefaultTargetUrl(DEFAULT_TARGET_URL);
filter.setAuthenticationManager(new MockAuthenticationManager());
filter.afterPropertiesSet();