From 60b72d721dc2f02279ff360d4ea1de98ae62d986 Mon Sep 17 00:00:00 2001 From: stsypanov Date: Thu, 7 Mar 2019 12:50:16 +0200 Subject: [PATCH] Polish: do simple clean-up --- .../springframework/beans/factory/config/YamlProcessor.java | 6 +----- .../beans/factory/support/AbstractBeanDefinition.java | 2 +- .../springframework/messaging/simp/stomp/StompDecoder.java | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java index 75149c09f43..74f1e68fa2c 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/config/YamlProcessor.java @@ -156,8 +156,7 @@ public abstract class YamlProcessor { if (logger.isDebugEnabled()) { logger.debug("Loading from YAML: " + resource); } - Reader reader = new UnicodeReader(resource.getInputStream()); - try { + try (Reader reader = new UnicodeReader(resource.getInputStream())) { for (Object object : yaml.loadAll(reader)) { if (object != null && process(asMap(object), callback)) { count++; @@ -171,9 +170,6 @@ public abstract class YamlProcessor { " from YAML resource: " + resource); } } - finally { - reader.close(); - } } catch (IOException ex) { handleProcessError(resource, ex); diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java index 84b748b0b0b..99ff9998a03 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinition.java @@ -663,7 +663,7 @@ public abstract class AbstractBeanDefinition extends BeanMetadataAttributeAccess * Return whether this bean has the specified qualifier. */ public boolean hasQualifier(String typeName) { - return this.qualifiers.keySet().contains(typeName); + return this.qualifiers.containsKey(typeName); } /** 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 9a9ed7c8029..9bb80c87865 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 @@ -267,7 +267,7 @@ public class StompDecoder { if (index + 1 >= inString.length()) { throw new StompConversionException("Illegal escape sequence at index " + index + ": " + inString); } - Character c = inString.charAt(index + 1); + char c = inString.charAt(index + 1); if (c == 'r') { sb.append('\r'); }