Merge branch 'gh-4813'

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/RequestMappingEndpoint.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 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.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;
@@ -35,6 +36,7 @@ import org.springframework.web.servlet.handler.AbstractUrlHandlerMapping;
  * {@link Endpoint} to expose Spring MVC mappings.
  *
  * @author Dave Syer
+ * @author Andy Wilkinson
  */
 @ConfigurationProperties(prefix = "endpoints.mappings", ignoreUnknownFields = false)
 public class RequestMappingEndpoint extends AbstractEndpoint<Map<String, Object>>
@@ -83,20 +85,19 @@ public class RequestMappingEndpoint extends AbstractEndpoint<Map<String, Object>
 		return result;
 	}
 
+	@SuppressWarnings("rawtypes")
 	protected void extractMethodMappings(ApplicationContext applicationContext,
 			Map<String, Object> result) {
 		if (applicationContext != null) {
-			for (String name : applicationContext
+			for (Entry<String, AbstractHandlerMethodMapping> bean : applicationContext
-					.getBeansOfType(AbstractHandlerMethodMapping.class).keySet()) {
+					.getBeansOfType(AbstractHandlerMethodMapping.class).entrySet()) {
 				@SuppressWarnings("unchecked")
-				Map<?, HandlerMethod> methods = applicationContext
+				Map<?, HandlerMethod> methods = bean.getValue().getHandlerMethods();
-						.getBean(name, AbstractHandlerMethodMapping.class)
+				for (Entry<?, HandlerMethod> method : methods.entrySet()) {
-						.getHandlerMethods();
-				for (Object key : methods.keySet()) {
 					Map<String, String> map = new LinkedHashMap<String, String>();
-					map.put("bean", name);
+					map.put("bean", bean.getKey());
-					map.put("method", methods.get(key).toString());
+					map.put("method", method.getValue().toString());
-					result.put(key.toString(), map);
+					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()) {
+			for (Entry<String, AbstractUrlHandlerMapping> mapping : mappings.entrySet()) {
-				AbstractUrlHandlerMapping mapping = mappings.get(name);
+				Map<String, Object> handlers = getHandlerMap(mapping.getValue());
-				Map<String, Object> handlers = getHandlerMap(mapping);
+				for (Entry<String, Object> handler : handlers.entrySet()) {
-				for (String key : handlers.keySet()) {
+					result.put(handler.getKey(),
-					result.put(key, Collections.singletonMap("bean", name));
+							Collections.singletonMap("bean", mapping.getKey()));
 				}
 			}
 		}

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()) {
+		for (Entry<Object, Object> name : this.objectNameStaticProperties.entrySet()) {
-			builder.append("," + key + "=" + this.objectNameStaticProperties.get(key));
+			builder.append("," + name.getKey() + "=" + name.getValue());
 		}
 		return builder.toString();
 	}

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()) {
+			for (Entry<String, MediaType> mediaType : mediaTypes.entrySet()) {
-				configurer.mediaType(extension, mediaTypes.get(extension));
+				configurer.mediaType(mediaType.getKey(), mediaType.getValue());
 			}
 		}
 

spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ServiceCapabilitiesReportGenerator.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.
@@ -23,11 +23,15 @@ import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
+import java.util.SortedSet;
+import java.util.TreeSet;
 
 /**
  * A helper class generating a report from the meta-data of a particular service.
  *
  * @author Stephane Nicoll
+ * @author Andy Wilkinson
  * @since 1.2.0
  */
 class ServiceCapabilitiesReportGenerator {
@@ -104,11 +108,20 @@ class ServiceCapabilitiesReportGenerator {
 			StringBuilder report) {
 		report.append("Available project types:" + NEW_LINE);
 		report.append("------------------------" + NEW_LINE);
-		List<String> typeIds = new ArrayList<String>(metadata.getProjectTypes().keySet());
+		SortedSet<Entry<String, ProjectType>> entries = new TreeSet<Entry<String, ProjectType>>(
-		Collections.sort(typeIds);
+				new Comparator<Entry<String, ProjectType>>() {
-		for (String typeId : typeIds) {
+
-			ProjectType type = metadata.getProjectTypes().get(typeId);
+					@Override
-			report.append(typeId + " -  " + type.getName());
+					public int compare(Entry<String, ProjectType> o1,
+							Entry<String, ProjectType> o2) {
+						return o1.getKey().compareTo(o2.getKey());
+					}
+
+				});
+		entries.addAll(metadata.getProjectTypes().entrySet());
+		for (Entry<String, ProjectType> entry : entries) {
+			ProjectType type = entry.getValue();
+			report.append(entry.getKey() + " -  " + type.getName());
 			if (!type.getTags().isEmpty()) {
 				reportTags(report, type);
 			}

spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/PropertiesMergingResourceTransformer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2013 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.
@@ -19,6 +19,7 @@ package org.springframework.boot.maven;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
+import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.jar.JarEntry;
 import java.util.jar.JarOutputStream;
@@ -32,6 +33,7 @@ import org.apache.maven.plugins.shade.resource.ResourceTransformer;
  * to be merged without losing any information.
  *
  * @author Dave Syer
+ * @author Andy Wilkinson
  */
 public class PropertiesMergingResourceTransformer implements ResourceTransformer {
 
@@ -62,9 +64,9 @@ public class PropertiesMergingResourceTransformer implements ResourceTransformer
 		Properties properties = new Properties();
 		properties.load(is);
 		is.close();
-		for (Object key : properties.keySet()) {
+		for (Entry<Object, Object> entry : properties.entrySet()) {
-			String name = (String) key;
+			String name = (String) entry.getKey();
-			String value = properties.getProperty(name);
+			String value = (String) entry.getValue();
 			String existing = this.data.getProperty(name);
 			this.data.setProperty(name,
 					existing == null ? value : existing + "," + value);