diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AnnotationBeanWiringInfoResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AnnotationBeanWiringInfoResolver.java index a0e05da517..b3550404c5 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AnnotationBeanWiringInfoResolver.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AnnotationBeanWiringInfoResolver.java @@ -56,7 +56,7 @@ public class AnnotationBeanWiringInfoResolver implements BeanWiringInfoResolver // Autowiring by name or by type return new BeanWiringInfo(annotation.autowire().value(), annotation.dependencyCheck()); } - else if (!"".equals(annotation.value())) { + else if (!annotation.value().isEmpty()) { // Explicitly specified bean name for bean definition to take property values from return new BeanWiringInfo(annotation.value(), false); } diff --git a/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContext.java b/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContext.java index 6c380907f2..f52b8191d4 100644 --- a/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContext.java +++ b/spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContext.java @@ -126,7 +126,7 @@ public class SimpleNamingContext implements Context { if (logger.isDebugEnabled()) { logger.debug("Static JNDI lookup: [" + name + "]"); } - if ("".equals(name)) { + if (name.isEmpty()) { return new SimpleNamingContext(this.root, this.boundObjects, this.environment); } Object found = this.boundObjects.get(name); @@ -306,7 +306,7 @@ public class SimpleNamingContext implements Context { private Iterator iterator; private AbstractNamingEnumeration(SimpleNamingContext context, String proot) throws NamingException { - if (!"".equals(proot) && !proot.endsWith("/")) { + if (!proot.isEmpty() && !proot.endsWith("/")) { proot = proot + "/"; } String root = context.root + proot; diff --git a/spring-web/src/main/java/org/springframework/http/codec/ServerSentEventHttpMessageReader.java b/spring-web/src/main/java/org/springframework/http/codec/ServerSentEventHttpMessageReader.java index d6b9c9cb9d..a6de190d51 100644 --- a/spring-web/src/main/java/org/springframework/http/codec/ServerSentEventHttpMessageReader.java +++ b/spring-web/src/main/java/org/springframework/http/codec/ServerSentEventHttpMessageReader.java @@ -105,7 +105,7 @@ public class ServerSentEventHttpMessageReader implements HttpMessageReader line.equals("")) + .bufferUntil(String::isEmpty) .concatMap(lines -> Mono.justOrEmpty(buildEvent(lines, valueType, shouldWrap, hints))); } diff --git a/spring-web/src/main/java/org/springframework/http/server/DefaultPathContainer.java b/spring-web/src/main/java/org/springframework/http/server/DefaultPathContainer.java index 7d5a586a9b..2098f45941 100644 --- a/spring-web/src/main/java/org/springframework/http/server/DefaultPathContainer.java +++ b/spring-web/src/main/java/org/springframework/http/server/DefaultPathContainer.java @@ -97,7 +97,7 @@ final class DefaultPathContainer implements PathContainer { static PathContainer createFromUrlPath(String path, Options options) { - if (path.equals("")) { + if (path.isEmpty()) { return EMPTY_PATH; } char separator = options.separator(); @@ -117,7 +117,7 @@ final class DefaultPathContainer implements PathContainer { while (begin < path.length()) { int end = path.indexOf(separator, begin); String segment = (end != -1 ? path.substring(begin, end) : path.substring(begin)); - if (!segment.equals("")) { + if (!segment.isEmpty()) { elements.add(options.shouldDecodeAndParseSegments() ? decodeAndParsePathSegment(segment) : new DefaultPathSegment(segment, separatorElement)); 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 85216a8cda..81fd667638 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 @@ -411,8 +411,8 @@ public class PathPattern implements Comparable { int dotPos2 = p2string.indexOf('.'); String file2 = (dotPos2 == -1 ? p2string : p2string.substring(0, dotPos2)); String secondExtension = (dotPos2 == -1 ? "" : p2string.substring(dotPos2)); - boolean firstExtensionWild = (firstExtension.equals(".*") || firstExtension.equals("")); - boolean secondExtensionWild = (secondExtension.equals(".*") || secondExtension.equals("")); + boolean firstExtensionWild = (firstExtension.equals(".*") || firstExtension.isEmpty()); + boolean secondExtensionWild = (secondExtension.equals(".*") || secondExtension.isEmpty()); if (!firstExtensionWild && !secondExtensionWild) { throw new IllegalArgumentException( "Cannot combine patterns: " + this.patternString + " and " + pattern2string);