From 9ca8681f79cad3a0c3c6ab1497575eaa9232441c Mon Sep 17 00:00:00 2001 From: stsypanov Date: Mon, 13 May 2019 14:27:01 +0300 Subject: [PATCH] Iteration over a map using EntrySet --- .../AbstractMethodMessageHandler.java | 5 ++-- .../invocation/reactive/InvocableHelper.java | 5 ++-- .../oxm/jaxb/Jaxb2Marshaller.java | 8 +++--- .../mock/web/HeaderValueHolder.java | 6 ++--- .../MockHttpServletRequestBuilder.java | 25 +++++++++++-------- .../annotation/ControllerMethodResolver.java | 5 ++-- .../servlet/mvc/WebContentInterceptor.java | 12 ++++----- .../support/AbstractFlashMapManager.java | 7 +++--- .../tags/form/AbstractHtmlElementTag.java | 4 +-- .../web/servlet/tags/form/FormTag.java | 4 +-- 10 files changed, 45 insertions(+), 36 deletions(-) diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AbstractMethodMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AbstractMethodMessageHandler.java index 2264c5c86e..67aa3da79a 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AbstractMethodMessageHandler.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AbstractMethodMessageHandler.java @@ -640,9 +640,10 @@ public abstract class AbstractMethodMessageHandler if (method != null) { return new InvocableHandlerMethod(handlerMethod.getBean(), method); } - for (MessagingAdviceBean advice : this.exceptionHandlerAdviceCache.keySet()) { + for (Map.Entry entry : this.exceptionHandlerAdviceCache.entrySet()) { + MessagingAdviceBean advice = entry.getKey(); if (advice.isApplicableToBeanType(beanType)) { - resolver = this.exceptionHandlerAdviceCache.get(advice); + resolver = entry.getValue(); method = resolver.resolveMethod(exception); if (method != null) { return new InvocableHandlerMethod(advice.resolveBean(), method); diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/InvocableHelper.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/InvocableHelper.java index 11faf8e7cb..b144ae59a8 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/InvocableHelper.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/reactive/InvocableHelper.java @@ -155,9 +155,10 @@ class InvocableHelper { exceptionHandlerMethod = new InvocableHandlerMethod(handlerMethod.getBean(), method); } else { - for (MessagingAdviceBean advice : this.exceptionHandlerAdviceCache.keySet()) { + for (Map.Entry entry : this.exceptionHandlerAdviceCache.entrySet()) { + MessagingAdviceBean advice = entry.getKey(); if (advice.isApplicableToBeanType(beanType)) { - resolver = this.exceptionHandlerAdviceCache.get(advice); + resolver = entry.getValue(); method = resolver.resolveMethod(ex); if (method != null) { exceptionHandlerMethod = new InvocableHandlerMethod(advice.resolveBean(), method); diff --git a/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java index 109ff92b09..ded4206f2f 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java @@ -759,8 +759,8 @@ public class Jaxb2Marshaller implements MimeMarshaller, MimeUnmarshaller, Generi */ protected void initJaxbMarshaller(Marshaller marshaller) throws JAXBException { if (this.marshallerProperties != null) { - for (String name : this.marshallerProperties.keySet()) { - marshaller.setProperty(name, this.marshallerProperties.get(name)); + for (Map.Entry entry : this.marshallerProperties.entrySet()) { + marshaller.setProperty(entry.getKey(), entry.getValue()); } } if (this.marshallerListener != null) { @@ -913,8 +913,8 @@ public class Jaxb2Marshaller implements MimeMarshaller, MimeUnmarshaller, Generi */ protected void initJaxbUnmarshaller(Unmarshaller unmarshaller) throws JAXBException { if (this.unmarshallerProperties != null) { - for (String name : this.unmarshallerProperties.keySet()) { - unmarshaller.setProperty(name, this.unmarshallerProperties.get(name)); + for (Map.Entry entry : this.unmarshallerProperties.entrySet()) { + unmarshaller.setProperty(entry.getKey(), entry.getValue()); } } if (this.unmarshallerListener != null) { diff --git a/spring-test/src/main/java/org/springframework/mock/web/HeaderValueHolder.java b/spring-test/src/main/java/org/springframework/mock/web/HeaderValueHolder.java index de3c74aa25..540b104d5b 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/HeaderValueHolder.java +++ b/spring-test/src/main/java/org/springframework/mock/web/HeaderValueHolder.java @@ -95,9 +95,9 @@ class HeaderValueHolder { @Nullable public static HeaderValueHolder getByName(Map headers, String name) { Assert.notNull(name, "Header name must not be null"); - for (String headerName : headers.keySet()) { - if (headerName.equalsIgnoreCase(name)) { - return headers.get(headerName); + for (Map.Entry entry : headers.entrySet()) { + if (entry.getKey().equalsIgnoreCase(name)) { + return entry.getValue(); } } return null; diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java index 3b1f8b8d80..ba29310fdd 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java +++ b/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java @@ -530,14 +530,16 @@ public class MockHttpServletRequestBuilder this.contentType = parentBuilder.contentType; } - for (String headerName : parentBuilder.headers.keySet()) { + for (Map.Entry> entry : parentBuilder.headers.entrySet()) { + String headerName = entry.getKey(); if (!this.headers.containsKey(headerName)) { - this.headers.put(headerName, parentBuilder.headers.get(headerName)); + this.headers.put(headerName, entry.getValue()); } } - for (String paramName : parentBuilder.parameters.keySet()) { + for (Map.Entry> entry : parentBuilder.parameters.entrySet()) { + String paramName = entry.getKey(); if (!this.parameters.containsKey(paramName)) { - this.parameters.put(paramName, parentBuilder.parameters.get(paramName)); + this.parameters.put(paramName, entry.getValue()); } } for (Cookie cookie : parentBuilder.cookies) { @@ -551,19 +553,22 @@ public class MockHttpServletRequestBuilder } } - for (String attributeName : parentBuilder.requestAttributes.keySet()) { + for (Map.Entry entry : parentBuilder.requestAttributes.entrySet()) { + String attributeName = entry.getKey(); if (!this.requestAttributes.containsKey(attributeName)) { - this.requestAttributes.put(attributeName, parentBuilder.requestAttributes.get(attributeName)); + this.requestAttributes.put(attributeName, entry.getValue()); } } - for (String attributeName : parentBuilder.sessionAttributes.keySet()) { + for (Map.Entry entry : parentBuilder.sessionAttributes.entrySet()) { + String attributeName = entry.getKey(); if (!this.sessionAttributes.containsKey(attributeName)) { - this.sessionAttributes.put(attributeName, parentBuilder.sessionAttributes.get(attributeName)); + this.sessionAttributes.put(attributeName, entry.getValue()); } } - for (String attributeName : parentBuilder.flashAttributes.keySet()) { + for (Map.Entry entry : parentBuilder.flashAttributes.entrySet()) { + String attributeName = entry.getKey(); if (!this.flashAttributes.containsKey(attributeName)) { - this.flashAttributes.put(attributeName, parentBuilder.flashAttributes.get(attributeName)); + this.flashAttributes.put(attributeName, entry.getValue()); } } diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ControllerMethodResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ControllerMethodResolver.java index 89150267a5..0c5c30a915 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ControllerMethodResolver.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ControllerMethodResolver.java @@ -351,10 +351,11 @@ class ControllerMethodResolver { if (targetMethod == null) { // Global exception handlers... - for (ControllerAdviceBean advice : this.exceptionHandlerAdviceCache.keySet()) { + for (Map.Entry entry : this.exceptionHandlerAdviceCache.entrySet()) { + ControllerAdviceBean advice = entry.getKey(); if (advice.isApplicableToBeanType(handlerType)) { targetBean = advice.resolveBean(); - targetMethod = this.exceptionHandlerAdviceCache.get(advice).resolveMethodByThrowable(ex); + targetMethod = entry.getValue().resolveMethodByThrowable(ex); if (targetMethod != null) { break; } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java index 90b94aec99..489e3a8d72 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/WebContentInterceptor.java @@ -213,9 +213,9 @@ public class WebContentInterceptor extends WebContentGenerator implements Handle return cacheControl; } // Pattern match? - for (String registeredPath : this.cacheControlMappings.keySet()) { - if (this.pathMatcher.match(registeredPath, urlPath)) { - return this.cacheControlMappings.get(registeredPath); + for (Map.Entry entry : this.cacheControlMappings.entrySet()) { + if (this.pathMatcher.match(entry.getKey(), urlPath)) { + return entry.getValue(); } } return null; @@ -238,9 +238,9 @@ public class WebContentInterceptor extends WebContentGenerator implements Handle return cacheSeconds; } // Pattern match? - for (String registeredPath : this.cacheMappings.keySet()) { - if (this.pathMatcher.match(registeredPath, urlPath)) { - return this.cacheMappings.get(registeredPath); + for (Map.Entry entry : this.cacheMappings.entrySet()) { + if (this.pathMatcher.match(entry.getKey(), urlPath)) { + return entry.getValue(); } } return null; diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/AbstractFlashMapManager.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/AbstractFlashMapManager.java index 2c73d3bd46..e5604af920 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/AbstractFlashMapManager.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/AbstractFlashMapManager.java @@ -19,6 +19,7 @@ package org.springframework.web.servlet.support; import java.util.Collections; import java.util.LinkedList; import java.util.List; +import java.util.Map; import java.util.concurrent.CopyOnWriteArrayList; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -169,12 +170,12 @@ public abstract class AbstractFlashMapManager implements FlashMapManager { } MultiValueMap actualParams = getOriginatingRequestParams(request); MultiValueMap expectedParams = flashMap.getTargetRequestParams(); - for (String expectedName : expectedParams.keySet()) { - List actualValues = actualParams.get(expectedName); + for (Map.Entry> entry : expectedParams.entrySet()) { + List actualValues = actualParams.get(entry.getKey()); if (actualValues == null) { return false; } - for (String expectedValue : expectedParams.get(expectedName)) { + for (String expectedValue : entry.getValue()) { if (!actualValues.contains(expectedValue)) { return false; } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java index 15abfcdd04..97998a832c 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java @@ -485,8 +485,8 @@ public abstract class AbstractHtmlElementTag extends AbstractDataBoundFormElemen writeOptionalAttribute(tagWriter, ONKEYDOWN_ATTRIBUTE, getOnkeydown()); if (!CollectionUtils.isEmpty(this.dynamicAttributes)) { - for (String attr : this.dynamicAttributes.keySet()) { - tagWriter.writeOptionalAttributeValue(attr, getDisplayString(this.dynamicAttributes.get(attr))); + for (Map.Entry entry : this.dynamicAttributes.entrySet()) { + tagWriter.writeOptionalAttributeValue(entry.getKey(), getDisplayString(entry.getValue())); } } } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/FormTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/FormTag.java index 91c49e4290..e4c295108c 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/FormTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/FormTag.java @@ -704,9 +704,9 @@ public class FormTag extends AbstractHtmlElementTag { if (!CollectionUtils.isEmpty(hiddenFields)) { Assert.state(this.tagWriter != null, "No TagWriter set"); this.tagWriter.appendValue("
\n"); - for (String name : hiddenFields.keySet()) { + for (Map.Entry entry : hiddenFields.entrySet()) { this.tagWriter.appendValue("\n"); } this.tagWriter.appendValue("
");