From 5bdfd8cd7793d90b9b6a36d1a7cc052b36396ac1 Mon Sep 17 00:00:00 2001 From: Luke Taylor Date: Sat, 5 Sep 2009 14:14:58 +0000 Subject: [PATCH] Tidying imports etc to remove compiler warnings. --- .../CasAssertionAuthenticationToken.java | 9 +++--- ...AssertionAttributesUserDetailsService.java | 3 +- .../CasAuthenticationProviderTests.java | 30 +++++++++---------- .../PythonInterpreterPreInvocationAdvice.java | 1 + .../contact/AddPermissionValidator.java | 1 + .../sample/contact/WebContactValidator.java | 1 + ...ultSessionAuthenticationStrategyTests.java | 22 +++++++------- 7 files changed, 33 insertions(+), 34 deletions(-) diff --git a/cas/src/main/java/org/springframework/security/cas/authentication/CasAssertionAuthenticationToken.java b/cas/src/main/java/org/springframework/security/cas/authentication/CasAssertionAuthenticationToken.java index c1f0798d7a..b01ead8d20 100644 --- a/cas/src/main/java/org/springframework/security/cas/authentication/CasAssertionAuthenticationToken.java +++ b/cas/src/main/java/org/springframework/security/cas/authentication/CasAssertionAuthenticationToken.java @@ -1,17 +1,16 @@ package org.springframework.security.cas.authentication; +import java.util.ArrayList; + +import org.jasig.cas.client.validation.Assertion; import org.springframework.security.authentication.AbstractAuthenticationToken; import org.springframework.security.core.GrantedAuthority; -import org.jasig.cas.client.validation.Assertion; - -import java.util.List; -import java.util.ArrayList; /** * Temporary authentication object needed to load the user details service. * * @author Scott Battaglia - * @version $Revision$ $Date$ + * @version $Id$ * @since 3.0 */ public final class CasAssertionAuthenticationToken extends AbstractAuthenticationToken { diff --git a/cas/src/main/java/org/springframework/security/cas/userdetails/GrantedAuthorityFromAssertionAttributesUserDetailsService.java b/cas/src/main/java/org/springframework/security/cas/userdetails/GrantedAuthorityFromAssertionAttributesUserDetailsService.java index 53b98a0fcf..bc1fb45776 100644 --- a/cas/src/main/java/org/springframework/security/cas/userdetails/GrantedAuthorityFromAssertionAttributesUserDetailsService.java +++ b/cas/src/main/java/org/springframework/security/cas/userdetails/GrantedAuthorityFromAssertionAttributesUserDetailsService.java @@ -17,13 +17,14 @@ import java.util.ArrayList; * value then its not added. * * @author Scott Battaglia - * @version $Revision$ $Date$ + * @version $Id$ * @since 3.0 */ public final class GrantedAuthorityFromAssertionAttributesUserDetailsService extends AbstractCasAssertionUserDetailsService implements InitializingBean { private String[] attributes; + @SuppressWarnings("unchecked") @Override protected UserDetails loadUserDetails(final Assertion assertion) { final List grantedAuthorities = new ArrayList(); diff --git a/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationProviderTests.java b/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationProviderTests.java index 1b14e426c7..03de2a93e4 100644 --- a/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationProviderTests.java +++ b/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationProviderTests.java @@ -16,21 +16,7 @@ package org.springframework.security.cas.authentication; -import org.springframework.security.authentication.BadCredentialsException; -import org.springframework.security.authentication.TestingAuthenticationToken; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.cas.ServiceProperties; -import org.springframework.security.cas.authentication.CasAuthenticationProvider; -import org.springframework.security.cas.authentication.CasAuthenticationToken; -import org.springframework.security.cas.authentication.StatelessTicketCache; -import org.springframework.security.cas.web.CasProcessingFilter; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.AuthenticationException; -import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.authority.AuthorityUtils; -import org.springframework.security.core.authority.GrantedAuthorityImpl; -import org.springframework.security.core.userdetails.*; - +import static org.junit.Assert.*; import java.util.HashMap; import java.util.Map; @@ -40,7 +26,19 @@ import org.jasig.cas.client.validation.AssertionImpl; import org.jasig.cas.client.validation.TicketValidationException; import org.jasig.cas.client.validation.TicketValidator; import org.junit.Test; -import static org.junit.Assert.*; +import org.springframework.security.authentication.BadCredentialsException; +import org.springframework.security.authentication.TestingAuthenticationToken; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.cas.ServiceProperties; +import org.springframework.security.cas.web.CasProcessingFilter; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.AuthorityUtils; +import org.springframework.security.core.authority.GrantedAuthorityImpl; +import org.springframework.security.core.userdetails.AuthenticationUserDetailsService; +import org.springframework.security.core.userdetails.User; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UsernameNotFoundException; /** diff --git a/itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPreInvocationAdvice.java b/itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPreInvocationAdvice.java index 8e0fe5e53d..e1be9e6ffd 100644 --- a/itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPreInvocationAdvice.java +++ b/itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPreInvocationAdvice.java @@ -21,6 +21,7 @@ import org.springframework.util.ClassUtils; public class PythonInterpreterPreInvocationAdvice implements PreInvocationAuthorizationAdvice{ private ParameterNameDiscoverer parameterNameDiscoverer = new LocalVariableTableParameterNameDiscoverer(); + @SuppressWarnings("deprecation") public boolean before(Authentication authentication, MethodInvocation mi, PreInvocationAttribute preAttr) { PythonInterpreterPreInvocationAttribute pythonAttr = (PythonInterpreterPreInvocationAttribute) preAttr; String script = pythonAttr.getScript(); diff --git a/samples/contacts/src/main/java/sample/contact/AddPermissionValidator.java b/samples/contacts/src/main/java/sample/contact/AddPermissionValidator.java index ed1c224215..06ac40fc2a 100644 --- a/samples/contacts/src/main/java/sample/contact/AddPermissionValidator.java +++ b/samples/contacts/src/main/java/sample/contact/AddPermissionValidator.java @@ -30,6 +30,7 @@ import org.springframework.validation.Validator; public class AddPermissionValidator implements Validator { //~ Methods ======================================================================================================== + @SuppressWarnings("unchecked") public boolean supports(Class clazz) { return clazz.equals(AddPermission.class); } diff --git a/samples/contacts/src/main/java/sample/contact/WebContactValidator.java b/samples/contacts/src/main/java/sample/contact/WebContactValidator.java index 4e4f282c69..bc5b824b75 100644 --- a/samples/contacts/src/main/java/sample/contact/WebContactValidator.java +++ b/samples/contacts/src/main/java/sample/contact/WebContactValidator.java @@ -28,6 +28,7 @@ import org.springframework.validation.Validator; public class WebContactValidator implements Validator { //~ Methods ======================================================================================================== + @SuppressWarnings("unchecked") public boolean supports(Class clazz) { return clazz.equals(WebContact.class); } diff --git a/web/src/test/java/org/springframework/security/web/session/DefaultSessionAuthenticationStrategyTests.java b/web/src/test/java/org/springframework/security/web/session/DefaultSessionAuthenticationStrategyTests.java index fe78bb5373..756f980968 100644 --- a/web/src/test/java/org/springframework/security/web/session/DefaultSessionAuthenticationStrategyTests.java +++ b/web/src/test/java/org/springframework/security/web/session/DefaultSessionAuthenticationStrategyTests.java @@ -9,7 +9,6 @@ import javax.servlet.http.HttpSession; import org.junit.Test; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; -import org.springframework.security.authentication.concurrent.SessionRegistry; import org.springframework.security.core.Authentication; import org.springframework.security.web.savedrequest.SavedRequest; @@ -30,17 +29,16 @@ public class DefaultSessionAuthenticationStrategyTests { assertNull(request.getSession(false)); } -// @Test -// public void newSessionIsCreatedIfSessionAlreadyExists() throws Exception { -// DefaultSessionAuthenticationStrategy strategy = new DefaultSessionAuthenticationStrategy(); -// strategy.setSessionRegistry(mock(SessionRegistry.class)); -// HttpServletRequest request = new MockHttpServletRequest(); -// String sessionId = request.getSession().getId(); -// -// strategy.onAuthentication(mock(Authentication.class), request, new MockHttpServletResponse()); -// -// assertFalse(sessionId.equals(request.getSession().getId())); -// } + @Test + public void newSessionIsCreatedIfSessionAlreadyExists() throws Exception { + DefaultSessionAuthenticationStrategy strategy = new DefaultSessionAuthenticationStrategy(); + HttpServletRequest request = new MockHttpServletRequest(); + String sessionId = request.getSession().getId(); + + strategy.onAuthentication(mock(Authentication.class), request, new MockHttpServletResponse()); + + assertFalse(sessionId.equals(request.getSession().getId())); + } // See SEC-1077 @Test