diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/RequestMappingEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/RequestMappingEndpoint.java
index a4d65af6b7..b7ea7fa051 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/RequestMappingEndpoint.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/RequestMappingEndpoint.java
@@ -21,6 +21,7 @@ import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.BeansException;
@@ -92,11 +93,11 @@ public class RequestMappingEndpoint extends AbstractEndpoint<Map<String, Object>
 				Map<?, HandlerMethod> methods = applicationContext
 						.getBean(name, AbstractHandlerMethodMapping.class)
 						.getHandlerMethods();
-				for (Object key : methods.keySet()) {
+				for (Entry<?, HandlerMethod> method : methods.entrySet()) {
 					Map<String, String> map = new LinkedHashMap<String, String>();
 					map.put("bean", name);
-					map.put("method", methods.get(key).toString());
-					result.put(key.toString(), map);
+					map.put("method",  method.getValue().toString());
+					result.put( method.getKey().toString(), map);
 				}
 			}
 		}
@@ -107,11 +108,11 @@ public class RequestMappingEndpoint extends AbstractEndpoint<Map<String, Object>
 		if (applicationContext != null) {
 			Map<String, AbstractUrlHandlerMapping> mappings = applicationContext
 					.getBeansOfType(AbstractUrlHandlerMapping.class);
-			for (String name : mappings.keySet()) {
-				AbstractUrlHandlerMapping mapping = mappings.get(name);
-				Map<String, Object> handlers = getHandlerMap(mapping);
-				for (String key : handlers.keySet()) {
-					result.put(key, Collections.singletonMap("bean", name));
+			for (Entry<String, AbstractUrlHandlerMapping> mapping : mappings.entrySet()) {
+				Map<String, Object> handlers = getHandlerMap(mapping.getValue());
+				for (Entry<String, Object> handler : handlers.entrySet()) {
+					result.put(handler.getKey(),
+							Collections.singletonMap("bean", mapping.getKey()));
 				}
 			}
 		}
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporter.java
index fea94d536c..102eeaa3ab 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporter.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@ package org.springframework.boot.actuate.endpoint.jmx;
 
 import java.util.HashSet;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.Set;
 import java.util.concurrent.locks.ReentrantLock;
@@ -241,8 +242,8 @@ public class EndpointMBeanExporter extends MBeanExporter
 		}
 		StringBuilder builder = new StringBuilder();
 
-		for (Object key : this.objectNameStaticProperties.keySet()) {
-			builder.append("," + key + "=" + this.objectNameStaticProperties.get(key));
+		for (Entry<Object, Object> name : this.objectNameStaticProperties.entrySet()) {
+			builder.append("," + name.getKey() + "=" + name.getValue());
 		}
 		return builder.toString();
 	}
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfiguration.java
index 51839a223f..68b229feb9 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 
 import javax.servlet.Servlet;
 
@@ -132,7 +133,8 @@ public class WebMvcAutoConfiguration {
 	@EnableConfigurationProperties({ WebMvcProperties.class, ResourceProperties.class })
 	public static class WebMvcAutoConfigurationAdapter extends WebMvcConfigurerAdapter {
 
-		private static final Log logger = LogFactory.getLog(WebMvcConfigurerAdapter.class);
+		private static final Log logger = LogFactory
+				.getLog(WebMvcConfigurerAdapter.class);
 
 		@Autowired
 		private ResourceProperties resourceProperties = new ResourceProperties();
@@ -162,8 +164,8 @@ public class WebMvcAutoConfiguration {
 		@Override
 		public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
 			Map<String, MediaType> mediaTypes = this.mvcProperties.getMediaTypes();
-			for (String extension : mediaTypes.keySet()) {
-				configurer.mediaType(extension, mediaTypes.get(extension));
+			for (Entry<String, MediaType> mediaType : mediaTypes.entrySet()) {
+				configurer.mediaType(mediaType.getKey(), mediaType.getValue());
 			}
 		}