diff --git a/cas/src/main/java/org/springframework/security/cas/web/authentication/DefaultServiceAuthenticationDetails.java b/cas/src/main/java/org/springframework/security/cas/web/authentication/DefaultServiceAuthenticationDetails.java index 5f08dc39b8..9dcdc3aa56 100644 --- a/cas/src/main/java/org/springframework/security/cas/web/authentication/DefaultServiceAuthenticationDetails.java +++ b/cas/src/main/java/org/springframework/security/cas/web/authentication/DefaultServiceAuthenticationDetails.java @@ -132,7 +132,7 @@ final class DefaultServiceAuthenticationDetails extends WebAuthenticationDetails * @return */ static Pattern createArtifactPattern(String artifactParameterName) { - Assert.hasLength(artifactParameterName); + Assert.hasLength(artifactParameterName, "artifactParameterName is expected to have a length"); return Pattern.compile("&?" + Pattern.quote(artifactParameterName) + "=[^&]*"); } diff --git a/config/src/main/java/org/springframework/security/config/http/AuthenticationConfigBuilder.java b/config/src/main/java/org/springframework/security/config/http/AuthenticationConfigBuilder.java index f381e5dbde..48530b996c 100644 --- a/config/src/main/java/org/springframework/security/config/http/AuthenticationConfigBuilder.java +++ b/config/src/main/java/org/springframework/security/config/http/AuthenticationConfigBuilder.java @@ -481,7 +481,7 @@ final class AuthenticationConfigBuilder { SimpleAttributes2GrantedAuthoritiesMapper.class)); String roles = jeeElt.getAttribute(ATT_MAPPABLE_ROLES); - Assert.state(StringUtils.hasText(roles)); + Assert.hasLength(roles, "roles is expected to have length"); BeanDefinitionBuilder rolesBuilder = BeanDefinitionBuilder .rootBeanDefinition(StringUtils.class); rolesBuilder.addConstructorArgValue(roles); diff --git a/config/src/main/java/org/springframework/security/config/method/ProtectPointcutPostProcessor.java b/config/src/main/java/org/springframework/security/config/method/ProtectPointcutPostProcessor.java index 14c301c350..8ccdf58936 100644 --- a/config/src/main/java/org/springframework/security/config/method/ProtectPointcutPostProcessor.java +++ b/config/src/main/java/org/springframework/security/config/method/ProtectPointcutPostProcessor.java @@ -163,7 +163,7 @@ final class ProtectPointcutPostProcessor implements BeanPostProcessor { } public void setPointcutMap(Map> map) { - Assert.notEmpty(map); + Assert.notEmpty(map, "configAttributes cannot be empty"); for (String expression : map.keySet()) { List value = map.get(expression); addPointcut(expression, value); diff --git a/core/src/main/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataSource.java index acb251b00b..3ef0253d3a 100644 --- a/core/src/main/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataSource.java +++ b/core/src/main/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataSource.java @@ -49,7 +49,7 @@ public class SecuredAnnotationSecurityMetadataSource extends public SecuredAnnotationSecurityMetadataSource( AnnotationMetadataExtractor annotationMetadataExtractor) { - Assert.notNull(annotationMetadataExtractor); + Assert.notNull(annotationMetadataExtractor, "annotationMetadataExtractor cannot be null"); annotationExtractor = annotationMetadataExtractor; annotationType = (Class) GenericTypeResolver .resolveTypeArgument(annotationExtractor.getClass(), diff --git a/core/src/main/java/org/springframework/security/authentication/RememberMeAuthenticationProvider.java b/core/src/main/java/org/springframework/security/authentication/RememberMeAuthenticationProvider.java index 32713cf5ea..15ebeff028 100644 --- a/core/src/main/java/org/springframework/security/authentication/RememberMeAuthenticationProvider.java +++ b/core/src/main/java/org/springframework/security/authentication/RememberMeAuthenticationProvider.java @@ -41,7 +41,7 @@ public class RememberMeAuthenticationProvider implements AuthenticationProvider, private String key; public RememberMeAuthenticationProvider(String key) { - Assert.hasLength(key); + Assert.hasLength(key, "key must have a length"); this.key = key; } diff --git a/core/src/main/java/org/springframework/security/authentication/event/InteractiveAuthenticationSuccessEvent.java b/core/src/main/java/org/springframework/security/authentication/event/InteractiveAuthenticationSuccessEvent.java index b66e06bf93..db882839e5 100644 --- a/core/src/main/java/org/springframework/security/authentication/event/InteractiveAuthenticationSuccessEvent.java +++ b/core/src/main/java/org/springframework/security/authentication/event/InteractiveAuthenticationSuccessEvent.java @@ -45,7 +45,7 @@ public class InteractiveAuthenticationSuccessEvent extends AbstractAuthenticatio public InteractiveAuthenticationSuccessEvent(Authentication authentication, Class generatedBy) { super(authentication); - Assert.notNull(generatedBy); + Assert.notNull(generatedBy, "generatedBy cannot be null"); this.generatedBy = generatedBy; } diff --git a/core/src/main/java/org/springframework/security/provisioning/InMemoryUserDetailsManager.java b/core/src/main/java/org/springframework/security/provisioning/InMemoryUserDetailsManager.java index 9d884125ee..939535e8c8 100644 --- a/core/src/main/java/org/springframework/security/provisioning/InMemoryUserDetailsManager.java +++ b/core/src/main/java/org/springframework/security/provisioning/InMemoryUserDetailsManager.java @@ -76,7 +76,7 @@ public class InMemoryUserDetailsManager implements UserDetailsManager { } public void createUser(UserDetails user) { - Assert.isTrue(!userExists(user.getUsername())); + Assert.isTrue(!userExists(user.getUsername()), "user should not exist"); users.put(user.getUsername().toLowerCase(), new MutableUser(user)); } @@ -86,7 +86,7 @@ public class InMemoryUserDetailsManager implements UserDetailsManager { } public void updateUser(UserDetails user) { - Assert.isTrue(userExists(user.getUsername())); + Assert.isTrue(userExists(user.getUsername()), "user should exist"); users.put(user.getUsername().toLowerCase(), new MutableUser(user)); } diff --git a/core/src/main/java/org/springframework/security/provisioning/JdbcUserDetailsManager.java b/core/src/main/java/org/springframework/security/provisioning/JdbcUserDetailsManager.java index 959d91c735..709efe1940 100644 --- a/core/src/main/java/org/springframework/security/provisioning/JdbcUserDetailsManager.java +++ b/core/src/main/java/org/springframework/security/provisioning/JdbcUserDetailsManager.java @@ -258,15 +258,15 @@ public class JdbcUserDetailsManager extends JdbcDaoImpl implements UserDetailsMa } public List findUsersInGroup(String groupName) { - Assert.hasText(groupName); + Assert.hasText(groupName, "groupName should have text"); return getJdbcTemplate().queryForList(findUsersInGroupSql, new String[] { groupName }, String.class); } public void createGroup(final String groupName, final List authorities) { - Assert.hasText(groupName); - Assert.notNull(authorities); + Assert.hasText(groupName, "groupName should have text"); + Assert.notNull(authorities, "authorities cannot be null"); logger.debug("Creating new group '" + groupName + "' with authorities " + AuthorityUtils.authorityListToSet(authorities)); @@ -289,7 +289,7 @@ public class JdbcUserDetailsManager extends JdbcDaoImpl implements UserDetailsMa public void deleteGroup(String groupName) { logger.debug("Deleting group '" + groupName + "'"); - Assert.hasText(groupName); + Assert.hasText(groupName, "groupName should have text"); final int id = findGroupId(groupName); PreparedStatementSetter groupIdPSS = new PreparedStatementSetter() { @@ -304,16 +304,16 @@ public class JdbcUserDetailsManager extends JdbcDaoImpl implements UserDetailsMa public void renameGroup(String oldName, String newName) { logger.debug("Changing group name from '" + oldName + "' to '" + newName + "'"); - Assert.hasText(oldName); - Assert.hasText(newName); + Assert.hasText(oldName,"oldName should have text");; + Assert.hasText(newName,"newName should have text");; getJdbcTemplate().update(renameGroupSql, newName, oldName); } public void addUserToGroup(final String username, final String groupName) { logger.debug("Adding user '" + username + "' to group '" + groupName + "'"); - Assert.hasText(username); - Assert.hasText(groupName); + Assert.hasText(username,"username should have text");; + Assert.hasText(groupName,"groupName should have text");; final int id = findGroupId(groupName); getJdbcTemplate().update(insertGroupMemberSql, new PreparedStatementSetter() { @@ -328,8 +328,8 @@ public class JdbcUserDetailsManager extends JdbcDaoImpl implements UserDetailsMa public void removeUserFromGroup(final String username, final String groupName) { logger.debug("Removing user '" + username + "' to group '" + groupName + "'"); - Assert.hasText(username); - Assert.hasText(groupName); + Assert.hasText(username,"username should have text");; + Assert.hasText(groupName,"groupName should have text");; final int id = findGroupId(groupName); @@ -345,7 +345,7 @@ public class JdbcUserDetailsManager extends JdbcDaoImpl implements UserDetailsMa public List findGroupAuthorities(String groupName) { logger.debug("Loading authorities for group '" + groupName + "'"); - Assert.hasText(groupName); + Assert.hasText(groupName,"groupName should have text");; return getJdbcTemplate().query(groupAuthoritiesSql, new String[] { groupName }, new RowMapper() { @@ -361,8 +361,8 @@ public class JdbcUserDetailsManager extends JdbcDaoImpl implements UserDetailsMa public void removeGroupAuthority(String groupName, final GrantedAuthority authority) { logger.debug("Removing authority '" + authority + "' from group '" + groupName + "'"); - Assert.hasText(groupName); - Assert.notNull(authority); + Assert.hasText(groupName,"groupName should have text"); + Assert.notNull(authority, "authority cannot be null"); final int id = findGroupId(groupName); @@ -377,8 +377,8 @@ public class JdbcUserDetailsManager extends JdbcDaoImpl implements UserDetailsMa public void addGroupAuthority(final String groupName, final GrantedAuthority authority) { logger.debug("Adding authority '" + authority + "' to group '" + groupName + "'"); - Assert.hasText(groupName); - Assert.notNull(authority); + Assert.hasText(groupName,"groupName should have text");; + Assert.notNull(authority, "authority cannot be null"); final int id = findGroupId(groupName); getJdbcTemplate().update(insertGroupAuthoritySql, new PreparedStatementSetter() { @@ -398,102 +398,102 @@ public class JdbcUserDetailsManager extends JdbcDaoImpl implements UserDetailsMa } public void setCreateUserSql(String createUserSql) { - Assert.hasText(createUserSql); + Assert.hasText(createUserSql,"createUserSql should have text");; this.createUserSql = createUserSql; } public void setDeleteUserSql(String deleteUserSql) { - Assert.hasText(deleteUserSql); + Assert.hasText(deleteUserSql,"deleteUserSql should have text");; this.deleteUserSql = deleteUserSql; } public void setUpdateUserSql(String updateUserSql) { - Assert.hasText(updateUserSql); + Assert.hasText(updateUserSql,"updateUserSql should have text");; this.updateUserSql = updateUserSql; } public void setCreateAuthoritySql(String createAuthoritySql) { - Assert.hasText(createAuthoritySql); + Assert.hasText(createAuthoritySql,"createAuthoritySql should have text");; this.createAuthoritySql = createAuthoritySql; } public void setDeleteUserAuthoritiesSql(String deleteUserAuthoritiesSql) { - Assert.hasText(deleteUserAuthoritiesSql); + Assert.hasText(deleteUserAuthoritiesSql,"deleteUserAuthoritiesSql should have text");; this.deleteUserAuthoritiesSql = deleteUserAuthoritiesSql; } public void setUserExistsSql(String userExistsSql) { - Assert.hasText(userExistsSql); + Assert.hasText(userExistsSql,"userExistsSql should have text");; this.userExistsSql = userExistsSql; } public void setChangePasswordSql(String changePasswordSql) { - Assert.hasText(changePasswordSql); + Assert.hasText(changePasswordSql,"changePasswordSql should have text");; this.changePasswordSql = changePasswordSql; } public void setFindAllGroupsSql(String findAllGroupsSql) { - Assert.hasText(findAllGroupsSql); + Assert.hasText(findAllGroupsSql,"findAllGroupsSql should have text");; this.findAllGroupsSql = findAllGroupsSql; } public void setFindUsersInGroupSql(String findUsersInGroupSql) { - Assert.hasText(findUsersInGroupSql); + Assert.hasText(findUsersInGroupSql,"findUsersInGroupSql should have text");; this.findUsersInGroupSql = findUsersInGroupSql; } public void setInsertGroupSql(String insertGroupSql) { - Assert.hasText(insertGroupSql); + Assert.hasText(insertGroupSql,"insertGroupSql should have text");; this.insertGroupSql = insertGroupSql; } public void setFindGroupIdSql(String findGroupIdSql) { - Assert.hasText(findGroupIdSql); + Assert.hasText(findGroupIdSql,"findGroupIdSql should have text");; this.findGroupIdSql = findGroupIdSql; } public void setInsertGroupAuthoritySql(String insertGroupAuthoritySql) { - Assert.hasText(insertGroupAuthoritySql); + Assert.hasText(insertGroupAuthoritySql,"insertGroupAuthoritySql should have text");; this.insertGroupAuthoritySql = insertGroupAuthoritySql; } public void setDeleteGroupSql(String deleteGroupSql) { - Assert.hasText(deleteGroupSql); + Assert.hasText(deleteGroupSql,"deleteGroupSql should have text");; this.deleteGroupSql = deleteGroupSql; } public void setDeleteGroupAuthoritiesSql(String deleteGroupAuthoritiesSql) { - Assert.hasText(deleteGroupAuthoritiesSql); + Assert.hasText(deleteGroupAuthoritiesSql,"deleteGroupAuthoritiesSql should have text");; this.deleteGroupAuthoritiesSql = deleteGroupAuthoritiesSql; } public void setDeleteGroupMembersSql(String deleteGroupMembersSql) { - Assert.hasText(deleteGroupMembersSql); + Assert.hasText(deleteGroupMembersSql,"deleteGroupMembersSql should have text");; this.deleteGroupMembersSql = deleteGroupMembersSql; } public void setRenameGroupSql(String renameGroupSql) { - Assert.hasText(renameGroupSql); + Assert.hasText(renameGroupSql,"renameGroupSql should have text");; this.renameGroupSql = renameGroupSql; } public void setInsertGroupMemberSql(String insertGroupMemberSql) { - Assert.hasText(insertGroupMemberSql); + Assert.hasText(insertGroupMemberSql,"insertGroupMemberSql should have text");; this.insertGroupMemberSql = insertGroupMemberSql; } public void setDeleteGroupMemberSql(String deleteGroupMemberSql) { - Assert.hasText(deleteGroupMemberSql); + Assert.hasText(deleteGroupMemberSql,"deleteGroupMemberSql should have text");; this.deleteGroupMemberSql = deleteGroupMemberSql; } public void setGroupAuthoritiesSql(String groupAuthoritiesSql) { - Assert.hasText(groupAuthoritiesSql); + Assert.hasText(groupAuthoritiesSql,"groupAuthoritiesSql should have text");; this.groupAuthoritiesSql = groupAuthoritiesSql; } public void setDeleteGroupAuthoritySql(String deleteGroupAuthoritySql) { - Assert.hasText(deleteGroupAuthoritySql); + Assert.hasText(deleteGroupAuthoritySql,"deleteGroupAuthoritySql should have text");; this.deleteGroupAuthoritySql = deleteGroupAuthoritySql; } diff --git a/core/src/main/java/org/springframework/security/util/InMemoryResource.java b/core/src/main/java/org/springframework/security/util/InMemoryResource.java index 7be680dd21..d75e648986 100644 --- a/core/src/main/java/org/springframework/security/util/InMemoryResource.java +++ b/core/src/main/java/org/springframework/security/util/InMemoryResource.java @@ -52,7 +52,7 @@ public class InMemoryResource extends AbstractResource { } public InMemoryResource(byte[] source, String description) { - Assert.notNull(source); + Assert.notNull(source, "source cannot be null"); this.source = source; this.description = description; } diff --git a/ldap/src/main/java/org/springframework/security/ldap/LdapUtils.java b/ldap/src/main/java/org/springframework/security/ldap/LdapUtils.java index 30bbb17d61..86e6266ed2 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/LdapUtils.java +++ b/ldap/src/main/java/org/springframework/security/ldap/LdapUtils.java @@ -157,7 +157,7 @@ public final class LdapUtils { * @return the root DN */ public static String parseRootDnFromUrl(String url) { - Assert.hasLength(url); + Assert.hasLength(url, "url must have length"); String urlRootDn; @@ -187,7 +187,7 @@ public final class LdapUtils { */ private static URI parseLdapUrl(String url) { - Assert.hasLength(url); + Assert.hasLength(url, "url must have length"); try { return new URI(url); diff --git a/ldap/src/main/java/org/springframework/security/ldap/authentication/AbstractLdapAuthenticator.java b/ldap/src/main/java/org/springframework/security/ldap/authentication/AbstractLdapAuthenticator.java index c1652f74a2..91885265fa 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/authentication/AbstractLdapAuthenticator.java +++ b/ldap/src/main/java/org/springframework/security/ldap/authentication/AbstractLdapAuthenticator.java @@ -119,7 +119,7 @@ public abstract class AbstractLdapAuthenticator implements LdapAuthenticator, } public void setMessageSource(MessageSource messageSource) { - Assert.notNull("Message source must not be null"); + Assert.notNull(messageSource, "Message source must not be null"); this.messages = new MessageSourceAccessor(messageSource); } diff --git a/ldap/src/main/java/org/springframework/security/ldap/server/ApacheDSContainer.java b/ldap/src/main/java/org/springframework/security/ldap/server/ApacheDSContainer.java index ca63320d37..64d696ab36 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/server/ApacheDSContainer.java +++ b/ldap/src/main/java/org/springframework/security/ldap/server/ApacheDSContainer.java @@ -159,7 +159,7 @@ public class ApacheDSContainer implements InitializingBean, DisposableBean, Life } public void setWorkingDirectory(File workingDir) { - Assert.notNull(workingDir); + Assert.notNull(workingDir, "workingDir cannot be null"); logger.info("Setting working directory for LDAP_PROVIDER: " + workingDir.getAbsolutePath()); @@ -239,7 +239,7 @@ public class ApacheDSContainer implements InitializingBean, DisposableBean, Life catch (LdapNameNotFoundException e) { try { LdapDN dn = new LdapDN(root); - Assert.isTrue(root.startsWith("dc=")); + Assert.isTrue(root.startsWith("dc="), "root must start with dc="); String dc = root.substring(3, root.indexOf(',')); ServerEntry entry = service.newEntry(dn); entry.add("objectClass", "top", "domain", "extensibleObject"); diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java index 8914147d4f..def2b2bacc 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java +++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java @@ -387,7 +387,7 @@ public class LdapUserDetailsManager implements UserDetailsManager { } public void setAttributesToRetrieve(String[] attributesToRetrieve) { - Assert.notNull(attributesToRetrieve); + Assert.notNull(attributesToRetrieve, "attributesToRetrieve cannot be null"); this.attributesToRetrieve = attributesToRetrieve; } @@ -406,7 +406,7 @@ public class LdapUserDetailsManager implements UserDetailsManager { * members. */ public void setGroupMemberAttributeName(String groupMemberAttributeName) { - Assert.hasText(groupMemberAttributeName); + Assert.hasText(groupMemberAttributeName, "groupMemberAttributeName should have text"); this.groupMemberAttributeName = groupMemberAttributeName; this.groupSearchFilter = "(" + groupMemberAttributeName + "={0})"; } diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/Person.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/Person.java index fc8e60144b..44ddf8c04a 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/Person.java +++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/Person.java @@ -139,8 +139,8 @@ public class Person extends LdapUserDetailsImpl { public LdapUserDetails createUserDetails() { Person p = (Person) super.createUserDetails(); - Assert.notNull(p.cn); - Assert.notEmpty(p.cn); + Assert.notNull(p.cn, "person.sn cannot be null"); + Assert.notEmpty(p.cn, "person.cn cannot be empty"); // TODO: Check contents for null entries return p; } diff --git a/openid/src/main/java/org/springframework/security/openid/OpenIDAttribute.java b/openid/src/main/java/org/springframework/security/openid/OpenIDAttribute.java index 06b8081f17..0dc199f305 100644 --- a/openid/src/main/java/org/springframework/security/openid/OpenIDAttribute.java +++ b/openid/src/main/java/org/springframework/security/openid/OpenIDAttribute.java @@ -45,7 +45,7 @@ public class OpenIDAttribute implements Serializable { } public OpenIDAttribute(String name, String type, List values) { - Assert.notEmpty(values); + Assert.notEmpty(values, "values cannot be empty"); this.name = name; this.typeIdentifier = type; this.values = values; diff --git a/samples/xml/gae/src/main/java/samples/gae/users/InMemoryUserRegistry.java b/samples/xml/gae/src/main/java/samples/gae/users/InMemoryUserRegistry.java index 26e3c9658d..613d7ce838 100644 --- a/samples/xml/gae/src/main/java/samples/gae/users/InMemoryUserRegistry.java +++ b/samples/xml/gae/src/main/java/samples/gae/users/InMemoryUserRegistry.java @@ -39,7 +39,7 @@ public class InMemoryUserRegistry implements UserRegistry { public void registerUser(GaeUser newUser) { logger.debug("Attempting to create new user " + newUser); - Assert.state(!users.containsKey(newUser.getUserId())); + Assert.isTrue(!users.containsKey(newUser.getUserId()), "user should not exist"); users.put(newUser.getUserId(), newUser); } diff --git a/samples/xml/tutorial/src/main/java/bigbank/BankServiceImpl.java b/samples/xml/tutorial/src/main/java/bigbank/BankServiceImpl.java index e05a2cf546..4c6381e7d9 100644 --- a/samples/xml/tutorial/src/main/java/bigbank/BankServiceImpl.java +++ b/samples/xml/tutorial/src/main/java/bigbank/BankServiceImpl.java @@ -21,7 +21,7 @@ public class BankServiceImpl implements BankService { private final BankDao bankDao; public BankServiceImpl(BankDao bankDao) { - Assert.notNull(bankDao); + Assert.notNull(bankDao, "bankDao cannot be null"); this.bankDao = bankDao; } @@ -30,7 +30,7 @@ public class BankServiceImpl implements BankService { } public Account post(Account account, double amount) { - Assert.notNull(account); + Assert.notNull(account, "account cannot be null"); // We read account back from DAO so it reflects the latest balance Account a = bankDao.readAccount(account.getId()); diff --git a/samples/xml/tutorial/src/main/java/bigbank/SeedData.java b/samples/xml/tutorial/src/main/java/bigbank/SeedData.java index 4b970218fb..c364e9c253 100644 --- a/samples/xml/tutorial/src/main/java/bigbank/SeedData.java +++ b/samples/xml/tutorial/src/main/java/bigbank/SeedData.java @@ -22,7 +22,7 @@ public class SeedData implements InitializingBean { private BankDao bankDao; public void afterPropertiesSet() throws Exception { - Assert.notNull(bankDao); + Assert.notNull(bankDao, "bankDao cannot be null"); bankDao.createOrUpdateAccount(new Account("rod")); bankDao.createOrUpdateAccount(new Account("dianne")); bankDao.createOrUpdateAccount(new Account("scott")); diff --git a/samples/xml/tutorial/src/main/java/bigbank/web/ListAccounts.java b/samples/xml/tutorial/src/main/java/bigbank/web/ListAccounts.java index 68098e4071..7909c92113 100644 --- a/samples/xml/tutorial/src/main/java/bigbank/web/ListAccounts.java +++ b/samples/xml/tutorial/src/main/java/bigbank/web/ListAccounts.java @@ -29,7 +29,7 @@ public class ListAccounts implements Controller { private final BankService bankService; public ListAccounts(BankService bankService) { - Assert.notNull(bankService); + Assert.notNull(bankService, "bankService cannot be null"); this.bankService = bankService; } diff --git a/samples/xml/tutorial/src/main/java/bigbank/web/PostAccounts.java b/samples/xml/tutorial/src/main/java/bigbank/web/PostAccounts.java index 552af9081a..3781f03e3c 100644 --- a/samples/xml/tutorial/src/main/java/bigbank/web/PostAccounts.java +++ b/samples/xml/tutorial/src/main/java/bigbank/web/PostAccounts.java @@ -31,7 +31,7 @@ public class PostAccounts implements Controller { private final BankService bankService; public PostAccounts(BankService bankService) { - Assert.notNull(bankService); + Assert.notNull(bankService, "bankService cannot be null"); this.bankService = bankService; } 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 06e138f4db..df2c534347 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 @@ -286,7 +286,7 @@ public final class SecurityMockMvcRequestPostProcessors { private final X509Certificate[] certificates; private X509RequestPostProcessor(X509Certificate... certificates) { - Assert.notNull("X509Certificate cannot be null"); + Assert.notNull(certificates, "X509Certificate cannot be null"); this.certificates = certificates; } diff --git a/web/src/main/java/org/springframework/security/web/authentication/AnonymousAuthenticationFilter.java b/web/src/main/java/org/springframework/security/web/authentication/AnonymousAuthenticationFilter.java index 3e19770bd7..0eda0128a1 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/AnonymousAuthenticationFilter.java +++ b/web/src/main/java/org/springframework/security/web/authentication/AnonymousAuthenticationFilter.java @@ -84,7 +84,7 @@ public class AnonymousAuthenticationFilter extends GenericFilterBean implements @Override public void afterPropertiesSet() { - Assert.hasLength(key); + Assert.hasLength(key, "key must have length"); Assert.notNull(principal, "Anonymous authentication principal must be set"); Assert.notNull(authorities, "Anonymous authorities must be set"); } diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsService.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsService.java index 0b4a3489b7..e4c815eb97 100755 --- a/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsService.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesUserDetailsService.java @@ -54,7 +54,7 @@ public class PreAuthenticatedGrantedAuthoritiesUserDetailsService implements */ public final UserDetails loadUserDetails(PreAuthenticatedAuthenticationToken token) throws AuthenticationException { - Assert.notNull(token.getDetails()); + Assert.notNull(token.getDetails(), "token.getDetails() cannot be null"); Assert.isInstanceOf(GrantedAuthoritiesContainer.class, token.getDetails()); Collection authorities = ((GrantedAuthoritiesContainer) token .getDetails()).getGrantedAuthorities(); diff --git a/web/src/main/java/org/springframework/security/web/authentication/session/SessionFixationProtectionEvent.java b/web/src/main/java/org/springframework/security/web/authentication/session/SessionFixationProtectionEvent.java index 08338d3940..ae589bec40 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/session/SessionFixationProtectionEvent.java +++ b/web/src/main/java/org/springframework/security/web/authentication/session/SessionFixationProtectionEvent.java @@ -48,8 +48,8 @@ public class SessionFixationProtectionEvent extends AbstractAuthenticationEvent public SessionFixationProtectionEvent(Authentication authentication, String oldSessionId, String newSessionId) { super(authentication); - Assert.hasLength(oldSessionId); - Assert.hasLength(newSessionId); + Assert.hasLength(oldSessionId, "oldSessionId must have length"); + Assert.hasLength(newSessionId, "newSessionId must have length"); this.oldSessionId = oldSessionId; this.newSessionId = newSessionId; } diff --git a/web/src/main/java/org/springframework/security/web/util/RedirectUrlBuilder.java b/web/src/main/java/org/springframework/security/web/util/RedirectUrlBuilder.java index 8c15bd4299..d603cfad0c 100644 --- a/web/src/main/java/org/springframework/security/web/util/RedirectUrlBuilder.java +++ b/web/src/main/java/org/springframework/security/web/util/RedirectUrlBuilder.java @@ -68,8 +68,8 @@ public class RedirectUrlBuilder { public String getUrl() { StringBuilder sb = new StringBuilder(); - Assert.notNull(scheme); - Assert.notNull(serverName); + Assert.notNull(scheme, "scheme cannot be null"); + Assert.notNull(serverName, "serverName cannot be null"); sb.append(scheme).append("://").append(serverName);