From c1ba31c40f7b8c5c0b4c50ba3491e43317e4021b Mon Sep 17 00:00:00 2001 From: Yanming Zhou Date: Fri, 18 Sep 2026 16:23:49 +0800 Subject: [PATCH] Use "isEmpty" to check if a collection is empty Signed-off-by: Yanming Zhou --- .../beans/factory/xml/ComponentFactoryBean.java | 2 +- .../context/testfixture/jndi/SimpleNamingContext.java | 2 +- .../java/org/springframework/cglib/proxy/CallbackHelper.java | 4 ++-- .../main/java/org/springframework/cglib/proxy/Enhancer.java | 2 +- .../core/io/support/PropertySourceProcessor.java | 2 +- .../springframework/messaging/simp/stomp/StompDecoder.java | 2 +- .../simp/stomp/AbstractStompBrokerRelayIntegrationTests.java | 2 +- .../org/springframework/web/util/pattern/PathPattern.java | 2 +- .../web/servlet/handler/AbstractUrlHandlerMapping.java | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/integration-tests/src/test/java/org/springframework/beans/factory/xml/ComponentFactoryBean.java b/integration-tests/src/test/java/org/springframework/beans/factory/xml/ComponentFactoryBean.java index 7e5566ccc73..cb8ecf7ddb5 100644 --- a/integration-tests/src/test/java/org/springframework/beans/factory/xml/ComponentFactoryBean.java +++ b/integration-tests/src/test/java/org/springframework/beans/factory/xml/ComponentFactoryBean.java @@ -35,7 +35,7 @@ public class ComponentFactoryBean implements FactoryBean { @Override public Component getObject() { - if (this.children != null && this.children.size() > 0) { + if (this.children != null && !this.children.isEmpty()) { for (Component child : children) { this.parent.addComponent(child); } diff --git a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/jndi/SimpleNamingContext.java b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/jndi/SimpleNamingContext.java index 8b3194a2758..1219f47bda2 100644 --- a/spring-context/src/testFixtures/java/org/springframework/context/testfixture/jndi/SimpleNamingContext.java +++ b/spring-context/src/testFixtures/java/org/springframework/context/testfixture/jndi/SimpleNamingContext.java @@ -326,7 +326,7 @@ public class SimpleNamingContext implements Context { } } } - if (contents.size() == 0) { + if (contents.isEmpty()) { throw new NamingException("Invalid root: [" + context.root + proot + "]"); } this.iterator = contents.values().iterator(); diff --git a/spring-core/src/main/java/org/springframework/cglib/proxy/CallbackHelper.java b/spring-core/src/main/java/org/springframework/cglib/proxy/CallbackHelper.java index 4f8b3726f07..e1befdf4511 100644 --- a/spring-core/src/main/java/org/springframework/cglib/proxy/CallbackHelper.java +++ b/spring-core/src/main/java/org/springframework/cglib/proxy/CallbackHelper.java @@ -63,7 +63,7 @@ implements CallbackFilter abstract protected Object getCallback(Method method); public Callback[] getCallbacks() { - if (callbacks.size() == 0) { + if (callbacks.isEmpty()) { return new Callback[0]; } if (callbacks.get(0) instanceof Callback) { @@ -75,7 +75,7 @@ implements CallbackFilter } public Class[] getCallbackTypes() { - if (callbacks.size() == 0) { + if (callbacks.isEmpty()) { return new Class[0]; } if (callbacks.get(0) instanceof Callback) { diff --git a/spring-core/src/main/java/org/springframework/cglib/proxy/Enhancer.java b/spring-core/src/main/java/org/springframework/cglib/proxy/Enhancer.java index f9f5275cacd..5263b552daf 100644 --- a/spring-core/src/main/java/org/springframework/cglib/proxy/Enhancer.java +++ b/spring-core/src/main/java/org/springframework/cglib/proxy/Enhancer.java @@ -755,7 +755,7 @@ public class Enhancer extends AbstractClassGenerator { */ protected void filterConstructors(Class sc, List constructors) { CollectionUtils.filter(constructors, new VisibilityPredicate(sc, true)); - if (constructors.size() == 0) { + if (constructors.isEmpty()) { throw new IllegalArgumentException("No visible constructors in " + sc); } } diff --git a/spring-core/src/main/java/org/springframework/core/io/support/PropertySourceProcessor.java b/spring-core/src/main/java/org/springframework/core/io/support/PropertySourceProcessor.java index 9b073381234..70a3bc2f892 100644 --- a/spring-core/src/main/java/org/springframework/core/io/support/PropertySourceProcessor.java +++ b/spring-core/src/main/java/org/springframework/core/io/support/PropertySourceProcessor.java @@ -80,7 +80,7 @@ public class PropertySourceProcessor { String name = descriptor.name(); String encoding = descriptor.encoding(); List locations = descriptor.locations(); - Assert.isTrue(locations.size() > 0, "At least one @PropertySource(value) location is required"); + Assert.isTrue(!locations.isEmpty(), "At least one @PropertySource(value) location is required"); boolean ignoreResourceNotFound = descriptor.ignoreResourceNotFound(); PropertySourceFactory factory = (descriptor.propertySourceFactory() != null ? instantiateClass(descriptor.propertySourceFactory()) : defaultPropertySourceFactory); diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java index d54ea520059..10a6facc235 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompDecoder.java @@ -134,7 +134,7 @@ public class StompDecoder { byteBuffer.mark(); String command = readCommand(byteBuffer); - if (command.length() > 0) { + if (!command.isEmpty()) { StompHeaderAccessor headerAccessor = null; byte[] payload = null; if (byteBuffer.remaining() > 0) { diff --git a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/AbstractStompBrokerRelayIntegrationTests.java b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/AbstractStompBrokerRelayIntegrationTests.java index 135b1c9cbf0..c2a04f5393e 100644 --- a/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/AbstractStompBrokerRelayIntegrationTests.java +++ b/spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/AbstractStompBrokerRelayIntegrationTests.java @@ -368,7 +368,7 @@ public abstract class AbstractStompBrokerRelayIntegrationTests { public void expectMessages(MessageExchange... messageExchanges) throws InterruptedException { List expectedMessages = new ArrayList<>(Arrays.asList(messageExchanges)); - while (expectedMessages.size() > 0) { + while (!expectedMessages.isEmpty()) { Message message = this.queue.poll(10000, TimeUnit.MILLISECONDS); assertThat(message).as("Timed out waiting for messages, expected [" + expectedMessages + "]").isNotNull(); MessageExchange match = findMatch(expectedMessages, message); diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/PathPattern.java b/spring-web/src/main/java/org/springframework/web/util/pattern/PathPattern.java index ddd8ce9fc8a..43268065efd 100644 --- a/spring-web/src/main/java/org/springframework/web/util/pattern/PathPattern.java +++ b/spring-web/src/main/java/org/springframework/web/util/pattern/PathPattern.java @@ -567,7 +567,7 @@ public class PathPattern implements Comparable { * @return {@code true} has more than zero elements */ private boolean hasLength(@Nullable PathContainer container) { - return container != null && container.elements().size() > 0; + return container != null && !container.elements().isEmpty(); } private static int scoreByNormalizedLength(PathPattern pattern) { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractUrlHandlerMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractUrlHandlerMapping.java index 210603c7f75..dfb8060c792 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractUrlHandlerMapping.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractUrlHandlerMapping.java @@ -383,7 +383,7 @@ public abstract class AbstractUrlHandlerMapping extends AbstractHandlerMapping { uriTemplateVariables.putAll(decodedVars); } } - if (logger.isTraceEnabled() && uriTemplateVariables.size() > 0) { + if (logger.isTraceEnabled() && !uriTemplateVariables.isEmpty()) { logger.trace("URI variables " + uriTemplateVariables); } return buildPathExposingHandler(handler, bestMatch, pathWithinMapping, uriTemplateVariables);