diff --git a/spring-context/src/main/java/org/springframework/cache/config/CacheAdviceParser.java b/spring-context/src/main/java/org/springframework/cache/config/CacheAdviceParser.java index b879c823e9..457feeb4f5 100644 --- a/spring-context/src/main/java/org/springframework/cache/config/CacheAdviceParser.java +++ b/spring-context/src/main/java/org/springframework/cache/config/CacheAdviceParser.java @@ -72,7 +72,7 @@ class CacheAdviceParser extends AbstractSingleBeanDefinitionParser { CacheNamespaceHandler.parseKeyGenerator(element, builder.getBeanDefinition()); List cacheDefs = DomUtils.getChildElementsByTagName(element, DEFS_ELEMENT); - if (cacheDefs.size() >= 1) { + if (!cacheDefs.isEmpty()) { // Using attributes source. List attributeSourceDefinitions = parseDefinitionsSources(cacheDefs, parserContext); builder.addPropertyValue("cacheOperationSources", attributeSourceDefinitions); diff --git a/spring-context/src/main/java/org/springframework/jmx/support/JmxUtils.java b/spring-context/src/main/java/org/springframework/jmx/support/JmxUtils.java index 8c6d57f565..233087a398 100644 --- a/spring-context/src/main/java/org/springframework/jmx/support/JmxUtils.java +++ b/spring-context/src/main/java/org/springframework/jmx/support/JmxUtils.java @@ -95,7 +95,7 @@ public abstract class JmxUtils { // null means any registered server, but "" specifically means the platform server if (!"".equals(agentId)) { List servers = MBeanServerFactory.findMBeanServer(agentId); - if (servers != null && servers.size() > 0) { + if (servers != null && !servers.isEmpty()) { // Check to see if an MBeanServer is registered. if (servers.size() > 1 && logger.isWarnEnabled()) { logger.warn("Found more than one MBeanServer instance" + diff --git a/spring-context/src/main/java/org/springframework/validation/DataBinder.java b/spring-context/src/main/java/org/springframework/validation/DataBinder.java index f8fe8df2bc..19cddccfd4 100644 --- a/spring-context/src/main/java/org/springframework/validation/DataBinder.java +++ b/spring-context/src/main/java/org/springframework/validation/DataBinder.java @@ -568,7 +568,7 @@ public class DataBinder implements PropertyEditorRegistry, TypeConverter { */ @Nullable public Validator getValidator() { - return (this.validators.size() > 0 ? this.validators.get(0) : null); + return (!this.validators.isEmpty() ? this.validators.get(0) : null); } /** diff --git a/spring-core/src/main/java/org/springframework/core/codec/StringDecoder.java b/spring-core/src/main/java/org/springframework/core/codec/StringDecoder.java index f8a376711a..6b21dbc290 100644 --- a/spring-core/src/main/java/org/springframework/core/codec/StringDecoder.java +++ b/spring-core/src/main/java/org/springframework/core/codec/StringDecoder.java @@ -188,7 +188,7 @@ public class StringDecoder extends AbstractDataBufferDecoder { * Joins the given list of buffers into a single buffer. */ private static Mono joinUntilEndFrame(List dataBuffers) { - if (dataBuffers.size() > 0) { + if (!dataBuffers.isEmpty()) { int lastIdx = dataBuffers.size() - 1; if (isEndFrame(dataBuffers.get(lastIdx))) { dataBuffers.remove(lastIdx); diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/config/DatabasePopulatorConfigUtils.java b/spring-jdbc/src/main/java/org/springframework/jdbc/config/DatabasePopulatorConfigUtils.java index 5c32c678d7..ddc47b5864 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/config/DatabasePopulatorConfigUtils.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/config/DatabasePopulatorConfigUtils.java @@ -40,7 +40,7 @@ class DatabasePopulatorConfigUtils { public static void setDatabasePopulator(Element element, BeanDefinitionBuilder builder) { List scripts = DomUtils.getChildElementsByTagName(element, "script"); - if (scripts.size() > 0) { + if (!scripts.isEmpty()) { builder.addPropertyValue("databasePopulator", createDatabasePopulator(element, scripts, "INIT")); builder.addPropertyValue("databaseCleaner", createDatabasePopulator(element, scripts, "DESTROY")); } diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataContext.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataContext.java index b9579f0077..09b8b3b198 100755 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataContext.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/CallMetaDataContext.java @@ -293,7 +293,7 @@ public class CallMetaDataContext { if (this.outParameterNames.size() > 1) { logger.warn("Accessing single output value when procedure has more than one output parameter"); } - return (this.outParameterNames.size() > 0 ? this.outParameterNames.get(0) : null); + return (!this.outParameterNames.isEmpty() ? this.outParameterNames.get(0) : null); } } @@ -388,7 +388,7 @@ public class CallMetaDataContext { SqlParameter param; if (meta.getParameterType() == DatabaseMetaData.procedureColumnReturn) { param = declaredParams.get(getFunctionReturnName()); - if (param == null && getOutParameterNames().size() > 0) { + if (param == null && !getOutParameterNames().isEmpty()) { param = declaredParams.get(getOutParameterNames().get(0).toLowerCase()); } if (param == null) { diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataContext.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataContext.java index e864f444b2..f5743e06bf 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataContext.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/TableMetaDataContext.java @@ -184,7 +184,7 @@ public class TableMetaDataContext { if (generatedKeyNames.length > 0) { this.generatedKeyColumnsUsed = true; } - if (declaredColumns.size() > 0) { + if (!declaredColumns.isEmpty()) { return new ArrayList<>(declaredColumns); } Set keys = new LinkedHashSet<>(generatedKeyNames.length); diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/support/GeneratedKeyHolder.java b/spring-jdbc/src/main/java/org/springframework/jdbc/support/GeneratedKeyHolder.java index d7f8df8fd5..f916994f4f 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/support/GeneratedKeyHolder.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/support/GeneratedKeyHolder.java @@ -61,7 +61,7 @@ public class GeneratedKeyHolder implements KeyHolder { @Override @Nullable public Number getKey() throws InvalidDataAccessApiUsageException, DataRetrievalFailureException { - if (this.keyList.size() == 0) { + if (this.keyList.isEmpty()) { return null; } if (this.keyList.size() > 1 || this.keyList.get(0).size() > 1) { @@ -89,7 +89,7 @@ public class GeneratedKeyHolder implements KeyHolder { @Override @Nullable public Map getKeys() throws InvalidDataAccessApiUsageException { - if (this.keyList.size() == 0) { + if (this.keyList.isEmpty()) { return null; } if (this.keyList.size() > 1) diff --git a/spring-test/src/main/java/org/springframework/test/context/BootstrapUtils.java b/spring-test/src/main/java/org/springframework/test/context/BootstrapUtils.java index 4fb45ea539..124e568743 100644 --- a/spring-test/src/main/java/org/springframework/test/context/BootstrapUtils.java +++ b/spring-test/src/main/java/org/springframework/test/context/BootstrapUtils.java @@ -151,7 +151,7 @@ abstract class BootstrapUtils { @Nullable private static Class resolveExplicitTestContextBootstrapper(Class testClass) { Set annotations = AnnotatedElementUtils.findAllMergedAnnotations(testClass, BootstrapWith.class); - if (annotations.size() < 1) { + if (annotations.isEmpty()) { return null; } Assert.state(annotations.size() <= 1, () -> String.format( diff --git a/spring-test/src/main/java/org/springframework/test/web/ModelAndViewAssert.java b/spring-test/src/main/java/org/springframework/test/web/ModelAndViewAssert.java index 3ca4ec5ee8..e4f9f410f8 100644 --- a/spring-test/src/main/java/org/springframework/test/web/ModelAndViewAssert.java +++ b/spring-test/src/main/java/org/springframework/test/web/ModelAndViewAssert.java @@ -201,7 +201,7 @@ public abstract class ModelAndViewAssert { tempSet.addAll(incorrectSet); tempSet.removeAll(assertionSet); - if (tempSet.size() > 0) { + if (!tempSet.isEmpty()) { sb.append("Set has too many elements:\n"); for (Object element : tempSet) { sb.append('-'); @@ -214,7 +214,7 @@ public abstract class ModelAndViewAssert { tempSet.addAll(assertionSet); tempSet.removeAll(incorrectSet); - if (tempSet.size() > 0) { + if (!tempSet.isEmpty()) { sb.append("Set is missing elements:\n"); for (Object element : tempSet) { sb.append('-'); diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/RegexPathElement.java b/spring-web/src/main/java/org/springframework/web/util/pattern/RegexPathElement.java index 45a3326e97..6dbdbb96ac 100644 --- a/spring-web/src/main/java/org/springframework/web/util/pattern/RegexPathElement.java +++ b/spring-web/src/main/java/org/springframework/web/util/pattern/RegexPathElement.java @@ -136,7 +136,7 @@ class RegexPathElement extends PathElement { if (matches) { if (isNoMorePattern()) { if (matchingContext.determineRemainingPath && - ((this.variableNames.size() == 0) ? true : textToMatch.length() > 0)) { + (this.variableNames.isEmpty() ? true : textToMatch.length() > 0)) { matchingContext.remainingPathIndex = pathIndex + 1; matches = true; } diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/InitBinderBindingContext.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/InitBinderBindingContext.java index 839fe9db06..8869bb2b50 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/InitBinderBindingContext.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/InitBinderBindingContext.java @@ -79,7 +79,7 @@ class InitBinderBindingContext extends BindingContext { InitBinder ann = binderMethod.getMethodAnnotation(InitBinder.class); Assert.state(ann != null, "No InitBinder annotation"); Collection names = Arrays.asList(ann.value()); - return (names.size() == 0 || names.contains(dataBinder.getObjectName())); + return (names.isEmpty() || names.contains(dataBinder.getObjectName())); }) .forEach(method -> invokeBinderMethod(dataBinder, exchange, method)); diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagWriter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagWriter.java index f4b83ccf64..345634c63b 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagWriter.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/TagWriter.java @@ -191,7 +191,7 @@ public class TagWriter { } private boolean inTag() { - return this.tagState.size() > 0; + return !this.tagState.isEmpty(); } private TagStateEntry currentState() { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/groovy/GroovyMarkupConfigurer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/groovy/GroovyMarkupConfigurer.java index 29232c5b5e..15e69b7539 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/groovy/GroovyMarkupConfigurer.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/groovy/GroovyMarkupConfigurer.java @@ -180,7 +180,7 @@ public class GroovyMarkupConfigurer extends TemplateConfiguration } ClassLoader classLoader = getApplicationContext().getClassLoader(); Assert.state(classLoader != null, "No ClassLoader"); - return (urls.size() > 0 ? new URLClassLoader(urls.toArray(new URL[urls.size()]), classLoader) : classLoader); + return (!urls.isEmpty() ? new URLClassLoader(urls.toArray(new URL[urls.size()]), classLoader) : classLoader); } /**