Browse Source

Improve readability of empty collection checks

pull/15918/head
kwonyonghyun 1 year ago committed by Josh Cummings
parent
commit
b8aa78829c
  1. 2
      acl/src/main/java/org/springframework/security/acls/domain/AclImpl.java
  2. 4
      acl/src/main/java/org/springframework/security/acls/domain/DefaultPermissionFactory.java
  3. 8
      config/src/main/java/org/springframework/security/config/http/UserDetailsServiceFactoryBean.java
  4. 2
      core/src/main/java/org/springframework/security/access/intercept/RunAsManagerImpl.java
  5. 4
      core/src/main/java/org/springframework/security/core/userdetails/jdbc/JdbcDaoImpl.java
  6. 4
      ldap/src/test/java/org/apache/directory/server/core/avltree/ArrayMarshaller.java
  7. 4
      taglibs/src/main/java/org/springframework/security/taglibs/authz/AbstractAuthorizeTag.java
  8. 2
      taglibs/src/main/java/org/springframework/security/taglibs/authz/AccessControlListTag.java
  9. 2
      web/src/main/java/org/springframework/security/web/FilterChainProxy.java

2
acl/src/main/java/org/springframework/security/acls/domain/AclImpl.java

@ -202,7 +202,7 @@ public class AclImpl implements Acl, MutableAcl, AuditableAcl, OwnershipAcl { @@ -202,7 +202,7 @@ public class AclImpl implements Acl, MutableAcl, AuditableAcl, OwnershipAcl {
public boolean isSidLoaded(List<Sid> sids) {
// If loadedSides is null, this indicates all SIDs were loaded
// Also return true if the caller didn't specify a SID to find
if ((this.loadedSids == null) || (sids == null) || (sids.size() == 0)) {
if ((this.loadedSids == null) || (sids == null) || sids.isEmpty()) {
return true;
}

4
acl/src/main/java/org/springframework/security/acls/domain/DefaultPermissionFactory.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2018 the original author or authors.
* Copyright 2002-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -140,7 +140,7 @@ public class DefaultPermissionFactory implements PermissionFactory { @@ -140,7 +140,7 @@ public class DefaultPermissionFactory implements PermissionFactory {
@Override
public List<Permission> buildFromNames(List<String> names) {
if ((names == null) || (names.size() == 0)) {
if ((names == null) || names.isEmpty()) {
return Collections.emptyList();
}
List<Permission> permissions = new ArrayList<>(names.size());

8
config/src/main/java/org/springframework/security/config/http/UserDetailsServiceFactoryBean.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2016 the original author or authors.
* Copyright 2002-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -101,10 +101,10 @@ public class UserDetailsServiceFactoryBean implements ApplicationContextAware { @@ -101,10 +101,10 @@ public class UserDetailsServiceFactoryBean implements ApplicationContextAware {
*/
private UserDetailsService getUserDetailsService() {
Map<String, ?> beans = getBeansOfType(CachingUserDetailsService.class);
if (beans.size() == 0) {
if (beans.isEmpty()) {
beans = getBeansOfType(UserDetailsService.class);
}
if (beans.size() == 0) {
if (beans.isEmpty()) {
throw new ApplicationContextException("No UserDetailsService registered.");
}
if (beans.size() > 1) {
@ -124,7 +124,7 @@ public class UserDetailsServiceFactoryBean implements ApplicationContextAware { @@ -124,7 +124,7 @@ public class UserDetailsServiceFactoryBean implements ApplicationContextAware {
// Check ancestor bean factories if they exist and the current one has none of the
// required type
BeanFactory parent = this.beanFactory.getParentBeanFactory();
while (parent != null && beans.size() == 0) {
while (parent != null && beans.isEmpty()) {
if (parent instanceof ListableBeanFactory) {
beans = ((ListableBeanFactory) parent).getBeansOfType(type);
}

2
core/src/main/java/org/springframework/security/access/intercept/RunAsManagerImpl.java

@ -80,7 +80,7 @@ public class RunAsManagerImpl implements RunAsManager, InitializingBean { @@ -80,7 +80,7 @@ public class RunAsManagerImpl implements RunAsManager, InitializingBean {
newAuthorities.add(extraAuthority);
}
}
if (newAuthorities.size() == 0) {
if (newAuthorities.isEmpty()) {
return null;
}
// Add existing authorities

4
core/src/main/java/org/springframework/security/core/userdetails/jdbc/JdbcDaoImpl.java

@ -182,7 +182,7 @@ public class JdbcDaoImpl extends JdbcDaoSupport implements UserDetailsService, M @@ -182,7 +182,7 @@ public class JdbcDaoImpl extends JdbcDaoSupport implements UserDetailsService, M
@Override
public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
List<UserDetails> users = loadUsersByUsername(username);
if (users.size() == 0) {
if (users.isEmpty()) {
this.logger.debug("Query returned no results for user '" + username + "'");
throw new UsernameNotFoundException(this.messages.getMessage("JdbcDaoImpl.notFound",
new Object[] { username }, "Username {0} not found"));
@ -197,7 +197,7 @@ public class JdbcDaoImpl extends JdbcDaoSupport implements UserDetailsService, M @@ -197,7 +197,7 @@ public class JdbcDaoImpl extends JdbcDaoSupport implements UserDetailsService, M
}
List<GrantedAuthority> dbAuths = new ArrayList<>(dbAuthsSet);
addCustomAuthorities(user.getUsername(), dbAuths);
if (dbAuths.size() == 0) {
if (dbAuths.isEmpty()) {
this.logger.debug("User '" + username + "' has no authorities and will be treated as 'not found'");
throw new UsernameNotFoundException(this.messages.getMessage("JdbcDaoImpl.noAuthority",
new Object[] { username }, "User {0} has no GrantedAuthority"));

4
ldap/src/test/java/org/apache/directory/server/core/avltree/ArrayMarshaller.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2021 the original author or authors.
* Copyright 2002-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -73,7 +73,7 @@ public class ArrayMarshaller<E> implements Marshaller<ArrayTree<E>> { @@ -73,7 +73,7 @@ public class ArrayMarshaller<E> implements Marshaller<ArrayTree<E>> {
* @param tree the tree to be marshalled
*/
public byte[] serialize(ArrayTree<E> tree) {
if ((tree == null) || (tree.size() == 0)) {
if ((tree == null) || tree.isEmpty()) {
return EMPTY_TREE;
}

4
taglibs/src/main/java/org/springframework/security/taglibs/authz/AbstractAuthorizeTag.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2004-2022 the original author or authors.
* Copyright 2004-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -207,7 +207,7 @@ public abstract class AbstractAuthorizeTag { @@ -207,7 +207,7 @@ public abstract class AbstractAuthorizeTag {
ApplicationContext ctx = SecurityWebApplicationContextUtils
.findRequiredWebApplicationContext(getServletContext());
Map<String, WebInvocationPrivilegeEvaluator> wipes = ctx.getBeansOfType(WebInvocationPrivilegeEvaluator.class);
if (wipes.size() == 0) {
if (wipes.isEmpty()) {
throw new IOException(
"No visible WebInvocationPrivilegeEvaluator instance could be found in the application "
+ "context. There must be at least one in order to support the use of URL access checks in 'authorize' tags.");

2
taglibs/src/main/java/org/springframework/security/taglibs/authz/AccessControlListTag.java

@ -163,7 +163,7 @@ public class AccessControlListTag extends TagSupport { @@ -163,7 +163,7 @@ public class AccessControlListTag extends TagSupport {
.getParent()) {
map.putAll(context.getBeansOfType(type));
}
if (map.size() == 0) {
if (map.isEmpty()) {
return null;
}
if (map.size() == 1) {

2
web/src/main/java/org/springframework/security/web/FilterChainProxy.java

@ -211,7 +211,7 @@ public class FilterChainProxy extends GenericFilterBean { @@ -211,7 +211,7 @@ public class FilterChainProxy extends GenericFilterBean {
FirewalledRequest firewallRequest = this.firewall.getFirewalledRequest((HttpServletRequest) request);
HttpServletResponse firewallResponse = this.firewall.getFirewalledResponse((HttpServletResponse) response);
List<Filter> filters = getFilters(firewallRequest);
if (filters == null || filters.size() == 0) {
if (filters == null || filters.isEmpty()) {
if (logger.isTraceEnabled()) {
logger.trace(LogMessage.of(() -> "No security for " + requestLine(firewallRequest)));
}

Loading…
Cancel
Save