From aaeabc3c85befe72c6c22df9ac9b83a6c67bdef2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9=20=D0=A6=D1=8B=D0=BF?= =?UTF-8?q?=D0=B0=D0=BD=D0=BE=D0=B2?= Date: Wed, 29 May 2019 19:00:34 +0300 Subject: [PATCH] Simplify iteration over maps Closes gh-23053 --- .../springframework/jms/support/SimpleJmsHeaderMapper.java | 7 ++++--- .../test/context/cache/DefaultContextCache.java | 6 +++--- .../result/method/annotation/SessionAttributesHandler.java | 3 +-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/spring-jms/src/main/java/org/springframework/jms/support/SimpleJmsHeaderMapper.java b/spring-jms/src/main/java/org/springframework/jms/support/SimpleJmsHeaderMapper.java index a5fba5a00d..049e5be287 100644 --- a/spring-jms/src/main/java/org/springframework/jms/support/SimpleJmsHeaderMapper.java +++ b/spring-jms/src/main/java/org/springframework/jms/support/SimpleJmsHeaderMapper.java @@ -92,10 +92,11 @@ public class SimpleJmsHeaderMapper extends AbstractHeaderMapper impleme logger.debug("Failed to set JMSType - skipping", ex); } } - Set headerNames = headers.keySet(); - for (String headerName : headerNames) { + Set> entries = headers.entrySet(); + for (Map.Entry entry : entries) { + String headerName = entry.getKey(); if (StringUtils.hasText(headerName) && !headerName.startsWith(JmsHeaders.PREFIX)) { - Object value = headers.get(headerName); + Object value = entry.getValue(); if (value != null && SUPPORTED_PROPERTY_TYPES.contains(value.getClass())) { try { String propertyName = this.fromHeaderName(headerName); diff --git a/spring-test/src/main/java/org/springframework/test/context/cache/DefaultContextCache.java b/spring-test/src/main/java/org/springframework/test/context/cache/DefaultContextCache.java index c639ef71e2..ba27b97937 100644 --- a/spring-test/src/main/java/org/springframework/test/context/cache/DefaultContextCache.java +++ b/spring-test/src/main/java/org/springframework/test/context/cache/DefaultContextCache.java @@ -180,9 +180,9 @@ public class DefaultContextCache implements ContextCache { } // Remove empty entries from the hierarchy map. - for (MergedContextConfiguration currentKey : this.hierarchyMap.keySet()) { - if (this.hierarchyMap.get(currentKey).isEmpty()) { - this.hierarchyMap.remove(currentKey); + for (Map.Entry> entry : this.hierarchyMap.entrySet()) { + if (entry.getValue().isEmpty()) { + this.hierarchyMap.remove(entry.getKey()); } } } diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/SessionAttributesHandler.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/SessionAttributesHandler.java index 287abc112e..debbc0fd74 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/SessionAttributesHandler.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/SessionAttributesHandler.java @@ -113,8 +113,7 @@ class SessionAttributesHandler { * @param attributes candidate attributes for session storage */ public void storeAttributes(WebSession session, Map attributes) { - attributes.keySet().forEach(name -> { - Object value = attributes.get(name); + attributes.forEach((name, value) -> { if (value != null && isHandlerSessionAttribute(name, value.getClass())) { session.getAttributes().put(name, value); }