Polish: do simple clean-up

stsypanov · jhoeller · commit 60b72d721dc2 · 2019-03-07T16:51:44.000+01:00
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
@@ -156,8 +156,7 @@ private boolean process(MatchCallback callback, Yaml yaml, Resource resource) {
 			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 @@ private boolean process(MatchCallback callback, Yaml yaml, Resource resource) {
 							" 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
@@ -663,7 +663,7 @@ public void addQualifier(AutowireCandidateQualifier qualifier) {
 	 * 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
@@ -267,7 +267,7 @@ private String unescape(String inString) {
 			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');
 			}

Original file line number	Diff line number	Diff line change
`@@ -156,8 +156,7 @@ private boolean process(MatchCallback callback, Yaml yaml, Resource resource) {`
`156`	`156`	`if (logger.isDebugEnabled()) {`
`157`	`157`	`logger.debug("Loading from YAML: " + resource);`
`158`	`158`	`}`
`159`		`- Reader reader = new UnicodeReader(resource.getInputStream());`
`160`		`- try {`
	`159`	`+ try (Reader reader = new UnicodeReader(resource.getInputStream())) {`
`161`	`160`	`for (Object object : yaml.loadAll(reader)) {`
`162`	`161`	`if (object != null && process(asMap(object), callback)) {`
`163`	`162`	`count++;`
`@@ -171,9 +170,6 @@ private boolean process(MatchCallback callback, Yaml yaml, Resource resource) {`
`171`	`170`	`" from YAML resource: " + resource);`
`172`	`171`	`}`
`173`	`172`	`}`
`174`		`- finally {`
`175`		`- reader.close();`
`176`		`- }`
`177`	`173`	`}`
`178`	`174`	`catch (IOException ex) {`
`179`	`175`	`handleProcessError(resource, ex);`
Original file line number	Diff line number	Diff line change
`@@ -663,7 +663,7 @@ public void addQualifier(AutowireCandidateQualifier qualifier) {`
`663`	`663`	`* Return whether this bean has the specified qualifier.`
`664`	`664`	`*/`
`665`	`665`	`public boolean hasQualifier(String typeName) {`
`666`		`- return this.qualifiers.keySet().contains(typeName);`
	`666`	`+ return this.qualifiers.containsKey(typeName);`
`667`	`667`	`}`
`668`	`668`
`669`	`669`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,7 @@ private String unescape(String inString) {`
`267`	`267`	`if (index + 1 >= inString.length()) {`
`268`	`268`	`throw new StompConversionException("Illegal escape sequence at index " + index + ": " + inString);`
`269`	`269`	`}`
`270`		`- Character c = inString.charAt(index + 1);`
	`270`	`+ char c = inString.charAt(index + 1);`
`271`	`271`	`if (c == 'r') {`
`272`	`272`	`sb.append('\r');`
`273`	`273`	`}`