diff --git a/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/EndpointDocumentation.java b/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/EndpointDocumentation.java
index d8ccf9aafe..1807a12939 100644
--- a/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/EndpointDocumentation.java
+++ b/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/EndpointDocumentation.java
@@ -78,7 +78,7 @@ public class EndpointDocumentation {
 	static final File LOG_FILE = new File("target/logs/spring.log");
 
 	private static final Set<String> SKIPPED = Collections
-			.<String>unmodifiableSet(new HashSet<String>(
+			.<String>unmodifiableSet(new HashSet<>(
 					Arrays.asList("/docs", "/logfile", "/heapdump", "/auditevents")));
 
 	@Autowired
@@ -161,8 +161,8 @@ public class EndpointDocumentation {
 	@Test
 	public void endpoints() throws Exception {
 		final File docs = new File("src/main/asciidoc");
-		final Map<String, Object> model = new LinkedHashMap<String, Object>();
-		final List<EndpointDoc> endpoints = new ArrayList<EndpointDoc>();
+		final Map<String, Object> model = new LinkedHashMap<>();
+		final List<EndpointDoc> endpoints = new ArrayList<>();
 		model.put("endpoints", endpoints);
 		for (MvcEndpoint endpoint : getEndpoints()) {
 			final String endpointPath = (StringUtils.hasText(endpoint.getPath())
@@ -200,7 +200,7 @@ public class EndpointDocumentation {
 	}
 
 	private Collection<? extends MvcEndpoint> getEndpoints() {
-		List<? extends MvcEndpoint> endpoints = new ArrayList<MvcEndpoint>(
+		List<? extends MvcEndpoint> endpoints = new ArrayList<>(
 				this.mvcEndpoints.getEndpoints());
 		Collections.sort(endpoints, new Comparator<MvcEndpoint>() {
 			@Override
diff --git a/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/LimitedEnvironmentEndpoint.java b/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/LimitedEnvironmentEndpoint.java
index 443c06cd0f..eaa2d95140 100644
--- a/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/LimitedEnvironmentEndpoint.java
+++ b/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/LimitedEnvironmentEndpoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -39,8 +39,8 @@ public class LimitedEnvironmentEndpoint extends EnvironmentEndpoint {
 	private static final MultiValueMap<String, String> INCLUDES;
 
 	static {
-		Map<String, List<String>> includes = new LinkedHashMap<String, List<String>>();
-		List<String> systemProperties = new ArrayList<String>();
+		Map<String, List<String>> includes = new LinkedHashMap<>();
+		List<String> systemProperties = new ArrayList<>();
 		systemProperties.add("java.runtime.name");
 		systemProperties.add("sun.boot.library.path");
 		systemProperties.add("java.vendor.url");
@@ -61,14 +61,13 @@ public class LimitedEnvironmentEndpoint extends EnvironmentEndpoint {
 		systemProperties.add("java.vendor");
 		systemProperties.add("file.separator");
 		includes.put("systemProperties", systemProperties);
-		List<String> systemEnvironment = new ArrayList<String>();
+		List<String> systemEnvironment = new ArrayList<>();
 		systemEnvironment.add("SHELL");
 		systemEnvironment.add("TMPDIR");
 		systemEnvironment.add("DISPLAY");
 		systemEnvironment.add("LOGNAME");
 		includes.put("systemEnvironment", systemEnvironment);
-		INCLUDES = new LinkedMultiValueMap<String, String>(
-				Collections.unmodifiableMap(includes));
+		INCLUDES = new LinkedMultiValueMap<>(Collections.unmodifiableMap(includes));
 	}
 
 	@Override
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/AuditEvent.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/AuditEvent.java
index ae96349f10..84501c61cc 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/AuditEvent.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/AuditEvent.java
@@ -94,7 +94,7 @@ public class AuditEvent implements Serializable {
 	}
 
 	private static Map<String, Object> convert(String[] data) {
-		Map<String, Object> result = new HashMap<String, Object>();
+		Map<String, Object> result = new HashMap<>();
 		for (String entry : data) {
 			if (entry.contains("=")) {
 				int index = entry.indexOf("=");
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepository.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepository.java
index 5ee48dd923..2602701742 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepository.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepository.java
@@ -81,7 +81,7 @@ public class InMemoryAuditEventRepository implements AuditEventRepository {
 
 	@Override
 	public List<AuditEvent> find(String principal, Date after, String type) {
-		LinkedList<AuditEvent> events = new LinkedList<AuditEvent>();
+		LinkedList<AuditEvent> events = new LinkedList<>();
 		synchronized (this.monitor) {
 			for (int i = 0; i < this.events.length; i++) {
 				AuditEvent event = resolveTailEvent(i);
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointAutoConfiguration.java
index 2e7b0e4eba..357dacd433 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointAutoConfiguration.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointAutoConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -145,7 +145,7 @@ public class EndpointAutoConfiguration {
 	@Bean
 	@ConditionalOnMissingBean
 	public MetricsEndpoint metricsEndpoint() {
-		List<PublicMetrics> publicMetrics = new ArrayList<PublicMetrics>();
+		List<PublicMetrics> publicMetrics = new ArrayList<>();
 		if (this.publicMetrics != null) {
 			publicMetrics.addAll(this.publicMetrics);
 		}
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointCorsProperties.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointCorsProperties.java
index 8f2ba01ae3..caeb45669d 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointCorsProperties.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointCorsProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -34,23 +34,23 @@ public class EndpointCorsProperties {
 	 * Comma-separated list of origins to allow. '*' allows all origins. When not set,
 	 * CORS support is disabled.
 	 */
-	private List<String> allowedOrigins = new ArrayList<String>();
+	private List<String> allowedOrigins = new ArrayList<>();
 
 	/**
 	 * Comma-separated list of methods to allow. '*' allows all methods. When not set,
 	 * defaults to GET.
 	 */
-	private List<String> allowedMethods = new ArrayList<String>();
+	private List<String> allowedMethods = new ArrayList<>();
 
 	/**
 	 * Comma-separated list of headers to allow in a request. '*' allows all headers.
 	 */
-	private List<String> allowedHeaders = new ArrayList<String>();
+	private List<String> allowedHeaders = new ArrayList<>();
 
 	/**
 	 * Comma-separated list of headers to include in a response.
 	 */
-	private List<String> exposedHeaders = new ArrayList<String>();
+	private List<String> exposedHeaders = new ArrayList<>();
 
 	/**
 	 * Set whether credentials are supported. When not set, credentials are not supported.
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java
index b16c7e81d8..40ac3065be 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java
@@ -243,7 +243,7 @@ public class EndpointWebMvcChildContextConfiguration {
 		}
 
 		private List<HandlerMapping> extractMappings() {
-			List<HandlerMapping> list = new ArrayList<HandlerMapping>();
+			List<HandlerMapping> list = new ArrayList<>();
 			list.addAll(this.beanFactory.getBeansOfType(HandlerMapping.class).values());
 			list.remove(this);
 			AnnotationAwareOrderComparator.sort(list);
@@ -260,7 +260,7 @@ public class EndpointWebMvcChildContextConfiguration {
 		private List<HandlerAdapter> adapters;
 
 		private List<HandlerAdapter> extractAdapters() {
-			List<HandlerAdapter> list = new ArrayList<HandlerAdapter>();
+			List<HandlerAdapter> list = new ArrayList<>();
 			list.addAll(this.beanFactory.getBeansOfType(HandlerAdapter.class).values());
 			list.remove(this);
 			AnnotationAwareOrderComparator.sort(list);
@@ -317,7 +317,7 @@ public class EndpointWebMvcChildContextConfiguration {
 		private List<HandlerExceptionResolver> resolvers;
 
 		private List<HandlerExceptionResolver> extractResolvers() {
-			List<HandlerExceptionResolver> list = new ArrayList<HandlerExceptionResolver>();
+			List<HandlerExceptionResolver> list = new ArrayList<>();
 			list.addAll(this.beanFactory.getBeansOfType(HandlerExceptionResolver.class)
 					.values());
 			list.remove(this);
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcHypermediaManagementContextConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcHypermediaManagementContextConfiguration.java
index 531649405a..ea77499047 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcHypermediaManagementContextConfiguration.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcHypermediaManagementContextConfiguration.java
@@ -126,8 +126,8 @@ public class EndpointWebMvcHypermediaManagementContextConfiguration {
 	@ConditionalOnBean(DocsMvcEndpoint.class)
 	@ConditionalOnMissingBean(CurieProvider.class)
 	@ConditionalOnProperty(prefix = "endpoints.docs.curies", name = "enabled", matchIfMissing = false)
-	public DefaultCurieProvider curieProvider(
-			ManagementServerProperties management, DocsMvcEndpoint endpoint) {
+	public DefaultCurieProvider curieProvider(ManagementServerProperties management,
+			DocsMvcEndpoint endpoint) {
 		String path = management.getContextPath() + endpoint.getPath()
 				+ "/#spring_boot_actuator__{rel}";
 		return new DefaultCurieProvider("boot", new UriTemplate(path));
@@ -229,7 +229,7 @@ public class EndpointWebMvcHypermediaManagementContextConfiguration {
 
 		private final List<RequestMappingHandlerAdapter> handlerAdapters;
 
-		private final Map<MediaType, HttpMessageConverter<?>> converterCache = new ConcurrentHashMap<MediaType, HttpMessageConverter<?>>();
+		private final Map<MediaType, HttpMessageConverter<?>> converterCache = new ConcurrentHashMap<>();
 
 		MvcEndpointAdvice(List<RequestMappingHandlerAdapter> handlerAdapters) {
 			this.handlerAdapters = handlerAdapters;
@@ -248,7 +248,7 @@ public class EndpointWebMvcHypermediaManagementContextConfiguration {
 		private void configureHttpMessageConverter(
 				HttpMessageConverter<?> messageConverter) {
 			if (messageConverter instanceof TypeConstrainedMappingJackson2HttpMessageConverter) {
-				List<MediaType> supportedMediaTypes = new ArrayList<MediaType>(
+				List<MediaType> supportedMediaTypes = new ArrayList<>(
 						messageConverter.getSupportedMediaTypes());
 				supportedMediaTypes.add(ActuatorMediaTypes.APPLICATION_ACTUATOR_V1_JSON);
 				((AbstractHttpMessageConverter<?>) messageConverter)
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java
index e6855de2f7..95d7008019 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfiguration.java
@@ -201,7 +201,7 @@ public class HealthIndicatorAutoConfiguration {
 			if (candidates == null) {
 				return null;
 			}
-			Map<String, DataSource> dataSources = new LinkedHashMap<String, DataSource>();
+			Map<String, DataSource> dataSources = new LinkedHashMap<>();
 			for (Map.Entry<String, DataSource> entry : candidates.entrySet()) {
 				if (!(entry.getValue() instanceof AbstractRoutingDataSource)) {
 					dataSources.put(entry.getKey(), entry.getValue());
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthMvcEndpointProperties.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthMvcEndpointProperties.java
index dd1650e5f9..a6b5e52537 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthMvcEndpointProperties.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthMvcEndpointProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -36,7 +36,7 @@ public class HealthMvcEndpointProperties {
 	 * Mapping of health statuses to HttpStatus codes. By default, registered health
 	 * statuses map to sensible defaults (i.e. UP maps to 200).
 	 */
-	private Map<String, HttpStatus> mapping = new HashMap<String, HttpStatus>();
+	private Map<String, HttpStatus> mapping = new HashMap<>();
 
 	public Map<String, HttpStatus> getMapping() {
 		return this.mapping;
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/JolokiaProperties.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/JolokiaProperties.java
index 95986cd437..35ab01d2e5 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/JolokiaProperties.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/JolokiaProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -34,7 +34,7 @@ public class JolokiaProperties {
 	 * Jolokia settings. These are traditionally set using servlet parameters. Refer to
 	 * the documentation of Jolokia for more details.
 	 */
-	private Map<String, String> config = new HashMap<String, String>();
+	private Map<String, String> config = new HashMap<>();
 
 	public Map<String, String> getConfig() {
 		return this.config;
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/LinksEnhancer.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/LinksEnhancer.java
index f0429137ee..2d7a0f4a5e 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/LinksEnhancer.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/LinksEnhancer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -50,7 +50,7 @@ class LinksEnhancer {
 			resource.add(linkTo(LinksEnhancer.class).slash(this.rootPath + self)
 					.withSelfRel());
 		}
-		MultiValueMap<String, String> added = new LinkedMultiValueMap<String, String>();
+		MultiValueMap<String, String> added = new LinkedMultiValueMap<>();
 		for (MvcEndpoint endpoint : this.endpoints.getEndpoints()) {
 			if (!endpoint.getPath().equals(self)) {
 				String rel = getRel(endpoint);
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementContextConfigurationsImportSelector.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementContextConfigurationsImportSelector.java
index 5ecb99599b..45466df3ab 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementContextConfigurationsImportSelector.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementContextConfigurationsImportSelector.java
@@ -53,7 +53,7 @@ class ManagementContextConfigurationsImportSelector
 		// Find all management context configuration classes, filtering duplicates
 		List<ManagementConfiguration> configurations = getConfigurations();
 		OrderComparator.sort(configurations);
-		List<String> names = new ArrayList<String>();
+		List<String> names = new ArrayList<>();
 		for (ManagementConfiguration configuration : configurations) {
 			names.add(configuration.getClassName());
 		}
@@ -63,7 +63,7 @@ class ManagementContextConfigurationsImportSelector
 	private List<ManagementConfiguration> getConfigurations() {
 		SimpleMetadataReaderFactory readerFactory = new SimpleMetadataReaderFactory(
 				this.classLoader);
-		List<ManagementConfiguration> configurations = new ArrayList<ManagementConfiguration>();
+		List<ManagementConfiguration> configurations = new ArrayList<>();
 		for (String className : loadFactoryNames()) {
 			getConfiguration(readerFactory, configurations, className);
 		}
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementWebSecurityAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementWebSecurityAutoConfiguration.java
index babc13bc11..623a6edad7 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementWebSecurityAutoConfiguration.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementWebSecurityAutoConfiguration.java
@@ -295,7 +295,7 @@ public class ManagementWebSecurityAutoConfiguration {
 				return NO_PATHS;
 			}
 			Set<? extends MvcEndpoint> endpoints = endpointHandlerMapping.getEndpoints();
-			Set<String> paths = new LinkedHashSet<String>(endpoints.size());
+			Set<String> paths = new LinkedHashSet<>(endpoints.size());
 			for (MvcEndpoint endpoint : endpoints) {
 				if (isIncluded(endpoint)) {
 					String path = endpointHandlerMapping.getPath(endpoint.getPath());
@@ -361,10 +361,11 @@ public class ManagementWebSecurityAutoConfiguration {
 		private RequestMatcher createDelegate() {
 			ServerProperties server = this.contextResolver.getApplicationContext()
 					.getBean(ServerProperties.class);
-			List<RequestMatcher> matchers = new ArrayList<RequestMatcher>();
+			List<RequestMatcher> matchers = new ArrayList<>();
 			EndpointHandlerMapping endpointHandlerMapping = getRequiredEndpointHandlerMapping();
 			for (String path : this.endpointPaths.getPaths(endpointHandlerMapping)) {
-				matchers.add(new AntPathRequestMatcher(server.getServlet().getPath(path)));
+				matchers.add(
+						new AntPathRequestMatcher(server.getServlet().getPath(path)));
 			}
 			return (matchers.isEmpty() ? MATCH_NONE : new OrRequestMatcher(matchers));
 		}
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricExportAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricExportAutoConfiguration.java
index 0a11bfca7b..c837c79a96 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricExportAutoConfiguration.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricExportAutoConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -78,7 +78,7 @@ public class MetricExportAutoConfiguration {
 	@ConditionalOnMissingBean(name = "metricWritersMetricExporter")
 	public SchedulingConfigurer metricWritersMetricExporter(
 			MetricExportProperties properties) {
-		Map<String, GaugeWriter> writers = new HashMap<String, GaugeWriter>();
+		Map<String, GaugeWriter> writers = new HashMap<>();
 		MetricReader reader = this.endpointReader;
 		if (reader == null && !CollectionUtils.isEmpty(this.readers)) {
 			reader = new CompositeMetricReader(
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricFilterProperties.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricFilterProperties.java
index 33bbeedef2..8f9ae456d6 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricFilterProperties.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricFilterProperties.java
@@ -43,9 +43,8 @@ public class MetricFilterProperties {
 	private Set<MetricsFilterSubmission> counterSubmissions;
 
 	public MetricFilterProperties() {
-		this.gaugeSubmissions = new HashSet<MetricsFilterSubmission>(
-				EnumSet.of(MetricsFilterSubmission.MERGED));
-		this.counterSubmissions = new HashSet<MetricsFilterSubmission>(
+		this.gaugeSubmissions = new HashSet<>(EnumSet.of(MetricsFilterSubmission.MERGED));
+		this.counterSubmissions = new HashSet<>(
 				EnumSet.of(MetricsFilterSubmission.MERGED));
 	}
 
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricsFilter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricsFilter.java
index abfb791b09..f9a2bec5ee 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricsFilter.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricsFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -65,7 +65,7 @@ final class MetricsFilter extends OncePerRequestFilter {
 	private static final Set<PatternReplacer> STATUS_REPLACERS;
 
 	static {
-		Set<PatternReplacer> replacements = new LinkedHashSet<PatternReplacer>();
+		Set<PatternReplacer> replacements = new LinkedHashSet<>();
 		replacements.add(new PatternReplacer("\\{(.+?)(?::.+)?\\}", 0, "-$1-"));
 		replacements.add(new PatternReplacer("**", Pattern.LITERAL, "-star-star-"));
 		replacements.add(new PatternReplacer("*", Pattern.LITERAL, "-star-"));
@@ -77,7 +77,7 @@ final class MetricsFilter extends OncePerRequestFilter {
 	private static final Set<PatternReplacer> KEY_REPLACERS;
 
 	static {
-		Set<PatternReplacer> replacements = new LinkedHashSet<PatternReplacer>();
+		Set<PatternReplacer> replacements = new LinkedHashSet<>();
 		replacements.add(new PatternReplacer("/", Pattern.LITERAL, "."));
 		replacements.add(new PatternReplacer("..", Pattern.LITERAL, "."));
 		KEY_REPLACERS = Collections.unmodifiableSet(replacements);
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cache/AbstractJmxCacheStatisticsProvider.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cache/AbstractJmxCacheStatisticsProvider.java
index e62b66e128..418ce193ff 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cache/AbstractJmxCacheStatisticsProvider.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cache/AbstractJmxCacheStatisticsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -50,7 +50,7 @@ public abstract class AbstractJmxCacheStatisticsProvider<C extends Cache>
 
 	private MBeanServer mBeanServer;
 
-	private final Map<String, ObjectNameWrapper> caches = new ConcurrentHashMap<String, ObjectNameWrapper>();
+	private final Map<String, ObjectNameWrapper> caches = new ConcurrentHashMap<>();
 
 	@Override
 	public CacheStatistics getCacheStatistics(CacheManager cacheManager, C cache) {
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cache/DefaultCacheStatistics.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cache/DefaultCacheStatistics.java
index d676e3690b..091ab34ccb 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cache/DefaultCacheStatistics.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cache/DefaultCacheStatistics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -37,7 +37,7 @@ public class DefaultCacheStatistics implements CacheStatistics {
 
 	@Override
 	public Collection<Metric<?>> toMetrics(String prefix) {
-		Collection<Metric<?>> result = new ArrayList<Metric<?>>();
+		Collection<Metric<?>> result = new ArrayList<>();
 		addMetric(result, prefix + "size", getSize());
 		addMetric(result, prefix + "hit.ratio", getHitRatio());
 		addMetric(result, prefix + "miss.ratio", getMissRatio());
@@ -83,7 +83,7 @@ public class DefaultCacheStatistics implements CacheStatistics {
 	private <T extends Number> void addMetric(Collection<Metric<?>> metrics, String name,
 			T value) {
 		if (value != null) {
-			metrics.add(new Metric<T>(name, value));
+			metrics.add(new Metric<>(name, value));
 		}
 	}
 
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfiguration.java
index 460891dec2..4d7cc6b3df 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfiguration.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -60,7 +60,7 @@ public class CloudFoundryActuatorAutoConfiguration {
 	public CloudFoundryEndpointHandlerMapping cloudFoundryEndpointHandlerMapping(
 			MvcEndpoints mvcEndpoints, RestTemplateBuilder restTemplateBuilder,
 			Environment environment) {
-		Set<NamedMvcEndpoint> endpoints = new LinkedHashSet<NamedMvcEndpoint>(
+		Set<NamedMvcEndpoint> endpoints = new LinkedHashSet<>(
 				mvcEndpoints.getEndpoints(NamedMvcEndpoint.class));
 		HandlerInterceptor securityInterceptor = getSecurityInterceptor(
 				restTemplateBuilder, environment);
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryDiscoveryMvcEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryDiscoveryMvcEndpoint.java
index a270e18a41..a409c652bf 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryDiscoveryMvcEndpoint.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryDiscoveryMvcEndpoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -48,7 +48,7 @@ class CloudFoundryDiscoveryMvcEndpoint extends AbstractMvcEndpoint {
 	@RequestMapping(produces = MediaType.APPLICATION_JSON_VALUE)
 	@ResponseBody
 	public Map<String, Map<String, Link>> links(HttpServletRequest request) {
-		Map<String, Link> links = new LinkedHashMap<String, Link>();
+		Map<String, Link> links = new LinkedHashMap<>();
 		String url = request.getRequestURL().toString();
 		if (url.endsWith("/")) {
 			url = url.substring(0, url.length() - 1);
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundrySecurityService.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundrySecurityService.java
index e0b8a3a314..7f7dd85f0b 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundrySecurityService.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundrySecurityService.java
@@ -116,7 +116,7 @@ class CloudFoundrySecurityService {
 	}
 
 	private Map<String, String> extractTokenKeys(Map<?, ?> response) {
-		Map<String, String> tokenKeys = new HashMap<String, String>();
+		Map<String, String> tokenKeys = new HashMap<>();
 		for (Object key : (List<?>) response.get("keys")) {
 			Map<?, ?> tokenKey = (Map<?, ?>) key;
 			tokenKeys.put((String) tokenKey.get("kid"), (String) tokenKey.get("value"));
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/AutoConfigurationReportEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/AutoConfigurationReportEndpoint.java
index 02af56b5bb..c4f8c8542f 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/AutoConfigurationReportEndpoint.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/AutoConfigurationReportEndpoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -77,8 +77,8 @@ public class AutoConfigurationReportEndpoint extends AbstractEndpoint<Report> {
 		private final Report parent;
 
 		public Report(ConditionEvaluationReport report) {
-			this.positiveMatches = new LinkedMultiValueMap<String, MessageAndCondition>();
-			this.negativeMatches = new LinkedHashMap<String, MessageAndConditions>();
+			this.positiveMatches = new LinkedMultiValueMap<>();
+			this.negativeMatches = new LinkedHashMap<>();
 			this.exclusions = report.getExclusions();
 			for (Map.Entry<String, ConditionAndOutcomes> entry : report
 					.getConditionAndOutcomesBySource().entrySet()) {
@@ -131,9 +131,9 @@ public class AutoConfigurationReportEndpoint extends AbstractEndpoint<Report> {
 	@JsonPropertyOrder({ "notMatched", "matched" })
 	public static class MessageAndConditions {
 
-		private final List<MessageAndCondition> notMatched = new ArrayList<MessageAndCondition>();
+		private final List<MessageAndCondition> notMatched = new ArrayList<>();
 
-		private final List<MessageAndCondition> matched = new ArrayList<MessageAndCondition>();
+		private final List<MessageAndCondition> matched = new ArrayList<>();
 
 		public MessageAndConditions(ConditionAndOutcomes conditionAndOutcomes) {
 			for (ConditionAndOutcome conditionAndOutcome : conditionAndOutcomes) {
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/BeansEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/BeansEndpoint.java
index 04dedfd613..e646f4580d 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/BeansEndpoint.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/BeansEndpoint.java
@@ -90,7 +90,7 @@ public class BeansEndpoint extends AbstractEndpoint<List<Object>>
 		}
 
 		private Set<ConfigurableApplicationContext> getContextHierarchy() {
-			Set<ConfigurableApplicationContext> contexts = new LinkedHashSet<ConfigurableApplicationContext>();
+			Set<ConfigurableApplicationContext> contexts = new LinkedHashSet<>();
 			ApplicationContext context = this.leafContext;
 			while (context != null) {
 				contexts.add(asConfigurableContext(context));
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/CachePublicMetrics.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/CachePublicMetrics.java
index 25ab754826..ffb75ffa19 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/CachePublicMetrics.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/CachePublicMetrics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -47,7 +47,7 @@ public class CachePublicMetrics implements PublicMetrics {
 
 	@Override
 	public Collection<Metric<?>> metrics() {
-		Collection<Metric<?>> metrics = new HashSet<Metric<?>>();
+		Collection<Metric<?>> metrics = new HashSet<>();
 		for (Map.Entry<String, List<CacheManagerBean>> entry : getCacheManagerBeans()
 				.entrySet()) {
 			addMetrics(metrics, entry.getKey(), entry.getValue());
@@ -56,7 +56,7 @@ public class CachePublicMetrics implements PublicMetrics {
 	}
 
 	private MultiValueMap<String, CacheManagerBean> getCacheManagerBeans() {
-		MultiValueMap<String, CacheManagerBean> cacheManagerNamesByCacheName = new LinkedMultiValueMap<String, CacheManagerBean>();
+		MultiValueMap<String, CacheManagerBean> cacheManagerNamesByCacheName = new LinkedMultiValueMap<>();
 		for (Map.Entry<String, CacheManager> entry : this.cacheManagers.entrySet()) {
 			for (String cacheName : entry.getValue().getCacheNames()) {
 				cacheManagerNamesByCacheName.add(cacheName,
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpoint.java
index 49e8e68b32..3558d565da 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpoint.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpoint.java
@@ -100,7 +100,7 @@ public class ConfigurationPropertiesReportEndpoint
 	}
 
 	private Map<String, Object> extract(ApplicationContext context, ObjectMapper mapper) {
-		Map<String, Object> result = new HashMap<String, Object>();
+		Map<String, Object> result = new HashMap<>();
 		ConfigurationBeanFactoryMetaData beanFactoryMetaData = getBeanFactoryMetaData(
 				context);
 		Map<String, Object> beans = getConfigurationPropertiesBeans(context,
@@ -108,7 +108,7 @@ public class ConfigurationPropertiesReportEndpoint
 		for (Map.Entry<String, Object> entry : beans.entrySet()) {
 			String beanName = entry.getKey();
 			Object bean = entry.getValue();
-			Map<String, Object> root = new HashMap<String, Object>();
+			Map<String, Object> root = new HashMap<>();
 			String prefix = extractPrefix(context, beanFactoryMetaData, beanName, bean);
 			root.put("prefix", prefix);
 			root.put("properties", sanitize(prefix, safeSerialize(mapper, bean, prefix)));
@@ -133,7 +133,7 @@ public class ConfigurationPropertiesReportEndpoint
 	private Map<String, Object> getConfigurationPropertiesBeans(
 			ApplicationContext context,
 			ConfigurationBeanFactoryMetaData beanFactoryMetaData) {
-		Map<String, Object> beans = new HashMap<String, Object>();
+		Map<String, Object> beans = new HashMap<>();
 		beans.putAll(context.getBeansWithAnnotation(ConfigurationProperties.class));
 		if (beanFactoryMetaData != null) {
 			beans.putAll(beanFactoryMetaData
@@ -154,13 +154,13 @@ public class ConfigurationPropertiesReportEndpoint
 			String prefix) {
 		try {
 			@SuppressWarnings("unchecked")
-			Map<String, Object> result = new HashMap<String, Object>(
+			Map<String, Object> result = new HashMap<>(
 					mapper.convertValue(bean, Map.class));
 			return result;
 		}
 		catch (Exception ex) {
-			return new HashMap<String, Object>(Collections.<String, Object>singletonMap(
-					"error", "Cannot serialize '" + prefix + "'"));
+			return new HashMap<>(Collections.<String, Object>singletonMap("error",
+					"Cannot serialize '" + prefix + "'"));
 		}
 	}
 
@@ -253,7 +253,7 @@ public class ConfigurationPropertiesReportEndpoint
 
 	@SuppressWarnings("unchecked")
 	private List<Object> sanitize(String prefix, List<Object> list) {
-		List<Object> sanitized = new ArrayList<Object>();
+		List<Object> sanitized = new ArrayList<>();
 		for (Object item : list) {
 			if (item instanceof Map) {
 				sanitized.add(sanitize(prefix, (Map<String, Object>) item));
@@ -317,7 +317,7 @@ public class ConfigurationPropertiesReportEndpoint
 		@Override
 		public List<BeanPropertyWriter> changeProperties(SerializationConfig config,
 				BeanDescription beanDesc, List<BeanPropertyWriter> beanProperties) {
-			List<BeanPropertyWriter> result = new ArrayList<BeanPropertyWriter>();
+			List<BeanPropertyWriter> result = new ArrayList<>();
 			for (BeanPropertyWriter writer : beanProperties) {
 				boolean readable = isReadable(beanDesc, writer);
 				if (readable) {
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/DataSourcePublicMetrics.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/DataSourcePublicMetrics.java
index a9d6c555f4..29b03e9686 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/DataSourcePublicMetrics.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/DataSourcePublicMetrics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -50,7 +50,7 @@ public class DataSourcePublicMetrics implements PublicMetrics {
 	@Autowired
 	private Collection<DataSourcePoolMetadataProvider> providers;
 
-	private final Map<String, DataSourcePoolMetadata> metadataByPrefix = new HashMap<String, DataSourcePoolMetadata>();
+	private final Map<String, DataSourcePoolMetadata> metadataByPrefix = new HashMap<>();
 
 	@PostConstruct
 	public void initialize() {
@@ -72,7 +72,7 @@ public class DataSourcePublicMetrics implements PublicMetrics {
 
 	@Override
 	public Collection<Metric<?>> metrics() {
-		Set<Metric<?>> metrics = new LinkedHashSet<Metric<?>>();
+		Set<Metric<?>> metrics = new LinkedHashSet<>();
 		for (Map.Entry<String, DataSourcePoolMetadata> entry : this.metadataByPrefix
 				.entrySet()) {
 			String prefix = entry.getKey();
@@ -87,7 +87,7 @@ public class DataSourcePublicMetrics implements PublicMetrics {
 	private <T extends Number> void addMetric(Set<Metric<?>> metrics, String name,
 			T value) {
 		if (value != null) {
-			metrics.add(new Metric<T>(name, value));
+			metrics.add(new Metric<>(name, value));
 		}
 	}
 
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpoint.java
index c21442ba03..daec0884e6 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpoint.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -54,14 +54,14 @@ public class EnvironmentEndpoint extends AbstractEndpoint<Map<String, Object>> {
 
 	@Override
 	public Map<String, Object> invoke() {
-		Map<String, Object> result = new LinkedHashMap<String, Object>();
+		Map<String, Object> result = new LinkedHashMap<>();
 		result.put("profiles", getEnvironment().getActiveProfiles());
 		for (Entry<String, PropertySource<?>> entry : getPropertySources().entrySet()) {
 			PropertySource<?> source = entry.getValue();
 			String sourceName = entry.getKey();
 			if (source instanceof EnumerablePropertySource) {
 				EnumerablePropertySource<?> enumerable = (EnumerablePropertySource<?>) source;
-				Map<String, Object> properties = new LinkedHashMap<String, Object>();
+				Map<String, Object> properties = new LinkedHashMap<>();
 				for (String name : enumerable.getPropertyNames()) {
 					properties.put(name, sanitize(name, enumerable.getProperty(name)));
 				}
@@ -75,7 +75,7 @@ public class EnvironmentEndpoint extends AbstractEndpoint<Map<String, Object>> {
 	}
 
 	private Map<String, PropertySource<?>> getPropertySources() {
-		Map<String, PropertySource<?>> map = new LinkedHashMap<String, PropertySource<?>>();
+		Map<String, PropertySource<?>> map = new LinkedHashMap<>();
 		MutablePropertySources sources = null;
 		Environment environment = getEnvironment();
 		if (environment != null && environment instanceof ConfigurableEnvironment) {
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/FlywayEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/FlywayEndpoint.java
index 8113081560..d5e33b5376 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/FlywayEndpoint.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/FlywayEndpoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -56,9 +56,9 @@ public class FlywayEndpoint extends AbstractEndpoint<List<FlywayReport>> {
 
 	@Override
 	public List<FlywayReport> invoke() {
-		List<FlywayReport> reports = new ArrayList<FlywayReport>();
+		List<FlywayReport> reports = new ArrayList<>();
 		for (Map.Entry<String, Flyway> entry : this.flyways.entrySet()) {
-			List<FlywayMigration> migrations = new ArrayList<FlywayMigration>();
+			List<FlywayMigration> migrations = new ArrayList<>();
 			for (MigrationInfo info : entry.getValue().info().all()) {
 				migrations.add(new FlywayMigration(info));
 			}
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/LiquibaseEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/LiquibaseEndpoint.java
index 9008bab7b0..4c65fac6d3 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/LiquibaseEndpoint.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/LiquibaseEndpoint.java
@@ -56,7 +56,7 @@ public class LiquibaseEndpoint extends AbstractEndpoint<List<LiquibaseReport>> {
 
 	@Override
 	public List<LiquibaseReport> invoke() {
-		List<LiquibaseReport> reports = new ArrayList<LiquibaseReport>();
+		List<LiquibaseReport> reports = new ArrayList<>();
 		DatabaseFactory factory = DatabaseFactory.getInstance();
 		StandardChangeLogHistoryService service = new StandardChangeLogHistoryService();
 		for (Map.Entry<String, SpringLiquibase> entry : this.liquibases.entrySet()) {
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/LoggersEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/LoggersEndpoint.java
index db730d11a7..7fe2270fef 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/LoggersEndpoint.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/LoggersEndpoint.java
@@ -59,7 +59,7 @@ public class LoggersEndpoint extends AbstractEndpoint<Map<String, Object>> {
 		if (configurations == null) {
 			return Collections.emptyMap();
 		}
-		Map<String, Object> result = new LinkedHashMap<String, Object>();
+		Map<String, Object> result = new LinkedHashMap<>();
 		result.put("levels", getLevels());
 		result.put("loggers", getLoggers(configurations));
 		return result;
@@ -67,13 +67,12 @@ public class LoggersEndpoint extends AbstractEndpoint<Map<String, Object>> {
 
 	private NavigableSet<LogLevel> getLevels() {
 		Set<LogLevel> levels = this.loggingSystem.getSupportedLogLevels();
-		return new TreeSet<LogLevel>(levels).descendingSet();
+		return new TreeSet<>(levels).descendingSet();
 	}
 
 	private Map<String, LoggerLevels> getLoggers(
 			Collection<LoggerConfiguration> configurations) {
-		Map<String, LoggerLevels> loggers = new LinkedHashMap<String, LoggerLevels>(
-				configurations.size());
+		Map<String, LoggerLevels> loggers = new LinkedHashMap<>(configurations.size());
 		for (LoggerConfiguration configuration : configurations) {
 			loggers.put(configuration.getName(), new LoggerLevels(configuration));
 		}
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/MetricReaderPublicMetrics.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/MetricReaderPublicMetrics.java
index 306f70b536..b68784d1c8 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/MetricReaderPublicMetrics.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/MetricReaderPublicMetrics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -43,7 +43,7 @@ public class MetricReaderPublicMetrics implements PublicMetrics {
 
 	@Override
 	public Collection<Metric<?>> metrics() {
-		List<Metric<?>> result = new ArrayList<Metric<?>>();
+		List<Metric<?>> result = new ArrayList<>();
 		for (Metric<?> metric : this.metricReader.findAll()) {
 			result.add(metric);
 		}
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/MetricsEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/MetricsEndpoint.java
index ec54fa3f52..612cdefa8a 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/MetricsEndpoint.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/MetricsEndpoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -54,7 +54,7 @@ public class MetricsEndpoint extends AbstractEndpoint<Map<String, Object>> {
 	public MetricsEndpoint(Collection<PublicMetrics> publicMetrics) {
 		super("metrics");
 		Assert.notNull(publicMetrics, "PublicMetrics must not be null");
-		this.publicMetrics = new ArrayList<PublicMetrics>(publicMetrics);
+		this.publicMetrics = new ArrayList<>(publicMetrics);
 		AnnotationAwareOrderComparator.sort(this.publicMetrics);
 	}
 
@@ -69,8 +69,8 @@ public class MetricsEndpoint extends AbstractEndpoint<Map<String, Object>> {
 
 	@Override
 	public Map<String, Object> invoke() {
-		Map<String, Object> result = new LinkedHashMap<String, Object>();
-		List<PublicMetrics> metrics = new ArrayList<PublicMetrics>(this.publicMetrics);
+		Map<String, Object> result = new LinkedHashMap<>();
+		List<PublicMetrics> metrics = new ArrayList<>(this.publicMetrics);
 		for (PublicMetrics publicMetric : metrics) {
 			try {
 				for (Metric<?> metric : publicMetric.metrics()) {
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/MetricsEndpointMetricReader.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/MetricsEndpointMetricReader.java
index 3944748bce..ee1eabbc2a 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/MetricsEndpointMetricReader.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/MetricsEndpointMetricReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -46,20 +46,20 @@ public class MetricsEndpointMetricReader implements MetricReader {
 		Metric<Number> metric = null;
 		Object value = this.endpoint.invoke().get(metricName);
 		if (value != null) {
-			metric = new Metric<Number>(metricName, (Number) value);
+			metric = new Metric<>(metricName, (Number) value);
 		}
 		return metric;
 	}
 
 	@Override
 	public Iterable<Metric<?>> findAll() {
-		List<Metric<?>> metrics = new ArrayList<Metric<?>>();
+		List<Metric<?>> metrics = new ArrayList<>();
 		Map<String, Object> values = this.endpoint.invoke();
 		Date timestamp = new Date();
 		for (Entry<String, Object> entry : values.entrySet()) {
 			String name = entry.getKey();
 			Object value = entry.getValue();
-			metrics.add(new Metric<Number>(name, (Number) value, timestamp));
+			metrics.add(new Metric<>(name, (Number) value, timestamp));
 		}
 		return metrics;
 	}
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 647db74461..c7caece589 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -77,7 +77,7 @@ public class RequestMappingEndpoint extends AbstractEndpoint<Map<String, Object>
 
 	@Override
 	public Map<String, Object> invoke() {
-		Map<String, Object> result = new LinkedHashMap<String, Object>();
+		Map<String, Object> result = new LinkedHashMap<>();
 		extractHandlerMappings(this.handlerMappings, result);
 		extractHandlerMappings(this.applicationContext, result);
 		extractMethodMappings(this.methodMappings, result);
@@ -94,7 +94,7 @@ public class RequestMappingEndpoint extends AbstractEndpoint<Map<String, Object>
 				@SuppressWarnings("unchecked")
 				Map<?, HandlerMethod> methods = bean.getValue().getHandlerMethods();
 				for (Entry<?, HandlerMethod> method : methods.entrySet()) {
-					Map<String, String> map = new LinkedHashMap<String, String>();
+					Map<String, String> map = new LinkedHashMap<>();
 					map.put("bean", bean.getKey());
 					map.put("method", method.getValue().toString());
 					result.put(method.getKey().toString(), map);
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/RichGaugeReaderPublicMetrics.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/RichGaugeReaderPublicMetrics.java
index dc4d1d2615..970cec57d0 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/RichGaugeReaderPublicMetrics.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/RichGaugeReaderPublicMetrics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -42,7 +42,7 @@ public class RichGaugeReaderPublicMetrics implements PublicMetrics {
 
 	@Override
 	public Collection<Metric<?>> metrics() {
-		List<Metric<?>> result = new ArrayList<Metric<?>>();
+		List<Metric<?>> result = new ArrayList<>();
 		for (RichGauge richGauge : this.richGaugeReader.findAll()) {
 			result.addAll(convert(richGauge));
 		}
@@ -50,15 +50,13 @@ public class RichGaugeReaderPublicMetrics implements PublicMetrics {
 	}
 
 	private List<Metric<?>> convert(RichGauge gauge) {
-		List<Metric<?>> result = new ArrayList<Metric<?>>(6);
-		result.add(
-				new Metric<Double>(gauge.getName() + RichGauge.AVG, gauge.getAverage()));
-		result.add(new Metric<Double>(gauge.getName() + RichGauge.VAL, gauge.getValue()));
-		result.add(new Metric<Double>(gauge.getName() + RichGauge.MIN, gauge.getMin()));
-		result.add(new Metric<Double>(gauge.getName() + RichGauge.MAX, gauge.getMax()));
-		result.add(
-				new Metric<Double>(gauge.getName() + RichGauge.ALPHA, gauge.getAlpha()));
-		result.add(new Metric<Long>(gauge.getName() + RichGauge.COUNT, gauge.getCount()));
+		List<Metric<?>> result = new ArrayList<>(6);
+		result.add(new Metric<>(gauge.getName() + RichGauge.AVG, gauge.getAverage()));
+		result.add(new Metric<>(gauge.getName() + RichGauge.VAL, gauge.getValue()));
+		result.add(new Metric<>(gauge.getName() + RichGauge.MIN, gauge.getMin()));
+		result.add(new Metric<>(gauge.getName() + RichGauge.MAX, gauge.getMax()));
+		result.add(new Metric<>(gauge.getName() + RichGauge.ALPHA, gauge.getAlpha()));
+		result.add(new Metric<>(gauge.getName() + RichGauge.COUNT, gauge.getCount()));
 		return result;
 	}
 
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/SystemPublicMetrics.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/SystemPublicMetrics.java
index 6b09d57fba..6a0a97ecb4 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/SystemPublicMetrics.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/SystemPublicMetrics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -53,7 +53,7 @@ public class SystemPublicMetrics implements PublicMetrics, Ordered {
 
 	@Override
 	public Collection<Metric<?>> metrics() {
-		Collection<Metric<?>> result = new LinkedHashSet<Metric<?>>();
+		Collection<Metric<?>> result = new LinkedHashSet<>();
 		addBasicMetrics(result);
 		addManagementMetrics(result);
 		return result;
@@ -69,8 +69,8 @@ public class SystemPublicMetrics implements PublicMetrics, Ordered {
 		result.add(newMemoryMetric("mem",
 				runtime.totalMemory() + getTotalNonHeapMemoryIfPossible()));
 		result.add(newMemoryMetric("mem.free", runtime.freeMemory()));
-		result.add(new Metric<Integer>("processors", runtime.availableProcessors()));
-		result.add(new Metric<Long>("instance.uptime",
+		result.add(new Metric<>("processors", runtime.availableProcessors()));
+		result.add(new Metric<>("instance.uptime",
 				System.currentTimeMillis() - this.timestamp));
 	}
 
@@ -91,9 +91,9 @@ public class SystemPublicMetrics implements PublicMetrics, Ordered {
 	private void addManagementMetrics(Collection<Metric<?>> result) {
 		try {
 			// Add JVM up time in ms
-			result.add(new Metric<Long>("uptime",
+			result.add(new Metric<>("uptime",
 					ManagementFactory.getRuntimeMXBean().getUptime()));
-			result.add(new Metric<Double>("systemload.average",
+			result.add(new Metric<>("systemload.average",
 					ManagementFactory.getOperatingSystemMXBean().getSystemLoadAverage()));
 			addHeapMetrics(result);
 			addNonHeapMetrics(result);
@@ -133,7 +133,7 @@ public class SystemPublicMetrics implements PublicMetrics, Ordered {
 	}
 
 	private Metric<Long> newMemoryMetric(String name, long bytes) {
-		return new Metric<Long>(name, bytes / 1024);
+		return new Metric<>(name, bytes / 1024);
 	}
 
 	/**
@@ -142,13 +142,13 @@ public class SystemPublicMetrics implements PublicMetrics, Ordered {
 	 */
 	protected void addThreadMetrics(Collection<Metric<?>> result) {
 		ThreadMXBean threadMxBean = ManagementFactory.getThreadMXBean();
-		result.add(new Metric<Long>("threads.peak",
-				(long) threadMxBean.getPeakThreadCount()));
-		result.add(new Metric<Long>("threads.daemon",
+		result.add(
+				new Metric<>("threads.peak", (long) threadMxBean.getPeakThreadCount()));
+		result.add(new Metric<>("threads.daemon",
 				(long) threadMxBean.getDaemonThreadCount()));
-		result.add(new Metric<Long>("threads.totalStarted",
+		result.add(new Metric<>("threads.totalStarted",
 				threadMxBean.getTotalStartedThreadCount()));
-		result.add(new Metric<Long>("threads", (long) threadMxBean.getThreadCount()));
+		result.add(new Metric<>("threads", (long) threadMxBean.getThreadCount()));
 	}
 
 	/**
@@ -157,11 +157,11 @@ public class SystemPublicMetrics implements PublicMetrics, Ordered {
 	 */
 	protected void addClassLoadingMetrics(Collection<Metric<?>> result) {
 		ClassLoadingMXBean classLoadingMxBean = ManagementFactory.getClassLoadingMXBean();
-		result.add(new Metric<Long>("classes",
-				(long) classLoadingMxBean.getLoadedClassCount()));
-		result.add(new Metric<Long>("classes.loaded",
+		result.add(
+				new Metric<>("classes", (long) classLoadingMxBean.getLoadedClassCount()));
+		result.add(new Metric<>("classes.loaded",
 				classLoadingMxBean.getTotalLoadedClassCount()));
-		result.add(new Metric<Long>("classes.unloaded",
+		result.add(new Metric<>("classes.unloaded",
 				classLoadingMxBean.getUnloadedClassCount()));
 	}
 
@@ -174,9 +174,9 @@ public class SystemPublicMetrics implements PublicMetrics, Ordered {
 				.getGarbageCollectorMXBeans();
 		for (GarbageCollectorMXBean garbageCollectorMXBean : garbageCollectorMxBeans) {
 			String name = beautifyGcName(garbageCollectorMXBean.getName());
-			result.add(new Metric<Long>("gc." + name + ".count",
+			result.add(new Metric<>("gc." + name + ".count",
 					garbageCollectorMXBean.getCollectionCount()));
-			result.add(new Metric<Long>("gc." + name + ".time",
+			result.add(new Metric<>("gc." + name + ".time",
 					garbageCollectorMXBean.getCollectionTime()));
 		}
 	}
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/TomcatPublicMetrics.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/TomcatPublicMetrics.java
index 69daf8bd4c..72b46e4ab1 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/TomcatPublicMetrics.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/TomcatPublicMetrics.java
@@ -58,8 +58,7 @@ public class TomcatPublicMetrics implements PublicMetrics, ApplicationContextAwa
 	}
 
 	private Manager getManager(EmbeddedWebApplicationContext applicationContext) {
-		EmbeddedWebServer embeddedWebServer = applicationContext
-				.getEmbeddedWebServer();
+		EmbeddedWebServer embeddedWebServer = applicationContext.getEmbeddedWebServer();
 		if (embeddedWebServer instanceof TomcatEmbeddedServletContainer) {
 			return getManager((TomcatEmbeddedServletContainer) embeddedWebServer);
 		}
@@ -77,7 +76,7 @@ public class TomcatPublicMetrics implements PublicMetrics, ApplicationContextAwa
 	}
 
 	private Collection<Metric<?>> metrics(Manager manager) {
-		List<Metric<?>> metrics = new ArrayList<Metric<?>>(2);
+		List<Metric<?>> metrics = new ArrayList<>(2);
 		if (manager instanceof ManagerBase) {
 			addMetric(metrics, "httpsessions.max",
 					((ManagerBase) manager).getMaxActiveSessions());
@@ -87,7 +86,7 @@ public class TomcatPublicMetrics implements PublicMetrics, ApplicationContextAwa
 	}
 
 	private void addMetric(List<Metric<?>> metrics, String name, Integer value) {
-		metrics.add(new Metric<Integer>(name, value));
+		metrics.add(new Metric<>(name, value));
 	}
 
 	@Override
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 fc0551a019..07114618d7 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
@@ -81,7 +81,7 @@ public class EndpointMBeanExporter extends MBeanExporter
 	private final MetadataNamingStrategy defaultNamingStrategy = new MetadataNamingStrategy(
 			this.attributeSource);
 
-	private final Set<Class<?>> registeredEndpoints = new HashSet<Class<?>>();
+	private final Set<Class<?>> registeredEndpoints = new HashSet<>();
 
 	private volatile boolean autoStartup = true;
 
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/AbstractEndpointHandlerMapping.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/AbstractEndpointHandlerMapping.java
index f00922087c..916ccb2eb9 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/AbstractEndpointHandlerMapping.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/AbstractEndpointHandlerMapping.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -91,7 +91,7 @@ public abstract class AbstractEndpointHandlerMapping<E extends MvcEndpoint>
 	 */
 	public AbstractEndpointHandlerMapping(Collection<? extends E> endpoints,
 			CorsConfiguration corsConfiguration) {
-		this.endpoints = new HashSet<E>(endpoints);
+		this.endpoints = new HashSet<>(endpoints);
 		postProcessEndpoints(this.endpoints);
 		this.corsConfiguration = corsConfiguration;
 		// By default the static resource handler mapping is LOWEST_PRECEDENCE - 1
@@ -166,7 +166,7 @@ public abstract class AbstractEndpointHandlerMapping<E extends MvcEndpoint>
 		if (defaultPatterns.isEmpty()) {
 			return new String[] { patternPrefix, patternPrefix + ".json" };
 		}
-		List<String> patterns = new ArrayList<String>(defaultPatterns);
+		List<String> patterns = new ArrayList<>(defaultPatterns);
 		for (int i = 0; i < patterns.size(); i++) {
 			patterns.set(i, patternPrefix + patterns.get(i));
 		}
@@ -205,7 +205,7 @@ public abstract class AbstractEndpointHandlerMapping<E extends MvcEndpoint>
 	}
 
 	private HandlerExecutionChain addSecurityInterceptor(HandlerExecutionChain chain) {
-		List<HandlerInterceptor> interceptors = new ArrayList<HandlerInterceptor>();
+		List<HandlerInterceptor> interceptors = new ArrayList<>();
 		if (chain.getInterceptors() != null) {
 			interceptors.addAll(Arrays.asList(chain.getInterceptors()));
 		}
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/AuditEventsMvcEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/AuditEventsMvcEndpoint.java
index a30b32990b..b8661cd13c 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/AuditEventsMvcEndpoint.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/AuditEventsMvcEndpoint.java
@@ -56,7 +56,7 @@ public class AuditEventsMvcEndpoint extends AbstractNamedMvcEndpoint {
 		if (!isEnabled()) {
 			return DISABLED_RESPONSE;
 		}
-		Map<Object, Object> result = new LinkedHashMap<Object, Object>();
+		Map<Object, Object> result = new LinkedHashMap<>();
 		result.put("events", this.auditEventRepository.find(principal, after, type));
 		return ResponseEntity.ok(result);
 	}
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HalBrowserMvcEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HalBrowserMvcEndpoint.java
index 62fbed2ec9..e3d2aa74c0 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HalBrowserMvcEndpoint.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HalBrowserMvcEndpoint.java
@@ -156,7 +156,7 @@ public class HalBrowserMvcEndpoint extends HalJsonMvcEndpoint
 				throws IOException {
 			byte[] bytes = FileCopyUtils.copyToByteArray(resource.getInputStream());
 			String content = new String(bytes, DEFAULT_CHARSET);
-			List<String> pathSegments = new ArrayList<String>(ServletUriComponentsBuilder
+			List<String> pathSegments = new ArrayList<>(ServletUriComponentsBuilder
 					.fromRequest(request).build().getPathSegments());
 			pathSegments.remove(pathSegments.size() - 1);
 			String initial = "/"
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HealthMvcEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HealthMvcEndpoint.java
index 9ebaf80d24..fc86febd32 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HealthMvcEndpoint.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HealthMvcEndpoint.java
@@ -60,7 +60,7 @@ public class HealthMvcEndpoint extends AbstractEndpointMvcAdapter<HealthEndpoint
 
 	private final List<String> roles;
 
-	private Map<String, HttpStatus> statusMapping = new HashMap<String, HttpStatus>();
+	private Map<String, HttpStatus> statusMapping = new HashMap<>();
 
 	private RelaxedPropertyResolver securityPropertyResolver;
 
@@ -101,7 +101,7 @@ public class HealthMvcEndpoint extends AbstractEndpointMvcAdapter<HealthEndpoint
 	 */
 	public void setStatusMapping(Map<String, HttpStatus> statusMapping) {
 		Assert.notNull(statusMapping, "StatusMapping must not be null");
-		this.statusMapping = new HashMap<String, HttpStatus>(statusMapping);
+		this.statusMapping = new HashMap<>(statusMapping);
 	}
 
 	/**
@@ -145,7 +145,7 @@ public class HealthMvcEndpoint extends AbstractEndpointMvcAdapter<HealthEndpoint
 		Health health = getHealth(request, principal);
 		HttpStatus status = getStatus(health);
 		if (status != null) {
-			return new ResponseEntity<Health>(health, status);
+			return new ResponseEntity<>(health, status);
 		}
 		return health;
 	}
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/MvcEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/MvcEndpoint.java
index 6f2df006f3..ab208ed009 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/MvcEndpoint.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/MvcEndpoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -38,7 +38,7 @@ public interface MvcEndpoint {
 	/**
 	 * A {@link ResponseEntity} returned for disabled endpoints.
 	 */
-	ResponseEntity<Map<String, String>> DISABLED_RESPONSE = new ResponseEntity<Map<String, String>>(
+	ResponseEntity<Map<String, String>> DISABLED_RESPONSE = new ResponseEntity<>(
 			Collections.singletonMap("message", "This endpoint is disabled"),
 			HttpStatus.NOT_FOUND);
 
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/MvcEndpoints.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/MvcEndpoints.java
index 3780ca36bb..fe7d82dd0d 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/MvcEndpoints.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/MvcEndpoints.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -42,7 +42,7 @@ public class MvcEndpoints implements ApplicationContextAware, InitializingBean {
 
 	private ApplicationContext applicationContext;
 
-	private final Set<MvcEndpoint> endpoints = new HashSet<MvcEndpoint>();
+	private final Set<MvcEndpoint> endpoints = new HashSet<>();
 
 	private Set<Class<?>> customTypes;
 
@@ -77,7 +77,7 @@ public class MvcEndpoints implements ApplicationContextAware, InitializingBean {
 	}
 
 	private Set<Class<?>> findEndpointClasses(Collection<MvcEndpoint> existing) {
-		Set<Class<?>> types = new HashSet<Class<?>>();
+		Set<Class<?>> types = new HashSet<>();
 		for (MvcEndpoint endpoint : existing) {
 			Class<?> type = endpoint.getEndpointType();
 			if (type != null) {
@@ -99,7 +99,7 @@ public class MvcEndpoints implements ApplicationContextAware, InitializingBean {
 	 */
 	@SuppressWarnings("unchecked")
 	public <E extends MvcEndpoint> Set<E> getEndpoints(Class<E> type) {
-		Set<E> result = new HashSet<E>(this.endpoints.size());
+		Set<E> result = new HashSet<>(this.endpoints.size());
 		for (MvcEndpoint candidate : this.endpoints) {
 			if (type.isInstance(candidate)) {
 				result.add((E) candidate);
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/NamePatternFilter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/NamePatternFilter.java
index ec8fcef7d7..d3ed23610c 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/NamePatternFilter.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/NamePatternFilter.java
@@ -46,7 +46,7 @@ abstract class NamePatternFilter<T> {
 	public Map<String, Object> getResults(String name) {
 		if (!isRegex(name)) {
 			Object value = getValue(this.source, name);
-			Map<String, Object> result = new HashMap<String, Object>();
+			Map<String, Object> result = new HashMap<>();
 			result.put(name, value);
 			return result;
 		}
@@ -89,7 +89,7 @@ abstract class NamePatternFilter<T> {
 
 		private final Pattern pattern;
 
-		private final Map<String, Object> results = new LinkedHashMap<String, Object>();
+		private final Map<String, Object> results = new LinkedHashMap<>();
 
 		ResultCollectingNameCallback(Pattern pattern) {
 			this.pattern = pattern;
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/ShutdownMvcEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/ShutdownMvcEndpoint.java
index 7799fe2666..8362f8f8dd 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/ShutdownMvcEndpoint.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/ShutdownMvcEndpoint.java
@@ -45,7 +45,7 @@ public class ShutdownMvcEndpoint extends EndpointMvcAdapter {
 	@Override
 	public Object invoke() {
 		if (!getDelegate().isEnabled()) {
-			return new ResponseEntity<Map<String, String>>(
+			return new ResponseEntity<>(
 					Collections.singletonMap("message", "This endpoint is disabled"),
 					HttpStatus.NOT_FOUND);
 		}
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/AbstractHealthAggregator.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/AbstractHealthAggregator.java
index dee7888c5e..17b434cbb3 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/AbstractHealthAggregator.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/AbstractHealthAggregator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -33,7 +33,7 @@ public abstract class AbstractHealthAggregator implements HealthAggregator {
 
 	@Override
 	public final Health aggregate(Map<String, Health> healths) {
-		List<Status> statusCandidates = new ArrayList<Status>();
+		List<Status> statusCandidates = new ArrayList<>();
 		for (Map.Entry<String, Health> entry : healths.entrySet()) {
 			statusCandidates.add(entry.getValue().getStatus());
 		}
@@ -58,7 +58,7 @@ public abstract class AbstractHealthAggregator implements HealthAggregator {
 	 * @since 1.3.1
 	 */
 	protected Map<String, Object> aggregateDetails(Map<String, Health> healths) {
-		return new LinkedHashMap<String, Object>(healths);
+		return new LinkedHashMap<>(healths);
 	}
 
 }
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/CompositeHealthIndicator.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/CompositeHealthIndicator.java
index fc51568a26..7018ad18cf 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/CompositeHealthIndicator.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/CompositeHealthIndicator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -53,7 +53,7 @@ public class CompositeHealthIndicator implements HealthIndicator {
 			Map<String, HealthIndicator> indicators) {
 		Assert.notNull(healthAggregator, "HealthAggregator must not be null");
 		Assert.notNull(indicators, "Indicators must not be null");
-		this.indicators = new LinkedHashMap<String, HealthIndicator>(indicators);
+		this.indicators = new LinkedHashMap<>(indicators);
 		this.healthAggregator = healthAggregator;
 	}
 
@@ -63,7 +63,7 @@ public class CompositeHealthIndicator implements HealthIndicator {
 
 	@Override
 	public Health health() {
-		Map<String, Health> healths = new LinkedHashMap<String, Health>();
+		Map<String, Health> healths = new LinkedHashMap<>();
 		for (Map.Entry<String, HealthIndicator> entry : this.indicators.entrySet()) {
 			healths.put(entry.getKey(), entry.getValue().health());
 		}
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/ElasticsearchHealthIndicatorProperties.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/ElasticsearchHealthIndicatorProperties.java
index c84256396d..80933f5efa 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/ElasticsearchHealthIndicatorProperties.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/ElasticsearchHealthIndicatorProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -34,7 +34,7 @@ public class ElasticsearchHealthIndicatorProperties {
 	/**
 	 * Comma-separated index names.
 	 */
-	private List<String> indices = new ArrayList<String>();
+	private List<String> indices = new ArrayList<>();
 
 	/**
 	 * Time, in milliseconds, to wait for a response from the cluster.
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/Health.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/Health.java
index 310e500134..2264e417e1 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/Health.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/Health.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -182,7 +182,7 @@ public final class Health {
 		 */
 		public Builder() {
 			this.status = Status.UNKNOWN;
-			this.details = new LinkedHashMap<String, Object>();
+			this.details = new LinkedHashMap<>();
 		}
 
 		/**
@@ -192,7 +192,7 @@ public final class Health {
 		public Builder(Status status) {
 			Assert.notNull(status, "Status must not be null");
 			this.status = status;
-			this.details = new LinkedHashMap<String, Object>();
+			this.details = new LinkedHashMap<>();
 		}
 
 		/**
@@ -205,7 +205,7 @@ public final class Health {
 			Assert.notNull(status, "Status must not be null");
 			Assert.notNull(details, "Details must not be null");
 			this.status = status;
-			this.details = new LinkedHashMap<String, Object>(details);
+			this.details = new LinkedHashMap<>(details);
 		}
 
 		/**
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/OrderedHealthAggregator.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/OrderedHealthAggregator.java
index ad2e7c8170..cb1b52ade3 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/OrderedHealthAggregator.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/OrderedHealthAggregator.java
@@ -69,7 +69,7 @@ public class OrderedHealthAggregator extends AbstractHealthAggregator {
 	@Override
 	protected Status aggregateStatus(List<Status> candidates) {
 		// Only sort those status instances that we know about
-		List<Status> filteredCandidates = new ArrayList<Status>();
+		List<Status> filteredCandidates = new ArrayList<>();
 		for (Status candidate : candidates) {
 			if (this.statusOrder.contains(candidate.getCode())) {
 				filteredCandidates.add(candidate);
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/info/Info.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/info/Info.java
index 41e5f84b18..a27c880e62 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/info/Info.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/info/Info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -40,7 +40,7 @@ public final class Info {
 	private final Map<String, Object> details;
 
 	private Info(Builder builder) {
-		LinkedHashMap<String, Object> content = new LinkedHashMap<String, Object>();
+		LinkedHashMap<String, Object> content = new LinkedHashMap<>();
 		content.putAll(builder.content);
 		this.details = Collections.unmodifiableMap(content);
 	}
@@ -98,7 +98,7 @@ public final class Info {
 		private final Map<String, Object> content;
 
 		public Builder() {
-			this.content = new LinkedHashMap<String, Object>();
+			this.content = new LinkedHashMap<>();
 		}
 
 		/**
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/info/MapInfoContributor.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/info/MapInfoContributor.java
index 79c16ed6df..758bf2afc6 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/info/MapInfoContributor.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/info/MapInfoContributor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -30,7 +30,7 @@ public class MapInfoContributor implements InfoContributor {
 	private final Map<String, Object> info;
 
 	public MapInfoContributor(Map<String, Object> info) {
-		this.info = new LinkedHashMap<String, Object>(info);
+		this.info = new LinkedHashMap<>(info);
 	}
 
 	@Override
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/Metric.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/Metric.java
index 757e061586..19d61ac178 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/Metric.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/Metric.java
@@ -91,7 +91,7 @@ public class Metric<T extends Number> {
 	 * @return a new {@link Metric} instance
 	 */
 	public Metric<Long> increment(int amount) {
-		return new Metric<Long>(this.getName(),
+		return new Metric<>(this.getName(),
 				Long.valueOf(this.getValue().longValue() + amount));
 	}
 
@@ -102,7 +102,7 @@ public class Metric<T extends Number> {
 	 * @return a new {@link Metric} instance
 	 */
 	public <S extends Number> Metric<S> set(S value) {
-		return new Metric<S>(this.getName(), value);
+		return new Metric<>(this.getName(), value);
 	}
 
 	@Override
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/aggregate/AggregateMetricReader.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/aggregate/AggregateMetricReader.java
index f39c9424f8..96a3ec3680 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/aggregate/AggregateMetricReader.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/aggregate/AggregateMetricReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -107,7 +107,7 @@ public class AggregateMetricReader implements MetricReader {
 
 	@Override
 	public long count() {
-		Set<String> names = new HashSet<String>();
+		Set<String> names = new HashSet<>();
 		for (Metric<?> metric : this.source.findAll()) {
 			String name = getSourceKey(metric.getName());
 			if (name != null) {
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/BufferCounterService.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/BufferCounterService.java
index 9462a19f7e..0ffa20dc85 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/BufferCounterService.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/BufferCounterService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -28,7 +28,7 @@ import org.springframework.boot.actuate.metrics.CounterService;
  */
 public class BufferCounterService implements CounterService {
 
-	private final ConcurrentHashMap<String, String> names = new ConcurrentHashMap<String, String>();
+	private final ConcurrentHashMap<String, String> names = new ConcurrentHashMap<>();
 
 	private final CounterBuffers buffers;
 
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/BufferGaugeService.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/BufferGaugeService.java
index 221f51fe6e..d928cbd31f 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/BufferGaugeService.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/BufferGaugeService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -28,7 +28,7 @@ import org.springframework.boot.actuate.metrics.GaugeService;
  */
 public class BufferGaugeService implements GaugeService {
 
-	private final ConcurrentHashMap<String, String> names = new ConcurrentHashMap<String, String>();
+	private final ConcurrentHashMap<String, String> names = new ConcurrentHashMap<>();
 
 	private final GaugeBuffers buffers;
 
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/BufferMetricReader.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/BufferMetricReader.java
index 041c41c285..5ea7b957b2 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/BufferMetricReader.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/BufferMetricReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -72,7 +72,7 @@ public class BufferMetricReader implements MetricReader, PrefixMetricReader {
 	}
 
 	private Iterable<Metric<?>> findAll(Predicate<String> predicate) {
-		final List<Metric<?>> metrics = new ArrayList<Metric<?>>();
+		final List<Metric<?>> metrics = new ArrayList<>();
 		collectMetrics(this.gaugeBuffers, predicate, metrics);
 		collectMetrics(this.counterBuffers, predicate, metrics);
 		return metrics;
@@ -92,7 +92,7 @@ public class BufferMetricReader implements MetricReader, PrefixMetricReader {
 	}
 
 	private <T extends Number> Metric<T> asMetric(final String name, Buffer<T> buffer) {
-		return new Metric<T>(name, buffer.getValue(), new Date(buffer.getTimestamp()));
+		return new Metric<>(name, buffer.getValue(), new Date(buffer.getTimestamp()));
 	}
 
 }
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/Buffers.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/Buffers.java
index dd7f71cdda..29cacda935 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/Buffers.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/Buffers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -31,7 +31,7 @@ import java.util.function.Predicate;
  */
 abstract class Buffers<B extends Buffer<?>> {
 
-	private final ConcurrentHashMap<String, B> buffers = new ConcurrentHashMap<String, B>();
+	private final ConcurrentHashMap<String, B> buffers = new ConcurrentHashMap<>();
 
 	public void forEach(final Predicate<String> predicate,
 			final BiConsumer<String, B> consumer) {
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/dropwizard/DropwizardMetricServices.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/dropwizard/DropwizardMetricServices.java
index 98a70ad8cc..2872a8324b 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/dropwizard/DropwizardMetricServices.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/dropwizard/DropwizardMetricServices.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -59,9 +59,9 @@ public class DropwizardMetricServices implements CounterService, GaugeService {
 
 	private final ReservoirFactory reservoirFactory;
 
-	private final ConcurrentMap<String, SimpleGauge> gauges = new ConcurrentHashMap<String, SimpleGauge>();
+	private final ConcurrentMap<String, SimpleGauge> gauges = new ConcurrentHashMap<>();
 
-	private final ConcurrentHashMap<String, String> names = new ConcurrentHashMap<String, String>();
+	private final ConcurrentHashMap<String, String> names = new ConcurrentHashMap<>();
 
 	/**
 	 * Create a new {@link DropwizardMetricServices} instance.
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/AbstractMetricExporter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/AbstractMetricExporter.java
index 31d41899cd..9a93e2b0f7 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/AbstractMetricExporter.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/AbstractMetricExporter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -105,7 +105,7 @@ public abstract class AbstractMetricExporter implements Exporter, Closeable, Flu
 
 	private void exportGroups() {
 		for (String group : groups()) {
-			Collection<Metric<?>> values = new ArrayList<Metric<?>>();
+			Collection<Metric<?>> values = new ArrayList<>();
 			for (Metric<?> metric : next(group)) {
 				Date timestamp = metric.getTimestamp();
 				if (canExportTimestamp(timestamp)) {
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/MetricCopyExporter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/MetricCopyExporter.java
index 1d50eabca0..5eec2cdff5 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/MetricCopyExporter.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/MetricCopyExporter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -63,7 +63,7 @@ public class MetricCopyExporter extends AbstractMetricExporter {
 
 	private final CounterWriter counter;
 
-	private ConcurrentMap<String, Long> counts = new ConcurrentHashMap<String, Long>();
+	private ConcurrentMap<String, Long> counts = new ConcurrentHashMap<>();
 
 	private String[] includes = new String[0];
 
@@ -145,7 +145,7 @@ public class MetricCopyExporter extends AbstractMetricExporter {
 		else {
 			this.counts.putIfAbsent(value.getName(), delta);
 		}
-		return new Delta<Long>(value.getName(), delta, value.getTimestamp());
+		return new Delta<>(value.getName(), delta, value.getTimestamp());
 	}
 
 	@Override
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/MetricExportProperties.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/MetricExportProperties.java
index d7f991ea46..39222ea745 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/MetricExportProperties.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/MetricExportProperties.java
@@ -38,7 +38,7 @@ public class MetricExportProperties extends TriggerProperties {
 	/**
 	 * Specific trigger properties per MetricWriter bean name.
 	 */
-	private Map<String, SpecificTriggerProperties> triggers = new LinkedHashMap<String, SpecificTriggerProperties>();
+	private Map<String, SpecificTriggerProperties> triggers = new LinkedHashMap<>();
 
 	private Aggregate aggregate = new Aggregate();
 
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/MetricExporters.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/MetricExporters.java
index 2a558514c4..fb6d06e7d2 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/MetricExporters.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/MetricExporters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -40,13 +40,13 @@ public class MetricExporters implements SchedulingConfigurer, Closeable {
 
 	private MetricReader reader;
 
-	private Map<String, GaugeWriter> writers = new HashMap<String, GaugeWriter>();
+	private Map<String, GaugeWriter> writers = new HashMap<>();
 
 	private final MetricExportProperties properties;
 
-	private final Map<String, Exporter> exporters = new HashMap<String, Exporter>();
+	private final Map<String, Exporter> exporters = new HashMap<>();
 
-	private final Set<String> closeables = new HashSet<String>();
+	private final Set<String> closeables = new HashSet<>();
 
 	public MetricExporters(MetricExportProperties properties) {
 		this.properties = properties;
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/PrefixMetricGroupExporter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/PrefixMetricGroupExporter.java
index 064714ebf1..90e8a9ebe7 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/PrefixMetricGroupExporter.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/PrefixMetricGroupExporter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -41,9 +41,9 @@ public class PrefixMetricGroupExporter extends AbstractMetricExporter {
 
 	private final PrefixMetricWriter writer;
 
-	private ConcurrentMap<String, Long> counts = new ConcurrentHashMap<String, Long>();
+	private ConcurrentMap<String, Long> counts = new ConcurrentHashMap<>();
 
-	private Set<String> groups = new HashSet<String>();
+	private Set<String> groups = new HashSet<>();
 
 	/**
 	 * Create a new exporter for metrics to a writer based on an empty prefix for the
@@ -112,7 +112,7 @@ public class PrefixMetricGroupExporter extends AbstractMetricExporter {
 		else {
 			this.counts.putIfAbsent(value.getName(), delta);
 		}
-		return new Delta<Long>(value.getName(), delta, value.getTimestamp());
+		return new Delta<>(value.getName(), delta, value.getTimestamp());
 	}
 
 }
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/RichGaugeExporter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/RichGaugeExporter.java
index fa1d261722..f996bac0f1 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/RichGaugeExporter.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/RichGaugeExporter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -71,7 +71,7 @@ public class RichGaugeExporter extends AbstractMetricExporter {
 	@Override
 	protected Iterable<Metric<?>> next(String group) {
 		RichGauge rich = this.reader.findOne(group);
-		Collection<Metric<?>> metrics = new ArrayList<Metric<?>>();
+		Collection<Metric<?>> metrics = new ArrayList<>();
 		metrics.add(new Metric<Number>(group + MIN, rich.getMin()));
 		metrics.add(new Metric<Number>(group + MAX, rich.getMax()));
 		metrics.add(new Metric<Number>(group + COUNT, rich.getCount()));
@@ -83,7 +83,7 @@ public class RichGaugeExporter extends AbstractMetricExporter {
 
 	@Override
 	protected Iterable<String> groups() {
-		Collection<String> names = new HashSet<String>();
+		Collection<String> names = new HashSet<>();
 		for (RichGauge rich : this.reader.findAll()) {
 			names.add(rich.getName());
 		}
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/integration/SpringIntegrationMetricReader.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/integration/SpringIntegrationMetricReader.java
index dab8e7a778..cb3bffb186 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/integration/SpringIntegrationMetricReader.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/integration/SpringIntegrationMetricReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -52,16 +52,16 @@ public class SpringIntegrationMetricReader implements MetricReader {
 
 	@Override
 	public Iterable<Metric<?>> findAll() {
-		List<Metric<?>> result = new ArrayList<Metric<?>>();
+		List<Metric<?>> result = new ArrayList<>();
 		String[] channelNames = this.configurer.getChannelNames();
 		String[] handlerNames = this.configurer.getHandlerNames();
 		String[] sourceNames = this.configurer.getSourceNames();
 		addChannelMetrics(result, channelNames);
 		addHandlerMetrics(result, handlerNames);
 		addSourceMetrics(result, sourceNames);
-		result.add(new Metric<Integer>("integration.handlerCount", handlerNames.length));
-		result.add(new Metric<Integer>("integration.channelCount", channelNames.length));
-		result.add(new Metric<Integer>("integration.sourceCount", sourceNames.length));
+		result.add(new Metric<>("integration.handlerCount", handlerNames.length));
+		result.add(new Metric<>("integration.channelCount", channelNames.length));
+		result.add(new Metric<>("integration.sourceCount", sourceNames.length));
 		return result;
 	}
 
@@ -75,10 +75,10 @@ public class SpringIntegrationMetricReader implements MetricReader {
 			MessageChannelMetrics metrics) {
 		String prefix = "integration.channel." + name;
 		result.addAll(getStatistics(prefix + ".errorRate", metrics.getErrorRate()));
-		result.add(new Metric<Long>(prefix + ".sendCount", metrics.getSendCountLong()));
+		result.add(new Metric<>(prefix + ".sendCount", metrics.getSendCountLong()));
 		result.addAll(getStatistics(prefix + ".sendRate", metrics.getSendRate()));
 		if (metrics instanceof PollableChannelManagement) {
-			result.add(new Metric<Long>(prefix + ".receiveCount",
+			result.add(new Metric<>(prefix + ".receiveCount",
 					((PollableChannelManagement) metrics).getReceiveCountLong()));
 		}
 	}
@@ -94,7 +94,7 @@ public class SpringIntegrationMetricReader implements MetricReader {
 		String prefix = "integration.handler." + name;
 		result.addAll(getStatistics(prefix + ".duration", metrics.getDuration()));
 		long activeCount = metrics.getActiveCountLong();
-		result.add(new Metric<Long>(prefix + ".activeCount", activeCount));
+		result.add(new Metric<>(prefix + ".activeCount", activeCount));
 	}
 
 	private void addSourceMetrics(List<Metric<?>> result, String[] names) {
@@ -106,17 +106,17 @@ public class SpringIntegrationMetricReader implements MetricReader {
 	private void addSourceMetrics(List<Metric<?>> result, String name,
 			MessageSourceMetrics sourceMetrics) {
 		String prefix = "integration.source." + name;
-		result.add(new Metric<Long>(prefix + ".messageCount",
+		result.add(new Metric<>(prefix + ".messageCount",
 				sourceMetrics.getMessageCountLong()));
 	}
 
 	private Collection<? extends Metric<?>> getStatistics(String name, Statistics stats) {
-		List<Metric<?>> metrics = new ArrayList<Metric<?>>();
-		metrics.add(new Metric<Double>(name + ".mean", stats.getMean()));
-		metrics.add(new Metric<Double>(name + ".max", stats.getMax()));
-		metrics.add(new Metric<Double>(name + ".min", stats.getMin()));
-		metrics.add(new Metric<Double>(name + ".stdev", stats.getStandardDeviation()));
-		metrics.add(new Metric<Long>(name + ".count", stats.getCountLong()));
+		List<Metric<?>> metrics = new ArrayList<>();
+		metrics.add(new Metric<>(name + ".mean", stats.getMean()));
+		metrics.add(new Metric<>(name + ".max", stats.getMax()));
+		metrics.add(new Metric<>(name + ".min", stats.getMin()));
+		metrics.add(new Metric<>(name + ".stdev", stats.getStandardDeviation()));
+		metrics.add(new Metric<>(name + ".count", stats.getCountLong()));
 		return metrics;
 	}
 
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/jmx/DefaultMetricNamingStrategy.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/jmx/DefaultMetricNamingStrategy.java
index 7f454c9bf3..45ddd1e36d 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/jmx/DefaultMetricNamingStrategy.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/jmx/DefaultMetricNamingStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -44,7 +44,7 @@ public class DefaultMetricNamingStrategy implements ObjectNamingStrategy {
 			throws MalformedObjectNameException {
 		ObjectName objectName = this.namingStrategy.getObjectName(managedBean, beanKey);
 		String domain = objectName.getDomain();
-		Hashtable<String, String> table = new Hashtable<String, String>(
+		Hashtable<String, String> table = new Hashtable<>(
 				objectName.getKeyPropertyList());
 		String name = objectName.getKeyProperty("name");
 		if (name != null) {
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/jmx/JmxMetricWriter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/jmx/JmxMetricWriter.java
index f72d79b0ec..9a0f271ea9 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/jmx/JmxMetricWriter.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/jmx/JmxMetricWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -50,7 +50,7 @@ public class JmxMetricWriter implements MetricWriter {
 
 	private static final Log logger = LogFactory.getLog(JmxMetricWriter.class);
 
-	private final ConcurrentMap<String, MetricValue> values = new ConcurrentHashMap<String, MetricValue>();
+	private final ConcurrentMap<String, MetricValue> values = new ConcurrentHashMap<>();
 
 	private final MBeanExporter exporter;
 
@@ -72,7 +72,7 @@ public class JmxMetricWriter implements MetricWriter {
 
 	@ManagedOperation
 	public void increment(String name, long value) {
-		increment(new Delta<Long>(name, value));
+		increment(new Delta<>(name, value));
 	}
 
 	@Override
@@ -83,7 +83,7 @@ public class JmxMetricWriter implements MetricWriter {
 
 	@ManagedOperation
 	public void set(String name, double value) {
-		set(new Metric<Double>(name, value));
+		set(new Metric<>(name, value));
 	}
 
 	@Override
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/opentsdb/DefaultOpenTsdbNamingStrategy.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/opentsdb/DefaultOpenTsdbNamingStrategy.java
index 53aaaecd82..abdd76fc99 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/opentsdb/DefaultOpenTsdbNamingStrategy.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/opentsdb/DefaultOpenTsdbNamingStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -52,9 +52,9 @@ public class DefaultOpenTsdbNamingStrategy implements OpenTsdbNamingStrategy {
 	 * Tags to apply to every metric. Open TSDB requires at least one tag, so a "prefix"
 	 * tag is added for you by default.
 	 */
-	private Map<String, String> tags = new LinkedHashMap<String, String>();
+	private Map<String, String> tags = new LinkedHashMap<>();
 
-	private Map<String, OpenTsdbName> cache = new HashMap<String, OpenTsdbName>();
+	private Map<String, OpenTsdbName> cache = new HashMap<>();
 
 	public DefaultOpenTsdbNamingStrategy() {
 		this.tags.put(DOMAIN_KEY, "org.springframework.metrics");
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbGaugeWriter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbGaugeWriter.java
index ffad29c0d0..576ffa20f5 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbGaugeWriter.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbGaugeWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -74,8 +74,7 @@ public class OpenTsdbGaugeWriter implements GaugeWriter {
 	 */
 	private MediaType mediaType = MediaType.APPLICATION_JSON;
 
-	private final List<OpenTsdbData> buffer = new ArrayList<OpenTsdbData>(
-			this.bufferSize);
+	private final List<OpenTsdbData> buffer = new ArrayList<>(this.bufferSize);
 
 	private OpenTsdbNamingStrategy namingStrategy = new DefaultOpenTsdbNamingStrategy();
 
@@ -149,7 +148,7 @@ public class OpenTsdbGaugeWriter implements GaugeWriter {
 		headers.setAccept(Arrays.asList(this.mediaType));
 		headers.setContentType(this.mediaType);
 		ResponseEntity<Map> response = this.restTemplate.postForEntity(this.url,
-				new HttpEntity<List<OpenTsdbData>>(snapshot, headers), Map.class);
+				new HttpEntity<>(snapshot, headers), Map.class);
 		if (!response.getStatusCode().is2xxSuccessful()) {
 			logger.warn("Cannot write metrics (discarded " + snapshot.size()
 					+ " values): " + response.getBody());
@@ -161,7 +160,7 @@ public class OpenTsdbGaugeWriter implements GaugeWriter {
 			if (this.buffer.isEmpty()) {
 				return Collections.emptyList();
 			}
-			List<OpenTsdbData> snapshot = new ArrayList<OpenTsdbData>(this.buffer);
+			List<OpenTsdbData> snapshot = new ArrayList<>(this.buffer);
 			this.buffer.clear();
 			return snapshot;
 		}
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbName.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbName.java
index e949de4742..682f69912f 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbName.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -29,7 +29,7 @@ public class OpenTsdbName {
 
 	private String metric;
 
-	private Map<String, String> tags = new LinkedHashMap<String, String>();
+	private Map<String, String> tags = new LinkedHashMap<>();
 
 	protected OpenTsdbName() {
 	}
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/reader/CompositeMetricReader.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/reader/CompositeMetricReader.java
index a52a1ca191..1a8cb8fa4f 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/reader/CompositeMetricReader.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/reader/CompositeMetricReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -29,7 +29,7 @@ import org.springframework.boot.actuate.metrics.Metric;
  */
 public class CompositeMetricReader implements MetricReader {
 
-	private final List<MetricReader> readers = new ArrayList<MetricReader>();
+	private final List<MetricReader> readers = new ArrayList<>();
 
 	public CompositeMetricReader(MetricReader... readers) {
 		Collections.addAll(this.readers, readers);
@@ -48,7 +48,7 @@ public class CompositeMetricReader implements MetricReader {
 
 	@Override
 	public Iterable<Metric<?>> findAll() {
-		List<Metric<?>> values = new ArrayList<Metric<?>>((int) count());
+		List<Metric<?>> values = new ArrayList<>((int) count());
 		for (MetricReader delegate : this.readers) {
 			Iterable<Metric<?>> all = delegate.findAll();
 			for (Metric<?> value : all) {
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/reader/MetricRegistryMetricReader.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/reader/MetricRegistryMetricReader.java
index 5d1de4b18d..ae7f04d151 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/reader/MetricRegistryMetricReader.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/reader/MetricRegistryMetricReader.java
@@ -57,13 +57,13 @@ public class MetricRegistryMetricReader implements MetricReader, MetricRegistryL
 
 	private static final Log logger = LogFactory.getLog(MetricRegistryMetricReader.class);
 
-	private static final Map<Class<?>, Set<String>> numberKeys = new ConcurrentHashMap<Class<?>, Set<String>>();
+	private static final Map<Class<?>, Set<String>> numberKeys = new ConcurrentHashMap<>();
 
 	private final Object monitor = new Object();
 
-	private final Map<String, String> names = new ConcurrentHashMap<String, String>();
+	private final Map<String, String> names = new ConcurrentHashMap<>();
 
-	private final MultiValueMap<String, String> reverse = new LinkedMultiValueMap<String, String>();
+	private final MultiValueMap<String, String> reverse = new LinkedMultiValueMap<>();
 
 	private final MetricRegistry registry;
 
@@ -89,7 +89,7 @@ public class MetricRegistryMetricReader implements MetricReader, MetricRegistryL
 		if (metric instanceof Gauge) {
 			Object value = ((Gauge<?>) metric).getValue();
 			if (value instanceof Number) {
-				return new Metric<Number>(metricName, (Number) value);
+				return new Metric<>(metricName, (Number) value);
 			}
 			if (logger.isDebugEnabled()) {
 				logger.debug("Ignoring gauge '" + name + "' (" + metric
@@ -105,10 +105,10 @@ public class MetricRegistryMetricReader implements MetricReader, MetricRegistryL
 					value = TimeUnit.MILLISECONDS.convert(value.longValue(),
 							TimeUnit.NANOSECONDS);
 				}
-				return new Metric<Number>(metricName, value);
+				return new Metric<>(metricName, value);
 			}
 		}
-		return new Metric<Number>(metricName, getMetric(metric, metricName));
+		return new Metric<>(metricName, getMetric(metric, metricName));
 	}
 
 	@Override
@@ -116,7 +116,7 @@ public class MetricRegistryMetricReader implements MetricReader, MetricRegistryL
 		return new Iterable<Metric<?>>() {
 			@Override
 			public Iterator<Metric<?>> iterator() {
-				Set<Metric<?>> metrics = new HashSet<Metric<?>>();
+				Set<Metric<?>> metrics = new HashSet<>();
 				for (String name : MetricRegistryMetricReader.this.names.keySet()) {
 					Metric<?> metric = findOne(name);
 					if (metric != null) {
@@ -236,7 +236,7 @@ public class MetricRegistryMetricReader implements MetricReader, MetricRegistryL
 	private static Set<String> getNumberKeys(Object metric) {
 		Set<String> result = numberKeys.get(metric.getClass());
 		if (result == null) {
-			result = new HashSet<String>();
+			result = new HashSet<>();
 		}
 		if (result.isEmpty()) {
 			for (PropertyDescriptor descriptor : BeanUtils
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/InMemoryMetricRepository.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/InMemoryMetricRepository.java
index 95f454daa8..d4e8d66a33 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/InMemoryMetricRepository.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/InMemoryMetricRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -32,7 +32,7 @@ import org.springframework.boot.actuate.metrics.writer.Delta;
  */
 public class InMemoryMetricRepository implements MetricRepository {
 
-	private final SimpleInMemoryRepository<Metric<?>> metrics = new SimpleInMemoryRepository<Metric<?>>();
+	private final SimpleInMemoryRepository<Metric<?>> metrics = new SimpleInMemoryRepository<>();
 
 	public void setValues(ConcurrentNavigableMap<String, Metric<?>> values) {
 		this.metrics.setValues(values);
@@ -48,10 +48,10 @@ public class InMemoryMetricRepository implements MetricRepository {
 			@Override
 			public Metric<?> modify(Metric<?> current) {
 				if (current != null) {
-					return new Metric<Long>(metricName,
-							current.increment(amount).getValue(), timestamp);
+					return new Metric<>(metricName, current.increment(amount).getValue(),
+							timestamp);
 				}
-				return new Metric<Long>(metricName, (long) amount, timestamp);
+				return new Metric<>(metricName, (long) amount, timestamp);
 			}
 
 		});
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/InMemoryMultiMetricRepository.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/InMemoryMultiMetricRepository.java
index 73a048d59f..ed82b152d5 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/InMemoryMultiMetricRepository.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/InMemoryMultiMetricRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -35,7 +35,7 @@ public class InMemoryMultiMetricRepository implements MultiMetricRepository {
 
 	private final InMemoryMetricRepository repository;
 
-	private final Collection<String> groups = new HashSet<String>();
+	private final Collection<String> groups = new HashSet<>();
 
 	/**
 	 * Create a new {@link InMemoryMetricRepository} backed by a new
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMetricRepository.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMetricRepository.java
index 10648dd665..be77aec59a 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMetricRepository.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMetricRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -124,7 +124,7 @@ public class RedisMetricRepository implements MetricRepository {
 		Set<String> keys = this.zSetOperations.range(0, -1);
 		Iterator<String> keysIt = keys.iterator();
 
-		List<Metric<?>> result = new ArrayList<Metric<?>>(keys.size());
+		List<Metric<?>> result = new ArrayList<>(keys.size());
 		List<String> values = this.redisOperations.opsForValue().multiGet(keys);
 		for (String v : values) {
 			String key = keysIt.next();
@@ -149,7 +149,7 @@ public class RedisMetricRepository implements MetricRepository {
 		trackMembership(key);
 		double value = this.zSetOperations.incrementScore(key,
 				delta.getValue().doubleValue());
-		String raw = serialize(new Metric<Double>(name, value, delta.getTimestamp()));
+		String raw = serialize(new Metric<>(name, value, delta.getTimestamp()));
 		this.redisOperations.opsForValue().set(key, raw);
 	}
 
@@ -176,7 +176,7 @@ public class RedisMetricRepository implements MetricRepository {
 			return null;
 		}
 		Date timestamp = new Date(Long.valueOf(v));
-		return new Metric<Double>(nameFor(redisKey), value, timestamp);
+		return new Metric<>(nameFor(redisKey), value, timestamp);
 	}
 
 	private String serialize(Metric<?> entity) {
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMultiMetricRepository.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMultiMetricRepository.java
index c12e5ca042..aeeadee271 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMultiMetricRepository.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMultiMetricRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -76,7 +76,7 @@ public class RedisMultiMetricRepository implements MultiMetricRepository {
 		Set<String> keys = zSetOperations.range(0, -1);
 		Iterator<String> keysIt = keys.iterator();
 
-		List<Metric<?>> result = new ArrayList<Metric<?>>(keys.size());
+		List<Metric<?>> result = new ArrayList<>(keys.size());
 		List<String> values = this.redisOperations.opsForValue().multiGet(keys);
 		for (String v : values) {
 			String key = keysIt.next();
@@ -109,14 +109,14 @@ public class RedisMultiMetricRepository implements MultiMetricRepository {
 		String key = keyFor(delta.getName());
 		double value = zSetOperations.incrementScore(key, delta.getValue().doubleValue());
 		String raw = serialize(
-				new Metric<Double>(delta.getName(), value, delta.getTimestamp()));
+				new Metric<>(delta.getName(), value, delta.getTimestamp()));
 		this.redisOperations.opsForValue().set(key, raw);
 	}
 
 	@Override
 	public Iterable<String> groups() {
 		Set<String> range = this.zSetOperations.range(0, -1);
-		Collection<String> result = new ArrayList<String>();
+		Collection<String> result = new ArrayList<>();
 		for (String key : range) {
 			result.add(key.substring(this.prefix.length()));
 		}
@@ -145,7 +145,7 @@ public class RedisMultiMetricRepository implements MultiMetricRepository {
 
 	private Metric<?> deserialize(String group, String redisKey, String v, Double value) {
 		Date timestamp = new Date(Long.valueOf(v));
-		return new Metric<Double>(nameFor(redisKey), value, timestamp);
+		return new Metric<>(nameFor(redisKey), value, timestamp);
 	}
 
 	private String serialize(Metric<?> entity) {
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/redis/RedisUtils.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/redis/RedisUtils.java
index 67694b2c2d..44ddfe5518 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/redis/RedisUtils.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/redis/RedisUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -35,9 +35,9 @@ final class RedisUtils {
 
 	static <K, V> RedisTemplate<K, V> createRedisTemplate(
 			RedisConnectionFactory connectionFactory, Class<V> valueClass) {
-		RedisTemplate<K, V> redisTemplate = new RedisTemplate<K, V>();
+		RedisTemplate<K, V> redisTemplate = new RedisTemplate<>();
 		redisTemplate.setKeySerializer(new StringRedisSerializer());
-		redisTemplate.setValueSerializer(new GenericToStringSerializer<V>(valueClass));
+		redisTemplate.setValueSerializer(new GenericToStringSerializer<>(valueClass));
 
 		// avoids proxy
 		redisTemplate.setExposeConnection(true);
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/rich/InMemoryRichGaugeRepository.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/rich/InMemoryRichGaugeRepository.java
index 34ca47fc42..b1aff342a5 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/rich/InMemoryRichGaugeRepository.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/rich/InMemoryRichGaugeRepository.java
@@ -33,7 +33,7 @@ import org.springframework.boot.actuate.metrics.writer.MetricWriter;
  */
 public class InMemoryRichGaugeRepository implements RichGaugeRepository {
 
-	private final SimpleInMemoryRepository<RichGauge> repository = new SimpleInMemoryRepository<RichGauge>();
+	private final SimpleInMemoryRepository<RichGauge> repository = new SimpleInMemoryRepository<>();
 
 	@Override
 	public void increment(final Delta<?> delta) {
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/rich/MultiMetricRichGaugeReader.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/rich/MultiMetricRichGaugeReader.java
index d42fd7c80e..66abf8b96e 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/rich/MultiMetricRichGaugeReader.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/rich/MultiMetricRichGaugeReader.java
@@ -73,7 +73,7 @@ public class MultiMetricRichGaugeReader implements RichGaugeReader {
 
 	@Override
 	public Iterable<RichGauge> findAll() {
-		List<RichGauge> result = new ArrayList<RichGauge>();
+		List<RichGauge> result = new ArrayList<>();
 		for (String name : this.repository.groups()) {
 			result.add(findOne(name));
 		}
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/util/SimpleInMemoryRepository.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/util/SimpleInMemoryRepository.java
index c6a43002f8..69f536111d 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/util/SimpleInMemoryRepository.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/util/SimpleInMemoryRepository.java
@@ -32,9 +32,9 @@ import java.util.concurrent.ConcurrentSkipListMap;
  */
 public class SimpleInMemoryRepository<T> {
 
-	private ConcurrentNavigableMap<String, T> values = new ConcurrentSkipListMap<String, T>();
+	private ConcurrentNavigableMap<String, T> values = new ConcurrentSkipListMap<>();
 
-	private final ConcurrentMap<String, Object> locks = new ConcurrentHashMap<String, Object>();
+	private final ConcurrentMap<String, Object> locks = new ConcurrentHashMap<>();
 
 	public T update(String name, Callback<T> callback) {
 		Object lock = getLock(name);
@@ -75,7 +75,7 @@ public class SimpleInMemoryRepository<T> {
 	}
 
 	public Iterable<T> findAll() {
-		return new ArrayList<T>(this.values.values());
+		return new ArrayList<>(this.values.values());
 	}
 
 	public Iterable<T> findAllWithPrefix(String prefix) {
@@ -85,7 +85,7 @@ public class SimpleInMemoryRepository<T> {
 		if (!prefix.endsWith(".")) {
 			prefix = prefix + ".";
 		}
-		return new ArrayList<T>(
+		return new ArrayList<>(
 				this.values.subMap(prefix, false, prefix + "~", true).values());
 	}
 
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/writer/CompositeMetricWriter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/writer/CompositeMetricWriter.java
index bb35e5a90e..18ef8f6ad9 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/writer/CompositeMetricWriter.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/writer/CompositeMetricWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -31,7 +31,7 @@ import org.springframework.boot.actuate.metrics.Metric;
  */
 public class CompositeMetricWriter implements MetricWriter, Iterable<MetricWriter> {
 
-	private final List<MetricWriter> writers = new ArrayList<MetricWriter>();
+	private final List<MetricWriter> writers = new ArrayList<>();
 
 	public CompositeMetricWriter(MetricWriter... writers) {
 		Collections.addAll(this.writers, writers);
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/writer/DefaultCounterService.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/writer/DefaultCounterService.java
index 20b8183fac..2151705f76 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/writer/DefaultCounterService.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/writer/DefaultCounterService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -29,7 +29,7 @@ public class DefaultCounterService implements CounterService {
 
 	private final MetricWriter writer;
 
-	private final ConcurrentHashMap<String, String> names = new ConcurrentHashMap<String, String>();
+	private final ConcurrentHashMap<String, String> names = new ConcurrentHashMap<>();
 
 	/**
 	 * Create a {@link DefaultCounterService} instance.
@@ -41,12 +41,12 @@ public class DefaultCounterService implements CounterService {
 
 	@Override
 	public void increment(String metricName) {
-		this.writer.increment(new Delta<Long>(wrap(metricName), 1L));
+		this.writer.increment(new Delta<>(wrap(metricName), 1L));
 	}
 
 	@Override
 	public void decrement(String metricName) {
-		this.writer.increment(new Delta<Long>(wrap(metricName), -1L));
+		this.writer.increment(new Delta<>(wrap(metricName), -1L));
 	}
 
 	@Override
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/writer/DefaultGaugeService.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/writer/DefaultGaugeService.java
index dd90e6f422..daecc2b97b 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/writer/DefaultGaugeService.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/writer/DefaultGaugeService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -30,7 +30,7 @@ public class DefaultGaugeService implements GaugeService {
 
 	private final MetricWriter writer;
 
-	private final ConcurrentHashMap<String, String> names = new ConcurrentHashMap<String, String>();
+	private final ConcurrentHashMap<String, String> names = new ConcurrentHashMap<>();
 
 	/**
 	 * Create a {@link DefaultGaugeService} instance.
@@ -42,7 +42,7 @@ public class DefaultGaugeService implements GaugeService {
 
 	@Override
 	public void submit(String metricName, double value) {
-		this.writer.set(new Metric<Double>(wrap(metricName), value));
+		this.writer.set(new Metric<>(wrap(metricName), value));
 	}
 
 	private String wrap(String metricName) {
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/security/AuthenticationAuditListener.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/security/AuthenticationAuditListener.java
index a4660cbc8d..328ef92416 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/security/AuthenticationAuditListener.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/security/AuthenticationAuditListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -74,7 +74,7 @@ public class AuthenticationAuditListener extends AbstractAuthenticationAuditList
 	}
 
 	private void onAuthenticationFailureEvent(AbstractAuthenticationFailureEvent event) {
-		Map<String, Object> data = new HashMap<String, Object>();
+		Map<String, Object> data = new HashMap<>();
 		data.put("type", event.getException().getClass().getName());
 		data.put("message", event.getException().getMessage());
 		if (event.getAuthentication().getDetails() != null) {
@@ -85,7 +85,7 @@ public class AuthenticationAuditListener extends AbstractAuthenticationAuditList
 	}
 
 	private void onAuthenticationSuccessEvent(AuthenticationSuccessEvent event) {
-		Map<String, Object> data = new HashMap<String, Object>();
+		Map<String, Object> data = new HashMap<>();
 		if (event.getAuthentication().getDetails() != null) {
 			data.put("details", event.getAuthentication().getDetails());
 		}
@@ -99,7 +99,7 @@ public class AuthenticationAuditListener extends AbstractAuthenticationAuditList
 				AbstractAuthenticationEvent input) {
 			if (listener != null) {
 				AuthenticationSwitchUserEvent event = (AuthenticationSwitchUserEvent) input;
-				Map<String, Object> data = new HashMap<String, Object>();
+				Map<String, Object> data = new HashMap<>();
 				if (event.getAuthentication().getDetails() != null) {
 					data.put("details", event.getAuthentication().getDetails());
 				}
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/security/AuthorizationAuditListener.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/security/AuthorizationAuditListener.java
index 324f703eb4..44202adad0 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/security/AuthorizationAuditListener.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/security/AuthorizationAuditListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -50,7 +50,7 @@ public class AuthorizationAuditListener extends AbstractAuthorizationAuditListen
 
 	private void onAuthenticationCredentialsNotFoundEvent(
 			AuthenticationCredentialsNotFoundEvent event) {
-		Map<String, Object> data = new HashMap<String, Object>();
+		Map<String, Object> data = new HashMap<>();
 		data.put("type", event.getCredentialsNotFoundException().getClass().getName());
 		data.put("message", event.getCredentialsNotFoundException().getMessage());
 		publish(new AuditEvent("<unknown>",
@@ -58,7 +58,7 @@ public class AuthorizationAuditListener extends AbstractAuthorizationAuditListen
 	}
 
 	private void onAuthorizationFailureEvent(AuthorizationFailureEvent event) {
-		Map<String, Object> data = new HashMap<String, Object>();
+		Map<String, Object> data = new HashMap<>();
 		data.put("type", event.getAccessDeniedException().getClass().getName());
 		data.put("message", event.getAccessDeniedException().getMessage());
 		if (event.getAuthentication().getDetails() != null) {
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/InMemoryTraceRepository.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/InMemoryTraceRepository.java
index 86a73d9d5b..1d585ef9bb 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/InMemoryTraceRepository.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/InMemoryTraceRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -35,7 +35,7 @@ public class InMemoryTraceRepository implements TraceRepository {
 
 	private boolean reverse = true;
 
-	private final List<Trace> traces = new LinkedList<Trace>();
+	private final List<Trace> traces = new LinkedList<>();
 
 	/**
 	 * Flag to say that the repository lists traces in reverse order.
@@ -60,7 +60,7 @@ public class InMemoryTraceRepository implements TraceRepository {
 	@Override
 	public List<Trace> findAll() {
 		synchronized (this.traces) {
-			return Collections.unmodifiableList(new ArrayList<Trace>(this.traces));
+			return Collections.unmodifiableList(new ArrayList<>(this.traces));
 		}
 	}
 
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/TraceProperties.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/TraceProperties.java
index 9129372700..a5c53091e1 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/TraceProperties.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/TraceProperties.java
@@ -38,7 +38,7 @@ public class TraceProperties {
 	private static final Set<Include> DEFAULT_INCLUDES;
 
 	static {
-		Set<Include> defaultIncludes = new LinkedHashSet<Include>();
+		Set<Include> defaultIncludes = new LinkedHashSet<>();
 		defaultIncludes.add(Include.REQUEST_HEADERS);
 		defaultIncludes.add(Include.RESPONSE_HEADERS);
 		defaultIncludes.add(Include.COOKIES);
@@ -50,7 +50,7 @@ public class TraceProperties {
 	 * Items to be included in the trace. Defaults to request/response headers (including
 	 * cookies) and errors.
 	 */
-	private Set<Include> include = new HashSet<Include>(DEFAULT_INCLUDES);
+	private Set<Include> include = new HashSet<>(DEFAULT_INCLUDES);
 
 	public Set<Include> getInclude() {
 		return this.include;
diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/WebRequestTraceFilter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/WebRequestTraceFilter.java
index 853135680e..ba822b3349 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/WebRequestTraceFilter.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/WebRequestTraceFilter.java
@@ -120,8 +120,8 @@ public class WebRequestTraceFilter extends OncePerRequestFilter implements Order
 		Throwable exception = (Throwable) request
 				.getAttribute("javax.servlet.error.exception");
 		Principal userPrincipal = request.getUserPrincipal();
-		Map<String, Object> trace = new LinkedHashMap<String, Object>();
-		Map<String, Object> headers = new LinkedHashMap<String, Object>();
+		Map<String, Object> trace = new LinkedHashMap<>();
+		Map<String, Object> headers = new LinkedHashMap<>();
 		trace.put("method", request.getMethod());
 		trace.put("path", request.getRequestURI());
 		trace.put("headers", headers);
@@ -152,7 +152,7 @@ public class WebRequestTraceFilter extends OncePerRequestFilter implements Order
 	}
 
 	private Map<String, Object> getRequestHeaders(HttpServletRequest request) {
-		Map<String, Object> headers = new LinkedHashMap<String, Object>();
+		Map<String, Object> headers = new LinkedHashMap<>();
 		Set<String> excludedHeaders = getExcludeHeaders();
 		Enumeration<String> names = request.getHeaderNames();
 		while (names.hasMoreElements()) {
@@ -166,7 +166,7 @@ public class WebRequestTraceFilter extends OncePerRequestFilter implements Order
 	}
 
 	private Set<String> getExcludeHeaders() {
-		Set<String> excludedHeaders = new HashSet<String>();
+		Set<String> excludedHeaders = new HashSet<>();
 		if (!isIncluded(Include.COOKIES)) {
 			excludedHeaders.add("cookie");
 		}
@@ -204,7 +204,7 @@ public class WebRequestTraceFilter extends OncePerRequestFilter implements Order
 	}
 
 	private Map<String, String> getResponseHeaders(HttpServletResponse response) {
-		Map<String, String> headers = new LinkedHashMap<String, String>();
+		Map<String, String> headers = new LinkedHashMap<>();
 		for (String header : response.getHeaderNames()) {
 			String value = response.getHeader(header);
 			headers.put(header, value);
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepositoryTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepositoryTests.java
index a4aa8d298f..f9ed23c02b 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepositoryTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/audit/InMemoryAuditEventRepositoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -102,7 +102,7 @@ public class InMemoryAuditEventRepositoryTests {
 		Calendar calendar = Calendar.getInstance();
 		calendar.set(2000, 1, 1, 0, 0, 0);
 		calendar.set(Calendar.MILLISECOND, 0);
-		Map<String, Object> data = new HashMap<String, Object>();
+		Map<String, Object> data = new HashMap<>();
 		InMemoryAuditEventRepository repository = new InMemoryAuditEventRepository();
 		repository.add(new AuditEvent(calendar.getTime(), "dave", "a", data));
 		calendar.add(Calendar.DAY_OF_YEAR, 1);
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/CacheStatisticsAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/CacheStatisticsAutoConfigurationTests.java
index eb4e1f4ed2..287ed24f16 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/CacheStatisticsAutoConfigurationTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/CacheStatisticsAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -217,7 +217,7 @@ public class CacheStatisticsAutoConfigurationTests {
 			javax.cache.CacheManager cacheManager = Caching
 					.getCachingProvider(HazelcastCachingProvider.class.getName())
 					.getCacheManager();
-			MutableConfiguration<Object, Object> config = new MutableConfiguration<Object, Object>();
+			MutableConfiguration<Object, Object> config = new MutableConfiguration<>();
 			config.setStatisticsEnabled(true);
 			cacheManager.createCache("books", config);
 			cacheManager.createCache("speakers", config);
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointAutoConfigurationTests.java
index 1010d900fd..0c2b398feb 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointAutoConfigurationTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -278,7 +278,7 @@ public class EndpointAutoConfigurationTests {
 			return new PublicMetrics() {
 				@Override
 				public Collection<Metric<?>> metrics() {
-					Metric<Integer> metric = new Metric<Integer>("foo", 1);
+					Metric<Integer> metric = new Metric<>("foo", 1);
 					return Collections.<Metric<?>>singleton(metric);
 				}
 			};
@@ -310,7 +310,7 @@ public class EndpointAutoConfigurationTests {
 
 		private static class GitFullInfoContributor implements InfoContributor {
 
-			private Map<String, Object> content = new LinkedHashMap<String, Object>();
+			private Map<String, Object> content = new LinkedHashMap<>();
 
 			GitFullInfoContributor(Resource location) throws BindException, IOException {
 				if (location.exists()) {
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java
index dddff4bcca..f05a0b03fb 100755
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java
@@ -117,7 +117,7 @@ public class EndpointWebMvcAutoConfigurationTests {
 
 	private final AnnotationConfigEmbeddedWebApplicationContext applicationContext = new AnnotationConfigEmbeddedWebApplicationContext();
 
-	private static ThreadLocal<Ports> ports = new ThreadLocal<Ports>();
+	private static ThreadLocal<Ports> ports = new ThreadLocal<>();
 
 	@Before
 	public void setUp() {
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesNoSecurityTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesNoSecurityTests.java
index 166071a619..d45e1af59e 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesNoSecurityTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesNoSecurityTests.java
@@ -66,5 +66,4 @@ public class ManagementServerPropertiesNoSecurityTests {
 
 	}
 
-
 }
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementWebSecurityAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementWebSecurityAutoConfigurationTests.java
index 9d416b5e21..77ab9fd0e9 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementWebSecurityAutoConfigurationTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementWebSecurityAutoConfigurationTests.java
@@ -116,8 +116,7 @@ public class ManagementWebSecurityAutoConfigurationTests {
 		this.context.register(WebConfiguration.class);
 		this.context.refresh();
 		UserDetails user = getUser();
-		ArrayList<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>(
-				user.getAuthorities());
+		ArrayList<GrantedAuthority> authorities = new ArrayList<>(user.getAuthorities());
 		assertThat(authorities).containsAll(AuthorityUtils
 				.commaSeparatedStringToAuthorityList("ROLE_USER,ROLE_ACTUATOR"));
 	}
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java
index 3065435d3d..152de6052b 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java
@@ -505,14 +505,14 @@ public class MetricFilterAutoConfigurationTests {
 
 		@RequestMapping("create")
 		public DeferredResult<ResponseEntity<String>> create() {
-			final DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>();
+			final DeferredResult<ResponseEntity<String>> result = new DeferredResult<>();
 			new Thread(new Runnable() {
 				@Override
 				public void run() {
 					try {
 						MetricFilterTestController.this.latch.await();
 						result.setResult(
-								new ResponseEntity<String>("Done", HttpStatus.CREATED));
+								new ResponseEntity<>("Done", HttpStatus.CREATED));
 					}
 					catch (InterruptedException ex) {
 					}
@@ -523,7 +523,7 @@ public class MetricFilterAutoConfigurationTests {
 
 		@RequestMapping("createFailure")
 		public DeferredResult<ResponseEntity<String>> createFailure() {
-			final DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>();
+			final DeferredResult<ResponseEntity<String>> result = new DeferredResult<>();
 			new Thread(new Runnable() {
 				@Override
 				public void run() {
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MvcEndpointPathConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MvcEndpointPathConfigurationTests.java
index 1b477f11ed..0835033e2b 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MvcEndpointPathConfigurationTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MvcEndpointPathConfigurationTests.java
@@ -142,9 +142,8 @@ public class MvcEndpointPathConfigurationTests {
 
 	@Configuration
 	@ImportAutoConfiguration({ EndpointAutoConfiguration.class,
-			HttpMessageConvertersAutoConfiguration.class,
-			AuditAutoConfiguration.class, EndpointWebMvcAutoConfiguration.class,
-			JolokiaAutoConfiguration.class })
+			HttpMessageConvertersAutoConfiguration.class, AuditAutoConfiguration.class,
+			EndpointWebMvcAutoConfiguration.class, JolokiaAutoConfiguration.class })
 
 	protected static class TestConfiguration {
 
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/PublicMetricsAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/PublicMetricsAutoConfigurationTests.java
index 27c2f4dd14..ef8664a277 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/PublicMetricsAutoConfigurationTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/PublicMetricsAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -110,12 +110,12 @@ public class PublicMetricsAutoConfigurationTests {
 		Collection<Metric<?>> metrics = publicMetrics.metrics();
 		assertThat(metrics).isNotNull();
 		assertThat(6).isEqualTo(metrics.size());
-		assertHasMetric(metrics, new Metric<Double>("bar.val", 3.7d));
-		assertHasMetric(metrics, new Metric<Double>("bar.avg", 3.7d));
-		assertHasMetric(metrics, new Metric<Double>("bar.min", 3.7d));
-		assertHasMetric(metrics, new Metric<Double>("bar.max", 3.7d));
-		assertHasMetric(metrics, new Metric<Double>("bar.alpha", -1.d));
-		assertHasMetric(metrics, new Metric<Long>("bar.count", 1L));
+		assertHasMetric(metrics, new Metric<>("bar.val", 3.7d));
+		assertHasMetric(metrics, new Metric<>("bar.avg", 3.7d));
+		assertHasMetric(metrics, new Metric<>("bar.min", 3.7d));
+		assertHasMetric(metrics, new Metric<>("bar.max", 3.7d));
+		assertHasMetric(metrics, new Metric<>("bar.alpha", -1.d));
+		assertHasMetric(metrics, new Metric<>("bar.count", 1L));
 		context.close();
 	}
 
@@ -227,7 +227,7 @@ public class PublicMetricsAutoConfigurationTests {
 	}
 
 	private void assertMetrics(Collection<Metric<?>> metrics, String... keys) {
-		Map<String, Number> content = new HashMap<String, Number>();
+		Map<String, Number> content = new HashMap<>();
 		for (Metric<?> metric : metrics) {
 			content.put(metric.getName(), metric.getValue());
 		}
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryDiscoveryMvcEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryDiscoveryMvcEndpointTests.java
index ab105964bd..0d7b49255e 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryDiscoveryMvcEndpointTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryDiscoveryMvcEndpointTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -44,7 +44,7 @@ public class CloudFoundryDiscoveryMvcEndpointTests {
 	@Before
 	public void setup() {
 		NamedMvcEndpoint endpoint = new TestMvcEndpoint(new TestEndpoint("a"));
-		this.endpoints = new LinkedHashSet<NamedMvcEndpoint>();
+		this.endpoints = new LinkedHashSet<>();
 		this.endpoints.add(endpoint);
 		this.endpoint = new CloudFoundryDiscoveryMvcEndpoint(this.endpoints);
 	}
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/SkipSslVerificationHttpRequestFactoryTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/SkipSslVerificationHttpRequestFactoryTests.java
index ba538010d5..c46be09569 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/SkipSslVerificationHttpRequestFactoryTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/SkipSslVerificationHttpRequestFactoryTests.java
@@ -67,8 +67,7 @@ public class SkipSslVerificationHttpRequestFactoryTests {
 				0);
 		factory.setSsl(getSsl("password", "classpath:test.jks"));
 		EmbeddedWebServer container = factory.getEmbeddedServletContainer(
-				new ServletRegistrationBean<ExampleServlet>(new ExampleServlet(),
-						"/hello"));
+				new ServletRegistrationBean<>(new ExampleServlet(), "/hello"));
 		container.start();
 		return "https://localhost:" + container.getPort() + "/hello";
 	}
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/AbstractEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/AbstractEndpointTests.java
index 73e0e76ee8..4e33792526 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/AbstractEndpointTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/AbstractEndpointTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -110,7 +110,7 @@ public abstract class AbstractEndpointTests<T extends Endpoint<?>> {
 	@Test
 	public void isSensitiveOverrideWithGlobal() throws Exception {
 		this.context = new AnnotationConfigApplicationContext();
-		Map<String, Object> properties = new HashMap<String, Object>();
+		Map<String, Object> properties = new HashMap<>();
 		properties.put("endpoint.sensitive", this.sensitive);
 		properties.put(this.property + ".sensitive", String.valueOf(!this.sensitive));
 		PropertySource<?> propertySource = new MapPropertySource("test", properties);
@@ -163,7 +163,7 @@ public abstract class AbstractEndpointTests<T extends Endpoint<?>> {
 	@Test
 	public void isOptIn() throws Exception {
 		this.context = new AnnotationConfigApplicationContext();
-		Map<String, Object> source = new HashMap<String, Object>();
+		Map<String, Object> source = new HashMap<>();
 		source.put("endpoints.enabled", false);
 		source.put(this.property + ".enabled", true);
 		PropertySource<?> propertySource = new MapPropertySource("test", source);
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointTests.java
index a866e79fa6..3c124362a4 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointTests.java
@@ -266,13 +266,13 @@ public class ConfigurationPropertiesReportEndpointTests
 
 		private Boolean mixedBoolean = true;
 
-		private Map<String, Object> secrets = new HashMap<String, Object>();
+		private Map<String, Object> secrets = new HashMap<>();
 
 		private Hidden hidden = new Hidden();
 
-		private List<ListItem> listItems = new ArrayList<ListItem>();
+		private List<ListItem> listItems = new ArrayList<>();
 
-		private List<List<ListItem>> listOfListItems = new ArrayList<List<ListItem>>();
+		private List<List<ListItem>> listOfListItems = new ArrayList<>();
 
 		public TestProperties() {
 			this.secrets.put("mine", "myPrivateThing");
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/MetricReaderPublicMetricsTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/MetricReaderPublicMetricsTests.java
index 87e7ff673e..1f6652811c 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/MetricReaderPublicMetricsTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/MetricReaderPublicMetricsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -37,7 +37,7 @@ public class MetricReaderPublicMetricsTests {
 
 	@Test
 	public void exposesMetrics() {
-		List<Metric<?>> metrics = new ArrayList<Metric<?>>();
+		List<Metric<?>> metrics = new ArrayList<>();
 		metrics.add(mock(Metric.class));
 		metrics.add(mock(Metric.class));
 		MetricReader reader = mock(MetricReader.class);
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/MetricsEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/MetricsEndpointTests.java
index 38819cd6ae..200d8a3d63 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/MetricsEndpointTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/MetricsEndpointTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -42,11 +42,11 @@ import static org.assertj.core.api.Assertions.assertThat;
  */
 public class MetricsEndpointTests extends AbstractEndpointTests<MetricsEndpoint> {
 
-	private Metric<Number> metric1 = new Metric<Number>("a", 1);
+	private Metric<Number> metric1 = new Metric<>("a", 1);
 
-	private Metric<Number> metric2 = new Metric<Number>("b", 2);
+	private Metric<Number> metric2 = new Metric<>("b", 2);
 
-	private Metric<Number> metric3 = new Metric<Number>("c", 3);
+	private Metric<Number> metric3 = new Metric<>("c", 3);
 
 	public MetricsEndpointTests() {
 		super(Config.class, MetricsEndpoint.class, "metrics", true, "endpoints.metrics");
@@ -59,7 +59,7 @@ public class MetricsEndpointTests extends AbstractEndpointTests<MetricsEndpoint>
 
 	@Test
 	public void ordered() {
-		List<PublicMetrics> publicMetrics = new ArrayList<PublicMetrics>();
+		List<PublicMetrics> publicMetrics = new ArrayList<>();
 		publicMetrics
 				.add(new TestPublicMetrics(2, this.metric2, this.metric2, this.metric3));
 		publicMetrics.add(new TestPublicMetrics(1, this.metric1));
@@ -100,7 +100,7 @@ public class MetricsEndpointTests extends AbstractEndpointTests<MetricsEndpoint>
 
 		@Bean
 		public MetricsEndpoint endpoint() {
-			final Metric<Float> metric = new Metric<Float>("a", 0.5f);
+			final Metric<Float> metric = new Metric<>("a", 0.5f);
 			PublicMetrics metrics = new PublicMetrics() {
 				@Override
 				public Collection<Metric<?>> metrics() {
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/RichGaugeReaderPublicMetricsTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/RichGaugeReaderPublicMetricsTests.java
index 710d5fcb64..356b5d7334 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/RichGaugeReaderPublicMetricsTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/RichGaugeReaderPublicMetricsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -38,13 +38,13 @@ public class RichGaugeReaderPublicMetricsTests {
 	public void testMetrics() throws Exception {
 		InMemoryRichGaugeRepository repository = new InMemoryRichGaugeRepository();
 
-		repository.set(new Metric<Double>("a", 0.d, new Date()));
-		repository.set(new Metric<Double>("a", 0.5d, new Date()));
+		repository.set(new Metric<>("a", 0.d, new Date()));
+		repository.set(new Metric<>("a", 0.5d, new Date()));
 
 		RichGaugeReaderPublicMetrics metrics = new RichGaugeReaderPublicMetrics(
 				repository);
 
-		Map<String, Metric<?>> results = new HashMap<String, Metric<?>>();
+		Map<String, Metric<?>> results = new HashMap<>();
 		for (Metric<?> metric : metrics.metrics()) {
 			results.put(metric.getName(), metric);
 		}
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/SystemPublicMetricsTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/SystemPublicMetricsTests.java
index 92b7579bef..085cb1c43b 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/SystemPublicMetricsTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/SystemPublicMetricsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -35,7 +35,7 @@ public class SystemPublicMetricsTests {
 	@Test
 	public void testSystemMetrics() throws Exception {
 		SystemPublicMetrics publicMetrics = new SystemPublicMetrics();
-		Map<String, Metric<?>> results = new HashMap<String, Metric<?>>();
+		Map<String, Metric<?>> results = new HashMap<>();
 		for (Metric<?> metric : publicMetrics.metrics()) {
 			results.put(metric.getName(), metric);
 		}
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporterTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporterTests.java
index 09ecc318bd..e52666df67 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporterTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporterTests.java
@@ -155,7 +155,7 @@ public class EndpointMBeanExporterTests {
 
 	@Test
 	public void testRegistrationWithDifferentDomainAndIdentity() throws Exception {
-		Map<String, Object> properties = new HashMap<String, Object>();
+		Map<String, Object> properties = new HashMap<>();
 		properties.put("domain", "test-domain");
 		properties.put("ensureUniqueRuntimeObjectNames", true);
 		this.context = new GenericApplicationContext();
@@ -174,7 +174,7 @@ public class EndpointMBeanExporterTests {
 	@Test
 	public void testRegistrationWithDifferentDomainAndIdentityAndStaticNames()
 			throws Exception {
-		Map<String, Object> properties = new HashMap<String, Object>();
+		Map<String, Object> properties = new HashMap<>();
 		properties.put("domain", "test-domain");
 		properties.put("ensureUniqueRuntimeObjectNames", true);
 		Properties staticNames = new Properties();
@@ -342,7 +342,7 @@ public class EndpointMBeanExporterTests {
 
 		@Override
 		public Map<String, Object> invoke() {
-			Map<String, Object> result = new LinkedHashMap<String, Object>();
+			Map<String, Object> result = new LinkedHashMap<>();
 			result.put("date", new Date());
 			return result;
 		}
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/AbstractEndpointHandlerMappingTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/AbstractEndpointHandlerMappingTests.java
index 768ad901ad..a34aa19268 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/AbstractEndpointHandlerMappingTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/AbstractEndpointHandlerMappingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -44,7 +44,7 @@ public abstract class AbstractEndpointHandlerMappingTests {
 	public void securityInterceptorShouldBePresentForNonCorsRequest() throws Exception {
 		HandlerInterceptor securityInterceptor = mock(HandlerInterceptor.class);
 		TestActionEndpoint endpoint = new TestActionEndpoint(new TestEndpoint("a"));
-		AbstractEndpointHandlerMapping<?> mapping = new TestEndpointHandlerMapping<TestActionEndpoint>(
+		AbstractEndpointHandlerMapping<?> mapping = new TestEndpointHandlerMapping<>(
 				Collections.singletonList(endpoint));
 		mapping.setApplicationContext(this.context);
 		mapping.setSecurityInterceptor(securityInterceptor);
@@ -56,7 +56,7 @@ public abstract class AbstractEndpointHandlerMappingTests {
 	@Test
 	public void securityInterceptorIfNullShouldNotBeAdded() throws Exception {
 		TestActionEndpoint endpoint = new TestActionEndpoint(new TestEndpoint("a"));
-		AbstractEndpointHandlerMapping<?> mapping = new TestEndpointHandlerMapping<TestActionEndpoint>(
+		AbstractEndpointHandlerMapping<?> mapping = new TestEndpointHandlerMapping<>(
 				Collections.singletonList(endpoint));
 		mapping.setApplicationContext(this.context);
 		mapping.afterPropertiesSet();
@@ -68,7 +68,7 @@ public abstract class AbstractEndpointHandlerMappingTests {
 			throws Exception {
 		HandlerInterceptor securityInterceptor = mock(HandlerInterceptor.class);
 		TestActionEndpoint endpoint = new TestActionEndpoint(new TestEndpoint("a"));
-		AbstractEndpointHandlerMapping<?> mapping = new TestEndpointHandlerMapping<TestActionEndpoint>(
+		AbstractEndpointHandlerMapping<?> mapping = new TestEndpointHandlerMapping<>(
 				Collections.singletonList(endpoint));
 		mapping.setApplicationContext(this.context);
 		mapping.setSecurityInterceptor(securityInterceptor);
@@ -84,7 +84,7 @@ public abstract class AbstractEndpointHandlerMappingTests {
 	public void pathNotMappedWhenGetPathReturnsNull() throws Exception {
 		TestMvcEndpoint endpoint = new TestMvcEndpoint(new TestEndpoint("a"));
 		TestActionEndpoint other = new TestActionEndpoint(new TestEndpoint("b"));
-		AbstractEndpointHandlerMapping<?> mapping = new TestEndpointHandlerMapping<MvcEndpoint>(
+		AbstractEndpointHandlerMapping<?> mapping = new TestEndpointHandlerMapping<>(
 				Arrays.<MvcEndpoint>asList(endpoint, other));
 		mapping.setApplicationContext(this.context);
 		mapping.afterPropertiesSet();
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/EnvironmentMvcEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/EnvironmentMvcEndpointTests.java
index 3d90689c91..62af6e7854 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/EnvironmentMvcEndpointTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/EnvironmentMvcEndpointTests.java
@@ -128,7 +128,7 @@ public class EnvironmentMvcEndpointTests {
 
 	@Test
 	public void regex() throws Exception {
-		Map<String, Object> map = new HashMap<String, Object>();
+		Map<String, Object> map = new HashMap<>();
 		map.put("food", null);
 		((ConfigurableEnvironment) this.context.getEnvironment()).getPropertySources()
 				.addFirst(new MapPropertySource("null-value", map));
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HalBrowserMvcEndpointVanillaIntegrationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HalBrowserMvcEndpointVanillaIntegrationTests.java
index 4781db490c..96003d610a 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HalBrowserMvcEndpointVanillaIntegrationTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/HalBrowserMvcEndpointVanillaIntegrationTests.java
@@ -119,8 +119,8 @@ public class HalBrowserMvcEndpointVanillaIntegrationTests {
 
 	@Test
 	public void endpointsEachHaveSelf() throws Exception {
-		Set<String> collections = new HashSet<String>(Arrays.asList("/trace", "/beans",
-				"/dump", "/heapdump", "/loggers", "/auditevents"));
+		Set<String> collections = new HashSet<>(Arrays.asList("/trace", "/beans", "/dump",
+				"/heapdump", "/loggers", "/auditevents"));
 		for (MvcEndpoint endpoint : this.mvcEndpoints.getEndpoints()) {
 			String path = endpoint.getPath();
 			if (collections.contains(path)) {
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/InfoMvcEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/InfoMvcEndpointTests.java
index 961984fe88..10f09d31f2 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/InfoMvcEndpointTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/InfoMvcEndpointTests.java
@@ -114,7 +114,7 @@ public class InfoMvcEndpointTests {
 
 				@Override
 				public void contribute(Info.Builder builder) {
-					Map<String, Object> content = new LinkedHashMap<String, Object>();
+					Map<String, Object> content = new LinkedHashMap<>();
 					content.put("key11", "value11");
 					content.put("key12", "value12");
 					builder.withDetail("beanName1", content);
@@ -127,7 +127,7 @@ public class InfoMvcEndpointTests {
 			return new InfoContributor() {
 				@Override
 				public void contribute(Info.Builder builder) {
-					Map<String, Object> content = new LinkedHashMap<String, Object>();
+					Map<String, Object> content = new LinkedHashMap<>();
 					content.put("key21", "value21");
 					content.put("key22", "value22");
 					builder.withDetail("beanName2", content);
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/MetricsMvcEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/MetricsMvcEndpointTests.java
index 1ee0d601c3..91fa46bef8 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/MetricsMvcEndpointTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/MetricsMvcEndpointTests.java
@@ -174,12 +174,12 @@ public class MetricsMvcEndpointTests {
 
 				@Override
 				public Collection<Metric<?>> metrics() {
-					ArrayList<Metric<?>> metrics = new ArrayList<Metric<?>>();
-					metrics.add(new Metric<Integer>("foo", 1));
-					metrics.add(new Metric<Integer>("group1.a", 1));
-					metrics.add(new Metric<Integer>("group1.b", 1));
-					metrics.add(new Metric<Integer>("group2.a", 1));
-					metrics.add(new Metric<Integer>("group2_a", 1));
+					ArrayList<Metric<?>> metrics = new ArrayList<>();
+					metrics.add(new Metric<>("foo", 1));
+					metrics.add(new Metric<>("group1.a", 1));
+					metrics.add(new Metric<>("group1.b", 1));
+					metrics.add(new Metric<>("group2.a", 1));
+					metrics.add(new Metric<>("group2_a", 1));
 					metrics.add(new Metric<Integer>("baz", null));
 					return Collections.unmodifiableList(metrics);
 				}
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/CompositeHealthIndicatorTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/CompositeHealthIndicatorTests.java
index 4bf86ff013..1652553209 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/CompositeHealthIndicatorTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/CompositeHealthIndicatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -63,7 +63,7 @@ public class CompositeHealthIndicatorTests {
 
 	@Test
 	public void createWithIndicators() throws Exception {
-		Map<String, HealthIndicator> indicators = new HashMap<String, HealthIndicator>();
+		Map<String, HealthIndicator> indicators = new HashMap<>();
 		indicators.put("one", this.one);
 		indicators.put("two", this.two);
 		CompositeHealthIndicator composite = new CompositeHealthIndicator(
@@ -78,7 +78,7 @@ public class CompositeHealthIndicatorTests {
 
 	@Test
 	public void createWithIndicatorsAndAdd() throws Exception {
-		Map<String, HealthIndicator> indicators = new HashMap<String, HealthIndicator>();
+		Map<String, HealthIndicator> indicators = new HashMap<>();
 		indicators.put("one", this.one);
 		indicators.put("two", this.two);
 		CompositeHealthIndicator composite = new CompositeHealthIndicator(
@@ -110,7 +110,7 @@ public class CompositeHealthIndicatorTests {
 
 	@Test
 	public void testSerialization() throws Exception {
-		Map<String, HealthIndicator> indicators = new HashMap<String, HealthIndicator>();
+		Map<String, HealthIndicator> indicators = new HashMap<>();
 		indicators.put("db1", this.one);
 		indicators.put("db2", this.two);
 		CompositeHealthIndicator innerComposite = new CompositeHealthIndicator(
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/ElasticsearchHealthIndicatorTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/ElasticsearchHealthIndicatorTests.java
index 3fc37273c5..6ab1801102 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/ElasticsearchHealthIndicatorTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/ElasticsearchHealthIndicatorTests.java
@@ -85,7 +85,7 @@ public class ElasticsearchHealthIndicatorTests {
 
 	@Test
 	public void certainIndices() {
-		PlainActionFuture<ClusterHealthResponse> responseFuture = new PlainActionFuture<ClusterHealthResponse>();
+		PlainActionFuture<ClusterHealthResponse> responseFuture = new PlainActionFuture<>();
 		responseFuture.onResponse(new StubClusterHealthResponse());
 		ArgumentCaptor<ClusterHealthRequest> requestCaptor = ArgumentCaptor
 				.forClass(ClusterHealthRequest.class);
@@ -112,7 +112,7 @@ public class ElasticsearchHealthIndicatorTests {
 
 	@Test
 	public void healthDetails() {
-		PlainActionFuture<ClusterHealthResponse> responseFuture = new PlainActionFuture<ClusterHealthResponse>();
+		PlainActionFuture<ClusterHealthResponse> responseFuture = new PlainActionFuture<>();
 		responseFuture.onResponse(new StubClusterHealthResponse());
 		given(this.cluster.health(any(ClusterHealthRequest.class)))
 				.willReturn(responseFuture);
@@ -131,7 +131,7 @@ public class ElasticsearchHealthIndicatorTests {
 
 	@Test
 	public void redResponseMapsToDown() {
-		PlainActionFuture<ClusterHealthResponse> responseFuture = new PlainActionFuture<ClusterHealthResponse>();
+		PlainActionFuture<ClusterHealthResponse> responseFuture = new PlainActionFuture<>();
 		responseFuture.onResponse(new StubClusterHealthResponse(ClusterHealthStatus.RED));
 		given(this.cluster.health(any(ClusterHealthRequest.class)))
 				.willReturn(responseFuture);
@@ -140,7 +140,7 @@ public class ElasticsearchHealthIndicatorTests {
 
 	@Test
 	public void yellowResponseMapsToUp() {
-		PlainActionFuture<ClusterHealthResponse> responseFuture = new PlainActionFuture<ClusterHealthResponse>();
+		PlainActionFuture<ClusterHealthResponse> responseFuture = new PlainActionFuture<>();
 		responseFuture
 				.onResponse(new StubClusterHealthResponse(ClusterHealthStatus.YELLOW));
 		given(this.cluster.health(any(ClusterHealthRequest.class)))
@@ -150,7 +150,7 @@ public class ElasticsearchHealthIndicatorTests {
 
 	@Test
 	public void responseTimeout() {
-		PlainActionFuture<ClusterHealthResponse> responseFuture = new PlainActionFuture<ClusterHealthResponse>();
+		PlainActionFuture<ClusterHealthResponse> responseFuture = new PlainActionFuture<>();
 		given(this.cluster.health(any(ClusterHealthRequest.class)))
 				.willReturn(responseFuture);
 		Health health = this.indicator.health();
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/LdapHealthIndicatorTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/LdapHealthIndicatorTests.java
index cfb4aa4196..47959cc510 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/LdapHealthIndicatorTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/LdapHealthIndicatorTests.java
@@ -31,8 +31,8 @@ import org.springframework.ldap.core.ContextExecutor;
 import org.springframework.ldap.core.LdapTemplate;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.BDDMockito.given;
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/OrderedHealthAggregatorTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/OrderedHealthAggregatorTests.java
index 14e4033071..335a995581 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/OrderedHealthAggregatorTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/OrderedHealthAggregatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -41,7 +41,7 @@ public class OrderedHealthAggregatorTests {
 
 	@Test
 	public void defaultOrder() {
-		Map<String, Health> healths = new HashMap<String, Health>();
+		Map<String, Health> healths = new HashMap<>();
 		healths.put("h1", new Health.Builder().status(Status.DOWN).build());
 		healths.put("h2", new Health.Builder().status(Status.UP).build());
 		healths.put("h3", new Health.Builder().status(Status.UNKNOWN).build());
@@ -54,7 +54,7 @@ public class OrderedHealthAggregatorTests {
 	public void customOrder() {
 		this.healthAggregator.setStatusOrder(Status.UNKNOWN, Status.UP,
 				Status.OUT_OF_SERVICE, Status.DOWN);
-		Map<String, Health> healths = new HashMap<String, Health>();
+		Map<String, Health> healths = new HashMap<>();
 		healths.put("h1", new Health.Builder().status(Status.DOWN).build());
 		healths.put("h2", new Health.Builder().status(Status.UP).build());
 		healths.put("h3", new Health.Builder().status(Status.UNKNOWN).build());
@@ -65,7 +65,7 @@ public class OrderedHealthAggregatorTests {
 
 	@Test
 	public void defaultOrderWithCustomStatus() {
-		Map<String, Health> healths = new HashMap<String, Health>();
+		Map<String, Health> healths = new HashMap<>();
 		healths.put("h1", new Health.Builder().status(Status.DOWN).build());
 		healths.put("h2", new Health.Builder().status(Status.UP).build());
 		healths.put("h3", new Health.Builder().status(Status.UNKNOWN).build());
@@ -79,7 +79,7 @@ public class OrderedHealthAggregatorTests {
 	public void customOrderWithCustomStatus() {
 		this.healthAggregator.setStatusOrder(
 				Arrays.asList("DOWN", "OUT_OF_SERVICE", "UP", "UNKNOWN", "CUSTOM"));
-		Map<String, Health> healths = new HashMap<String, Health>();
+		Map<String, Health> healths = new HashMap<>();
 		healths.put("h1", new Health.Builder().status(Status.DOWN).build());
 		healths.put("h2", new Health.Builder().status(Status.UP).build());
 		healths.put("h3", new Health.Builder().status(Status.UNKNOWN).build());
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/SolrHealthIndicatorTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/SolrHealthIndicatorTests.java
index e4d055c39e..13eabac89b 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/SolrHealthIndicatorTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/SolrHealthIndicatorTests.java
@@ -66,7 +66,7 @@ public class SolrHealthIndicatorTests {
 	public void solrIsUp() throws Exception {
 		SolrClient solrClient = mock(SolrClient.class);
 		SolrPingResponse pingResponse = new SolrPingResponse();
-		NamedList<Object> response = new NamedList<Object>();
+		NamedList<Object> response = new NamedList<>();
 		response.add("status", "OK");
 		pingResponse.setResponse(response);
 		given(solrClient.ping()).willReturn(pingResponse);
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/Iterables.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/Iterables.java
index 33cc8754bb..6f9562365b 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/Iterables.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/Iterables.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2013 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -28,7 +28,7 @@ public abstract class Iterables {
 		if (iterable instanceof Collection) {
 			return (Collection<T>) iterable;
 		}
-		ArrayList<T> list = new ArrayList<T>();
+		ArrayList<T> list = new ArrayList<>();
 		for (T t : iterable) {
 			list.add(t);
 		}
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/aggregate/AggregateMetricReaderTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/aggregate/AggregateMetricReaderTests.java
index 59765b1c11..870fd9d4ab 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/aggregate/AggregateMetricReaderTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/aggregate/AggregateMetricReaderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -39,28 +39,28 @@ public class AggregateMetricReaderTests {
 
 	@Test
 	public void writeAndReadDefaults() {
-		this.source.set(new Metric<Double>("foo.bar.spam", 2.3));
+		this.source.set(new Metric<>("foo.bar.spam", 2.3));
 		assertThat(this.reader.findOne("aggregate.spam").getValue()).isEqualTo(2.3);
 	}
 
 	@Test
 	public void defaultKeyPattern() {
-		this.source.set(new Metric<Double>("foo.bar.spam.bucket.wham", 2.3));
+		this.source.set(new Metric<>("foo.bar.spam.bucket.wham", 2.3));
 		assertThat(this.reader.findOne("aggregate.spam.bucket.wham").getValue())
 				.isEqualTo(2.3);
 	}
 
 	@Test
 	public void addKeyPattern() {
-		this.source.set(new Metric<Double>("foo.bar.spam.bucket.wham", 2.3));
+		this.source.set(new Metric<>("foo.bar.spam.bucket.wham", 2.3));
 		this.reader.setKeyPattern("d.d.k.d");
 		assertThat(this.reader.findOne("aggregate.spam.wham").getValue()).isEqualTo(2.3);
 	}
 
 	@Test
 	public void addPrefix() {
-		this.source.set(new Metric<Double>("foo.bar.spam.bucket.wham", 2.3));
-		this.source.set(new Metric<Double>("off.bar.spam.bucket.wham", 2.4));
+		this.source.set(new Metric<>("foo.bar.spam.bucket.wham", 2.3));
+		this.source.set(new Metric<>("off.bar.spam.bucket.wham", 2.4));
 		this.reader.setPrefix("www");
 		this.reader.setKeyPattern("k.d.k.d");
 		assertThat(this.reader.findOne("www.foo.spam.wham").getValue()).isEqualTo(2.3);
@@ -69,45 +69,45 @@ public class AggregateMetricReaderTests {
 
 	@Test
 	public void writeAndReadExtraLong() {
-		this.source.set(new Metric<Double>("blee.foo.bar.spam", 2.3));
+		this.source.set(new Metric<>("blee.foo.bar.spam", 2.3));
 		this.reader.setKeyPattern("d.d.d.k");
 		assertThat(this.reader.findOne("aggregate.spam").getValue()).isEqualTo(2.3);
 	}
 
 	@Test
 	public void writeAndReadLatestValue() {
-		this.source.set(new Metric<Double>("foo.bar.spam", 2.3, new Date(100L)));
-		this.source.set(new Metric<Double>("oof.rab.spam", 2.4, new Date(0L)));
+		this.source.set(new Metric<>("foo.bar.spam", 2.3, new Date(100L)));
+		this.source.set(new Metric<>("oof.rab.spam", 2.4, new Date(0L)));
 		assertThat(this.reader.findOne("aggregate.spam").getValue()).isEqualTo(2.3);
 	}
 
 	@Test
 	public void onlyPrefixed() {
-		this.source.set(new Metric<Double>("foo.bar.spam", 2.3));
+		this.source.set(new Metric<>("foo.bar.spam", 2.3));
 		assertThat(this.reader.findOne("spam")).isNull();
 	}
 
 	@Test
 	public void incrementCounter() {
-		this.source.increment(new Delta<Long>("foo.bar.counter.spam", 2L));
-		this.source.increment(new Delta<Long>("oof.rab.counter.spam", 3L));
+		this.source.increment(new Delta<>("foo.bar.counter.spam", 2L));
+		this.source.increment(new Delta<>("oof.rab.counter.spam", 3L));
 		assertThat(this.reader.findOne("aggregate.counter.spam").getValue())
 				.isEqualTo(5L);
 	}
 
 	@Test
 	public void countGauges() {
-		this.source.set(new Metric<Double>("foo.bar.spam", 2.3));
-		this.source.set(new Metric<Double>("oof.rab.spam", 2.4));
+		this.source.set(new Metric<>("foo.bar.spam", 2.3));
+		this.source.set(new Metric<>("oof.rab.spam", 2.4));
 		assertThat(this.reader.count()).isEqualTo(1);
 	}
 
 	@Test
 	public void countGaugesAndCounters() {
-		this.source.set(new Metric<Double>("foo.bar.spam", 2.3));
-		this.source.set(new Metric<Double>("oof.rab.spam", 2.4));
-		this.source.increment(new Delta<Long>("foo.bar.counter.spam", 2L));
-		this.source.increment(new Delta<Long>("oof.rab.counter.spam", 3L));
+		this.source.set(new Metric<>("foo.bar.spam", 2.3));
+		this.source.set(new Metric<>("oof.rab.spam", 2.4));
+		this.source.increment(new Delta<>("foo.bar.counter.spam", 2L));
+		this.source.increment(new Delta<>("oof.rab.counter.spam", 3L));
 		assertThat(this.reader.count()).isEqualTo(2);
 	}
 
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/buffer/BufferGaugeServiceSpeedTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/buffer/BufferGaugeServiceSpeedTests.java
index 29e43d1f76..322f1d97b0 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/buffer/BufferGaugeServiceSpeedTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/buffer/BufferGaugeServiceSpeedTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -154,7 +154,7 @@ public class BufferGaugeServiceSpeedTests {
 				}
 			}
 		};
-		Collection<Future<?>> futures = new HashSet<Future<?>>();
+		Collection<Future<?>> futures = new HashSet<>();
 		for (int i = 0; i < threadCount; i++) {
 			futures.add(pool.submit(task));
 		}
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/buffer/CounterServiceSpeedTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/buffer/CounterServiceSpeedTests.java
index 25bc73b9c5..f309fabd04 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/buffer/CounterServiceSpeedTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/buffer/CounterServiceSpeedTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -153,7 +153,7 @@ public class CounterServiceSpeedTests {
 				}
 			}
 		};
-		Collection<Future<?>> futures = new HashSet<Future<?>>();
+		Collection<Future<?>> futures = new HashSet<>();
 		for (int i = 0; i < threadCount; i++) {
 			futures.add(pool.submit(task));
 		}
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/buffer/DefaultCounterServiceSpeedTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/buffer/DefaultCounterServiceSpeedTests.java
index 9cb2083a58..4b9720705b 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/buffer/DefaultCounterServiceSpeedTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/buffer/DefaultCounterServiceSpeedTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -96,7 +96,7 @@ public class DefaultCounterServiceSpeedTests {
 				}
 			}
 		};
-		Collection<Future<?>> futures = new HashSet<Future<?>>();
+		Collection<Future<?>> futures = new HashSet<>();
 		for (int i = 0; i < threadCount; i++) {
 			futures.add(pool.submit(task));
 		}
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/buffer/DefaultGaugeServiceSpeedTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/buffer/DefaultGaugeServiceSpeedTests.java
index fac827f08b..bc869573af 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/buffer/DefaultGaugeServiceSpeedTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/buffer/DefaultGaugeServiceSpeedTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -97,7 +97,7 @@ public class DefaultGaugeServiceSpeedTests {
 				}
 			}
 		};
-		Collection<Future<?>> futures = new HashSet<Future<?>>();
+		Collection<Future<?>> futures = new HashSet<>();
 		for (int i = 0; i < threadCount; i++) {
 			futures.add(pool.submit(task));
 		}
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/buffer/DropwizardCounterServiceSpeedTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/buffer/DropwizardCounterServiceSpeedTests.java
index 86cfdd7a8b..3b547b2ca7 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/buffer/DropwizardCounterServiceSpeedTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/buffer/DropwizardCounterServiceSpeedTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -99,7 +99,7 @@ public class DropwizardCounterServiceSpeedTests {
 				}
 			}
 		};
-		Collection<Future<?>> futures = new HashSet<Future<?>>();
+		Collection<Future<?>> futures = new HashSet<>();
 		for (int i = 0; i < threadCount; i++) {
 			futures.add(pool.submit(task));
 		}
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/dropwizard/DropwizardMetricServicesTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/dropwizard/DropwizardMetricServicesTests.java
index 61abfe88ce..83485f2aa3 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/dropwizard/DropwizardMetricServicesTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/dropwizard/DropwizardMetricServicesTests.java
@@ -139,7 +139,7 @@ public class DropwizardMetricServicesTests {
 	 */
 	@Test
 	public void testParallelism() throws Exception {
-		List<WriterThread> threads = new ArrayList<WriterThread>();
+		List<WriterThread> threads = new ArrayList<>();
 		ThreadGroup group = new ThreadGroup("threads");
 		for (int i = 0; i < 10; i++) {
 			WriterThread thread = new WriterThread(group, i, this.writer);
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/export/MetricExportersTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/export/MetricExportersTests.java
index 61d098797a..200a464392 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/export/MetricExportersTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/export/MetricExportersTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -41,7 +41,7 @@ public class MetricExportersTests {
 
 	private MetricExportProperties export = new MetricExportProperties();
 
-	private Map<String, GaugeWriter> writers = new LinkedHashMap<String, GaugeWriter>();
+	private Map<String, GaugeWriter> writers = new LinkedHashMap<>();
 
 	private MetricReader reader = mock(MetricReader.class);
 
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/export/PrefixMetricGroupExporterTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/export/PrefixMetricGroupExporterTests.java
index 04ac555940..164801ca64 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/export/PrefixMetricGroupExporterTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/export/PrefixMetricGroupExporterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -53,7 +53,7 @@ public class PrefixMetricGroupExporterTests {
 
 	@Test
 	public void countersIncremented() {
-		this.writer.increment("counter.foo", new Delta<Long>("bar", 1L));
+		this.writer.increment("counter.foo", new Delta<>("bar", 1L));
 		this.reader.set("counter", Collections
 				.<Metric<?>>singletonList(new Metric<Number>("counter.foo.bar", 1)));
 		this.exporter.setGroups(Collections.singleton("counter.foo"));
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbGaugeWriterTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbGaugeWriterTests.java
index 21c5ebf389..45d8a44dd9 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbGaugeWriterTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/opentsdb/OpenTsdbGaugeWriterTests.java
@@ -52,7 +52,7 @@ public class OpenTsdbGaugeWriterTests {
 
 	@Test
 	public void postSuccessfullyOnFlush() {
-		this.writer.set(new Metric<Double>("foo", 2.4));
+		this.writer.set(new Metric<>("foo", 2.4));
 		given(this.restTemplate.postForEntity(anyString(), any(Object.class), anyMap()))
 				.willReturn(emptyResponse());
 		this.writer.flush();
@@ -64,13 +64,13 @@ public class OpenTsdbGaugeWriterTests {
 		given(this.restTemplate.postForEntity(anyString(), any(Object.class), anyMap()))
 				.willReturn(emptyResponse());
 		this.writer.setBufferSize(0);
-		this.writer.set(new Metric<Double>("foo", 2.4));
+		this.writer.set(new Metric<>("foo", 2.4));
 		verify(this.restTemplate).postForEntity(anyString(), any(Object.class), anyMap());
 	}
 
 	@SuppressWarnings("rawtypes")
 	private ResponseEntity<Map> emptyResponse() {
-		return new ResponseEntity<Map>(Collections.emptyMap(), HttpStatus.OK);
+		return new ResponseEntity<>(Collections.emptyMap(), HttpStatus.OK);
 	}
 
 	@SuppressWarnings({ "rawtypes", "unchecked" })
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/reader/MetricRegistryMetricReaderTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/reader/MetricRegistryMetricReaderTests.java
index 4617dea14f..b409551aa4 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/reader/MetricRegistryMetricReaderTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/reader/MetricRegistryMetricReaderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -45,7 +45,7 @@ public class MetricRegistryMetricReaderTests {
 
 			@Override
 			public Set<String> getValue() {
-				return new HashSet<String>();
+				return new HashSet<>();
 			}
 
 		});
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/InMemoryMetricRepositoryTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/InMemoryMetricRepositoryTests.java
index a3212779f3..25cf51063b 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/InMemoryMetricRepositoryTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/InMemoryMetricRepositoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -37,14 +37,14 @@ public class InMemoryMetricRepositoryTests {
 
 	@Test
 	public void increment() {
-		this.repository.increment(new Delta<Integer>("foo", 1, new Date()));
+		this.repository.increment(new Delta<>("foo", 1, new Date()));
 		assertThat(this.repository.findOne("foo").getValue().doubleValue()).isEqualTo(1.0,
 				offset(0.01));
 	}
 
 	@Test
 	public void set() {
-		this.repository.set(new Metric<Double>("foo", 2.5, new Date()));
+		this.repository.set(new Metric<>("foo", 2.5, new Date()));
 		assertThat(this.repository.findOne("foo").getValue().doubleValue()).isEqualTo(2.5,
 				offset(0.01));
 	}
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/InMemoryMultiMetricRepositoryTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/InMemoryMultiMetricRepositoryTests.java
index 19bac157fa..501691c6bc 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/InMemoryMultiMetricRepositoryTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/InMemoryMultiMetricRepositoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -42,7 +42,7 @@ public class InMemoryMultiMetricRepositoryTests {
 		this.repository.increment("foo", new Delta<Number>("bar", 1));
 		this.repository.increment("foo", new Delta<Number>("bar", 1));
 		this.repository.increment("foo", new Delta<Number>("spam", 1));
-		Set<String> names = new HashSet<String>();
+		Set<String> names = new HashSet<>();
 		for (Metric<?> metric : this.repository.findAll("foo")) {
 			names.add(metric.getName());
 		}
@@ -53,7 +53,7 @@ public class InMemoryMultiMetricRepositoryTests {
 	@Test
 	public void prefixWithWildcard() {
 		this.repository.increment("foo", new Delta<Number>("bar", 1));
-		Set<String> names = new HashSet<String>();
+		Set<String> names = new HashSet<>();
 		for (Metric<?> metric : this.repository.findAll("foo.*")) {
 			names.add(metric.getName());
 		}
@@ -64,7 +64,7 @@ public class InMemoryMultiMetricRepositoryTests {
 	@Test
 	public void prefixWithPeriod() {
 		this.repository.increment("foo", new Delta<Number>("bar", 1));
-		Set<String> names = new HashSet<String>();
+		Set<String> names = new HashSet<>();
 		for (Metric<?> metric : this.repository.findAll("foo.")) {
 			names.add(metric.getName());
 		}
@@ -76,7 +76,7 @@ public class InMemoryMultiMetricRepositoryTests {
 	public void onlyRegisteredPrefixCounted() {
 		this.repository.increment("foo", new Delta<Number>("bar", 1));
 		this.repository.increment("foobar", new Delta<Number>("spam", 1));
-		Set<String> names = new HashSet<String>();
+		Set<String> names = new HashSet<>();
 		for (Metric<?> metric : this.repository.findAll("foo")) {
 			names.add(metric.getName());
 		}
@@ -89,7 +89,7 @@ public class InMemoryMultiMetricRepositoryTests {
 		this.repository.increment("foo", new Delta<Number>("foo.bar", 1));
 		this.repository.increment("foo", new Delta<Number>("foo.bar", 2));
 		this.repository.increment("foo", new Delta<Number>("foo.spam", 1));
-		Map<String, Metric<?>> metrics = new HashMap<String, Metric<?>>();
+		Map<String, Metric<?>> metrics = new HashMap<>();
 		for (Metric<?> metric : this.repository.findAll("foo")) {
 			metrics.put(metric.getName(), metric);
 		}
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMetricRepositoryTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMetricRepositoryTests.java
index 547b22c673..a298f585ff 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMetricRepositoryTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMetricRepositoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -71,14 +71,14 @@ public class RedisMetricRepositoryTests {
 
 	@Test
 	public void incrementAndGet() {
-		this.repository.increment(new Delta<Long>("foo", 3L));
+		this.repository.increment(new Delta<>("foo", 3L));
 		assertThat(this.repository.findOne("foo").getValue().longValue()).isEqualTo(3);
 	}
 
 	@Test
 	public void setIncrementAndGet() {
 		this.repository.set(new Metric<Number>("foo", 12.3));
-		this.repository.increment(new Delta<Long>("foo", 3L));
+		this.repository.increment(new Delta<>("foo", 3L));
 		Metric<?> metric = this.repository.findOne("foo");
 		assertThat(metric.getName()).isEqualTo("foo");
 		assertThat(metric.getValue().doubleValue()).isEqualTo(15.3, offset(0.01));
@@ -86,21 +86,21 @@ public class RedisMetricRepositoryTests {
 
 	@Test
 	public void findAll() {
-		this.repository.increment(new Delta<Long>("foo", 3L));
+		this.repository.increment(new Delta<>("foo", 3L));
 		this.repository.set(new Metric<Number>("bar", 12.3));
 		assertThat(Iterables.collection(this.repository.findAll())).hasSize(2);
 	}
 
 	@Test
 	public void findOneWithAll() {
-		this.repository.increment(new Delta<Long>("foo", 3L));
+		this.repository.increment(new Delta<>("foo", 3L));
 		Metric<?> metric = this.repository.findAll().iterator().next();
 		assertThat(metric.getName()).isEqualTo("foo");
 	}
 
 	@Test
 	public void count() {
-		this.repository.increment(new Delta<Long>("foo", 3L));
+		this.repository.increment(new Delta<>("foo", 3L));
 		this.repository.set(new Metric<Number>("bar", 12.3));
 		assertThat(this.repository.count()).isEqualTo(2);
 	}
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMultiMetricRepositoryTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMultiMetricRepositoryTests.java
index c95bb27775..1612b39f92 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMultiMetricRepositoryTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMultiMetricRepositoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -132,7 +132,7 @@ public class RedisMultiMetricRepositoryTests {
 		this.repository.increment("foo", new Delta<Number>("foo.bar", 2));
 		this.repository.increment("foo", new Delta<Number>("foo.spam", 1));
 		Metric<?> bar = null;
-		Set<String> names = new HashSet<String>();
+		Set<String> names = new HashSet<>();
 		for (Metric<?> metric : this.repository.findAll("foo")) {
 			names.add(metric.getName());
 			if (metric.getName().equals("foo.bar")) {
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/rich/InMemoryRichGaugeRepositoryTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/rich/InMemoryRichGaugeRepositoryTests.java
index 5afef238c5..6af63795f8 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/rich/InMemoryRichGaugeRepositoryTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/rich/InMemoryRichGaugeRepositoryTests.java
@@ -36,23 +36,23 @@ public class InMemoryRichGaugeRepositoryTests {
 
 	@Test
 	public void writeAndRead() {
-		this.repository.set(new Metric<Double>("foo", 1d));
-		this.repository.set(new Metric<Double>("foo", 2d));
+		this.repository.set(new Metric<>("foo", 1d));
+		this.repository.set(new Metric<>("foo", 2d));
 		assertThat(this.repository.findOne("foo").getCount()).isEqualTo(2L);
 		assertThat(this.repository.findOne("foo").getValue()).isEqualTo(2d, offset(0.01));
 	}
 
 	@Test
 	public void incrementExisting() {
-		this.repository.set(new Metric<Double>("foo", 1d));
-		this.repository.increment(new Delta<Double>("foo", 2d));
+		this.repository.set(new Metric<>("foo", 1d));
+		this.repository.increment(new Delta<>("foo", 2d));
 		assertThat(this.repository.findOne("foo").getCount()).isEqualTo(2L);
 		assertThat(this.repository.findOne("foo").getValue()).isEqualTo(3d, offset(0.01));
 	}
 
 	@Test
 	public void incrementNew() {
-		this.repository.increment(new Delta<Double>("foo", 2d));
+		this.repository.increment(new Delta<>("foo", 2d));
 		assertThat(this.repository.findOne("foo").getCount()).isEqualTo(1L);
 		assertThat(this.repository.findOne("foo").getValue()).isEqualTo(2d, offset(0.01));
 	}
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/rich/MultiMetricRichGaugeReaderTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/rich/MultiMetricRichGaugeReaderTests.java
index b6b195d808..df4b7bcd55 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/rich/MultiMetricRichGaugeReaderTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/rich/MultiMetricRichGaugeReaderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -43,8 +43,8 @@ public class MultiMetricRichGaugeReaderTests {
 
 	@Test
 	public void countOne() {
-		this.data.set(new Metric<Integer>("foo", 1));
-		this.data.set(new Metric<Integer>("foo", 1));
+		this.data.set(new Metric<>("foo", 1));
+		this.data.set(new Metric<>("foo", 1));
 		this.exporter.export();
 		// Check the exporter worked
 		assertThat(this.repository.countGroups()).isEqualTo(1);
@@ -56,8 +56,8 @@ public class MultiMetricRichGaugeReaderTests {
 
 	@Test
 	public void countTwo() {
-		this.data.set(new Metric<Integer>("foo", 1));
-		this.data.set(new Metric<Integer>("bar", 1));
+		this.data.set(new Metric<>("foo", 1));
+		this.data.set(new Metric<>("bar", 1));
 		this.exporter.export();
 		assertThat(this.reader.count()).isEqualTo(2);
 		RichGauge one = this.reader.findOne("foo");
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/statsd/StatsdMetricWriterTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/statsd/StatsdMetricWriterTests.java
index 33494ecffb..8b5e4344ac 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/statsd/StatsdMetricWriterTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/statsd/StatsdMetricWriterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -54,21 +54,21 @@ public class StatsdMetricWriterTests {
 
 	@Test
 	public void increment() {
-		this.writer.increment(new Delta<Long>("counter.foo", 3L));
+		this.writer.increment(new Delta<>("counter.foo", 3L));
 		this.server.waitForMessage();
 		assertThat(this.server.messagesReceived().get(0)).isEqualTo("me.counter.foo:3|c");
 	}
 
 	@Test
 	public void setLongMetric() throws Exception {
-		this.writer.set(new Metric<Long>("gauge.foo", 3L));
+		this.writer.set(new Metric<>("gauge.foo", 3L));
 		this.server.waitForMessage();
 		assertThat(this.server.messagesReceived().get(0)).isEqualTo("me.gauge.foo:3|g");
 	}
 
 	@Test
 	public void setDoubleMetric() throws Exception {
-		this.writer.set(new Metric<Double>("gauge.foo", 3.7));
+		this.writer.set(new Metric<>("gauge.foo", 3.7));
 		this.server.waitForMessage();
 		// Doubles are truncated
 		assertThat(this.server.messagesReceived().get(0)).isEqualTo("me.gauge.foo:3.7|g");
@@ -76,7 +76,7 @@ public class StatsdMetricWriterTests {
 
 	@Test
 	public void setTimerMetric() throws Exception {
-		this.writer.set(new Metric<Long>("timer.foo", 37L));
+		this.writer.set(new Metric<>("timer.foo", 37L));
 		this.server.waitForMessage();
 		assertThat(this.server.messagesReceived().get(0)).isEqualTo("me.timer.foo:37|ms");
 	}
@@ -84,7 +84,7 @@ public class StatsdMetricWriterTests {
 	@Test
 	public void nullPrefix() throws Exception {
 		this.writer = new StatsdMetricWriter("localhost", this.port);
-		this.writer.set(new Metric<Long>("gauge.foo", 3L));
+		this.writer.set(new Metric<>("gauge.foo", 3L));
 		this.server.waitForMessage();
 		assertThat(this.server.messagesReceived().get(0)).isEqualTo("gauge.foo:3|g");
 	}
@@ -92,14 +92,14 @@ public class StatsdMetricWriterTests {
 	@Test
 	public void periodPrefix() throws Exception {
 		this.writer = new StatsdMetricWriter("my.", "localhost", this.port);
-		this.writer.set(new Metric<Long>("gauge.foo", 3L));
+		this.writer.set(new Metric<>("gauge.foo", 3L));
 		this.server.waitForMessage();
 		assertThat(this.server.messagesReceived().get(0)).isEqualTo("my.gauge.foo:3|g");
 	}
 
 	private static final class DummyStatsDServer implements Runnable {
 
-		private final List<String> messagesReceived = new ArrayList<String>();
+		private final List<String> messagesReceived = new ArrayList<>();
 
 		private final DatagramSocket server;
 
@@ -142,7 +142,7 @@ public class StatsdMetricWriterTests {
 		}
 
 		public List<String> messagesReceived() {
-			return new ArrayList<String>(this.messagesReceived);
+			return new ArrayList<>(this.messagesReceived);
 		}
 
 	}
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/util/SimpleInMemoryRepositoryTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/util/SimpleInMemoryRepositoryTests.java
index 2c053e0a34..049a606dd4 100755
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/util/SimpleInMemoryRepositoryTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/util/SimpleInMemoryRepositoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -38,7 +38,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  */
 public class SimpleInMemoryRepositoryTests {
 
-	private final SimpleInMemoryRepository<String> repository = new SimpleInMemoryRepository<String>();
+	private final SimpleInMemoryRepository<String> repository = new SimpleInMemoryRepository<>();
 
 	@Test
 	public void setAndGet() {
@@ -88,8 +88,8 @@ public class SimpleInMemoryRepositoryTests {
 
 	@Test
 	public void updateConcurrent() throws Exception {
-		SimpleInMemoryRepository<Integer> repository = new SimpleInMemoryRepository<Integer>();
-		Collection<Callable<Boolean>> tasks = new ArrayList<Callable<Boolean>>();
+		SimpleInMemoryRepository<Integer> repository = new SimpleInMemoryRepository<>();
+		Collection<Callable<Boolean>> tasks = new ArrayList<>();
 		for (int i = 0; i < 1000; i++) {
 			tasks.add(new RepositoryUpdate(repository, 1));
 			tasks.add(new RepositoryUpdate(repository, -1));
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/writer/MessageChannelMetricWriterTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/writer/MessageChannelMetricWriterTests.java
index 2aade006b0..be497c13c5 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/writer/MessageChannelMetricWriterTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/writer/MessageChannelMetricWriterTests.java
@@ -67,14 +67,14 @@ public class MessageChannelMetricWriterTests {
 
 	@Test
 	public void messageSentOnAdd() {
-		this.writer.increment(new Delta<Integer>("foo", 1));
+		this.writer.increment(new Delta<>("foo", 1));
 		verify(this.channel).send(any(Message.class));
 		verify(this.observer).increment(any(Delta.class));
 	}
 
 	@Test
 	public void messageSentOnSet() {
-		this.writer.set(new Metric<Double>("foo", 1d));
+		this.writer.set(new Metric<>("foo", 1d));
 		verify(this.channel).send(any(Message.class));
 		verify(this.observer).set(any(Metric.class));
 	}
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AbstractDependsOnBeanFactoryPostProcessor.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AbstractDependsOnBeanFactoryPostProcessor.java
index 993ebca9b6..8a86fedfb1 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AbstractDependsOnBeanFactoryPostProcessor.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AbstractDependsOnBeanFactoryPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -71,7 +71,7 @@ public abstract class AbstractDependsOnBeanFactoryPostProcessor
 	}
 
 	private Iterable<String> getBeanNames(ListableBeanFactory beanFactory) {
-		Set<String> names = new HashSet<String>();
+		Set<String> names = new HashSet<>();
 		names.addAll(Arrays.asList(BeanFactoryUtils.beanNamesForTypeIncludingAncestors(
 				beanFactory, this.beanClass, true, false)));
 		for (String factoryBeanName : BeanFactoryUtils.beanNamesForTypeIncludingAncestors(
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationImportSelector.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationImportSelector.java
index 1e2b9b1ed9..4b5ebe85d1 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationImportSelector.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationImportSelector.java
@@ -167,7 +167,7 @@ public class AutoConfigurationImportSelector
 
 	private void checkExcludedClasses(List<String> configurations,
 			Set<String> exclusions) {
-		List<String> invalidExcludes = new ArrayList<String>(exclusions.size());
+		List<String> invalidExcludes = new ArrayList<>(exclusions.size());
 		for (String exclusion : exclusions) {
 			if (ClassUtils.isPresent(exclusion, getClass().getClassLoader())
 					&& !configurations.contains(exclusion)) {
@@ -203,7 +203,7 @@ public class AutoConfigurationImportSelector
 	 */
 	protected Set<String> getExclusions(AnnotationMetadata metadata,
 			AnnotationAttributes attributes) {
-		Set<String> excluded = new LinkedHashSet<String>();
+		Set<String> excluded = new LinkedHashSet<>();
 		excluded.addAll(asList(attributes, "exclude"));
 		excluded.addAll(Arrays.asList(attributes.getStringArray("excludeName")));
 		excluded.addAll(getExcludeAutoConfigurationsProperty());
@@ -218,12 +218,12 @@ public class AutoConfigurationImportSelector
 			if (properties.isEmpty()) {
 				return Collections.emptyList();
 			}
-			List<String> excludes = new ArrayList<String>();
+			List<String> excludes = new ArrayList<>();
 			for (Map.Entry<String, Object> entry : properties.entrySet()) {
 				String name = entry.getKey();
 				Object value = entry.getValue();
 				if (name.isEmpty() || name.startsWith("[") && value != null) {
-					excludes.addAll(new HashSet<String>(Arrays.asList(StringUtils
+					excludes.addAll(new HashSet<>(Arrays.asList(StringUtils
 							.tokenizeToStringArray(String.valueOf(value), ","))));
 				}
 			}
@@ -261,7 +261,7 @@ public class AutoConfigurationImportSelector
 		if (!skipped) {
 			return configurations;
 		}
-		List<String> result = new ArrayList<String>(candidates.length);
+		List<String> result = new ArrayList<>(candidates.length);
 		for (int i = 0; i < candidates.length; i++) {
 			if (!skip[i]) {
 				result.add(candidates[i]);
@@ -273,7 +273,7 @@ public class AutoConfigurationImportSelector
 					+ TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startTime)
 					+ " ms");
 		}
-		return new ArrayList<String>(result);
+		return new ArrayList<>(result);
 	}
 
 	protected List<AutoConfigurationImportFilter> getAutoConfigurationImportFilters() {
@@ -293,7 +293,7 @@ public class AutoConfigurationImportSelector
 	}
 
 	protected final <T> List<T> removeDuplicates(List<T> list) {
-		return new ArrayList<T>(new LinkedHashSet<T>(list));
+		return new ArrayList<>(new LinkedHashSet<>(list));
 	}
 
 	protected final List<String> asList(AnnotationAttributes attributes, String name) {
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationPackages.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationPackages.java
index a2557aa823..08215a74dd 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationPackages.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationPackages.java
@@ -113,7 +113,7 @@ public abstract class AutoConfigurationPackages {
 			ConstructorArgumentValues constructorArguments, String[] packageNames) {
 		String[] existing = (String[]) constructorArguments
 				.getIndexedArgumentValue(0, String[].class).getValue();
-		Set<String> merged = new LinkedHashSet<String>();
+		Set<String> merged = new LinkedHashSet<>();
 		merged.addAll(Arrays.asList(existing));
 		merged.addAll(Arrays.asList(packageNames));
 		return merged.toArray(new String[merged.size()]);
@@ -184,7 +184,7 @@ public abstract class AutoConfigurationPackages {
 		private boolean loggedBasePackageInfo;
 
 		BasePackages(String... names) {
-			List<String> packages = new ArrayList<String>();
+			List<String> packages = new ArrayList<>();
 			for (String name : names) {
 				if (StringUtils.hasText(name)) {
 					packages.add(name);
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationSorter.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationSorter.java
index 762f32c174..2842a80419 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationSorter.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/AutoConfigurationSorter.java
@@ -56,7 +56,7 @@ class AutoConfigurationSorter {
 	public List<String> getInPriorityOrder(Collection<String> classNames) {
 		final AutoConfigurationClasses classes = new AutoConfigurationClasses(
 				this.metadataReaderFactory, this.autoConfigurationMetadata, classNames);
-		List<String> orderedClassNames = new ArrayList<String>(classNames);
+		List<String> orderedClassNames = new ArrayList<>(classNames);
 		// Initially sort alphabetically
 		Collections.sort(orderedClassNames);
 		// Then sort by order
@@ -77,13 +77,13 @@ class AutoConfigurationSorter {
 
 	private List<String> sortByAnnotation(AutoConfigurationClasses classes,
 			List<String> classNames) {
-		List<String> toSort = new ArrayList<String>(classNames);
-		Set<String> sorted = new LinkedHashSet<String>();
-		Set<String> processing = new LinkedHashSet<String>();
+		List<String> toSort = new ArrayList<>(classNames);
+		Set<String> sorted = new LinkedHashSet<>();
+		Set<String> processing = new LinkedHashSet<>();
 		while (!toSort.isEmpty()) {
 			doSortByAfterAnnotation(classes, toSort, sorted, processing, null);
 		}
-		return new ArrayList<String>(sorted);
+		return new ArrayList<>(sorted);
 	}
 
 	private void doSortByAfterAnnotation(AutoConfigurationClasses classes,
@@ -106,7 +106,7 @@ class AutoConfigurationSorter {
 
 	private static class AutoConfigurationClasses {
 
-		private final Map<String, AutoConfigurationClass> classes = new HashMap<String, AutoConfigurationClass>();
+		private final Map<String, AutoConfigurationClass> classes = new HashMap<>();
 
 		AutoConfigurationClasses(MetadataReaderFactory metadataReaderFactory,
 				AutoConfigurationMetadata autoConfigurationMetadata,
@@ -122,7 +122,7 @@ class AutoConfigurationSorter {
 		}
 
 		public Set<String> getClassesRequestedAfter(String className) {
-			Set<String> rtn = new LinkedHashSet<String>();
+			Set<String> rtn = new LinkedHashSet<>();
 			rtn.addAll(get(className).getAfter());
 			for (Map.Entry<String, AutoConfigurationClass> entry : this.classes
 					.entrySet()) {
@@ -200,7 +200,7 @@ class AutoConfigurationSorter {
 			if (attributes == null) {
 				return Collections.emptySet();
 			}
-			Set<String> value = new LinkedHashSet<String>();
+			Set<String> value = new LinkedHashSet<>();
 			Collections.addAll(value, (String[]) attributes.get("value"));
 			Collections.addAll(value, (String[]) attributes.get("name"));
 			return value;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationImportSelector.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationImportSelector.java
index 5b9fcac212..859193b6e4 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationImportSelector.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationImportSelector.java
@@ -51,7 +51,7 @@ class ImportAutoConfigurationImportSelector extends AutoConfigurationImportSelec
 	private static final Set<String> ANNOTATION_NAMES;
 
 	static {
-		Set<String> names = new LinkedHashSet<String>();
+		Set<String> names = new LinkedHashSet<>();
 		names.add(ImportAutoConfiguration.class.getName());
 		names.add("org.springframework.boot.autoconfigure.test.ImportAutoConfiguration");
 		ANNOTATION_NAMES = Collections.unmodifiableSet(names);
@@ -59,7 +59,7 @@ class ImportAutoConfigurationImportSelector extends AutoConfigurationImportSelec
 
 	@Override
 	public Set<Object> determineImports(AnnotationMetadata metadata) {
-		Set<String> result = new LinkedHashSet<String>();
+		Set<String> result = new LinkedHashSet<>();
 		result.addAll(getCandidateConfigurations(metadata, null));
 		result.removeAll(getExclusions(metadata, null));
 		return Collections.<Object>unmodifiableSet(result);
@@ -73,7 +73,7 @@ class ImportAutoConfigurationImportSelector extends AutoConfigurationImportSelec
 	@Override
 	protected List<String> getCandidateConfigurations(AnnotationMetadata metadata,
 			AnnotationAttributes attributes) {
-		List<String> candidates = new ArrayList<String>();
+		List<String> candidates = new ArrayList<>();
 		Map<Class<?>, List<Annotation>> annotations = getAnnotations(metadata);
 		for (Map.Entry<Class<?>, List<Annotation>> entry : annotations.entrySet()) {
 			collectCandidateConfigurations(entry.getKey(), entry.getValue(), candidates);
@@ -106,7 +106,7 @@ class ImportAutoConfigurationImportSelector extends AutoConfigurationImportSelec
 	@Override
 	protected Set<String> getExclusions(AnnotationMetadata metadata,
 			AnnotationAttributes attributes) {
-		Set<String> exclusions = new LinkedHashSet<String>();
+		Set<String> exclusions = new LinkedHashSet<>();
 		Class<?> source = ClassUtils.resolveClassName(metadata.getClassName(), null);
 		for (String annotationName : ANNOTATION_NAMES) {
 			AnnotationAttributes merged = AnnotatedElementUtils
@@ -133,7 +133,7 @@ class ImportAutoConfigurationImportSelector extends AutoConfigurationImportSelec
 
 	protected final Map<Class<?>, List<Annotation>> getAnnotations(
 			AnnotationMetadata metadata) {
-		MultiValueMap<Class<?>, Annotation> annotations = new LinkedMultiValueMap<Class<?>, Annotation>();
+		MultiValueMap<Class<?>, Annotation> annotations = new LinkedMultiValueMap<>();
 		Class<?> source = ClassUtils.resolveClassName(metadata.getClassName(), null);
 		collectAnnotations(source, annotations, new HashSet<Class<?>>());
 		return Collections.unmodifiableMap(annotations);
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java
index 8b0ca0d794..6a9a4a7abf 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java
@@ -166,7 +166,7 @@ public class RabbitProperties {
 		if (CollectionUtils.isEmpty(this.parsedAddresses)) {
 			return this.host + ":" + this.port;
 		}
-		List<String> addressStrings = new ArrayList<String>();
+		List<String> addressStrings = new ArrayList<>();
 		for (Address parsedAddress : this.parsedAddresses) {
 			addressStrings.add(parsedAddress.host + ":" + parsedAddress.port);
 		}
@@ -179,7 +179,7 @@ public class RabbitProperties {
 	}
 
 	private List<Address> parseAddresses(String addresses) {
-		List<Address> parsedAddresses = new ArrayList<Address>();
+		List<Address> parsedAddresses = new ArrayList<>();
 		for (String address : StringUtils.commaDelimitedListToStringArray(addresses)) {
 			parsedAddresses.add(new Address(address));
 		}
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobExecutionExitCodeGenerator.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobExecutionExitCodeGenerator.java
index 074b8a4825..ae3d41bb57 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobExecutionExitCodeGenerator.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobExecutionExitCodeGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2013 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -31,7 +31,7 @@ import org.springframework.context.ApplicationListener;
 public class JobExecutionExitCodeGenerator
 		implements ApplicationListener<JobExecutionEvent>, ExitCodeGenerator {
 
-	private final List<JobExecution> executions = new ArrayList<JobExecution>();
+	private final List<JobExecution> executions = new ArrayList<>();
 
 	@Override
 	public void onApplicationEvent(JobExecutionEvent event) {
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobLauncherCommandLineRunner.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobLauncherCommandLineRunner.java
index ec6c78e551..a0ce641562 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobLauncherCommandLineRunner.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/JobLauncherCommandLineRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -167,8 +167,7 @@ public class JobLauncherCommandLineRunner
 	}
 
 	private void removeNonIdentifying(Map<String, JobParameter> parameters) {
-		HashMap<String, JobParameter> copy = new HashMap<String, JobParameter>(
-				parameters);
+		HashMap<String, JobParameter> copy = new HashMap<>(parameters);
 		for (Map.Entry<String, JobParameter> parameter : copy.entrySet()) {
 			if (!parameter.getValue().isIdentifying()) {
 				parameters.remove(parameter.getKey());
@@ -178,7 +177,7 @@ public class JobLauncherCommandLineRunner
 
 	private JobParameters merge(JobParameters parameters,
 			Map<String, JobParameter> additionals) {
-		Map<String, JobParameter> merged = new HashMap<String, JobParameter>();
+		Map<String, JobParameter> merged = new HashMap<>();
 		merged.putAll(parameters.getParameters());
 		merged.putAll(additionals);
 		parameters = new JobParameters(merged);
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheConfigurations.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheConfigurations.java
index c9dc7b85e1..bf33c479aa 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheConfigurations.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheConfigurations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -33,7 +33,7 @@ final class CacheConfigurations {
 	private static final Map<CacheType, Class<?>> MAPPINGS;
 
 	static {
-		Map<CacheType, Class<?>> mappings = new HashMap<CacheType, Class<?>>();
+		Map<CacheType, Class<?>> mappings = new HashMap<>();
 		mappings.put(CacheType.GENERIC, GenericCacheConfiguration.class);
 		mappings.put(CacheType.EHCACHE, EhCacheCacheConfiguration.class);
 		mappings.put(CacheType.HAZELCAST, HazelcastCacheConfiguration.class);
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheManagerCustomizers.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheManagerCustomizers.java
index 021f9c79e9..a9b57add7b 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheManagerCustomizers.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheManagerCustomizers.java
@@ -41,8 +41,7 @@ public class CacheManagerCustomizers {
 
 	public CacheManagerCustomizers(
 			List<? extends CacheManagerCustomizer<?>> customizers) {
-		this.customizers = (customizers != null
-				? new ArrayList<CacheManagerCustomizer<?>>(customizers)
+		this.customizers = (customizers != null ? new ArrayList<>(customizers)
 				: Collections.<CacheManagerCustomizer<?>>emptyList());
 	}
 
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheProperties.java
index 6ea9fad142..1d299e70e6 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheProperties.java
@@ -43,7 +43,7 @@ public class CacheProperties {
 	 * Comma-separated list of cache names to create if supported by the underlying cache
 	 * manager. Usually, this disables the ability to create additional caches on-the-fly.
 	 */
-	private List<String> cacheNames = new ArrayList<String>();
+	private List<String> cacheNames = new ArrayList<>();
 
 	private final Caffeine caffeine = new Caffeine();
 
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/JCacheCacheConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/JCacheCacheConfiguration.java
index 582fc358e5..da7d62d095 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/JCacheCacheConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/JCacheCacheConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -132,7 +132,7 @@ class JCacheCacheConfiguration {
 		if (this.defaultCacheConfiguration != null) {
 			return this.defaultCacheConfiguration;
 		}
-		return new MutableConfiguration<Object, Object>();
+		return new MutableConfiguration<>();
 	}
 
 	private void customize(CacheManager cacheManager) {
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/AbstractNestedCondition.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/AbstractNestedCondition.java
index 11be4a5ec4..9fe5b3b9f9 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/AbstractNestedCondition.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/AbstractNestedCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -78,8 +78,8 @@ abstract class AbstractNestedCondition extends SpringBootCondition
 
 		public MemberMatchOutcomes(MemberConditions memberConditions) {
 			this.all = Collections.unmodifiableList(memberConditions.getMatchOutcomes());
-			List<ConditionOutcome> matches = new ArrayList<ConditionOutcome>();
-			List<ConditionOutcome> nonMatches = new ArrayList<ConditionOutcome>();
+			List<ConditionOutcome> matches = new ArrayList<>();
+			List<ConditionOutcome> nonMatches = new ArrayList<>();
 			for (ConditionOutcome outcome : this.all) {
 				(outcome.isMatch() ? matches : nonMatches).add(outcome);
 			}
@@ -119,7 +119,7 @@ abstract class AbstractNestedCondition extends SpringBootCondition
 
 		private Map<AnnotationMetadata, List<Condition>> getMemberConditions(
 				String[] members) {
-			MultiValueMap<AnnotationMetadata, Condition> memberConditions = new LinkedMultiValueMap<AnnotationMetadata, Condition>();
+			MultiValueMap<AnnotationMetadata, Condition> memberConditions = new LinkedMultiValueMap<>();
 			for (String member : members) {
 				AnnotationMetadata metadata = getMetadata(member);
 				for (String[] conditionClasses : getConditionClasses(metadata)) {
@@ -157,7 +157,7 @@ abstract class AbstractNestedCondition extends SpringBootCondition
 		}
 
 		public List<ConditionOutcome> getMatchOutcomes() {
-			List<ConditionOutcome> outcomes = new ArrayList<ConditionOutcome>();
+			List<ConditionOutcome> outcomes = new ArrayList<>();
 			for (Map.Entry<AnnotationMetadata, List<Condition>> entry : this.memberConditions
 					.entrySet()) {
 				AnnotationMetadata metadata = entry.getKey();
@@ -182,7 +182,7 @@ abstract class AbstractNestedCondition extends SpringBootCondition
 				List<Condition> conditions) {
 			this.context = context;
 			this.metadata = metadata;
-			this.outcomes = new ArrayList<ConditionOutcome>(conditions.size());
+			this.outcomes = new ArrayList<>(conditions.size());
 			for (Condition condition : conditions) {
 				this.outcomes.add(getConditionOutcome(metadata, condition));
 			}
@@ -207,8 +207,8 @@ abstract class AbstractNestedCondition extends SpringBootCondition
 				return new ConditionOutcome(outcome.isMatch(),
 						message.because(outcome.getMessage()));
 			}
-			List<ConditionOutcome> match = new ArrayList<ConditionOutcome>();
-			List<ConditionOutcome> nonMatch = new ArrayList<ConditionOutcome>();
+			List<ConditionOutcome> match = new ArrayList<>();
+			List<ConditionOutcome> nonMatch = new ArrayList<>();
 			for (ConditionOutcome outcome : this.outcomes) {
 				(outcome.isMatch() ? match : nonMatch).add(outcome);
 			}
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/AllNestedConditions.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/AllNestedConditions.java
index d430540ab2..d8f6bd4a9c 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/AllNestedConditions.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/AllNestedConditions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -51,7 +51,7 @@ public abstract class AllNestedConditions extends AbstractNestedCondition {
 	@Override
 	protected ConditionOutcome getFinalMatchOutcome(MemberMatchOutcomes memberOutcomes) {
 		boolean match = hasSameSize(memberOutcomes.getMatches(), memberOutcomes.getAll());
-		List<ConditionMessage> messages = new ArrayList<ConditionMessage>();
+		List<ConditionMessage> messages = new ArrayList<>();
 		messages.add(ConditionMessage.forCondition("AllNestedConditions")
 				.because(memberOutcomes.getMatches().size() + " matched "
 						+ memberOutcomes.getNonMatches().size() + " did not"));
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/AnyNestedCondition.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/AnyNestedCondition.java
index eea3462424..7cf9f0d781 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/AnyNestedCondition.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/AnyNestedCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -54,7 +54,7 @@ public abstract class AnyNestedCondition extends AbstractNestedCondition {
 	@Override
 	protected ConditionOutcome getFinalMatchOutcome(MemberMatchOutcomes memberOutcomes) {
 		boolean match = !memberOutcomes.getMatches().isEmpty();
-		List<ConditionMessage> messages = new ArrayList<ConditionMessage>();
+		List<ConditionMessage> messages = new ArrayList<>();
 		messages.add(ConditionMessage.forCondition("AnyNestedCondition")
 				.because(memberOutcomes.getMatches().size() + " matched "
 						+ memberOutcomes.getNonMatches().size() + " did not"));
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/BeanTypeRegistry.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/BeanTypeRegistry.java
index 5dcecbe977..b750d162fb 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/BeanTypeRegistry.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/BeanTypeRegistry.java
@@ -74,7 +74,7 @@ final class BeanTypeRegistry implements SmartInitializingSingleton {
 
 	private final DefaultListableBeanFactory beanFactory;
 
-	private final Map<String, Class<?>> beanTypes = new HashMap<String, Class<?>>();
+	private final Map<String, Class<?>> beanTypes = new HashMap<>();
 
 	private int lastBeanDefinitionCount = 0;
 
@@ -112,7 +112,7 @@ final class BeanTypeRegistry implements SmartInitializingSingleton {
 	 */
 	Set<String> getNamesForType(Class<?> type) {
 		updateTypesIfNecessary();
-		Set<String> matches = new LinkedHashSet<String>();
+		Set<String> matches = new LinkedHashSet<>();
 		for (Map.Entry<String, Class<?>> entry : this.beanTypes.entrySet()) {
 			if (entry.getValue() != null && type.isAssignableFrom(entry.getValue())) {
 				matches.add(entry.getKey());
@@ -132,7 +132,7 @@ final class BeanTypeRegistry implements SmartInitializingSingleton {
 	 */
 	Set<String> getNamesForAnnotation(Class<? extends Annotation> annotation) {
 		updateTypesIfNecessary();
-		Set<String> matches = new LinkedHashSet<String>();
+		Set<String> matches = new LinkedHashSet<>();
 		for (Map.Entry<String, Class<?>> entry : this.beanTypes.entrySet()) {
 			if (entry.getValue() != null && AnnotationUtils
 					.findAnnotation(entry.getValue(), annotation) != null) {
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReport.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReport.java
index 05ab9e995a..9790f9fd3a 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReport.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -51,7 +51,7 @@ public final class ConditionEvaluationReport {
 
 	private static final AncestorsMatchedCondition ANCESTOR_CONDITION = new AncestorsMatchedCondition();
 
-	private final SortedMap<String, ConditionAndOutcomes> outcomes = new TreeMap<String, ConditionAndOutcomes>();
+	private final SortedMap<String, ConditionAndOutcomes> outcomes = new TreeMap<>();
 
 	private boolean addedAncestorOutcomes;
 
@@ -59,7 +59,7 @@ public final class ConditionEvaluationReport {
 
 	private List<String> exclusions = Collections.emptyList();
 
-	private Set<String> unconditionalClasses = new HashSet<String>();
+	private Set<String> unconditionalClasses = new HashSet<>();
 
 	/**
 	 * Private constructor.
@@ -93,7 +93,7 @@ public final class ConditionEvaluationReport {
 	 */
 	public void recordExclusions(Collection<String> exclusions) {
 		Assert.notNull(exclusions, "exclusions must not be null");
-		this.exclusions = new ArrayList<String>(exclusions);
+		this.exclusions = new ArrayList<>(exclusions);
 	}
 
 	/**
@@ -103,7 +103,7 @@ public final class ConditionEvaluationReport {
 	 */
 	public void recordEvaluationCandidates(List<String> evaluationCandidates) {
 		Assert.notNull(evaluationCandidates, "evaluationCandidates must not be null");
-		this.unconditionalClasses = new HashSet<String>(evaluationCandidates);
+		this.unconditionalClasses = new HashSet<>(evaluationCandidates);
 	}
 
 	/**
@@ -193,7 +193,7 @@ public final class ConditionEvaluationReport {
 	 */
 	public static class ConditionAndOutcomes implements Iterable<ConditionAndOutcome> {
 
-		private final Set<ConditionAndOutcome> outcomes = new LinkedHashSet<ConditionAndOutcome>();
+		private final Set<ConditionAndOutcome> outcomes = new LinkedHashSet<>();
 
 		public void add(Condition condition, ConditionOutcome outcome) {
 			this.outcomes.add(new ConditionAndOutcome(condition, outcome));
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionMessage.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionMessage.java
index 53e03ed134..e9919e4f53 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionMessage.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionMessage.java
@@ -421,7 +421,7 @@ public final class ConditionMessage {
 		};
 
 		public Collection<?> applyTo(Collection<?> items) {
-			List<Object> result = new ArrayList<Object>();
+			List<Object> result = new ArrayList<>();
 			for (Object item : items) {
 				result.add(applyToItem(item));
 			}
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/NoneNestedConditions.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/NoneNestedConditions.java
index 9bbe3f5f50..b6ebdfdb55 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/NoneNestedConditions.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/NoneNestedConditions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -51,7 +51,7 @@ public abstract class NoneNestedConditions extends AbstractNestedCondition {
 	@Override
 	protected ConditionOutcome getFinalMatchOutcome(MemberMatchOutcomes memberOutcomes) {
 		boolean match = memberOutcomes.getMatches().isEmpty();
-		List<ConditionMessage> messages = new ArrayList<ConditionMessage>();
+		List<ConditionMessage> messages = new ArrayList<>();
 		messages.add(ConditionMessage.forCondition("NoneNestedConditions")
 				.because(memberOutcomes.getMatches().size() + " matched "
 						+ memberOutcomes.getNonMatches().size() + " did not"));
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java
index 28d2d886cd..b03dd47d06 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java
@@ -230,7 +230,7 @@ class OnBeanCondition extends SpringBootCondition implements ConfigurationCondit
 	private List<String> getNamesOfBeansIgnoredByType(List<String> ignoredTypes,
 			ListableBeanFactory beanFactory, ConditionContext context,
 			boolean considerHierarchy) {
-		List<String> beanNames = new ArrayList<String>();
+		List<String> beanNames = new ArrayList<>();
 		for (String ignoredType : ignoredTypes) {
 			beanNames.addAll(getBeanNamesForType(beanFactory, ignoredType,
 					context.getClassLoader(), considerHierarchy));
@@ -250,7 +250,7 @@ class OnBeanCondition extends SpringBootCondition implements ConfigurationCondit
 			String type, ClassLoader classLoader, boolean considerHierarchy)
 					throws LinkageError {
 		try {
-			Set<String> result = new LinkedHashSet<String>();
+			Set<String> result = new LinkedHashSet<>();
 			collectBeanNamesForType(result, beanFactory,
 					ClassUtils.forName(type, classLoader), considerHierarchy);
 			return result;
@@ -279,7 +279,7 @@ class OnBeanCondition extends SpringBootCondition implements ConfigurationCondit
 	private String[] getBeanNamesForAnnotation(
 			ConfigurableListableBeanFactory beanFactory, String type,
 			ClassLoader classLoader, boolean considerHierarchy) throws LinkageError {
-		Set<String> names = new HashSet<String>();
+		Set<String> names = new HashSet<>();
 		try {
 			@SuppressWarnings("unchecked")
 			Class<? extends Annotation> annotationType = (Class<? extends Annotation>) ClassUtils
@@ -318,7 +318,7 @@ class OnBeanCondition extends SpringBootCondition implements ConfigurationCondit
 
 	private List<String> getPrimaryBeans(ConfigurableListableBeanFactory beanFactory,
 			Set<String> beanNames, boolean considerHierarchy) {
-		List<String> primaryBeans = new ArrayList<String>();
+		List<String> primaryBeans = new ArrayList<>();
 		for (String beanName : beanNames) {
 			BeanDefinition beanDefinition = findBeanDefinition(beanFactory, beanName,
 					considerHierarchy);
@@ -347,13 +347,13 @@ class OnBeanCondition extends SpringBootCondition implements ConfigurationCondit
 
 		private final Class<?> annotationType;
 
-		private final List<String> names = new ArrayList<String>();
+		private final List<String> names = new ArrayList<>();
 
-		private final List<String> types = new ArrayList<String>();
+		private final List<String> types = new ArrayList<>();
 
-		private final List<String> annotations = new ArrayList<String>();
+		private final List<String> annotations = new ArrayList<>();
 
-		private final List<String> ignoredTypes = new ArrayList<String>();
+		private final List<String> ignoredTypes = new ArrayList<>();
 
 		private final SearchStrategy strategy;
 
@@ -523,19 +523,19 @@ class OnBeanCondition extends SpringBootCondition implements ConfigurationCondit
 
 	static final class MatchResult {
 
-		private final Map<String, Collection<String>> matchedAnnotations = new HashMap<String, Collection<String>>();
+		private final Map<String, Collection<String>> matchedAnnotations = new HashMap<>();
 
-		private final List<String> matchedNames = new ArrayList<String>();
+		private final List<String> matchedNames = new ArrayList<>();
 
-		private final Map<String, Collection<String>> matchedTypes = new HashMap<String, Collection<String>>();
+		private final Map<String, Collection<String>> matchedTypes = new HashMap<>();
 
-		private final List<String> unmatchedAnnotations = new ArrayList<String>();
+		private final List<String> unmatchedAnnotations = new ArrayList<>();
 
-		private final List<String> unmatchedNames = new ArrayList<String>();
+		private final List<String> unmatchedNames = new ArrayList<>();
 
-		private final List<String> unmatchedTypes = new ArrayList<String>();
+		private final List<String> unmatchedTypes = new ArrayList<>();
 
-		private final Set<String> namesOfAllMatches = new HashSet<String>();
+		private final Set<String> namesOfAllMatches = new HashSet<>();
 
 		private void recordMatchedName(String name) {
 			this.matchedNames.add(name);
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnClassCondition.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnClassCondition.java
index c97cf6757c..e1a750765c 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnClassCondition.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnClassCondition.java
@@ -179,7 +179,7 @@ class OnClassCondition extends SpringBootCondition
 			Class<?> annotationType) {
 		MultiValueMap<String, Object> attributes = metadata
 				.getAllAnnotationAttributes(annotationType.getName(), true);
-		List<String> candidates = new ArrayList<String>();
+		List<String> candidates = new ArrayList<>();
 		if (attributes == null) {
 			return Collections.emptyList();
 		}
@@ -198,7 +198,7 @@ class OnClassCondition extends SpringBootCondition
 
 	private List<String> getMatches(Collection<String> candidates, MatchType matchType,
 			ClassLoader classLoader) {
-		List<String> matches = new ArrayList<String>(candidates.size());
+		List<String> matches = new ArrayList<>(candidates.size());
 		for (String candidate : candidates) {
 			if (matchType.matches(candidate, classLoader)) {
 				matches.add(candidate);
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnPropertyCondition.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnPropertyCondition.java
index e2d5176334..d5b8ace68e 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnPropertyCondition.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnPropertyCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -54,8 +54,8 @@ class OnPropertyCondition extends SpringBootCondition {
 		List<AnnotationAttributes> allAnnotationAttributes = annotationAttributesFromMultiValueMap(
 				metadata.getAllAnnotationAttributes(
 						ConditionalOnProperty.class.getName()));
-		List<ConditionMessage> noMatch = new ArrayList<ConditionMessage>();
-		List<ConditionMessage> match = new ArrayList<ConditionMessage>();
+		List<ConditionMessage> noMatch = new ArrayList<>();
+		List<ConditionMessage> match = new ArrayList<>();
 		for (AnnotationAttributes annotationAttributes : allAnnotationAttributes) {
 			ConditionOutcome outcome = determineOutcome(annotationAttributes,
 					context.getEnvironment());
@@ -69,7 +69,7 @@ class OnPropertyCondition extends SpringBootCondition {
 
 	private List<AnnotationAttributes> annotationAttributesFromMultiValueMap(
 			MultiValueMap<String, Object> multiValueMap) {
-		List<Map<String, Object>> maps = new ArrayList<Map<String, Object>>();
+		List<Map<String, Object>> maps = new ArrayList<>();
 		for (Entry<String, List<Object>> entry : multiValueMap.entrySet()) {
 			for (int i = 0; i < entry.getValue().size(); i++) {
 				Map<String, Object> map;
@@ -77,14 +77,13 @@ class OnPropertyCondition extends SpringBootCondition {
 					map = maps.get(i);
 				}
 				else {
-					map = new HashMap<String, Object>();
+					map = new HashMap<>();
 					maps.add(map);
 				}
 				map.put(entry.getKey(), entry.getValue().get(i));
 			}
 		}
-		List<AnnotationAttributes> annotationAttributes = new ArrayList<AnnotationAttributes>(
-				maps.size());
+		List<AnnotationAttributes> annotationAttributes = new ArrayList<>(maps.size());
 		for (Map<String, Object> map : maps) {
 			annotationAttributes.add(AnnotationAttributes.fromMap(map));
 		}
@@ -94,8 +93,8 @@ class OnPropertyCondition extends SpringBootCondition {
 	private ConditionOutcome determineOutcome(AnnotationAttributes annotationAttributes,
 			PropertyResolver resolver) {
 		Spec spec = new Spec(annotationAttributes);
-		List<String> missingProperties = new ArrayList<String>();
-		List<String> nonMatchingProperties = new ArrayList<String>();
+		List<String> missingProperties = new ArrayList<>();
+		List<String> nonMatchingProperties = new ArrayList<>();
 		spec.collectProperties(resolver, missingProperties, nonMatchingProperties);
 		if (!missingProperties.isEmpty()) {
 			return ConditionOutcome.noMatch(
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnResourceCondition.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnResourceCondition.java
index b36627dd1b..3c54c1dc55 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnResourceCondition.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnResourceCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -48,12 +48,12 @@ class OnResourceCondition extends SpringBootCondition {
 				.getAllAnnotationAttributes(ConditionalOnResource.class.getName(), true);
 		ResourceLoader loader = context.getResourceLoader() == null
 				? this.defaultResourceLoader : context.getResourceLoader();
-		List<String> locations = new ArrayList<String>();
+		List<String> locations = new ArrayList<>();
 		collectValues(locations, attributes.get("resources"));
 		Assert.isTrue(!locations.isEmpty(),
 				"@ConditionalOnResource annotations must specify at "
 						+ "least one resource location");
-		List<String> missing = new ArrayList<String>();
+		List<String> missing = new ArrayList<>();
 		for (String location : locations) {
 			String resource = context.getEnvironment().resolvePlaceholders(location);
 			if (!loader.getResource(resource).exists()) {
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ResourceCondition.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ResourceCondition.java
index d98280872f..ee8c5324c5 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ResourceCondition.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ResourceCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -81,7 +81,7 @@ public abstract class ResourceCondition extends SpringBootCondition {
 	 */
 	protected ConditionOutcome getResourceOutcome(ConditionContext context,
 			AnnotatedTypeMetadata metadata) {
-		List<String> found = new ArrayList<String>();
+		List<String> found = new ArrayList<>();
 		for (String location : this.resourceLocations) {
 			Resource resource = context.getResourceLoader().getResource(location);
 			if (resource != null && resource.exists()) {
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfiguration.java
index 5b292d6b8f..61d05ccdc5 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfiguration.java
@@ -147,7 +147,7 @@ public class MessageSourceAutoConfiguration {
 
 	protected static class ResourceBundleCondition extends SpringBootCondition {
 
-		private static ConcurrentReferenceHashMap<String, ConditionOutcome> cache = new ConcurrentReferenceHashMap<String, ConditionOutcome>();
+		private static ConcurrentReferenceHashMap<String, ConditionOutcome> cache = new ConcurrentReferenceHashMap<>();
 
 		@Override
 		public ConditionOutcome getMatchOutcome(ConditionContext context,
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/OnBootstrapHostsCondition.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/OnBootstrapHostsCondition.java
index b78cc05fdb..0fcc190a37 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/OnBootstrapHostsCondition.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/OnBootstrapHostsCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -66,7 +66,7 @@ class OnBootstrapHostsCondition extends SpringBootCondition {
 
 		PropertyResolver(PropertySources propertySources, String prefix) {
 			this.prefix = prefix;
-			this.content = new HashMap<String, Object>();
+			this.content = new HashMap<>();
 			DataBinder binder = new RelaxedDataBinder(this.content, this.prefix);
 			binder.bind(new PropertySourcesPropertyValues(propertySources));
 		}
@@ -78,7 +78,7 @@ class OnBootstrapHostsCondition extends SpringBootCondition {
 				for (String relaxedKey : keys) {
 					String key = prefix + relaxedKey;
 					if (this.content.containsKey(relaxedKey)) {
-						return new AbstractMap.SimpleEntry<String, Object>(key,
+						return new AbstractMap.SimpleEntry<>(key,
 								this.content.get(relaxedKey));
 					}
 				}
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchAutoConfiguration.java
index c35f3a75ac..d7f953ba1a 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchAutoConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -59,7 +59,7 @@ public class ElasticsearchAutoConfiguration implements DisposableBean {
 	private static final Map<String, String> DEFAULTS;
 
 	static {
-		Map<String, String> defaults = new LinkedHashMap<String, String>();
+		Map<String, String> defaults = new LinkedHashMap<>();
 		defaults.put("http.enabled", String.valueOf(false));
 		defaults.put("node.local", String.valueOf(true));
 		defaults.put("path.home", System.getProperty("user.dir"));
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchProperties.java
index ea5a6b291a..a9436e75b5 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -45,7 +45,7 @@ public class ElasticsearchProperties {
 	/**
 	 * Additional properties used to configure the client.
 	 */
-	private Map<String, String> properties = new HashMap<String, String>();
+	private Map<String, String> properties = new HashMap<>();
 
 	public String getClusterName() {
 		return this.clusterName;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfiguration.java
index 909a81cdd3..b9882aaafd 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -178,7 +178,7 @@ public class RedisAutoConfiguration {
 		}
 
 		private List<RedisNode> createSentinels(Sentinel sentinel) {
-			List<RedisNode> nodes = new ArrayList<RedisNode>();
+			List<RedisNode> nodes = new ArrayList<>();
 			for (String node : StringUtils
 					.commaDelimitedListToStringArray(sentinel.getNodes())) {
 				try {
@@ -230,7 +230,7 @@ public class RedisAutoConfiguration {
 		public RedisTemplate<Object, Object> redisTemplate(
 				RedisConnectionFactory redisConnectionFactory)
 						throws UnknownHostException {
-			RedisTemplate<Object, Object> template = new RedisTemplate<Object, Object>();
+			RedisTemplate<Object, Object> template = new RedisTemplate<>();
 			template.setConnectionFactory(redisConnectionFactory);
 			return template;
 		}
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/diagnostics/analyzer/NoSuchBeanDefinitionFailureAnalyzer.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/diagnostics/analyzer/NoSuchBeanDefinitionFailureAnalyzer.java
index 68f8444b5e..2847602cd9 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/diagnostics/analyzer/NoSuchBeanDefinitionFailureAnalyzer.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/diagnostics/analyzer/NoSuchBeanDefinitionFailureAnalyzer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -116,7 +116,7 @@ class NoSuchBeanDefinitionFailureAnalyzer
 
 	private List<AutoConfigurationResult> getAutoConfigurationResults(
 			NoSuchBeanDefinitionException cause) {
-		List<AutoConfigurationResult> results = new ArrayList<AutoConfigurationResult>();
+		List<AutoConfigurationResult> results = new ArrayList<>();
 		collectReportedConditionOutcomes(cause, results);
 		collectExcludedAutoConfiguration(cause, results);
 		return results;
@@ -197,7 +197,7 @@ class NoSuchBeanDefinitionFailureAnalyzer
 						.getMetadataReader(source.getClassName());
 				Set<MethodMetadata> candidates = classMetadata.getAnnotationMetadata()
 						.getAnnotatedMethods(Bean.class.getName());
-				List<MethodMetadata> result = new ArrayList<MethodMetadata>();
+				List<MethodMetadata> result = new ArrayList<>();
 				for (MethodMetadata candidate : candidates) {
 					if (isMatch(candidate, source, cause)) {
 						result.add(candidate);
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/domain/EntityScanPackages.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/domain/EntityScanPackages.java
index 9c652a1513..f520724017 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/domain/EntityScanPackages.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/domain/EntityScanPackages.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -57,7 +57,7 @@ public class EntityScanPackages {
 	private final List<String> packageNames;
 
 	EntityScanPackages(String... packageNames) {
-		List<String> packages = new ArrayList<String>();
+		List<String> packages = new ArrayList<>();
 		for (String name : packageNames) {
 			if (StringUtils.hasText(name)) {
 				packages.add(name);
@@ -133,7 +133,7 @@ public class EntityScanPackages {
 			Collection<String> packageNames) {
 		String[] existing = (String[]) constructorArguments
 				.getIndexedArgumentValue(0, String[].class).getValue();
-		Set<String> merged = new LinkedHashSet<String>();
+		Set<String> merged = new LinkedHashSet<>();
 		merged.addAll(Arrays.asList(existing));
 		merged.addAll(packageNames);
 		return merged.toArray(new String[merged.size()]);
@@ -158,7 +158,7 @@ public class EntityScanPackages {
 			String[] basePackages = attributes.getStringArray("basePackages");
 			Class<?>[] basePackageClasses = attributes
 					.getClassArray("basePackageClasses");
-			Set<String> packagesToScan = new LinkedHashSet<String>();
+			Set<String> packagesToScan = new LinkedHashSet<>();
 			packagesToScan.addAll(Arrays.asList(basePackages));
 			for (Class<?> basePackageClass : basePackageClasses) {
 				packagesToScan.add(ClassUtils.getPackageName(basePackageClass));
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/domain/EntityScanner.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/domain/EntityScanner.java
index dc1a25ecd1..e23afb80b8 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/domain/EntityScanner.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/domain/EntityScanner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -64,7 +64,7 @@ public class EntityScanner {
 		if (packages.isEmpty()) {
 			return Collections.<Class<?>>emptySet();
 		}
-		Set<Class<?>> entitySet = new HashSet<Class<?>>();
+		Set<Class<?>> entitySet = new HashSet<>();
 		ClassPathScanningCandidateComponentProvider scanner = new ClassPathScanningCandidateComponentProvider(
 				false);
 		scanner.setEnvironment(this.context.getEnvironment());
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java
index c5397983be..7ba7a08271 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java
@@ -239,7 +239,7 @@ public class FlywayAutoConfiguration {
 		private static final Set<ConvertiblePair> CONVERTIBLE_TYPES;
 
 		static {
-			Set<ConvertiblePair> types = new HashSet<ConvertiblePair>(2);
+			Set<ConvertiblePair> types = new HashSet<>(2);
 			types.add(new ConvertiblePair(String.class, MigrationVersion.class));
 			types.add(new ConvertiblePair(Number.class, MigrationVersion.class));
 			CONVERTIBLE_TYPES = Collections.unmodifiableSet(types);
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java
index f2ca140b13..9795d28fb5 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java
@@ -40,7 +40,7 @@ public class FlywayProperties {
 	 * Locations of migrations scripts. Can contain the special "{vendor}" placeholder to
 	 * use vendor-specific locations.
 	 */
-	private List<String> locations = new ArrayList<String>(
+	private List<String> locations = new ArrayList<>(
 			Collections.singletonList("db/migration"));
 
 	/**
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfiguration.java
index de69eb6137..029c911258 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfiguration.java
@@ -81,7 +81,7 @@ public class FreeMarkerAutoConfiguration {
 	public void checkTemplateLocationExists() {
 		if (this.properties.isCheckTemplateLocation()) {
 			TemplateLocation templatePathLocation = null;
-			List<TemplateLocation> locations = new ArrayList<TemplateLocation>();
+			List<TemplateLocation> locations = new ArrayList<>();
 			for (String templateLoaderPath : this.properties.getTemplateLoaderPath()) {
 				TemplateLocation location = new TemplateLocation(templateLoaderPath);
 				locations.add(location);
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerProperties.java
index 2eec98d39f..e99c376ec9 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -41,7 +41,7 @@ public class FreeMarkerProperties extends AbstractTemplateViewResolverProperties
 	/**
 	 * Well-known FreeMarker keys which will be passed to FreeMarker's Configuration.
 	 */
-	private Map<String, String> settings = new HashMap<String, String>();
+	private Map<String, String> settings = new HashMap<>();
 
 	/**
 	 * Comma-separated list of template paths.
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/h2/H2ConsoleAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/h2/H2ConsoleAutoConfiguration.java
index 4c121088a5..4a3cb9dd92 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/h2/H2ConsoleAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/h2/H2ConsoleAutoConfiguration.java
@@ -64,7 +64,7 @@ public class H2ConsoleAutoConfiguration {
 	public ServletRegistrationBean<WebServlet> h2Console() {
 		String path = this.properties.getPath();
 		String urlMapping = (path.endsWith("/") ? path + "*" : path + "/*");
-		ServletRegistrationBean<WebServlet> registration = new ServletRegistrationBean<WebServlet>(
+		ServletRegistrationBean<WebServlet> registration = new ServletRegistrationBean<>(
 				new WebServlet(), urlMapping);
 		H2ConsoleProperties.Settings settings = this.properties.getSettings();
 		if (settings.isTrace()) {
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HypermediaHttpMessageConverterConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HypermediaHttpMessageConverterConfiguration.java
index 2b61ee36bd..1a4536e67d 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HypermediaHttpMessageConverterConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HypermediaHttpMessageConverterConfiguration.java
@@ -81,7 +81,7 @@ public class HypermediaHttpMessageConverterConfiguration {
 
 		private void configureHttpMessageConverter(HttpMessageConverter<?> converter) {
 			if (converter instanceof TypeConstrainedMappingJackson2HttpMessageConverter) {
-				List<MediaType> supportedMediaTypes = new ArrayList<MediaType>(
+				List<MediaType> supportedMediaTypes = new ArrayList<>(
 						converter.getSupportedMediaTypes());
 				if (!supportedMediaTypes.contains(MediaType.APPLICATION_JSON)) {
 					supportedMediaTypes.add(MediaType.APPLICATION_JSON);
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonProperties.java
index 1ea0047f90..894cf077e6 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jackson/JacksonProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -63,27 +63,27 @@ public class JacksonProperties {
 	/**
 	 * Jackson on/off features that affect the way Java objects are serialized.
 	 */
-	private Map<SerializationFeature, Boolean> serialization = new HashMap<SerializationFeature, Boolean>();
+	private Map<SerializationFeature, Boolean> serialization = new HashMap<>();
 
 	/**
 	 * Jackson on/off features that affect the way Java objects are deserialized.
 	 */
-	private Map<DeserializationFeature, Boolean> deserialization = new HashMap<DeserializationFeature, Boolean>();
+	private Map<DeserializationFeature, Boolean> deserialization = new HashMap<>();
 
 	/**
 	 * Jackson general purpose on/off features.
 	 */
-	private Map<MapperFeature, Boolean> mapper = new HashMap<MapperFeature, Boolean>();
+	private Map<MapperFeature, Boolean> mapper = new HashMap<>();
 
 	/**
 	 * Jackson on/off features for parsers.
 	 */
-	private Map<JsonParser.Feature, Boolean> parser = new HashMap<JsonParser.Feature, Boolean>();
+	private Map<JsonParser.Feature, Boolean> parser = new HashMap<>();
 
 	/**
 	 * Jackson on/off features for generators.
 	 */
-	private Map<JsonGenerator.Feature, Boolean> generator = new HashMap<JsonGenerator.Feature, Boolean>();
+	private Map<JsonGenerator.Feature, Boolean> generator = new HashMap<>();
 
 	/**
 	 * Controls the inclusion of properties during serialization. Configured with one of
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceBuilder.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceBuilder.java
index 3c65908125..8419d95c03 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceBuilder.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -50,7 +50,7 @@ public class DataSourceBuilder {
 
 	private ClassLoader classLoader;
 
-	private Map<String, String> properties = new HashMap<String, String>();
+	private Map<String, String> properties = new HashMap<>();
 
 	public static DataSourceBuilder create() {
 		return new DataSourceBuilder(null);
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java
index 16e0debaa2..54e064851b 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializer.java
@@ -134,7 +134,7 @@ class DataSourceInitializer implements ApplicationListener<DataSourceInitialized
 			return getResources(propertyName, resources, true);
 		}
 		String platform = this.properties.getPlatform();
-		List<String> fallbackResources = new ArrayList<String>();
+		List<String> fallbackResources = new ArrayList<>();
 		fallbackResources.add("classpath*:" + fallback + "-" + platform + ".sql");
 		fallbackResources.add("classpath*:" + fallback + ".sql");
 		return getResources(propertyName, fallbackResources, false);
@@ -142,7 +142,7 @@ class DataSourceInitializer implements ApplicationListener<DataSourceInitialized
 
 	private List<Resource> getResources(String propertyName, List<String> locations,
 			boolean validate) {
-		List<Resource> resources = new ArrayList<Resource>();
+		List<Resource> resources = new ArrayList<>();
 		for (String location : locations) {
 			for (Resource resource : doGetResources(location)) {
 				if (resource.exists()) {
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java
index 6b79062f89..f702187a21 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -486,7 +486,7 @@ public class DataSourceProperties
 		/**
 		 * Properties to pass to the XA data source.
 		 */
-		private Map<String, String> properties = new LinkedHashMap<String, String>();
+		private Map<String, String> properties = new LinkedHashMap<>();
 
 		public String getDataSourceClassName() {
 			return this.dataSourceClassName;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/metadata/DataSourcePoolMetadataProviders.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/metadata/DataSourcePoolMetadataProviders.java
index 73164134bf..ad954f23d0 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/metadata/DataSourcePoolMetadataProviders.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/metadata/DataSourcePoolMetadataProviders.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -43,7 +43,7 @@ public class DataSourcePoolMetadataProviders implements DataSourcePoolMetadataPr
 			Collection<? extends DataSourcePoolMetadataProvider> providers) {
 		this.providers = (providers == null
 				? Collections.<DataSourcePoolMetadataProvider>emptyList()
-				: new ArrayList<DataSourcePoolMetadataProvider>(providers));
+				: new ArrayList<>(providers));
 	}
 
 	@Override
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java
index dcfc7c5b62..c1aac2457f 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java
@@ -135,7 +135,7 @@ public class JerseyAutoConfiguration implements ServletContextAware {
 	@Bean
 	@ConditionalOnMissingBean
 	public FilterRegistrationBean<RequestContextFilter> requestContextFilter() {
-		FilterRegistrationBean<RequestContextFilter> registration = new FilterRegistrationBean<RequestContextFilter>();
+		FilterRegistrationBean<RequestContextFilter> registration = new FilterRegistrationBean<>();
 		registration.setFilter(new RequestContextFilter());
 		registration.setOrder(this.jersey.getFilter().getOrder() - 1);
 		registration.setName("requestContextFilter");
@@ -146,7 +146,7 @@ public class JerseyAutoConfiguration implements ServletContextAware {
 	@ConditionalOnMissingBean(name = "jerseyFilterRegistration")
 	@ConditionalOnProperty(prefix = "spring.jersey", name = "type", havingValue = "filter")
 	public FilterRegistrationBean<ServletContainer> jerseyFilterRegistration() {
-		FilterRegistrationBean<ServletContainer> registration = new FilterRegistrationBean<ServletContainer>();
+		FilterRegistrationBean<ServletContainer> registration = new FilterRegistrationBean<>();
 		registration.setFilter(new ServletContainer(this.config));
 		registration.setUrlPatterns(Arrays.asList(this.path));
 		registration.setOrder(this.jersey.getFilter().getOrder());
@@ -169,7 +169,7 @@ public class JerseyAutoConfiguration implements ServletContextAware {
 	@ConditionalOnMissingBean(name = "jerseyServletRegistration")
 	@ConditionalOnProperty(prefix = "spring.jersey", name = "type", havingValue = "servlet", matchIfMissing = true)
 	public ServletRegistrationBean<ServletContainer> jerseyServletRegistration() {
-		ServletRegistrationBean<ServletContainer> registration = new ServletRegistrationBean<ServletContainer>(
+		ServletRegistrationBean<ServletContainer> registration = new ServletRegistrationBean<>(
 				new ServletContainer(this.config), this.path);
 		addInitParameters(registration);
 		registration.setName(getServletRegistrationName());
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyProperties.java
index 331fe6c7b1..4e0462499c 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyProperties.java
@@ -40,7 +40,7 @@ public class JerseyProperties {
 	/**
 	 * Init parameters to pass to Jersey via the servlet or filter.
 	 */
-	private Map<String, String> init = new HashMap<String, String>();
+	private Map<String, String> init = new HashMap<>();
 
 	private final Filter filter = new Filter();
 
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQProperties.java
index 6cd2fa7b1d..12aed79db9 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -169,7 +169,7 @@ public class ActiveMQProperties {
 		 * Comma-separated list of specific packages to trust (when not trusting all
 		 * packages).
 		 */
-		private List<String> trusted = new ArrayList<String>();
+		private List<String> trusted = new ArrayList<>();
 
 		public Boolean getTrustAll() {
 			return this.trustAll;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisConnectionFactoryFactory.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisConnectionFactoryFactory.java
index ef155ef193..8e9d1ead0a 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisConnectionFactoryFactory.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisConnectionFactoryFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -124,7 +124,7 @@ class ArtemisConnectionFactoryFactory {
 
 	private <T extends ActiveMQConnectionFactory> T createNativeConnectionFactory(
 			Class<T> factoryClass) throws Exception {
-		Map<String, Object> params = new HashMap<String, Object>();
+		Map<String, Object> params = new HashMap<>();
 		params.put(TransportConstants.HOST_PROP_NAME, this.properties.getHost());
 		params.put(TransportConstants.PORT_PROP_NAME, this.properties.getPort());
 		TransportConfiguration transportConfiguration = new TransportConfiguration(
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisProperties.java
index 6361809d89..3d16f3a7da 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -218,7 +218,7 @@ public class ArtemisProperties {
 		 * @see TransportConstants#SERVER_ID_PROP_NAME
 		 */
 		public Map<String, Object> generateTransportParameters() {
-			Map<String, Object> parameters = new HashMap<String, Object>();
+			Map<String, Object> parameters = new HashMap<>();
 			parameters.put(TransportConstants.SERVER_ID_PROP_NAME, getServerId());
 			return parameters;
 		}
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jmx/ParentAwareNamingStrategy.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jmx/ParentAwareNamingStrategy.java
index 2dcee99737..3fa765a1e2 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jmx/ParentAwareNamingStrategy.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jmx/ParentAwareNamingStrategy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -60,7 +60,7 @@ public class ParentAwareNamingStrategy extends MetadataNamingStrategy
 	public ObjectName getObjectName(Object managedBean, String beanKey)
 			throws MalformedObjectNameException {
 		ObjectName name = super.getObjectName(managedBean, beanKey);
-		Hashtable<String, String> properties = new Hashtable<String, String>();
+		Hashtable<String, String> properties = new Hashtable<>();
 		properties.putAll(name.getKeyPropertyList());
 		if (this.ensureUniqueRuntimeObjectNames) {
 			properties.put("identity", ObjectUtils.getIdentityHexString(managedBean));
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAnnotationDrivenConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAnnotationDrivenConfiguration.java
index 882119a60f..9abe319be3 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAnnotationDrivenConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAnnotationDrivenConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -54,7 +54,7 @@ class KafkaAnnotationDrivenConfiguration {
 	public ConcurrentKafkaListenerContainerFactory<?, ?> kafkaListenerContainerFactory(
 			ConcurrentKafkaListenerContainerFactoryConfigurer configurer,
 			ConsumerFactory<Object, Object> kafkaConsumerFactory) {
-		ConcurrentKafkaListenerContainerFactory<Object, Object> factory = new ConcurrentKafkaListenerContainerFactory<Object, Object>();
+		ConcurrentKafkaListenerContainerFactory<Object, Object> factory = new ConcurrentKafkaListenerContainerFactory<>();
 		configurer.configure(factory, kafkaConsumerFactory);
 		return factory;
 	}
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfiguration.java
index 92fad05211..be2481c38b 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -54,7 +54,7 @@ public class KafkaAutoConfiguration {
 	public KafkaTemplate<?, ?> kafkaTemplate(
 			ProducerFactory<Object, Object> kafkaProducerFactory,
 			ProducerListener<Object, Object> kafkaProducerListener) {
-		KafkaTemplate<Object, Object> kafkaTemplate = new KafkaTemplate<Object, Object>(
+		KafkaTemplate<Object, Object> kafkaTemplate = new KafkaTemplate<>(
 				kafkaProducerFactory);
 		kafkaTemplate.setProducerListener(kafkaProducerListener);
 		kafkaTemplate.setDefaultTopic(this.properties.getTemplate().getDefaultTopic());
@@ -64,20 +64,20 @@ public class KafkaAutoConfiguration {
 	@Bean
 	@ConditionalOnMissingBean(ProducerListener.class)
 	public ProducerListener<Object, Object> kafkaProducerListener() {
-		return new LoggingProducerListener<Object, Object>();
+		return new LoggingProducerListener<>();
 	}
 
 	@Bean
 	@ConditionalOnMissingBean(ConsumerFactory.class)
 	public ConsumerFactory<?, ?> kafkaConsumerFactory() {
-		return new DefaultKafkaConsumerFactory<Object, Object>(
+		return new DefaultKafkaConsumerFactory<>(
 				this.properties.buildConsumerProperties());
 	}
 
 	@Bean
 	@ConditionalOnMissingBean(ProducerFactory.class)
 	public ProducerFactory<?, ?> kafkaProducerFactory() {
-		return new DefaultKafkaProducerFactory<Object, Object>(
+		return new DefaultKafkaProducerFactory<>(
 				this.properties.buildProducerProperties());
 	}
 
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java
index 356c9fbcd5..239d11344e 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -53,7 +53,7 @@ public class KafkaProperties {
 	 * Comma-delimited list of host:port pairs to use for establishing the initial
 	 * connection to the Kafka cluster.
 	 */
-	private List<String> bootstrapServers = new ArrayList<String>(
+	private List<String> bootstrapServers = new ArrayList<>(
 			Collections.singletonList("localhost:9092"));
 
 	/**
@@ -64,7 +64,7 @@ public class KafkaProperties {
 	/**
 	 * Additional properties used to configure the client.
 	 */
-	private Map<String, String> properties = new HashMap<String, String>();
+	private Map<String, String> properties = new HashMap<>();
 
 	private final Consumer consumer = new Consumer();
 
@@ -121,7 +121,7 @@ public class KafkaProperties {
 	}
 
 	private Map<String, Object> buildCommonProperties() {
-		Map<String, Object> properties = new HashMap<String, Object>();
+		Map<String, Object> properties = new HashMap<>();
 		if (this.bootstrapServers != null) {
 			properties.put(CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG,
 					this.bootstrapServers);
@@ -362,7 +362,7 @@ public class KafkaProperties {
 		}
 
 		public Map<String, Object> buildProperties() {
-			Map<String, Object> properties = new HashMap<String, Object>();
+			Map<String, Object> properties = new HashMap<>();
 			if (this.autoCommitInterval != null) {
 				properties.put(ConsumerConfig.AUTO_COMMIT_INTERVAL_MS_CONFIG,
 						this.autoCommitInterval);
@@ -562,7 +562,7 @@ public class KafkaProperties {
 		}
 
 		public Map<String, Object> buildProperties() {
-			Map<String, Object> properties = new HashMap<String, Object>();
+			Map<String, Object> properties = new HashMap<>();
 			if (this.acks != null) {
 				properties.put(ProducerConfig.ACKS_CONFIG, this.acks);
 			}
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/LdapProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/LdapProperties.java
index c2155866c2..d35611e173 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/LdapProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ldap/LdapProperties.java
@@ -58,7 +58,7 @@ public class LdapProperties {
 	/**
 	 * LDAP specification settings.
 	 */
-	private Map<String, String> baseEnvironment = new HashMap<String, String>();
+	private Map<String, String> baseEnvironment = new HashMap<>();
 
 	public String[] getUrls() {
 		return this.urls;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/ConditionEvaluationReportMessage.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/ConditionEvaluationReportMessage.java
index 9b5aa7939e..1ecb8a922d 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/ConditionEvaluationReportMessage.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/logging/ConditionEvaluationReportMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -94,9 +94,9 @@ public class ConditionEvaluationReportMessage {
 
 	private Map<String, ConditionAndOutcomes> orderByName(
 			Map<String, ConditionAndOutcomes> outcomes) {
-		Map<String, ConditionAndOutcomes> result = new LinkedHashMap<String, ConditionAndOutcomes>();
-		List<String> names = new ArrayList<String>();
-		Map<String, String> classNames = new HashMap<String, String>();
+		Map<String, ConditionAndOutcomes> result = new LinkedHashMap<>();
+		List<String> names = new ArrayList<>();
+		Map<String, String> classNames = new HashMap<>();
 		for (String name : outcomes.keySet()) {
 			String shortName = ClassUtils.getShortName(name);
 			names.add(shortName);
@@ -120,8 +120,8 @@ public class ConditionEvaluationReportMessage {
 	private void addNonMatchLogMessage(StringBuilder message, String source,
 			ConditionAndOutcomes conditionAndOutcomes) {
 		message.append(String.format("%n   %s:%n", source));
-		List<ConditionAndOutcome> matches = new ArrayList<ConditionAndOutcome>();
-		List<ConditionAndOutcome> nonMatches = new ArrayList<ConditionAndOutcome>();
+		List<ConditionAndOutcome> matches = new ArrayList<>();
+		List<ConditionAndOutcome> nonMatches = new ArrayList<>();
 		for (ConditionAndOutcome conditionAndOutcome : conditionAndOutcomes) {
 			if (conditionAndOutcome.getOutcome().isMatch()) {
 				matches.add(conditionAndOutcome);
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailProperties.java
index b8db99c6c7..2947de43e6 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -68,7 +68,7 @@ public class MailProperties {
 	/**
 	 * Additional JavaMail session properties.
 	 */
-	private Map<String, String> properties = new HashMap<String, String>();
+	private Map<String, String> properties = new HashMap<>();
 
 	/**
 	 * Session JNDI name. When set, takes precedence to others mail settings.
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoClientFactory.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoClientFactory.java
index ca72803405..c102d3d411 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoClientFactory.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoClientFactory.java
@@ -98,7 +98,7 @@ public class MongoClientFactory {
 			if (options == null) {
 				options = MongoClientOptions.builder().build();
 			}
-			List<MongoCredential> credentials = new ArrayList<MongoCredential>();
+			List<MongoCredential> credentials = new ArrayList<>();
 			if (hasCustomCredentials()) {
 				String database = this.properties.getAuthenticationDatabase() == null
 						? this.properties.getMongoClientDatabase()
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/ReactiveMongoClientFactory.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/ReactiveMongoClientFactory.java
index 898d6062f8..b929440378 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/ReactiveMongoClientFactory.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/ReactiveMongoClientFactory.java
@@ -99,7 +99,7 @@ public class ReactiveMongoClientFactory {
 
 			Builder builder = builder(settings);
 			if (hasCustomCredentials()) {
-				List<MongoCredential> credentials = new ArrayList<MongoCredential>();
+				List<MongoCredential> credentials = new ArrayList<>();
 				String database = this.properties.getAuthenticationDatabase() == null
 						? this.properties.getMongoClientDatabase()
 						: this.properties.getAuthenticationDatabase();
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoProperties.java
index 9b6c1fd4b2..c20e42bfef 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -44,7 +44,7 @@ public class EmbeddedMongoProperties {
 	/**
 	 * Comma-separated list of features to enable.
 	 */
-	private Set<Feature> features = new HashSet<Feature>(
+	private Set<Feature> features = new HashSet<>(
 			Collections.singletonList(Feature.SYNC_DELAY));
 
 	public String getVersion() {
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheEnvironmentCollector.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheEnvironmentCollector.java
index ec4e9d4fd3..e99691dcca 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheEnvironmentCollector.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheEnvironmentCollector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -50,7 +50,7 @@ public class MustacheEnvironmentCollector extends DefaultCollector
 	@Override
 	public void setEnvironment(Environment environment) {
 		this.environment = (ConfigurableEnvironment) environment;
-		this.target = new HashMap<String, Object>();
+		this.target = new HashMap<>();
 		new RelaxedDataBinder(this.target).bind(
 				new PropertySourcesPropertyValues(this.environment.getPropertySources()));
 		this.propertyResolver = new RelaxedPropertyResolver(environment);
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/DatabaseLookup.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/DatabaseLookup.java
index 390c4f04ab..da593f8916 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/DatabaseLookup.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/DatabaseLookup.java
@@ -43,7 +43,7 @@ final class DatabaseLookup {
 	private static final Map<DatabaseDriver, Database> LOOKUP;
 
 	static {
-		Map<DatabaseDriver, Database> map = new HashMap<DatabaseDriver, Database>();
+		Map<DatabaseDriver, Database> map = new HashMap<>();
 		map.put(DatabaseDriver.DERBY, Database.DERBY);
 		map.put(DatabaseDriver.H2, Database.H2);
 		map.put(DatabaseDriver.HSQLDB, Database.HSQL);
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java
index 80204020a7..b8151e7d88 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -102,7 +102,7 @@ public class HibernateJpaAutoConfiguration extends JpaBaseConfiguration {
 
 	@Override
 	protected Map<String, Object> getVendorProperties() {
-		Map<String, Object> vendorProperties = new LinkedHashMap<String, Object>();
+		Map<String, Object> vendorProperties = new LinkedHashMap<>();
 		vendorProperties.putAll(getProperties().getHibernateProperties(getDataSource()));
 		return vendorProperties;
 	}
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaProperties.java
index 0921c6c73d..2368092ceb 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaProperties.java
@@ -42,7 +42,7 @@ public class JpaProperties {
 	/**
 	 * Additional native properties to set on the JPA provider.
 	 */
-	private Map<String, String> properties = new HashMap<String, String>();
+	private Map<String, String> properties = new HashMap<>();
 
 	/**
 	 * Name of the target database to operate on, auto-detected by default. Can be
@@ -183,7 +183,7 @@ public class JpaProperties {
 
 		private Map<String, String> getAdditionalProperties(Map<String, String> existing,
 				DataSource dataSource) {
-			Map<String, String> result = new HashMap<String, String>(existing);
+			Map<String, String> result = new HashMap<>(existing);
 			applyNewIdGeneratorMappings(result);
 			getNaming().applyNamingStrategies(result);
 			String ddlAuto = getOrDeduceDdlAuto(existing, dataSource);
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/AuthenticationManagerConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/AuthenticationManagerConfiguration.java
index 0119557bb9..a718d695ff 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/AuthenticationManagerConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/AuthenticationManagerConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -173,7 +173,7 @@ public class AuthenticationManagerConfiguration {
 				logger.info(String.format("%n%nUsing default security password: %s%n",
 						user.getPassword()));
 			}
-			Set<String> roles = new LinkedHashSet<String>(user.getRole());
+			Set<String> roles = new LinkedHashSet<>(user.getRole());
 			withUser(user.getName()).password(user.getPassword())
 					.roles(roles.toArray(new String[roles.size()]));
 			setField(auth, "defaultUserDetailsService", getUserDetailsService());
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityFilterAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityFilterAutoConfiguration.java
index 7528d68315..07b71541f8 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityFilterAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityFilterAutoConfiguration.java
@@ -73,7 +73,7 @@ public class SecurityFilterAutoConfiguration {
 		if (securityProperties.getFilterDispatcherTypes() == null) {
 			return null;
 		}
-		Set<DispatcherType> dispatcherTypes = new HashSet<DispatcherType>();
+		Set<DispatcherType> dispatcherTypes = new HashSet<>();
 		for (String dispatcherType : securityProperties.getFilterDispatcherTypes()) {
 			dispatcherTypes.add(DispatcherType.valueOf(dispatcherType));
 		}
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java
index 7237afb6e5..fb64720c71 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SecurityProperties.java
@@ -91,7 +91,7 @@ public class SecurityProperties implements SecurityPrerequisite {
 	/**
 	 * Comma-separated list of paths to exclude from the default secured paths.
 	 */
-	private List<String> ignored = new ArrayList<String>();
+	private List<String> ignored = new ArrayList<>();
 
 	private final User user = new User();
 
@@ -103,7 +103,7 @@ public class SecurityProperties implements SecurityPrerequisite {
 	/**
 	 * Security filter chain dispatcher types.
 	 */
-	private Set<String> filterDispatcherTypes = new HashSet<String>(
+	private Set<String> filterDispatcherTypes = new HashSet<>(
 			Arrays.asList("ASYNC", "ERROR", "REQUEST"));
 
 	public Headers getHeaders() {
@@ -147,7 +147,7 @@ public class SecurityProperties implements SecurityPrerequisite {
 	}
 
 	public void setIgnored(List<String> ignored) {
-		this.ignored = new ArrayList<String>(ignored);
+		this.ignored = new ArrayList<>(ignored);
 	}
 
 	public List<String> getIgnored() {
@@ -357,7 +357,7 @@ public class SecurityProperties implements SecurityPrerequisite {
 		/**
 		 * Granted roles for the default user name.
 		 */
-		private List<String> role = new ArrayList<String>(Arrays.asList("USER"));
+		private List<String> role = new ArrayList<>(Arrays.asList("USER"));
 
 		private boolean defaultPassword = true;
 
@@ -387,7 +387,7 @@ public class SecurityProperties implements SecurityPrerequisite {
 		}
 
 		public void setRole(List<String> role) {
-			this.role = new ArrayList<String>(role);
+			this.role = new ArrayList<>(role);
 		}
 
 		public boolean isDefaultPassword() {
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfiguration.java
index a4f6e5a417..20566cbbc9 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfiguration.java
@@ -190,7 +190,7 @@ public class SpringBootWebSecurityConfiguration {
 				ignored.add(normalizePath(this.errorController.getErrorPath()));
 			}
 			String[] paths = this.server.getServlet().getPathsArray(ignored);
-			List<RequestMatcher> matchers = new ArrayList<RequestMatcher>();
+			List<RequestMatcher> matchers = new ArrayList<>();
 			if (!ObjectUtils.isEmpty(paths)) {
 				for (String pattern : paths) {
 					matchers.add(new AntPathRequestMatcher(pattern, null));
@@ -202,7 +202,7 @@ public class SpringBootWebSecurityConfiguration {
 		}
 
 		private List<String> getIgnored(SecurityProperties security) {
-			List<String> ignored = new ArrayList<String>(security.getIgnored());
+			List<String> ignored = new ArrayList<>(security.getIgnored());
 			if (ignored.isEmpty()) {
 				ignored.addAll(DEFAULT_IGNORED);
 			}
@@ -282,7 +282,7 @@ public class SpringBootWebSecurityConfiguration {
 		}
 
 		private String[] getSecureApplicationPaths() {
-			List<String> list = new ArrayList<String>();
+			List<String> list = new ArrayList<>();
 			for (String path : this.security.getBasic().getPath()) {
 				path = (path == null ? "" : path.trim());
 				if (path.equals("/**")) {
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfiguration.java
index 48ac21a515..929a6af72f 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfiguration.java
@@ -97,7 +97,7 @@ public class OAuth2RestOperationsConfiguration {
 		@Bean
 		public FilterRegistrationBean<OAuth2ClientContextFilter> oauth2ClientFilterRegistration(
 				OAuth2ClientContextFilter filter, SecurityProperties security) {
-			FilterRegistrationBean<OAuth2ClientContextFilter> registration = new FilterRegistrationBean<OAuth2ClientContextFilter>();
+			FilterRegistrationBean<OAuth2ClientContextFilter> registration = new FilterRegistrationBean<>();
 			registration.setFilter(filter);
 			registration.setOrder(security.getFilterOrder() - 10);
 			return registration;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/FixedAuthoritiesExtractor.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/FixedAuthoritiesExtractor.java
index 9d16dae9a9..fdb3468d93 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/FixedAuthoritiesExtractor.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/FixedAuthoritiesExtractor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -50,7 +50,7 @@ public class FixedAuthoritiesExtractor implements AuthoritiesExtractor {
 	}
 
 	private String asAuthorities(Object object) {
-		List<Object> authorities = new ArrayList<Object>();
+		List<Object> authorities = new ArrayList<>();
 		if (object instanceof Collection) {
 			Collection<?> collection = (Collection<?>) object;
 			object = collection.toArray(new Object[0]);
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerTokenServicesConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerTokenServicesConfiguration.java
index 7e1504ad82..e4da42c3df 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerTokenServicesConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerTokenServicesConfiguration.java
@@ -315,7 +315,7 @@ public class ResourceServerTokenServicesConfiguration {
 				byte[] token = Base64.encode((username + ":" + password).getBytes());
 				headers.add("Authorization", "Basic " + new String(token));
 			}
-			HttpEntity<Void> request = new HttpEntity<Void>(headers);
+			HttpEntity<Void> request = new HttpEntity<>(headers);
 			String url = this.resource.getJwt().getKeyUri();
 			return (String) keyUriRestTemplate
 					.exchange(url, HttpMethod.GET, request, Map.class).getBody()
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionRepositoryFilterConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionRepositoryFilterConfiguration.java
index ad0b75dade..286226fae5 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionRepositoryFilterConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionRepositoryFilterConfiguration.java
@@ -38,7 +38,7 @@ class SessionRepositoryFilterConfiguration {
 	@Bean
 	public FilterRegistrationBean<SessionRepositoryFilter<?>> sessionRepositoryFilterRegistration(
 			SessionRepositoryFilter<?> filter) {
-		FilterRegistrationBean<SessionRepositoryFilter<?>> registration = new FilterRegistrationBean<SessionRepositoryFilter<?>>(
+		FilterRegistrationBean<SessionRepositoryFilter<?>> registration = new FilterRegistrationBean<>(
 				filter);
 		registration.setDispatcherTypes(EnumSet.of(DispatcherType.ASYNC,
 				DispatcherType.ERROR, DispatcherType.REQUEST));
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionStoreMappings.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionStoreMappings.java
index b2fa12b417..cae44137ac 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionStoreMappings.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionStoreMappings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -33,7 +33,7 @@ final class SessionStoreMappings {
 	private static final Map<StoreType, Class<?>> MAPPINGS;
 
 	static {
-		Map<StoreType, Class<?>> mappings = new HashMap<StoreType, Class<?>>();
+		Map<StoreType, Class<?>> mappings = new HashMap<>();
 		mappings.put(StoreType.REDIS, RedisSessionConfiguration.class);
 		mappings.put(StoreType.MONGO, MongoSessionConfiguration.class);
 		mappings.put(StoreType.JDBC, JdbcSessionConfiguration.class);
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/AbstractViewResolverProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/AbstractViewResolverProperties.java
index acc0cd6c5c..4e2b937213 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/AbstractViewResolverProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/AbstractViewResolverProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -102,7 +102,7 @@ public abstract class AbstractViewResolverProperties {
 
 	public MimeType getContentType() {
 		if (this.contentType.getCharset() == null) {
-			Map<String, String> parameters = new LinkedHashMap<String, String>();
+			Map<String, String> parameters = new LinkedHashMap<>();
 			parameters.put("charset", this.charset.name());
 			parameters.putAll(this.contentType.getParameters());
 			return new MimeType(this.contentType, parameters);
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/TemplateAvailabilityProviders.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/TemplateAvailabilityProviders.java
index 39ecd7ee34..9b073f5409 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/TemplateAvailabilityProviders.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/template/TemplateAvailabilityProviders.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -49,7 +49,7 @@ public class TemplateAvailabilityProviders {
 	/**
 	 * Resolved template views, returning already cached instances without a global lock.
 	 */
-	private final Map<String, TemplateAvailabilityProvider> resolved = new ConcurrentHashMap<String, TemplateAvailabilityProvider>(
+	private final Map<String, TemplateAvailabilityProvider> resolved = new ConcurrentHashMap<>(
 			CACHE_LIMIT);
 
 	/**
@@ -96,7 +96,7 @@ public class TemplateAvailabilityProviders {
 	protected TemplateAvailabilityProviders(
 			Collection<? extends TemplateAvailabilityProvider> providers) {
 		Assert.notNull(providers, "Providers must not be null");
-		this.providers = new ArrayList<TemplateAvailabilityProvider>(providers);
+		this.providers = new ArrayList<>(providers);
 	}
 
 	/**
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java
index 919ef830d4..3110c7cd17 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java
@@ -159,7 +159,7 @@ public class ThymeleafAutoConfiguration {
 			if (type.getCharset() != null) {
 				return type.toString();
 			}
-			LinkedHashMap<String, String> parameters = new LinkedHashMap<String, String>();
+			LinkedHashMap<String, String> parameters = new LinkedHashMap<>();
 			parameters.put("charset", charset);
 			parameters.putAll(type.getParameters());
 			return new MimeType(type, parameters).toString();
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionManagerCustomizers.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionManagerCustomizers.java
index 6c5ab3a0a6..65b54868b1 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionManagerCustomizers.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionManagerCustomizers.java
@@ -41,8 +41,7 @@ public class TransactionManagerCustomizers {
 
 	public TransactionManagerCustomizers(
 			Collection<? extends PlatformTransactionManagerCustomizer<?>> customizers) {
-		this.customizers = (customizers == null ? null
-				: new ArrayList<PlatformTransactionManagerCustomizer<?>>(customizers));
+		this.customizers = (customizers == null ? null : new ArrayList<>(customizers));
 	}
 
 	public void customize(PlatformTransactionManager transactionManager) {
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/AbstractErrorController.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/AbstractErrorController.java
index 20fa52d83e..4de3f83547 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/AbstractErrorController.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/AbstractErrorController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -58,7 +58,7 @@ public abstract class AbstractErrorController implements ErrorController {
 
 	private List<ErrorViewResolver> sortErrorViewResolvers(
 			List<ErrorViewResolver> resolvers) {
-		List<ErrorViewResolver> sorted = new ArrayList<ErrorViewResolver>();
+		List<ErrorViewResolver> sorted = new ArrayList<>();
 		if (resolvers != null) {
 			sorted.addAll(resolvers);
 			AnnotationAwareOrderComparator.sortIfNecessary(sorted);
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/BasicErrorController.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/BasicErrorController.java
index 41363125d1..688abdd2a1 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/BasicErrorController.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/BasicErrorController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -99,7 +99,7 @@ public class BasicErrorController extends AbstractErrorController {
 		Map<String, Object> body = getErrorAttributes(request,
 				isIncludeStackTrace(request, MediaType.ALL));
 		HttpStatus status = getStatus(request);
-		return new ResponseEntity<Map<String, Object>>(body, status);
+		return new ResponseEntity<>(body, status);
 	}
 
 	/**
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/DefaultErrorAttributes.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/DefaultErrorAttributes.java
index 05a0d08632..fc501adb06 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/DefaultErrorAttributes.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/DefaultErrorAttributes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -83,7 +83,7 @@ public class DefaultErrorAttributes
 	@Override
 	public Map<String, Object> getErrorAttributes(RequestAttributes requestAttributes,
 			boolean includeStackTrace) {
-		Map<String, Object> errorAttributes = new LinkedHashMap<String, Object>();
+		Map<String, Object> errorAttributes = new LinkedHashMap<>();
 		errorAttributes.put("timestamp", new Date());
 		addStatus(errorAttributes, requestAttributes);
 		addErrorDetails(errorAttributes, requestAttributes, includeStackTrace);
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/DefaultErrorViewResolver.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/DefaultErrorViewResolver.java
index c481ff290b..6bbc4c3195 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/DefaultErrorViewResolver.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/DefaultErrorViewResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -59,7 +59,7 @@ public class DefaultErrorViewResolver implements ErrorViewResolver, Ordered {
 	private static final Map<Series, String> SERIES_VIEWS;
 
 	static {
-		Map<Series, String> views = new HashMap<Series, String>();
+		Map<Series, String> views = new HashMap<>();
 		views.put(Series.CLIENT_ERROR, "4xx");
 		views.put(Series.SERVER_ERROR, "5xx");
 		SERIES_VIEWS = Collections.unmodifiableMap(views);
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/DispatcherServletAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/DispatcherServletAutoConfiguration.java
index 7f76cff58c..1c799f4b22 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/DispatcherServletAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/DispatcherServletAutoConfiguration.java
@@ -138,7 +138,7 @@ public class DispatcherServletAutoConfiguration {
 		@ConditionalOnBean(value = DispatcherServlet.class, name = DEFAULT_DISPATCHER_SERVLET_BEAN_NAME)
 		public ServletRegistrationBean<DispatcherServlet> dispatcherServletRegistration(
 				DispatcherServlet dispatcherServlet) {
-			ServletRegistrationBean<DispatcherServlet> registration = new ServletRegistrationBean<DispatcherServlet>(
+			ServletRegistrationBean<DispatcherServlet> registration = new ServletRegistrationBean<>(
 					dispatcherServlet,
 					this.serverProperties.getServlet().getServletMapping());
 			registration.setName(DEFAULT_DISPATCHER_SERVLET_BEAN_NAME);
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ErrorMvcAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ErrorMvcAutoConfiguration.java
index 8e99b1cb0f..a0876816b6 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ErrorMvcAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ErrorMvcAutoConfiguration.java
@@ -221,7 +221,7 @@ public class ErrorMvcAutoConfiguration {
 			if (response.getContentType() == null) {
 				response.setContentType(getContentType());
 			}
-			Map<String, Object> map = new HashMap<String, Object>(model);
+			Map<String, Object> map = new HashMap<>(model);
 			map.put("path", request.getContextPath());
 			PlaceholderResolver resolver = new ExpressionResolver(getExpressions(), map);
 			String result = this.helper.replacePlaceholders(this.template, resolver);
@@ -248,7 +248,7 @@ public class ErrorMvcAutoConfiguration {
 
 		private final SpelExpressionParser parser = new SpelExpressionParser();
 
-		private final Map<String, Expression> expressions = new HashMap<String, Expression>();
+		private final Map<String, Expression> expressions = new HashMap<>();
 
 		@Override
 		public String resolvePlaceholder(String name) {
@@ -309,8 +309,9 @@ public class ErrorMvcAutoConfiguration {
 
 		@Override
 		public void registerErrorPages(ErrorPageRegistry errorPageRegistry) {
-			ErrorPage errorPage = new ErrorPage(this.properties.getServlet().getServletPrefix()
-					+ this.properties.getError().getPath());
+			ErrorPage errorPage = new ErrorPage(
+					this.properties.getServlet().getServletPrefix()
+							+ this.properties.getError().getPath());
 			errorPageRegistry.addErrorPages(errorPage);
 		}
 
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpMessageConverters.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpMessageConverters.java
index c5b9606432..7b1fea9250 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpMessageConverters.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/HttpMessageConverters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -59,7 +59,7 @@ public class HttpMessageConverters implements Iterable<HttpMessageConverter<?>>
 	private static final List<Class<?>> NON_REPLACING_CONVERTERS;
 
 	static {
-		List<Class<?>> nonReplacingConverters = new ArrayList<Class<?>>();
+		List<Class<?>> nonReplacingConverters = new ArrayList<>();
 		addClassIfExists(nonReplacingConverters, "org.springframework.hateoas.mvc."
 				+ "TypeConstrainedMappingJackson2HttpMessageConverter");
 		NON_REPLACING_CONVERTERS = Collections.unmodifiableList(nonReplacingConverters);
@@ -112,9 +112,8 @@ public class HttpMessageConverters implements Iterable<HttpMessageConverter<?>>
 	private List<HttpMessageConverter<?>> getCombinedConverters(
 			Collection<HttpMessageConverter<?>> converters,
 			List<HttpMessageConverter<?>> defaultConverters) {
-		List<HttpMessageConverter<?>> combined = new ArrayList<HttpMessageConverter<?>>();
-		List<HttpMessageConverter<?>> processing = new ArrayList<HttpMessageConverter<?>>(
-				converters);
+		List<HttpMessageConverter<?>> combined = new ArrayList<>();
+		List<HttpMessageConverter<?>> processing = new ArrayList<>(converters);
 		for (HttpMessageConverter<?> defaultConverter : defaultConverters) {
 			Iterator<HttpMessageConverter<?>> iterator = processing.iterator();
 			while (iterator.hasNext()) {
@@ -191,7 +190,7 @@ public class HttpMessageConverters implements Iterable<HttpMessageConverter<?>>
 	}
 
 	private List<HttpMessageConverter<?>> getDefaultConverters() {
-		List<HttpMessageConverter<?>> converters = new ArrayList<HttpMessageConverter<?>>();
+		List<HttpMessageConverter<?>> converters = new ArrayList<>();
 		if (ClassUtils.isPresent("org.springframework.web.servlet.config.annotation."
 				+ "WebMvcConfigurationSupport", null)) {
 			converters.addAll(new WebMvcConfigurationSupport() {
@@ -208,7 +207,7 @@ public class HttpMessageConverters implements Iterable<HttpMessageConverter<?>>
 	}
 
 	private void reorderXmlConvertersToEnd(List<HttpMessageConverter<?>> converters) {
-		List<HttpMessageConverter<?>> xml = new ArrayList<HttpMessageConverter<?>>();
+		List<HttpMessageConverter<?>> xml = new ArrayList<>();
 		for (Iterator<HttpMessageConverter<?>> iterator = converters.iterator(); iterator
 				.hasNext();) {
 			HttpMessageConverter<?> converter = iterator.next();
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ResourceProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ResourceProperties.java
index 71080b136b..ef312d53e3 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ResourceProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ResourceProperties.java
@@ -118,8 +118,7 @@ public class ResourceProperties implements ResourceLoaderAware {
 	}
 
 	List<Resource> getFaviconLocations() {
-		List<Resource> locations = new ArrayList<Resource>(
-				this.staticLocations.length + 1);
+		List<Resource> locations = new ArrayList<>(this.staticLocations.length + 1);
 		if (this.resourceLoader != null) {
 			for (String location : this.staticLocations) {
 				locations.add(this.resourceLoader.getResource(location));
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java
index e2296b2ec4..891b3a4676 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java
@@ -481,7 +481,7 @@ public class ServerProperties {
 		 * scanning. The special '?' and '*' characters can be used in the pattern to
 		 * match one and only one character and zero or more characters respectively.
 		 */
-		private List<String> additionalTldSkipPatterns = new ArrayList<String>();
+		private List<String> additionalTldSkipPatterns = new ArrayList<>();
 
 		public int getMaxThreads() {
 			return this.maxThreads;
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebClientAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebClientAutoConfiguration.java
index 61160b0460..74c0ee600e 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebClientAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebClientAutoConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -69,7 +69,7 @@ public class WebClientAutoConfiguration {
 			List<RestTemplateCustomizer> customizers = this.restTemplateCustomizers
 					.getIfAvailable();
 			if (!CollectionUtils.isEmpty(customizers)) {
-				customizers = new ArrayList<RestTemplateCustomizer>(customizers);
+				customizers = new ArrayList<>(customizers);
 				AnnotationAwareOrderComparator.sort(customizers);
 				builder = builder.customizers(customizers);
 			}
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcProperties.java
index 17c1eb6cbe..18c50d7d2c 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcProperties.java
@@ -86,7 +86,7 @@ public class WebMvcProperties {
 	/**
 	 * Maps file extensions to media types for content negotiation, e.g. yml->text/yaml.
 	 */
-	private Map<String, MediaType> mediaTypes = new LinkedHashMap<String, MediaType>();
+	private Map<String, MediaType> mediaTypes = new LinkedHashMap<>();
 
 	/**
 	 * Path pattern used for static resources.
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/webservices/WebServicesAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/webservices/WebServicesAutoConfiguration.java
index 9bd698422a..9d8840cff3 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/webservices/WebServicesAutoConfiguration.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/webservices/WebServicesAutoConfiguration.java
@@ -62,7 +62,7 @@ public class WebServicesAutoConfiguration {
 		servlet.setApplicationContext(applicationContext);
 		String path = this.properties.getPath();
 		String urlMapping = (path.endsWith("/") ? path + "*" : path + "/*");
-		ServletRegistrationBean<MessageDispatcherServlet> registration = new ServletRegistrationBean<MessageDispatcherServlet>(
+		ServletRegistrationBean<MessageDispatcherServlet> registration = new ServletRegistrationBean<>(
 				servlet, urlMapping);
 		WebServicesProperties.Servlet servletProperties = this.properties.getServlet();
 		registration.setLoadOnStartup(servletProperties.getLoadOnStartup());
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/webservices/WebServicesProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/webservices/WebServicesProperties.java
index 4f26ef282f..1379170d4e 100644
--- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/webservices/WebServicesProperties.java
+++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/webservices/WebServicesProperties.java
@@ -59,7 +59,7 @@ public class WebServicesProperties {
 		/**
 		 * Servlet init parameters to pass to Spring Web Services.
 		 */
-		private Map<String, String> init = new HashMap<String, String>();
+		private Map<String, String> init = new HashMap<>();
 
 		/**
 		 * Load on startup priority of the Spring Web Services servlet.
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationImportSelectorTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationImportSelectorTests.java
index a84b28b29b..0c8804055b 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationImportSelectorTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationImportSelectorTests.java
@@ -59,7 +59,7 @@ public class AutoConfigurationImportSelectorTests {
 
 	private final MockEnvironment environment = new MockEnvironment();
 
-	private List<AutoConfigurationImportFilter> filters = new ArrayList<AutoConfigurationImportFilter>();
+	private List<AutoConfigurationImportFilter> filters = new ArrayList<>();
 
 	@Rule
 	public ExpectedException expected = ExpectedException.none();
@@ -269,7 +269,7 @@ public class AutoConfigurationImportSelectorTests {
 	private static class TestAutoConfigurationImportFilter
 			implements AutoConfigurationImportFilter, BeanFactoryAware {
 
-		private final Set<String> nonMatching = new HashSet<String>();
+		private final Set<String> nonMatching = new HashSet<>();
 
 		private BeanFactory beanFactory;
 
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationSorterTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationSorterTests.java
index 3536492ee3..6d2b009c1a 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationSorterTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationSorterTests.java
@@ -183,7 +183,7 @@ public class AutoConfigurationSorterTests {
 	}
 
 	private String merge(Class<?>[] value, String[] name) {
-		Set<String> items = new LinkedHashSet<String>();
+		Set<String> items = new LinkedHashSet<>();
 		for (Class<?> type : value) {
 			items.add(type.getName());
 		}
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationTests.java
index 047bdacfc5..aaf8e8cc3b 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ImportAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -61,7 +61,7 @@ public class ImportAutoConfigurationTests {
 				config);
 		String shortName = ClassUtils.getShortName(ImportAutoConfigurationTests.class);
 		int beginIndex = shortName.length() + 1;
-		List<String> orderedConfigBeans = new ArrayList<String>();
+		List<String> orderedConfigBeans = new ArrayList<>();
 		for (String bean : context.getBeanDefinitionNames()) {
 			if (bean.contains("$Config")) {
 				String shortBeanName = ClassUtils.getShortName(bean);
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java
index 5ec9dc5ca9..001b571269 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java
@@ -637,7 +637,7 @@ public class CacheAutoConfigurationTests {
 			String... expectedCustomizerNames) {
 		load(config, "spring.cache.type=" + cacheType);
 		CacheManager cacheManager = validateCacheManager(CacheManager.class);
-		List<String> expected = new ArrayList<String>();
+		List<String> expected = new ArrayList<>();
 		expected.addAll(Arrays.asList(expectedCustomizerNames));
 		Map<String, CacheManagerTestCustomizer> map = this.context
 				.getBeansOfType(CacheManagerTestCustomizer.class);
@@ -787,7 +787,7 @@ public class CacheAutoConfigurationTests {
 			return new JCacheManagerCustomizer() {
 				@Override
 				public void customize(javax.cache.CacheManager cacheManager) {
-					MutableConfiguration<?, ?> config = new MutableConfiguration<Object, Object>();
+					MutableConfiguration<?, ?> config = new MutableConfiguration<>();
 					config.setExpiryPolicyFactory(
 							CreatedExpiryPolicy.factoryOf(Duration.TEN_MINUTES));
 					config.setStatisticsEnabled(true);
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheManagerCustomizersTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheManagerCustomizersTests.java
index 86f7c7ceff..fc89bee731 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheManagerCustomizersTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheManagerCustomizersTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -51,8 +51,8 @@ public class CacheManagerCustomizersTests {
 
 	@Test
 	public void customizeShouldCheckGeneric() throws Exception {
-		List<TestCustomizer<?>> list = new ArrayList<TestCustomizer<?>>();
-		list.add(new TestCustomizer<CacheManager>());
+		List<TestCustomizer<?>> list = new ArrayList<>();
+		list.add(new TestCustomizer<>());
 		list.add(new TestConcurrentMapCacheManagerCustomizer());
 		CacheManagerCustomizers customizers = new CacheManagerCustomizers(list);
 		customizers.customize(mock(CacheManager.class));
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/support/MockCachingProvider.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/support/MockCachingProvider.java
index dde52959de..63d9b500de 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/support/MockCachingProvider.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/support/MockCachingProvider.java
@@ -50,7 +50,7 @@ public class MockCachingProvider implements CachingProvider {
 		CacheManager cacheManager = mock(CacheManager.class);
 		given(cacheManager.getURI()).willReturn(uri);
 		given(cacheManager.getClassLoader()).willReturn(classLoader);
-		final Map<String, Cache> caches = new HashMap<String, Cache>();
+		final Map<String, Cache> caches = new HashMap<>();
 		given(cacheManager.getCacheNames()).willReturn(caches.keySet());
 		given(cacheManager.getCache(anyString())).willAnswer(new Answer<Cache>() {
 			@Override
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cloud/CloudAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cloud/CloudAutoConfigurationTests.java
index e6ef1a6c17..5ad7be002e 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cloud/CloudAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cloud/CloudAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -42,7 +42,7 @@ public class CloudAutoConfigurationTests {
 	public void testOrder() throws Exception {
 		TestAutoConfigurationSorter sorter = new TestAutoConfigurationSorter(
 				new CachingMetadataReaderFactory());
-		Collection<String> classNames = new ArrayList<String>();
+		Collection<String> classNames = new ArrayList<>();
 		classNames.add(MongoAutoConfiguration.class.getName());
 		classNames.add(DataSourceAutoConfiguration.class.getName());
 		classNames.add(MongoRepositoriesAutoConfiguration.class.getName());
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReportTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReportTests.java
index e0378993bb..1f05f8a071 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReportTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -212,7 +212,7 @@ public class ConditionEvaluationReportTests {
 		assertThat(outcomes).isNotEqualTo(nullValue());
 		assertThat(getNumberOfOutcomes(outcomes)).isEqualTo(2);
 
-		List<String> messages = new ArrayList<String>();
+		List<String> messages = new ArrayList<>();
 		for (ConditionAndOutcome outcome : outcomes) {
 			messages.add(outcome.getOutcome().getMessage());
 		}
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionMessageTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionMessageTests.java
index fec1496fff..eea9e1d183 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionMessageTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionMessageTests.java
@@ -98,7 +98,7 @@ public class ConditionMessageTests {
 
 	@Test
 	public void ofCollectionShouldCombine() throws Exception {
-		List<ConditionMessage> messages = new ArrayList<ConditionMessage>();
+		List<ConditionMessage> messages = new ArrayList<>();
 		messages.add(ConditionMessage.of("a"));
 		messages.add(ConditionMessage.of("b"));
 		ConditionMessage message = ConditionMessage.of(messages);
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJndiTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJndiTests.java
index 73b026face..7d3c4e104f 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJndiTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJndiTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -142,7 +142,7 @@ public class ConditionalOnJndiTests {
 
 	private AnnotatedTypeMetadata mockMetaData(String... value) {
 		AnnotatedTypeMetadata metadata = mock(AnnotatedTypeMetadata.class);
-		Map<String, Object> attributes = new HashMap<String, Object>();
+		Map<String, Object> attributes = new HashMap<>();
 		attributes.put("value", value);
 		given(metadata.getAnnotationAttributes(ConditionalOnJndi.class.getName()))
 				.willReturn(attributes);
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MixedMongoRepositoriesAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MixedMongoRepositoriesAutoConfigurationTests.java
index 521e759cde..d06dc9c0e6 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MixedMongoRepositoriesAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MixedMongoRepositoriesAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -156,7 +156,7 @@ public class MixedMongoRepositoriesAutoConfigurationTests {
 
 		@Override
 		public String[] selectImports(AnnotationMetadata importingClassMetadata) {
-			List<String> names = new ArrayList<String>();
+			List<String> names = new ArrayList<>();
 			for (Class<?> type : new Class<?>[] { DataSourceAutoConfiguration.class,
 					HibernateJpaAutoConfiguration.class,
 					JpaRepositoriesAutoConfiguration.class, MongoAutoConfiguration.class,
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/ReactiveAndBlockingMongoRepositoriesAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/ReactiveAndBlockingMongoRepositoriesAutoConfigurationTests.java
index a32235908b..9e423a9630 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/ReactiveAndBlockingMongoRepositoriesAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/ReactiveAndBlockingMongoRepositoriesAutoConfigurationTests.java
@@ -85,7 +85,7 @@ public class ReactiveAndBlockingMongoRepositoriesAutoConfigurationTests {
 
 		@Override
 		public String[] selectImports(AnnotationMetadata importingClassMetadata) {
-			List<String> names = new ArrayList<String>();
+			List<String> names = new ArrayList<>();
 			for (Class<?> type : new Class<?>[] { MongoAutoConfiguration.class,
 					ReactiveMongoAutoConfiguration.class,
 					MongoDataAutoConfiguration.class,
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/MixedNeo4jRepositoriesAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/MixedNeo4jRepositoriesAutoConfigurationTests.java
index 821b791c24..241d006c16 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/MixedNeo4jRepositoriesAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/MixedNeo4jRepositoriesAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -155,7 +155,7 @@ public class MixedNeo4jRepositoriesAutoConfigurationTests {
 
 		@Override
 		public String[] selectImports(AnnotationMetadata importingClassMetadata) {
-			List<String> names = new ArrayList<String>();
+			List<String> names = new ArrayList<>();
 			for (Class<?> type : new Class<?>[] { DataSourceAutoConfiguration.class,
 					HibernateJpaAutoConfiguration.class,
 					JpaRepositoriesAutoConfiguration.class,
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/diagnostics/analyzer/NoSuchBeanDefinitionFailureAnalyzerTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/diagnostics/analyzer/NoSuchBeanDefinitionFailureAnalyzerTests.java
index e40398186b..2d3c093fc8 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/diagnostics/analyzer/NoSuchBeanDefinitionFailureAnalyzerTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/diagnostics/analyzer/NoSuchBeanDefinitionFailureAnalyzerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -227,7 +227,7 @@ public class NoSuchBeanDefinitionFailureAnalyzerTests {
 			Class<?>... classes) {
 		ConditionEvaluationReport report = (ConditionEvaluationReport) new DirectFieldAccessor(
 				analyzer).getPropertyValue("report");
-		List<String> exclusions = new ArrayList<String>(report.getExclusions());
+		List<String> exclusions = new ArrayList<>(report.getExclusions());
 		for (Class<?> c : classes) {
 			exclusions.add(c.getName());
 		}
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/jest/JestAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/jest/JestAutoConfigurationTests.java
index e12924b361..cdc9583406 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/jest/JestAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/jest/JestAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -112,7 +112,7 @@ public class JestAutoConfigurationTests {
 				"spring.data.elasticsearch.properties.http.port:" + port,
 				"spring.elasticsearch.jest.uris:http://localhost:" + port);
 		JestClient client = this.context.getBean(JestClient.class);
-		Map<String, String> source = new HashMap<String, String>();
+		Map<String, String> source = new HashMap<>();
 		source.put("a", "alpha");
 		source.put("b", "bravo");
 		Index index = new Index.Builder(source).index("foo").type("bar").build();
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java
index 4a0658c57f..a02e2e09f0 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java
@@ -324,7 +324,7 @@ public class FlywayAutoConfigurationTests {
 
 		@Bean
 		public LocalContainerEntityManagerFactoryBean entityManagerFactoryBean() {
-			Map<String, Object> properties = new HashMap<String, Object>();
+			Map<String, Object> properties = new HashMap<>();
 			properties.put("configured", "manually");
 			properties.put("hibernate.transaction.jta.platform", NoJtaPlatform.INSTANCE);
 			return new EntityManagerFactoryBuilder(new HibernateJpaVendorAdapter(),
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java
index b608a98e97..d4184569ce 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -588,7 +588,7 @@ public class JacksonAutoConfigurationTests {
 
 	private static class CustomModule extends SimpleModule {
 
-		private Set<ObjectCodec> owners = new HashSet<ObjectCodec>();
+		private Set<ObjectCodec> owners = new HashSet<>();
 
 		@Override
 		public void setupModule(SetupContext context) {
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJsonSerializationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJsonSerializationTests.java
index 60bf306a41..10b1a91f31 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJsonSerializationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJsonSerializationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -109,7 +109,7 @@ public class DataSourceJsonSerializationTests {
 		@Override
 		public List<BeanPropertyWriter> changeProperties(SerializationConfig config,
 				BeanDescription beanDesc, List<BeanPropertyWriter> beanProperties) {
-			List<BeanPropertyWriter> result = new ArrayList<BeanPropertyWriter>();
+			List<BeanPropertyWriter> result = new ArrayList<>();
 			for (BeanPropertyWriter writer : beanProperties) {
 				AnnotatedMethod setter = beanDesc.findMethod(
 						"set" + StringUtils.capitalize(writer.getName()),
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jndi/TestableInitialContextFactory.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jndi/TestableInitialContextFactory.java
index 7f8241f973..ee647430a7 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jndi/TestableInitialContextFactory.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jndi/TestableInitialContextFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -66,7 +66,7 @@ public class TestableInitialContextFactory implements InitialContextFactory {
 
 	private final static class TestableContext extends InitialContext {
 
-		private final Map<String, Object> bindings = new HashMap<String, Object>();
+		private final Map<String, Object> bindings = new HashMap<>();
 
 		private TestableContext() throws NamingException {
 			super(true);
@@ -84,8 +84,8 @@ public class TestableInitialContextFactory implements InitialContextFactory {
 
 		@Override
 		public Hashtable<?, ?> getEnvironment() throws NamingException {
-			return new Hashtable<Object, Object>(); // Used to detect if JNDI is
-													// available
+			return new Hashtable<>(); // Used to detect if JNDI is
+										// available
 		}
 
 		public void clearAll() {
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializerTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializerTests.java
index baf64d4d98..b76f38e6e6 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializerTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/logging/AutoConfigurationReportLoggingInitializerTests.java
@@ -60,15 +60,15 @@ import static org.mockito.Mockito.mock;
  */
 public class AutoConfigurationReportLoggingInitializerTests {
 
-	private static ThreadLocal<Log> logThreadLocal = new ThreadLocal<Log>();
+	private static ThreadLocal<Log> logThreadLocal = new ThreadLocal<>();
 
 	private Log log;
 
 	private AutoConfigurationReportLoggingInitializer initializer;
 
-	protected List<String> debugLog = new ArrayList<String>();
+	protected List<String> debugLog = new ArrayList<>();
 
-	protected List<String> infoLog = new ArrayList<String>();
+	protected List<String> infoLog = new ArrayList<>();
 
 	@Before
 	public void setup() {
@@ -171,8 +171,8 @@ public class AutoConfigurationReportLoggingInitializerTests {
 		}
 		// Just basic sanity check, test is for visual inspection
 		String l = this.debugLog.get(0);
-		assertThat(l).contains(
-				"not a servlet web application (OnWebApplicationCondition)");
+		assertThat(l)
+				.contains("not a servlet web application (OnWebApplicationCondition)");
 	}
 
 	@Test
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mobile/DeviceResolverAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mobile/DeviceResolverAutoConfigurationTests.java
index b17ed35299..6d20f55c21 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mobile/DeviceResolverAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mobile/DeviceResolverAutoConfigurationTests.java
@@ -127,9 +127,9 @@ public class DeviceResolverAutoConfigurationTests {
 		@RequestMapping("/")
 		public ResponseEntity<Void> test(Device device) {
 			if (device.getDevicePlatform() != null) {
-				return new ResponseEntity<Void>(HttpStatus.OK);
+				return new ResponseEntity<>(HttpStatus.OK);
 			}
-			return new ResponseEntity<Void>(HttpStatus.INTERNAL_SERVER_ERROR);
+			return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
 		}
 
 	}
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/web/MustacheWebIntegrationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/web/MustacheWebIntegrationTests.java
index e72bf34a49..ac92adb02b 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/web/MustacheWebIntegrationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/web/MustacheWebIntegrationTests.java
@@ -77,7 +77,7 @@ public class MustacheWebIntegrationTests {
 	public void contextLoads() {
 		String source = "Hello {{arg}}!";
 		Template tmpl = Mustache.compiler().compile(source);
-		Map<String, String> context = new HashMap<String, String>();
+		Map<String, String> context = new HashMap<>();
 		context.put("arg", "world");
 		assertThat(tmpl.execute(context)).isEqualTo("Hello world!"); // returns "Hello
 																		// world!"
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/AbstractJpaAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/AbstractJpaAutoConfigurationTests.java
index 6a66bc0a98..84f5b3fa81 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/AbstractJpaAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/AbstractJpaAutoConfigurationTests.java
@@ -239,7 +239,7 @@ public abstract class AbstractJpaAutoConfigurationTests {
 			factoryBean.setJpaVendorAdapter(adapter);
 			factoryBean.setDataSource(dataSource);
 			factoryBean.setPersistenceUnitName("manually-configured");
-			Map<String, Object> properties = new HashMap<String, Object>();
+			Map<String, Object> properties = new HashMap<>();
 			properties.put("configured", "manually");
 			properties.put("hibernate.transaction.jta.platform", NoJtaPlatform.INSTANCE);
 			factoryBean.setJpaPropertyMap(properties);
@@ -259,7 +259,7 @@ public abstract class AbstractJpaAutoConfigurationTests {
 			factoryBean.setJpaVendorAdapter(adapter);
 			factoryBean.setDataSource(dataSource);
 			factoryBean.setPersistenceUnitName("manually-configured");
-			Map<String, Object> properties = new HashMap<String, Object>();
+			Map<String, Object> properties = new HashMap<>();
 			properties.put("configured", "manually");
 			properties.put("hibernate.transaction.jta.platform", NoJtaPlatform.INSTANCE);
 			factoryBean.setJpaPropertyMap(properties);
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityPropertiesTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityPropertiesTests.java
index b032dbecb7..2b0c080d58 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityPropertiesTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityPropertiesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -80,7 +80,7 @@ public class SecurityPropertiesTests {
 
 	@Test
 	public void testBindingIgnoredMultiValuedList() {
-		Map<String, String> map = new HashMap<String, String>();
+		Map<String, String> map = new HashMap<>();
 		map.put("security.ignored[0]", "/css/**");
 		map.put("security.ignored[1]", "/foo/**");
 		this.binder.bind(new MutablePropertyValues(map));
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfigurationTests.java
index 789cf47221..8e1d9f835a 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SpringBootWebSecurityConfigurationTests.java
@@ -173,14 +173,14 @@ public class SpringBootWebSecurityConfigurationTests {
 		TestRestTemplate rest = new TestRestTemplate();
 
 		// not overriding causes forbidden
-		MultiValueMap<String, String> form = new LinkedMultiValueMap<String, String>();
+		MultiValueMap<String, String> form = new LinkedMultiValueMap<>();
 
 		ResponseEntity<Object> result = rest
 				.postForEntity("http://localhost:" + port + "/", form, Object.class);
 		assertThat(result.getStatusCode()).isEqualTo(HttpStatus.FORBIDDEN);
 
 		// override method with GET
-		form = new LinkedMultiValueMap<String, String>();
+		form = new LinkedMultiValueMap<>();
 		form.add("_method", "GET");
 
 		result = rest.postForEntity("http://localhost:" + port + "/", form, Object.class);
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/OAuth2AutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/OAuth2AutoConfigurationTests.java
index 46f5b07a07..acfb606ecc 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/OAuth2AutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/OAuth2AutoConfigurationTests.java
@@ -419,8 +419,7 @@ public class OAuth2AutoConfigurationTests {
 		HttpHeaders headers = getHeaders(config);
 		String url = baseUrl + "/oauth/token";
 		JsonNode tokenResponse = rest.postForObject(url,
-				new HttpEntity<MultiValueMap<String, Object>>(getBody(), headers),
-				JsonNode.class);
+				new HttpEntity<>(getBody(), headers), JsonNode.class);
 		String authorizationToken = tokenResponse.findValue("access_token").asText();
 		String tokenType = tokenResponse.findValue("token_type").asText();
 		String scope = tokenResponse.findValues("scope").get(0).toString();
@@ -448,7 +447,7 @@ public class OAuth2AutoConfigurationTests {
 	}
 
 	private MultiValueMap<String, Object> getBody() {
-		MultiValueMap<String, Object> body = new LinkedMultiValueMap<String, Object>();
+		MultiValueMap<String, Object> body = new LinkedMultiValueMap<>();
 		body.set("grant_type", "password");
 		body.set("username", "foo");
 		body.set("password", "bar");
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/FixedAuthoritiesExtractorTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/FixedAuthoritiesExtractorTests.java
index 9fcc717036..8152f628ef 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/FixedAuthoritiesExtractorTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/FixedAuthoritiesExtractorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -35,7 +35,7 @@ public class FixedAuthoritiesExtractorTests {
 
 	private FixedAuthoritiesExtractor extractor = new FixedAuthoritiesExtractor();
 
-	private Map<String, Object> map = new LinkedHashMap<String, Object>();
+	private Map<String, Object> map = new LinkedHashMap<>();
 
 	@Test
 	public void authorities() {
@@ -75,7 +75,7 @@ public class FixedAuthoritiesExtractorTests {
 
 	@Test
 	public void authoritiesAsListOfMapsWithStandardKey() {
-		Map<String, String> map = new LinkedHashMap<String, String>();
+		Map<String, String> map = new LinkedHashMap<>();
 		map.put("role", "ROLE_ADMIN");
 		map.put("extra", "value");
 		this.map.put("authorities", Arrays.asList(map));
@@ -93,7 +93,7 @@ public class FixedAuthoritiesExtractorTests {
 
 	@Test
 	public void authoritiesAsListOfMapsWithMultipleNonStandardKeys() {
-		Map<String, String> map = new HashMap<String, String>();
+		Map<String, String> map = new HashMap<>();
 		map.put("any", "ROLE_ADMIN");
 		map.put("foo", "bar");
 		this.map.put("authorities", Arrays.asList(map));
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerTokenServicesConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerTokenServicesConfigurationTests.java
index fceac6d7b4..72c5830b46 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerTokenServicesConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerTokenServicesConfigurationTests.java
@@ -61,7 +61,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
@@ -177,8 +177,8 @@ public class ResourceServerTokenServicesConfigurationTests {
 				"security.oauth2.resource.tokenInfoUri:http://example.com",
 				"security.oauth2.resource.preferTokenInfo:false");
 		this.context = new SpringApplicationBuilder(ResourceConfiguration.class,
-				Customizer.class).environment(this.environment).web(WebApplicationType.NONE)
-						.run();
+				Customizer.class).environment(this.environment)
+						.web(WebApplicationType.NONE).run();
 		UserInfoTokenServices services = this.context
 				.getBean(UserInfoTokenServices.class);
 		assertThat(services).isNotNull();
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/UserInfoTokenServicesTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/UserInfoTokenServicesTests.java
index fde700bdf9..4ac1457cb9 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/UserInfoTokenServicesTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/UserInfoTokenServicesTests.java
@@ -57,7 +57,7 @@ public class UserInfoTokenServicesTests {
 
 	private OAuth2RestOperations template = mock(OAuth2RestOperations.class);
 
-	private Map<String, Object> map = new LinkedHashMap<String, Object>();
+	private Map<String, Object> map = new LinkedHashMap<>();
 
 	@SuppressWarnings("rawtypes")
 	@Before
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/TransactionManagerCustomizersTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/TransactionManagerCustomizersTests.java
index dd3d37d726..3124aaefaf 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/TransactionManagerCustomizersTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/TransactionManagerCustomizersTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -42,8 +42,8 @@ public class TransactionManagerCustomizersTests {
 
 	@Test
 	public void customizeShouldCheckGeneric() throws Exception {
-		List<TestCustomizer<?>> list = new ArrayList<TestCustomizer<?>>();
-		list.add(new TestCustomizer<PlatformTransactionManager>());
+		List<TestCustomizer<?>> list = new ArrayList<>();
+		list.add(new TestCustomizer<>());
 		list.add(new TestJtaCustomizer());
 		TransactionManagerCustomizers customizers = new TransactionManagerCustomizers(
 				list);
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerIntegrationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerIntegrationTests.java
index a0b567d175..78ac6df9ae 100755
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerIntegrationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -203,7 +203,7 @@ public class BasicErrorControllerIntegrationTests {
 	}
 
 	private void load(String... arguments) {
-		List<String> args = new ArrayList<String>();
+		List<String> args = new ArrayList<>();
 		args.add("--server.port=0");
 		if (arguments != null) {
 			args.addAll(Arrays.asList(arguments));
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/DefaultErrorViewResolverTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/DefaultErrorViewResolverTests.java
index 9bd27b176c..c15146fdc8 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/DefaultErrorViewResolverTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/DefaultErrorViewResolverTests.java
@@ -68,7 +68,7 @@ public class DefaultErrorViewResolverTests {
 
 	private ResourceProperties resourceProperties;
 
-	private Map<String, Object> model = new HashMap<String, Object>();
+	private Map<String, Object> model = new HashMap<>();
 
 	private HttpServletRequest request = new MockHttpServletRequest();
 
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/DefaultServletContainerCustomizerIntegrationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/DefaultServletContainerCustomizerIntegrationTests.java
index 4fa9a3e681..515731c890 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/DefaultServletContainerCustomizerIntegrationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/DefaultServletContainerCustomizerIntegrationTests.java
@@ -156,7 +156,8 @@ public class DefaultServletContainerCustomizerIntegrationTests {
 	protected static class Config {
 
 		@Bean
-		public DefaultServletContainerCustomizer defaultServletContainerCustomizer(ServerProperties properties) {
+		public DefaultServletContainerCustomizer defaultServletContainerCustomizer(
+				ServerProperties properties) {
 			return new DefaultServletContainerCustomizer(properties);
 		}
 
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/DefaultServletContainerCustomizerTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/DefaultServletContainerCustomizerTests.java
index 8f01d7d346..ad23a0a66f 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/DefaultServletContainerCustomizerTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/DefaultServletContainerCustomizerTests.java
@@ -84,7 +84,7 @@ public class DefaultServletContainerCustomizerTests {
 	@Test
 	public void tomcatAccessLogCanBeEnabled() {
 		TomcatEmbeddedServletContainerFactory tomcatContainer = new TomcatEmbeddedServletContainerFactory();
-		Map<String, String> map = new HashMap<String, String>();
+		Map<String, String> map = new HashMap<>();
 		map.put("server.tomcat.accesslog.enabled", "true");
 		bindProperties(map);
 		this.customizer.customize(tomcatContainer);
@@ -96,7 +96,7 @@ public class DefaultServletContainerCustomizerTests {
 	@Test
 	public void tomcatAccessLogIsBufferedByDefault() {
 		TomcatEmbeddedServletContainerFactory tomcatContainer = new TomcatEmbeddedServletContainerFactory();
-		Map<String, String> map = new HashMap<String, String>();
+		Map<String, String> map = new HashMap<>();
 		map.put("server.tomcat.accesslog.enabled", "true");
 		bindProperties(map);
 		this.customizer.customize(tomcatContainer);
@@ -107,7 +107,7 @@ public class DefaultServletContainerCustomizerTests {
 	@Test
 	public void tomcatAccessLogBufferingCanBeDisabled() {
 		TomcatEmbeddedServletContainerFactory tomcatContainer = new TomcatEmbeddedServletContainerFactory();
-		Map<String, String> map = new HashMap<String, String>();
+		Map<String, String> map = new HashMap<>();
 		map.put("server.tomcat.accesslog.enabled", "true");
 		map.put("server.tomcat.accesslog.buffered", "false");
 		bindProperties(map);
@@ -118,7 +118,7 @@ public class DefaultServletContainerCustomizerTests {
 
 	@Test
 	public void redirectContextRootCanBeConfigured() throws Exception {
-		Map<String, String> map = new HashMap<String, String>();
+		Map<String, String> map = new HashMap<>();
 		map.put("server.tomcat.redirect-context-root", "false");
 		bindProperties(map);
 		ServerProperties.Tomcat tomcat = this.properties.getTomcat();
@@ -160,7 +160,7 @@ public class DefaultServletContainerCustomizerTests {
 
 	@Test
 	public void customizeSessionProperties() throws Exception {
-		Map<String, String> map = new HashMap<String, String>();
+		Map<String, String> map = new HashMap<>();
 		map.put("server.session.timeout", "123");
 		map.put("server.session.tracking-modes", "cookie,url");
 		map.put("server.session.cookie.name", "testname");
@@ -201,7 +201,7 @@ public class DefaultServletContainerCustomizerTests {
 
 	@Test
 	public void customizeTomcatDisplayName() throws Exception {
-		Map<String, String> map = new HashMap<String, String>();
+		Map<String, String> map = new HashMap<>();
 		map.put("server.display-name", "MyBootApp");
 		bindProperties(map);
 		TomcatEmbeddedServletContainerFactory container = new TomcatEmbeddedServletContainerFactory();
@@ -211,7 +211,7 @@ public class DefaultServletContainerCustomizerTests {
 
 	@Test
 	public void disableTomcatRemoteIpValve() throws Exception {
-		Map<String, String> map = new HashMap<String, String>();
+		Map<String, String> map = new HashMap<>();
 		map.put("server.tomcat.remote_ip_header", "");
 		map.put("server.tomcat.protocol_header", "");
 		bindProperties(map);
@@ -227,12 +227,12 @@ public class DefaultServletContainerCustomizerTests {
 		assertThat(
 				((TomcatEmbeddedServletContainer) container.getEmbeddedServletContainer())
 						.getTomcat().getEngine().getBackgroundProcessorDelay())
-				.isEqualTo(30);
+								.isEqualTo(30);
 	}
 
 	@Test
 	public void customTomcatBackgroundProcessorDelay() throws Exception {
-		Map<String, String> map = new HashMap<String, String>();
+		Map<String, String> map = new HashMap<>();
 		map.put("server.tomcat.background-processor-delay", "5");
 		bindProperties(map);
 		TomcatEmbeddedServletContainerFactory container = new TomcatEmbeddedServletContainerFactory();
@@ -240,12 +240,12 @@ public class DefaultServletContainerCustomizerTests {
 		assertThat(
 				((TomcatEmbeddedServletContainer) container.getEmbeddedServletContainer())
 						.getTomcat().getEngine().getBackgroundProcessorDelay())
-				.isEqualTo(5);
+								.isEqualTo(5);
 	}
 
 	@Test
 	public void defaultTomcatRemoteIpValve() throws Exception {
-		Map<String, String> map = new HashMap<String, String>();
+		Map<String, String> map = new HashMap<>();
 		// Since 1.1.7 you need to specify at least the protocol
 		map.put("server.tomcat.protocol_header", "X-Forwarded-Proto");
 		map.put("server.tomcat.remote_ip_header", "X-Forwarded-For");
@@ -288,7 +288,7 @@ public class DefaultServletContainerCustomizerTests {
 
 	@Test
 	public void customTomcatRemoteIpValve() throws Exception {
-		Map<String, String> map = new HashMap<String, String>();
+		Map<String, String> map = new HashMap<>();
 		map.put("server.tomcat.remote_ip_header", "x-my-remote-ip-header");
 		map.put("server.tomcat.protocol_header", "x-my-protocol-header");
 		map.put("server.tomcat.internal_proxies", "192.168.0.1");
@@ -310,7 +310,7 @@ public class DefaultServletContainerCustomizerTests {
 
 	@Test
 	public void customTomcatAcceptCount() {
-		Map<String, String> map = new HashMap<String, String>();
+		Map<String, String> map = new HashMap<>();
 		map.put("server.tomcat.accept-count", "10");
 		bindProperties(map);
 		TomcatEmbeddedServletContainerFactory container = new TomcatEmbeddedServletContainerFactory(
@@ -330,7 +330,7 @@ public class DefaultServletContainerCustomizerTests {
 
 	@Test
 	public void customTomcatMaxConnections() {
-		Map<String, String> map = new HashMap<String, String>();
+		Map<String, String> map = new HashMap<>();
 		map.put("server.tomcat.max-connections", "5");
 		bindProperties(map);
 		TomcatEmbeddedServletContainerFactory container = new TomcatEmbeddedServletContainerFactory(
@@ -350,7 +350,7 @@ public class DefaultServletContainerCustomizerTests {
 
 	@Test
 	public void customTomcatMaxHttpPostSize() {
-		Map<String, String> map = new HashMap<String, String>();
+		Map<String, String> map = new HashMap<>();
 		map.put("server.tomcat.max-http-post-size", "10000");
 		bindProperties(map);
 		TomcatEmbeddedServletContainerFactory container = new TomcatEmbeddedServletContainerFactory(
@@ -370,7 +370,7 @@ public class DefaultServletContainerCustomizerTests {
 
 	@Test
 	public void customizeUndertowAccessLog() {
-		Map<String, String> map = new HashMap<String, String>();
+		Map<String, String> map = new HashMap<>();
 		map.put("server.undertow.accesslog.enabled", "true");
 		map.put("server.undertow.accesslog.pattern", "foo");
 		map.put("server.undertow.accesslog.prefix", "test_log");
@@ -391,7 +391,7 @@ public class DefaultServletContainerCustomizerTests {
 
 	@Test
 	public void testCustomizeTomcatMinSpareThreads() throws Exception {
-		Map<String, String> map = new HashMap<String, String>();
+		Map<String, String> map = new HashMap<>();
 		map.put("server.tomcat.min-spare-threads", "10");
 		bindProperties(map);
 		assertThat(this.properties.getTomcat().getMinSpareThreads()).isEqualTo(10);
@@ -399,7 +399,7 @@ public class DefaultServletContainerCustomizerTests {
 
 	@Test
 	public void customTomcatTldSkip() {
-		Map<String, String> map = new HashMap<String, String>();
+		Map<String, String> map = new HashMap<>();
 		map.put("server.tomcat.additional-tld-skip-patterns", "foo.jar,bar.jar");
 		bindProperties(map);
 		testCustomTomcatTldSkip("foo.jar", "bar.jar");
@@ -407,7 +407,7 @@ public class DefaultServletContainerCustomizerTests {
 
 	@Test
 	public void customTomcatTldSkipAsList() {
-		Map<String, String> map = new HashMap<String, String>();
+		Map<String, String> map = new HashMap<>();
 		map.put("server.tomcat.additional-tld-skip-patterns[0]", "biz.jar");
 		map.put("server.tomcat.additional-tld-skip-patterns[1]", "bah.jar");
 		bindProperties(map);
@@ -476,7 +476,7 @@ public class DefaultServletContainerCustomizerTests {
 
 	@Test
 	public void sessionStoreDir() throws Exception {
-		Map<String, String> map = new HashMap<String, String>();
+		Map<String, String> map = new HashMap<>();
 		map.put("server.session.store-dir", "myfolder");
 		bindProperties(map);
 		JettyEmbeddedServletContainerFactory container = spy(
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/DispatcherServletAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/DispatcherServletAutoConfigurationTests.java
index ceb98065fd..69eb04aafe 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/DispatcherServletAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/DispatcherServletAutoConfigurationTests.java
@@ -219,7 +219,7 @@ public class DispatcherServletAutoConfigurationTests {
 		@Bean
 		public ServletRegistrationBean<?> dispatcherServletRegistration(
 				DispatcherServlet dispatcherServlet) {
-			ServletRegistrationBean<DispatcherServlet> registration = new ServletRegistrationBean<DispatcherServlet>(
+			ServletRegistrationBean<DispatcherServlet> registration = new ServletRegistrationBean<>(
 					dispatcherServlet, "/foo");
 			registration.setName("customDispatcher");
 			return registration;
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java
index 187edefc53..660ed1feb2 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java
@@ -219,8 +219,7 @@ public class EmbeddedServletContainerAutoConfigurationTests {
 
 		@Bean(name = DispatcherServletAutoConfiguration.DEFAULT_DISPATCHER_SERVLET_REGISTRATION_BEAN_NAME)
 		public ServletRegistrationBean<DispatcherServlet> dispatcherRegistration() {
-			return new ServletRegistrationBean<DispatcherServlet>(dispatcherServlet(),
-					"/app/*");
+			return new ServletRegistrationBean<>(dispatcherServlet(), "/app/*");
 		}
 
 	}
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/EmbeddedServletContainerServletContextListenerTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/EmbeddedServletContainerServletContextListenerTests.java
index f73138eeb7..d4e6489860 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/EmbeddedServletContainerServletContextListenerTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/EmbeddedServletContainerServletContextListenerTests.java
@@ -36,8 +36,7 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
 /**
- * Tests for {@link EmbeddedWebServer}s driving {@link ServletContextListener}s
- * correctly
+ * Tests for {@link EmbeddedWebServer}s driving {@link ServletContextListener}s correctly
  *
  * @author Andy Wilkinson
  */
@@ -137,7 +136,7 @@ public class EmbeddedServletContainerServletContextListenerTests {
 
 		@Bean
 		public ServletListenerRegistrationBean<ServletContextListener> registration() {
-			return new ServletListenerRegistrationBean<ServletContextListener>(
+			return new ServletListenerRegistrationBean<>(
 					mock(ServletContextListener.class));
 		}
 
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/FilterOrderingIntegrationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/FilterOrderingIntegrationTests.java
index 7ff2ad98e1..386f964af6 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/FilterOrderingIntegrationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/FilterOrderingIntegrationTests.java
@@ -69,7 +69,7 @@ public class FilterOrderingIntegrationTests {
 		List<RegisteredFilter> registeredFilters = this.context
 				.getBean(MockEmbeddedServletContainerFactory.class).getContainer()
 				.getRegisteredFilters();
-		List<Filter> filters = new ArrayList<Filter>(registeredFilters.size());
+		List<Filter> filters = new ArrayList<>(registeredFilters.size());
 		for (RegisteredFilter registeredFilter : registeredFilters) {
 			filters.add(registeredFilter.getFilter());
 		}
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/HttpEncodingAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/HttpEncodingAutoConfigurationTests.java
index 0023e1b09f..c6f4308b27 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/HttpEncodingAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/HttpEncodingAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -135,7 +135,7 @@ public class HttpEncodingAutoConfigurationTests {
 	@Test
 	public void filterIsOrderedHighest() throws Exception {
 		load(OrderedConfiguration.class);
-		List<Filter> beans = new ArrayList<Filter>(
+		List<Filter> beans = new ArrayList<>(
 				this.context.getBeansOfType(Filter.class).values());
 		AnnotationAwareOrderComparator.sort(beans);
 		assertThat(beans.get(0)).isInstanceOf(CharacterEncodingFilter.class);
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/HttpMessageConvertersTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/HttpMessageConvertersTests.java
index 057ea8eab1..caedb10996 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/HttpMessageConvertersTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/HttpMessageConvertersTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -54,7 +54,7 @@ public class HttpMessageConvertersTests {
 	@Test
 	public void containsDefaults() throws Exception {
 		HttpMessageConverters converters = new HttpMessageConverters();
-		List<Class<?>> converterClasses = new ArrayList<Class<?>>();
+		List<Class<?>> converterClasses = new ArrayList<>();
 		for (HttpMessageConverter<?> converter : converters) {
 			converterClasses.add(converter.getClass());
 		}
@@ -76,7 +76,7 @@ public class HttpMessageConvertersTests {
 				converter2);
 		assertThat(converters.getConverters().contains(converter1)).isTrue();
 		assertThat(converters.getConverters().contains(converter2)).isTrue();
-		List<MappingJackson2HttpMessageConverter> httpConverters = new ArrayList<MappingJackson2HttpMessageConverter>();
+		List<MappingJackson2HttpMessageConverter> httpConverters = new ArrayList<>();
 		for (HttpMessageConverter<?> candidate : converters) {
 			if (candidate instanceof MappingJackson2HttpMessageConverter) {
 				httpConverters.add((MappingJackson2HttpMessageConverter) candidate);
@@ -127,7 +127,7 @@ public class HttpMessageConvertersTests {
 				return converters;
 			};
 		};
-		List<Class<?>> converterClasses = new ArrayList<Class<?>>();
+		List<Class<?>> converterClasses = new ArrayList<>();
 		for (HttpMessageConverter<?> converter : converters) {
 			converterClasses.add(converter.getClass());
 		}
@@ -156,7 +156,7 @@ public class HttpMessageConvertersTests {
 				return converters;
 			};
 		};
-		List<Class<?>> converterClasses = new ArrayList<Class<?>>();
+		List<Class<?>> converterClasses = new ArrayList<>();
 		for (HttpMessageConverter<?> converter : extractFormPartConverters(
 				converters.getConverters())) {
 			converterClasses.add(converter.getClass());
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/MultipartAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/MultipartAutoConfigurationTests.java
index 36126be6eb..56e1f96d2d 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/MultipartAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/MultipartAutoConfigurationTests.java
@@ -150,8 +150,8 @@ public class MultipartAutoConfigurationTests {
 	public void containerWithAutomatedMultipartTomcatConfiguration() throws Exception {
 		this.context = new AnnotationConfigEmbeddedWebApplicationContext(
 				ContainerWithEverythingTomcat.class, BaseConfiguration.class);
-		new RestTemplate().getForObject("http://localhost:"
-				+ this.context.getEmbeddedWebServer().getPort() + "/",
+		new RestTemplate().getForObject(
+				"http://localhost:" + this.context.getEmbeddedWebServer().getPort() + "/",
 				String.class);
 		this.context.getBean(MultipartConfigElement.class);
 		assertThat(this.context.getBean(StandardServletMultipartResolver.class)).isSameAs(
@@ -228,8 +228,8 @@ public class MultipartAutoConfigurationTests {
 
 	private void verifyServletWorks() {
 		RestTemplate restTemplate = new RestTemplate();
-		String url = "http://localhost:"
-				+ this.context.getEmbeddedWebServer().getPort() + "/";
+		String url = "http://localhost:" + this.context.getEmbeddedWebServer().getPort()
+				+ "/";
 		assertThat(restTemplate.getForObject(url, String.class)).isEqualTo("Hello");
 	}
 
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/RemappedErrorViewIntegrationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/RemappedErrorViewIntegrationTests.java
index 6d69fd04fd..78c599a388 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/RemappedErrorViewIntegrationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/RemappedErrorViewIntegrationTests.java
@@ -69,8 +69,8 @@ public class RemappedErrorViewIntegrationTests {
 	}
 
 	@Configuration
-	@Import({ PropertyPlaceholderAutoConfiguration.class,
-			WebMvcAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class,
+	@Import({ PropertyPlaceholderAutoConfiguration.class, WebMvcAutoConfiguration.class,
+			HttpMessageConvertersAutoConfiguration.class,
 			EmbeddedServletContainerAutoConfiguration.class,
 			DispatcherServletAutoConfiguration.class, ErrorMvcAutoConfiguration.class })
 	@Controller
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesTests.java
index c5e44aee6b..3fd99ba96f 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesTests.java
@@ -76,7 +76,7 @@ public class ServerPropertiesTests {
 
 	@Test
 	public void testConnectionTimeout() throws Exception {
-		Map<String, String> map = new HashMap<String, String>();
+		Map<String, String> map = new HashMap<>();
 		map.put("server.connection-timeout", "60000");
 		bindProperties(map);
 		assertThat(this.properties.getConnectionTimeout()).isEqualTo(60000);
@@ -104,7 +104,7 @@ public class ServerPropertiesTests {
 
 	@Test
 	public void testTomcatBinding() throws Exception {
-		Map<String, String> map = new HashMap<String, String>();
+		Map<String, String> map = new HashMap<>();
 		map.put("server.tomcat.accesslog.pattern", "%h %t '%r' %s %b");
 		map.put("server.tomcat.accesslog.prefix", "foo");
 		map.put("server.tomcat.accesslog.rotate", "false");
@@ -153,7 +153,7 @@ public class ServerPropertiesTests {
 
 	@Test
 	public void testCustomizeUriEncoding() throws Exception {
-		Map<String, String> map = new HashMap<String, String>();
+		Map<String, String> map = new HashMap<>();
 		map.put("server.tomcat.uriEncoding", "US-ASCII");
 		bindProperties(map);
 		assertThat(this.properties.getTomcat().getUriEncoding())
@@ -162,7 +162,7 @@ public class ServerPropertiesTests {
 
 	@Test
 	public void testCustomizeHeaderSize() throws Exception {
-		Map<String, String> map = new HashMap<String, String>();
+		Map<String, String> map = new HashMap<>();
 		map.put("server.maxHttpHeaderSize", "9999");
 		bindProperties(map);
 		assertThat(this.properties.getMaxHttpHeaderSize()).isEqualTo(9999);
@@ -170,7 +170,7 @@ public class ServerPropertiesTests {
 
 	@Test
 	public void testCustomizeJettyAcceptors() throws Exception {
-		Map<String, String> map = new HashMap<String, String>();
+		Map<String, String> map = new HashMap<>();
 		map.put("server.jetty.acceptors", "10");
 		bindProperties(map);
 		assertThat(this.properties.getJetty().getAcceptors()).isEqualTo(10);
@@ -178,7 +178,7 @@ public class ServerPropertiesTests {
 
 	@Test
 	public void testCustomizeJettySelectors() throws Exception {
-		Map<String, String> map = new HashMap<String, String>();
+		Map<String, String> map = new HashMap<>();
 		map.put("server.jetty.selectors", "10");
 		bindProperties(map);
 		assertThat(this.properties.getJetty().getSelectors()).isEqualTo(10);
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebClientAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebClientAutoConfigurationTests.java
index 834cb5907b..f619e18e77 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebClientAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebClientAutoConfigurationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -79,7 +79,7 @@ public class WebClientAutoConfigurationTests {
 		load(CustomHttpMessageConverter.class,
 				HttpMessageConvertersAutoConfiguration.class, RestTemplateConfig.class);
 		RestTemplate restTemplate = this.context.getBean(RestTemplate.class);
-		List<Class<?>> converterClasses = new ArrayList<Class<?>>();
+		List<Class<?>> converterClasses = new ArrayList<>();
 		for (HttpMessageConverter<?> converter : restTemplate.getMessageConverters()) {
 			converterClasses.add(converter.getClass());
 		}
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfigurationTests.java
index 0a5e9ee0f4..1bcebe937d 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfigurationTests.java
@@ -384,7 +384,7 @@ public class WebMvcAutoConfigurationTests {
 	@SuppressWarnings("unchecked")
 	protected Map<String, List<Resource>> getMappingLocations(HandlerMapping mapping)
 			throws IllegalAccessException {
-		Map<String, List<Resource>> mappingLocations = new LinkedHashMap<String, List<Resource>>();
+		Map<String, List<Resource>> mappingLocations = new LinkedHashMap<>();
 		if (mapping instanceof SimpleUrlHandlerMapping) {
 			Field locationsField = ReflectionUtils
 					.findField(ResourceHttpRequestHandler.class, "locations");
@@ -710,7 +710,7 @@ public class WebMvcAutoConfigurationTests {
 	private void load(Class<?> config, String... environment) {
 		this.context = new AnnotationConfigEmbeddedWebApplicationContext();
 		EnvironmentTestUtils.addEnvironment(this.context, environment);
-		List<Class<?>> configClasses = new ArrayList<Class<?>>();
+		List<Class<?>> configClasses = new ArrayList<>();
 		if (config != null) {
 			configClasses.add(config);
 		}
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/websocket/WebSocketMessagingAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/websocket/WebSocketMessagingAutoConfigurationTests.java
index 6226eaa1cc..5adcabcfeb 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/websocket/WebSocketMessagingAutoConfigurationTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/websocket/WebSocketMessagingAutoConfigurationTests.java
@@ -124,7 +124,7 @@ public class WebSocketMessagingAutoConfigurationTests {
 	}
 
 	private List<MessageConverter> getCustomizedConverters() {
-		List<MessageConverter> customizedConverters = new ArrayList<MessageConverter>();
+		List<MessageConverter> customizedConverters = new ArrayList<>();
 		WebSocketMessagingAutoConfiguration.WebSocketMessageConverterConfiguration configuration = new WebSocketMessagingAutoConfiguration.WebSocketMessageConverterConfiguration(
 				new ObjectMapper());
 		configuration.configureMessageConverters(customizedConverters);
@@ -146,8 +146,8 @@ public class WebSocketMessagingAutoConfigurationTests {
 		new ServerPortInfoApplicationContextInitializer().initialize(this.context);
 		this.context.refresh();
 		WebSocketStompClient stompClient = new WebSocketStompClient(this.sockJsClient);
-		final AtomicReference<Throwable> failure = new AtomicReference<Throwable>();
-		final AtomicReference<Object> result = new AtomicReference<Object>();
+		final AtomicReference<Throwable> failure = new AtomicReference<>();
+		final AtomicReference<Object> result = new AtomicReference<>();
 		final CountDownLatch latch = new CountDownLatch(1);
 		StompSessionHandler handler = new StompSessionHandlerAdapter() {
 
diff --git a/spring-boot-cli/src/it/java/org/springframework/boot/cli/infrastructure/CommandLineInvoker.java b/spring-boot-cli/src/it/java/org/springframework/boot/cli/infrastructure/CommandLineInvoker.java
index 923b0d1518..3f36f187b3 100644
--- a/spring-boot-cli/src/it/java/org/springframework/boot/cli/infrastructure/CommandLineInvoker.java
+++ b/spring-boot-cli/src/it/java/org/springframework/boot/cli/infrastructure/CommandLineInvoker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -54,7 +54,7 @@ public final class CommandLineInvoker {
 	}
 
 	private Process runCliProcess(String... args) throws IOException {
-		List<String> command = new ArrayList<String>();
+		List<String> command = new ArrayList<>();
 		command.add(findLaunchScript().getAbsolutePath());
 		command.addAll(Arrays.asList(args));
 		ProcessBuilder processBuilder = new ProcessBuilder(command)
@@ -97,7 +97,7 @@ public final class CommandLineInvoker {
 
 		private final Process process;
 
-		private final List<Thread> streamReaders = new ArrayList<Thread>();
+		private final List<Thread> streamReaders = new ArrayList<>();
 
 		public Invocation(Process process) {
 			this.process = process;
@@ -141,7 +141,7 @@ public final class CommandLineInvoker {
 			BufferedReader reader = new BufferedReader(
 					new StringReader(buffer.toString()));
 			String line;
-			List<String> lines = new ArrayList<String>();
+			List<String> lines = new ArrayList<>();
 			try {
 				while ((line = reader.readLine()) != null) {
 					if (!line.startsWith("Picked up ")) {
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/SpringCli.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/SpringCli.java
index 7fd33b8922..00998f5645 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/SpringCli.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/SpringCli.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -80,7 +80,7 @@ public final class SpringCli {
 	}
 
 	private static URL[] getExtensionURLs() {
-		List<URL> urls = new ArrayList<URL>();
+		List<URL> urls = new ArrayList<>();
 		String home = SystemPropertyUtils
 				.resolvePlaceholders("${spring.home:${SPRING_HOME:.}}");
 		File extDirectory = new File(new File(home, "lib"), "ext");
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/app/SpringApplicationLauncher.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/app/SpringApplicationLauncher.java
index 01068993a5..09459da1d9 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/app/SpringApplicationLauncher.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/app/SpringApplicationLauncher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -57,7 +57,7 @@ public class SpringApplicationLauncher {
 	 * @throws Exception if the launch fails
 	 */
 	public Object launch(Object[] sources, String[] args) throws Exception {
-		Map<String, Object> defaultProperties = new HashMap<String, Object>();
+		Map<String, Object> defaultProperties = new HashMap<>();
 		defaultProperties.put("spring.groovy.template.check-template-location", "false");
 		Class<?> applicationClass = this.classLoader
 				.loadClass(getSpringApplicationClassName());
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/CommandRunner.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/CommandRunner.java
index 0a52a20dd8..bfea4c4cbc 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/CommandRunner.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/CommandRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -43,7 +43,7 @@ public class CommandRunner implements Iterable<Command> {
 
 	private final String name;
 
-	private final List<Command> commands = new ArrayList<Command>();
+	private final List<Command> commands = new ArrayList<>();
 
 	private Class<?>[] optionCommandClasses = {};
 
@@ -185,7 +185,7 @@ public class CommandRunner implements Iterable<Command> {
 	}
 
 	private String[] removeDebugFlags(String[] args) {
-		List<String> rtn = new ArrayList<String>(args.length);
+		List<String> rtn = new ArrayList<>(args.length);
 		boolean appArgsDetected = false;
 		for (String arg : args) {
 			// Allow apps to have a -d argument
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/archive/ArchiveCommand.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/archive/ArchiveCommand.java
index be7086f776..4e47c6f162 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/archive/ArchiveCommand.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/archive/ArchiveCommand.java
@@ -168,7 +168,7 @@ abstract class ArchiveCommand extends OptionParsingCommand {
 		}
 
 		private List<URL> getClassPathUrls(GroovyCompiler compiler) {
-			return new ArrayList<URL>(Arrays.asList(compiler.getLoader().getURLs()));
+			return new ArrayList<>(Arrays.asList(compiler.getLoader().getURLs()));
 		}
 
 		private List<MatchedResource> findMatchingClasspathEntries(List<URL> classpath,
@@ -176,7 +176,7 @@ abstract class ArchiveCommand extends OptionParsingCommand {
 			ResourceMatcher matcher = new ResourceMatcher(
 					options.valuesOf(this.includeOption),
 					options.valuesOf(this.excludeOption));
-			List<File> roots = new ArrayList<File>();
+			List<File> roots = new ArrayList<>();
 			for (URL classpathEntry : classpath) {
 				roots.add(new File(URI.create(classpathEntry.toString())));
 			}
@@ -215,7 +215,7 @@ abstract class ArchiveCommand extends OptionParsingCommand {
 
 		private List<Library> createLibraries(List<URL> dependencies)
 				throws URISyntaxException {
-			List<Library> libraries = new ArrayList<Library>();
+			List<Library> libraries = new ArrayList<>();
 			for (URL dependency : dependencies) {
 				File file = new File(dependency.toURI());
 				libraries.add(new Library(file, getLibraryScope(file)));
@@ -277,7 +277,7 @@ abstract class ArchiveCommand extends OptionParsingCommand {
 
 		private List<Library> addClasspathEntries(JarWriter writer,
 				List<MatchedResource> entries) throws IOException {
-			List<Library> libraries = new ArrayList<Library>();
+			List<Library> libraries = new ArrayList<>();
 			for (MatchedResource entry : entries) {
 				if (entry.isRoot()) {
 					libraries.add(new Library(entry.getFile(), LibraryScope.COMPILE));
@@ -329,7 +329,7 @@ abstract class ArchiveCommand extends OptionParsingCommand {
 		private void disableGrabResolvers(List<? extends AnnotatedNode> nodes) {
 			for (AnnotatedNode classNode : nodes) {
 				List<AnnotationNode> annotations = classNode.getAnnotations();
-				for (AnnotationNode node : new ArrayList<AnnotationNode>(annotations)) {
+				for (AnnotationNode node : new ArrayList<>(annotations)) {
 					if (node.getClassNode().getNameWithoutPackage()
 							.equals("GrabResolver")) {
 						node.setMember("initClass", new ConstantExpression(false));
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/archive/ResourceMatcher.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/archive/ResourceMatcher.java
index da162bed9b..f4a0a7f267 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/archive/ResourceMatcher.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/archive/ResourceMatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -60,7 +60,7 @@ class ResourceMatcher {
 	}
 
 	public List<MatchedResource> find(List<File> roots) throws IOException {
-		List<MatchedResource> matchedResources = new ArrayList<MatchedResource>();
+		List<MatchedResource> matchedResources = new ArrayList<>();
 		for (File root : roots) {
 			if (root.isFile()) {
 				matchedResources.add(new MatchedResource(root));
@@ -73,7 +73,7 @@ class ResourceMatcher {
 	}
 
 	private List<MatchedResource> findInFolder(File folder) throws IOException {
-		List<MatchedResource> matchedResources = new ArrayList<MatchedResource>();
+		List<MatchedResource> matchedResources = new ArrayList<>();
 
 		PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(
 				new FolderResourceLoader(folder));
@@ -103,8 +103,8 @@ class ResourceMatcher {
 	}
 
 	private List<String> getOptions(List<String> values, String[] defaults) {
-		Set<String> result = new LinkedHashSet<String>();
-		Set<String> minus = new LinkedHashSet<String>();
+		Set<String> result = new LinkedHashSet<>();
+		Set<String> minus = new LinkedHashSet<>();
 		boolean deltasFound = false;
 		for (String value : values) {
 			if (value.startsWith("+")) {
@@ -126,7 +126,7 @@ class ResourceMatcher {
 				result.add(value);
 			}
 		}
-		return new ArrayList<String>(result);
+		return new ArrayList<>(result);
 	}
 
 	/**
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/core/HelpCommand.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/core/HelpCommand.java
index 0d41157aae..5a16d39f85 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/core/HelpCommand.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/core/HelpCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -58,7 +58,7 @@ public class HelpCommand extends AbstractCommand {
 
 	@Override
 	public Collection<OptionHelp> getOptionsHelp() {
-		List<OptionHelp> help = new ArrayList<OptionHelp>();
+		List<OptionHelp> help = new ArrayList<>();
 		for (final Command command : this.commandRunner) {
 			if (isHelpShown(command)) {
 				help.add(new OptionHelp() {
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/core/HintCommand.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/core/HintCommand.java
index 2803e32940..88dfbefc98 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/core/HintCommand.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/core/HintCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -46,7 +46,7 @@ public class HintCommand extends AbstractCommand {
 	public ExitStatus run(String... args) throws Exception {
 		try {
 			int index = (args.length == 0 ? 0 : Integer.valueOf(args[0]) - 1);
-			List<String> arguments = new ArrayList<String>(args.length);
+			List<String> arguments = new ArrayList<>(args.length);
 			for (int i = 2; i < args.length; i++) {
 				arguments.add(args[i]);
 			}
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitCommand.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitCommand.java
index f80e123fa1..f831a77151 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitCommand.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -59,7 +59,7 @@ public class InitCommand extends OptionParsingCommand {
 
 	@Override
 	public Collection<HelpExample> getExamples() {
-		List<HelpExample> examples = new ArrayList<HelpExample>();
+		List<HelpExample> examples = new ArrayList<>();
 		examples.add(new HelpExample("To list all the capabilities of the service",
 				"spring init --list"));
 		examples.add(new HelpExample("To creates a default project", "spring init"));
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitializrServiceMetadata.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitializrServiceMetadata.java
index b8f125ce9b..123b4a51be 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitializrServiceMetadata.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/InitializrServiceMetadata.java
@@ -68,12 +68,12 @@ class InitializrServiceMetadata {
 	}
 
 	InitializrServiceMetadata(ProjectType defaultProjectType) {
-		this.dependencies = new HashMap<String, Dependency>();
-		this.projectTypes = new MetadataHolder<String, ProjectType>();
+		this.dependencies = new HashMap<>();
+		this.projectTypes = new MetadataHolder<>();
 		this.projectTypes.getContent().put(defaultProjectType.getId(),
 				defaultProjectType);
 		this.projectTypes.setDefaultItem(defaultProjectType);
-		this.defaults = new HashMap<String, String>();
+		this.defaults = new HashMap<>();
 	}
 
 	/**
@@ -128,7 +128,7 @@ class InitializrServiceMetadata {
 
 	private Map<String, Dependency> parseDependencies(JSONObject root)
 			throws JSONException {
-		Map<String, Dependency> result = new HashMap<String, Dependency>();
+		Map<String, Dependency> result = new HashMap<>();
 		if (!root.has(DEPENDENCIES_EL)) {
 			return result;
 		}
@@ -143,7 +143,7 @@ class InitializrServiceMetadata {
 
 	private MetadataHolder<String, ProjectType> parseProjectTypes(JSONObject root)
 			throws JSONException {
-		MetadataHolder<String, ProjectType> result = new MetadataHolder<String, ProjectType>();
+		MetadataHolder<String, ProjectType> result = new MetadataHolder<>();
 		if (!root.has(TYPE_EL)) {
 			return result;
 		}
@@ -163,7 +163,7 @@ class InitializrServiceMetadata {
 	}
 
 	private Map<String, String> parseDefaults(JSONObject root) throws JSONException {
-		Map<String, String> result = new HashMap<String, String>();
+		Map<String, String> result = new HashMap<>();
 		Iterator<?> keys = root.keys();
 		while (keys.hasNext()) {
 			String key = (String) keys.next();
@@ -202,7 +202,7 @@ class InitializrServiceMetadata {
 		String name = getStringValue(object, NAME_ATTRIBUTE, null);
 		String action = getStringValue(object, ACTION_ATTRIBUTE, null);
 		boolean defaultType = id.equals(defaultId);
-		Map<String, String> tags = new HashMap<String, String>();
+		Map<String, String> tags = new HashMap<>();
 		if (object.has("tags")) {
 			JSONObject jsonTags = object.getJSONObject("tags");
 			tags.putAll(parseStringItems(jsonTags));
@@ -216,7 +216,7 @@ class InitializrServiceMetadata {
 	}
 
 	private Map<String, String> parseStringItems(JSONObject json) throws JSONException {
-		Map<String, String> result = new HashMap<String, String>();
+		Map<String, String> result = new HashMap<>();
 		for (Iterator<?> iterator = json.keys(); iterator.hasNext();) {
 			String key = (String) iterator.next();
 			Object value = json.get(key);
@@ -234,7 +234,7 @@ class InitializrServiceMetadata {
 		private T defaultItem;
 
 		private MetadataHolder() {
-			this.content = new HashMap<K, T>();
+			this.content = new HashMap<>();
 		}
 
 		public Map<K, T> getContent() {
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectGenerationRequest.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectGenerationRequest.java
index 4cf44fd5ed..697c838ee4 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectGenerationRequest.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectGenerationRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -73,7 +73,7 @@ class ProjectGenerationRequest {
 
 	private String bootVersion;
 
-	private List<String> dependencies = new ArrayList<String>();
+	private List<String> dependencies = new ArrayList<>();
 
 	/**
 	 * The URL of the service to use.
@@ -374,8 +374,7 @@ class ProjectGenerationRequest {
 			return result;
 		}
 		else if (isDetectType()) {
-			Map<String, ProjectType> types = new HashMap<String, ProjectType>(
-					metadata.getProjectTypes());
+			Map<String, ProjectType> types = new HashMap<>(metadata.getProjectTypes());
 			if (this.build != null) {
 				filter(types, "build", this.build);
 			}
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectType.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectType.java
index df30b3e36b..383080bee4 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectType.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ProjectType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -36,7 +36,7 @@ class ProjectType {
 
 	private final boolean defaultType;
 
-	private final Map<String, String> tags = new HashMap<String, String>();
+	private final Map<String, String> tags = new HashMap<>();
 
 	ProjectType(String id, String name, String action, boolean defaultType,
 			Map<String, String> tags) {
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ServiceCapabilitiesReportGenerator.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ServiceCapabilitiesReportGenerator.java
index 9c33682a54..0e1f776265 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ServiceCapabilitiesReportGenerator.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ServiceCapabilitiesReportGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -93,8 +93,7 @@ class ServiceCapabilitiesReportGenerator {
 	}
 
 	private List<Dependency> getSortedDependencies(InitializrServiceMetadata metadata) {
-		ArrayList<Dependency> dependencies = new ArrayList<Dependency>(
-				metadata.getDependencies());
+		ArrayList<Dependency> dependencies = new ArrayList<>(metadata.getDependencies());
 		Collections.sort(dependencies, new Comparator<Dependency>() {
 			@Override
 			public int compare(Dependency o1, Dependency o2) {
@@ -108,7 +107,7 @@ class ServiceCapabilitiesReportGenerator {
 			StringBuilder report) {
 		report.append("Available project types:" + NEW_LINE);
 		report.append("------------------------" + NEW_LINE);
-		SortedSet<Entry<String, ProjectType>> entries = new TreeSet<Entry<String, ProjectType>>(
+		SortedSet<Entry<String, ProjectType>> entries = new TreeSet<>(
 				new Comparator<Entry<String, ProjectType>>() {
 
 					@Override
@@ -150,8 +149,7 @@ class ServiceCapabilitiesReportGenerator {
 			InitializrServiceMetadata metadata) {
 		report.append("Defaults:" + NEW_LINE);
 		report.append("---------" + NEW_LINE);
-		List<String> defaultsKeys = new ArrayList<String>(
-				metadata.getDefaults().keySet());
+		List<String> defaultsKeys = new ArrayList<>(metadata.getDefaults().keySet());
 		Collections.sort(defaultsKeys);
 		for (String defaultsKey : defaultsKeys) {
 			String defaultsValue = metadata.getDefaults().get(defaultsKey);
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/install/GroovyGrabDependencyResolver.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/install/GroovyGrabDependencyResolver.java
index ae03dde601..087692bbf2 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/install/GroovyGrabDependencyResolver.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/install/GroovyGrabDependencyResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -50,7 +50,7 @@ class GroovyGrabDependencyResolver implements DependencyResolver {
 	public List<File> resolve(List<String> artifactIdentifiers)
 			throws CompilationFailedException, IOException {
 		GroovyCompiler groovyCompiler = new GroovyCompiler(this.configuration);
-		List<File> artifactFiles = new ArrayList<File>();
+		List<File> artifactFiles = new ArrayList<>();
 		if (!artifactIdentifiers.isEmpty()) {
 			List<URL> initialUrls = getClassPathUrls(groovyCompiler);
 			groovyCompiler.compile(createSources(artifactIdentifiers));
@@ -64,7 +64,7 @@ class GroovyGrabDependencyResolver implements DependencyResolver {
 	}
 
 	private List<URL> getClassPathUrls(GroovyCompiler compiler) {
-		return new ArrayList<URL>(Arrays.asList(compiler.getLoader().getURLs()));
+		return new ArrayList<>(Arrays.asList(compiler.getLoader().getURLs()));
 	}
 
 	private String createSources(List<String> artifactIdentifiers) throws IOException {
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/OptionHandler.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/OptionHandler.java
index 305938d0f8..b3f6c004c1 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/OptionHandler.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/OptionHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -126,7 +126,7 @@ public class OptionHandler {
 
 	private static class OptionHelpFormatter implements HelpFormatter {
 
-		private final List<OptionHelp> help = new ArrayList<OptionHelp>();
+		private final List<OptionHelp> help = new ArrayList<>();
 
 		@Override
 		public String format(Map<String, ? extends OptionDescriptor> options) {
@@ -138,7 +138,7 @@ public class OptionHandler {
 				}
 			};
 
-			Set<OptionDescriptor> sorted = new TreeSet<OptionDescriptor>(comparator);
+			Set<OptionDescriptor> sorted = new TreeSet<>(comparator);
 			sorted.addAll(options.values());
 
 			for (OptionDescriptor descriptor : sorted) {
@@ -162,7 +162,7 @@ public class OptionHandler {
 		private final String description;
 
 		OptionHelpAdapter(OptionDescriptor descriptor) {
-			this.options = new LinkedHashSet<String>();
+			this.options = new LinkedHashSet<>();
 			for (String option : descriptor.options()) {
 				this.options.add((option.length() == 1 ? "-" : "--") + option);
 			}
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/SourceOptions.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/SourceOptions.java
index 60a4eaa242..0d9bd95acb 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/SourceOptions.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/SourceOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -71,7 +71,7 @@ public class SourceOptions {
 	}
 
 	private SourceOptions(List<?> nonOptionArguments, ClassLoader classLoader) {
-		List<String> sources = new ArrayList<String>();
+		List<String> sources = new ArrayList<>();
 		int sourceArgCount = 0;
 		for (Object option : nonOptionArguments) {
 			if (option instanceof String) {
@@ -79,7 +79,7 @@ public class SourceOptions {
 				if ("--".equals(filename)) {
 					break;
 				}
-				List<String> urls = new ArrayList<String>();
+				List<String> urls = new ArrayList<>();
 				File fileCandidate = new File(filename);
 				if (fileCandidate.isFile()) {
 					urls.add(fileCandidate.getAbsoluteFile().toURI().toString());
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/SpringApplicationRunner.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/SpringApplicationRunner.java
index a7920921c3..49d4a5f072 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/SpringApplicationRunner.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/run/SpringApplicationRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -230,7 +230,7 @@ public class SpringApplicationRunner {
 		}
 
 		private List<File> getSourceFiles() {
-			List<File> sources = new ArrayList<File>();
+			List<File> sources = new ArrayList<>();
 			for (String source : SpringApplicationRunner.this.sources) {
 				List<String> paths = ResourceUtils.getUrls(source,
 						SpringApplicationRunner.this.compiler.getLoader());
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/CommandCompleter.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/CommandCompleter.java
index 5bfa79a542..e741eea27d 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/CommandCompleter.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/CommandCompleter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -42,20 +42,20 @@ import org.springframework.boot.cli.util.Log;
  */
 public class CommandCompleter extends StringsCompleter {
 
-	private final Map<String, Completer> commandCompleters = new HashMap<String, Completer>();
+	private final Map<String, Completer> commandCompleters = new HashMap<>();
 
-	private final List<Command> commands = new ArrayList<Command>();
+	private final List<Command> commands = new ArrayList<>();
 
 	private final ConsoleReader console;
 
 	public CommandCompleter(ConsoleReader consoleReader,
 			ArgumentDelimiter argumentDelimiter, Iterable<Command> commands) {
 		this.console = consoleReader;
-		List<String> names = new ArrayList<String>();
+		List<String> names = new ArrayList<>();
 		for (Command command : commands) {
 			this.commands.add(command);
 			names.add(command.getName());
-			List<String> options = new ArrayList<String>();
+			List<String> options = new ArrayList<>();
 			for (OptionHelp optionHelp : command.getOptionsHelp()) {
 				options.addAll(optionHelp.getOptions());
 			}
@@ -95,7 +95,7 @@ public class CommandCompleter extends StringsCompleter {
 	private void printUsage(Command command) {
 		try {
 			int maxOptionsLength = 0;
-			List<OptionHelpLine> optionHelpLines = new ArrayList<OptionHelpLine>();
+			List<OptionHelpLine> optionHelpLines = new ArrayList<>();
 			for (OptionHelp optionHelp : command.getOptionsHelp()) {
 				OptionHelpLine optionHelpLine = new OptionHelpLine(optionHelp);
 				optionHelpLines.add(optionHelpLine);
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ForkProcessCommand.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ForkProcessCommand.java
index 483abdb03e..720da50692 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ForkProcessCommand.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ForkProcessCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -69,7 +69,7 @@ class ForkProcessCommand extends RunProcessCommand {
 
 	@Override
 	public ExitStatus run(String... args) throws Exception {
-		List<String> fullArgs = new ArrayList<String>();
+		List<String> fullArgs = new ArrayList<>();
 		fullArgs.add("-cp");
 		fullArgs.add(System.getProperty("java.class.path"));
 		fullArgs.add(MAIN_CLASS);
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/Shell.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/Shell.java
index c9f84dbf57..b2745217e5 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/Shell.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/Shell.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -51,7 +51,7 @@ public class Shell {
 	private static final Set<Class<?>> NON_FORKED_COMMANDS;
 
 	static {
-		Set<Class<?>> nonForked = new HashSet<Class<?>>();
+		Set<Class<?>> nonForked = new HashSet<>();
 		nonForked.add(VersionCommand.class);
 		NON_FORKED_COMMANDS = Collections.unmodifiableSet(nonForked);
 	}
@@ -86,7 +86,7 @@ public class Shell {
 	}
 
 	private Iterable<Command> getCommands() {
-		List<Command> commands = new ArrayList<Command>();
+		List<Command> commands = new ArrayList<>();
 		ServiceLoader<CommandFactory> factories = ServiceLoader.load(CommandFactory.class,
 				getClass().getClassLoader());
 		for (CommandFactory factory : factories) {
@@ -193,7 +193,7 @@ public class Shell {
 
 		private volatile Command lastCommand;
 
-		private final Map<String, String> aliases = new HashMap<String, String>();
+		private final Map<String, String> aliases = new HashMap<>();
 
 		ShellCommandRunner() {
 			super(null);
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ShellPrompts.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ShellPrompts.java
index 1b8ec1f67a..bca81c3cb3 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ShellPrompts.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/shell/ShellPrompts.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -27,7 +27,7 @@ public class ShellPrompts {
 
 	private static final String DEFAULT_PROMPT = "$ ";
 
-	private final Stack<String> prompts = new Stack<String>();
+	private final Stack<String> prompts = new Stack<>();
 
 	/**
 	 * Push a new prompt to be used by the shell.
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/test/TestRunner.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/test/TestRunner.java
index aeab1d3a3f..3b35d163cd 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/test/TestRunner.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/test/TestRunner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -112,7 +112,7 @@ public class TestRunner {
 		}
 
 		private Class<?>[] getTestClasses(Object[] sources) {
-			List<Class<?>> testClasses = new ArrayList<Class<?>>();
+			List<Class<?>> testClasses = new ArrayList<>();
 			for (Object source : sources) {
 				if ((source instanceof Class) && isTestable((Class<?>) source)) {
 					testClasses.add((Class<?>) source);
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/AnnotatedNodeASTTransformation.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/AnnotatedNodeASTTransformation.java
index d0eb45e69a..bfcfb806b6 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/AnnotatedNodeASTTransformation.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/AnnotatedNodeASTTransformation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -56,7 +56,7 @@ public abstract class AnnotatedNodeASTTransformation implements ASTTransformatio
 	@Override
 	public void visit(ASTNode[] nodes, SourceUnit source) {
 		this.sourceUnit = source;
-		List<AnnotationNode> annotationNodes = new ArrayList<AnnotationNode>();
+		List<AnnotationNode> annotationNodes = new ArrayList<>();
 		ClassVisitor classVisitor = new ClassVisitor(source, annotationNodes);
 		for (ASTNode node : nodes) {
 			if (node instanceof ModuleNode) {
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/AstUtils.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/AstUtils.java
index e30f530a1e..ef2656c1e0 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/AstUtils.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/AstUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -98,7 +98,7 @@ public abstract class AstUtils {
 	 * @return {@code true} if at least one of the types is found, otherwise {@code false}
 	 */
 	public static boolean hasAtLeastOneFieldOrMethod(ClassNode node, String... types) {
-		Set<String> typesSet = new HashSet<String>(Arrays.asList(types));
+		Set<String> typesSet = new HashSet<>(Arrays.asList(types));
 		for (FieldNode field : node.getFields()) {
 			if (typesSet.contains(field.getType().getName())) {
 				return true;
@@ -130,7 +130,7 @@ public abstract class AstUtils {
 	}
 
 	public static boolean hasAtLeastOneInterface(ClassNode classNode, String... types) {
-		Set<String> typesSet = new HashSet<String>(Arrays.asList(types));
+		Set<String> typesSet = new HashSet<>(Arrays.asList(types));
 		for (ClassNode inter : classNode.getInterfaces()) {
 			if (typesSet.contains(inter.getName())) {
 				return true;
@@ -167,7 +167,7 @@ public abstract class AstUtils {
 
 	private static List<ExpressionStatement> getExpressionStatements(
 			BlockStatement block) {
-		ArrayList<ExpressionStatement> statements = new ArrayList<ExpressionStatement>();
+		ArrayList<ExpressionStatement> statements = new ArrayList<>();
 		for (Statement statement : block.getStatements()) {
 			if (statement instanceof ExpressionStatement) {
 				statements.add((ExpressionStatement) statement);
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyManagementBomTransformation.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyManagementBomTransformation.java
index fabf061962..7b84789ea3 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyManagementBomTransformation.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/DependencyManagementBomTransformation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -70,8 +70,8 @@ public class DependencyManagementBomTransformation
 	public static final int ORDER = Ordered.HIGHEST_PRECEDENCE + 100;
 
 	private static final Set<String> DEPENDENCY_MANAGEMENT_BOM_ANNOTATION_NAMES = Collections
-			.unmodifiableSet(new HashSet<String>(
-					Arrays.asList(DependencyManagementBom.class.getName(),
+			.unmodifiableSet(
+					new HashSet<>(Arrays.asList(DependencyManagementBom.class.getName(),
 							DependencyManagementBom.class.getSimpleName())));
 
 	private final DependencyResolutionContext resolutionContext;
@@ -106,14 +106,14 @@ public class DependencyManagementBomTransformation
 		Map<String, String> dependency = null;
 		List<ConstantExpression> constantExpressions = getConstantExpressions(
 				valueExpression);
-		List<Map<String, String>> dependencies = new ArrayList<Map<String, String>>(
+		List<Map<String, String>> dependencies = new ArrayList<>(
 				constantExpressions.size());
 		for (ConstantExpression expression : constantExpressions) {
 			Object value = expression.getValue();
 			if (value instanceof String) {
 				String[] components = ((String) expression.getValue()).split(":");
 				if (components.length == 3) {
-					dependency = new HashMap<String, String>();
+					dependency = new HashMap<>();
 					dependency.put("group", components[0]);
 					dependency.put("module", components[1]);
 					dependency.put("version", components[2]);
@@ -143,7 +143,7 @@ public class DependencyManagementBomTransformation
 
 	private List<ConstantExpression> getConstantExpressions(
 			ListExpression valueExpression) {
-		List<ConstantExpression> expressions = new ArrayList<ConstantExpression>();
+		List<ConstantExpression> expressions = new ArrayList<>();
 		for (Expression expression : valueExpression.getExpressions()) {
 			if (expression instanceof ConstantExpression
 					&& ((ConstantExpression) expression).getValue() instanceof String) {
@@ -213,7 +213,7 @@ public class DependencyManagementBomTransformation
 		@Override
 		public ModelSource resolveModel(String groupId, String artifactId, String version)
 				throws UnresolvableModelException {
-			Map<String, String> dependency = new HashMap<String, String>();
+			Map<String, String> dependency = new HashMap<>();
 			dependency.put("group", groupId);
 			dependency.put("module", artifactId);
 			dependency.put("version", version);
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/ExtendedGroovyClassLoader.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/ExtendedGroovyClassLoader.java
index 9992ba9c6d..a3bee740ea 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/ExtendedGroovyClassLoader.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/ExtendedGroovyClassLoader.java
@@ -53,7 +53,7 @@ public class ExtendedGroovyClassLoader extends GroovyClassLoader {
 
 	private static final URL[] NO_URLS = new URL[] {};
 
-	private final Map<String, byte[]> classResources = new HashMap<String, byte[]>();
+	private final Map<String, byte[]> classResources = new HashMap<>();
 
 	private final GroovyCompilerScope scope;
 
@@ -183,13 +183,13 @@ public class ExtendedGroovyClassLoader extends GroovyClassLoader {
 		}
 
 		private URL[] getGroovyJars(final ClassLoader parent) {
-			Set<URL> urls = new HashSet<URL>();
+			Set<URL> urls = new HashSet<>();
 			findGroovyJarsDirectly(parent, urls);
 			if (urls.isEmpty()) {
 				findGroovyJarsFromClassPath(parent, urls);
 			}
 			Assert.state(!urls.isEmpty(), "Unable to find groovy JAR");
-			return new ArrayList<URL>(urls).toArray(new URL[urls.size()]);
+			return new ArrayList<>(urls).toArray(new URL[urls.size()]);
 		}
 
 		private void findGroovyJarsDirectly(ClassLoader classLoader, Set<URL> urls) {
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GenericBomAstTransformation.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GenericBomAstTransformation.java
index 0e5b490d23..11ed2f71e1 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GenericBomAstTransformation.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GenericBomAstTransformation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -81,7 +81,7 @@ public abstract class GenericBomAstTransformation
 		AnnotatedNode annotated = getAnnotatedNode(node);
 		if (annotated != null) {
 			AnnotationNode bom = getAnnotation(annotated);
-			List<Expression> expressions = new ArrayList<Expression>(
+			List<Expression> expressions = new ArrayList<>(
 					getConstantExpressions(bom.getMember("value")));
 			expressions.add(new ConstantExpression(module));
 			bom.setMember("value", new ListExpression(expressions));
@@ -122,7 +122,7 @@ public abstract class GenericBomAstTransformation
 
 	private List<ConstantExpression> getConstantExpressions(
 			ListExpression valueExpression) {
-		List<ConstantExpression> expressions = new ArrayList<ConstantExpression>();
+		List<ConstantExpression> expressions = new ArrayList<>();
 		for (Expression expression : valueExpression.getExpressions()) {
 			if (expression instanceof ConstantExpression
 					&& ((ConstantExpression) expression).getValue() instanceof String) {
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyBeansTransformation.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyBeansTransformation.java
index 1e3b42775c..836e188209 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyBeansTransformation.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyBeansTransformation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -53,8 +53,7 @@ public class GroovyBeansTransformation implements ASTTransformation {
 		for (ASTNode node : nodes) {
 			if (node instanceof ModuleNode) {
 				ModuleNode module = (ModuleNode) node;
-				for (ClassNode classNode : new ArrayList<ClassNode>(
-						module.getClasses())) {
+				for (ClassNode classNode : new ArrayList<>(module.getClasses())) {
 					if (classNode.isScript()) {
 						classNode.visitContents(new ClassVisitor(source, classNode));
 					}
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompiler.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompiler.java
index 7b4db23c27..0e31ed167f 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompiler.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompiler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -109,7 +109,7 @@ public class GroovyCompiler {
 			this.compilerAutoConfigurations = Collections.emptySet();
 		}
 
-		this.transformations = new ArrayList<ASTTransformation>();
+		this.transformations = new ArrayList<>();
 		this.transformations
 				.add(new DependencyManagementBomTransformation(resolutionContext));
 		this.transformations.add(new DependencyAutoConfigurationTransformation(
@@ -184,7 +184,7 @@ public class GroovyCompiler {
 			throws CompilationFailedException, IOException {
 
 		this.loader.clearCache();
-		List<Class<?>> classes = new ArrayList<Class<?>>();
+		List<Class<?>> classes = new ArrayList<>();
 
 		CompilerConfiguration configuration = this.loader.getConfiguration();
 
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/RepositoryConfigurationFactory.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/RepositoryConfigurationFactory.java
index 3b60f5d3d9..d6b6462c75 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/RepositoryConfigurationFactory.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/RepositoryConfigurationFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -59,7 +59,7 @@ public final class RepositoryConfigurationFactory {
 	 */
 	public static List<RepositoryConfiguration> createDefaultRepositoryConfiguration() {
 		MavenSettings mavenSettings = new MavenSettingsReader().readSettings();
-		List<RepositoryConfiguration> repositoryConfiguration = new ArrayList<RepositoryConfiguration>();
+		List<RepositoryConfiguration> repositoryConfiguration = new ArrayList<>();
 		repositoryConfiguration.add(MAVEN_CENTRAL);
 		if (!Boolean.getBoolean("disableSpringSnapshotRepos")) {
 			repositoryConfiguration.add(SPRING_MILESTONE);
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/ResolveDependencyCoordinatesTransformation.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/ResolveDependencyCoordinatesTransformation.java
index 723d966764..4db5495306 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/ResolveDependencyCoordinatesTransformation.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/ResolveDependencyCoordinatesTransformation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -47,7 +47,7 @@ public class ResolveDependencyCoordinatesTransformation
 	public static final int ORDER = DependencyManagementBomTransformation.ORDER + 300;
 
 	private static final Set<String> GRAB_ANNOTATION_NAMES = Collections
-			.unmodifiableSet(new HashSet<String>(
+			.unmodifiableSet(new HashSet<>(
 					Arrays.asList(Grab.class.getName(), Grab.class.getSimpleName())));
 
 	private final DependencyResolutionContext resolutionContext;
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/dependencies/CompositeDependencyManagement.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/dependencies/CompositeDependencyManagement.java
index f6d19d5e35..8cf2be3c46 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/dependencies/CompositeDependencyManagement.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/dependencies/CompositeDependencyManagement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -31,7 +31,7 @@ public class CompositeDependencyManagement implements DependencyManagement {
 
 	private final List<DependencyManagement> delegates;
 
-	private final List<Dependency> dependencies = new ArrayList<Dependency>();
+	private final List<Dependency> dependencies = new ArrayList<>();
 
 	public CompositeDependencyManagement(DependencyManagement... delegates) {
 		this.delegates = Arrays.asList(delegates);
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/dependencies/MavenModelDependencyManagement.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/dependencies/MavenModelDependencyManagement.java
index 7442978870..7effd91830 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/dependencies/MavenModelDependencyManagement.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/dependencies/MavenModelDependencyManagement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -35,7 +35,7 @@ public class MavenModelDependencyManagement implements DependencyManagement {
 
 	private final List<Dependency> dependencies;
 
-	private final Map<String, Dependency> byArtifactId = new LinkedHashMap<String, Dependency>();
+	private final Map<String, Dependency> byArtifactId = new LinkedHashMap<>();
 
 	public MavenModelDependencyManagement(Model model) {
 		this.dependencies = extractDependenciesFromModel(model);
@@ -45,10 +45,10 @@ public class MavenModelDependencyManagement implements DependencyManagement {
 	}
 
 	private static List<Dependency> extractDependenciesFromModel(Model model) {
-		List<Dependency> dependencies = new ArrayList<Dependency>();
+		List<Dependency> dependencies = new ArrayList<>();
 		for (org.apache.maven.model.Dependency mavenDependency : model
 				.getDependencyManagement().getDependencies()) {
-			List<Exclusion> exclusions = new ArrayList<Exclusion>();
+			List<Exclusion> exclusions = new ArrayList<>();
 			for (org.apache.maven.model.Exclusion mavenExclusion : mavenDependency
 					.getExclusions()) {
 				exclusions.add(new Exclusion(mavenExclusion.getGroupId(),
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngine.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngine.java
index c62d40f98d..ec4be5b5b0 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngine.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -56,7 +56,7 @@ public class AetherGrapeEngine implements GrapeEngine {
 	private static final Collection<Exclusion> WILDCARD_EXCLUSION;
 
 	static {
-		List<Exclusion> exclusions = new ArrayList<Exclusion>();
+		List<Exclusion> exclusions = new ArrayList<>();
 		exclusions.add(new Exclusion("*", "*", "*", "*"));
 		WILDCARD_EXCLUSION = Collections.unmodifiableList(exclusions);
 	}
@@ -82,9 +82,8 @@ public class AetherGrapeEngine implements GrapeEngine {
 		this.repositorySystem = repositorySystem;
 		this.session = repositorySystemSession;
 		this.resolutionContext = resolutionContext;
-		this.repositories = new ArrayList<RemoteRepository>();
-		List<RemoteRepository> remotes = new ArrayList<RemoteRepository>(
-				remoteRepositories);
+		this.repositories = new ArrayList<>();
+		List<RemoteRepository> remotes = new ArrayList<>(remoteRepositories);
 		Collections.reverse(remotes); // priority is reversed in addRepository
 		for (RemoteRepository repository : remotes) {
 			addRepository(repository);
@@ -141,7 +140,7 @@ public class AetherGrapeEngine implements GrapeEngine {
 
 	@SuppressWarnings("unchecked")
 	private List<Exclusion> createExclusions(Map<?, ?> args) {
-		List<Exclusion> exclusions = new ArrayList<Exclusion>();
+		List<Exclusion> exclusions = new ArrayList<>();
 		if (args != null) {
 			List<Map<String, Object>> exclusionMaps = (List<Map<String, Object>>) args
 					.get("excludes");
@@ -162,7 +161,7 @@ public class AetherGrapeEngine implements GrapeEngine {
 
 	private List<Dependency> createDependencies(Map<?, ?>[] dependencyMaps,
 			List<Exclusion> exclusions) {
-		List<Dependency> dependencies = new ArrayList<Dependency>(dependencyMaps.length);
+		List<Dependency> dependencies = new ArrayList<>(dependencyMaps.length);
 		for (Map<?, ?> dependencyMap : dependencyMaps) {
 			dependencies.add(createDependency(dependencyMap, exclusions));
 		}
@@ -212,7 +211,7 @@ public class AetherGrapeEngine implements GrapeEngine {
 	}
 
 	private List<Dependency> getDependencies(DependencyResult dependencyResult) {
-		List<Dependency> dependencies = new ArrayList<Dependency>();
+		List<Dependency> dependencies = new ArrayList<>();
 		for (ArtifactResult artifactResult : dependencyResult.getArtifactResults()) {
 			dependencies.add(
 					new Dependency(artifactResult.getArtifact(), JavaScopes.COMPILE));
@@ -221,7 +220,7 @@ public class AetherGrapeEngine implements GrapeEngine {
 	}
 
 	private List<File> getFiles(DependencyResult dependencyResult) {
-		List<File> files = new ArrayList<File>();
+		List<File> files = new ArrayList<>();
 		for (ArtifactResult result : dependencyResult.getArtifactResults()) {
 			files.add(result.getArtifact().getFile());
 		}
@@ -297,7 +296,7 @@ public class AetherGrapeEngine implements GrapeEngine {
 		List<Dependency> dependencies = createDependencies(dependencyMaps, exclusions);
 		try {
 			List<File> files = resolve(dependencies);
-			List<URI> uris = new ArrayList<URI>(files.size());
+			List<URI> uris = new ArrayList<>(files.size());
 			for (File file : files) {
 				uris.add(file.toURI());
 			}
@@ -328,7 +327,7 @@ public class AetherGrapeEngine implements GrapeEngine {
 
 	private CollectRequest getCollectRequest(List<Dependency> dependencies) {
 		CollectRequest collectRequest = new CollectRequest((Dependency) null,
-				dependencies, new ArrayList<RemoteRepository>(this.repositories));
+				dependencies, new ArrayList<>(this.repositories));
 		collectRequest
 				.setManagedDependencies(this.resolutionContext.getManagedDependencies());
 		return collectRequest;
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineFactory.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineFactory.java
index 13017518c1..8878a67041 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineFactory.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -79,7 +79,7 @@ public abstract class AetherGrapeEngineFactory {
 
 	private static List<RemoteRepository> createRepositories(
 			List<RepositoryConfiguration> repositoryConfigurations) {
-		List<RemoteRepository> repositories = new ArrayList<RemoteRepository>(
+		List<RemoteRepository> repositories = new ArrayList<>(
 				repositoryConfigurations.size());
 		for (RepositoryConfiguration repositoryConfiguration : repositoryConfigurations) {
 			RemoteRepository.Builder builder = new RemoteRepository.Builder(
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/CompositeProxySelector.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/CompositeProxySelector.java
index f34652c4fd..fc115fdfe9 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/CompositeProxySelector.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/CompositeProxySelector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -31,7 +31,7 @@ import org.eclipse.aether.repository.RemoteRepository;
  */
 public class CompositeProxySelector implements ProxySelector {
 
-	private List<ProxySelector> selectors = new ArrayList<ProxySelector>();
+	private List<ProxySelector> selectors = new ArrayList<>();
 
 	public CompositeProxySelector(List<ProxySelector> selectors) {
 		this.selectors = selectors;
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/DependencyResolutionContext.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/DependencyResolutionContext.java
index 94ecf81de9..69baed5595 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/DependencyResolutionContext.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/DependencyResolutionContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -40,9 +40,9 @@ import org.springframework.boot.cli.compiler.dependencies.DependencyManagementAr
  */
 public class DependencyResolutionContext {
 
-	private final Map<String, Dependency> managedDependencyByGroupAndArtifact = new HashMap<String, Dependency>();
+	private final Map<String, Dependency> managedDependencyByGroupAndArtifact = new HashMap<>();
 
-	private final List<Dependency> managedDependencies = new ArrayList<Dependency>();
+	private final List<Dependency> managedDependencies = new ArrayList<>();
 
 	private DependencyManagement dependencyManagement = null;
 
@@ -90,7 +90,7 @@ public class DependencyResolutionContext {
 	public void addDependencyManagement(DependencyManagement dependencyManagement) {
 		for (org.springframework.boot.cli.compiler.dependencies.Dependency dependency : dependencyManagement
 				.getDependencies()) {
-			List<Exclusion> aetherExclusions = new ArrayList<Exclusion>();
+			List<Exclusion> aetherExclusions = new ArrayList<>();
 			for (org.springframework.boot.cli.compiler.dependencies.Dependency.Exclusion exclusion : dependency
 					.getExclusions()) {
 				aetherExclusions.add(new Exclusion(exclusion.getGroupId(),
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/maven/MavenSettings.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/maven/MavenSettings.java
index f3a6bbc3ac..6c73b25a4b 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/maven/MavenSettings.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/maven/MavenSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -137,7 +137,7 @@ public class MavenSettings {
 		if (!problemCollector.getProblems().isEmpty()) {
 			throw new IllegalStateException(createFailureMessage(problemCollector));
 		}
-		List<Profile> activeProfiles = new ArrayList<Profile>();
+		List<Profile> activeProfiles = new ArrayList<>();
 		Map<String, Profile> profiles = settings.getProfilesAsMap();
 		for (org.apache.maven.model.Profile modelProfile : activeModelProfiles) {
 			activeProfiles.add(profiles.get(modelProfile.getId()));
@@ -200,7 +200,7 @@ public class MavenSettings {
 
 	private List<org.apache.maven.model.Profile> createModelProfiles(
 			List<Profile> profiles) {
-		List<org.apache.maven.model.Profile> modelProfiles = new ArrayList<org.apache.maven.model.Profile>();
+		List<org.apache.maven.model.Profile> modelProfiles = new ArrayList<>();
 		for (Profile profile : profiles) {
 			org.apache.maven.model.Profile modelProfile = new org.apache.maven.model.Profile();
 			modelProfile.setId(profile.getId());
@@ -310,7 +310,7 @@ public class MavenSettings {
 	private static final class SpringBootCliModelProblemCollector
 			implements ModelProblemCollector {
 
-		private final List<ModelProblemCollectorRequest> problems = new ArrayList<ModelProblemCollectorRequest>();
+		private final List<ModelProblemCollectorRequest> problems = new ArrayList<>();
 
 		@Override
 		public void add(ModelProblemCollectorRequest req) {
diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/util/ResourceUtils.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/util/ResourceUtils.java
index 8566af19ed..289d048afe 100644
--- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/util/ResourceUtils.java
+++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/util/ResourceUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -84,7 +84,7 @@ public abstract class ResourceUtils {
 		if (path.contains(":")) {
 			return getUrlsFromPrefixedWildcardPath(path, classLoader);
 		}
-		Set<String> result = new LinkedHashSet<String>();
+		Set<String> result = new LinkedHashSet<>();
 		try {
 			result.addAll(getUrls(FILE_URL_PREFIX + path, classLoader));
 		}
@@ -93,14 +93,14 @@ public abstract class ResourceUtils {
 		}
 		path = stripLeadingSlashes(path);
 		result.addAll(getUrls(ALL_CLASSPATH_URL_PREFIX + path, classLoader));
-		return new ArrayList<String>(result);
+		return new ArrayList<>(result);
 	}
 
 	private static List<String> getUrlsFromPrefixedWildcardPath(String path,
 			ClassLoader classLoader) throws IOException {
 		Resource[] resources = new PathMatchingResourcePatternResolver(
 				new FileSearchResourceLoader(classLoader)).getResources(path);
-		List<String> result = new ArrayList<String>();
+		List<String> result = new ArrayList<>();
 		for (Resource resource : resources) {
 			if (resource.exists()) {
 				if (resource.getURI().getScheme().equals("file")) {
@@ -118,7 +118,7 @@ public abstract class ResourceUtils {
 	private static List<String> getChildFiles(Resource resource) throws IOException {
 		Resource[] children = new PathMatchingResourcePatternResolver()
 				.getResources(resource.getURL() + "/**");
-		List<String> childFiles = new ArrayList<String>();
+		List<String> childFiles = new ArrayList<>();
 		for (Resource child : children) {
 			if (!child.getFile().isDirectory()) {
 				childFiles.add(absolutePath(child));
diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/CliTester.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/CliTester.java
index 13e37821fd..5e299a7c1e 100644
--- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/CliTester.java
+++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/CliTester.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -57,7 +57,7 @@ public class CliTester implements TestRule {
 
 	private long timeout = TimeUnit.MINUTES.toMillis(6);
 
-	private final List<AbstractCommand> commands = new ArrayList<AbstractCommand>();
+	private final List<AbstractCommand> commands = new ArrayList<>();
 
 	private final String prefix;
 
diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/app/SpringApplicationLauncherTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/app/SpringApplicationLauncherTests.java
index 959cd0d7a6..654c8b1cea 100644
--- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/app/SpringApplicationLauncherTests.java
+++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/app/SpringApplicationLauncherTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -33,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat;
  */
 public class SpringApplicationLauncherTests {
 
-	private Map<String, String> env = new HashMap<String, String>();
+	private Map<String, String> env = new HashMap<>();
 
 	@After
 	public void cleanUp() {
@@ -100,7 +100,7 @@ public class SpringApplicationLauncherTests {
 
 	private static class TestClassLoader extends ClassLoader {
 
-		private Set<String> classes = new HashSet<String>();
+		private Set<String> classes = new HashSet<>();
 
 		TestClassLoader(ClassLoader parent) {
 			super(parent);
diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/archive/ResourceMatcherTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/archive/ResourceMatcherTests.java
index cd73f8a40f..fe1275cf5e 100644
--- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/archive/ResourceMatcherTests.java
+++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/archive/ResourceMatcherTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -139,7 +139,7 @@ public class ResourceMatcherTests {
 				.find(Arrays.asList(new File("src/test/resources/resource-matcher/one"),
 						new File("src/test/resources/resource-matcher/two"),
 						new File("src/test/resources/resource-matcher/three")));
-		List<String> paths = new ArrayList<String>();
+		List<String> paths = new ArrayList<>();
 		for (MatchedResource resource : matchedResources) {
 			paths.add(resource.getName());
 		}
diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/install/GroovyGrabDependencyResolverTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/install/GroovyGrabDependencyResolverTests.java
index 5803df1bfc..177bb89546 100644
--- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/install/GroovyGrabDependencyResolverTests.java
+++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/install/GroovyGrabDependencyResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -121,7 +121,7 @@ public class GroovyGrabDependencyResolverTests {
 	}
 
 	public Set<String> getNames(Collection<File> files) {
-		Set<String> names = new HashSet<String>(files.size());
+		Set<String> names = new HashSet<>(files.size());
 		for (File file : files) {
 			names.add(file.getName());
 		}
diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/install/InstallerTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/install/InstallerTests.java
index 2003c10658..8a79cd7237 100644
--- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/install/InstallerTests.java
+++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/command/install/InstallerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -118,7 +118,7 @@ public class InstallerTests {
 	}
 
 	private Set<String> getNamesOfFilesInLibExt() {
-		Set<String> names = new HashSet<String>();
+		Set<String> names = new HashSet<>();
 		for (File file : new File("target/lib/ext").listFiles()) {
 			names.add(file.getName());
 		}
diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/GenericBomAstTransformationTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/GenericBomAstTransformationTests.java
index c62408d88b..f0477894fe 100644
--- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/GenericBomAstTransformationTests.java
+++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/GenericBomAstTransformationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -95,7 +95,7 @@ public final class GenericBomAstTransformationTests {
 	private List<String> getValue() {
 		Expression expression = findAnnotation().getMember("value");
 		if (expression instanceof ListExpression) {
-			List<String> list = new ArrayList<String>();
+			List<String> list = new ArrayList<>();
 			for (Expression ex : ((ListExpression) expression).getExpressions()) {
 				list.add((String) ((ConstantExpression) ex).getValue());
 			}
diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/RepositoryConfigurationFactoryTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/RepositoryConfigurationFactoryTests.java
index de4193d7c3..dc1db57cd9 100644
--- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/RepositoryConfigurationFactoryTests.java
+++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/RepositoryConfigurationFactoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -106,7 +106,7 @@ public class RepositoryConfigurationFactoryTests {
 	private void assertRepositoryConfiguration(
 			List<RepositoryConfiguration> configurations, String... expectedNames) {
 		assertThat(configurations).hasSize(expectedNames.length);
-		Set<String> actualNames = new HashSet<String>();
+		Set<String> actualNames = new HashSet<>();
 		for (RepositoryConfiguration configuration : configurations) {
 			actualNames.add(configuration.getName());
 		}
diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java
index 304e2b4273..37c30ff937 100644
--- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java
+++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngineTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -51,7 +51,7 @@ public class AetherGrapeEngineTests {
 
 	private AetherGrapeEngine createGrapeEngine(
 			RepositoryConfiguration... additionalRepositories) {
-		List<RepositoryConfiguration> repositoryConfigurations = new ArrayList<RepositoryConfiguration>();
+		List<RepositoryConfiguration> repositoryConfigurations = new ArrayList<>();
 		repositoryConfigurations.add(new RepositoryConfiguration("central",
 				URI.create("http://repo1.maven.org/maven2"), false));
 		repositoryConfigurations.addAll(Arrays.asList(additionalRepositories));
@@ -64,7 +64,7 @@ public class AetherGrapeEngineTests {
 
 	@Test
 	public void dependencyResolution() {
-		Map<String, Object> args = new HashMap<String, Object>();
+		Map<String, Object> args = new HashMap<>();
 		createGrapeEngine(this.springMilestones).grab(args,
 				createDependency("org.springframework", "spring-jdbc", "3.2.4.RELEASE"));
 		assertThat(this.groovyClassLoader.getURLs()).hasSize(5);
@@ -125,7 +125,7 @@ public class AetherGrapeEngineTests {
 
 	@Test
 	public void dependencyResolutionWithExclusions() {
-		Map<String, Object> args = new HashMap<String, Object>();
+		Map<String, Object> args = new HashMap<>();
 		args.put("excludes",
 				Arrays.asList(createExclusion("org.springframework", "spring-core")));
 
@@ -138,7 +138,7 @@ public class AetherGrapeEngineTests {
 
 	@Test
 	public void nonTransitiveDependencyResolution() {
-		Map<String, Object> args = new HashMap<String, Object>();
+		Map<String, Object> args = new HashMap<>();
 
 		createGrapeEngine().grab(args, createDependency("org.springframework",
 				"spring-jdbc", "3.2.4.RELEASE", false));
@@ -148,7 +148,7 @@ public class AetherGrapeEngineTests {
 
 	@Test
 	public void dependencyResolutionWithCustomClassLoader() {
-		Map<String, Object> args = new HashMap<String, Object>();
+		Map<String, Object> args = new HashMap<>();
 		GroovyClassLoader customClassLoader = new GroovyClassLoader();
 		args.put("classLoader", customClassLoader);
 
@@ -161,7 +161,7 @@ public class AetherGrapeEngineTests {
 
 	@Test
 	public void resolutionWithCustomResolver() {
-		Map<String, Object> args = new HashMap<String, Object>();
+		Map<String, Object> args = new HashMap<>();
 		AetherGrapeEngine grapeEngine = this.createGrapeEngine();
 		grapeEngine
 				.addResolver(createResolver("restlet.org", "http://maven.restlet.org"));
@@ -180,7 +180,7 @@ public class AetherGrapeEngineTests {
 
 	@Test
 	public void pomDependencyResolutionViaType() {
-		Map<String, Object> args = new HashMap<String, Object>();
+		Map<String, Object> args = new HashMap<>();
 		Map<String, Object> dependency = createDependency("org.springframework",
 				"spring-framework-bom", "4.0.5.RELEASE");
 		dependency.put("type", "pom");
@@ -192,7 +192,7 @@ public class AetherGrapeEngineTests {
 
 	@Test
 	public void pomDependencyResolutionViaExt() {
-		Map<String, Object> args = new HashMap<String, Object>();
+		Map<String, Object> args = new HashMap<>();
 		Map<String, Object> dependency = createDependency("org.springframework",
 				"spring-framework-bom", "4.0.5.RELEASE");
 		dependency.put("ext", "pom");
@@ -204,7 +204,7 @@ public class AetherGrapeEngineTests {
 
 	@Test
 	public void resolutionWithClassifier() {
-		Map<String, Object> args = new HashMap<String, Object>();
+		Map<String, Object> args = new HashMap<>();
 
 		Map<String, Object> dependency = createDependency("org.springframework",
 				"spring-jdbc", "3.2.4.RELEASE", false);
@@ -218,7 +218,7 @@ public class AetherGrapeEngineTests {
 
 	private Map<String, Object> createDependency(String group, String module,
 			String version) {
-		Map<String, Object> dependency = new HashMap<String, Object>();
+		Map<String, Object> dependency = new HashMap<>();
 		dependency.put("group", group);
 		dependency.put("module", module);
 		dependency.put("version", version);
@@ -233,14 +233,14 @@ public class AetherGrapeEngineTests {
 	}
 
 	private Map<String, Object> createResolver(String name, String url) {
-		Map<String, Object> resolver = new HashMap<String, Object>();
+		Map<String, Object> resolver = new HashMap<>();
 		resolver.put("name", name);
 		resolver.put("root", url);
 		return resolver;
 	}
 
 	private Map<String, Object> createExclusion(String group, String module) {
-		Map<String, Object> exclusion = new HashMap<String, Object>();
+		Map<String, Object> exclusion = new HashMap<>();
 		exclusion.put("group", group);
 		exclusion.put("module", module);
 		return exclusion;
diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/testutil/SystemProperties.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/testutil/SystemProperties.java
index f9e336fc1a..f9d8f303b3 100644
--- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/testutil/SystemProperties.java
+++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/testutil/SystemProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -39,7 +39,7 @@ public final class SystemProperties {
 	 */
 	public static void doWithSystemProperties(Runnable action,
 			String... systemPropertyPairs) {
-		Map<String, String> originalValues = new HashMap<String, String>();
+		Map<String, String> originalValues = new HashMap<>();
 		for (String pair : systemPropertyPairs) {
 			String[] components = pair.split(":");
 			String key = components[0];
diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/RemoteSpringApplication.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/RemoteSpringApplication.java
index 11f32e39fe..a2005bbe53 100644
--- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/RemoteSpringApplication.java
+++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/RemoteSpringApplication.java
@@ -65,13 +65,13 @@ public final class RemoteSpringApplication {
 	}
 
 	private Collection<ApplicationContextInitializer<?>> getInitializers() {
-		List<ApplicationContextInitializer<?>> initializers = new ArrayList<ApplicationContextInitializer<?>>();
+		List<ApplicationContextInitializer<?>> initializers = new ArrayList<>();
 		initializers.add(new RestartScopeInitializer());
 		return initializers;
 	}
 
 	private Collection<ApplicationListener<?>> getListeners() {
-		List<ApplicationListener<?>> listeners = new ArrayList<ApplicationListener<?>>();
+		List<ApplicationListener<?>> listeners = new ArrayList<>();
 		listeners.add(new AnsiOutputApplicationListener());
 		listeners.add(new ConfigFileApplicationListener());
 		listeners.add(new ClasspathLoggingApplicationListener());
diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsDataSourceAutoConfiguration.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsDataSourceAutoConfiguration.java
index 2c867b5013..7cd635d6b5 100644
--- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsDataSourceAutoConfiguration.java
+++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsDataSourceAutoConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -85,7 +85,7 @@ public class DevToolsDataSourceAutoConfiguration {
 	static final class NonEmbeddedInMemoryDatabaseShutdownExecutor
 			implements DisposableBean {
 
-		private static final Set<String> IN_MEMORY_DRIVER_CLASS_NAMES = new HashSet<String>(
+		private static final Set<String> IN_MEMORY_DRIVER_CLASS_NAMES = new HashSet<>(
 				Arrays.asList("org.apache.derby.jdbc.EmbeddedDriver", "org.h2.Driver",
 						"org.h2.jdbcx.JdbcDataSource", "org.hsqldb.jdbcDriver",
 						"org.hsqldb.jdbc.JDBCDriver",
diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsProperties.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsProperties.java
index 30ad5c5352..7fefa779e0 100644
--- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsProperties.java
+++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/DevToolsProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -101,7 +101,7 @@ public class DevToolsProperties {
 		/**
 		 * Additional paths to watch for changes.
 		 */
-		private List<File> additionalPaths = new ArrayList<File>();
+		private List<File> additionalPaths = new ArrayList<>();
 
 		public boolean isEnabled() {
 			return this.enabled;
@@ -112,7 +112,7 @@ public class DevToolsProperties {
 		}
 
 		public String[] getAllExclude() {
-			List<String> allExclude = new ArrayList<String>();
+			List<String> allExclude = new ArrayList<>();
 			if (StringUtils.hasText(this.exclude)) {
 				allExclude.addAll(StringUtils.commaDelimitedListToSet(this.exclude));
 			}
diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfiguration.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfiguration.java
index 9aeb1eed27..c6d8823a33 100644
--- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfiguration.java
+++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfiguration.java
@@ -95,9 +95,11 @@ public class RemoteDevToolsAutoConfiguration {
 	@Bean
 	public HandlerMapper remoteDevToolsHealthCheckHandlerMapper() {
 		Handler handler = new HttpStatusHandler();
-		return new UrlHandlerMapper((this.serverProperties.getServlet().getContextPath() == null ? ""
-				: this.serverProperties.getServlet().getContextPath())
-				+ this.properties.getRemote().getContextPath(), handler);
+		return new UrlHandlerMapper(
+				(this.serverProperties.getServlet().getContextPath() == null ? ""
+						: this.serverProperties.getServlet().getContextPath())
+						+ this.properties.getRemote().getContextPath(),
+				handler);
 	}
 
 	@Bean
diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/classpath/ClassPathFolders.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/classpath/ClassPathFolders.java
index 23bc180aa8..3237540397 100644
--- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/classpath/ClassPathFolders.java
+++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/classpath/ClassPathFolders.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -38,7 +38,7 @@ public class ClassPathFolders implements Iterable<File> {
 
 	private static final Log logger = LogFactory.getLog(ClassPathFolders.class);
 
-	private final List<File> folders = new ArrayList<File>();
+	private final List<File> folders = new ArrayList<>();
 
 	public ClassPathFolders(URL[] urls) {
 		if (urls != null) {
diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/env/DevToolsPropertyDefaultsPostProcessor.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/env/DevToolsPropertyDefaultsPostProcessor.java
index 9455b07ae2..b6118cf3bc 100755
--- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/env/DevToolsPropertyDefaultsPostProcessor.java
+++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/env/DevToolsPropertyDefaultsPostProcessor.java
@@ -45,7 +45,7 @@ public class DevToolsPropertyDefaultsPostProcessor implements EnvironmentPostPro
 	private static final Map<String, Object> PROPERTIES;
 
 	static {
-		Map<String, Object> properties = new HashMap<String, Object>();
+		Map<String, Object> properties = new HashMap<>();
 		properties.put("spring.thymeleaf.cache", "false");
 		properties.put("spring.freemarker.cache", "false");
 		properties.put("spring.groovy.template.cache", "false");
diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FileSystemWatcher.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FileSystemWatcher.java
index 18cf85e130..0aab793d53 100644
--- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FileSystemWatcher.java
+++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FileSystemWatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -45,7 +45,7 @@ public class FileSystemWatcher {
 
 	private static final long DEFAULT_QUIET_PERIOD = 400;
 
-	private final List<FileChangeListener> listeners = new ArrayList<FileChangeListener>();
+	private final List<FileChangeListener> listeners = new ArrayList<>();
 
 	private final boolean daemon;
 
@@ -55,7 +55,7 @@ public class FileSystemWatcher {
 
 	private final AtomicInteger remainingScans = new AtomicInteger(-1);
 
-	private final Map<File, FolderSnapshot> folders = new HashMap<File, FolderSnapshot>();
+	private final Map<File, FolderSnapshot> folders = new HashMap<>();
 
 	private Thread watchThread;
 
@@ -152,12 +152,11 @@ public class FileSystemWatcher {
 		synchronized (this.monitor) {
 			saveInitialSnapshots();
 			if (this.watchThread == null) {
-				Map<File, FolderSnapshot> localFolders = new HashMap<File, FolderSnapshot>();
+				Map<File, FolderSnapshot> localFolders = new HashMap<>();
 				localFolders.putAll(this.folders);
 				this.watchThread = new Thread(new Watcher(this.remainingScans,
-						new ArrayList<FileChangeListener>(this.listeners),
-						this.triggerFilter, this.pollInterval, this.quietPeriod,
-						localFolders));
+						new ArrayList<>(this.listeners), this.triggerFilter,
+						this.pollInterval, this.quietPeriod, localFolders));
 				this.watchThread.setName("File Watcher");
 				this.watchThread.setDaemon(this.daemon);
 				this.watchThread.start();
@@ -276,7 +275,7 @@ public class FileSystemWatcher {
 		}
 
 		private Map<File, FolderSnapshot> getCurrentSnapshots() {
-			Map<File, FolderSnapshot> snapshots = new LinkedHashMap<File, FolderSnapshot>();
+			Map<File, FolderSnapshot> snapshots = new LinkedHashMap<>();
 			for (File folder : this.folders.keySet()) {
 				snapshots.put(folder, new FolderSnapshot(folder));
 			}
@@ -284,8 +283,8 @@ public class FileSystemWatcher {
 		}
 
 		private void updateSnapshots(Collection<FolderSnapshot> snapshots) {
-			Map<File, FolderSnapshot> updated = new LinkedHashMap<File, FolderSnapshot>();
-			Set<ChangedFiles> changeSet = new LinkedHashSet<ChangedFiles>();
+			Map<File, FolderSnapshot> updated = new LinkedHashMap<>();
+			Set<ChangedFiles> changeSet = new LinkedHashSet<>();
 			for (FolderSnapshot snapshot : snapshots) {
 				FolderSnapshot previous = this.folders.get(snapshot.getFolder());
 				updated.put(snapshot.getFolder(), snapshot);
diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FolderSnapshot.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FolderSnapshot.java
index 1ea0f697bc..f4a5da8907 100644
--- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FolderSnapshot.java
+++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/filewatch/FolderSnapshot.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -38,7 +38,7 @@ import org.springframework.util.Assert;
 class FolderSnapshot {
 
 	private static final Set<String> DOT_FOLDERS = Collections
-			.unmodifiableSet(new HashSet<String>(Arrays.asList(".", "..")));
+			.unmodifiableSet(new HashSet<>(Arrays.asList(".", "..")));
 
 	private final File folder;
 
@@ -55,7 +55,7 @@ class FolderSnapshot {
 		Assert.isTrue(folder.isDirectory(), "Folder must not be a file");
 		this.folder = folder;
 		this.time = new Date();
-		Set<FileSnapshot> files = new LinkedHashSet<FileSnapshot>();
+		Set<FileSnapshot> files = new LinkedHashSet<>();
 		collectFiles(folder, files);
 		this.files = Collections.unmodifiableSet(files);
 	}
@@ -80,7 +80,7 @@ class FolderSnapshot {
 		File folder = this.folder;
 		Assert.isTrue(snapshot.folder.equals(folder),
 				"Snapshot source folder must be '" + folder + "'");
-		Set<ChangedFile> changes = new LinkedHashSet<ChangedFile>();
+		Set<ChangedFile> changes = new LinkedHashSet<>();
 		Map<File, FileSnapshot> previousFiles = getFilesMap();
 		for (FileSnapshot currentFile : snapshot.files) {
 			if (acceptChangedFile(triggerFilter, currentFile)) {
@@ -107,7 +107,7 @@ class FolderSnapshot {
 	}
 
 	private Map<File, FileSnapshot> getFilesMap() {
-		Map<File, FileSnapshot> files = new LinkedHashMap<File, FileSnapshot>();
+		Map<File, FileSnapshot> files = new LinkedHashMap<>();
 		for (FileSnapshot file : this.files) {
 			files.put(file.getFile(), file);
 		}
@@ -141,7 +141,7 @@ class FolderSnapshot {
 		if (filter == null) {
 			return source;
 		}
-		Set<FileSnapshot> filtered = new LinkedHashSet<FileSnapshot>();
+		Set<FileSnapshot> filtered = new LinkedHashSet<>();
 		for (FileSnapshot file : source) {
 			if (filter.accept(file.getFile())) {
 				filtered.add(file);
diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/LiveReloadServer.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/LiveReloadServer.java
index 6c736706ff..69a8d2eef7 100644
--- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/LiveReloadServer.java
+++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/livereload/LiveReloadServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -56,7 +56,7 @@ public class LiveReloadServer {
 	private final ExecutorService executor = Executors
 			.newCachedThreadPool(new WorkerThreadFactory());
 
-	private final List<Connection> connections = new ArrayList<Connection>();
+	private final List<Connection> connections = new ArrayList<>();
 
 	private final Object monitor = new Object();
 
diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/ClassPathChangeUploader.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/ClassPathChangeUploader.java
index cbd5c67499..6c1bf79096 100644
--- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/ClassPathChangeUploader.java
+++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/ClassPathChangeUploader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -61,7 +61,7 @@ public class ClassPathChangeUploader
 	private static final Map<ChangedFile.Type, ClassLoaderFile.Kind> TYPE_MAPPINGS;
 
 	static {
-		Map<ChangedFile.Type, ClassLoaderFile.Kind> map = new HashMap<ChangedFile.Type, ClassLoaderFile.Kind>();
+		Map<ChangedFile.Type, ClassLoaderFile.Kind> map = new HashMap<>();
 		map.put(ChangedFile.Type.ADD, ClassLoaderFile.Kind.ADDED);
 		map.put(ChangedFile.Type.DELETE, ClassLoaderFile.Kind.DELETED);
 		map.put(ChangedFile.Type.MODIFY, ClassLoaderFile.Kind.MODIFIED);
diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/Dispatcher.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/Dispatcher.java
index 85b79ec644..3d4a733f65 100644
--- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/Dispatcher.java
+++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/server/Dispatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -46,7 +46,7 @@ public class Dispatcher {
 		Assert.notNull(accessManager, "AccessManager must not be null");
 		Assert.notNull(mappers, "Mappers must not be null");
 		this.accessManager = accessManager;
-		this.mappers = new ArrayList<HandlerMapper>(mappers);
+		this.mappers = new ArrayList<>(mappers);
 		AnnotationAwareOrderComparator.sort(this.mappers);
 	}
 
diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/AgentReloader.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/AgentReloader.java
index f54e9c080f..163ca20f8e 100644
--- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/AgentReloader.java
+++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/AgentReloader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -33,7 +33,7 @@ public abstract class AgentReloader {
 	private static final Set<String> AGENT_CLASSES;
 
 	static {
-		Set<String> agentClasses = new LinkedHashSet<String>();
+		Set<String> agentClasses = new LinkedHashSet<>();
 		agentClasses.add("org.zeroturnaround.javarebel.Integration");
 		agentClasses.add("org.zeroturnaround.javarebel.ReloaderFactory");
 		AGENT_CLASSES = Collections.unmodifiableSet(agentClasses);
diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/ChangeableUrls.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/ChangeableUrls.java
index 7d68419769..f9cf69aae5 100644
--- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/ChangeableUrls.java
+++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/ChangeableUrls.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -50,7 +50,7 @@ final class ChangeableUrls implements Iterable<URL> {
 
 	private ChangeableUrls(URL... urls) {
 		DevToolsSettings settings = DevToolsSettings.get();
-		List<URL> reloadableUrls = new ArrayList<URL>(urls.length);
+		List<URL> reloadableUrls = new ArrayList<>(urls.length);
 		for (URL url : urls) {
 			if ((settings.isRestartInclude(url) || isFolderUrl(url.toString()))
 					&& !settings.isRestartExclude(url)) {
@@ -90,7 +90,7 @@ final class ChangeableUrls implements Iterable<URL> {
 	}
 
 	public static ChangeableUrls fromUrlClassLoader(URLClassLoader classLoader) {
-		List<URL> urls = new ArrayList<URL>();
+		List<URL> urls = new ArrayList<>();
 		for (URL url : classLoader.getURLs()) {
 			urls.add(url);
 			urls.addAll(getUrlsFromClassPathOfJarManifestIfPossible(url));
@@ -136,7 +136,7 @@ final class ChangeableUrls implements Iterable<URL> {
 			return Collections.emptyList();
 		}
 		String[] entries = StringUtils.delimitedListToStringArray(classPath, " ");
-		List<URL> urls = new ArrayList<URL>(entries.length);
+		List<URL> urls = new ArrayList<>(entries.length);
 		for (String entry : entries) {
 			try {
 				urls.add(new URL(base, entry));
@@ -150,7 +150,7 @@ final class ChangeableUrls implements Iterable<URL> {
 	}
 
 	public static ChangeableUrls fromUrls(Collection<URL> urls) {
-		return fromUrls(new ArrayList<URL>(urls).toArray(new URL[urls.size()]));
+		return fromUrls(new ArrayList<>(urls).toArray(new URL[urls.size()]));
 	}
 
 	public static ChangeableUrls fromUrls(URL... urls) {
diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/ClassLoaderFilesResourcePatternResolver.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/ClassLoaderFilesResourcePatternResolver.java
index cbba9e9870..46b53a2777 100644
--- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/ClassLoaderFilesResourcePatternResolver.java
+++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/ClassLoaderFilesResourcePatternResolver.java
@@ -108,7 +108,7 @@ final class ClassLoaderFilesResourcePatternResolver implements ResourcePatternRe
 
 	@Override
 	public Resource[] getResources(String locationPattern) throws IOException {
-		List<Resource> resources = new ArrayList<Resource>();
+		List<Resource> resources = new ArrayList<>();
 		Resource[] candidates = this.patternResolverDelegate
 				.getResources(locationPattern);
 		for (Resource candidate : candidates) {
@@ -122,7 +122,7 @@ final class ClassLoaderFilesResourcePatternResolver implements ResourcePatternRe
 
 	private List<Resource> getAdditionalResources(String locationPattern)
 			throws MalformedURLException {
-		List<Resource> additionalResources = new ArrayList<Resource>();
+		List<Resource> additionalResources = new ArrayList<>();
 		String trimmedLocationPattern = trimLocationPattern(locationPattern);
 		for (SourceFolder sourceFolder : this.classLoaderFiles.getSourceFolders()) {
 			for (Entry<String, ClassLoaderFile> entry : sourceFolder.getFilesEntrySet()) {
diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/DefaultRestartInitializer.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/DefaultRestartInitializer.java
index ea3b6f8e63..55b36297cb 100644
--- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/DefaultRestartInitializer.java
+++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/DefaultRestartInitializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -36,7 +36,7 @@ public class DefaultRestartInitializer implements RestartInitializer {
 	private static final Set<String> SKIPPED_STACK_ELEMENTS;
 
 	static {
-		Set<String> skipped = new LinkedHashSet<String>();
+		Set<String> skipped = new LinkedHashSet<>();
 		skipped.add("org.junit.runners.");
 		skipped.add("org.springframework.boot.test.");
 		skipped.add("cucumber.runtime.");
diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/Restarter.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/Restarter.java
index 0eb49b6bea..4da7159670 100644
--- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/Restarter.java
+++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/Restarter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -89,13 +89,13 @@ public class Restarter {
 
 	private static Restarter instance;
 
-	private final Set<URL> urls = new LinkedHashSet<URL>();
+	private final Set<URL> urls = new LinkedHashSet<>();
 
 	private final ClassLoaderFiles classLoaderFiles = new ClassLoaderFiles();
 
-	private final Map<String, Object> attributes = new HashMap<String, Object>();
+	private final Map<String, Object> attributes = new HashMap<>();
 
-	private final BlockingDeque<LeakSafeThread> leakSafeThreads = new LinkedBlockingDeque<LeakSafeThread>();
+	private final BlockingDeque<LeakSafeThread> leakSafeThreads = new LinkedBlockingDeque<>();
 
 	private final Lock stopLock = new ReentrantLock();
 
@@ -119,7 +119,7 @@ public class Restarter {
 
 	private boolean finished = false;
 
-	private final List<ConfigurableApplicationContext> rootContexts = new CopyOnWriteArrayList<ConfigurableApplicationContext>();
+	private final List<ConfigurableApplicationContext> rootContexts = new CopyOnWriteArrayList<>();
 
 	/**
 	 * Internal constructor to create a new {@link Restarter} instance.
@@ -387,7 +387,7 @@ public class Restarter {
 	 */
 	private void forceReferenceCleanup() {
 		try {
-			final List<long[]> memory = new LinkedList<long[]>();
+			final List<long[]> memory = new LinkedList<>();
 			while (true) {
 				memory.add(new long[102400]);
 			}
diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFiles.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFiles.java
index 94d6e7859e..d8670abba8 100644
--- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFiles.java
+++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/ClassLoaderFiles.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -47,7 +47,7 @@ public class ClassLoaderFiles implements ClassLoaderFileRepository, Serializable
 	 * Create a new {@link ClassLoaderFiles} instance.
 	 */
 	public ClassLoaderFiles() {
-		this.sourceFolders = new LinkedHashMap<String, SourceFolder>();
+		this.sourceFolders = new LinkedHashMap<>();
 	}
 
 	/**
@@ -56,8 +56,7 @@ public class ClassLoaderFiles implements ClassLoaderFileRepository, Serializable
 	 */
 	public ClassLoaderFiles(ClassLoaderFiles classLoaderFiles) {
 		Assert.notNull(classLoaderFiles, "ClassLoaderFiles must not be null");
-		this.sourceFolders = new LinkedHashMap<String, SourceFolder>(
-				classLoaderFiles.sourceFolders);
+		this.sourceFolders = new LinkedHashMap<>(classLoaderFiles.sourceFolders);
 	}
 
 	/**
@@ -158,7 +157,7 @@ public class ClassLoaderFiles implements ClassLoaderFileRepository, Serializable
 
 		private final String name;
 
-		private final Map<String, ClassLoaderFile> files = new LinkedHashMap<String, ClassLoaderFile>();
+		private final Map<String, ClassLoaderFile> files = new LinkedHashMap<>();
 
 		SourceFolder(String name) {
 			this.name = name;
diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/RestartClassLoader.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/RestartClassLoader.java
index ac39e2a5fb..bad78dd338 100644
--- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/RestartClassLoader.java
+++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/classloader/RestartClassLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -98,7 +98,7 @@ public class RestartClassLoader extends URLClassLoader implements SmartClassLoad
 				resources.nextElement();
 			}
 			if (file.getKind() != Kind.DELETED) {
-				return new CompoundEnumeration<URL>(createFileUrl(name, file), resources);
+				return new CompoundEnumeration<>(createFileUrl(name, file), resources);
 			}
 		}
 		return resources;
diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/DefaultSourceFolderUrlFilter.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/DefaultSourceFolderUrlFilter.java
index cad1b4d5da..20c0284371 100644
--- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/DefaultSourceFolderUrlFilter.java
+++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/DefaultSourceFolderUrlFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -41,7 +41,7 @@ public class DefaultSourceFolderUrlFilter implements SourceFolderUrlFilter {
 	private static final Pattern VERSION_PATTERN = Pattern
 			.compile("^-\\d+(?:\\.\\d+)*(?:[.-].+)?$");
 
-	private static final Set<String> SKIPPED_PROJECTS = new HashSet<String>(Arrays.asList(
+	private static final Set<String> SKIPPED_PROJECTS = new HashSet<>(Arrays.asList(
 			"spring-boot", "spring-boot-devtools", "spring-boot-autoconfigure",
 			"spring-boot-actuator", "spring-boot-starter"));
 
diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/RestartServer.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/RestartServer.java
index fff70e8c41..9483e0b51e 100755
--- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/RestartServer.java
+++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/server/RestartServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -81,7 +81,7 @@ public class RestartServer {
 	 * @param files updated class loader files
 	 */
 	public void updateAndRestart(ClassLoaderFiles files) {
-		Set<URL> urls = new LinkedHashSet<URL>();
+		Set<URL> urls = new LinkedHashSet<>();
 		Set<URL> classLoaderUrls = getClassLoaderUrls();
 		for (SourceFolder folder : files.getSourceFolders()) {
 			for (Entry<String, ClassLoaderFile> entry : folder.getFilesEntrySet()) {
@@ -124,7 +124,7 @@ public class RestartServer {
 	}
 
 	private Set<URL> getMatchingUrls(Set<URL> urls, String sourceFolder) {
-		Set<URL> matchingUrls = new LinkedHashSet<URL>();
+		Set<URL> matchingUrls = new LinkedHashSet<>();
 		for (URL url : urls) {
 			if (this.sourceFolderUrlFilter.isMatch(sourceFolder, url)) {
 				if (logger.isDebugEnabled()) {
@@ -138,7 +138,7 @@ public class RestartServer {
 	}
 
 	private Set<URL> getClassLoaderUrls() {
-		Set<URL> urls = new LinkedHashSet<URL>();
+		Set<URL> urls = new LinkedHashSet<>();
 		ClassLoader classLoader = this.classLoader;
 		while (classLoader != null) {
 			if (classLoader instanceof URLClassLoader) {
diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/settings/DevToolsSettings.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/settings/DevToolsSettings.java
index e0a08091a0..27b528ce02 100644
--- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/settings/DevToolsSettings.java
+++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/settings/DevToolsSettings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -47,9 +47,9 @@ public class DevToolsSettings {
 
 	private static DevToolsSettings settings;
 
-	private final List<Pattern> restartIncludePatterns = new ArrayList<Pattern>();
+	private final List<Pattern> restartIncludePatterns = new ArrayList<>();
 
-	private final List<Pattern> restartExcludePatterns = new ArrayList<Pattern>();
+	private final List<Pattern> restartExcludePatterns = new ArrayList<>();
 
 	DevToolsSettings() {
 	}
@@ -62,7 +62,7 @@ public class DevToolsSettings {
 	}
 
 	private Map<String, Pattern> getPatterns(Map<?, ?> properties, String prefix) {
-		Map<String, Pattern> patterns = new LinkedHashMap<String, Pattern>();
+		Map<String, Pattern> patterns = new LinkedHashMap<>();
 		for (Map.Entry<?, ?> entry : properties.entrySet()) {
 			String name = String.valueOf(entry.getKey());
 			if (name.startsWith(prefix)) {
diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/TunnelClientListeners.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/TunnelClientListeners.java
index 0cd704df14..e54f86ba36 100644
--- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/TunnelClientListeners.java
+++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/client/TunnelClientListeners.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -29,7 +29,7 @@ import org.springframework.util.Assert;
  */
 class TunnelClientListeners {
 
-	private final List<TunnelClientListener> listeners = new CopyOnWriteArrayList<TunnelClientListener>();
+	private final List<TunnelClientListener> listeners = new CopyOnWriteArrayList<>();
 
 	public void addListener(TunnelClientListener listener) {
 		Assert.notNull(listener, "Listener must not be null");
diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/payload/HttpTunnelPayloadForwarder.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/payload/HttpTunnelPayloadForwarder.java
index eb286bea54..d055401707 100644
--- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/payload/HttpTunnelPayloadForwarder.java
+++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/payload/HttpTunnelPayloadForwarder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -34,7 +34,7 @@ public class HttpTunnelPayloadForwarder {
 
 	private static final int MAXIMUM_QUEUE_SIZE = 100;
 
-	private final Map<Long, HttpTunnelPayload> queue = new HashMap<Long, HttpTunnelPayload>();
+	private final Map<Long, HttpTunnelPayload> queue = new HashMap<>();
 
 	private final Object monitor = new Object();
 
diff --git a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/HttpTunnelServer.java b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/HttpTunnelServer.java
index cc2c5711e3..7afb2ceb9e 100644
--- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/HttpTunnelServer.java
+++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/tunnel/server/HttpTunnelServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -227,7 +227,7 @@ public class HttpTunnelServer {
 		public ServerThread(ByteChannel targetServer) {
 			Assert.notNull(targetServer, "TargetServer must not be null");
 			this.targetServer = targetServer;
-			this.httpConnections = new ArrayDeque<HttpConnection>(2);
+			this.httpConnections = new ArrayDeque<>(2);
 			this.payloadForwarder = new HttpTunnelPayloadForwarder(targetServer);
 		}
 
diff --git a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfigurationTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfigurationTests.java
index 60d9ea13d5..6f5980d615 100644
--- a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfigurationTests.java
+++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfigurationTests.java
@@ -167,7 +167,7 @@ public class LocalDevToolsAutoConfigurationTests {
 
 	@Test
 	public void liveReloadDisabled() throws Exception {
-		Map<String, Object> properties = new HashMap<String, Object>();
+		Map<String, Object> properties = new HashMap<>();
 		properties.put("spring.devtools.livereload.enabled", false);
 		this.context = initializeAndRun(Config.class, properties);
 		this.thrown.expect(NoSuchBeanDefinitionException.class);
@@ -202,7 +202,7 @@ public class LocalDevToolsAutoConfigurationTests {
 
 	@Test
 	public void restartDisabled() throws Exception {
-		Map<String, Object> properties = new HashMap<String, Object>();
+		Map<String, Object> properties = new HashMap<>();
 		properties.put("spring.devtools.restart.enabled", false);
 		this.context = initializeAndRun(Config.class, properties);
 		this.thrown.expect(NoSuchBeanDefinitionException.class);
@@ -211,7 +211,7 @@ public class LocalDevToolsAutoConfigurationTests {
 
 	@Test
 	public void restartWithTriggerFile() throws Exception {
-		Map<String, Object> properties = new HashMap<String, Object>();
+		Map<String, Object> properties = new HashMap<>();
 		properties.put("spring.devtools.restart.trigger-file", "somefile.txt");
 		this.context = initializeAndRun(Config.class, properties);
 		ClassPathFileSystemWatcher classPathWatcher = this.context
@@ -224,7 +224,7 @@ public class LocalDevToolsAutoConfigurationTests {
 
 	@Test
 	public void watchingAdditionalPaths() throws Exception {
-		Map<String, Object> properties = new HashMap<String, Object>();
+		Map<String, Object> properties = new HashMap<>();
 		properties.put("spring.devtools.restart.additional-paths",
 				"src/main/java,src/test/java");
 		this.context = initializeAndRun(Config.class, properties);
@@ -268,7 +268,7 @@ public class LocalDevToolsAutoConfigurationTests {
 
 	private Map<String, Object> getDefaultProperties(
 			Map<String, Object> specifiedProperties) {
-		Map<String, Object> properties = new HashMap<String, Object>();
+		Map<String, Object> properties = new HashMap<>();
 		properties.put("spring.thymeleaf.check-template-location", false);
 		properties.put("spring.devtools.livereload.port", this.liveReloadPort);
 		properties.put("server.port", 0);
@@ -307,7 +307,7 @@ public class LocalDevToolsAutoConfigurationTests {
 
 		@Bean
 		public RedisTemplate<Object, Object> sessionRedisTemplate() {
-			RedisTemplate<Object, Object> redisTemplate = new RedisTemplate<Object, Object>();
+			RedisTemplate<Object, Object> redisTemplate = new RedisTemplate<>();
 			redisTemplate.setConnectionFactory(mock(RedisConnectionFactory.class));
 			return redisTemplate;
 		}
diff --git a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/ClassPathChangedEventTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/ClassPathChangedEventTests.java
index aaa7a53759..3c21de473e 100644
--- a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/ClassPathChangedEventTests.java
+++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/ClassPathChangedEventTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -48,7 +48,7 @@ public class ClassPathChangedEventTests {
 
 	@Test
 	public void getChangeSet() throws Exception {
-		Set<ChangedFiles> changeSet = new LinkedHashSet<ChangedFiles>();
+		Set<ChangedFiles> changeSet = new LinkedHashSet<>();
 		ClassPathChangedEvent event = new ClassPathChangedEvent(this.source, changeSet,
 				false);
 		assertThat(event.getChangeSet()).isSameAs(changeSet);
@@ -56,7 +56,7 @@ public class ClassPathChangedEventTests {
 
 	@Test
 	public void getRestartRequired() throws Exception {
-		Set<ChangedFiles> changeSet = new LinkedHashSet<ChangedFiles>();
+		Set<ChangedFiles> changeSet = new LinkedHashSet<>();
 		ClassPathChangedEvent event;
 		event = new ClassPathChangedEvent(this.source, changeSet, false);
 		assertThat(event.isRestartRequired()).isFalse();
diff --git a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/ClassPathFileChangeListenerTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/ClassPathFileChangeListenerTests.java
index 135b604b61..6bbc692305 100644
--- a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/ClassPathFileChangeListenerTests.java
+++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/ClassPathFileChangeListenerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -103,7 +103,7 @@ public class ClassPathFileChangeListenerTests {
 		File file = new File("f1");
 		ChangedFile file1 = new ChangedFile(folder, file, ChangedFile.Type.ADD);
 		ChangedFile file2 = new ChangedFile(folder, file, ChangedFile.Type.ADD);
-		Set<ChangedFile> files = new LinkedHashSet<ChangedFile>();
+		Set<ChangedFile> files = new LinkedHashSet<>();
 		files.add(file1);
 		files.add(file2);
 		ChangedFiles changedFiles = new ChangedFiles(new File("source"), files);
diff --git a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/ClassPathFileSystemWatcherTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/ClassPathFileSystemWatcherTests.java
index 9f5c97fb57..e2d1c4d896 100644
--- a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/ClassPathFileSystemWatcherTests.java
+++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/classpath/ClassPathFileSystemWatcherTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -67,9 +67,9 @@ public class ClassPathFileSystemWatcherTests {
 	@Test
 	public void configuredWithRestartStrategy() throws Exception {
 		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
-		Map<String, Object> properties = new HashMap<String, Object>();
+		Map<String, Object> properties = new HashMap<>();
 		File folder = this.temp.newFolder();
-		List<URL> urls = new ArrayList<URL>();
+		List<URL> urls = new ArrayList<>();
 		urls.add(new URL("http://spring.io"));
 		urls.add(folder.toURI().toURL());
 		properties.put("urls", urls);
@@ -132,7 +132,7 @@ public class ClassPathFileSystemWatcherTests {
 
 	public static class Listener implements ApplicationListener<ClassPathChangedEvent> {
 
-		private List<ClassPathChangedEvent> events = new ArrayList<ClassPathChangedEvent>();
+		private List<ClassPathChangedEvent> events = new ArrayList<>();
 
 		@Override
 		public void onApplicationEvent(ClassPathChangedEvent event) {
diff --git a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/filewatch/FileSystemWatcherTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/filewatch/FileSystemWatcherTests.java
index a39f2a3a8f..03ceb3c215 100644
--- a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/filewatch/FileSystemWatcherTests.java
+++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/filewatch/FileSystemWatcherTests.java
@@ -219,7 +219,7 @@ public class FileSystemWatcherTests {
 	@Test
 	public void multipleListeners() throws Exception {
 		File folder = this.temp.newFolder();
-		final Set<ChangedFiles> listener2Changes = new LinkedHashSet<ChangedFiles>();
+		final Set<ChangedFiles> listener2Changes = new LinkedHashSet<>();
 		this.watcher.addSourceFolder(folder);
 		this.watcher.addListener(new FileChangeListener() {
 			@Override
@@ -249,7 +249,7 @@ public class FileSystemWatcherTests {
 		this.watcher.stopAfter(1);
 		ChangedFiles changedFiles = getSingleChangedFiles();
 		Set<ChangedFile> actual = changedFiles.getFiles();
-		Set<ChangedFile> expected = new HashSet<ChangedFile>();
+		Set<ChangedFile> expected = new HashSet<>();
 		expected.add(new ChangedFile(folder, modify, Type.MODIFY));
 		expected.add(new ChangedFile(folder, delete, Type.DELETE));
 		expected.add(new ChangedFile(folder, add, Type.ADD));
@@ -278,7 +278,7 @@ public class FileSystemWatcherTests {
 		this.watcher.stopAfter(1);
 		ChangedFiles changedFiles = getSingleChangedFiles();
 		Set<ChangedFile> actual = changedFiles.getFiles();
-		Set<ChangedFile> expected = new HashSet<ChangedFile>();
+		Set<ChangedFile> expected = new HashSet<>();
 		expected.add(new ChangedFile(folder, file, Type.MODIFY));
 		assertThat(actual).isEqualTo(expected);
 	}
diff --git a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/livereload/LiveReloadServerTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/livereload/LiveReloadServerTests.java
index 5fd384e9f2..f2df9ec91a 100644
--- a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/livereload/LiveReloadServerTests.java
+++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/livereload/LiveReloadServerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -156,7 +156,7 @@ public class LiveReloadServerTests {
 	 */
 	private static class MonitoredLiveReloadServer extends LiveReloadServer {
 
-		private final List<ConnectionClosedException> closedExceptions = new ArrayList<ConnectionClosedException>();
+		private final List<ConnectionClosedException> closedExceptions = new ArrayList<>();
 
 		private final Object monitor = new Object();
 
@@ -172,7 +172,7 @@ public class LiveReloadServerTests {
 
 		public List<ConnectionClosedException> getClosedExceptions() {
 			synchronized (this.monitor) {
-				return new ArrayList<ConnectionClosedException>(this.closedExceptions);
+				return new ArrayList<>(this.closedExceptions);
 			}
 		}
 
@@ -207,7 +207,7 @@ public class LiveReloadServerTests {
 
 		private final CountDownLatch helloLatch = new CountDownLatch(2);
 
-		private final List<String> messages = new ArrayList<String>();
+		private final List<String> messages = new ArrayList<>();
 
 		private int pongCount;
 
diff --git a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/ClassPathChangeUploaderTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/ClassPathChangeUploaderTests.java
index f1158bf5c3..b7c9598406 100644
--- a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/ClassPathChangeUploaderTests.java
+++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/ClassPathChangeUploaderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -145,14 +145,14 @@ public class ClassPathChangeUploaderTests {
 
 	private ClassPathChangedEvent createClassPathChangedEvent(File sourceFolder)
 			throws IOException {
-		Set<ChangedFile> files = new LinkedHashSet<ChangedFile>();
+		Set<ChangedFile> files = new LinkedHashSet<>();
 		File file1 = createFile(sourceFolder, "File1");
 		File file2 = createFile(sourceFolder, "File2");
 		File file3 = createFile(sourceFolder, "File3");
 		files.add(new ChangedFile(sourceFolder, file1, Type.ADD));
 		files.add(new ChangedFile(sourceFolder, file2, Type.MODIFY));
 		files.add(new ChangedFile(sourceFolder, file3, Type.DELETE));
-		Set<ChangedFiles> changeSet = new LinkedHashSet<ChangedFiles>();
+		Set<ChangedFiles> changeSet = new LinkedHashSet<>();
 		changeSet.add(new ChangedFiles(sourceFolder, files));
 		ClassPathChangedEvent event = new ClassPathChangedEvent(this, changeSet, false);
 		return event;
diff --git a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/RemoteClientConfigurationTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/RemoteClientConfigurationTests.java
index 95e293c182..9241e66d1e 100644
--- a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/RemoteClientConfigurationTests.java
+++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/RemoteClientConfigurationTests.java
@@ -112,7 +112,7 @@ public class RemoteClientConfigurationTests {
 	@Test
 	public void liveReloadOnClassPathChanged() throws Exception {
 		configure();
-		Set<ChangedFiles> changeSet = new HashSet<ChangedFiles>();
+		Set<ChangedFiles> changeSet = new HashSet<>();
 		ClassPathChangedEvent event = new ClassPathChangedEvent(this, changeSet, false);
 		this.context.publishEvent(event);
 		LiveReloadConfiguration configuration = this.context
diff --git a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/MainMethodTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/MainMethodTests.java
index deb64e5784..4bd5c0c0b1 100644
--- a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/MainMethodTests.java
+++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/MainMethodTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -37,7 +37,7 @@ public class MainMethodTests {
 	@Rule
 	public ExpectedException thrown = ExpectedException.none();
 
-	private static ThreadLocal<MainMethod> mainMethod = new ThreadLocal<MainMethod>();
+	private static ThreadLocal<MainMethod> mainMethod = new ThreadLocal<>();
 
 	private Method actualMain;
 
diff --git a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/MockRestarter.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/MockRestarter.java
index da0889fa10..c315b762ac 100644
--- a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/MockRestarter.java
+++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/MockRestarter.java
@@ -41,7 +41,7 @@ import static org.mockito.Mockito.mock;
  */
 public class MockRestarter implements TestRule {
 
-	private Map<String, Object> attributes = new HashMap<String, Object>();
+	private Map<String, Object> attributes = new HashMap<>();
 
 	private Restarter mock = mock(Restarter.class);
 
diff --git a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/classloader/RestartClassLoaderTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/classloader/RestartClassLoaderTests.java
index 1ad2954ac4..1060f03951 100644
--- a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/classloader/RestartClassLoaderTests.java
+++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/classloader/RestartClassLoaderTests.java
@@ -214,7 +214,7 @@ public class RestartClassLoaderTests {
 	}
 
 	private <T> List<T> toList(Enumeration<T> enumeration) {
-		List<T> list = new ArrayList<T>();
+		List<T> list = new ArrayList<>();
 		if (enumeration != null) {
 			while (enumeration.hasMoreElements()) {
 				list.add(enumeration.nextElement());
diff --git a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/server/DefaultSourceFolderUrlFilterTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/server/DefaultSourceFolderUrlFilterTests.java
index 29ce5038e9..f530257b48 100644
--- a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/server/DefaultSourceFolderUrlFilterTests.java
+++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/server/DefaultSourceFolderUrlFilterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -38,7 +38,7 @@ public class DefaultSourceFolderUrlFilterTests {
 	private static final List<String> COMMON_POSTFIXES;
 
 	static {
-		List<String> postfixes = new ArrayList<String>();
+		List<String> postfixes = new ArrayList<>();
 		postfixes.add(".jar");
 		postfixes.add("-1.3.0.jar");
 		postfixes.add("-1.3.0-SNAPSHOT.jar");
@@ -105,7 +105,7 @@ public class DefaultSourceFolderUrlFilterTests {
 	}
 
 	private List<URL> getUrls(String name) throws MalformedURLException {
-		List<URL> urls = new ArrayList<URL>();
+		List<URL> urls = new ArrayList<>();
 		urls.add(new URL("file:/some/path/" + name));
 		urls.add(new URL("file:/some/path/" + name + "!/"));
 		for (String postfix : COMMON_POSTFIXES) {
diff --git a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/server/RestartServerTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/server/RestartServerTests.java
index 3964f7c4be..e2a9c4979f 100644
--- a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/server/RestartServerTests.java
+++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/server/RestartServerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -73,7 +73,7 @@ public class RestartServerTests {
 		files.addFile("my/module-a", "ClassA.class", fileA);
 		files.addFile("my/module-c", "ClassB.class", fileB);
 		server.updateAndRestart(files);
-		Set<URL> expectedUrls = new LinkedHashSet<URL>(Arrays.asList(url1, url3));
+		Set<URL> expectedUrls = new LinkedHashSet<>(Arrays.asList(url1, url3));
 		assertThat(server.restartUrls).isEqualTo(expectedUrls);
 		assertThat(server.restartFiles).isEqualTo(files);
 	}
diff --git a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/test/MockClientHttpRequestFactory.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/test/MockClientHttpRequestFactory.java
index 3d10375c60..a144f58a6e 100644
--- a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/test/MockClientHttpRequestFactory.java
+++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/test/MockClientHttpRequestFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -43,9 +43,9 @@ public class MockClientHttpRequestFactory implements ClientHttpRequestFactory {
 
 	private AtomicLong seq = new AtomicLong();
 
-	private Deque<Object> responses = new ArrayDeque<Object>();
+	private Deque<Object> responses = new ArrayDeque<>();
 
-	private List<MockClientHttpRequest> executedRequests = new ArrayList<MockClientHttpRequest>();
+	private List<MockClientHttpRequest> executedRequests = new ArrayList<>();
 
 	@Override
 	public ClientHttpRequest createRequest(URI uri, HttpMethod httpMethod)
diff --git a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/server/HttpTunnelServerTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/server/HttpTunnelServerTests.java
index d81cc70226..e8a7d17931 100644
--- a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/server/HttpTunnelServerTests.java
+++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/tunnel/server/HttpTunnelServerTests.java
@@ -345,7 +345,7 @@ public class HttpTunnelServerTests {
 
 		private int timeout;
 
-		private BlockingDeque<ByteBuffer> outgoing = new LinkedBlockingDeque<ByteBuffer>();
+		private BlockingDeque<ByteBuffer> outgoing = new LinkedBlockingDeque<>();
 
 		private ByteArrayOutputStream written = new ByteArrayOutputStream();
 
diff --git a/spring-boot-docs/src/main/java/org/springframework/boot/kafka/KafkaSpecialProducerConsumerConfigExample.java b/spring-boot-docs/src/main/java/org/springframework/boot/kafka/KafkaSpecialProducerConsumerConfigExample.java
index c3e46a4d9a..ae859a7478 100644
--- a/spring-boot-docs/src/main/java/org/springframework/boot/kafka/KafkaSpecialProducerConsumerConfigExample.java
+++ b/spring-boot-docs/src/main/java/org/springframework/boot/kafka/KafkaSpecialProducerConsumerConfigExample.java
@@ -54,7 +54,7 @@ public class KafkaSpecialProducerConsumerConfigExample {
 			Map<String, Object> producerProperties = properties.buildProducerProperties();
 			producerProperties.put(CommonClientConfigs.METRIC_REPORTER_CLASSES_CONFIG,
 					MyProducerMetricsReporter.class);
-			return new DefaultKafkaProducerFactory<Object, Object>(producerProperties);
+			return new DefaultKafkaProducerFactory<>(producerProperties);
 		}
 
 		/**
@@ -67,7 +67,7 @@ public class KafkaSpecialProducerConsumerConfigExample {
 			Map<String, Object> consumerProperties = properties.buildConsumerProperties();
 			consumerProperties.put(CommonClientConfigs.METRIC_REPORTER_CLASSES_CONFIG,
 					MyConsumerMetricsReporter.class);
-			return new DefaultKafkaConsumerFactory<Object, Object>(consumerProperties);
+			return new DefaultKafkaConsumerFactory<>(consumerProperties);
 		}
 
 	}
diff --git a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/FullyExecutableJarTests.java b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/FullyExecutableJarTests.java
index ffdfc54267..c90f1fc40d 100644
--- a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/FullyExecutableJarTests.java
+++ b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/FullyExecutableJarTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -165,7 +165,7 @@ public class FullyExecutableJarTests {
 
 	private List<String> readLines(File file) throws IOException {
 		BufferedReader reader = new BufferedReader(new FileReader(file));
-		List<String> lines = new ArrayList<String>();
+		List<String> lines = new ArrayList<>();
 		try {
 			String line = reader.readLine();
 			while (line != null && lines.size() < 50) {
diff --git a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/SpringLoadedTests.java b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/SpringLoadedTests.java
index 10d0005b03..da131ea2be 100644
--- a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/SpringLoadedTests.java
+++ b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/SpringLoadedTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -60,7 +60,7 @@ public class SpringLoadedTests {
 		BufferedReader reader = new BufferedReader(new FileReader(
 				new File("target/spring-loaded-jvm-args/build/output.txt")));
 		try {
-			List<String> lines = new ArrayList<String>();
+			List<String> lines = new ArrayList<>();
 
 			String line;
 
diff --git a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/WarPackagingTests.java b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/WarPackagingTests.java
index 809228541d..8e1918c4b3 100644
--- a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/WarPackagingTests.java
+++ b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/gradle/WarPackagingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -44,11 +44,11 @@ public class WarPackagingTests {
 
 	private static final String WEB_INF_LIB_PREFIX = "WEB-INF/lib/";
 
-	private static final Set<String> TOMCAT_EXPECTED_IN_WEB_INF_LIB_PROVIDED = new HashSet<String>(
+	private static final Set<String> TOMCAT_EXPECTED_IN_WEB_INF_LIB_PROVIDED = new HashSet<>(
 			Arrays.asList("spring-boot-starter-tomcat-", "tomcat-embed-core-",
 					"tomcat-embed-el-", "tomcat-embed-websocket-"));
 
-	private static final Set<String> JETTY_EXPECTED_IN_WEB_INF_LIB_PROVIDED = new HashSet<String>(
+	private static final Set<String> JETTY_EXPECTED_IN_WEB_INF_LIB_PROVIDED = new HashSet<>(
 			Arrays.asList("spring-boot-starter-jetty-", "jetty-continuation",
 					"jetty-util-", "javax.servlet-", "jetty-client", "jetty-io-",
 					"jetty-http-", "jetty-server-", "jetty-security-", "jetty-servlet-",
@@ -105,7 +105,7 @@ public class WarPackagingTests {
 			throws IOException {
 		Set<String> entries = getWebInfLibProvidedEntries(war);
 		assertThat(entries).hasSameSizeAs(expectedEntries);
-		List<String> unexpectedLibProvidedEntries = new ArrayList<String>();
+		List<String> unexpectedLibProvidedEntries = new ArrayList<>();
 		for (String entry : entries) {
 			if (!isExpectedInWebInfLibProvided(entry, expectedEntries)) {
 				unexpectedLibProvidedEntries.add(entry);
@@ -117,7 +117,7 @@ public class WarPackagingTests {
 	private void checkWebInfLibEntries(JarFile war, Set<String> entriesOnlyInLibProvided)
 			throws IOException {
 		Set<String> entries = getWebInfLibEntries(war);
-		List<String> unexpectedLibEntries = new ArrayList<String>();
+		List<String> unexpectedLibEntries = new ArrayList<>();
 		for (String entry : entries) {
 			if (!isExpectedInWebInfLib(entry, entriesOnlyInLibProvided)) {
 				unexpectedLibEntries.add(entry);
@@ -127,7 +127,7 @@ public class WarPackagingTests {
 	}
 
 	private Set<String> getWebInfLibProvidedEntries(JarFile war) throws IOException {
-		Set<String> webInfLibProvidedEntries = new HashSet<String>();
+		Set<String> webInfLibProvidedEntries = new HashSet<>();
 		Enumeration<JarEntry> entries = war.entries();
 		while (entries.hasMoreElements()) {
 			String name = entries.nextElement().getName();
@@ -139,7 +139,7 @@ public class WarPackagingTests {
 	}
 
 	private Set<String> getWebInfLibEntries(JarFile war) throws IOException {
-		Set<String> webInfLibEntries = new HashSet<String>();
+		Set<String> webInfLibEntries = new HashSet<>();
 		Enumeration<JarEntry> entries = war.entries();
 		while (entries.hasMoreElements()) {
 			String name = entries.nextElement().getName();
diff --git a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/starter/StarterDependenciesIntegrationTests.java b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/starter/StarterDependenciesIntegrationTests.java
index f19197b976..f8d2fc7922 100644
--- a/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/starter/StarterDependenciesIntegrationTests.java
+++ b/spring-boot-integration-tests/spring-boot-gradle-tests/src/test/java/org/springframework/boot/starter/StarterDependenciesIntegrationTests.java
@@ -58,7 +58,7 @@ public class StarterDependenciesIntegrationTests {
 
 	@Parameters
 	public static List<String[]> getStarters() {
-		List<String[]> starters = new ArrayList<String[]>();
+		List<String[]> starters = new ArrayList<>();
 		for (File file : new File("../../spring-boot-starters").listFiles()) {
 			if (file.isDirectory() && new File(file, "pom.xml").exists()) {
 				String name = file.getName();
diff --git a/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/AbstractApplicationLauncher.java b/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/AbstractApplicationLauncher.java
index bd16fdf01b..3c192162ec 100644
--- a/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/AbstractApplicationLauncher.java
+++ b/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/AbstractApplicationLauncher.java
@@ -65,7 +65,7 @@ abstract class AbstractApplicationLauncher extends ExternalResource {
 	private Process startApplication() throws Exception {
 		this.serverPortFile.delete();
 		File archive = this.applicationBuilder.buildApplication();
-		List<String> arguments = new ArrayList<String>();
+		List<String> arguments = new ArrayList<>();
 		arguments.add(System.getProperty("java.home") + "/bin/java");
 		arguments.addAll(getArguments(archive));
 		ProcessBuilder processBuilder = new ProcessBuilder(
diff --git a/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerIntegrationTests.java b/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerIntegrationTests.java
index f318cf3c07..fd6638fe23 100644
--- a/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerIntegrationTests.java
+++ b/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerIntegrationTests.java
@@ -48,7 +48,7 @@ public abstract class AbstractEmbeddedServletContainerIntegrationTests {
 	protected final RestTemplate rest = new RestTemplate();
 
 	public static Object[] parameters(String packaging) {
-		List<Object> parameters = new ArrayList<Object>();
+		List<Object> parameters = new ArrayList<>();
 		parameters.addAll(createParameters(packaging, "jetty"));
 		parameters.addAll(createParameters(packaging, "tomcat"));
 		parameters.addAll(createParameters(packaging, "undertow"));
@@ -57,7 +57,7 @@ public abstract class AbstractEmbeddedServletContainerIntegrationTests {
 
 	private static List<Object> createParameters(String packaging, String container,
 			String... versions) {
-		List<Object> parameters = new ArrayList<Object>();
+		List<Object> parameters = new ArrayList<>();
 		ApplicationBuilder applicationBuilder = new ApplicationBuilder(temporaryFolder,
 				packaging, container);
 		parameters.add(new Object[] {
diff --git a/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/ApplicationBuilder.java b/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/ApplicationBuilder.java
index 8685ff9576..cb439df345 100644
--- a/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/ApplicationBuilder.java
+++ b/spring-boot-integration-tests/spring-boot-integration-tests-embedded-servlet-container/src/test/java/org/springframework/boot/context/embedded/ApplicationBuilder.java
@@ -98,7 +98,7 @@ class ApplicationBuilder {
 
 	private void writePom(File appFolder, File resourcesJar)
 			throws FileNotFoundException, IOException {
-		Map<String, Object> context = new HashMap<String, Object>();
+		Map<String, Object> context = new HashMap<>();
 		context.put("packaging", this.packaging);
 		context.put("container", this.container);
 		context.put("bootVersion", Versions.getBootVersion());
diff --git a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIT.java b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIT.java
index 57f44a7646..0a18899e01 100644
--- a/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIT.java
+++ b/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/java/org/springframework/boot/launchscript/SysVinitLaunchScriptIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -73,7 +73,7 @@ public class SysVinitLaunchScriptIT {
 
 	@Parameters(name = "{0} {1}")
 	public static List<Object[]> parameters() {
-		List<Object[]> parameters = new ArrayList<Object[]>();
+		List<Object[]> parameters = new ArrayList<>();
 		for (File os : new File("src/test/resources/conf").listFiles()) {
 			for (File version : os.listFiles()) {
 				parameters.add(new Object[] { os.getName(), version.getName() });
diff --git a/spring-boot-samples/spring-boot-sample-actuator/src/main/java/sample/actuator/SampleController.java b/spring-boot-samples/spring-boot-sample-actuator/src/main/java/sample/actuator/SampleController.java
index 1dcc6054e2..3cd2396e5e 100644
--- a/spring-boot-samples/spring-boot-sample-actuator/src/main/java/sample/actuator/SampleController.java
+++ b/spring-boot-samples/spring-boot-sample-actuator/src/main/java/sample/actuator/SampleController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -51,7 +51,7 @@ public class SampleController {
 	@PostMapping("/")
 	@ResponseBody
 	public Map<String, Object> olleh(@Validated Message message) {
-		Map<String, Object> model = new LinkedHashMap<String, Object>();
+		Map<String, Object> model = new LinkedHashMap<>();
 		model.put("message", message.getValue());
 		model.put("title", "Hello Home");
 		model.put("date", new Date());
diff --git a/spring-boot-samples/spring-boot-sample-atmosphere/src/main/java/sample/atmosphere/SampleAtmosphereApplication.java b/spring-boot-samples/spring-boot-sample-atmosphere/src/main/java/sample/atmosphere/SampleAtmosphereApplication.java
index 29d036addf..24844bf9d3 100644
--- a/spring-boot-samples/spring-boot-sample-atmosphere/src/main/java/sample/atmosphere/SampleAtmosphereApplication.java
+++ b/spring-boot-samples/spring-boot-sample-atmosphere/src/main/java/sample/atmosphere/SampleAtmosphereApplication.java
@@ -48,7 +48,7 @@ public class SampleAtmosphereApplication {
 	public ServletRegistrationBean<AtmosphereServlet> atmosphereServlet() {
 		// Dispatcher servlet is mapped to '/home' to allow the AtmosphereServlet
 		// to be mapped to '/chat'
-		ServletRegistrationBean<AtmosphereServlet> registration = new ServletRegistrationBean<AtmosphereServlet>(
+		ServletRegistrationBean<AtmosphereServlet> registration = new ServletRegistrationBean<>(
 				new AtmosphereServlet(), "/chat/*");
 		registration.addInitParameter("org.atmosphere.cpr.packages", "sample");
 		registration.addInitParameter("org.atmosphere.interceptor.HeartbeatInterceptor"
diff --git a/spring-boot-samples/spring-boot-sample-atmosphere/src/test/java/sample/atmosphere/SampleAtmosphereApplicationTests.java b/spring-boot-samples/spring-boot-sample-atmosphere/src/test/java/sample/atmosphere/SampleAtmosphereApplicationTests.java
index af9dbc744e..ea4e3212f2 100644
--- a/spring-boot-samples/spring-boot-sample-atmosphere/src/test/java/sample/atmosphere/SampleAtmosphereApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-atmosphere/src/test/java/sample/atmosphere/SampleAtmosphereApplicationTests.java
@@ -79,7 +79,7 @@ public class SampleAtmosphereApplicationTests {
 
 		private final CountDownLatch latch = new CountDownLatch(1);
 
-		private final AtomicReference<String> messagePayload = new AtomicReference<String>();
+		private final AtomicReference<String> messagePayload = new AtomicReference<>();
 
 		@Override
 		public void run(String... args) throws Exception {
diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/HotelServiceImpl.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/HotelServiceImpl.java
index 85c05d22f9..5a1ecf464c 100644
--- a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/HotelServiceImpl.java
+++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/service/HotelServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -83,7 +83,7 @@ class HotelServiceImpl implements HotelService {
 		private final Map<Rating, Long> ratingCount;
 
 		public ReviewsSummaryImpl(List<RatingCount> ratingCounts) {
-			this.ratingCount = new HashMap<Rating, Long>();
+			this.ratingCount = new HashMap<>();
 			for (RatingCount ratingCount : ratingCounts) {
 				this.ratingCount.put(ratingCount.getRating(), ratingCount.getCount());
 			}
diff --git a/spring-boot-samples/spring-boot-sample-hateoas/src/main/java/sample/hateoas/domain/InMemoryCustomerRepository.java b/spring-boot-samples/spring-boot-sample-hateoas/src/main/java/sample/hateoas/domain/InMemoryCustomerRepository.java
index c1783ebb65..793e56cd00 100644
--- a/spring-boot-samples/spring-boot-sample-hateoas/src/main/java/sample/hateoas/domain/InMemoryCustomerRepository.java
+++ b/spring-boot-samples/spring-boot-sample-hateoas/src/main/java/sample/hateoas/domain/InMemoryCustomerRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -25,7 +25,7 @@ import org.springframework.util.ObjectUtils;
 @Repository
 public class InMemoryCustomerRepository implements CustomerRepository {
 
-	private final List<Customer> customers = new ArrayList<Customer>();
+	private final List<Customer> customers = new ArrayList<>();
 
 	public InMemoryCustomerRepository() {
 		this.customers.add(new Customer(1L, "Oliver", "Gierke"));
diff --git a/spring-boot-samples/spring-boot-sample-hateoas/src/main/java/sample/hateoas/web/CustomerController.java b/spring-boot-samples/spring-boot-sample-hateoas/src/main/java/sample/hateoas/web/CustomerController.java
index 87c9bfdc6b..1412771860 100644
--- a/spring-boot-samples/spring-boot-sample-hateoas/src/main/java/sample/hateoas/web/CustomerController.java
+++ b/spring-boot-samples/spring-boot-sample-hateoas/src/main/java/sample/hateoas/web/CustomerController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -48,17 +48,16 @@ public class CustomerController {
 
 	@GetMapping(produces = MediaType.APPLICATION_JSON_VALUE)
 	HttpEntity<Resources<Customer>> showCustomers() {
-		Resources<Customer> resources = new Resources<Customer>(
-				this.repository.findAll());
+		Resources<Customer> resources = new Resources<>(this.repository.findAll());
 		resources.add(this.entityLinks.linkToCollectionResource(Customer.class));
-		return new ResponseEntity<Resources<Customer>>(resources, HttpStatus.OK);
+		return new ResponseEntity<>(resources, HttpStatus.OK);
 	}
 
 	@GetMapping(path = "/{id}", produces = MediaType.APPLICATION_JSON_VALUE)
 	HttpEntity<Resource<Customer>> showCustomer(@PathVariable Long id) {
-		Resource<Customer> resource = new Resource<Customer>(this.repository.findOne(id));
+		Resource<Customer> resource = new Resource<>(this.repository.findOne(id));
 		resource.add(this.entityLinks.linkToSingleResource(Customer.class, id));
-		return new ResponseEntity<Resource<Customer>>(resource, HttpStatus.OK);
+		return new ResponseEntity<>(resource, HttpStatus.OK);
 	}
 
 }
diff --git a/spring-boot-samples/spring-boot-sample-jersey1/src/main/java/sample/jersey1/SampleJersey1Application.java b/spring-boot-samples/spring-boot-sample-jersey1/src/main/java/sample/jersey1/SampleJersey1Application.java
index 9e75ba7c00..8b4fdb5983 100644
--- a/spring-boot-samples/spring-boot-sample-jersey1/src/main/java/sample/jersey1/SampleJersey1Application.java
+++ b/spring-boot-samples/spring-boot-sample-jersey1/src/main/java/sample/jersey1/SampleJersey1Application.java
@@ -47,7 +47,7 @@ public class SampleJersey1Application {
 
 	@Bean
 	public FilterRegistrationBean<ServletContainer> jersey() {
-		FilterRegistrationBean<ServletContainer> bean = new FilterRegistrationBean<ServletContainer>();
+		FilterRegistrationBean<ServletContainer> bean = new FilterRegistrationBean<>();
 		bean.setFilter(new ServletContainer());
 		bean.addInitParameter("com.sun.jersey.config.property.packages",
 				"com.sun.jersey;sample.jersey1");
diff --git a/spring-boot-samples/spring-boot-sample-jetty/src/test/java/sample/jetty/SampleJettyApplicationTests.java b/spring-boot-samples/spring-boot-sample-jetty/src/test/java/sample/jetty/SampleJettyApplicationTests.java
index 3a2ea9b7ef..91912ccce3 100644
--- a/spring-boot-samples/spring-boot-sample-jetty/src/test/java/sample/jetty/SampleJettyApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-jetty/src/test/java/sample/jetty/SampleJettyApplicationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -63,7 +63,7 @@ public class SampleJettyApplicationTests {
 	public void testCompression() throws Exception {
 		HttpHeaders requestHeaders = new HttpHeaders();
 		requestHeaders.set("Accept-Encoding", "gzip");
-		HttpEntity<?> requestEntity = new HttpEntity<Object>(requestHeaders);
+		HttpEntity<?> requestEntity = new HttpEntity<>(requestHeaders);
 
 		ResponseEntity<byte[]> entity = this.restTemplate.exchange("/", HttpMethod.GET,
 				requestEntity, byte[].class);
diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Author.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Author.java
index 0052e031c3..70f5bae490 100644
--- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Author.java
+++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Author.java
@@ -133,6 +133,7 @@ public class Author extends TableImpl<Record> {
 	/**
 	 * Rename this table
 	 */
+	@Override
 	public Author rename(String name) {
 		return new Author(name, null);
 	}
diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Book.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Book.java
index b987e2f5b6..8b90b902c4 100644
--- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Book.java
+++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Book.java
@@ -136,6 +136,7 @@ public class Book extends TableImpl<Record> {
 	/**
 	 * Rename this table
 	 */
+	@Override
 	public Book rename(String name) {
 		return new Book(name, null);
 	}
diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/BookStore.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/BookStore.java
index a4025863c5..6bb06ff4a4 100644
--- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/BookStore.java
+++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/BookStore.java
@@ -94,6 +94,7 @@ public class BookStore extends TableImpl<Record> {
 	/**
 	 * Rename this table
 	 */
+	@Override
 	public BookStore rename(String name) {
 		return new BookStore(name, null);
 	}
diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/BookToBookStore.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/BookToBookStore.java
index fa5ea67190..87dcc42d62 100644
--- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/BookToBookStore.java
+++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/BookToBookStore.java
@@ -124,6 +124,7 @@ public class BookToBookStore extends TableImpl<Record> {
 	/**
 	 * Rename this table
 	 */
+	@Override
 	public BookToBookStore rename(String name) {
 		return new BookToBookStore(name, null);
 	}
diff --git a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Language.java b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Language.java
index a8f9d51578..6c90114549 100644
--- a/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Language.java
+++ b/spring-boot-samples/spring-boot-sample-jooq/gensrc/main/java/sample/jooq/domain/Language.java
@@ -114,6 +114,7 @@ public class Language extends TableImpl<Record> {
 	/**
 	 * Rename this table
 	 */
+	@Override
 	public Language rename(String name) {
 		return new Language(name, null);
 	}
diff --git a/spring-boot-samples/spring-boot-sample-session-redis/src/test/java/sample/session/redis/SampleSessionRedisApplicationTests.java b/spring-boot-samples/spring-boot-sample-session-redis/src/test/java/sample/session/redis/SampleSessionRedisApplicationTests.java
index a18af63950..9cb3e27ddb 100644
--- a/spring-boot-samples/spring-boot-sample-session-redis/src/test/java/sample/session/redis/SampleSessionRedisApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-session-redis/src/test/java/sample/session/redis/SampleSessionRedisApplicationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -67,8 +67,8 @@ public class SampleSessionRedisApplicationTests {
 		HttpHeaders requestHeaders = new HttpHeaders();
 		requestHeaders.set("Cookie", response.getHeaders().getFirst("Set-Cookie"));
 
-		RequestEntity<Void> request = new RequestEntity<Void>(requestHeaders,
-				HttpMethod.GET, uri);
+		RequestEntity<Void> request = new RequestEntity<>(requestHeaders, HttpMethod.GET,
+				uri);
 
 		String uuid2 = restTemplate.exchange(request, String.class).getBody();
 		assertThat(uuid1).isEqualTo(uuid2);
diff --git a/spring-boot-samples/spring-boot-sample-tomcat/src/test/java/sample/tomcat/SampleTomcatApplicationTests.java b/spring-boot-samples/spring-boot-sample-tomcat/src/test/java/sample/tomcat/SampleTomcatApplicationTests.java
index 235565edfb..5055992802 100644
--- a/spring-boot-samples/spring-boot-sample-tomcat/src/test/java/sample/tomcat/SampleTomcatApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-tomcat/src/test/java/sample/tomcat/SampleTomcatApplicationTests.java
@@ -71,7 +71,7 @@ public class SampleTomcatApplicationTests {
 	public void testCompression() throws Exception {
 		HttpHeaders requestHeaders = new HttpHeaders();
 		requestHeaders.set("Accept-Encoding", "gzip");
-		HttpEntity<?> requestEntity = new HttpEntity<Object>(requestHeaders);
+		HttpEntity<?> requestEntity = new HttpEntity<>(requestHeaders);
 		ResponseEntity<byte[]> entity = this.restTemplate.exchange("/", HttpMethod.GET,
 				requestEntity, byte[].class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
diff --git a/spring-boot-samples/spring-boot-sample-undertow/src/test/java/sample/undertow/SampleUndertowApplicationTests.java b/spring-boot-samples/spring-boot-sample-undertow/src/test/java/sample/undertow/SampleUndertowApplicationTests.java
index 05ee9d4d39..3b964e191f 100644
--- a/spring-boot-samples/spring-boot-sample-undertow/src/test/java/sample/undertow/SampleUndertowApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-undertow/src/test/java/sample/undertow/SampleUndertowApplicationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -66,7 +66,7 @@ public class SampleUndertowApplicationTests {
 	public void testCompression() throws Exception {
 		HttpHeaders requestHeaders = new HttpHeaders();
 		requestHeaders.set("Accept-Encoding", "gzip");
-		HttpEntity<?> requestEntity = new HttpEntity<Object>(requestHeaders);
+		HttpEntity<?> requestEntity = new HttpEntity<>(requestHeaders);
 		ResponseEntity<byte[]> entity = this.restTemplate.exchange("/", HttpMethod.GET,
 				requestEntity, byte[].class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
diff --git a/spring-boot-samples/spring-boot-sample-web-freemarker/src/test/java/sample/freemarker/SampleWebFreeMarkerApplicationTests.java b/spring-boot-samples/spring-boot-sample-web-freemarker/src/test/java/sample/freemarker/SampleWebFreeMarkerApplicationTests.java
index 1adec7ff61..754badaee0 100644
--- a/spring-boot-samples/spring-boot-sample-web-freemarker/src/test/java/sample/freemarker/SampleWebFreeMarkerApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-web-freemarker/src/test/java/sample/freemarker/SampleWebFreeMarkerApplicationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -62,7 +62,7 @@ public class SampleWebFreeMarkerApplicationTests {
 	public void testFreeMarkerErrorTemplate() throws Exception {
 		HttpHeaders headers = new HttpHeaders();
 		headers.setAccept(Arrays.asList(MediaType.TEXT_HTML));
-		HttpEntity<String> requestEntity = new HttpEntity<String>(headers);
+		HttpEntity<String> requestEntity = new HttpEntity<>(headers);
 
 		ResponseEntity<String> responseEntity = this.testRestTemplate
 				.exchange("/does-not-exist", HttpMethod.GET, requestEntity, String.class);
diff --git a/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/java/sample/groovytemplates/InMemoryMessageRepository.java b/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/java/sample/groovytemplates/InMemoryMessageRepository.java
index 626b83064d..0fe40f2c0c 100644
--- a/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/java/sample/groovytemplates/InMemoryMessageRepository.java
+++ b/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/java/sample/groovytemplates/InMemoryMessageRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -24,7 +24,7 @@ public class InMemoryMessageRepository implements MessageRepository {
 
 	private static AtomicLong counter = new AtomicLong();
 
-	private final ConcurrentMap<Long, Message> messages = new ConcurrentHashMap<Long, Message>();
+	private final ConcurrentMap<Long, Message> messages = new ConcurrentHashMap<>();
 
 	@Override
 	public Iterable<Message> findAll() {
diff --git a/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/java/sample/groovytemplates/mvc/MessageController.java b/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/java/sample/groovytemplates/mvc/MessageController.java
index 89bb290970..eb2fe29426 100644
--- a/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/java/sample/groovytemplates/mvc/MessageController.java
+++ b/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/main/java/sample/groovytemplates/mvc/MessageController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -77,7 +77,7 @@ public class MessageController {
 	}
 
 	private Map<String, ObjectError> getFieldErrors(BindingResult result) {
-		Map<String, ObjectError> map = new HashMap<String, ObjectError>();
+		Map<String, ObjectError> map = new HashMap<>();
 		for (FieldError error : result.getFieldErrors()) {
 			map.put(error.getField(), error);
 		}
diff --git a/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/test/java/sample/groovytemplates/SampleGroovyTemplateApplicationTests.java b/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/test/java/sample/groovytemplates/SampleGroovyTemplateApplicationTests.java
index 108f13c16f..cf0fd812e3 100644
--- a/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/test/java/sample/groovytemplates/SampleGroovyTemplateApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/test/java/sample/groovytemplates/SampleGroovyTemplateApplicationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -61,7 +61,7 @@ public class SampleGroovyTemplateApplicationTests {
 
 	@Test
 	public void testCreate() throws Exception {
-		MultiValueMap<String, String> map = new LinkedMultiValueMap<String, String>();
+		MultiValueMap<String, String> map = new LinkedMultiValueMap<>();
 		map.set("text", "FOO text");
 		map.set("summary", "FOO");
 		URI location = this.restTemplate.postForLocation("/", map);
diff --git a/spring-boot-samples/spring-boot-sample-web-method-security/src/test/java/sample/security/method/SampleMethodSecurityApplicationTests.java b/spring-boot-samples/spring-boot-sample-web-method-security/src/test/java/sample/security/method/SampleMethodSecurityApplicationTests.java
index fa23d46567..695b23ec6f 100644
--- a/spring-boot-samples/spring-boot-sample-web-method-security/src/test/java/sample/security/method/SampleMethodSecurityApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-web-method-security/src/test/java/sample/security/method/SampleMethodSecurityApplicationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -72,14 +72,12 @@ public class SampleMethodSecurityApplicationTests {
 	public void testLogin() throws Exception {
 		HttpHeaders headers = new HttpHeaders();
 		headers.setAccept(Arrays.asList(MediaType.TEXT_HTML));
-		MultiValueMap<String, String> form = new LinkedMultiValueMap<String, String>();
+		MultiValueMap<String, String> form = new LinkedMultiValueMap<>();
 		form.set("username", "admin");
 		form.set("password", "admin");
 		getCsrf(form, headers);
 		ResponseEntity<String> entity = this.restTemplate.exchange("/login",
-				HttpMethod.POST,
-				new HttpEntity<MultiValueMap<String, String>>(form, headers),
-				String.class);
+				HttpMethod.POST, new HttpEntity<>(form, headers), String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.FOUND);
 		assertThat(entity.getHeaders().getLocation().toString())
 				.isEqualTo("http://localhost:" + this.port + "/");
@@ -89,14 +87,12 @@ public class SampleMethodSecurityApplicationTests {
 	public void testDenied() throws Exception {
 		HttpHeaders headers = new HttpHeaders();
 		headers.setAccept(Arrays.asList(MediaType.TEXT_HTML));
-		MultiValueMap<String, String> form = new LinkedMultiValueMap<String, String>();
+		MultiValueMap<String, String> form = new LinkedMultiValueMap<>();
 		form.set("username", "user");
 		form.set("password", "user");
 		getCsrf(form, headers);
 		ResponseEntity<String> entity = this.restTemplate.exchange("/login",
-				HttpMethod.POST,
-				new HttpEntity<MultiValueMap<String, String>>(form, headers),
-				String.class);
+				HttpMethod.POST, new HttpEntity<>(form, headers), String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.FOUND);
 		String cookie = entity.getHeaders().getFirst("Set-Cookie");
 		headers.set("Cookie", cookie);
diff --git a/spring-boot-samples/spring-boot-sample-web-mustache/src/test/java/sample/mustache/SampleWebMustacheApplicationTests.java b/spring-boot-samples/spring-boot-sample-web-mustache/src/test/java/sample/mustache/SampleWebMustacheApplicationTests.java
index 397b232481..029ff9798a 100644
--- a/spring-boot-samples/spring-boot-sample-web-mustache/src/test/java/sample/mustache/SampleWebMustacheApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-web-mustache/src/test/java/sample/mustache/SampleWebMustacheApplicationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -61,7 +61,7 @@ public class SampleWebMustacheApplicationTests {
 	public void testMustacheErrorTemplate() throws Exception {
 		HttpHeaders headers = new HttpHeaders();
 		headers.setAccept(Arrays.asList(MediaType.TEXT_HTML));
-		HttpEntity<String> requestEntity = new HttpEntity<String>(headers);
+		HttpEntity<String> requestEntity = new HttpEntity<>(headers);
 		ResponseEntity<String> responseEntity = this.restTemplate
 				.exchange("/does-not-exist", HttpMethod.GET, requestEntity, String.class);
 		assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND);
@@ -73,7 +73,7 @@ public class SampleWebMustacheApplicationTests {
 	public void test503HtmlResource() throws Exception {
 		HttpHeaders headers = new HttpHeaders();
 		headers.setAccept(Arrays.asList(MediaType.TEXT_HTML));
-		HttpEntity<String> requestEntity = new HttpEntity<String>(headers);
+		HttpEntity<String> requestEntity = new HttpEntity<>(headers);
 		ResponseEntity<String> entity = this.restTemplate.exchange("/serviceUnavailable",
 				HttpMethod.GET, requestEntity, String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.SERVICE_UNAVAILABLE);
@@ -84,7 +84,7 @@ public class SampleWebMustacheApplicationTests {
 	public void test5xxHtmlResource() throws Exception {
 		HttpHeaders headers = new HttpHeaders();
 		headers.setAccept(Arrays.asList(MediaType.TEXT_HTML));
-		HttpEntity<String> requestEntity = new HttpEntity<String>(headers);
+		HttpEntity<String> requestEntity = new HttpEntity<>(headers);
 		ResponseEntity<String> entity = this.restTemplate.exchange("/bang",
 				HttpMethod.GET, requestEntity, String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR);
@@ -95,7 +95,7 @@ public class SampleWebMustacheApplicationTests {
 	public void test507Template() throws Exception {
 		HttpHeaders headers = new HttpHeaders();
 		headers.setAccept(Arrays.asList(MediaType.TEXT_HTML));
-		HttpEntity<String> requestEntity = new HttpEntity<String>(headers);
+		HttpEntity<String> requestEntity = new HttpEntity<>(headers);
 		ResponseEntity<String> entity = this.restTemplate.exchange("/insufficientStorage",
 				HttpMethod.GET, requestEntity, String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.INSUFFICIENT_STORAGE);
diff --git a/spring-boot-samples/spring-boot-sample-web-secure-custom/src/test/java/sample/web/secure/custom/SampleWebSecureCustomApplicationTests.java b/spring-boot-samples/spring-boot-sample-web-secure-custom/src/test/java/sample/web/secure/custom/SampleWebSecureCustomApplicationTests.java
index 70f83cc19c..70d5ca2086 100644
--- a/spring-boot-samples/spring-boot-sample-web-secure-custom/src/test/java/sample/web/secure/custom/SampleWebSecureCustomApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-web-secure-custom/src/test/java/sample/web/secure/custom/SampleWebSecureCustomApplicationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -83,13 +83,11 @@ public class SampleWebSecureCustomApplicationTests {
 		HttpHeaders headers = getHeaders();
 		headers.setAccept(Arrays.asList(MediaType.TEXT_HTML));
 		headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
-		MultiValueMap<String, String> form = new LinkedMultiValueMap<String, String>();
+		MultiValueMap<String, String> form = new LinkedMultiValueMap<>();
 		form.set("username", "user");
 		form.set("password", "user");
 		ResponseEntity<String> entity = this.restTemplate.exchange("/login",
-				HttpMethod.POST,
-				new HttpEntity<MultiValueMap<String, String>>(form, headers),
-				String.class);
+				HttpMethod.POST, new HttpEntity<>(form, headers), String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.FOUND);
 		assertThat(entity.getHeaders().getLocation().toString())
 				.endsWith(this.port + "/");
diff --git a/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/test/java/sample/web/secure/jdbc/SampleWebSecureJdbcApplicationTests.java b/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/test/java/sample/web/secure/jdbc/SampleWebSecureJdbcApplicationTests.java
index 644b9815ee..00b9109856 100644
--- a/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/test/java/sample/web/secure/jdbc/SampleWebSecureJdbcApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/test/java/sample/web/secure/jdbc/SampleWebSecureJdbcApplicationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -83,13 +83,11 @@ public class SampleWebSecureJdbcApplicationTests {
 		HttpHeaders headers = getHeaders();
 		headers.setAccept(Arrays.asList(MediaType.TEXT_HTML));
 		headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
-		MultiValueMap<String, String> form = new LinkedMultiValueMap<String, String>();
+		MultiValueMap<String, String> form = new LinkedMultiValueMap<>();
 		form.set("username", "user");
 		form.set("password", "user");
 		ResponseEntity<String> entity = this.restTemplate.exchange("/login",
-				HttpMethod.POST,
-				new HttpEntity<MultiValueMap<String, String>>(form, headers),
-				String.class);
+				HttpMethod.POST, new HttpEntity<>(form, headers), String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.FOUND);
 		assertThat(entity.getHeaders().getLocation().toString())
 				.endsWith(this.port + "/");
diff --git a/spring-boot-samples/spring-boot-sample-web-secure/src/test/java/sample/web/secure/SampleSecureApplicationTests.java b/spring-boot-samples/spring-boot-sample-web-secure/src/test/java/sample/web/secure/SampleSecureApplicationTests.java
index 098e28f781..5eec9ec8c9 100644
--- a/spring-boot-samples/spring-boot-sample-web-secure/src/test/java/sample/web/secure/SampleSecureApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-web-secure/src/test/java/sample/web/secure/SampleSecureApplicationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -83,13 +83,11 @@ public class SampleSecureApplicationTests {
 		HttpHeaders headers = getHeaders();
 		headers.setAccept(Arrays.asList(MediaType.TEXT_HTML));
 		headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
-		MultiValueMap<String, String> form = new LinkedMultiValueMap<String, String>();
+		MultiValueMap<String, String> form = new LinkedMultiValueMap<>();
 		form.set("username", "user");
 		form.set("password", "user");
 		ResponseEntity<String> entity = this.restTemplate.exchange("/login",
-				HttpMethod.POST,
-				new HttpEntity<MultiValueMap<String, String>>(form, headers),
-				String.class);
+				HttpMethod.POST, new HttpEntity<>(form, headers), String.class);
 		assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.FOUND);
 		assertThat(entity.getHeaders().getLocation().toString())
 				.endsWith(this.port + "/");
diff --git a/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/web/ui/InMemoryMessageRepository.java b/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/web/ui/InMemoryMessageRepository.java
index af360eff42..4d3c372752 100755
--- a/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/web/ui/InMemoryMessageRepository.java
+++ b/spring-boot-samples/spring-boot-sample-web-ui/src/main/java/sample/web/ui/InMemoryMessageRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -27,7 +27,7 @@ public class InMemoryMessageRepository implements MessageRepository {
 
 	private static AtomicLong counter = new AtomicLong();
 
-	private final ConcurrentMap<Long, Message> messages = new ConcurrentHashMap<Long, Message>();
+	private final ConcurrentMap<Long, Message> messages = new ConcurrentHashMap<>();
 
 	@Override
 	public Iterable<Message> findAll() {
diff --git a/spring-boot-samples/spring-boot-sample-web-ui/src/test/java/sample/web/ui/SampleWebUiApplicationTests.java b/spring-boot-samples/spring-boot-sample-web-ui/src/test/java/sample/web/ui/SampleWebUiApplicationTests.java
index 57c81c8bf4..d7b998ac66 100644
--- a/spring-boot-samples/spring-boot-sample-web-ui/src/test/java/sample/web/ui/SampleWebUiApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-web-ui/src/test/java/sample/web/ui/SampleWebUiApplicationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -61,7 +61,7 @@ public class SampleWebUiApplicationTests {
 
 	@Test
 	public void testCreate() throws Exception {
-		MultiValueMap<String, String> map = new LinkedMultiValueMap<String, String>();
+		MultiValueMap<String, String> map = new LinkedMultiValueMap<>();
 		map.set("text", "FOO text");
 		map.set("summary", "FOO");
 		URI location = this.restTemplate.postForLocation("/", map);
diff --git a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/snake/Snake.java b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/snake/Snake.java
index a819650835..39ffc8de80 100644
--- a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/snake/Snake.java
+++ b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/snake/Snake.java
@@ -28,7 +28,7 @@ public class Snake {
 
 	private static final int DEFAULT_LENGTH = 5;
 
-	private final Deque<Location> tail = new ArrayDeque<Location>();
+	private final Deque<Location> tail = new ArrayDeque<>();
 
 	private final Object monitor = new Object();
 
diff --git a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/snake/SnakeTimer.java b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/snake/SnakeTimer.java
index d78a40ff9e..af0d7c6526 100644
--- a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/snake/SnakeTimer.java
+++ b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/main/java/samples/websocket/jetty/snake/SnakeTimer.java
@@ -39,7 +39,7 @@ public class SnakeTimer {
 
 	private static final Logger log = LoggerFactory.getLogger(SnakeTimer.class);
 
-	private static final ConcurrentHashMap<Integer, Snake> snakes = new ConcurrentHashMap<Integer, Snake>();
+	private static final ConcurrentHashMap<Integer, Snake> snakes = new ConcurrentHashMap<>();
 
 	private static Timer gameTimer = null;
 
diff --git a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/jetty/SampleWebSocketsApplicationTests.java b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/jetty/SampleWebSocketsApplicationTests.java
index 134d8767e1..6136a8e077 100644
--- a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/jetty/SampleWebSocketsApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/jetty/SampleWebSocketsApplicationTests.java
@@ -94,7 +94,7 @@ public class SampleWebSocketsApplicationTests {
 
 		private final CountDownLatch latch = new CountDownLatch(1);
 
-		private final AtomicReference<String> messagePayload = new AtomicReference<String>();
+		private final AtomicReference<String> messagePayload = new AtomicReference<>();
 
 		@Override
 		public void run(String... args) throws Exception {
diff --git a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/jetty/echo/CustomContainerWebSocketsApplicationTests.java b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/jetty/echo/CustomContainerWebSocketsApplicationTests.java
index a9efbc260c..3364dd9961 100644
--- a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/jetty/echo/CustomContainerWebSocketsApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/jetty/echo/CustomContainerWebSocketsApplicationTests.java
@@ -109,7 +109,7 @@ public class CustomContainerWebSocketsApplicationTests {
 
 		private final CountDownLatch latch = new CountDownLatch(1);
 
-		private final AtomicReference<String> messagePayload = new AtomicReference<String>();
+		private final AtomicReference<String> messagePayload = new AtomicReference<>();
 
 		@Override
 		public void run(String... args) throws Exception {
diff --git a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/snake/Snake.java b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/snake/Snake.java
index ce0eec69d8..d19cd4f549 100644
--- a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/snake/Snake.java
+++ b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/snake/Snake.java
@@ -28,7 +28,7 @@ public class Snake {
 
 	private static final int DEFAULT_LENGTH = 5;
 
-	private final Deque<Location> tail = new ArrayDeque<Location>();
+	private final Deque<Location> tail = new ArrayDeque<>();
 
 	private final Object monitor = new Object();
 
diff --git a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/snake/SnakeTimer.java b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/snake/SnakeTimer.java
index 07f5ecc558..b8d60600cd 100644
--- a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/snake/SnakeTimer.java
+++ b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/main/java/samples/websocket/tomcat/snake/SnakeTimer.java
@@ -39,7 +39,7 @@ public class SnakeTimer {
 
 	private static final Log log = LogFactory.getLog(SnakeTimer.class);
 
-	private static final ConcurrentHashMap<Integer, Snake> snakes = new ConcurrentHashMap<Integer, Snake>();
+	private static final ConcurrentHashMap<Integer, Snake> snakes = new ConcurrentHashMap<>();
 
 	private static Timer gameTimer = null;
 
diff --git a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/tomcat/SampleWebSocketsApplicationTests.java b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/tomcat/SampleWebSocketsApplicationTests.java
index 83bf872272..0cff500d18 100644
--- a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/tomcat/SampleWebSocketsApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/tomcat/SampleWebSocketsApplicationTests.java
@@ -94,7 +94,7 @@ public class SampleWebSocketsApplicationTests {
 
 		private final CountDownLatch latch = new CountDownLatch(1);
 
-		private final AtomicReference<String> messagePayload = new AtomicReference<String>();
+		private final AtomicReference<String> messagePayload = new AtomicReference<>();
 
 		@Override
 		public void run(String... args) throws Exception {
diff --git a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/tomcat/echo/CustomContainerWebSocketsApplicationTests.java b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/tomcat/echo/CustomContainerWebSocketsApplicationTests.java
index 2a9c7d9cf4..81155eeb23 100644
--- a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/tomcat/echo/CustomContainerWebSocketsApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/tomcat/echo/CustomContainerWebSocketsApplicationTests.java
@@ -109,7 +109,7 @@ public class CustomContainerWebSocketsApplicationTests {
 
 		private final CountDownLatch latch = new CountDownLatch(1);
 
-		private final AtomicReference<String> messagePayload = new AtomicReference<String>();
+		private final AtomicReference<String> messagePayload = new AtomicReference<>();
 
 		@Override
 		public void run(String... args) throws Exception {
diff --git a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/snake/Snake.java b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/snake/Snake.java
index ba95f12688..78b6b044b4 100644
--- a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/snake/Snake.java
+++ b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/snake/Snake.java
@@ -28,7 +28,7 @@ public class Snake {
 
 	private static final int DEFAULT_LENGTH = 5;
 
-	private final Deque<Location> tail = new ArrayDeque<Location>();
+	private final Deque<Location> tail = new ArrayDeque<>();
 
 	private final Object monitor = new Object();
 
diff --git a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/snake/SnakeTimer.java b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/snake/SnakeTimer.java
index 3f76cbe03a..7c78c3e1df 100644
--- a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/snake/SnakeTimer.java
+++ b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/main/java/samples/websocket/undertow/snake/SnakeTimer.java
@@ -39,7 +39,7 @@ public class SnakeTimer {
 
 	private static final Logger log = LoggerFactory.getLogger(SnakeTimer.class);
 
-	private static final ConcurrentHashMap<Integer, Snake> snakes = new ConcurrentHashMap<Integer, Snake>();
+	private static final ConcurrentHashMap<Integer, Snake> snakes = new ConcurrentHashMap<>();
 
 	private static Timer gameTimer = null;
 
diff --git a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/undertow/SampleWebSocketsApplicationTests.java b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/undertow/SampleWebSocketsApplicationTests.java
index 383b3a478c..80d6032af0 100644
--- a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/undertow/SampleWebSocketsApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/undertow/SampleWebSocketsApplicationTests.java
@@ -94,7 +94,7 @@ public class SampleWebSocketsApplicationTests {
 
 		private final CountDownLatch latch = new CountDownLatch(1);
 
-		private final AtomicReference<String> messagePayload = new AtomicReference<String>();
+		private final AtomicReference<String> messagePayload = new AtomicReference<>();
 
 		@Override
 		public void run(String... args) throws Exception {
diff --git a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/undertow/echo/CustomContainerWebSocketsApplicationTests.java b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/undertow/echo/CustomContainerWebSocketsApplicationTests.java
index 329840959f..8dedb17e0d 100644
--- a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/undertow/echo/CustomContainerWebSocketsApplicationTests.java
+++ b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/undertow/echo/CustomContainerWebSocketsApplicationTests.java
@@ -109,7 +109,7 @@ public class CustomContainerWebSocketsApplicationTests {
 
 		private final CountDownLatch latch = new CountDownLatch(1);
 
-		private final AtomicReference<String> messagePayload = new AtomicReference<String>();
+		private final AtomicReference<String> messagePayload = new AtomicReference<>();
 
 		@Override
 		public void run(String... args) throws Exception {
diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTestersAutoConfiguration.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTestersAutoConfiguration.java
index bf44fdd2a9..0663bc5add 100644
--- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTestersAutoConfiguration.java
+++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTestersAutoConfiguration.java
@@ -74,8 +74,7 @@ public class JsonTestersAutoConfiguration {
 		@ConditionalOnBean(ObjectMapper.class)
 		public FactoryBean<JacksonTester<?>> jacksonTesterFactoryBean(
 				ObjectMapper mapper) {
-			return new JsonTesterFactoryBean<>(
-					JacksonTester.class, mapper);
+			return new JsonTesterFactoryBean<>(JacksonTester.class, mapper);
 		}
 
 	}
diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/context/ImportsContextCustomizer.java b/spring-boot-test/src/main/java/org/springframework/boot/test/context/ImportsContextCustomizer.java
index b77a7dffb9..7d761fac2b 100644
--- a/spring-boot-test/src/main/java/org/springframework/boot/test/context/ImportsContextCustomizer.java
+++ b/spring-boot-test/src/main/java/org/springframework/boot/test/context/ImportsContextCustomizer.java
@@ -231,7 +231,7 @@ class ImportsContextCustomizer implements ContextCustomizer {
 		private static final Set<AnnotationFilter> ANNOTATION_FILTERS;
 
 		static {
-			Set<AnnotationFilter> filters = new HashSet<AnnotationFilter>();
+			Set<AnnotationFilter> filters = new HashSet<>();
 			filters.add(new JavaLangAnnotationFilter());
 			filters.add(new KotlinAnnotationFilter());
 			filters.add(new SpockAnnotationFilter());
@@ -241,8 +241,8 @@ class ImportsContextCustomizer implements ContextCustomizer {
 		private final Set<Object> key;
 
 		ContextCustomizerKey(Class<?> testClass) {
-			Set<Annotation> annotations = new HashSet<Annotation>();
-			Set<Class<?>> seen = new HashSet<Class<?>>();
+			Set<Annotation> annotations = new HashSet<>();
+			Set<Class<?>> seen = new HashSet<>();
 			collectClassAnnotations(testClass, annotations, seen);
 			Set<Object> determinedImports = determineImports(annotations, testClass);
 			this.key = Collections.<Object>unmodifiableSet(
@@ -284,7 +284,7 @@ class ImportsContextCustomizer implements ContextCustomizer {
 
 		private Set<Object> determineImports(Set<Annotation> annotations,
 				Class<?> testClass) {
-			Set<Object> determinedImports = new LinkedHashSet<Object>();
+			Set<Object> determinedImports = new LinkedHashSet<>();
 			AnnotationMetadata testClassMetadata = new StandardAnnotationMetadata(
 					testClass);
 			for (Annotation annotation : annotations) {
diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java b/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java
index 8f3ee51196..6847c5162e 100644
--- a/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java
+++ b/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java
@@ -83,7 +83,7 @@ public class SpringBootContextLoader extends AbstractContextLoader {
 	private static final Set<String> INTEGRATION_TEST_ANNOTATIONS;
 
 	static {
-		Set<String> annotations = new LinkedHashSet<String>();
+		Set<String> annotations = new LinkedHashSet<>();
 		annotations.add("org.springframework.boot.test.IntegrationTest");
 		annotations.add("org.springframework.boot.test.WebIntegrationTest");
 		INTEGRATION_TEST_ANNOTATIONS = Collections.unmodifiableSet(annotations);
@@ -139,7 +139,7 @@ public class SpringBootContextLoader extends AbstractContextLoader {
 	}
 
 	private Set<Object> getSources(MergedContextConfiguration mergedConfig) {
-		Set<Object> sources = new LinkedHashSet<Object>();
+		Set<Object> sources = new LinkedHashSet<>();
 		sources.addAll(Arrays.asList(mergedConfig.getClasses()));
 		sources.addAll(Arrays.asList(mergedConfig.getLocations()));
 		Assert.state(!sources.isEmpty(), "No configuration classes "
@@ -156,7 +156,7 @@ public class SpringBootContextLoader extends AbstractContextLoader {
 	}
 
 	protected String[] getInlinedProperties(MergedContextConfiguration config) {
-		ArrayList<String> properties = new ArrayList<String>();
+		ArrayList<String> properties = new ArrayList<>();
 		// JMX bean names will clash if the same bean is used in multiple contexts
 		disableJmx(properties);
 		properties.addAll(Arrays.asList(config.getPropertySourceProperties()));
@@ -188,7 +188,7 @@ public class SpringBootContextLoader extends AbstractContextLoader {
 
 	private List<ApplicationContextInitializer<?>> getInitializers(
 			MergedContextConfiguration config, SpringApplication application) {
-		List<ApplicationContextInitializer<?>> initializers = new ArrayList<ApplicationContextInitializer<?>>();
+		List<ApplicationContextInitializer<?>> initializers = new ArrayList<>();
 		for (ContextCustomizer contextCustomizer : config.getContextCustomizers()) {
 			initializers.add(new ContextCustomizerAdapter(contextCustomizer, config));
 		}
diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTestContextBootstrapper.java b/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTestContextBootstrapper.java
index 34aa35ef65..66036972c4 100644
--- a/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTestContextBootstrapper.java
+++ b/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootTestContextBootstrapper.java
@@ -129,7 +129,7 @@ public class SpringBootTestContextBootstrapper extends DefaultTestContextBootstr
 
 	private void addConfigAttributesClasses(
 			ContextConfigurationAttributes configAttributes, Class<?>[] classes) {
-		List<Class<?>> combined = new ArrayList<Class<?>>();
+		List<Class<?>> combined = new ArrayList<>();
 		combined.addAll(Arrays.asList(classes));
 		if (configAttributes.getClasses() != null) {
 			combined.addAll(Arrays.asList(configAttributes.getClasses()));
@@ -253,7 +253,7 @@ public class SpringBootTestContextBootstrapper extends DefaultTestContextBootstr
 
 	private List<String> getAndProcessPropertySourceProperties(
 			MergedContextConfiguration mergedConfig) {
-		List<String> propertySourceProperties = new ArrayList<String>(
+		List<String> propertySourceProperties = new ArrayList<>(
 				Arrays.asList(mergedConfig.getPropertySourceProperties()));
 		String differentiator = getDifferentiatorPropertySourceProperty();
 		if (differentiator != null) {
diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/json/AbstractJsonMarshalTester.java b/spring-boot-test/src/main/java/org/springframework/boot/test/json/AbstractJsonMarshalTester.java
index e5aaf8b1e7..187213f245 100644
--- a/spring-boot-test/src/main/java/org/springframework/boot/test/json/AbstractJsonMarshalTester.java
+++ b/spring-boot-test/src/main/java/org/springframework/boot/test/json/AbstractJsonMarshalTester.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -123,7 +123,7 @@ public abstract class AbstractJsonMarshalTester<T> {
 		verify();
 		Assert.notNull(value, "Value must not be null");
 		String json = writeObject(value, this.type);
-		return new JsonContent<T>(this.resourceLoadClass, this.type, json);
+		return new JsonContent<>(this.resourceLoadClass, this.type, json);
 	}
 
 	/**
@@ -266,7 +266,7 @@ public abstract class AbstractJsonMarshalTester<T> {
 		InputStream inputStream = resource.getInputStream();
 		T object = readObject(inputStream, this.type);
 		closeQuietly(inputStream);
-		return new ObjectContent<T>(this.type, object);
+		return new ObjectContent<>(this.type, object);
 	}
 
 	/**
@@ -291,7 +291,7 @@ public abstract class AbstractJsonMarshalTester<T> {
 		Assert.notNull(reader, "Reader must not be null");
 		T object = readObject(reader, this.type);
 		closeQuietly(reader);
-		return new ObjectContent<T>(this.type, object);
+		return new ObjectContent<>(this.type, object);
 	}
 
 	private void closeQuietly(Closeable closeable) {
diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/json/BasicJsonTester.java b/spring-boot-test/src/main/java/org/springframework/boot/test/json/BasicJsonTester.java
index 6efb110bc7..4909f174ad 100644
--- a/spring-boot-test/src/main/java/org/springframework/boot/test/json/BasicJsonTester.java
+++ b/spring-boot-test/src/main/java/org/springframework/boot/test/json/BasicJsonTester.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -169,7 +169,7 @@ public class BasicJsonTester {
 	}
 
 	private JsonContent<Object> getJsonContent(String json) {
-		return new JsonContent<Object>(this.loader.getResourceLoadClass(), null, json);
+		return new JsonContent<>(this.loader.getResourceLoadClass(), null, json);
 	}
 
 }
diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/json/GsonTester.java b/spring-boot-test/src/main/java/org/springframework/boot/test/json/GsonTester.java
index 688b833ca3..c24e296147 100644
--- a/spring-boot-test/src/main/java/org/springframework/boot/test/json/GsonTester.java
+++ b/spring-boot-test/src/main/java/org/springframework/boot/test/json/GsonTester.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -121,7 +121,7 @@ public class GsonTester<T> extends AbstractJsonMarshalTester<T> {
 		@Override
 		protected AbstractJsonMarshalTester<Object> createTester(
 				Class<?> resourceLoadClass, ResolvableType type, Gson marshaller) {
-			return new GsonTester<Object>(resourceLoadClass, type, marshaller);
+			return new GsonTester<>(resourceLoadClass, type, marshaller);
 		}
 
 	}
diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/json/JacksonTester.java b/spring-boot-test/src/main/java/org/springframework/boot/test/json/JacksonTester.java
index 466d8e9d11..e6f079fe86 100644
--- a/spring-boot-test/src/main/java/org/springframework/boot/test/json/JacksonTester.java
+++ b/spring-boot-test/src/main/java/org/springframework/boot/test/json/JacksonTester.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -137,7 +137,7 @@ public class JacksonTester<T> extends AbstractJsonMarshalTester<T> {
 		protected AbstractJsonMarshalTester<Object> createTester(
 				Class<?> resourceLoadClass, ResolvableType type,
 				ObjectMapper marshaller) {
-			return new JacksonTester<Object>(resourceLoadClass, type, marshaller);
+			return new JacksonTester<>(resourceLoadClass, type, marshaller);
 		}
 
 	}
diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/json/ObjectContent.java b/spring-boot-test/src/main/java/org/springframework/boot/test/json/ObjectContent.java
index 553030553e..71c3b63aa2 100644
--- a/spring-boot-test/src/main/java/org/springframework/boot/test/json/ObjectContent.java
+++ b/spring-boot-test/src/main/java/org/springframework/boot/test/json/ObjectContent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -49,7 +49,7 @@ public final class ObjectContent<T> implements AssertProvider<ObjectContentAsser
 
 	@Override
 	public ObjectContentAssert<T> assertThat() {
-		return new ObjectContentAssert<T>(this.object);
+		return new ObjectContentAssert<>(this.object);
 	}
 
 	/**
diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/DefinitionsParser.java b/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/DefinitionsParser.java
index d95e7fde27..e0f4dce879 100644
--- a/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/DefinitionsParser.java
+++ b/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/DefinitionsParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -51,8 +51,8 @@ class DefinitionsParser {
 	}
 
 	DefinitionsParser(Collection<? extends Definition> existing) {
-		this.definitions = new LinkedHashSet<Definition>();
-		this.definitionFields = new LinkedHashMap<Definition, Field>();
+		this.definitions = new LinkedHashSet<>();
+		this.definitionFields = new LinkedHashMap<>();
 		if (existing != null) {
 			this.definitions.addAll(existing);
 		}
@@ -127,7 +127,7 @@ class DefinitionsParser {
 
 	private Set<ResolvableType> getOrDeduceTypes(AnnotatedElement element,
 			Class<?>[] value) {
-		Set<ResolvableType> types = new LinkedHashSet<ResolvableType>();
+		Set<ResolvableType> types = new LinkedHashSet<>();
 		for (Class<?> clazz : value) {
 			types.add(ResolvableType.forClass(clazz));
 		}
diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockDefinition.java b/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockDefinition.java
index 86bc5433ad..6257414e5f 100644
--- a/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockDefinition.java
+++ b/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockDefinition.java
@@ -60,7 +60,7 @@ class MockDefinition extends Definition {
 	}
 
 	private Set<Class<?>> asClassSet(Class<?>[] classes) {
-		Set<Class<?>> classSet = new LinkedHashSet<Class<?>>();
+		Set<Class<?>> classSet = new LinkedHashSet<>();
 		if (classes != null) {
 			classSet.addAll(Arrays.asList(classes));
 		}
diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoBeans.java b/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoBeans.java
index 1c6fae243e..bd274cb1a8 100644
--- a/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoBeans.java
+++ b/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoBeans.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -27,7 +27,7 @@ import java.util.List;
  */
 class MockitoBeans implements Iterable<Object> {
 
-	private final List<Object> beans = new ArrayList<Object>();
+	private final List<Object> beans = new ArrayList<>();
 
 	void add(Object bean) {
 		this.beans.add(bean);
diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoContextCustomizer.java b/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoContextCustomizer.java
index f2c31ad083..048f0ab287 100644
--- a/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoContextCustomizer.java
+++ b/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoContextCustomizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -34,7 +34,7 @@ class MockitoContextCustomizer implements ContextCustomizer {
 	private final Set<Definition> definitions;
 
 	MockitoContextCustomizer(Set<? extends Definition> definitions) {
-		this.definitions = new LinkedHashSet<Definition>(definitions);
+		this.definitions = new LinkedHashSet<>(definitions);
 	}
 
 	@Override
diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoPostProcessor.java b/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoPostProcessor.java
index bcfee98d19..fab7081390 100644
--- a/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoPostProcessor.java
+++ b/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoPostProcessor.java
@@ -98,11 +98,11 @@ public class MockitoPostProcessor extends InstantiationAwareBeanPostProcessorAda
 
 	private final MockitoBeans mockitoBeans = new MockitoBeans();
 
-	private Map<Definition, String> beanNameRegistry = new HashMap<Definition, String>();
+	private Map<Definition, String> beanNameRegistry = new HashMap<>();
 
-	private Map<Field, RegisteredField> fieldRegistry = new HashMap<Field, RegisteredField>();
+	private Map<Field, RegisteredField> fieldRegistry = new HashMap<>();
 
-	private Map<String, SpyDefinition> spies = new HashMap<String, SpyDefinition>();
+	private Map<String, SpyDefinition> spies = new HashMap<>();
 
 	/**
 	 * Create a new {@link MockitoPostProcessor} instance with the given initial
@@ -150,7 +150,7 @@ public class MockitoPostProcessor extends InstantiationAwareBeanPostProcessorAda
 
 	private Set<Class<?>> getConfigurationClasses(
 			ConfigurableListableBeanFactory beanFactory) {
-		Set<Class<?>> configurationClasses = new LinkedHashSet<Class<?>>();
+		Set<Class<?>> configurationClasses = new LinkedHashSet<>();
 		for (BeanDefinition beanDefinition : getConfigurationBeanDefinitions(beanFactory)
 				.values()) {
 			configurationClasses.add(ClassUtils.resolveClassName(
@@ -161,7 +161,7 @@ public class MockitoPostProcessor extends InstantiationAwareBeanPostProcessorAda
 
 	private Map<String, BeanDefinition> getConfigurationBeanDefinitions(
 			ConfigurableListableBeanFactory beanFactory) {
-		Map<String, BeanDefinition> definitions = new LinkedHashMap<String, BeanDefinition>();
+		Map<String, BeanDefinition> definitions = new LinkedHashMap<>();
 		for (String beanName : beanFactory.getBeanDefinitionNames()) {
 			BeanDefinition definition = beanFactory.getBeanDefinition(beanName);
 			if (definition.getAttribute(CONFIGURATION_CLASS_ATTRIBUTE) != null) {
@@ -258,7 +258,7 @@ public class MockitoPostProcessor extends InstantiationAwareBeanPostProcessorAda
 	private Set<String> findCandidateBeans(ConfigurableListableBeanFactory beanFactory,
 			MockDefinition mockDefinition) {
 		QualifierDefinition qualifier = mockDefinition.getQualifier();
-		Set<String> candidates = new TreeSet<String>();
+		Set<String> candidates = new TreeSet<>();
 		for (String candidate : getExistingBeans(beanFactory,
 				mockDefinition.getTypeToMock())) {
 			if (qualifier == null || qualifier.matches(beanFactory, candidate)) {
@@ -270,7 +270,7 @@ public class MockitoPostProcessor extends InstantiationAwareBeanPostProcessorAda
 
 	private String[] getExistingBeans(ConfigurableListableBeanFactory beanFactory,
 			ResolvableType type) {
-		Set<String> beans = new LinkedHashSet<String>(
+		Set<String> beans = new LinkedHashSet<>(
 				Arrays.asList(beanFactory.getBeanNamesForType(type)));
 		String resolvedTypeName = type.resolve(Object.class).getName();
 		for (String beanName : beanFactory.getBeanNamesForType(FactoryBean.class)) {
diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoTestExecutionListener.java b/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoTestExecutionListener.java
index 0521c27f4b..2a7374022d 100644
--- a/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoTestExecutionListener.java
+++ b/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoTestExecutionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -80,7 +80,7 @@ public class MockitoTestExecutionListener extends AbstractTestExecutionListener
 	 */
 	private static class MockitoAnnotationCollection implements FieldCallback {
 
-		private final Set<Annotation> annotations = new LinkedHashSet<Annotation>();
+		private final Set<Annotation> annotations = new LinkedHashSet<>();
 
 		@Override
 		public void doWith(Field field)
diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/QualifierDefinition.java b/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/QualifierDefinition.java
index c66713b468..dad2d1d972 100644
--- a/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/QualifierDefinition.java
+++ b/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/QualifierDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -91,7 +91,7 @@ class QualifierDefinition {
 	private static Set<Annotation> getQualifierAnnotations(Field field) {
 		// Assume that any annotations other than @MockBean/@SpyBean are qualifiers
 		Annotation[] candidates = field.getDeclaredAnnotations();
-		Set<Annotation> annotations = new HashSet<Annotation>(candidates.length);
+		Set<Annotation> annotations = new HashSet<>(candidates.length);
 		for (Annotation candidate : candidates) {
 			if (!isMockOrSpyAnnotation(candidate)) {
 				annotations.add(candidate);
diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/ResetMocksTestExecutionListener.java b/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/ResetMocksTestExecutionListener.java
index 2d9f257d86..6e65391053 100644
--- a/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/ResetMocksTestExecutionListener.java
+++ b/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/ResetMocksTestExecutionListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -60,7 +60,7 @@ public class ResetMocksTestExecutionListener extends AbstractTestExecutionListen
 			MockReset reset) {
 		ConfigurableListableBeanFactory beanFactory = applicationContext.getBeanFactory();
 		String[] names = beanFactory.getBeanDefinitionNames();
-		Set<String> instantiatedSingletons = new HashSet<String>(
+		Set<String> instantiatedSingletons = new HashSet<>(
 				Arrays.asList(beanFactory.getSingletonNames()));
 		for (String name : names) {
 			BeanDefinition definition = beanFactory.getBeanDefinition(name);
diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/rule/OutputCapture.java b/spring-boot-test/src/main/java/org/springframework/boot/test/rule/OutputCapture.java
index ba3cc44b3e..a69e5bb1c0 100644
--- a/spring-boot-test/src/main/java/org/springframework/boot/test/rule/OutputCapture.java
+++ b/spring-boot-test/src/main/java/org/springframework/boot/test/rule/OutputCapture.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -49,7 +49,7 @@ public class OutputCapture implements TestRule {
 
 	private ByteArrayOutputStream copy;
 
-	private List<Matcher<? super String>> matchers = new ArrayList<Matcher<? super String>>();
+	private List<Matcher<? super String>> matchers = new ArrayList<>();
 
 	@Override
 	public Statement apply(final Statement base, Description description) {
diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/util/EnvironmentTestUtils.java b/spring-boot-test/src/main/java/org/springframework/boot/test/util/EnvironmentTestUtils.java
index b7cb4690bd..ecaffc7cde 100644
--- a/spring-boot-test/src/main/java/org/springframework/boot/test/util/EnvironmentTestUtils.java
+++ b/spring-boot-test/src/main/java/org/springframework/boot/test/util/EnvironmentTestUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -83,7 +83,7 @@ public abstract class EnvironmentTestUtils {
 		if (sources.contains(name)) {
 			return (Map<String, Object>) sources.get(name).getSource();
 		}
-		Map<String, Object> map = new HashMap<String, Object>();
+		Map<String, Object> map = new HashMap<>();
 		sources.addFirst(new MapPropertySource(name, map));
 		return map;
 	}
diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/MockServerRestTemplateCustomizer.java b/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/MockServerRestTemplateCustomizer.java
index 427cc955f0..827f9153dd 100644
--- a/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/MockServerRestTemplateCustomizer.java
+++ b/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/MockServerRestTemplateCustomizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -53,9 +53,9 @@ import org.springframework.web.client.RestTemplate;
  */
 public class MockServerRestTemplateCustomizer implements RestTemplateCustomizer {
 
-	private Map<RestTemplate, RequestExpectationManager> expectationManagers = new ConcurrentHashMap<RestTemplate, RequestExpectationManager>();
+	private Map<RestTemplate, RequestExpectationManager> expectationManagers = new ConcurrentHashMap<>();
 
-	private Map<RestTemplate, MockRestServiceServer> servers = new ConcurrentHashMap<RestTemplate, MockRestServiceServer>();
+	private Map<RestTemplate, MockRestServiceServer> servers = new ConcurrentHashMap<>();
 
 	private final Class<? extends RequestExpectationManager> expectationManager;
 
diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java b/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java
index 2ddca34889..f206a77a9c 100644
--- a/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java
+++ b/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java
@@ -148,7 +148,7 @@ public class TestRestTemplate {
 		if (interceptors == null) {
 			interceptors = Collections.emptyList();
 		}
-		interceptors = new ArrayList<ClientHttpRequestInterceptor>(interceptors);
+		interceptors = new ArrayList<>(interceptors);
 		Iterator<ClientHttpRequestInterceptor> iterator = interceptors.iterator();
 		while (iterator.hasNext()) {
 			if (iterator.next() instanceof BasicAuthorizationInterceptor) {
@@ -1063,7 +1063,7 @@ public class TestRestTemplate {
 
 		public CustomHttpComponentsClientHttpRequestFactory(
 				HttpClientOption[] httpClientOptions) {
-			Set<HttpClientOption> options = new HashSet<TestRestTemplate.HttpClientOption>(
+			Set<HttpClientOption> options = new HashSet<>(
 					Arrays.asList(httpClientOptions));
 			this.cookieSpec = (options.contains(HttpClientOption.ENABLE_COOKIES)
 					? CookieSpecs.STANDARD : CookieSpecs.IGNORE_COOKIES);
diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestReactiveWebEnvironmentDefinedPortTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestReactiveWebEnvironmentDefinedPortTests.java
index 1a62e8f192..601f6f8124 100644
--- a/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestReactiveWebEnvironmentDefinedPortTests.java
+++ b/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestReactiveWebEnvironmentDefinedPortTests.java
@@ -26,8 +26,8 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.reactive.config.EnableWebFlux;
 
 /**
- * Tests for {@link SpringBootTest} in a reactive environment configured
- * with {@link WebEnvironment#DEFINED_PORT}.
+ * Tests for {@link SpringBootTest} in a reactive environment configured with
+ * {@link WebEnvironment#DEFINED_PORT}.
  *
  * @author Stephane Nicoll
  */
diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestReactiveWebEnvironmentRandomPortTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestReactiveWebEnvironmentRandomPortTests.java
index a115ef51e2..6a57681ba6 100644
--- a/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestReactiveWebEnvironmentRandomPortTests.java
+++ b/spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringBootTestReactiveWebEnvironmentRandomPortTests.java
@@ -26,8 +26,8 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.reactive.config.EnableWebFlux;
 
 /**
- * Tests for {@link SpringBootTest} in a reactive environment configured
- * with {@link WebEnvironment#RANDOM_PORT}.
+ * Tests for {@link SpringBootTest} in a reactive environment configured with
+ * {@link WebEnvironment#RANDOM_PORT}.
  *
  * @author Stephane Nicoll
  */
diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/json/AbstractJsonMarshalTesterTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/json/AbstractJsonMarshalTesterTests.java
index 2a0d2f2acd..04ded77ad6 100644
--- a/spring-boot-test/src/test/java/org/springframework/boot/test/json/AbstractJsonMarshalTesterTests.java
+++ b/spring-boot-test/src/test/java/org/springframework/boot/test/json/AbstractJsonMarshalTesterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -89,7 +89,7 @@ public abstract class AbstractJsonMarshalTesterTests {
 	@Test
 	public void writeMapShouldReturnJsonContent() throws Exception {
 		ResolvableType type = ResolvableTypes.get("mapOfExampleObject");
-		Map<String, Object> value = new LinkedHashMap<String, Object>();
+		Map<String, Object> value = new LinkedHashMap<>();
 		value.put("a", OBJECT);
 		JsonContent<Object> content = createTester(type).write(value);
 		assertThat(content).isEqualToJson(MAP_JSON);
diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/json/GsonTesterTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/json/GsonTesterTests.java
index 9431bd9f76..69e19142a3 100644
--- a/spring-boot-test/src/test/java/org/springframework/boot/test/json/GsonTesterTests.java
+++ b/spring-boot-test/src/test/java/org/springframework/boot/test/json/GsonTesterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -62,15 +62,14 @@ public class GsonTesterTests extends AbstractJsonMarshalTesterTests {
 	@Override
 	protected AbstractJsonMarshalTester<Object> createTester(Class<?> resourceLoadClass,
 			ResolvableType type) {
-		return new GsonTester<Object>(resourceLoadClass, type,
-				new GsonBuilder().create());
+		return new GsonTester<>(resourceLoadClass, type, new GsonBuilder().create());
 	}
 
 	static abstract class InitFieldsBaseClass {
 
 		public GsonTester<ExampleObject> base;
 
-		public GsonTester<ExampleObject> baseSet = new GsonTester<ExampleObject>(
+		public GsonTester<ExampleObject> baseSet = new GsonTester<>(
 				InitFieldsBaseClass.class, ResolvableType.forClass(ExampleObject.class),
 				new GsonBuilder().create());
 
@@ -80,7 +79,7 @@ public class GsonTesterTests extends AbstractJsonMarshalTesterTests {
 
 		public GsonTester<List<ExampleObject>> test;
 
-		public GsonTester<ExampleObject> testSet = new GsonTester<ExampleObject>(
+		public GsonTester<ExampleObject> testSet = new GsonTester<>(
 				InitFieldsBaseClass.class, ResolvableType.forClass(ExampleObject.class),
 				new GsonBuilder().create());
 
diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/json/JacksonTesterIntegrationTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/json/JacksonTesterIntegrationTests.java
index f85532cad2..7134c17288 100644
--- a/spring-boot-test/src/test/java/org/springframework/boot/test/json/JacksonTesterIntegrationTests.java
+++ b/spring-boot-test/src/test/java/org/springframework/boot/test/json/JacksonTesterIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -52,7 +52,7 @@ public class JacksonTesterIntegrationTests {
 
 	@Test
 	public void typicalMapTest() throws Exception {
-		Map<String, Integer> map = new LinkedHashMap<String, Integer>();
+		Map<String, Integer> map = new LinkedHashMap<>();
 		map.put("a", 1);
 		map.put("b", 2);
 		assertThat(this.mapJson.write(map)).extractingJsonPathNumberValue("@.a")
diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/json/JacksonTesterTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/json/JacksonTesterTests.java
index 8aa4667d92..08db300c9b 100644
--- a/spring-boot-test/src/test/java/org/springframework/boot/test/json/JacksonTesterTests.java
+++ b/spring-boot-test/src/test/java/org/springframework/boot/test/json/JacksonTesterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -61,14 +61,14 @@ public class JacksonTesterTests extends AbstractJsonMarshalTesterTests {
 	@Override
 	protected AbstractJsonMarshalTester<Object> createTester(Class<?> resourceLoadClass,
 			ResolvableType type) {
-		return new JacksonTester<Object>(resourceLoadClass, type, new ObjectMapper());
+		return new JacksonTester<>(resourceLoadClass, type, new ObjectMapper());
 	}
 
 	static abstract class InitFieldsBaseClass {
 
 		public JacksonTester<ExampleObject> base;
 
-		public JacksonTester<ExampleObject> baseSet = new JacksonTester<ExampleObject>(
+		public JacksonTester<ExampleObject> baseSet = new JacksonTester<>(
 				InitFieldsBaseClass.class, ResolvableType.forClass(ExampleObject.class),
 				new ObjectMapper());
 
@@ -78,7 +78,7 @@ public class JacksonTesterTests extends AbstractJsonMarshalTesterTests {
 
 		public JacksonTester<List<ExampleObject>> test;
 
-		public JacksonTester<ExampleObject> testSet = new JacksonTester<ExampleObject>(
+		public JacksonTester<ExampleObject> testSet = new JacksonTester<>(
 				InitFieldsBaseClass.class, ResolvableType.forClass(ExampleObject.class),
 				new ObjectMapper());
 
diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/json/JsonContentTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/json/JsonContentTests.java
index aba589ec11..e9afe460f5 100644
--- a/spring-boot-test/src/test/java/org/springframework/boot/test/json/JsonContentTests.java
+++ b/spring-boot-test/src/test/java/org/springframework/boot/test/json/JsonContentTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -55,38 +55,33 @@ public class JsonContentTests {
 
 	@Test
 	public void createWhenTypeIsNullShouldCreateContent() throws Exception {
-		JsonContent<ExampleObject> content = new JsonContent<ExampleObject>(getClass(),
-				null, JSON);
+		JsonContent<ExampleObject> content = new JsonContent<>(getClass(), null, JSON);
 		assertThat(content).isNotNull();
 	}
 
 	@Test
 	public void assertThatShouldReturnJsonContentAssert() throws Exception {
-		JsonContent<ExampleObject> content = new JsonContent<ExampleObject>(getClass(),
-				TYPE, JSON);
+		JsonContent<ExampleObject> content = new JsonContent<>(getClass(), TYPE, JSON);
 		assertThat(content.assertThat()).isInstanceOf(JsonContentAssert.class);
 	}
 
 	@Test
 	public void getJsonShouldReturnJson() throws Exception {
-		JsonContent<ExampleObject> content = new JsonContent<ExampleObject>(getClass(),
-				TYPE, JSON);
+		JsonContent<ExampleObject> content = new JsonContent<>(getClass(), TYPE, JSON);
 		assertThat(content.getJson()).isEqualTo(JSON);
 
 	}
 
 	@Test
 	public void toStringWhenHasTypeShouldReturnString() throws Exception {
-		JsonContent<ExampleObject> content = new JsonContent<ExampleObject>(getClass(),
-				TYPE, JSON);
+		JsonContent<ExampleObject> content = new JsonContent<>(getClass(), TYPE, JSON);
 		assertThat(content.toString())
 				.isEqualTo("JsonContent " + JSON + " created from " + TYPE);
 	}
 
 	@Test
 	public void toStringWhenHasNoTypeShouldReturnString() throws Exception {
-		JsonContent<ExampleObject> content = new JsonContent<ExampleObject>(getClass(),
-				null, JSON);
+		JsonContent<ExampleObject> content = new JsonContent<>(getClass(), null, JSON);
 		assertThat(content.toString()).isEqualTo("JsonContent " + JSON);
 	}
 
diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/json/ObjectContentAssertTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/json/ObjectContentAssertTests.java
index a6b705ee43..be83982f24 100644
--- a/spring-boot-test/src/test/java/org/springframework/boot/test/json/ObjectContentAssertTests.java
+++ b/spring-boot-test/src/test/java/org/springframework/boot/test/json/ObjectContentAssertTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -77,7 +77,7 @@ public class ObjectContentAssertTests {
 
 			@Override
 			public ObjectContentAssert<Object> assertThat() {
-				return new ObjectContentAssert<Object>(source);
+				return new ObjectContentAssert<>(source);
 			}
 
 		};
diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/json/ObjectContentTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/json/ObjectContentTests.java
index 55ad734980..376fc6c34e 100644
--- a/spring-boot-test/src/test/java/org/springframework/boot/test/json/ObjectContentTests.java
+++ b/spring-boot-test/src/test/java/org/springframework/boot/test/json/ObjectContentTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -48,37 +48,32 @@ public class ObjectContentTests {
 
 	@Test
 	public void createWhenTypeIsNullShouldCreateContent() throws Exception {
-		ObjectContent<ExampleObject> content = new ObjectContent<ExampleObject>(null,
-				OBJECT);
+		ObjectContent<ExampleObject> content = new ObjectContent<>(null, OBJECT);
 		assertThat(content).isNotNull();
 	}
 
 	@Test
 	public void assertThatShouldReturnObjectContentAssert() throws Exception {
-		ObjectContent<ExampleObject> content = new ObjectContent<ExampleObject>(TYPE,
-				OBJECT);
+		ObjectContent<ExampleObject> content = new ObjectContent<>(TYPE, OBJECT);
 		assertThat(content.assertThat()).isInstanceOf(ObjectContentAssert.class);
 	}
 
 	@Test
 	public void getObjectShouldReturnObject() throws Exception {
-		ObjectContent<ExampleObject> content = new ObjectContent<ExampleObject>(TYPE,
-				OBJECT);
+		ObjectContent<ExampleObject> content = new ObjectContent<>(TYPE, OBJECT);
 		assertThat(content.getObject()).isEqualTo(OBJECT);
 	}
 
 	@Test
 	public void toStringWhenHasTypeShouldReturnString() throws Exception {
-		ObjectContent<ExampleObject> content = new ObjectContent<ExampleObject>(TYPE,
-				OBJECT);
+		ObjectContent<ExampleObject> content = new ObjectContent<>(TYPE, OBJECT);
 		assertThat(content.toString())
 				.isEqualTo("ObjectContent " + OBJECT + " created from " + TYPE);
 	}
 
 	@Test
 	public void toStringWhenHasNoTypeShouldReturnString() throws Exception {
-		ObjectContent<ExampleObject> content = new ObjectContent<ExampleObject>(null,
-				OBJECT);
+		ObjectContent<ExampleObject> content = new ObjectContent<>(null, OBJECT);
 		assertThat(content.toString()).isEqualTo("ObjectContent " + OBJECT);
 	}
 
diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/DefinitionsParserTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/DefinitionsParserTests.java
index 65ac8cf512..94aa767560 100644
--- a/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/DefinitionsParserTests.java
+++ b/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/DefinitionsParserTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -215,7 +215,7 @@ public class DefinitionsParserTests {
 	}
 
 	private List<Definition> getDefinitions() {
-		return new ArrayList<Definition>(this.parser.getDefinitions());
+		return new ArrayList<>(this.parser.getDefinitions());
 	}
 
 	@MockBean(ExampleService.class)
diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoContextCustomizerTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoContextCustomizerTests.java
index aa25164707..184021f369 100644
--- a/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoContextCustomizerTests.java
+++ b/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/MockitoContextCustomizerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -44,9 +44,9 @@ public class MockitoContextCustomizerTests {
 		MockDefinition d2 = createTestMockDefinition(ExampleServiceCaller.class);
 		MockitoContextCustomizer c1 = new MockitoContextCustomizer(NO_DEFINITIONS);
 		MockitoContextCustomizer c2 = new MockitoContextCustomizer(
-				new LinkedHashSet<MockDefinition>(Arrays.asList(d1, d2)));
+				new LinkedHashSet<>(Arrays.asList(d1, d2)));
 		MockitoContextCustomizer c3 = new MockitoContextCustomizer(
-				new LinkedHashSet<MockDefinition>(Arrays.asList(d2, d1)));
+				new LinkedHashSet<>(Arrays.asList(d2, d1)));
 		assertThat(c2.hashCode()).isEqualTo(c3.hashCode());
 		assertThat(c1).isEqualTo(c1).isNotEqualTo(c2);
 		assertThat(c2).isEqualTo(c2).isEqualTo(c3).isNotEqualTo(c1);
diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/testutil/AbstractConfigurationClassTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/testutil/AbstractConfigurationClassTests.java
index 189f52727a..bb41f33a63 100644
--- a/spring-boot-test/src/test/java/org/springframework/boot/test/testutil/AbstractConfigurationClassTests.java
+++ b/spring-boot-test/src/test/java/org/springframework/boot/test/testutil/AbstractConfigurationClassTests.java
@@ -48,7 +48,7 @@ public abstract class AbstractConfigurationClassTests {
 
 	@Test
 	public void allBeanMethodsArePublic() throws IOException, ClassNotFoundException {
-		Set<String> nonPublicBeanMethods = new HashSet<String>();
+		Set<String> nonPublicBeanMethods = new HashSet<>();
 		for (AnnotationMetadata configurationClass : findConfigurationClasses()) {
 			Set<MethodMetadata> beanMethods = configurationClass
 					.getAnnotatedMethods(Bean.class.getName());
@@ -63,7 +63,7 @@ public abstract class AbstractConfigurationClassTests {
 	}
 
 	private Set<AnnotationMetadata> findConfigurationClasses() throws IOException {
-		Set<AnnotationMetadata> configurationClasses = new HashSet<AnnotationMetadata>();
+		Set<AnnotationMetadata> configurationClasses = new HashSet<>();
 		Resource[] resources = this.resolver.getResources("classpath*:"
 				+ getClass().getPackage().getName().replace('.', '/') + "/**/*.class");
 		for (Resource resource : resources) {
diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/util/EnvironmentTestUtilsTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/util/EnvironmentTestUtilsTests.java
index a4e4e42a59..c7fa64624f 100644
--- a/spring-boot-test/src/test/java/org/springframework/boot/test/util/EnvironmentTestUtilsTests.java
+++ b/spring-boot-test/src/test/java/org/springframework/boot/test/util/EnvironmentTestUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -83,7 +83,7 @@ public class EnvironmentTestUtilsTests {
 
 	@Test
 	public void testConfigHasHigherPrecedence() {
-		Map<String, Object> map = new HashMap<String, Object>();
+		Map<String, Object> map = new HashMap<>();
 		map.put("my.foo", "bar");
 		MapPropertySource source = new MapPropertySource("sample", map);
 		this.environment.getPropertySources().addFirst(source);
diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTests.java
index 3ac0a6fca9..94fea8df7f 100644
--- a/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTests.java
+++ b/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTests.java
@@ -269,7 +269,7 @@ public class TestRestTemplateTests {
 			public void doWithTestRestTemplate(TestRestTemplate testRestTemplate,
 					URI relativeUri) {
 				testRestTemplate.exchange(relativeUri, HttpMethod.GET,
-						new HttpEntity<byte[]>(new byte[0]), String.class);
+						new HttpEntity<>(new byte[0]), String.class);
 			}
 
 		});
@@ -284,7 +284,7 @@ public class TestRestTemplateTests {
 			public void doWithTestRestTemplate(TestRestTemplate testRestTemplate,
 					URI relativeUri) {
 				testRestTemplate.exchange(relativeUri, HttpMethod.GET,
-						new HttpEntity<byte[]>(new byte[0]),
+						new HttpEntity<>(new byte[0]),
 						new ParameterizedTypeReference<String>() {
 				});
 			}
diff --git a/spring-boot-tools/spring-boot-autoconfigure-processor/src/main/java/org/springframework/boot/autoconfigureprocessor/AutoConfigureAnnotationProcessor.java b/spring-boot-tools/spring-boot-autoconfigure-processor/src/main/java/org/springframework/boot/autoconfigureprocessor/AutoConfigureAnnotationProcessor.java
index fe09512e66..71a26c8558 100644
--- a/spring-boot-tools/spring-boot-autoconfigure-processor/src/main/java/org/springframework/boot/autoconfigureprocessor/AutoConfigureAnnotationProcessor.java
+++ b/spring-boot-tools/spring-boot-autoconfigure-processor/src/main/java/org/springframework/boot/autoconfigureprocessor/AutoConfigureAnnotationProcessor.java
@@ -62,7 +62,7 @@ public class AutoConfigureAnnotationProcessor extends AbstractProcessor {
 	private final Properties properties = new Properties();
 
 	public AutoConfigureAnnotationProcessor() {
-		Map<String, String> annotations = new LinkedHashMap<String, String>();
+		Map<String, String> annotations = new LinkedHashMap<>();
 		addAnnotations(annotations);
 		this.annotations = Collections.unmodifiableMap(annotations);
 	}
@@ -152,7 +152,7 @@ public class AutoConfigureAnnotationProcessor extends AbstractProcessor {
 
 	@SuppressWarnings("unchecked")
 	private List<Object> getValues(AnnotationMirror annotation) {
-		List<Object> result = new ArrayList<Object>();
+		List<Object> result = new ArrayList<>();
 		for (Map.Entry<? extends ExecutableElement, ? extends AnnotationValue> entry : annotation
 				.getElementValues().entrySet()) {
 			String attributeName = entry.getKey().getSimpleName().toString();
diff --git a/spring-boot-tools/spring-boot-autoconfigure-processor/src/test/java/org/springframework/boot/autoconfigureprocessor/AutoConfigureAnnotationProcessorTests.java b/spring-boot-tools/spring-boot-autoconfigure-processor/src/test/java/org/springframework/boot/autoconfigureprocessor/AutoConfigureAnnotationProcessorTests.java
index 7336153480..c50f697831 100644
--- a/spring-boot-tools/spring-boot-autoconfigure-processor/src/test/java/org/springframework/boot/autoconfigureprocessor/AutoConfigureAnnotationProcessorTests.java
+++ b/spring-boot-tools/spring-boot-autoconfigure-processor/src/test/java/org/springframework/boot/autoconfigureprocessor/AutoConfigureAnnotationProcessorTests.java
@@ -71,7 +71,7 @@ public class AutoConfigureAnnotationProcessorTests {
 	@Test
 	public void annotatedMethod() throws Exception {
 		Properties properties = compile(TestMethodConfiguration.class);
-		List<String> matching = new ArrayList<String>();
+		List<String> matching = new ArrayList<>();
 		for (Object key : properties.keySet()) {
 			if (key.toString().startsWith(
 					"org.springframework.boot.autoconfigureprocessor.TestMethodConfiguration")) {
diff --git a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataGroup.java b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataGroup.java
index ea6428e852..0886679ba6 100644
--- a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataGroup.java
+++ b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataGroup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -34,9 +34,9 @@ public class ConfigurationMetadataGroup implements Serializable {
 
 	private final String id;
 
-	private final Map<String, ConfigurationMetadataSource> sources = new HashMap<String, ConfigurationMetadataSource>();
+	private final Map<String, ConfigurationMetadataSource> sources = new HashMap<>();
 
-	private final Map<String, ConfigurationMetadataProperty> properties = new HashMap<String, ConfigurationMetadataProperty>();
+	private final Map<String, ConfigurationMetadataProperty> properties = new HashMap<>();
 
 	public ConfigurationMetadataGroup(String id) {
 		this.id = id;
diff --git a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataHint.java b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataHint.java
index 9f5e1f2049..a373370256 100644
--- a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataHint.java
+++ b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataHint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -33,9 +33,9 @@ class ConfigurationMetadataHint {
 
 	private String id;
 
-	private final List<ValueHint> valueHints = new ArrayList<ValueHint>();
+	private final List<ValueHint> valueHints = new ArrayList<>();
 
-	private final List<ValueProvider> valueProviders = new ArrayList<ValueProvider>();
+	private final List<ValueProvider> valueProviders = new ArrayList<>();
 
 	public boolean isMapKeyHints() {
 		return (this.id != null && this.id.endsWith(KEY_SUFFIX));
diff --git a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataRepositoryJsonBuilder.java b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataRepositoryJsonBuilder.java
index ce5a94723b..045776768b 100644
--- a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataRepositoryJsonBuilder.java
+++ b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataRepositoryJsonBuilder.java
@@ -41,7 +41,7 @@ public final class ConfigurationMetadataRepositoryJsonBuilder {
 
 	private final JsonReader reader = new JsonReader();
 
-	private final List<SimpleConfigurationMetadataRepository> repositories = new ArrayList<SimpleConfigurationMetadataRepository>();
+	private final List<SimpleConfigurationMetadataRepository> repositories = new ArrayList<>();
 
 	private ConfigurationMetadataRepositoryJsonBuilder(Charset defaultCharset) {
 		this.defaultCharset = defaultCharset;
diff --git a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataSource.java b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataSource.java
index 9c1dad9537..a78ec66be2 100644
--- a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataSource.java
+++ b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ConfigurationMetadataSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -42,7 +42,7 @@ public class ConfigurationMetadataSource implements Serializable {
 
 	private String sourceMethod;
 
-	private final Map<String, ConfigurationMetadataProperty> properties = new HashMap<String, ConfigurationMetadataProperty>();
+	private final Map<String, ConfigurationMetadataProperty> properties = new HashMap<>();
 
 	/**
 	 * The identifier of the group to which this source is associated.
diff --git a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/Hints.java b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/Hints.java
index 26bdcb69d7..792765192b 100644
--- a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/Hints.java
+++ b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/Hints.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -29,13 +29,13 @@ import java.util.List;
  */
 public class Hints {
 
-	private final List<ValueHint> keyHints = new ArrayList<ValueHint>();
+	private final List<ValueHint> keyHints = new ArrayList<>();
 
-	private final List<ValueProvider> keyProviders = new ArrayList<ValueProvider>();
+	private final List<ValueProvider> keyProviders = new ArrayList<>();
 
-	private final List<ValueHint> valueHints = new ArrayList<ValueHint>();
+	private final List<ValueHint> valueHints = new ArrayList<>();
 
-	private final List<ValueProvider> valueProviders = new ArrayList<ValueProvider>();
+	private final List<ValueProvider> valueProviders = new ArrayList<>();
 
 	/**
 	 * The list of well-defined keys, if any. Only applicable if the type of the related
diff --git a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/JsonReader.java b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/JsonReader.java
index 442df6ec35..b60e4e0788 100644
--- a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/JsonReader.java
+++ b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/JsonReader.java
@@ -61,7 +61,7 @@ class JsonReader {
 
 	private List<ConfigurationMetadataSource> parseAllSources(JSONObject root)
 			throws Exception {
-		List<ConfigurationMetadataSource> result = new ArrayList<ConfigurationMetadataSource>();
+		List<ConfigurationMetadataSource> result = new ArrayList<>();
 		if (!root.has("groups")) {
 			return result;
 		}
@@ -75,7 +75,7 @@ class JsonReader {
 
 	private List<ConfigurationMetadataItem> parseAllItems(JSONObject root)
 			throws Exception {
-		List<ConfigurationMetadataItem> result = new ArrayList<ConfigurationMetadataItem>();
+		List<ConfigurationMetadataItem> result = new ArrayList<>();
 		if (!root.has("properties")) {
 			return result;
 		}
@@ -89,7 +89,7 @@ class JsonReader {
 
 	private List<ConfigurationMetadataHint> parseAllHints(JSONObject root)
 			throws Exception {
-		List<ConfigurationMetadataHint> result = new ArrayList<ConfigurationMetadataHint>();
+		List<ConfigurationMetadataHint> result = new ArrayList<>();
 		if (!root.has("hints")) {
 			return result;
 		}
diff --git a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/RawConfigurationMetadata.java b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/RawConfigurationMetadata.java
index 4bc6c4d950..f3d0ecf808 100644
--- a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/RawConfigurationMetadata.java
+++ b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/RawConfigurationMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -36,9 +36,9 @@ class RawConfigurationMetadata {
 	RawConfigurationMetadata(List<ConfigurationMetadataSource> sources,
 			List<ConfigurationMetadataItem> items,
 			List<ConfigurationMetadataHint> hints) {
-		this.sources = new ArrayList<ConfigurationMetadataSource>(sources);
-		this.items = new ArrayList<ConfigurationMetadataItem>(items);
-		this.hints = new ArrayList<ConfigurationMetadataHint>(hints);
+		this.sources = new ArrayList<>(sources);
+		this.items = new ArrayList<>(items);
+		this.hints = new ArrayList<>(hints);
 		for (ConfigurationMetadataItem item : this.items) {
 			resolveName(item);
 		}
diff --git a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/SimpleConfigurationMetadataRepository.java b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/SimpleConfigurationMetadataRepository.java
index e12ec44796..1f4fde8456 100644
--- a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/SimpleConfigurationMetadataRepository.java
+++ b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/SimpleConfigurationMetadataRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -32,7 +32,7 @@ import java.util.Map;
 public class SimpleConfigurationMetadataRepository
 		implements ConfigurationMetadataRepository, Serializable {
 
-	private final Map<String, ConfigurationMetadataGroup> allGroups = new HashMap<String, ConfigurationMetadataGroup>();
+	private final Map<String, ConfigurationMetadataGroup> allGroups = new HashMap<>();
 
 	@Override
 	public Map<String, ConfigurationMetadataGroup> getAllGroups() {
@@ -41,7 +41,7 @@ public class SimpleConfigurationMetadataRepository
 
 	@Override
 	public Map<String, ConfigurationMetadataProperty> getAllProperties() {
-		Map<String, ConfigurationMetadataProperty> properties = new HashMap<String, ConfigurationMetadataProperty>();
+		Map<String, ConfigurationMetadataProperty> properties = new HashMap<>();
 		for (ConfigurationMetadataGroup group : this.allGroups.values()) {
 			properties.putAll(group.getProperties());
 		}
diff --git a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ValueProvider.java b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ValueProvider.java
index 550181ee91..07d99fdf90 100644
--- a/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ValueProvider.java
+++ b/spring-boot-tools/spring-boot-configuration-metadata/src/main/java/org/springframework/boot/configurationmetadata/ValueProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -35,7 +35,7 @@ public class ValueProvider implements Serializable {
 
 	private String name;
 
-	private final Map<String, Object> parameters = new LinkedHashMap<String, Object>();
+	private final Map<String, Object> parameters = new LinkedHashMap<>();
 
 	/**
 	 * Return the name of the provider.
diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessor.java b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessor.java
index 0111c3d169..8652d00d3b 100644
--- a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessor.java
+++ b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessor.java
@@ -385,7 +385,7 @@ public class ConfigurationMetadataAnnotationProcessor extends AbstractProcessor
 	}
 
 	private Map<String, Object> getAnnotationElementValues(AnnotationMirror annotation) {
-		Map<String, Object> values = new LinkedHashMap<String, Object>();
+		Map<String, Object> values = new LinkedHashMap<>();
 		for (Map.Entry<? extends ExecutableElement, ? extends AnnotationValue> entry : annotation
 				.getElementValues().entrySet()) {
 			values.put(entry.getKey().getSimpleName().toString(),
diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/MetadataCollector.java b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/MetadataCollector.java
index a478cf849e..fc64d19ca5 100644
--- a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/MetadataCollector.java
+++ b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/MetadataCollector.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -39,7 +39,7 @@ import org.springframework.boot.configurationprocessor.metadata.ItemMetadata;
  */
 public class MetadataCollector {
 
-	private final List<ItemMetadata> metadataItems = new ArrayList<ItemMetadata>();
+	private final List<ItemMetadata> metadataItems = new ArrayList<>();
 
 	private final ProcessingEnvironment processingEnvironment;
 
@@ -47,7 +47,7 @@ public class MetadataCollector {
 
 	private final TypeUtils typeUtils;
 
-	private final Set<String> processedSourceTypes = new HashSet<String>();
+	private final Set<String> processedSourceTypes = new HashSet<>();
 
 	/**
 	 * Creates a new {@code MetadataProcessor} instance.
diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeElementMembers.java b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeElementMembers.java
index 1c735eebc5..e6a7363df9 100644
--- a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeElementMembers.java
+++ b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeElementMembers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -49,13 +49,13 @@ class TypeElementMembers {
 
 	private final TypeUtils typeUtils;
 
-	private final Map<String, VariableElement> fields = new LinkedHashMap<String, VariableElement>();
+	private final Map<String, VariableElement> fields = new LinkedHashMap<>();
 
-	private final Map<String, ExecutableElement> publicGetters = new LinkedHashMap<String, ExecutableElement>();
+	private final Map<String, ExecutableElement> publicGetters = new LinkedHashMap<>();
 
-	private final Map<String, List<ExecutableElement>> publicSetters = new LinkedHashMap<String, List<ExecutableElement>>();
+	private final Map<String, List<ExecutableElement>> publicSetters = new LinkedHashMap<>();
 
-	private final Map<String, Object> fieldValues = new LinkedHashMap<String, Object>();
+	private final Map<String, Object> fieldValues = new LinkedHashMap<>();
 
 	private final FieldValuesParser fieldValuesParser;
 
@@ -107,7 +107,7 @@ class TypeElementMembers {
 				List<ExecutableElement> matchingSetters = this.publicSetters
 						.get(propertyName);
 				if (matchingSetters == null) {
-					matchingSetters = new ArrayList<ExecutableElement>();
+					matchingSetters = new ArrayList<>();
 					this.publicSetters.put(propertyName, matchingSetters);
 				}
 				TypeMirror paramType = method.getParameters().get(0).asType();
diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeExcludeFilter.java b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeExcludeFilter.java
index c8ba4a8d5b..2e9e2e114f 100644
--- a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeExcludeFilter.java
+++ b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeExcludeFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -30,7 +30,7 @@ import javax.lang.model.type.TypeMirror;
  */
 class TypeExcludeFilter {
 
-	private final Set<String> excludes = new HashSet<String>();
+	private final Set<String> excludes = new HashSet<>();
 
 	TypeExcludeFilter() {
 		add("com.zaxxer.hikari.IConnectionCustomizer");
diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeUtils.java b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeUtils.java
index 0fd0c7479b..df9e7267b6 100644
--- a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeUtils.java
+++ b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -41,7 +41,7 @@ class TypeUtils {
 	private static final Map<TypeKind, Class<?>> PRIMITIVE_WRAPPERS;
 
 	static {
-		Map<TypeKind, Class<?>> wrappers = new HashMap<TypeKind, Class<?>>();
+		Map<TypeKind, Class<?>> wrappers = new HashMap<>();
 		wrappers.put(TypeKind.BOOLEAN, Boolean.class);
 		wrappers.put(TypeKind.BYTE, Byte.class);
 		wrappers.put(TypeKind.CHAR, Character.class);
@@ -56,7 +56,7 @@ class TypeUtils {
 	private static final Map<String, TypeKind> WRAPPER_TO_PRIMITIVE;
 
 	static {
-		Map<String, TypeKind> primitives = new HashMap<String, TypeKind>();
+		Map<String, TypeKind> primitives = new HashMap<>();
 		for (Map.Entry<TypeKind, Class<?>> entry : PRIMITIVE_WRAPPERS.entrySet()) {
 			primitives.put(entry.getValue().getName(), entry.getKey());
 		}
diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/fieldvalues/javac/ExpressionTree.java b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/fieldvalues/javac/ExpressionTree.java
index 467e06dcdf..099cce19f7 100644
--- a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/fieldvalues/javac/ExpressionTree.java
+++ b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/fieldvalues/javac/ExpressionTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -75,7 +75,7 @@ class ExpressionTree extends ReflectionWrapper {
 	public List<? extends ExpressionTree> getArrayExpression() throws Exception {
 		if (this.newArrayTreeType.isAssignableFrom(getInstance().getClass())) {
 			List<?> elements = (List<?>) this.arrayValueMethod.invoke(getInstance());
-			List<ExpressionTree> result = new ArrayList<ExpressionTree>();
+			List<ExpressionTree> result = new ArrayList<>();
 			if (elements == null) {
 				return result;
 			}
diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/fieldvalues/javac/JavaCompilerFieldValuesParser.java b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/fieldvalues/javac/JavaCompilerFieldValuesParser.java
index 6c9e80e293..2675668e69 100644
--- a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/fieldvalues/javac/JavaCompilerFieldValuesParser.java
+++ b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/fieldvalues/javac/JavaCompilerFieldValuesParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -62,7 +62,7 @@ public class JavaCompilerFieldValuesParser implements FieldValuesParser {
 		private static final Map<String, Class<?>> WRAPPER_TYPES;
 
 		static {
-			Map<String, Class<?>> types = new HashMap<String, Class<?>>();
+			Map<String, Class<?>> types = new HashMap<>();
 			types.put("boolean", Boolean.class);
 			types.put(Boolean.class.getName(), Boolean.class);
 			types.put("byte", Byte.class);
@@ -79,7 +79,7 @@ public class JavaCompilerFieldValuesParser implements FieldValuesParser {
 		private static final Map<Class<?>, Object> DEFAULT_TYPE_VALUES;
 
 		static {
-			Map<Class<?>, Object> values = new HashMap<Class<?>, Object>();
+			Map<Class<?>, Object> values = new HashMap<>();
 			values.put(Boolean.class, false);
 			values.put(Byte.class, (byte) 0);
 			values.put(Short.class, (short) 0);
@@ -91,15 +91,15 @@ public class JavaCompilerFieldValuesParser implements FieldValuesParser {
 		private static final Map<String, Object> WELL_KNOWN_STATIC_FINALS;
 
 		static {
-			Map<String, Object> values = new HashMap<String, Object>();
+			Map<String, Object> values = new HashMap<>();
 			values.put("Boolean.TRUE", true);
 			values.put("Boolean.FALSE", false);
 			WELL_KNOWN_STATIC_FINALS = Collections.unmodifiableMap(values);
 		}
 
-		private final Map<String, Object> fieldValues = new HashMap<String, Object>();
+		private final Map<String, Object> fieldValues = new HashMap<>();
 
-		private final Map<String, Object> staticFinals = new HashMap<String, Object>();
+		private final Map<String, Object> staticFinals = new HashMap<>();
 
 		@Override
 		public void visitVariable(VariableTree variable) throws Exception {
diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/ConfigurationMetadata.java b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/ConfigurationMetadata.java
index f703f9e5b2..3ffb07865f 100644
--- a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/ConfigurationMetadata.java
+++ b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/ConfigurationMetadata.java
@@ -40,7 +40,7 @@ public class ConfigurationMetadata {
 
 	static {
 		List<Character> chars = Arrays.asList('-', '_');
-		SEPARATORS = Collections.unmodifiableSet(new HashSet<Character>(chars));
+		SEPARATORS = Collections.unmodifiableSet(new HashSet<>(chars));
 	}
 
 	private final Map<String, List<ItemMetadata>> items;
@@ -48,13 +48,13 @@ public class ConfigurationMetadata {
 	private final Map<String, List<ItemHint>> hints;
 
 	public ConfigurationMetadata() {
-		this.items = new LinkedHashMap<String, List<ItemMetadata>>();
-		this.hints = new LinkedHashMap<String, List<ItemHint>>();
+		this.items = new LinkedHashMap<>();
+		this.hints = new LinkedHashMap<>();
 	}
 
 	public ConfigurationMetadata(ConfigurationMetadata metadata) {
-		this.items = new LinkedHashMap<String, List<ItemMetadata>>(metadata.items);
-		this.hints = new LinkedHashMap<String, List<ItemHint>>(metadata.hints);
+		this.items = new LinkedHashMap<>(metadata.items);
+		this.hints = new LinkedHashMap<>(metadata.hints);
 	}
 
 	/**
@@ -135,7 +135,7 @@ public class ConfigurationMetadata {
 	private <K, V> void add(Map<K, List<V>> map, K key, V value) {
 		List<V> values = map.get(key);
 		if (values == null) {
-			values = new ArrayList<V>();
+			values = new ArrayList<>();
 			map.put(key, values);
 		}
 		values.add(value);
@@ -198,7 +198,7 @@ public class ConfigurationMetadata {
 	}
 
 	private static <T extends Comparable<T>> List<T> flattenValues(Map<?, List<T>> map) {
-		List<T> content = new ArrayList<T>();
+		List<T> content = new ArrayList<>();
 		for (List<T> values : map.values()) {
 			content.addAll(values);
 		}
diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/ItemHint.java b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/ItemHint.java
index 1851d41ca8..ba7c2998be 100644
--- a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/ItemHint.java
+++ b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/ItemHint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -44,10 +44,9 @@ public class ItemHint implements Comparable<ItemHint> {
 
 	public ItemHint(String name, List<ValueHint> values, List<ValueProvider> providers) {
 		this.name = toCanonicalName(name);
-		this.values = (values != null ? new ArrayList<ValueHint>(values)
-				: new ArrayList<ValueHint>());
-		this.providers = (providers != null ? new ArrayList<ValueProvider>(providers)
-				: new ArrayList<ValueProvider>());
+		this.values = (values != null ? new ArrayList<>(values) : new ArrayList<>());
+		this.providers = (providers != null ? new ArrayList<>(providers)
+				: new ArrayList<>());
 	}
 
 	private String toCanonicalName(String name) {
diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/JSONOrderedObject.java b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/JSONOrderedObject.java
index 8c89707d2f..bab74c752d 100644
--- a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/JSONOrderedObject.java
+++ b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/JSONOrderedObject.java
@@ -32,7 +32,7 @@ import org.json.JSONObject;
 @SuppressWarnings("rawtypes")
 class JSONOrderedObject extends JSONObject {
 
-	private Set<String> keys = new LinkedHashSet<String>();
+	private Set<String> keys = new LinkedHashSet<>();
 
 	@Override
 	public JSONObject put(String key, Object value) throws JSONException {
diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/JsonMarshaller.java b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/JsonMarshaller.java
index 0c6d65b2b8..e4ad5695b8 100644
--- a/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/JsonMarshaller.java
+++ b/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/JsonMarshaller.java
@@ -118,14 +118,14 @@ public class JsonMarshaller {
 
 	private ItemHint toItemHint(JSONObject object) throws Exception {
 		String name = object.getString("name");
-		List<ItemHint.ValueHint> values = new ArrayList<ItemHint.ValueHint>();
+		List<ItemHint.ValueHint> values = new ArrayList<>();
 		if (object.has("values")) {
 			JSONArray valuesArray = object.getJSONArray("values");
 			for (int i = 0; i < valuesArray.length(); i++) {
 				values.add(toValueHint((JSONObject) valuesArray.get(i)));
 			}
 		}
-		List<ItemHint.ValueProvider> providers = new ArrayList<ItemHint.ValueProvider>();
+		List<ItemHint.ValueProvider> providers = new ArrayList<>();
 		if (object.has("providers")) {
 			JSONArray providersObject = object.getJSONArray("providers");
 			for (int i = 0; i < providersObject.length(); i++) {
@@ -143,7 +143,7 @@ public class JsonMarshaller {
 
 	private ItemHint.ValueProvider toValueProvider(JSONObject object) throws Exception {
 		String name = object.getString("name");
-		Map<String, Object> parameters = new HashMap<String, Object>();
+		Map<String, Object> parameters = new HashMap<>();
 		if (object.has("parameters")) {
 			JSONObject parametersObject = object.getJSONObject("parameters");
 			for (Iterator<?> iterator = parametersObject.keys(); iterator.hasNext();) {
diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/Metadata.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/Metadata.java
index ef99e535f5..3efd621981 100644
--- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/Metadata.java
+++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/Metadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -296,7 +296,7 @@ public final class Metadata {
 		}
 
 		private <T> List<T> add(List<T> items, T item) {
-			List<T> result = new ArrayList<T>(items);
+			List<T> result = new ArrayList<>(items);
 			result.add(item);
 			return result;
 		}
diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/TestProject.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/TestProject.java
index ff5ec89fdd..aeb76620e4 100644
--- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/TestProject.java
+++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/TestProject.java
@@ -63,7 +63,7 @@ public class TestProject {
 
 	private TestCompiler compiler;
 
-	private Set<File> sourceFiles = new LinkedHashSet<File>();
+	private Set<File> sourceFiles = new LinkedHashSet<>();
 
 	public TestProject(TemporaryFolder tempFolder, Class<?>... classes)
 			throws IOException {
@@ -74,7 +74,7 @@ public class TestProject {
 				return TestProject.this.sourceFolder;
 			}
 		};
-		Set<Class<?>> contents = new HashSet<Class<?>>(Arrays.asList(classes));
+		Set<Class<?>> contents = new HashSet<>(Arrays.asList(classes));
 		contents.addAll(Arrays.asList(ALWAYS_INCLUDE));
 		copySources(contents);
 	}
diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/fieldvalues/AbstractFieldValuesProcessorTests.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/fieldvalues/AbstractFieldValuesProcessorTests.java
index 1a6793cdec..ad475e308e 100644
--- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/fieldvalues/AbstractFieldValuesProcessorTests.java
+++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/fieldvalues/AbstractFieldValuesProcessorTests.java
@@ -97,7 +97,7 @@ public abstract class AbstractFieldValuesProcessorTests {
 
 		private FieldValuesParser processor;
 
-		private Map<String, Object> values = new HashMap<String, Object>();
+		private Map<String, Object> values = new HashMap<>();
 
 		@Override
 		public synchronized void init(ProcessingEnvironment env) {
diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokExplicitProperties.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokExplicitProperties.java
index b014016715..d04a597f11 100644
--- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokExplicitProperties.java
+++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokExplicitProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -56,7 +56,7 @@ public class LombokExplicitProperties {
 	private Integer number = 0;
 
 	@Getter
-	private final List<String> items = new ArrayList<String>();
+	private final List<String> items = new ArrayList<>();
 
 	// Should be ignored if no annotation is set
 	@SuppressWarnings("unused")
diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokSimpleDataProperties.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokSimpleDataProperties.java
index 6c7c610a26..83a9e38caf 100644
--- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokSimpleDataProperties.java
+++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokSimpleDataProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -47,7 +47,7 @@ public class LombokSimpleDataProperties {
 	@Deprecated
 	private Integer number = 0;
 
-	private final List<String> items = new ArrayList<String>();
+	private final List<String> items = new ArrayList<>();
 
 	private final String ignored = "foo";
 
diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokSimpleProperties.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokSimpleProperties.java
index 369482f71b..cda5d19cb2 100644
--- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokSimpleProperties.java
+++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/lombok/LombokSimpleProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -49,7 +49,7 @@ public class LombokSimpleProperties {
 	@Deprecated
 	private Integer number = 0;
 
-	private final List<String> items = new ArrayList<String>();
+	private final List<String> items = new ArrayList<>();
 
 	private final String ignored = "foo";
 
diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/SimpleCollectionProperties.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/SimpleCollectionProperties.java
index 91d14019a2..e8c627f712 100644
--- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/SimpleCollectionProperties.java
+++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/simple/SimpleCollectionProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -39,11 +39,11 @@ public class SimpleCollectionProperties {
 
 	private List<Float> floats;
 
-	private final Map<String, Integer> namesToIntegers = new HashMap<String, Integer>();
+	private final Map<String, Integer> namesToIntegers = new HashMap<>();
 
-	private final Collection<Byte> bytes = new LinkedHashSet<Byte>();
+	private final Collection<Byte> bytes = new LinkedHashSet<>();
 
-	private final List<Double> doubles = new ArrayList<Double>();
+	private final List<Double> doubles = new ArrayList<>();
 
 	public Map<Integer, String> getIntegersToNames() {
 		return this.integersToNames;
diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/GenericConfig.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/GenericConfig.java
index 28de281047..3ffb6fc52e 100644
--- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/GenericConfig.java
+++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/specific/GenericConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -42,11 +42,11 @@ public class GenericConfig<T> {
 		private String name;
 
 		@NestedConfigurationProperty
-		private final Bar<String> bar = new Bar<String>();
+		private final Bar<String> bar = new Bar<>();
 
-		private final Map<String, Bar<Integer>> stringToBar = new HashMap<String, Bar<Integer>>();
+		private final Map<String, Bar<Integer>> stringToBar = new HashMap<>();
 
-		private final Map<String, Integer> stringToInteger = new HashMap<String, Integer>();
+		private final Map<String, Integer> stringToInteger = new HashMap<>();
 
 		public String getName() {
 			return this.name;
@@ -75,7 +75,7 @@ public class GenericConfig<T> {
 		private String name;
 
 		@NestedConfigurationProperty
-		private final Biz<String> biz = new Biz<String>();
+		private final Biz<String> biz = new Biz<>();
 
 		public String getName() {
 			return this.name;
diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/buildinfo/BuildInfo.java b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/buildinfo/BuildInfo.java
index 3cb5105e7e..b7d30287f0 100644
--- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/buildinfo/BuildInfo.java
+++ b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/buildinfo/BuildInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -63,7 +63,7 @@ public class BuildInfo extends DefaultTask {
 	private String projectName = getProject().getName();
 
 	@Input
-	private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+	private Map<String, Object> additionalProperties = new HashMap<>();
 
 	@TaskAction
 	public void generateBuildProperties() {
@@ -127,7 +127,7 @@ public class BuildInfo extends DefaultTask {
 	}
 
 	private Map<String, String> coerceToStringValues(Map<String, Object> input) {
-		Map<String, String> output = new HashMap<String, String>();
+		Map<String, String> output = new HashMap<>();
 		for (Entry<String, Object> entry : input.entrySet()) {
 			output.put(entry.getKey(), entry.getValue().toString());
 		}
diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/repackage/ProjectLibraries.java b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/repackage/ProjectLibraries.java
index a808ab4039..1ebd3a6c33 100644
--- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/repackage/ProjectLibraries.java
+++ b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/repackage/ProjectLibraries.java
@@ -119,7 +119,7 @@ class ProjectLibraries implements Libraries {
 		if (configuration == null) {
 			return null;
 		}
-		Set<GradleLibrary> libraries = new LinkedHashSet<GradleLibrary>();
+		Set<GradleLibrary> libraries = new LinkedHashSet<>();
 		for (ResolvedArtifact artifact : configuration.getResolvedConfiguration()
 				.getResolvedArtifacts()) {
 			libraries.add(new ResolvedArtifactLibrary(artifact, scope));
@@ -130,7 +130,7 @@ class ProjectLibraries implements Libraries {
 
 	private Set<GradleLibrary> getLibrariesForFileDependencies(
 			Configuration configuration, LibraryScope scope) {
-		Set<GradleLibrary> libraries = new LinkedHashSet<GradleLibrary>();
+		Set<GradleLibrary> libraries = new LinkedHashSet<>();
 		for (Dependency dependency : configuration.getIncoming().getDependencies()) {
 			if (dependency instanceof FileCollectionDependency) {
 				FileCollectionDependency fileDependency = (FileCollectionDependency) dependency;
@@ -156,11 +156,11 @@ class ProjectLibraries implements Libraries {
 		if (source == null || toRemove == null) {
 			return source;
 		}
-		Set<File> filesToRemove = new HashSet<File>();
+		Set<File> filesToRemove = new HashSet<>();
 		for (GradleLibrary library : toRemove) {
 			filesToRemove.add(library.getFile());
 		}
-		Set<GradleLibrary> result = new LinkedHashSet<GradleLibrary>();
+		Set<GradleLibrary> result = new LinkedHashSet<>();
 		for (GradleLibrary library : source) {
 			if (!filesToRemove.contains(library.getFile())) {
 				result.add(library);
@@ -195,8 +195,8 @@ class ProjectLibraries implements Libraries {
 	}
 
 	private Set<String> getDuplicates(Set<GradleLibrary> libraries) {
-		Set<String> duplicates = new HashSet<String>();
-		Set<String> seen = new HashSet<String>();
+		Set<String> duplicates = new HashSet<>();
+		Set<String> seen = new HashSet<>();
 		for (GradleLibrary library : libraries) {
 			if (library.getFile() != null && !seen.add(library.getFile().getName())) {
 				duplicates.add(library.getFile().getName());
diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/repackage/RepackageTask.java b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/repackage/RepackageTask.java
index 370c78b5f3..155adebca2 100644
--- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/repackage/RepackageTask.java
+++ b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/repackage/RepackageTask.java
@@ -193,7 +193,7 @@ public class RepackageTask extends DefaultTask {
 		private boolean isTaskMatch(Jar task, Object withJarTask) {
 			if (withJarTask == null) {
 				if ("".equals(task.getClassifier())) {
-					Set<Object> tasksWithCustomRepackaging = new HashSet<Object>();
+					Set<Object> tasksWithCustomRepackaging = new HashSet<>();
 					for (RepackageTask repackageTask : RepackageTask.this.getProject()
 							.getTasks().withType(RepackageTask.class)) {
 						if (repackageTask.getWithJarTask() != null) {
diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/run/BootRunTask.java b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/run/BootRunTask.java
index 76cc4fd345..7f51972f9f 100644
--- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/run/BootRunTask.java
+++ b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/run/BootRunTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -67,11 +67,11 @@ public class BootRunTask extends JavaExec {
 			SourceSet mainSourceSet = SourceSets.findMainSourceSet(getProject());
 			final File outputDir = (mainSourceSet == null ? null
 					: mainSourceSet.getOutput().getResourcesDir());
-			final Set<File> resources = new LinkedHashSet<File>();
+			final Set<File> resources = new LinkedHashSet<>();
 			if (mainSourceSet != null) {
 				resources.addAll(mainSourceSet.getResources().getSrcDirs());
 			}
-			List<File> classPath = new ArrayList<File>(getClasspath().getFiles());
+			List<File> classPath = new ArrayList<>(getClasspath().getFiles());
 			classPath.addAll(0, resources);
 			getLogger().info("Adding classpath: " + resources);
 			setClasspath(new SimpleFileCollection(classPath));
diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java
index 79fd737e29..c60b595418 100644
--- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java
+++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/JarWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -57,7 +57,7 @@ public class JarWriter implements LoaderClassesWriter {
 
 	private final JarOutputStream jarOutput;
 
-	private final Set<String> writtenEntries = new HashSet<String>();
+	private final Set<String> writtenEntries = new HashSet<>();
 
 	/**
 	 * Create a new {@link JarWriter} instance.
@@ -89,7 +89,7 @@ public class JarWriter implements LoaderClassesWriter {
 	private void setExecutableFilePermission(File file) {
 		try {
 			Path path = file.toPath();
-			Set<PosixFilePermission> permissions = new HashSet<PosixFilePermission>(
+			Set<PosixFilePermission> permissions = new HashSet<>(
 					Files.getPosixFilePermissions(path));
 			permissions.add(PosixFilePermission.OWNER_EXECUTE);
 			Files.setPosixFilePermissions(path, permissions);
diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layouts.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layouts.java
index 4070d79d41..f57d1d81b8 100644
--- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layouts.java
+++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Layouts.java
@@ -123,7 +123,7 @@ public final class Layouts {
 		private static final Map<LibraryScope, String> SCOPE_DESTINATIONS;
 
 		static {
-			Map<LibraryScope, String> map = new HashMap<LibraryScope, String>();
+			Map<LibraryScope, String> map = new HashMap<>();
 			map.put(LibraryScope.COMPILE, "WEB-INF/lib/");
 			map.put(LibraryScope.CUSTOM, "WEB-INF/lib/");
 			map.put(LibraryScope.RUNTIME, "WEB-INF/lib/");
diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java
index f46257618f..e9835a3468 100644
--- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java
+++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/MainClassFinder.java
@@ -136,7 +136,7 @@ public abstract class MainClassFinder {
 					"Invalid root folder '" + rootFolder + "'");
 		}
 		String prefix = rootFolder.getAbsolutePath() + "/";
-		Deque<File> stack = new ArrayDeque<File>();
+		Deque<File> stack = new ArrayDeque<>();
 		stack.push(rootFolder);
 		while (!stack.isEmpty()) {
 			File file = stack.pop();
@@ -275,7 +275,7 @@ public abstract class MainClassFinder {
 			String classesLocation) {
 		classesLocation = (classesLocation != null ? classesLocation : "");
 		Enumeration<JarEntry> sourceEntries = source.entries();
-		List<JarEntry> classEntries = new ArrayList<JarEntry>();
+		List<JarEntry> classEntries = new ArrayList<>();
 		while (sourceEntries.hasMoreElements()) {
 			JarEntry entry = sourceEntries.nextElement();
 			if (entry.getName().startsWith(classesLocation)
@@ -319,7 +319,7 @@ public abstract class MainClassFinder {
 
 	private static class ClassDescriptor extends ClassVisitor {
 
-		private final Set<String> annotationNames = new LinkedHashSet<String>();
+		private final Set<String> annotationNames = new LinkedHashSet<>();
 
 		private boolean mainMethodFound;
 
@@ -398,7 +398,7 @@ public abstract class MainClassFinder {
 		MainClass(String name, Set<String> annotationNames) {
 			this.name = name;
 			this.annotationNames = Collections
-					.unmodifiableSet(new HashSet<String>(annotationNames));
+					.unmodifiableSet(new HashSet<>(annotationNames));
 		}
 
 		String getName() {
@@ -446,7 +446,7 @@ public abstract class MainClassFinder {
 	private static final class SingleMainClassCallback
 			implements MainClassCallback<Object> {
 
-		private final Set<MainClass> mainClasses = new LinkedHashSet<MainClass>();
+		private final Set<MainClass> mainClasses = new LinkedHashSet<>();
 
 		private final String annotationName;
 
@@ -461,7 +461,7 @@ public abstract class MainClassFinder {
 		}
 
 		private String getMainClassName() {
-			Set<MainClass> matchingMainClasses = new LinkedHashSet<MainClass>();
+			Set<MainClass> matchingMainClasses = new LinkedHashSet<>();
 			if (this.annotationName != null) {
 				for (MainClass mainClass : this.mainClasses) {
 					if (mainClass.getAnnotationNames().contains(this.annotationName)) {
diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java
index 1450c48205..1bfee27d33 100644
--- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java
+++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java
@@ -60,7 +60,7 @@ public class Repackager {
 
 	private static final String SPRING_BOOT_APPLICATION_CLASS_NAME = "org.springframework.boot.autoconfigure.SpringBootApplication";
 
-	private List<MainClassTimeoutWarningListener> mainClassTimeoutListeners = new ArrayList<MainClassTimeoutWarningListener>();
+	private List<MainClassTimeoutWarningListener> mainClassTimeoutListeners = new ArrayList<>();
 
 	private String mainClass;
 
@@ -236,8 +236,8 @@ public class Repackager {
 			LaunchScript launchScript) throws IOException {
 		JarWriter writer = new JarWriter(destination, launchScript);
 		try {
-			final List<Library> unpackLibraries = new ArrayList<Library>();
-			final List<Library> standardLibraries = new ArrayList<Library>();
+			final List<Library> unpackLibraries = new ArrayList<>();
+			final List<Library> standardLibraries = new ArrayList<>();
 			libraries.doWithLibraries(new LibraryCallback() {
 
 				@Override
@@ -270,7 +270,7 @@ public class Repackager {
 			final List<Library> unpackLibraries, final List<Library> standardLibraries)
 					throws IOException {
 		writer.writeManifest(buildManifest(sourceJar));
-		Set<String> seen = new HashSet<String>();
+		Set<String> seen = new HashSet<>();
 		writeNestedLibraries(unpackLibraries, seen, writer);
 		if (this.layout instanceof RepackagingLayout) {
 			writer.writeEntries(sourceJar, new RenamingEntryTransformer(
diff --git a/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/DefaultLaunchScriptTests.java b/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/DefaultLaunchScriptTests.java
index fd4998ff27..2582cba95c 100644
--- a/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/DefaultLaunchScriptTests.java
+++ b/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/DefaultLaunchScriptTests.java
@@ -212,7 +212,7 @@ public class DefaultLaunchScriptTests {
 	}
 
 	private Map<?, ?> createProperties(String... pairs) {
-		Map<Object, Object> properties = new HashMap<Object, Object>();
+		Map<Object, Object> properties = new HashMap<>();
 		for (String pair : pairs) {
 			String[] keyValue = pair.split(":");
 			properties.put(keyValue[0], keyValue[1]);
diff --git a/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/MainClassFinderTests.java b/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/MainClassFinderTests.java
index 9b8c532980..81ab7a1774 100644
--- a/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/MainClassFinderTests.java
+++ b/spring-boot-tools/spring-boot-loader-tools/src/test/java/org/springframework/boot/loader/tools/MainClassFinderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -178,7 +178,7 @@ public class MainClassFinderTests {
 
 	private static class ClassNameCollector implements MainClassCallback<Object> {
 
-		private final List<String> classNames = new ArrayList<String>();
+		private final List<String> classNames = new ArrayList<>();
 
 		@Override
 		public Object doWith(MainClass mainClass) {
diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/ExecutableArchiveLauncher.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/ExecutableArchiveLauncher.java
index 0a6a1c83f4..c65fbfcbae 100644
--- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/ExecutableArchiveLauncher.java
+++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/ExecutableArchiveLauncher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -68,7 +68,7 @@ public abstract class ExecutableArchiveLauncher extends Launcher {
 
 	@Override
 	protected List<Archive> getClassPathArchives() throws Exception {
-		List<Archive> archives = new ArrayList<Archive>(
+		List<Archive> archives = new ArrayList<>(
 				this.archive.getNestedArchives(new EntryFilter() {
 
 					@Override
diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/Launcher.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/Launcher.java
index 2b0f106e66..ba402225f4 100644
--- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/Launcher.java
+++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/Launcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -57,7 +57,7 @@ public abstract class Launcher {
 	 * @throws Exception if the classloader cannot be created
 	 */
 	protected ClassLoader createClassLoader(List<Archive> archives) throws Exception {
-		List<URL> urls = new ArrayList<URL>(archives.size());
+		List<URL> urls = new ArrayList<>(archives.size());
 		for (Archive archive : archives) {
 			urls.add(archive.getUrl());
 		}
diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java
index 01253279ac..677c2212d8 100755
--- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java
+++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java
@@ -121,7 +121,7 @@ public class PropertiesLauncher extends Launcher {
 
 	private final File home;
 
-	private List<String> paths = new ArrayList<String>();
+	private List<String> paths = new ArrayList<>();
 
 	private final Properties properties = new Properties();
 
@@ -149,7 +149,7 @@ public class PropertiesLauncher extends Launcher {
 	}
 
 	private void initializeProperties() throws Exception, IOException {
-		List<String> configs = new ArrayList<String>();
+		List<String> configs = new ArrayList<>();
 		if (getProperty(CONFIG_LOCATION) != null) {
 			configs.add(getProperty(CONFIG_LOCATION));
 		}
@@ -296,7 +296,7 @@ public class PropertiesLauncher extends Launcher {
 	}
 
 	private List<String> parsePathsProperty(String commaSeparatedPaths) {
-		List<String> paths = new ArrayList<String>();
+		List<String> paths = new ArrayList<>();
 		for (String path : commaSeparatedPaths.split(",")) {
 			path = cleanupPath(path);
 			// Empty path (i.e. the archive itself if running from a JAR) is always added
@@ -432,11 +432,11 @@ public class PropertiesLauncher extends Launcher {
 
 	@Override
 	protected List<Archive> getClassPathArchives() throws Exception {
-		List<Archive> lib = new ArrayList<Archive>();
+		List<Archive> lib = new ArrayList<>();
 		for (String path : this.paths) {
 			for (Archive archive : getClassPathArchives(path)) {
 				if (archive instanceof ExplodedArchive) {
-					List<Archive> nested = new ArrayList<Archive>(
+					List<Archive> nested = new ArrayList<>(
 							archive.getNestedArchives(new ArchiveEntryFilter()));
 					nested.add(0, archive);
 					lib.addAll(nested);
@@ -452,7 +452,7 @@ public class PropertiesLauncher extends Launcher {
 
 	private List<Archive> getClassPathArchives(String path) throws Exception {
 		String root = cleanupPath(stripFileUrlPrefix(path));
-		List<Archive> lib = new ArrayList<Archive>();
+		List<Archive> lib = new ArrayList<>();
 		File file = new File(root);
 		if (!isAbsolutePath(root)) {
 			file = new File(this.home, root);
diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/ExplodedArchive.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/ExplodedArchive.java
index 59f94407a8..3f2b435ddd 100644
--- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/ExplodedArchive.java
+++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/ExplodedArchive.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -42,7 +42,7 @@ import java.util.jar.Manifest;
  */
 public class ExplodedArchive implements Archive {
 
-	private static final Set<String> SKIPPED_NAMES = new HashSet<String>(
+	private static final Set<String> SKIPPED_NAMES = new HashSet<>(
 			Arrays.asList(".", ".."));
 
 	private final File root;
@@ -104,7 +104,7 @@ public class ExplodedArchive implements Archive {
 
 	@Override
 	public List<Archive> getNestedArchives(EntryFilter filter) throws IOException {
-		List<Archive> nestedArchives = new ArrayList<Archive>();
+		List<Archive> nestedArchives = new ArrayList<>();
 		for (Entry entry : this) {
 			if (filter.matches(entry)) {
 				nestedArchives.add(getNestedArchive(entry));
@@ -145,7 +145,7 @@ public class ExplodedArchive implements Archive {
 
 		private final boolean recursive;
 
-		private final Deque<Iterator<File>> stack = new LinkedList<Iterator<File>>();
+		private final Deque<Iterator<File>> stack = new LinkedList<>();
 
 		private File current;
 
diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/JarFileArchive.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/JarFileArchive.java
index a136897e12..174b5486dd 100755
--- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/JarFileArchive.java
+++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/archive/JarFileArchive.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -81,7 +81,7 @@ public class JarFileArchive implements Archive {
 
 	@Override
 	public List<Archive> getNestedArchives(EntryFilter filter) throws IOException {
-		List<Archive> nestedArchives = new ArrayList<Archive>();
+		List<Archive> nestedArchives = new ArrayList<>();
 		for (Entry entry : this) {
 			if (filter.matches(entry)) {
 				nestedArchives.add(getNestedArchive(entry));
diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/data/RandomAccessDataFile.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/data/RandomAccessDataFile.java
index 384107bdd6..263fd5e76f 100644
--- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/data/RandomAccessDataFile.java
+++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/data/RandomAccessDataFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -240,7 +240,7 @@ public class RandomAccessDataFile implements RandomAccessData {
 		FilePool(int size) {
 			this.size = size;
 			this.available = new Semaphore(size);
-			this.files = new ConcurrentLinkedQueue<RandomAccessFile>();
+			this.files = new ConcurrentLinkedQueue<>();
 		}
 
 		public RandomAccessFile acquire() throws IOException {
diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/CentralDirectoryParser.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/CentralDirectoryParser.java
index 4b8a694c22..f1ca2c6993 100644
--- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/CentralDirectoryParser.java
+++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/CentralDirectoryParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -32,7 +32,7 @@ class CentralDirectoryParser {
 
 	private int CENTRAL_DIRECTORY_HEADER_BASE_SIZE = 46;
 
-	private final List<CentralDirectoryVisitor> visitors = new ArrayList<CentralDirectoryVisitor>();
+	private final List<CentralDirectoryVisitor> visitors = new ArrayList<>();
 
 	public <T extends CentralDirectoryVisitor> T addVisitor(T visitor) {
 		this.visitors.add(visitor);
diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/Handler.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/Handler.java
index 949504b4ff..4d4154c323 100644
--- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/Handler.java
+++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/Handler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -68,7 +68,7 @@ public class Handler extends URLStreamHandler {
 	private static SoftReference<Map<File, JarFile>> rootFileCache;
 
 	static {
-		rootFileCache = new SoftReference<Map<File, JarFile>>(null);
+		rootFileCache = new SoftReference<>(null);
 	}
 
 	private final Logger logger = Logger.getLogger(getClass().getName());
@@ -291,8 +291,8 @@ public class Handler extends URLStreamHandler {
 	static void addToRootFileCache(File sourceFile, JarFile jarFile) {
 		Map<File, JarFile> cache = rootFileCache.get();
 		if (cache == null) {
-			cache = new ConcurrentHashMap<File, JarFile>();
-			rootFileCache = new SoftReference<Map<File, JarFile>>(cache);
+			cache = new ConcurrentHashMap<>();
+			rootFileCache = new SoftReference<>(cache);
 		}
 		cache.put(sourceFile, jarFile);
 	}
diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFile.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFile.java
index e0a2741dfc..76f20da650 100644
--- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFile.java
+++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFile.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -172,7 +172,7 @@ public class JarFile extends java.util.jar.JarFile {
 					inputStream.close();
 				}
 			}
-			this.manifest = new SoftReference<Manifest>(manifest);
+			this.manifest = new SoftReference<>(manifest);
 		}
 		return manifest;
 	}
diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarURLConnection.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarURLConnection.java
index 8199fb4490..92ddeb0453 100644
--- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarURLConnection.java
+++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarURLConnection.java
@@ -39,7 +39,7 @@ import org.springframework.boot.loader.data.RandomAccessData.ResourceAccess;
  */
 final class JarURLConnection extends java.net.JarURLConnection {
 
-	private static ThreadLocal<Boolean> useFastExceptions = new ThreadLocal<Boolean>();
+	private static ThreadLocal<Boolean> useFastExceptions = new ThreadLocal<>();
 
 	private static final FileNotFoundException FILE_NOT_FOUND_EXCEPTION = new FileNotFoundException(
 			"Jar file or entry not found");
diff --git a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/AbstractExecutableArchiveLauncherTests.java b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/AbstractExecutableArchiveLauncherTests.java
index 48a2f53a2b..6bace570ad 100644
--- a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/AbstractExecutableArchiveLauncherTests.java
+++ b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/AbstractExecutableArchiveLauncherTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -89,7 +89,7 @@ public class AbstractExecutableArchiveLauncherTests {
 	}
 
 	protected Set<URL> getUrls(List<Archive> archives) throws MalformedURLException {
-		Set<URL> urls = new HashSet<URL>(archives.size());
+		Set<URL> urls = new HashSet<>(archives.size());
 		for (Archive archive : archives) {
 			urls.add(archive.getUrl());
 		}
diff --git a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/archive/ExplodedArchiveTests.java b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/archive/ExplodedArchiveTests.java
index 3166ed3bd9..08f07304a4 100755
--- a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/archive/ExplodedArchiveTests.java
+++ b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/archive/ExplodedArchiveTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -188,7 +188,7 @@ public class ExplodedArchiveTests {
 	}
 
 	private Map<String, Archive.Entry> getEntriesMap(Archive archive) {
-		Map<String, Archive.Entry> entries = new HashMap<String, Archive.Entry>();
+		Map<String, Archive.Entry> entries = new HashMap<>();
 		for (Archive.Entry entry : archive) {
 			entries.put(entry.getName(), entry);
 		}
diff --git a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/archive/JarFileArchiveTests.java b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/archive/JarFileArchiveTests.java
index ac7756d6d8..37df7c1d31 100755
--- a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/archive/JarFileArchiveTests.java
+++ b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/archive/JarFileArchiveTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -121,7 +121,7 @@ public class JarFileArchiveTests {
 	}
 
 	private Map<String, Archive.Entry> getEntriesMap(Archive archive) {
-		Map<String, Archive.Entry> entries = new HashMap<String, Archive.Entry>();
+		Map<String, Archive.Entry> entries = new HashMap<>();
 		for (Archive.Entry entry : archive) {
 			entries.put(entry.getName(), entry);
 		}
diff --git a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/data/RandomAccessDataFileTests.java b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/data/RandomAccessDataFileTests.java
index 3b0422dc89..500510c994 100644
--- a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/data/RandomAccessDataFileTests.java
+++ b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/data/RandomAccessDataFileTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -276,7 +276,7 @@ public class RandomAccessDataFileTests {
 	@Test
 	public void concurrentReads() throws Exception {
 		ExecutorService executorService = Executors.newFixedThreadPool(20);
-		List<Future<Boolean>> results = new ArrayList<Future<Boolean>>();
+		List<Future<Boolean>> results = new ArrayList<>();
 		for (int i = 0; i < 100; i++) {
 			results.add(executorService.submit(new Callable<Boolean>() {
 
diff --git a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/CentralDirectoryParserTests.java b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/CentralDirectoryParserTests.java
index fe0343d19e..2ef8e98ffa 100644
--- a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/CentralDirectoryParserTests.java
+++ b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/CentralDirectoryParserTests.java
@@ -86,7 +86,7 @@ public class CentralDirectoryParserTests {
 
 	private static class Collector implements CentralDirectoryVisitor {
 
-		private List<CentralDirectoryFileHeader> headers = new ArrayList<CentralDirectoryFileHeader>();
+		private List<CentralDirectoryFileHeader> headers = new ArrayList<>();
 
 		@Override
 		public void visitStart(CentralDirectoryEndRecord endRecord,
@@ -111,7 +111,7 @@ public class CentralDirectoryParserTests {
 
 	private static class MockCentralDirectoryVisitor implements CentralDirectoryVisitor {
 
-		private final List<String> invocations = new ArrayList<String>();
+		private final List<String> invocations = new ArrayList<>();
 
 		@Override
 		public void visitStart(CentralDirectoryEndRecord endRecord,
diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractDependencyFilterMojo.java b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractDependencyFilterMojo.java
index bcb5b2dbed..d3deec31ad 100644
--- a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractDependencyFilterMojo.java
+++ b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractDependencyFilterMojo.java
@@ -90,7 +90,7 @@ public abstract class AbstractDependencyFilterMojo extends AbstractMojo {
 	protected Set<Artifact> filterDependencies(Set<Artifact> dependencies,
 			FilterArtifacts filters) throws MojoExecutionException {
 		try {
-			Set<Artifact> filtered = new LinkedHashSet<Artifact>(dependencies);
+			Set<Artifact> filtered = new LinkedHashSet<>(dependencies);
 			filtered.retainAll(filters.filter(dependencies));
 			return filtered;
 		}
diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java
index 87a460905d..f208a99855 100644
--- a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java
+++ b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -270,7 +270,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
 
 	private void doRunWithForkedJvm(String startClassName)
 			throws MojoExecutionException, MojoFailureException {
-		List<String> args = new ArrayList<String>();
+		List<String> args = new ArrayList<>();
 		addAgents(args);
 		addJvmArgs(args);
 		addClasspath(args);
@@ -392,7 +392,7 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
 
 	protected URL[] getClassPathUrls() throws MojoExecutionException {
 		try {
-			List<URL> urls = new ArrayList<URL>();
+			List<URL> urls = new ArrayList<>();
 			addUserDefinedFolders(urls);
 			addResources(urls);
 			addProjectClasses(urls);
diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ArtifactsLibraries.java b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ArtifactsLibraries.java
index dd83710824..fed687bf27 100644
--- a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ArtifactsLibraries.java
+++ b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/ArtifactsLibraries.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -45,7 +45,7 @@ public class ArtifactsLibraries implements Libraries {
 	private static final Map<String, LibraryScope> SCOPES;
 
 	static {
-		Map<String, LibraryScope> scopes = new HashMap<String, LibraryScope>();
+		Map<String, LibraryScope> scopes = new HashMap<>();
 		scopes.put(Artifact.SCOPE_COMPILE, LibraryScope.COMPILE);
 		scopes.put(Artifact.SCOPE_RUNTIME, LibraryScope.RUNTIME);
 		scopes.put(Artifact.SCOPE_PROVIDED, LibraryScope.PROVIDED);
@@ -85,8 +85,8 @@ public class ArtifactsLibraries implements Libraries {
 	}
 
 	private Set<String> getDuplicates(Set<Artifact> artifacts) {
-		Set<String> duplicates = new HashSet<String>();
-		Set<String> seen = new HashSet<String>();
+		Set<String> duplicates = new HashSet<>();
+		Set<String> seen = new HashSet<>();
 		for (Artifact artifact : artifacts) {
 			String fileName = getFileName(artifact);
 			if (artifact.getFile() != null && !seen.add(fileName)) {
diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java
index e73c0fedf3..cba02a6cc7 100644
--- a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java
+++ b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java
@@ -242,7 +242,7 @@ public class RepackageMojo extends AbstractDependencyFilterMojo {
 	}
 
 	private ArtifactsFilter[] getAdditionalFilters() {
-		List<ArtifactsFilter> filters = new ArrayList<ArtifactsFilter>();
+		List<ArtifactsFilter> filters = new ArrayList<>();
 		if (this.excludeDevtools) {
 			Exclude exclude = new Exclude();
 			exclude.setGroupId("org.springframework.boot");
diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RunArguments.java b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RunArguments.java
index f81348b3fb..6888043c6a 100644
--- a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RunArguments.java
+++ b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RunArguments.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -38,7 +38,7 @@ class RunArguments {
 	}
 
 	RunArguments(String[] args) {
-		this.args = new LinkedList<String>(Arrays.asList(args));
+		this.args = new LinkedList<>(Arrays.asList(args));
 	}
 
 	public LinkedList<String> getArgs() {
diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/StartMojo.java b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/StartMojo.java
index 595ef0e124..1c157acbf5 100644
--- a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/StartMojo.java
+++ b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/StartMojo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -132,7 +132,7 @@ public class StartMojo extends AbstractRunMojo {
 	protected RunArguments resolveJvmArguments() {
 		RunArguments jvmArguments = super.resolveJvmArguments();
 		if (isFork()) {
-			List<String> remoteJmxArguments = new ArrayList<String>();
+			List<String> remoteJmxArguments = new ArrayList<>();
 			remoteJmxArguments.add("-Dcom.sun.management.jmxremote");
 			remoteJmxArguments.add("-Dcom.sun.management.jmxremote.port=" + this.jmxPort);
 			remoteJmxArguments.add("-Dcom.sun.management.jmxremote.authenticate=false");
diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/ArtifactsLibrariesTests.java b/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/ArtifactsLibrariesTests.java
index 243ab5dfb1..f73c0d4ade 100644
--- a/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/ArtifactsLibrariesTests.java
+++ b/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/ArtifactsLibrariesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -124,7 +124,7 @@ public class ArtifactsLibrariesTests {
 		given(artifact2.getBaseVersion()).willReturn("1.0");
 		given(artifact2.getFile()).willReturn(new File("a"));
 		given(artifact2.getArtifactHandler()).willReturn(this.artifactHandler);
-		this.artifacts = new LinkedHashSet<Artifact>(Arrays.asList(artifact1, artifact2));
+		this.artifacts = new LinkedHashSet<>(Arrays.asList(artifact1, artifact2));
 		this.libs = new ArtifactsLibraries(this.artifacts, null, mock(Log.class));
 		this.libs.doWithLibraries(this.callback);
 		verify(this.callback, times(2)).library(this.libraryCaptor.capture());
diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/DependencyFilterMojoTests.java b/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/DependencyFilterMojoTests.java
index 212e711d12..3b39ce4d11 100644
--- a/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/DependencyFilterMojoTests.java
+++ b/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/DependencyFilterMojoTests.java
@@ -148,7 +148,7 @@ public class DependencyFilterMojoTests {
 
 		public Set<Artifact> filterDependencies(Artifact... artifacts)
 				throws MojoExecutionException {
-			Set<Artifact> input = new LinkedHashSet<Artifact>(Arrays.asList(artifacts));
+			Set<Artifact> input = new LinkedHashSet<>(Arrays.asList(artifacts));
 			return filterDependencies(input, getFilters(this.additionalFilters));
 		}
 
diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/ExcludeFilterTests.java b/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/ExcludeFilterTests.java
index ee7340681c..610bb5608f 100644
--- a/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/ExcludeFilterTests.java
+++ b/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/ExcludeFilterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -101,7 +101,7 @@ public class ExcludeFilterTests {
 		ExcludeFilter filter = new ExcludeFilter(Arrays.asList(
 				createExclude("com.foo", "bar"), createExclude("com.foo", "bar2"),
 				createExclude("org.acme", "app")));
-		Set<Artifact> artifacts = new HashSet<Artifact>();
+		Set<Artifact> artifacts = new HashSet<>();
 		artifacts.add(createArtifact("com.foo", "bar"));
 		artifacts.add(createArtifact("com.foo", "bar"));
 		Artifact anotherAcme = createArtifact("org.acme", "another-app");
diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/IncludeFilterTests.java b/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/IncludeFilterTests.java
index 12553eb980..995410852e 100644
--- a/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/IncludeFilterTests.java
+++ b/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/IncludeFilterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -98,7 +98,7 @@ public class IncludeFilterTests {
 		IncludeFilter filter = new IncludeFilter(Arrays.asList(
 				createInclude("com.foo", "bar"), createInclude("com.foo", "bar2"),
 				createInclude("org.acme", "app")));
-		Set<Artifact> artifacts = new HashSet<Artifact>();
+		Set<Artifact> artifacts = new HashSet<>();
 		artifacts.add(createArtifact("com.foo", "bar"));
 		artifacts.add(createArtifact("com.foo", "bar"));
 		Artifact anotherAcme = createArtifact("org.acme", "another-app");
diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/Verify.java b/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/Verify.java
index e169faed59..55beb4d1aa 100644
--- a/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/Verify.java
+++ b/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/Verify.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -93,7 +93,7 @@ public final class Verify {
 		public ArchiveVerifier(ZipFile zipFile) {
 			this.zipFile = zipFile;
 			Enumeration<? extends ZipEntry> entries = zipFile.entries();
-			this.content = new HashMap<String, ZipEntry>();
+			this.content = new HashMap<>();
 			while (entries.hasMoreElements()) {
 				ZipEntry zipEntry = entries.nextElement();
 				this.content.put(zipEntry.getName(), zipEntry);
diff --git a/spring-boot/src/main/java/org/springframework/boot/BeanDefinitionLoader.java b/spring-boot/src/main/java/org/springframework/boot/BeanDefinitionLoader.java
index be3149894b..edf7db9159 100644
--- a/spring-boot/src/main/java/org/springframework/boot/BeanDefinitionLoader.java
+++ b/spring-boot/src/main/java/org/springframework/boot/BeanDefinitionLoader.java
@@ -305,7 +305,7 @@ class BeanDefinitionLoader {
 	private static class ClassExcludeFilter
 			extends AbstractTypeHierarchyTraversingFilter {
 
-		private final Set<String> classNames = new HashSet<String>();
+		private final Set<String> classNames = new HashSet<>();
 
 		ClassExcludeFilter(Object... sources) {
 			super(false, false);
diff --git a/spring-boot/src/main/java/org/springframework/boot/DefaultApplicationArguments.java b/spring-boot/src/main/java/org/springframework/boot/DefaultApplicationArguments.java
index 5b5817724d..2cbf74f3a3 100644
--- a/spring-boot/src/main/java/org/springframework/boot/DefaultApplicationArguments.java
+++ b/spring-boot/src/main/java/org/springframework/boot/DefaultApplicationArguments.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -51,7 +51,7 @@ public class DefaultApplicationArguments implements ApplicationArguments {
 	@Override
 	public Set<String> getOptionNames() {
 		String[] names = this.source.getPropertyNames();
-		return Collections.unmodifiableSet(new HashSet<String>(Arrays.asList(names)));
+		return Collections.unmodifiableSet(new HashSet<>(Arrays.asList(names)));
 	}
 
 	@Override
diff --git a/spring-boot/src/main/java/org/springframework/boot/ExitCodeGenerators.java b/spring-boot/src/main/java/org/springframework/boot/ExitCodeGenerators.java
index 866595febf..ab9ad2a93b 100644
--- a/spring-boot/src/main/java/org/springframework/boot/ExitCodeGenerators.java
+++ b/spring-boot/src/main/java/org/springframework/boot/ExitCodeGenerators.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -34,7 +34,7 @@ import org.springframework.util.Assert;
  */
 class ExitCodeGenerators implements Iterable<ExitCodeGenerator> {
 
-	private List<ExitCodeGenerator> generators = new ArrayList<ExitCodeGenerator>();
+	private List<ExitCodeGenerator> generators = new ArrayList<>();
 
 	public void addAll(Throwable exception, ExitCodeExceptionMapper... mappers) {
 		Assert.notNull(exception, "Exception must not be null");
diff --git a/spring-boot/src/main/java/org/springframework/boot/ResourceBanner.java b/spring-boot/src/main/java/org/springframework/boot/ResourceBanner.java
index c2d1d797b2..2091bd3577 100644
--- a/spring-boot/src/main/java/org/springframework/boot/ResourceBanner.java
+++ b/spring-boot/src/main/java/org/springframework/boot/ResourceBanner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -78,7 +78,7 @@ public class ResourceBanner implements Banner {
 
 	protected List<PropertyResolver> getPropertyResolvers(Environment environment,
 			Class<?> sourceClass) {
-		List<PropertyResolver> resolvers = new ArrayList<PropertyResolver>();
+		List<PropertyResolver> resolvers = new ArrayList<>();
 		resolvers.add(environment);
 		resolvers.add(getVersionResolver(sourceClass));
 		resolvers.add(getAnsiResolver());
@@ -96,7 +96,7 @@ public class ResourceBanner implements Banner {
 	private Map<String, Object> getVersionsMap(Class<?> sourceClass) {
 		String appVersion = getApplicationVersion(sourceClass);
 		String bootVersion = getBootVersion();
-		Map<String, Object> versions = new HashMap<String, Object>();
+		Map<String, Object> versions = new HashMap<>();
 		versions.put("application.version", getVersionString(appVersion, false));
 		versions.put("spring-boot.version", getVersionString(bootVersion, false));
 		versions.put("application.formatted-version", getVersionString(appVersion, true));
diff --git a/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java b/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
index 785d5aacb4..f0e45d26aa 100644
--- a/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
+++ b/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
@@ -178,8 +178,8 @@ public class SpringApplication {
 			"org.springframework.web.context.ConfigurableWebApplicationContext" };
 
 	/**
-	 * The class name of application context that will be used by default for
-	 * reactive web environments.
+	 * The class name of application context that will be used by default for reactive web
+	 * environments.
 	 */
 	public static final String DEFAULT_REACTIVE_WEB_CONTEXT_CLASS = "org.springframework."
 			+ "boot.context.embedded.EmbeddedReactiveWebApplicationContext";
@@ -207,7 +207,7 @@ public class SpringApplication {
 	private static final Set<String> SERVLET_ENVIRONMENT_SOURCE_NAMES;
 
 	static {
-		Set<String> names = new HashSet<String>();
+		Set<String> names = new HashSet<>();
 		names.add(StandardServletEnvironment.SERVLET_CONTEXT_PROPERTY_SOURCE_NAME);
 		names.add(StandardServletEnvironment.SERVLET_CONFIG_PROPERTY_SOURCE_NAME);
 		names.add(StandardServletEnvironment.JNDI_PROPERTY_SOURCE_NAME);
@@ -216,7 +216,7 @@ public class SpringApplication {
 
 	private static final Log logger = LogFactory.getLog(SpringApplication.class);
 
-	private final Set<Object> sources = new LinkedHashSet<Object>();
+	private final Set<Object> sources = new LinkedHashSet<>();
 
 	private Class<?> mainApplicationClass;
 
@@ -248,7 +248,7 @@ public class SpringApplication {
 
 	private Map<String, Object> defaultProperties;
 
-	private Set<String> additionalProfiles = new HashSet<String>();
+	private Set<String> additionalProfiles = new HashSet<>();
 
 	/**
 	 * Create a new {@link SpringApplication} instance. The application context will load
@@ -431,7 +431,7 @@ public class SpringApplication {
 			Class<?>[] parameterTypes, Object... args) {
 		ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
 		// Use names and ensure unique to protect against duplicates
-		Set<String> names = new LinkedHashSet<String>(
+		Set<String> names = new LinkedHashSet<>(
 				SpringFactoriesLoader.loadFactoryNames(type, classLoader));
 		List<T> instances = createSpringFactoriesInstances(type, parameterTypes,
 				classLoader, args, names);
@@ -443,7 +443,7 @@ public class SpringApplication {
 	private <T> List<T> createSpringFactoriesInstances(Class<T> type,
 			Class<?>[] parameterTypes, ClassLoader classLoader, Object[] args,
 			Set<String> names) {
-		List<T> instances = new ArrayList<T>(names.size());
+		List<T> instances = new ArrayList<>(names.size());
 		for (String name : names) {
 			try {
 				Class<?> instanceClass = ClassUtils.forName(name, classLoader);
@@ -513,7 +513,7 @@ public class SpringApplication {
 	}
 
 	private void removeAllPropertySources(MutablePropertySources propertySources) {
-		Set<String> names = new HashSet<String>();
+		Set<String> names = new HashSet<>();
 		for (PropertySource<?> propertySource : propertySources) {
 			names.add(propertySource.getName());
 		}
@@ -564,7 +564,7 @@ public class SpringApplication {
 	protected void configureProfiles(ConfigurableEnvironment environment, String[] args) {
 		environment.getActiveProfiles(); // ensure they are initialized
 		// But these ones should go first (last wins in a property key clash)
-		Set<String> profiles = new LinkedHashSet<String>(this.additionalProfiles);
+		Set<String> profiles = new LinkedHashSet<>(this.additionalProfiles);
 		profiles.addAll(Arrays.asList(environment.getActiveProfiles()));
 		environment.setActiveProfiles(profiles.toArray(new String[profiles.size()]));
 	}
@@ -625,14 +625,14 @@ public class SpringApplication {
 		if (contextClass == null) {
 			try {
 				switch (this.webApplicationType) {
-					case SERVLET:
-						contextClass = Class.forName(DEFAULT_WEB_CONTEXT_CLASS);
-						break;
-					case REACTIVE:
-						contextClass = Class.forName(DEFAULT_REACTIVE_WEB_CONTEXT_CLASS);
-						break;
-					default:
-						contextClass = Class.forName(DEFAULT_CONTEXT_CLASS);
+				case SERVLET:
+					contextClass = Class.forName(DEFAULT_WEB_CONTEXT_CLASS);
+					break;
+				case REACTIVE:
+					contextClass = Class.forName(DEFAULT_REACTIVE_WEB_CONTEXT_CLASS);
+					break;
+				default:
+					contextClass = Class.forName(DEFAULT_CONTEXT_CLASS);
 				}
 			}
 			catch (ClassNotFoundException ex) {
@@ -820,11 +820,11 @@ public class SpringApplication {
 	}
 
 	private void callRunners(ApplicationContext context, ApplicationArguments args) {
-		List<Object> runners = new ArrayList<Object>();
+		List<Object> runners = new ArrayList<>();
 		runners.addAll(context.getBeansOfType(ApplicationRunner.class).values());
 		runners.addAll(context.getBeansOfType(CommandLineRunner.class).values());
 		AnnotationAwareOrderComparator.sort(runners);
-		for (Object runner : new LinkedHashSet<Object>(runners)) {
+		for (Object runner : new LinkedHashSet<>(runners)) {
 			if (runner instanceof ApplicationRunner) {
 				callRunner((ApplicationRunner) runner, args);
 			}
@@ -1090,7 +1090,7 @@ public class SpringApplication {
 	 * @param defaultProperties some {@link Properties}
 	 */
 	public void setDefaultProperties(Properties defaultProperties) {
-		this.defaultProperties = new HashMap<String, Object>();
+		this.defaultProperties = new HashMap<>();
 		for (Object key : Collections.list(defaultProperties.propertyNames())) {
 			this.defaultProperties.put((String) key, defaultProperties.get(key));
 		}
@@ -1102,7 +1102,7 @@ public class SpringApplication {
 	 * @param profiles the additional profiles to set
 	 */
 	public void setAdditionalProfiles(String... profiles) {
-		this.additionalProfiles = new LinkedHashSet<String>(Arrays.asList(profiles));
+		this.additionalProfiles = new LinkedHashSet<>(Arrays.asList(profiles));
 	}
 
 	/**
@@ -1187,7 +1187,7 @@ public class SpringApplication {
 	 */
 	public void setInitializers(
 			Collection<? extends ApplicationContextInitializer<?>> initializers) {
-		this.initializers = new ArrayList<ApplicationContextInitializer<?>>();
+		this.initializers = new ArrayList<>();
 		this.initializers.addAll(initializers);
 	}
 
@@ -1215,7 +1215,7 @@ public class SpringApplication {
 	 * @param listeners the listeners to set
 	 */
 	public void setListeners(Collection<? extends ApplicationListener<?>> listeners) {
-		this.listeners = new ArrayList<ApplicationListener<?>>();
+		this.listeners = new ArrayList<>();
 		this.listeners.addAll(listeners);
 	}
 
@@ -1322,10 +1322,10 @@ public class SpringApplication {
 	}
 
 	private static <E> Set<E> asUnmodifiableOrderedSet(Collection<E> elements) {
-		List<E> list = new ArrayList<E>();
+		List<E> list = new ArrayList<>();
 		list.addAll(elements);
 		Collections.sort(list, AnnotationAwareOrderComparator.INSTANCE);
-		return new LinkedHashSet<E>(list);
+		return new LinkedHashSet<>(list);
 	}
 
 }
diff --git a/spring-boot/src/main/java/org/springframework/boot/SpringApplicationBannerPrinter.java b/spring-boot/src/main/java/org/springframework/boot/SpringApplicationBannerPrinter.java
index cea4d5f314..2a82056210 100644
--- a/spring-boot/src/main/java/org/springframework/boot/SpringApplicationBannerPrinter.java
+++ b/spring-boot/src/main/java/org/springframework/boot/SpringApplicationBannerPrinter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -123,7 +123,7 @@ class SpringApplicationBannerPrinter {
 	 */
 	private static class Banners implements Banner {
 
-		private final List<Banner> banners = new ArrayList<Banner>();
+		private final List<Banner> banners = new ArrayList<>();
 
 		public void addIfNotNull(Banner banner) {
 			if (banner != null) {
diff --git a/spring-boot/src/main/java/org/springframework/boot/SpringApplicationRunListeners.java b/spring-boot/src/main/java/org/springframework/boot/SpringApplicationRunListeners.java
index f6fc9e7179..c744059479 100644
--- a/spring-boot/src/main/java/org/springframework/boot/SpringApplicationRunListeners.java
+++ b/spring-boot/src/main/java/org/springframework/boot/SpringApplicationRunListeners.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -40,7 +40,7 @@ class SpringApplicationRunListeners {
 	SpringApplicationRunListeners(Log log,
 			Collection<? extends SpringApplicationRunListener> listeners) {
 		this.log = log;
-		this.listeners = new ArrayList<SpringApplicationRunListener>(listeners);
+		this.listeners = new ArrayList<>(listeners);
 	}
 
 	public void starting() {
diff --git a/spring-boot/src/main/java/org/springframework/boot/SpringBootExceptionHandler.java b/spring-boot/src/main/java/org/springframework/boot/SpringBootExceptionHandler.java
index af7948b24c..c0172547a4 100644
--- a/spring-boot/src/main/java/org/springframework/boot/SpringBootExceptionHandler.java
+++ b/spring-boot/src/main/java/org/springframework/boot/SpringBootExceptionHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -35,7 +35,7 @@ class SpringBootExceptionHandler implements UncaughtExceptionHandler {
 	private static Set<String> LOG_CONFIGURATION_MESSAGES;
 
 	static {
-		Set<String> messages = new HashSet<String>();
+		Set<String> messages = new HashSet<>();
 		messages.add("Logback configuration error detected");
 		LOG_CONFIGURATION_MESSAGES = Collections.unmodifiableSet(messages);
 	}
@@ -44,7 +44,7 @@ class SpringBootExceptionHandler implements UncaughtExceptionHandler {
 
 	private final UncaughtExceptionHandler parent;
 
-	private final List<Throwable> loggedExceptions = new ArrayList<Throwable>();
+	private final List<Throwable> loggedExceptions = new ArrayList<>();
 
 	private int exitCode = 0;
 
diff --git a/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiColors.java b/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiColors.java
index 7a562a5503..b7dabb3917 100644
--- a/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiColors.java
+++ b/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiColors.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -39,7 +39,7 @@ public final class AnsiColors {
 	private static final Map<AnsiColor, LabColor> ANSI_COLOR_MAP;
 
 	static {
-		Map<AnsiColor, LabColor> colorMap = new LinkedHashMap<AnsiColor, LabColor>();
+		Map<AnsiColor, LabColor> colorMap = new LinkedHashMap<>();
 		colorMap.put(AnsiColor.BLACK, new LabColor(0x000000));
 		colorMap.put(AnsiColor.RED, new LabColor(0xAA0000));
 		colorMap.put(AnsiColor.GREEN, new LabColor(0x00AA00));
diff --git a/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiPropertySource.java b/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiPropertySource.java
index efefd4a4e5..baa0c6ae2f 100644
--- a/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiPropertySource.java
+++ b/spring-boot/src/main/java/org/springframework/boot/ansi/AnsiPropertySource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -41,14 +41,13 @@ public class AnsiPropertySource extends PropertySource<AnsiElement> {
 	private static final Iterable<MappedEnum<?>> MAPPED_ENUMS;
 
 	static {
-		List<MappedEnum<?>> enums = new ArrayList<MappedEnum<?>>();
-		enums.add(new MappedEnum<AnsiStyle>("AnsiStyle.", AnsiStyle.class));
-		enums.add(new MappedEnum<AnsiColor>("AnsiColor.", AnsiColor.class));
-		enums.add(
-				new MappedEnum<AnsiBackground>("AnsiBackground.", AnsiBackground.class));
-		enums.add(new MappedEnum<AnsiStyle>("Ansi.", AnsiStyle.class));
-		enums.add(new MappedEnum<AnsiColor>("Ansi.", AnsiColor.class));
-		enums.add(new MappedEnum<AnsiBackground>("Ansi.BG_", AnsiBackground.class));
+		List<MappedEnum<?>> enums = new ArrayList<>();
+		enums.add(new MappedEnum<>("AnsiStyle.", AnsiStyle.class));
+		enums.add(new MappedEnum<>("AnsiColor.", AnsiColor.class));
+		enums.add(new MappedEnum<>("AnsiBackground.", AnsiBackground.class));
+		enums.add(new MappedEnum<>("Ansi.", AnsiStyle.class));
+		enums.add(new MappedEnum<>("Ansi.", AnsiColor.class));
+		enums.add(new MappedEnum<>("Ansi.BG_", AnsiBackground.class));
 		MAPPED_ENUMS = Collections.unmodifiableList(enums);
 	}
 
diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/DefaultPropertyNamePatternsMatcher.java b/spring-boot/src/main/java/org/springframework/boot/bind/DefaultPropertyNamePatternsMatcher.java
index 859d57be0c..58b80d2f93 100644
--- a/spring-boot/src/main/java/org/springframework/boot/bind/DefaultPropertyNamePatternsMatcher.java
+++ b/spring-boot/src/main/java/org/springframework/boot/bind/DefaultPropertyNamePatternsMatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -42,7 +42,7 @@ class DefaultPropertyNamePatternsMatcher implements PropertyNamePatternsMatcher
 
 	protected DefaultPropertyNamePatternsMatcher(char[] delimiters, boolean ignoreCase,
 			String... names) {
-		this(delimiters, ignoreCase, new HashSet<String>(Arrays.asList(names)));
+		this(delimiters, ignoreCase, new HashSet<>(Arrays.asList(names)));
 	}
 
 	DefaultPropertyNamePatternsMatcher(char[] delimiters, boolean ignoreCase,
diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java b/spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java
index 3b266f4b28..be8fd600d8 100644
--- a/spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java
+++ b/spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java
@@ -258,7 +258,7 @@ public class PropertiesConfigurationFactory<T>
 	}
 
 	private Set<String> getNames(Iterable<String> prefixes) {
-		Set<String> names = new LinkedHashSet<String>();
+		Set<String> names = new LinkedHashSet<>();
 		if (this.target != null) {
 			PropertyDescriptor[] descriptors = BeanUtils
 					.getPropertyDescriptors(this.target.getClass());
@@ -304,7 +304,7 @@ public class PropertiesConfigurationFactory<T>
 			// We can filter properties to those starting with the target name, but
 			// we can't do a complete filter since we need to trigger the
 			// unknown fields check
-			Set<String> relaxedNames = new HashSet<String>();
+			Set<String> relaxedNames = new HashSet<>();
 			for (String relaxedTargetName : relaxedTargetNames) {
 				relaxedNames.add(relaxedTargetName);
 			}
diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourceUtils.java b/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourceUtils.java
index e7449add66..fb30e91d90 100644
--- a/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourceUtils.java
+++ b/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourceUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -59,7 +59,7 @@ public abstract class PropertySourceUtils {
 	public static Map<String, Object> getSubProperties(PropertySources propertySources,
 			String rootPrefix, String keyPrefix) {
 		RelaxedNames keyPrefixes = new RelaxedNames(keyPrefix);
-		Map<String, Object> subProperties = new LinkedHashMap<String, Object>();
+		Map<String, Object> subProperties = new LinkedHashMap<>();
 		for (PropertySource<?> source : propertySources) {
 			if (source instanceof EnumerablePropertySource) {
 				for (String name : ((EnumerablePropertySource<?>) source)
diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourcesBinder.java b/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourcesBinder.java
index c23bbd248d..8e59e80ea9 100644
--- a/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourcesBinder.java
+++ b/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourcesBinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -88,7 +88,7 @@ public class PropertySourcesBinder {
 	 * @return the keys matching the prefix
 	 */
 	public Map<String, Object> extractAll(String prefix) {
-		Map<String, Object> content = new LinkedHashMap<String, Object>();
+		Map<String, Object> content = new LinkedHashMap<>();
 		bindTo(prefix, content);
 		return content;
 	}
@@ -101,7 +101,7 @@ public class PropertySourcesBinder {
 	 * @param target the object to bind to
 	 */
 	public void bindTo(String prefix, Object target) {
-		PropertiesConfigurationFactory<Object> factory = new PropertiesConfigurationFactory<Object>(
+		PropertiesConfigurationFactory<Object> factory = new PropertiesConfigurationFactory<>(
 				target);
 		if (StringUtils.hasText(prefix)) {
 			factory.setTargetName(prefix);
diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourcesPropertyValues.java b/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourcesPropertyValues.java
index 710197bedf..ce0b73cab5 100644
--- a/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourcesPropertyValues.java
+++ b/spring-boot/src/main/java/org/springframework/boot/bind/PropertySourcesPropertyValues.java
@@ -52,9 +52,9 @@ public class PropertySourcesPropertyValues implements PropertyValues {
 
 	private final PropertyNamePatternsMatcher includes;
 
-	private final Map<String, PropertyValue> propertyValues = new LinkedHashMap<String, PropertyValue>();
+	private final Map<String, PropertyValue> propertyValues = new LinkedHashMap<>();
 
-	private final ConcurrentHashMap<String, PropertySource<?>> collectionOwners = new ConcurrentHashMap<String, PropertySource<?>>();
+	private final ConcurrentHashMap<String, PropertySource<?>> collectionOwners = new ConcurrentHashMap<>();
 
 	private final boolean resolvePlaceholders;
 
diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedDataBinder.java b/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedDataBinder.java
index fc1ca4133a..48fe904bbc 100644
--- a/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedDataBinder.java
+++ b/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedDataBinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -64,7 +64,7 @@ public class RelaxedDataBinder extends DataBinder {
 
 	private boolean ignoreNestedProperties;
 
-	private MultiValueMap<String, String> nameAliases = new LinkedMultiValueMap<String, String>();
+	private MultiValueMap<String, String> nameAliases = new LinkedMultiValueMap<>();
 
 	/**
 	 * Create a new {@link RelaxedDataBinder} instance.
@@ -107,7 +107,7 @@ public class RelaxedDataBinder extends DataBinder {
 	 * @param aliases a map of property name to aliases
 	 */
 	public void setNameAliases(Map<String, List<String>> aliases) {
-		this.nameAliases = new LinkedMultiValueMap<String, String>(aliases);
+		this.nameAliases = new LinkedMultiValueMap<>(aliases);
 	}
 
 	/**
@@ -147,8 +147,8 @@ public class RelaxedDataBinder extends DataBinder {
 		wrapper.setConversionService(
 				new RelaxedConversionService(getConversionService()));
 		wrapper.setAutoGrowNestedPaths(true);
-		List<PropertyValue> sortedValues = new ArrayList<PropertyValue>();
-		Set<String> modifiedNames = new HashSet<String>();
+		List<PropertyValue> sortedValues = new ArrayList<>();
+		Set<String> modifiedNames = new HashSet<>();
 		List<String> sortedNames = getSortedPropertyNames(propertyValues);
 		for (String name : sortedNames) {
 			PropertyValue propertyValue = propertyValues.getPropertyValue(name);
@@ -161,7 +161,7 @@ public class RelaxedDataBinder extends DataBinder {
 	}
 
 	private List<String> getSortedPropertyNames(MutablePropertyValues propertyValues) {
-		List<String> names = new LinkedList<String>();
+		List<String> names = new LinkedList<>();
 		for (PropertyValue propertyValue : propertyValues.getPropertyValueList()) {
 			names.add(propertyValue.getName());
 		}
@@ -178,7 +178,7 @@ public class RelaxedDataBinder extends DataBinder {
 	 * @param names the names to sort
 	 */
 	private void sortPropertyNames(List<String> names) {
-		for (String name : new ArrayList<String>(names)) {
+		for (String name : new ArrayList<>(names)) {
 			int propertyIndex = names.indexOf(name);
 			BeanPath path = new BeanPath(name);
 			for (String prefix : path.prefixes()) {
@@ -343,7 +343,7 @@ public class RelaxedDataBinder extends DataBinder {
 		}
 		Object extend = new LinkedHashMap<String, Object>();
 		if (!elementDescriptor.isMap() && path.isArrayIndex(index)) {
-			extend = new ArrayList<Object>();
+			extend = new ArrayList<>();
 		}
 		wrapper.setPropertyValue(path.prefix(index + 1), extend);
 	}
@@ -372,7 +372,7 @@ public class RelaxedDataBinder extends DataBinder {
 		}
 		Object extend = new LinkedHashMap<String, Object>();
 		if (descriptor.isCollection()) {
-			extend = new ArrayList<Object>();
+			extend = new ArrayList<>();
 		}
 		if (descriptor.getType().equals(Object.class) && path.isLastNode(index)) {
 			extend = BLANK;
@@ -438,7 +438,7 @@ public class RelaxedDataBinder extends DataBinder {
 		if (aliases == null) {
 			return Collections.singleton(name);
 		}
-		List<String> nameAndAliases = new ArrayList<String>(aliases.size() + 1);
+		List<String> nameAndAliases = new ArrayList<>(aliases.size() + 1);
 		nameAndAliases.add(name);
 		nameAndAliases.addAll(aliases);
 		return nameAndAliases;
@@ -486,7 +486,7 @@ public class RelaxedDataBinder extends DataBinder {
 		}
 
 		public List<String> prefixes() {
-			List<String> prefixes = new ArrayList<String>();
+			List<String> prefixes = new ArrayList<>();
 			for (int index = 1; index < this.nodes.size(); index++) {
 				prefixes.add(prefix(index));
 			}
@@ -498,7 +498,7 @@ public class RelaxedDataBinder extends DataBinder {
 		}
 
 		private List<PathNode> splitPath(String path) {
-			List<PathNode> nodes = new ArrayList<PathNode>();
+			List<PathNode> nodes = new ArrayList<>();
 			String current = extractIndexedPaths(path, nodes);
 			for (String name : StringUtils.delimitedListToStringArray(current, ".")) {
 				if (StringUtils.hasText(name)) {
@@ -532,7 +532,7 @@ public class RelaxedDataBinder extends DataBinder {
 		}
 
 		public void collapseKeys(int index) {
-			List<PathNode> revised = new ArrayList<PathNode>();
+			List<PathNode> revised = new ArrayList<>();
 			for (int i = 0; i < index; i++) {
 				revised.add(this.nodes.get(i));
 			}
@@ -683,7 +683,7 @@ public class RelaxedDataBinder extends DataBinder {
 		private static final Set<String> BENIGN_PROPERTY_SOURCE_NAMES;
 
 		static {
-			Set<String> names = new HashSet<String>();
+			Set<String> names = new HashSet<>();
 			names.add(StandardEnvironment.SYSTEM_ENVIRONMENT_PROPERTY_SOURCE_NAME);
 			names.add(StandardEnvironment.SYSTEM_PROPERTIES_PROPERTY_SOURCE_NAME);
 			BENIGN_PROPERTY_SOURCE_NAMES = Collections.unmodifiableSet(names);
diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedNames.java b/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedNames.java
index 07f793c5b8..bd77de3900 100644
--- a/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedNames.java
+++ b/spring-boot/src/main/java/org/springframework/boot/bind/RelaxedNames.java
@@ -41,7 +41,7 @@ public final class RelaxedNames implements Iterable<String> {
 
 	private final String name;
 
-	private final Set<String> values = new LinkedHashSet<String>();
+	private final Set<String> values = new LinkedHashSet<>();
 
 	/**
 	 * Create a new {@link RelaxedNames} instance.
diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/YamlConfigurationFactory.java b/spring-boot/src/main/java/org/springframework/boot/bind/YamlConfigurationFactory.java
index fc27b860db..63fdf39b5e 100644
--- a/spring-boot/src/main/java/org/springframework/boot/bind/YamlConfigurationFactory.java
+++ b/spring-boot/src/main/java/org/springframework/boot/bind/YamlConfigurationFactory.java
@@ -91,8 +91,7 @@ public class YamlConfigurationFactory<T>
 	 * @param propertyAliases the property aliases
 	 */
 	public void setPropertyAliases(Map<Class<?>, Map<String, String>> propertyAliases) {
-		this.propertyAliases = new HashMap<Class<?>, Map<String, String>>(
-				propertyAliases);
+		this.propertyAliases = new HashMap<>(propertyAliases);
 	}
 
 	/**
diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/YamlJavaBeanPropertyConstructor.java b/spring-boot/src/main/java/org/springframework/boot/bind/YamlJavaBeanPropertyConstructor.java
index dabd103dd7..6d0688342d 100644
--- a/spring-boot/src/main/java/org/springframework/boot/bind/YamlJavaBeanPropertyConstructor.java
+++ b/spring-boot/src/main/java/org/springframework/boot/bind/YamlJavaBeanPropertyConstructor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -33,7 +33,7 @@ import org.yaml.snakeyaml.nodes.NodeId;
  */
 public class YamlJavaBeanPropertyConstructor extends Constructor {
 
-	private final Map<Class<?>, Map<String, Property>> properties = new HashMap<Class<?>, Map<String, Property>>();
+	private final Map<Class<?>, Map<String, Property>> properties = new HashMap<>();
 
 	private final PropertyUtils propertyUtils = new PropertyUtils();
 
@@ -66,7 +66,7 @@ public class YamlJavaBeanPropertyConstructor extends Constructor {
 	protected final void addPropertyAlias(String alias, Class<?> type, String name) {
 		Map<String, Property> typeMap = this.properties.get(type);
 		if (typeMap == null) {
-			typeMap = new HashMap<String, Property>();
+			typeMap = new HashMap<>();
 			this.properties.put(type, typeMap);
 		}
 		try {
diff --git a/spring-boot/src/main/java/org/springframework/boot/builder/ParentContextCloserApplicationListener.java b/spring-boot/src/main/java/org/springframework/boot/builder/ParentContextCloserApplicationListener.java
index 0872aee2e7..ad95daa3c3 100644
--- a/spring-boot/src/main/java/org/springframework/boot/builder/ParentContextCloserApplicationListener.java
+++ b/spring-boot/src/main/java/org/springframework/boot/builder/ParentContextCloserApplicationListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -89,8 +89,7 @@ public class ParentContextCloserApplicationListener
 		private WeakReference<ConfigurableApplicationContext> childContext;
 
 		public ContextCloserListener(ConfigurableApplicationContext childContext) {
-			this.childContext = new WeakReference<ConfigurableApplicationContext>(
-					childContext);
+			this.childContext = new WeakReference<>(childContext);
 		}
 
 		@Override
diff --git a/spring-boot/src/main/java/org/springframework/boot/builder/SpringApplicationBuilder.java b/spring-boot/src/main/java/org/springframework/boot/builder/SpringApplicationBuilder.java
index 34b8b8506a..bc189681c4 100644
--- a/spring-boot/src/main/java/org/springframework/boot/builder/SpringApplicationBuilder.java
+++ b/spring-boot/src/main/java/org/springframework/boot/builder/SpringApplicationBuilder.java
@@ -72,13 +72,13 @@ public class SpringApplicationBuilder {
 
 	private final AtomicBoolean running = new AtomicBoolean(false);
 
-	private final Set<Object> sources = new LinkedHashSet<Object>();
+	private final Set<Object> sources = new LinkedHashSet<>();
 
-	private final Map<String, Object> defaultProperties = new LinkedHashMap<String, Object>();
+	private final Map<String, Object> defaultProperties = new LinkedHashMap<>();
 
 	private ConfigurableEnvironment environment;
 
-	private Set<String> additionalProfiles = new LinkedHashSet<String>();
+	private Set<String> additionalProfiles = new LinkedHashSet<>();
 
 	private boolean registerShutdownHookApplied;
 
@@ -278,7 +278,7 @@ public class SpringApplicationBuilder {
 	 * @return the current builder
 	 */
 	public SpringApplicationBuilder sources(Object... sources) {
-		this.sources.addAll(new LinkedHashSet<Object>(Arrays.asList(sources)));
+		this.sources.addAll(new LinkedHashSet<>(Arrays.asList(sources)));
 		return this;
 	}
 
@@ -398,7 +398,7 @@ public class SpringApplicationBuilder {
 	}
 
 	private Map<String, Object> getMapFromKeyValuePairs(String[] properties) {
-		Map<String, Object> map = new HashMap<String, Object>();
+		Map<String, Object> map = new HashMap<>();
 		for (String property : properties) {
 			int index = lowestIndexOf(property, ":", "=");
 			String key = property.substring(0, index > 0 ? index : property.length());
@@ -430,7 +430,7 @@ public class SpringApplicationBuilder {
 	}
 
 	private Map<String, Object> getMapFromProperties(Properties properties) {
-		HashMap<String, Object> map = new HashMap<String, Object>();
+		HashMap<String, Object> map = new HashMap<>();
 		for (Object key : Collections.list(properties.propertyNames())) {
 			map.put((String) key, properties.get(key));
 		}
@@ -468,7 +468,7 @@ public class SpringApplicationBuilder {
 
 	private SpringApplicationBuilder additionalProfiles(
 			Collection<String> additionalProfiles) {
-		this.additionalProfiles = new LinkedHashSet<String>(additionalProfiles);
+		this.additionalProfiles = new LinkedHashSet<>(additionalProfiles);
 		this.application.setAdditionalProfiles(this.additionalProfiles
 				.toArray(new String[this.additionalProfiles.size()]));
 		return this;
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/ConfigurationWarningsApplicationContextInitializer.java b/spring-boot/src/main/java/org/springframework/boot/context/ConfigurationWarningsApplicationContextInitializer.java
index 73ba57fbb4..ecacf8b246 100755
--- a/spring-boot/src/main/java/org/springframework/boot/context/ConfigurationWarningsApplicationContextInitializer.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/ConfigurationWarningsApplicationContextInitializer.java
@@ -134,7 +134,7 @@ public class ConfigurationWarningsApplicationContextInitializer
 		private static final Set<String> PROBLEM_PACKAGES;
 
 		static {
-			Set<String> packages = new HashSet<String>();
+			Set<String> packages = new HashSet<>();
 			packages.add("org.springframework");
 			packages.add("org");
 			PROBLEM_PACKAGES = Collections.unmodifiableSet(packages);
@@ -155,7 +155,7 @@ public class ConfigurationWarningsApplicationContextInitializer
 
 		protected Set<String> getComponentScanningPackages(
 				BeanDefinitionRegistry registry) {
-			Set<String> packages = new LinkedHashSet<String>();
+			Set<String> packages = new LinkedHashSet<>();
 			String[] names = registry.getBeanDefinitionNames();
 			for (String name : names) {
 				BeanDefinition definition = registry.getBeanDefinition(name);
@@ -197,7 +197,7 @@ public class ConfigurationWarningsApplicationContextInitializer
 		}
 
 		private List<String> getProblematicPackages(Set<String> scannedPackages) {
-			List<String> problematicPackages = new ArrayList<String>();
+			List<String> problematicPackages = new ArrayList<>();
 			for (String scannedPackage : scannedPackages) {
 				if (isProblematicPackage(scannedPackage)) {
 					problematicPackages.add(getDisplayName(scannedPackage));
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/GenericReactiveWebApplicationContext.java b/spring-boot/src/main/java/org/springframework/boot/context/GenericReactiveWebApplicationContext.java
index 52f5b44cbc..8b06e4971b 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/GenericReactiveWebApplicationContext.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/GenericReactiveWebApplicationContext.java
@@ -25,9 +25,8 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext
  * @author Stephane Nicoll
  * @since 2.0.0
  */
-public class GenericReactiveWebApplicationContext
-		extends AnnotationConfigApplicationContext
-		implements ReactiveWebApplicationContext {
+public class GenericReactiveWebApplicationContext extends
+		AnnotationConfigApplicationContext implements ReactiveWebApplicationContext {
 
 	public GenericReactiveWebApplicationContext() {
 		super();
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java b/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java
index cac0167225..f55e4c473b 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java
@@ -301,7 +301,7 @@ public class ConfigFileApplicationListener implements EnvironmentPostProcessor,
 			this.propertiesLoader = new PropertySourcesLoader();
 			this.activatedProfiles = false;
 			this.profiles = Collections.asLifoQueue(new LinkedList<Profile>());
-			this.processedProfiles = new LinkedList<Profile>();
+			this.processedProfiles = new LinkedList<>();
 
 			// Pre-existing active profiles set via Environment.setActiveProfiles()
 			// are additional profiles and config files are allowed to add more if
@@ -351,7 +351,7 @@ public class ConfigFileApplicationListener implements EnvironmentPostProcessor,
 			// properties) take precedence over those added in config files.
 			SpringProfiles springProfiles = bindSpringProfiles(
 					this.environment.getPropertySources());
-			Set<Profile> activeProfiles = new LinkedHashSet<Profile>(
+			Set<Profile> activeProfiles = new LinkedHashSet<>(
 					springProfiles.getActiveProfiles());
 			activeProfiles.addAll(springProfiles.getIncludeProfiles());
 			maybeActivateProfiles(activeProfiles);
@@ -372,7 +372,7 @@ public class ConfigFileApplicationListener implements EnvironmentPostProcessor,
 		 */
 		private List<Profile> getUnprocessedActiveProfiles(
 				Set<Profile> initialActiveProfiles) {
-			List<Profile> unprocessedActiveProfiles = new ArrayList<Profile>();
+			List<Profile> unprocessedActiveProfiles = new ArrayList<>();
 			for (String profileName : this.environment.getActiveProfiles()) {
 				Profile profile = new Profile(profileName);
 				if (!initialActiveProfiles.contains(profile)) {
@@ -490,7 +490,7 @@ public class ConfigFileApplicationListener implements EnvironmentPostProcessor,
 		}
 
 		private List<String> resolvePlaceholders(List<String> values) {
-			List<String> resolved = new ArrayList<String>();
+			List<String> resolved = new ArrayList<>();
 			for (String value : values) {
 				resolved.add(this.environment.resolvePlaceholders(value));
 			}
@@ -545,7 +545,7 @@ public class ConfigFileApplicationListener implements EnvironmentPostProcessor,
 
 		private void prependProfile(ConfigurableEnvironment environment,
 				Profile profile) {
-			Set<String> profiles = new LinkedHashSet<String>();
+			Set<String> profiles = new LinkedHashSet<>();
 			environment.getActiveProfiles(); // ensure they are initialized
 			// But this one should go first (last wins in a property key clash)
 			profiles.add(profile.getName());
@@ -554,7 +554,7 @@ public class ConfigFileApplicationListener implements EnvironmentPostProcessor,
 		}
 
 		private Set<String> getSearchLocations() {
-			Set<String> locations = new LinkedHashSet<String>();
+			Set<String> locations = new LinkedHashSet<>();
 			// User-configured settings take precedence, so we do them first
 			if (this.environment.containsProperty(CONFIG_LOCATION_PROPERTY)) {
 				for (String path : asResolvedSet(
@@ -587,11 +587,11 @@ public class ConfigFileApplicationListener implements EnvironmentPostProcessor,
 					StringUtils.commaDelimitedListToStringArray(value != null
 							? this.environment.resolvePlaceholders(value) : fallback)));
 			Collections.reverse(list);
-			return new LinkedHashSet<String>(list);
+			return new LinkedHashSet<>(list);
 		}
 
 		private void addConfigurationProperties(MutablePropertySources sources) {
-			List<PropertySource<?>> reorderedSources = new ArrayList<PropertySource<?>>();
+			List<PropertySource<?>> reorderedSources = new ArrayList<>();
 			for (PropertySource<?> item : sources) {
 				reorderedSources.add(item);
 			}
@@ -674,7 +674,7 @@ public class ConfigFileApplicationListener implements EnvironmentPostProcessor,
 		ConfigurationPropertySources(Collection<PropertySource<?>> sources) {
 			super(APPLICATION_CONFIGURATION_PROPERTY_SOURCE_NAME, sources);
 			this.sources = sources;
-			List<String> names = new ArrayList<String>();
+			List<String> names = new ArrayList<>();
 			for (PropertySource<?> source : sources) {
 				if (source instanceof EnumerablePropertySource) {
 					names.addAll(Arrays.asList(
@@ -728,9 +728,9 @@ public class ConfigFileApplicationListener implements EnvironmentPostProcessor,
 	 */
 	static final class SpringProfiles {
 
-		private List<String> active = new ArrayList<String>();
+		private List<String> active = new ArrayList<>();
 
-		private List<String> include = new ArrayList<String>();
+		private List<String> include = new ArrayList<>();
 
 		public List<String> getActive() {
 			return this.active;
@@ -757,12 +757,12 @@ public class ConfigFileApplicationListener implements EnvironmentPostProcessor,
 		}
 
 		private Set<Profile> asProfileSet(List<String> profileNames) {
-			List<Profile> profiles = new ArrayList<Profile>();
+			List<Profile> profiles = new ArrayList<>();
 			for (String profileName : profileNames) {
 				profiles.add(new Profile(profileName));
 			}
 			Collections.reverse(profiles);
-			return new LinkedHashSet<Profile>(profiles);
+			return new LinkedHashSet<>(profiles);
 		}
 
 	}
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/config/DelegatingApplicationContextInitializer.java b/spring-boot/src/main/java/org/springframework/boot/context/config/DelegatingApplicationContextInitializer.java
index 8a845b487a..5d2fa55ad0 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/config/DelegatingApplicationContextInitializer.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/config/DelegatingApplicationContextInitializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2013 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -59,7 +59,7 @@ public class DelegatingApplicationContextInitializer implements
 
 	private List<Class<?>> getInitializerClasses(ConfigurableEnvironment env) {
 		String classNames = env.getProperty(PROPERTY_NAME);
-		List<Class<?>> classes = new ArrayList<Class<?>>();
+		List<Class<?>> classes = new ArrayList<>();
 		if (StringUtils.hasLength(classNames)) {
 			for (String className : StringUtils.tokenizeToStringArray(classNames, ",")) {
 				classes.add(getInitializerClass(className));
@@ -84,7 +84,7 @@ public class DelegatingApplicationContextInitializer implements
 	private void applyInitializerClasses(ConfigurableApplicationContext context,
 			List<Class<?>> initializerClasses) {
 		Class<?> contextClass = context.getClass();
-		List<ApplicationContextInitializer<?>> initializers = new ArrayList<ApplicationContextInitializer<?>>();
+		List<ApplicationContextInitializer<?>> initializers = new ArrayList<>();
 		for (Class<?> initializerClass : initializerClasses) {
 			initializers.add(instantiateInitializer(contextClass, initializerClass));
 		}
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/config/DelegatingApplicationListener.java b/spring-boot/src/main/java/org/springframework/boot/context/config/DelegatingApplicationListener.java
index 08264ba694..bfa1f7ed4a 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/config/DelegatingApplicationListener.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/config/DelegatingApplicationListener.java
@@ -76,7 +76,7 @@ public class DelegatingApplicationListener
 			return Collections.emptyList();
 		}
 		String classNames = environment.getProperty(PROPERTY_NAME);
-		List<ApplicationListener<ApplicationEvent>> listeners = new ArrayList<ApplicationListener<ApplicationEvent>>();
+		List<ApplicationListener<ApplicationEvent>> listeners = new ArrayList<>();
 		if (StringUtils.hasLength(classNames)) {
 			for (String className : StringUtils.commaDelimitedListToSet(classNames)) {
 				try {
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractConfigurableEmbeddedServletContainer.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractConfigurableEmbeddedServletContainer.java
index 1718460d0d..a6d32682f8 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractConfigurableEmbeddedServletContainer.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractConfigurableEmbeddedServletContainer.java
@@ -60,11 +60,11 @@ public abstract class AbstractConfigurableEmbeddedServletContainer
 
 	private int port = 8080;
 
-	private List<ServletContextInitializer> initializers = new ArrayList<ServletContextInitializer>();
+	private List<ServletContextInitializer> initializers = new ArrayList<>();
 
 	private File documentRoot;
 
-	private Set<ErrorPage> errorPages = new LinkedHashSet<ErrorPage>();
+	private Set<ErrorPage> errorPages = new LinkedHashSet<>();
 
 	private MimeMappings mimeMappings = new MimeMappings(MimeMappings.DEFAULT);
 
@@ -86,7 +86,7 @@ public abstract class AbstractConfigurableEmbeddedServletContainer
 
 	private String serverHeader;
 
-	private Map<Locale, Charset> localeCharsetMappings = new HashMap<Locale, Charset>();
+	private Map<Locale, Charset> localeCharsetMappings = new HashMap<>();
 
 	/**
 	 * Create a new {@link AbstractConfigurableEmbeddedServletContainer} instance.
@@ -219,7 +219,7 @@ public abstract class AbstractConfigurableEmbeddedServletContainer
 	@Override
 	public void setInitializers(List<? extends ServletContextInitializer> initializers) {
 		Assert.notNull(initializers, "Initializers must not be null");
-		this.initializers = new ArrayList<ServletContextInitializer>(initializers);
+		this.initializers = new ArrayList<>(initializers);
 	}
 
 	@Override
@@ -245,7 +245,7 @@ public abstract class AbstractConfigurableEmbeddedServletContainer
 	@Override
 	public void setErrorPages(Set<? extends ErrorPage> errorPages) {
 		Assert.notNull(errorPages, "ErrorPages must not be null");
-		this.errorPages = new LinkedHashSet<ErrorPage>(errorPages);
+		this.errorPages = new LinkedHashSet<>(errorPages);
 	}
 
 	@Override
@@ -357,7 +357,7 @@ public abstract class AbstractConfigurableEmbeddedServletContainer
 	 */
 	protected final ServletContextInitializer[] mergeInitializers(
 			ServletContextInitializer... initializers) {
-		List<ServletContextInitializer> mergedInitializers = new ArrayList<ServletContextInitializer>();
+		List<ServletContextInitializer> mergedInitializers = new ArrayList<>();
 		mergedInitializers.addAll(Arrays.asList(initializers));
 		mergedInitializers.addAll(this.initializers);
 		return mergedInitializers
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractConfigurableReactiveWebServer.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractConfigurableReactiveWebServer.java
index 20ce1af5d7..1dd9db0312 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractConfigurableReactiveWebServer.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractConfigurableReactiveWebServer.java
@@ -35,7 +35,7 @@ public class AbstractConfigurableReactiveWebServer
 
 	private int port = 8080;
 
-	private Set<ErrorPage> errorPages = new LinkedHashSet<ErrorPage>();
+	private Set<ErrorPage> errorPages = new LinkedHashSet<>();
 
 	private InetAddress address;
 
@@ -91,7 +91,7 @@ public class AbstractConfigurableReactiveWebServer
 	@Override
 	public void setErrorPages(Set<? extends ErrorPage> errorPages) {
 		Assert.notNull(errorPages, "ErrorPages must not be null");
-		this.errorPages = new LinkedHashSet<ErrorPage>(errorPages);
+		this.errorPages = new LinkedHashSet<>(errorPages);
 	}
 
 	@Override
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactory.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactory.java
index 5bb072cf42..87fa06faef 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactory.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactory.java
@@ -92,7 +92,7 @@ public abstract class AbstractEmbeddedServletContainerFactory
 
 	protected List<URL> getUrlsOfJarsWithMetaInfResources() {
 		ClassLoader classLoader = getClass().getClassLoader();
-		List<URL> staticResourceUrls = new ArrayList<URL>();
+		List<URL> staticResourceUrls = new ArrayList<>();
 		if (classLoader instanceof URLClassLoader) {
 			for (URL url : ((URLClassLoader) classLoader).getURLs()) {
 				try {
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedReactiveWebApplicationContext.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedReactiveWebApplicationContext.java
index 4c3be617be..a469bf0af5 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedReactiveWebApplicationContext.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedReactiveWebApplicationContext.java
@@ -23,8 +23,8 @@ import org.springframework.http.server.reactive.HttpHandler;
 import org.springframework.util.StringUtils;
 
 /**
- * A {@link GenericReactiveWebApplicationContext} that can be used to bootstrap
- * itself from a contained embedded web server factory bean.
+ * A {@link GenericReactiveWebApplicationContext} that can be used to bootstrap itself
+ * from a contained embedded web server factory bean.
  *
  * @author Brian Clozel
  * @since 2.0.0
@@ -60,7 +60,8 @@ public class EmbeddedReactiveWebApplicationContext
 			createEmbeddedServletContainer();
 		}
 		catch (Throwable ex) {
-			throw new ApplicationContextException("Unable to start reactive web server", ex);
+			throw new ApplicationContextException("Unable to start reactive web server",
+					ex);
 		}
 	}
 
@@ -90,9 +91,9 @@ public class EmbeddedReactiveWebApplicationContext
 	}
 
 	/**
-	 * Return the {@link ReactiveWebServerFactory} that should be used to create
-	 * the reactive web server. By default this method searches for a suitable bean
-	 * in the context itself.
+	 * Return the {@link ReactiveWebServerFactory} that should be used to create the
+	 * reactive web server. By default this method searches for a suitable bean in the
+	 * context itself.
 	 * @return a {@link ReactiveWebServerFactory} (never {@code null})
 	 */
 	protected ReactiveWebServerFactory getReactiveWebServerFactory() {
@@ -114,15 +115,13 @@ public class EmbeddedReactiveWebApplicationContext
 	}
 
 	/**
-	 * Return the {@link HttpHandler} that should be used to process
-	 * the reactive web server. By default this method searches for a suitable bean
-	 * in the context itself.
+	 * Return the {@link HttpHandler} that should be used to process the reactive web
+	 * server. By default this method searches for a suitable bean in the context itself.
 	 * @return a {@link HttpHandler} (never {@code null}
 	 */
 	protected HttpHandler getHttpHandler() {
 		// Use bean names so that we don't consider the hierarchy
-		String[] beanNames = getBeanFactory()
-				.getBeanNamesForType(HttpHandler.class);
+		String[] beanNames = getBeanFactory().getBeanNamesForType(HttpHandler.class);
 		if (beanNames.length == 0) {
 			throw new ApplicationContextException(
 					"Unable to start ReactiveWebApplicationContext due to missing HttpHandler bean.");
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java
index 329f4e3c0d..a897623dfd 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java
@@ -77,11 +77,8 @@ public class EmbeddedServletContainerCustomizerBeanPostProcessor
 	private Collection<EmbeddedServletContainerCustomizer> getCustomizers() {
 		if (this.customizers == null) {
 			// Look up does not include the parent context
-			this.customizers = new ArrayList<EmbeddedServletContainerCustomizer>(
-					this.beanFactory
-							.getBeansOfType(EmbeddedServletContainerCustomizer.class,
-									false, false)
-							.values());
+			this.customizers = new ArrayList<>(this.beanFactory.getBeansOfType(
+					EmbeddedServletContainerCustomizer.class, false, false).values());
 			Collections.sort(this.customizers, AnnotationAwareOrderComparator.INSTANCE);
 			this.customizers = Collections.unmodifiableList(this.customizers);
 		}
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedServletContainerFactory.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedServletContainerFactory.java
index a0095cb2ab..57ff7ee5d8 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedServletContainerFactory.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedServletContainerFactory.java
@@ -37,8 +37,8 @@ import org.springframework.boot.web.servlet.ServletContextInitializer;
 public interface EmbeddedServletContainerFactory {
 
 	/**
-	 * Gets a new fully configured but paused {@link EmbeddedWebServer} instance.
-	 * Clients should not be able to connect to the returned server until
+	 * Gets a new fully configured but paused {@link EmbeddedWebServer} instance. Clients
+	 * should not be able to connect to the returned server until
 	 * {@link EmbeddedWebServer#start()} is called (which happens when the
 	 * {@link ApplicationContext} has been fully refreshed).
 	 * @param initializers {@link ServletContextInitializer}s that should be applied as
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedWebApplicationContext.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedWebApplicationContext.java
index b09c1526fb..b59f000338 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedWebApplicationContext.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/EmbeddedWebApplicationContext.java
@@ -57,8 +57,8 @@ import org.springframework.web.context.support.WebApplicationContextUtils;
  * A {@link WebApplicationContext} that can be used to bootstrap itself from a contained
  * {@link EmbeddedServletContainerFactory} bean.
  * <p>
- * This context will create, initialize and run an {@link EmbeddedWebServer} by
- * searching for a single {@link EmbeddedServletContainerFactory} bean within the
+ * This context will create, initialize and run an {@link EmbeddedWebServer} by searching
+ * for a single {@link EmbeddedServletContainerFactory} bean within the
  * {@link ApplicationContext} itself. The {@link EmbeddedServletContainerFactory} is free
  * to use standard Spring concepts (such as dependency injection, lifecycle callbacks and
  * property placeholder variables).
@@ -359,7 +359,7 @@ public class EmbeddedWebApplicationContext extends GenericWebApplicationContext
 		private static final Set<String> SCOPES;
 
 		static {
-			Set<String> scopes = new LinkedHashSet<String>();
+			Set<String> scopes = new LinkedHashSet<>();
 			scopes.add(WebApplicationContext.SCOPE_REQUEST);
 			scopes.add(WebApplicationContext.SCOPE_SESSION);
 			SCOPES = Collections.unmodifiableSet(scopes);
@@ -367,7 +367,7 @@ public class EmbeddedWebApplicationContext extends GenericWebApplicationContext
 
 		private final ConfigurableListableBeanFactory beanFactory;
 
-		private final Map<String, Scope> scopes = new HashMap<String, Scope>();
+		private final Map<String, Scope> scopes = new HashMap<>();
 
 		public ExistingWebApplicationScopes(ConfigurableListableBeanFactory beanFactory) {
 			this.beanFactory = beanFactory;
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/Jsp.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/Jsp.java
index ee247e1f78..0c8f1e4eeb 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/Jsp.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/Jsp.java
@@ -38,7 +38,7 @@ public class Jsp {
 	/**
 	 * Init parameters used to configure the JSP servlet.
 	 */
-	private Map<String, String> initParameters = new HashMap<String, String>();
+	private Map<String, String> initParameters = new HashMap<>();
 
 	/**
 	 * Whether or not the JSP servlet should be registered with the embedded servlet
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/MimeMappings.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/MimeMappings.java
index f390ca3970..06f2215663 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/MimeMappings.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/MimeMappings.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -225,7 +225,7 @@ public final class MimeMappings implements Iterable<Mapping> {
 	 * Create a new empty {@link MimeMappings} instance.
 	 */
 	public MimeMappings() {
-		this.map = new LinkedHashMap<String, MimeMappings.Mapping>();
+		this.map = new LinkedHashMap<>();
 	}
 
 	/**
@@ -243,7 +243,7 @@ public final class MimeMappings implements Iterable<Mapping> {
 	 */
 	public MimeMappings(Map<String, String> mappings) {
 		Assert.notNull(mappings, "Mappings must not be null");
-		this.map = new LinkedHashMap<String, MimeMappings.Mapping>();
+		this.map = new LinkedHashMap<>();
 		for (Map.Entry<String, String> entry : mappings.entrySet()) {
 			add(entry.getKey(), entry.getValue());
 		}
@@ -256,8 +256,7 @@ public final class MimeMappings implements Iterable<Mapping> {
 	 */
 	private MimeMappings(MimeMappings mappings, boolean mutable) {
 		Assert.notNull(mappings, "Mappings must not be null");
-		this.map = (mutable
-				? new LinkedHashMap<String, MimeMappings.Mapping>(mappings.map)
+		this.map = (mutable ? new LinkedHashMap<>(mappings.map)
 				: Collections.unmodifiableMap(mappings.map));
 	}
 
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/ReactiveWebServerCustomizerBeanPostProcessor.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/ReactiveWebServerCustomizerBeanPostProcessor.java
index c47a30c436..1d11c10421 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/ReactiveWebServerCustomizerBeanPostProcessor.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/ReactiveWebServerCustomizerBeanPostProcessor.java
@@ -72,7 +72,7 @@ public class ReactiveWebServerCustomizerBeanPostProcessor
 	private Collection<ReactiveWebServerCustomizer> getCustomizers() {
 		if (this.customizers == null) {
 			// Look up does not include the parent context
-			this.customizers = new ArrayList<ReactiveWebServerCustomizer>(this.beanFactory
+			this.customizers = new ArrayList<>(this.beanFactory
 					.getBeansOfType(ReactiveWebServerCustomizer.class, false, false)
 					.values());
 			Collections.sort(this.customizers, AnnotationAwareOrderComparator.INSTANCE);
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/Servlet.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/Servlet.java
index ce98e106c0..adf56f85f3 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/Servlet.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/Servlet.java
@@ -35,7 +35,7 @@ public class Servlet {
 	/**
 	 * ServletContext parameters.
 	 */
-	private final Map<String, String> contextParameters = new HashMap<String, String>();
+	private final Map<String, String> contextParameters = new HashMap<>();
 
 	/**
 	 * Context path of the application.
@@ -136,5 +136,4 @@ public class Servlet {
 		return result;
 	}
 
-
 }
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/SslStoreProvider.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/SslStoreProvider.java
index 3e0ae57c71..476aa1f384 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/SslStoreProvider.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/SslStoreProvider.java
@@ -19,8 +19,8 @@ package org.springframework.boot.context.embedded;
 import java.security.KeyStore;
 
 /**
- * Interface to provide SSL key stores for an {@link EmbeddedWebServer} to use. Can
- * be used when file based key stores cannot be used.
+ * Interface to provide SSL key stores for an {@link EmbeddedWebServer} to use. Can be
+ * used when file based key stores cannot be used.
  *
  * @author Phillip Webb
  * @since 1.4.0
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainer.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainer.java
index 063d6542be..3984bbadb5 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainer.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainer.java
@@ -36,9 +36,9 @@ import org.springframework.util.ReflectionUtils;
 import org.springframework.util.StringUtils;
 
 /**
- * {@link EmbeddedWebServer} that can be used to control an embedded Jetty server.
- * Usually this class should be created using the
- * {@link JettyEmbeddedServletContainerFactory} and not directly.
+ * {@link EmbeddedWebServer} that can be used to control an embedded Jetty server. Usually
+ * this class should be created using the {@link JettyEmbeddedServletContainerFactory} and
+ * not directly.
  *
  * @author Phillip Webb
  * @author Dave Syer
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java
index 67961dce50..143dd12031 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java
@@ -103,7 +103,7 @@ import org.springframework.util.StringUtils;
 public class JettyEmbeddedServletContainerFactory
 		extends AbstractEmbeddedServletContainerFactory implements ResourceLoaderAware {
 
-	private List<Configuration> configurations = new ArrayList<Configuration>();
+	private List<Configuration> configurations = new ArrayList<>();
 
 	private boolean useForwardHeaders;
 
@@ -117,7 +117,7 @@ public class JettyEmbeddedServletContainerFactory
 	 */
 	private int selectors = -1;
 
-	private List<JettyServerCustomizer> jettyServerCustomizers = new ArrayList<JettyServerCustomizer>();
+	private List<JettyServerCustomizer> jettyServerCustomizers = new ArrayList<>();
 
 	private ResourceLoader resourceLoader;
 
@@ -387,7 +387,7 @@ public class JettyEmbeddedServletContainerFactory
 		File root = getValidDocumentRoot();
 		root = (root != null ? root : createTempDir("jetty-docbase"));
 		try {
-			List<Resource> resources = new ArrayList<Resource>();
+			List<Resource> resources = new ArrayList<>();
 			resources.add(
 					root.isDirectory() ? Resource.newResource(root.getCanonicalFile())
 							: JarResource.newJarResource(Resource.newResource(root)));
@@ -450,7 +450,7 @@ public class JettyEmbeddedServletContainerFactory
 	 */
 	protected Configuration[] getWebAppContextConfigurations(WebAppContext webAppContext,
 			ServletContextInitializer... initializers) {
-		List<Configuration> configurations = new ArrayList<Configuration>();
+		List<Configuration> configurations = new ArrayList<>();
 		configurations.add(
 				getServletContextInitializerConfiguration(webAppContext, initializers));
 		configurations.addAll(getConfigurations());
@@ -570,7 +570,7 @@ public class JettyEmbeddedServletContainerFactory
 	public void setServerCustomizers(
 			Collection<? extends JettyServerCustomizer> customizers) {
 		Assert.notNull(customizers, "Customizers must not be null");
-		this.jettyServerCustomizers = new ArrayList<JettyServerCustomizer>(customizers);
+		this.jettyServerCustomizers = new ArrayList<>(customizers);
 	}
 
 	/**
@@ -600,7 +600,7 @@ public class JettyEmbeddedServletContainerFactory
 	 */
 	public void setConfigurations(Collection<? extends Configuration> configurations) {
 		Assert.notNull(configurations, "Configurations must not be null");
-		this.configurations = new ArrayList<Configuration>(configurations);
+		this.configurations = new ArrayList<>(configurations);
 	}
 
 	/**
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/package-info.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/package-info.java
index 2c7d373b8e..fce2d0b53b 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/package-info.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/package-info.java
@@ -15,8 +15,7 @@
  */
 
 /**
- * Support for Jetty
- * {@link org.springframework.boot.context.embedded.EmbeddedWebServer
+ * Support for Jetty {@link org.springframework.boot.context.embedded.EmbeddedWebServer
  * EmbeddedServletContainers}.
  *
  * @see org.springframework.boot.context.embedded.jetty.JettyEmbeddedServletContainerFactory
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TldSkipPatterns.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TldSkipPatterns.java
index ada51d6972..143556c98f 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TldSkipPatterns.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TldSkipPatterns.java
@@ -31,7 +31,7 @@ final class TldSkipPatterns {
 
 	static {
 		// Same as Tomcat
-		Set<String> patterns = new LinkedHashSet<String>();
+		Set<String> patterns = new LinkedHashSet<>();
 		patterns.add("ant-*.jar");
 		patterns.add("aspectj*.jar");
 		patterns.add("commons-beanutils*.jar");
@@ -75,7 +75,7 @@ final class TldSkipPatterns {
 
 	static {
 		// Additional typical for Spring Boot applications
-		Set<String> patterns = new LinkedHashSet<String>();
+		Set<String> patterns = new LinkedHashSet<>();
 		patterns.add("antlr-*.jar");
 		patterns.add("aopalliance-*.jar");
 		patterns.add("aspectjrt-*.jar");
@@ -127,7 +127,7 @@ final class TldSkipPatterns {
 	static final Set<String> DEFAULT;
 
 	static {
-		Set<String> patterns = new LinkedHashSet<String>();
+		Set<String> patterns = new LinkedHashSet<>();
 		patterns.addAll(TOMCAT);
 		patterns.addAll(ADDITIONAL);
 		DEFAULT = Collections.unmodifiableSet(patterns);
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainer.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainer.java
index 1b5052b3d8..0cd8be5c1e 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainer.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainer.java
@@ -56,7 +56,7 @@ public class TomcatEmbeddedServletContainer implements EmbeddedWebServer {
 
 	private final Object monitor = new Object();
 
-	private final Map<Service, Connector[]> serviceConnectors = new HashMap<Service, Connector[]>();
+	private final Map<Service, Connector[]> serviceConnectors = new HashMap<>();
 
 	private final Tomcat tomcat;
 
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
index 64e2d8f22c..4d84190327 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java
@@ -108,24 +108,23 @@ public class TomcatEmbeddedServletContainerFactory
 
 	private File baseDirectory;
 
-	private List<Valve> engineValves = new ArrayList<Valve>();
+	private List<Valve> engineValves = new ArrayList<>();
 
-	private List<Valve> contextValves = new ArrayList<Valve>();
+	private List<Valve> contextValves = new ArrayList<>();
 
-	private List<LifecycleListener> contextLifecycleListeners = new ArrayList<LifecycleListener>();
+	private List<LifecycleListener> contextLifecycleListeners = new ArrayList<>();
 
-	private List<TomcatContextCustomizer> tomcatContextCustomizers = new ArrayList<TomcatContextCustomizer>();
+	private List<TomcatContextCustomizer> tomcatContextCustomizers = new ArrayList<>();
 
-	private List<TomcatConnectorCustomizer> tomcatConnectorCustomizers = new ArrayList<TomcatConnectorCustomizer>();
+	private List<TomcatConnectorCustomizer> tomcatConnectorCustomizers = new ArrayList<>();
 
-	private List<Connector> additionalTomcatConnectors = new ArrayList<Connector>();
+	private List<Connector> additionalTomcatConnectors = new ArrayList<>();
 
 	private ResourceLoader resourceLoader;
 
 	private String protocol = DEFAULT_PROTOCOL;
 
-	private Set<String> tldSkipPatterns = new LinkedHashSet<String>(
-			TldSkipPatterns.DEFAULT);
+	private Set<String> tldSkipPatterns = new LinkedHashSet<>(TldSkipPatterns.DEFAULT);
 
 	private Charset uriEncoding = DEFAULT_CHARSET;
 
@@ -575,7 +574,7 @@ public class TomcatEmbeddedServletContainerFactory
 	 */
 	public void setTldSkipPatterns(Collection<String> patterns) {
 		Assert.notNull(patterns, "Patterns must not be null");
-		this.tldSkipPatterns = new LinkedHashSet<String>(patterns);
+		this.tldSkipPatterns = new LinkedHashSet<>(patterns);
 	}
 
 	/**
@@ -605,7 +604,7 @@ public class TomcatEmbeddedServletContainerFactory
 	 */
 	public void setEngineValves(Collection<? extends Valve> engineValves) {
 		Assert.notNull(engineValves, "Valves must not be null");
-		this.engineValves = new ArrayList<Valve>(engineValves);
+		this.engineValves = new ArrayList<>(engineValves);
 	}
 
 	/**
@@ -633,7 +632,7 @@ public class TomcatEmbeddedServletContainerFactory
 	 */
 	public void setContextValves(Collection<? extends Valve> contextValves) {
 		Assert.notNull(contextValves, "Valves must not be null");
-		this.contextValves = new ArrayList<Valve>(contextValves);
+		this.contextValves = new ArrayList<>(contextValves);
 	}
 
 	/**
@@ -664,8 +663,7 @@ public class TomcatEmbeddedServletContainerFactory
 			Collection<? extends LifecycleListener> contextLifecycleListeners) {
 		Assert.notNull(contextLifecycleListeners,
 				"ContextLifecycleListeners must not be null");
-		this.contextLifecycleListeners = new ArrayList<LifecycleListener>(
-				contextLifecycleListeners);
+		this.contextLifecycleListeners = new ArrayList<>(contextLifecycleListeners);
 	}
 
 	/**
@@ -697,8 +695,7 @@ public class TomcatEmbeddedServletContainerFactory
 			Collection<? extends TomcatContextCustomizer> tomcatContextCustomizers) {
 		Assert.notNull(tomcatContextCustomizers,
 				"TomcatContextCustomizers must not be null");
-		this.tomcatContextCustomizers = new ArrayList<TomcatContextCustomizer>(
-				tomcatContextCustomizers);
+		this.tomcatContextCustomizers = new ArrayList<>(tomcatContextCustomizers);
 	}
 
 	/**
@@ -731,8 +728,7 @@ public class TomcatEmbeddedServletContainerFactory
 			Collection<? extends TomcatConnectorCustomizer> tomcatConnectorCustomizers) {
 		Assert.notNull(tomcatConnectorCustomizers,
 				"TomcatConnectorCustomizers must not be null");
-		this.tomcatConnectorCustomizers = new ArrayList<TomcatConnectorCustomizer>(
-				tomcatConnectorCustomizers);
+		this.tomcatConnectorCustomizers = new ArrayList<>(tomcatConnectorCustomizers);
 	}
 
 	/**
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatWebServer.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatWebServer.java
index 1b5c21a123..0e94284165 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatWebServer.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatWebServer.java
@@ -54,7 +54,7 @@ public class TomcatWebServer implements EmbeddedWebServer {
 
 	private final Object monitor = new Object();
 
-	private final Map<Service, Connector[]> serviceConnectors = new HashMap<Service, Connector[]>();
+	private final Map<Service, Connector[]> serviceConnectors = new HashMap<>();
 
 	private final Tomcat tomcat;
 
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/package-info.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/package-info.java
index bb22ecf666..38f950d811 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/package-info.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/package-info.java
@@ -15,8 +15,7 @@
  */
 
 /**
- * Support for Tomcat
- * {@link org.springframework.boot.context.embedded.EmbeddedWebServer
+ * Support for Tomcat {@link org.springframework.boot.context.embedded.EmbeddedWebServer
  * EmbeddedServletContainers}.
  *
  * @see org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/FileSessionPersistence.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/FileSessionPersistence.java
index afd16c98bb..fb0afe4f4c 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/FileSessionPersistence.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/FileSessionPersistence.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -71,7 +71,7 @@ public class FileSessionPersistence implements SessionPersistenceManager {
 
 	private void save(Map<String, PersistentSession> sessionData,
 			ObjectOutputStream stream) throws IOException {
-		Map<String, Serializable> session = new LinkedHashMap<String, Serializable>();
+		Map<String, Serializable> session = new LinkedHashMap<>();
 		for (Map.Entry<String, PersistentSession> entry : sessionData.entrySet()) {
 			session.put(entry.getKey(),
 					new SerializablePersistentSession(entry.getValue()));
@@ -110,7 +110,7 @@ public class FileSessionPersistence implements SessionPersistenceManager {
 			throws ClassNotFoundException, IOException {
 		Map<String, SerializablePersistentSession> session = readSession(stream);
 		long time = System.currentTimeMillis();
-		Map<String, PersistentSession> result = new LinkedHashMap<String, PersistentSession>();
+		Map<String, PersistentSession> result = new LinkedHashMap<>();
 		for (Map.Entry<String, SerializablePersistentSession> entry : session
 				.entrySet()) {
 			PersistentSession entrySession = entry.getValue().getPersistentSession();
@@ -152,8 +152,7 @@ public class FileSessionPersistence implements SessionPersistenceManager {
 
 		SerializablePersistentSession(PersistentSession session) {
 			this.expiration = session.getExpiration();
-			this.sessionData = new LinkedHashMap<String, Object>(
-					session.getSessionData());
+			this.sessionData = new LinkedHashMap<>(session.getSessionData());
 		}
 
 		public PersistentSession getPersistentSession() {
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainer.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainer.java
index 4f21074b65..130582bf49 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainer.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainer.java
@@ -218,7 +218,7 @@ public class UndertowEmbeddedServletContainer implements EmbeddedWebServer {
 	}
 
 	private Predicate[] getCompressionPredicates(Compression compression) {
-		List<Predicate> predicates = new ArrayList<Predicate>();
+		List<Predicate> predicates = new ArrayList<>();
 		predicates.add(new MaxSizePredicate(compression.getMinResponseSize()));
 		predicates.add(new CompressibleMimeTypePredicate(compression.getMimeTypes()));
 		if (compression.getExcludedUserAgents() != null) {
@@ -240,7 +240,7 @@ public class UndertowEmbeddedServletContainer implements EmbeddedWebServer {
 	}
 
 	private List<Port> getActualPorts() {
-		List<Port> ports = new ArrayList<Port>();
+		List<Port> ports = new ArrayList<>();
 		try {
 			if (!this.autoStart) {
 				ports.add(new Port(-1, "unknown"));
@@ -276,7 +276,7 @@ public class UndertowEmbeddedServletContainer implements EmbeddedWebServer {
 	}
 
 	private List<Port> getConfiguredPorts() {
-		List<Port> ports = new ArrayList<Port>();
+		List<Port> ports = new ArrayList<>();
 		for (Object listener : extractListeners()) {
 			try {
 				ports.add(getPortFromListener(listener));
@@ -384,7 +384,7 @@ public class UndertowEmbeddedServletContainer implements EmbeddedWebServer {
 		private final List<MimeType> mimeTypes;
 
 		CompressibleMimeTypePredicate(String[] mimeTypes) {
-			this.mimeTypes = new ArrayList<MimeType>(mimeTypes.length);
+			this.mimeTypes = new ArrayList<>(mimeTypes.length);
 			for (String mimeTypeString : mimeTypes) {
 				this.mimeTypes.add(MimeTypeUtils.parseMimeType(mimeTypeString));
 			}
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactory.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactory.java
index 603d7e8154..f33fc180c4 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactory.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactory.java
@@ -102,9 +102,9 @@ public class UndertowEmbeddedServletContainerFactory
 
 	private static final Set<Class<?>> NO_CLASSES = Collections.emptySet();
 
-	private List<UndertowBuilderCustomizer> builderCustomizers = new ArrayList<UndertowBuilderCustomizer>();
+	private List<UndertowBuilderCustomizer> builderCustomizers = new ArrayList<>();
 
-	private List<UndertowDeploymentInfoCustomizer> deploymentInfoCustomizers = new ArrayList<UndertowDeploymentInfoCustomizer>();
+	private List<UndertowDeploymentInfoCustomizer> deploymentInfoCustomizers = new ArrayList<>();
 
 	private ResourceLoader resourceLoader;
 
@@ -167,7 +167,7 @@ public class UndertowEmbeddedServletContainerFactory
 	public void setBuilderCustomizers(
 			Collection<? extends UndertowBuilderCustomizer> customizers) {
 		Assert.notNull(customizers, "Customizers must not be null");
-		this.builderCustomizers = new ArrayList<UndertowBuilderCustomizer>(customizers);
+		this.builderCustomizers = new ArrayList<>(customizers);
 	}
 
 	/**
@@ -198,8 +198,7 @@ public class UndertowEmbeddedServletContainerFactory
 	public void setDeploymentInfoCustomizers(
 			Collection<? extends UndertowDeploymentInfoCustomizer> customizers) {
 		Assert.notNull(customizers, "Customizers must not be null");
-		this.deploymentInfoCustomizers = new ArrayList<UndertowDeploymentInfoCustomizer>(
-				customizers);
+		this.deploymentInfoCustomizers = new ArrayList<>(customizers);
 	}
 
 	/**
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowWebServer.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowWebServer.java
index d6926556a8..cd562aed05 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowWebServer.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/UndertowWebServer.java
@@ -124,7 +124,7 @@ public class UndertowWebServer implements EmbeddedWebServer {
 	}
 
 	private List<UndertowWebServer.Port> getActualPorts() {
-		List<UndertowWebServer.Port> ports = new ArrayList<UndertowWebServer.Port>();
+		List<UndertowWebServer.Port> ports = new ArrayList<>();
 		try {
 			if (!this.autoStart) {
 				ports.add(new UndertowWebServer.Port(-1, "unknown"));
@@ -161,7 +161,7 @@ public class UndertowWebServer implements EmbeddedWebServer {
 	}
 
 	private List<UndertowWebServer.Port> getConfiguredPorts() {
-		List<UndertowWebServer.Port> ports = new ArrayList<UndertowWebServer.Port>();
+		List<UndertowWebServer.Port> ports = new ArrayList<>();
 		for (Object listener : extractListeners()) {
 			try {
 				ports.add(getPortFromListener(listener));
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/package-info.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/package-info.java
index dd03018228..1cc029ba69 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/package-info.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/undertow/package-info.java
@@ -15,8 +15,7 @@
  */
 
 /**
- * Support for Undertow
- * {@link org.springframework.boot.context.embedded.EmbeddedWebServer
+ * Support for Undertow {@link org.springframework.boot.context.embedded.EmbeddedWebServer
  * EmbeddedServletContainers}.
  *
  * @see org.springframework.boot.context.embedded.undertow.UndertowEmbeddedServletContainerFactory
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationBeanFactoryMetaData.java b/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationBeanFactoryMetaData.java
index 67aa3b0e5a..536ab0a2a6 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationBeanFactoryMetaData.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationBeanFactoryMetaData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -41,7 +41,7 @@ public class ConfigurationBeanFactoryMetaData implements BeanFactoryPostProcesso
 
 	private ConfigurableListableBeanFactory beanFactory;
 
-	private Map<String, MetaData> beans = new HashMap<String, MetaData>();
+	private Map<String, MetaData> beans = new HashMap<>();
 
 	@Override
 	public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory)
@@ -59,7 +59,7 @@ public class ConfigurationBeanFactoryMetaData implements BeanFactoryPostProcesso
 
 	public <A extends Annotation> Map<String, Object> getBeansWithFactoryAnnotation(
 			Class<A> type) {
-		Map<String, Object> result = new HashMap<String, Object>();
+		Map<String, Object> result = new HashMap<>();
 		for (String name : this.beans.keySet()) {
 			if (findFactoryAnnotation(name, type) != null) {
 				result.put(name, this.beanFactory.getBean(name));
@@ -78,7 +78,7 @@ public class ConfigurationBeanFactoryMetaData implements BeanFactoryPostProcesso
 		if (!this.beans.containsKey(beanName)) {
 			return null;
 		}
-		final AtomicReference<Method> found = new AtomicReference<Method>(null);
+		final AtomicReference<Method> found = new AtomicReference<>(null);
 		MetaData meta = this.beans.get(beanName);
 		final String factory = meta.getMethod();
 		Class<?> type = this.beanFactory.getType(meta.getBean());
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessor.java b/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessor.java
index 2248200c1c..c1e358d1df 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessor.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessor.java
@@ -307,7 +307,7 @@ public class ConfigurationPropertiesBindingPostProcessor implements BeanPostProc
 	private void postProcessBeforeInitialization(Object bean, String beanName,
 			ConfigurationProperties annotation) {
 		Object target = bean;
-		PropertiesConfigurationFactory<Object> factory = new PropertiesConfigurationFactory<Object>(
+		PropertiesConfigurationFactory<Object> factory = new PropertiesConfigurationFactory<>(
 				target);
 		factory.setPropertySources(this.propertySources);
 		factory.setValidator(determineValidator(bean));
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesImportSelector.java b/spring-boot/src/main/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesImportSelector.java
index aaf1471d6b..12e0f1a996 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesImportSelector.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesImportSelector.java
@@ -79,8 +79,8 @@ class EnableConfigurationPropertiesImportSelector implements ImportSelector {
 				String prefix = extractPrefix(type);
 				String name = (StringUtils.hasText(prefix) ? prefix + "-" + type.getName()
 						: type.getName());
-				if (!containsBeanDefinition(
-						(ConfigurableListableBeanFactory) registry, name)) {
+				if (!containsBeanDefinition((ConfigurableListableBeanFactory) registry,
+						name)) {
 					registerBeanDefinition(registry, type, name);
 				}
 			}
@@ -96,7 +96,7 @@ class EnableConfigurationPropertiesImportSelector implements ImportSelector {
 		}
 
 		private List<Class<?>> collectClasses(List<Object> list) {
-			ArrayList<Class<?>> result = new ArrayList<Class<?>>();
+			ArrayList<Class<?>> result = new ArrayList<>();
 			for (Object object : list) {
 				for (Object value : (Object[]) object) {
 					if (value instanceof Class && value != void.class) {
diff --git a/spring-boot/src/main/java/org/springframework/boot/diagnostics/FailureAnalyzers.java b/spring-boot/src/main/java/org/springframework/boot/diagnostics/FailureAnalyzers.java
index cc22ee27da..477857170b 100644
--- a/spring-boot/src/main/java/org/springframework/boot/diagnostics/FailureAnalyzers.java
+++ b/spring-boot/src/main/java/org/springframework/boot/diagnostics/FailureAnalyzers.java
@@ -73,7 +73,7 @@ public final class FailureAnalyzers {
 	private List<FailureAnalyzer> loadFailureAnalyzers(ClassLoader classLoader) {
 		List<String> analyzerNames = SpringFactoriesLoader
 				.loadFactoryNames(FailureAnalyzer.class, classLoader);
-		List<FailureAnalyzer> analyzers = new ArrayList<FailureAnalyzer>();
+		List<FailureAnalyzer> analyzers = new ArrayList<>();
 		for (String analyzerName : analyzerNames) {
 			try {
 				Constructor<?> constructor = ClassUtils.forName(analyzerName, classLoader)
diff --git a/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/BeanCurrentlyInCreationFailureAnalyzer.java b/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/BeanCurrentlyInCreationFailureAnalyzer.java
index 47d803ccd2..2ccbe58633 100644
--- a/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/BeanCurrentlyInCreationFailureAnalyzer.java
+++ b/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/BeanCurrentlyInCreationFailureAnalyzer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -39,7 +39,7 @@ class BeanCurrentlyInCreationFailureAnalyzer
 	@Override
 	protected FailureAnalysis analyze(Throwable rootFailure,
 			BeanCurrentlyInCreationException cause) {
-		List<BeanInCycle> cycle = new ArrayList<BeanInCycle>();
+		List<BeanInCycle> cycle = new ArrayList<>();
 		Throwable candidate = rootFailure;
 		int cycleStart = -1;
 		while (candidate != null) {
diff --git a/spring-boot/src/main/java/org/springframework/boot/env/EnumerableCompositePropertySource.java b/spring-boot/src/main/java/org/springframework/boot/env/EnumerableCompositePropertySource.java
index 4db0d2b841..a6f8ac04be 100644
--- a/spring-boot/src/main/java/org/springframework/boot/env/EnumerableCompositePropertySource.java
+++ b/spring-boot/src/main/java/org/springframework/boot/env/EnumerableCompositePropertySource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -57,9 +57,8 @@ public class EnumerableCompositePropertySource
 	public String[] getPropertyNames() {
 		String[] result = this.names;
 		if (result == null) {
-			List<String> names = new ArrayList<String>();
-			for (PropertySource<?> source : new ArrayList<PropertySource<?>>(
-					getSource())) {
+			List<String> names = new ArrayList<>();
+			for (PropertySource<?> source : new ArrayList<>(getSource())) {
 				if (source instanceof EnumerablePropertySource) {
 					names.addAll(Arrays.asList(
 							((EnumerablePropertySource<?>) source).getPropertyNames()));
diff --git a/spring-boot/src/main/java/org/springframework/boot/env/PropertySourcesLoader.java b/spring-boot/src/main/java/org/springframework/boot/env/PropertySourcesLoader.java
index 37c20533f0..2b394e64c8 100644
--- a/spring-boot/src/main/java/org/springframework/boot/env/PropertySourcesLoader.java
+++ b/spring-boot/src/main/java/org/springframework/boot/env/PropertySourcesLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -200,7 +200,7 @@ public class PropertySourcesLoader {
 	 * @return the file extensions
 	 */
 	public Set<String> getAllFileExtensions() {
-		Set<String> fileExtensions = new LinkedHashSet<String>();
+		Set<String> fileExtensions = new LinkedHashSet<>();
 		for (PropertySourceLoader loader : this.loaders) {
 			fileExtensions.addAll(Arrays.asList(loader.getFileExtensions()));
 		}
diff --git a/spring-boot/src/main/java/org/springframework/boot/env/SpringApplicationJsonEnvironmentPostProcessor.java b/spring-boot/src/main/java/org/springframework/boot/env/SpringApplicationJsonEnvironmentPostProcessor.java
index cea6ffb64c..3dba6bafb8 100644
--- a/spring-boot/src/main/java/org/springframework/boot/env/SpringApplicationJsonEnvironmentPostProcessor.java
+++ b/spring-boot/src/main/java/org/springframework/boot/env/SpringApplicationJsonEnvironmentPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -102,7 +102,7 @@ public class SpringApplicationJsonEnvironmentPostProcessor
 	 * @return the flattened map
 	 */
 	private Map<String, Object> flatten(Map<String, Object> map) {
-		Map<String, Object> result = new LinkedHashMap<String, Object>();
+		Map<String, Object> result = new LinkedHashMap<>();
 		flatten(null, result, map);
 		return result;
 	}
diff --git a/spring-boot/src/main/java/org/springframework/boot/env/YamlPropertySourceLoader.java b/spring-boot/src/main/java/org/springframework/boot/env/YamlPropertySourceLoader.java
index af8a3d1db0..8573108fa3 100755
--- a/spring-boot/src/main/java/org/springframework/boot/env/YamlPropertySourceLoader.java
+++ b/spring-boot/src/main/java/org/springframework/boot/env/YamlPropertySourceLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -97,7 +97,7 @@ public class YamlPropertySourceLoader implements PropertySourceLoader {
 		}
 
 		public Map<String, Object> process() {
-			final Map<String, Object> result = new LinkedHashMap<String, Object>();
+			final Map<String, Object> result = new LinkedHashMap<>();
 			process(new MatchCallback() {
 				@Override
 				public void process(Properties properties, Map<String, Object> map) {
diff --git a/spring-boot/src/main/java/org/springframework/boot/json/BasicJsonParser.java b/spring-boot/src/main/java/org/springframework/boot/json/BasicJsonParser.java
index e3ffc4af0f..c6d0ca2ba0 100644
--- a/spring-boot/src/main/java/org/springframework/boot/json/BasicJsonParser.java
+++ b/spring-boot/src/main/java/org/springframework/boot/json/BasicJsonParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -59,7 +59,7 @@ public class BasicJsonParser implements JsonParser {
 	}
 
 	private List<Object> parseListInternal(String json) {
-		List<Object> list = new ArrayList<Object>();
+		List<Object> list = new ArrayList<>();
 		json = trimLeadingCharacter(trimTrailingCharacter(json, ']'), '[');
 		for (String value : tokenize(json)) {
 			list.add(parseInternal(value));
@@ -107,7 +107,7 @@ public class BasicJsonParser implements JsonParser {
 	}
 
 	private Map<String, Object> parseMapInternal(String json) {
-		Map<String, Object> map = new LinkedHashMap<String, Object>();
+		Map<String, Object> map = new LinkedHashMap<>();
 		json = trimLeadingCharacter(trimTrailingCharacter(json, '}'), '{');
 		for (String pair : tokenize(json)) {
 			String[] values = StringUtils.trimArrayElements(StringUtils.split(pair, ":"));
@@ -124,7 +124,7 @@ public class BasicJsonParser implements JsonParser {
 	}
 
 	private List<String> tokenize(String json) {
-		List<String> list = new ArrayList<String>();
+		List<String> list = new ArrayList<>();
 		int index = 0;
 		int inObject = 0;
 		int inList = 0;
diff --git a/spring-boot/src/main/java/org/springframework/boot/json/JsonJsonParser.java b/spring-boot/src/main/java/org/springframework/boot/json/JsonJsonParser.java
index 9a41190b29..405bad36ee 100644
--- a/spring-boot/src/main/java/org/springframework/boot/json/JsonJsonParser.java
+++ b/spring-boot/src/main/java/org/springframework/boot/json/JsonJsonParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -35,7 +35,7 @@ public class JsonJsonParser implements JsonParser {
 
 	@Override
 	public Map<String, Object> parseMap(String json) {
-		Map<String, Object> map = new LinkedHashMap<String, Object>();
+		Map<String, Object> map = new LinkedHashMap<>();
 		putAll(map, new JSONObject(json));
 		return map;
 	}
@@ -45,12 +45,12 @@ public class JsonJsonParser implements JsonParser {
 			String name = key.toString();
 			Object value = object.get(name);
 			if (value instanceof JSONObject) {
-				Map<String, Object> nested = new LinkedHashMap<String, Object>();
+				Map<String, Object> nested = new LinkedHashMap<>();
 				putAll(nested, (JSONObject) value);
 				value = nested;
 			}
 			if (value instanceof JSONArray) {
-				List<Object> nested = new ArrayList<Object>();
+				List<Object> nested = new ArrayList<>();
 				addAll(nested, (JSONArray) value);
 				value = nested;
 			}
@@ -62,12 +62,12 @@ public class JsonJsonParser implements JsonParser {
 		for (int i = 0; i < array.length(); i++) {
 			Object value = array.get(i);
 			if (value instanceof JSONObject) {
-				Map<String, Object> nested = new LinkedHashMap<String, Object>();
+				Map<String, Object> nested = new LinkedHashMap<>();
 				putAll(nested, (JSONObject) value);
 				value = nested;
 			}
 			if (value instanceof JSONArray) {
-				List<Object> nested = new ArrayList<Object>();
+				List<Object> nested = new ArrayList<>();
 				addAll(nested, (JSONArray) value);
 				value = nested;
 			}
@@ -77,7 +77,7 @@ public class JsonJsonParser implements JsonParser {
 
 	@Override
 	public List<Object> parseList(String json) {
-		List<Object> nested = new ArrayList<Object>();
+		List<Object> nested = new ArrayList<>();
 		addAll(nested, new JSONArray(json));
 		return nested;
 	}
diff --git a/spring-boot/src/main/java/org/springframework/boot/jta/atomikos/AtomikosDependsOnBeanFactoryPostProcessor.java b/spring-boot/src/main/java/org/springframework/boot/jta/atomikos/AtomikosDependsOnBeanFactoryPostProcessor.java
index dc2ba8587a..22dd96db3f 100644
--- a/spring-boot/src/main/java/org/springframework/boot/jta/atomikos/AtomikosDependsOnBeanFactoryPostProcessor.java
+++ b/spring-boot/src/main/java/org/springframework/boot/jta/atomikos/AtomikosDependsOnBeanFactoryPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -60,7 +60,7 @@ public class AtomikosDependsOnBeanFactoryPostProcessor
 	private void addTransactionManagerDependencies(
 			ConfigurableListableBeanFactory beanFactory, String transactionManager) {
 		BeanDefinition bean = beanFactory.getBeanDefinition(transactionManager);
-		Set<String> dependsOn = new LinkedHashSet<String>(asList(bean.getDependsOn()));
+		Set<String> dependsOn = new LinkedHashSet<>(asList(bean.getDependsOn()));
 		int initialSize = dependsOn.size();
 		addDependencies(beanFactory, "javax.jms.ConnectionFactory", dependsOn);
 		addDependencies(beanFactory, "javax.sql.DataSource", dependsOn);
@@ -75,8 +75,7 @@ public class AtomikosDependsOnBeanFactoryPostProcessor
 				"com.atomikos.jms.extra.MessageDrivenContainer");
 		for (String messageDrivenContainer : messageDrivenContainers) {
 			BeanDefinition bean = beanFactory.getBeanDefinition(messageDrivenContainer);
-			Set<String> dependsOn = new LinkedHashSet<String>(
-					asList(bean.getDependsOn()));
+			Set<String> dependsOn = new LinkedHashSet<>(asList(bean.getDependsOn()));
 			dependsOn.addAll(asList(transactionManagers));
 			bean.setDependsOn(dependsOn.toArray(new String[dependsOn.size()]));
 		}
diff --git a/spring-boot/src/main/java/org/springframework/boot/jta/atomikos/AtomikosProperties.java b/spring-boot/src/main/java/org/springframework/boot/jta/atomikos/AtomikosProperties.java
index c45b7c8957..5b6fc59baf 100644
--- a/spring-boot/src/main/java/org/springframework/boot/jta/atomikos/AtomikosProperties.java
+++ b/spring-boot/src/main/java/org/springframework/boot/jta/atomikos/AtomikosProperties.java
@@ -36,7 +36,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 @ConfigurationProperties(prefix = "spring.jta.atomikos.properties")
 public class AtomikosProperties {
 
-	private final Map<String, String> values = new TreeMap<String, String>();
+	private final Map<String, String> values = new TreeMap<>();
 
 	/**
 	 * Transaction manager implementation that should be started.
diff --git a/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/PoolingConnectionFactoryBean.java b/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/PoolingConnectionFactoryBean.java
index 93e4ac22ef..0f148fb64e 100644
--- a/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/PoolingConnectionFactoryBean.java
+++ b/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/PoolingConnectionFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -47,7 +47,7 @@ import org.springframework.util.StringUtils;
 public class PoolingConnectionFactoryBean extends PoolingConnectionFactory
 		implements BeanNameAware, InitializingBean, DisposableBean {
 
-	private static final ThreadLocal<PoolingConnectionFactoryBean> source = new ThreadLocal<PoolingConnectionFactoryBean>();
+	private static final ThreadLocal<PoolingConnectionFactoryBean> source = new ThreadLocal<>();
 
 	private String beanName;
 
diff --git a/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/PoolingDataSourceBean.java b/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/PoolingDataSourceBean.java
index 108277cdc5..b9054c17f2 100644
--- a/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/PoolingDataSourceBean.java
+++ b/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/PoolingDataSourceBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -49,7 +49,7 @@ import org.springframework.util.StringUtils;
 public class PoolingDataSourceBean extends PoolingDataSource
 		implements BeanNameAware, InitializingBean {
 
-	private static final ThreadLocal<PoolingDataSourceBean> source = new ThreadLocal<PoolingDataSourceBean>();
+	private static final ThreadLocal<PoolingDataSourceBean> source = new ThreadLocal<>();
 
 	private XADataSource dataSource;
 
diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/AbstractLoggingSystem.java b/spring-boot/src/main/java/org/springframework/boot/logging/AbstractLoggingSystem.java
index bb6d40e8e6..38dcb4910b 100644
--- a/spring-boot/src/main/java/org/springframework/boot/logging/AbstractLoggingSystem.java
+++ b/spring-boot/src/main/java/org/springframework/boot/logging/AbstractLoggingSystem.java
@@ -194,8 +194,8 @@ public abstract class AbstractLoggingSystem extends LoggingSystem {
 		private final Map<T, LogLevel> nativeToSystem;
 
 		public LogLevels() {
-			this.systemToNative = new HashMap<LogLevel, T>();
-			this.nativeToSystem = new HashMap<T, LogLevel>();
+			this.systemToNative = new HashMap<>();
+			this.nativeToSystem = new HashMap<>();
 		}
 
 		public void map(LogLevel system, T nativeLevel) {
@@ -214,7 +214,7 @@ public abstract class AbstractLoggingSystem extends LoggingSystem {
 		}
 
 		public Set<LogLevel> getSupported() {
-			return new LinkedHashSet<LogLevel>(this.nativeToSystem.values());
+			return new LinkedHashSet<>(this.nativeToSystem.values());
 		}
 
 	}
diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java b/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java
index 3bd3056d5d..c30e9b674c 100644
--- a/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java
+++ b/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -31,7 +31,7 @@ import org.apache.commons.logging.LogFactory;
  */
 public class DeferredLog implements Log {
 
-	private List<Line> lines = new ArrayList<Line>();
+	private List<Line> lines = new ArrayList<>();
 
 	@Override
 	public boolean isTraceEnabled() {
diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/LoggerConfiguration.java b/spring-boot/src/main/java/org/springframework/boot/logging/LoggerConfiguration.java
index 9ea1cb6c93..5e9bbe26b0 100644
--- a/spring-boot/src/main/java/org/springframework/boot/logging/LoggerConfiguration.java
+++ b/spring-boot/src/main/java/org/springframework/boot/logging/LoggerConfiguration.java
@@ -102,7 +102,8 @@ public final class LoggerConfiguration {
 			rtn = rtn && ObjectUtils.nullSafeEquals(this.name, other.name);
 			rtn = rtn && ObjectUtils.nullSafeEquals(this.configuredLevel,
 					other.configuredLevel);
-			rtn = rtn && ObjectUtils.nullSafeEquals(this.effectiveLevel, other.effectiveLevel);
+			rtn = rtn && ObjectUtils.nullSafeEquals(this.effectiveLevel,
+					other.effectiveLevel);
 			return rtn;
 		}
 		return super.equals(obj);
diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/LoggingApplicationListener.java b/spring-boot/src/main/java/org/springframework/boot/logging/LoggingApplicationListener.java
index 5553b58b9c..9625b3c1bc 100644
--- a/spring-boot/src/main/java/org/springframework/boot/logging/LoggingApplicationListener.java
+++ b/spring-boot/src/main/java/org/springframework/boot/logging/LoggingApplicationListener.java
@@ -155,7 +155,7 @@ public class LoggingApplicationListener implements GenericApplicationListener {
 	private static AtomicBoolean shutdownHookRegistered = new AtomicBoolean(false);
 
 	static {
-		LOG_LEVEL_LOGGERS = new LinkedMultiValueMap<LogLevel, String>();
+		LOG_LEVEL_LOGGERS = new LinkedMultiValueMap<>();
 		LOG_LEVEL_LOGGERS.add(LogLevel.DEBUG, "org.springframework.boot");
 		LOG_LEVEL_LOGGERS.add(LogLevel.TRACE, "org.springframework");
 		LOG_LEVEL_LOGGERS.add(LogLevel.TRACE, "org.apache.tomcat");
diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystem.java b/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystem.java
index 4d33be2ff7..c21f8bba14 100644
--- a/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystem.java
+++ b/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -57,7 +57,7 @@ public abstract class LoggingSystem {
 	private static final Map<String, String> SYSTEMS;
 
 	static {
-		Map<String, String> systems = new LinkedHashMap<String, String>();
+		Map<String, String> systems = new LinkedHashMap<>();
 		systems.put("ch.qos.logback.core.Appender",
 				"org.springframework.boot.logging.logback.LogbackLoggingSystem");
 		systems.put("org.apache.logging.log4j.core.impl.Log4jContextFactory",
diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/java/JavaLoggingSystem.java b/spring-boot/src/main/java/org/springframework/boot/logging/java/JavaLoggingSystem.java
index 451afd5ff9..16d3941a7e 100644
--- a/spring-boot/src/main/java/org/springframework/boot/logging/java/JavaLoggingSystem.java
+++ b/spring-boot/src/main/java/org/springframework/boot/logging/java/JavaLoggingSystem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -48,7 +48,7 @@ import org.springframework.util.StringUtils;
  */
 public class JavaLoggingSystem extends AbstractLoggingSystem {
 
-	private static final LogLevels<Level> LEVELS = new LogLevels<Level>();
+	private static final LogLevels<Level> LEVELS = new LogLevels<>();
 
 	static {
 		LEVELS.map(LogLevel.TRACE, Level.FINEST);
@@ -129,7 +129,7 @@ public class JavaLoggingSystem extends AbstractLoggingSystem {
 
 	@Override
 	public List<LoggerConfiguration> getLoggerConfigurations() {
-		List<LoggerConfiguration> result = new ArrayList<LoggerConfiguration>();
+		List<LoggerConfiguration> result = new ArrayList<>();
 		Enumeration<String> names = LogManager.getLogManager().getLoggerNames();
 		while (names.hasMoreElements()) {
 			result.add(getLoggerConfiguration(names.nextElement()));
diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/ColorConverter.java b/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/ColorConverter.java
index af4c305ec6..5cdce0a85c 100644
--- a/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/ColorConverter.java
+++ b/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/ColorConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -52,7 +52,7 @@ public final class ColorConverter extends LogEventPatternConverter {
 	private static final Map<String, AnsiElement> ELEMENTS;
 
 	static {
-		Map<String, AnsiElement> elements = new HashMap<String, AnsiElement>();
+		Map<String, AnsiElement> elements = new HashMap<>();
 		elements.put("faint", AnsiStyle.FAINT);
 		elements.put("red", AnsiColor.RED);
 		elements.put("green", AnsiColor.GREEN);
@@ -66,7 +66,7 @@ public final class ColorConverter extends LogEventPatternConverter {
 	private static final Map<Integer, AnsiElement> LEVELS;
 
 	static {
-		Map<Integer, AnsiElement> levels = new HashMap<Integer, AnsiElement>();
+		Map<Integer, AnsiElement> levels = new HashMap<>();
 		levels.put(Level.FATAL.intLevel(), AnsiColor.RED);
 		levels.put(Level.ERROR.intLevel(), AnsiColor.RED);
 		levels.put(Level.WARN.intLevel(), AnsiColor.YELLOW);
diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java b/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java
index 66b2d59743..b78142cc1a 100644
--- a/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java
+++ b/spring-boot/src/main/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystem.java
@@ -62,7 +62,7 @@ public class Log4J2LoggingSystem extends Slf4JLoggingSystem {
 
 	private static final String FILE_PROTOCOL = "file";
 
-	private static final LogLevels<Level> LEVELS = new LogLevels<Level>();
+	private static final LogLevels<Level> LEVELS = new LogLevels<>();
 
 	static {
 		LEVELS.map(LogLevel.TRACE, Level.TRACE);
@@ -111,7 +111,7 @@ public class Log4J2LoggingSystem extends Slf4JLoggingSystem {
 	}
 
 	private String[] getCurrentlySupportedConfigLocations() {
-		List<String> supportedConfigLocations = new ArrayList<String>();
+		List<String> supportedConfigLocations = new ArrayList<>();
 		if (isClassAvailable("com.fasterxml.jackson.dataformat.yaml.YAMLParser")) {
 			Collections.addAll(supportedConfigLocations, "log4j2.yaml", "log4j2.yml");
 		}
@@ -215,7 +215,7 @@ public class Log4J2LoggingSystem extends Slf4JLoggingSystem {
 
 	@Override
 	public List<LoggerConfiguration> getLoggerConfigurations() {
-		List<LoggerConfiguration> result = new ArrayList<LoggerConfiguration>();
+		List<LoggerConfiguration> result = new ArrayList<>();
 		Configuration configuration = getLoggerContext().getConfiguration();
 		for (LoggerConfig loggerConfig : configuration.getLoggers().values()) {
 			result.add(convertLoggerConfiguration(loggerConfig));
diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/logback/ColorConverter.java b/spring-boot/src/main/java/org/springframework/boot/logging/logback/ColorConverter.java
index aaac78b3a3..7bc70e1d20 100644
--- a/spring-boot/src/main/java/org/springframework/boot/logging/logback/ColorConverter.java
+++ b/spring-boot/src/main/java/org/springframework/boot/logging/logback/ColorConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2013 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -41,7 +41,7 @@ public class ColorConverter extends CompositeConverter<ILoggingEvent> {
 	private static final Map<String, AnsiElement> ELEMENTS;
 
 	static {
-		Map<String, AnsiElement> elements = new HashMap<String, AnsiElement>();
+		Map<String, AnsiElement> elements = new HashMap<>();
 		elements.put("faint", AnsiStyle.FAINT);
 		elements.put("red", AnsiColor.RED);
 		elements.put("green", AnsiColor.GREEN);
@@ -55,7 +55,7 @@ public class ColorConverter extends CompositeConverter<ILoggingEvent> {
 	private static final Map<Integer, AnsiElement> LEVELS;
 
 	static {
-		Map<Integer, AnsiElement> levels = new HashMap<Integer, AnsiElement>();
+		Map<Integer, AnsiElement> levels = new HashMap<>();
 		levels.put(Level.ERROR_INTEGER, AnsiColor.RED);
 		levels.put(Level.WARN_INTEGER, AnsiColor.YELLOW);
 		LEVELS = Collections.unmodifiableMap(levels);
diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/logback/DefaultLogbackConfiguration.java b/spring-boot/src/main/java/org/springframework/boot/logging/logback/DefaultLogbackConfiguration.java
index 7c6036c6f2..ec1451bfb1 100644
--- a/spring-boot/src/main/java/org/springframework/boot/logging/logback/DefaultLogbackConfiguration.java
+++ b/spring-boot/src/main/java/org/springframework/boot/logging/logback/DefaultLogbackConfiguration.java
@@ -111,7 +111,7 @@ class DefaultLogbackConfiguration {
 	}
 
 	private Appender<ILoggingEvent> consoleAppender(LogbackConfigurator config) {
-		ConsoleAppender<ILoggingEvent> appender = new ConsoleAppender<ILoggingEvent>();
+		ConsoleAppender<ILoggingEvent> appender = new ConsoleAppender<>();
 		PatternLayoutEncoder encoder = new PatternLayoutEncoder();
 		String logPattern = this.patterns.getProperty("console", CONSOLE_LOG_PATTERN);
 		encoder.setPattern(OptionHelper.substVars(logPattern, config.getContext()));
@@ -124,7 +124,7 @@ class DefaultLogbackConfiguration {
 
 	private Appender<ILoggingEvent> fileAppender(LogbackConfigurator config,
 			String logFile) {
-		RollingFileAppender<ILoggingEvent> appender = new RollingFileAppender<ILoggingEvent>();
+		RollingFileAppender<ILoggingEvent> appender = new RollingFileAppender<>();
 		PatternLayoutEncoder encoder = new PatternLayoutEncoder();
 		String logPattern = this.patterns.getProperty("file", FILE_LOG_PATTERN);
 		encoder.setPattern(OptionHelper.substVars(logPattern, config.getContext()));
@@ -148,7 +148,7 @@ class DefaultLogbackConfiguration {
 
 	private void setMaxFileSize(RollingFileAppender<ILoggingEvent> appender,
 			LogbackConfigurator config) {
-		SizeBasedTriggeringPolicy<ILoggingEvent> triggeringPolicy = new SizeBasedTriggeringPolicy<ILoggingEvent>();
+		SizeBasedTriggeringPolicy<ILoggingEvent> triggeringPolicy = new SizeBasedTriggeringPolicy<>();
 		try {
 			triggeringPolicy.setMaxFileSize(FileSize.valueOf("10MB"));
 		}
diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/logback/LevelRemappingAppender.java b/spring-boot/src/main/java/org/springframework/boot/logging/logback/LevelRemappingAppender.java
index a08ef6efff..e7ee50510e 100644
--- a/spring-boot/src/main/java/org/springframework/boot/logging/logback/LevelRemappingAppender.java
+++ b/spring-boot/src/main/java/org/springframework/boot/logging/logback/LevelRemappingAppender.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -93,7 +93,7 @@ public class LevelRemappingAppender extends AppenderBase<ILoggingEvent> {
 	 */
 	public void setRemapLevels(String remapLevels) {
 		Assert.hasLength(remapLevels, "RemapLevels must not be empty");
-		this.remapLevels = new HashMap<Level, Level>();
+		this.remapLevels = new HashMap<>();
 		for (String remap : StringUtils.commaDelimitedListToStringArray(remapLevels)) {
 			String[] split = StringUtils.split(remap, "->");
 			Assert.notNull(split, "Remap element '" + remap + "' must contain '->'");
diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackConfigurator.java b/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackConfigurator.java
index a8c2d7771e..a075f78be7 100644
--- a/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackConfigurator.java
+++ b/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackConfigurator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -63,7 +63,7 @@ class LogbackConfigurator {
 		Map<String, String> registry = (Map<String, String>) this.context
 				.getObject(CoreConstants.PATTERN_RULE_REGISTRY);
 		if (registry == null) {
-			registry = new HashMap<String, String>();
+			registry = new HashMap<>();
 			this.context.putObject(CoreConstants.PATTERN_RULE_REGISTRY, registry);
 		}
 		registry.put(conversionWord, converterClass.getName());
diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java b/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java
index c88a8db80b..3ea9cca505 100644
--- a/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java
+++ b/spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java
@@ -60,7 +60,7 @@ public class LogbackLoggingSystem extends Slf4JLoggingSystem {
 
 	private static final String CONFIGURATION_FILE_PROPERTY = "logback.configurationFile";
 
-	private static final LogLevels<Level> LEVELS = new LogLevels<Level>();
+	private static final LogLevels<Level> LEVELS = new LogLevels<>();
 
 	static {
 		LEVELS.map(LogLevel.TRACE, Level.TRACE);
@@ -213,7 +213,7 @@ public class LogbackLoggingSystem extends Slf4JLoggingSystem {
 
 	@Override
 	public List<LoggerConfiguration> getLoggerConfigurations() {
-		List<LoggerConfiguration> result = new ArrayList<LoggerConfiguration>();
+		List<LoggerConfiguration> result = new ArrayList<>();
 		for (ch.qos.logback.classic.Logger logger : getLoggerContext().getLoggerList()) {
 			result.add(getLoggerConfiguration(logger));
 		}
diff --git a/spring-boot/src/main/java/org/springframework/boot/logging/logback/SpringProfileAction.java b/spring-boot/src/main/java/org/springframework/boot/logging/logback/SpringProfileAction.java
index 4ab29581c1..abc6070b0f 100644
--- a/spring-boot/src/main/java/org/springframework/boot/logging/logback/SpringProfileAction.java
+++ b/spring-boot/src/main/java/org/springframework/boot/logging/logback/SpringProfileAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -62,7 +62,7 @@ class SpringProfileAction extends Action implements InPlayListener {
 		}
 		ic.pushObject(this);
 		this.acceptsProfile = acceptsProfiles(ic, attributes);
-		this.events = new ArrayList<SaxEvent>();
+		this.events = new ArrayList<>();
 		ic.addInPlayListener(this);
 	}
 
diff --git a/spring-boot/src/main/java/org/springframework/boot/orm/jpa/EntityManagerFactoryBuilder.java b/spring-boot/src/main/java/org/springframework/boot/orm/jpa/EntityManagerFactoryBuilder.java
index ebc691a177..af046592db 100644
--- a/spring-boot/src/main/java/org/springframework/boot/orm/jpa/EntityManagerFactoryBuilder.java
+++ b/spring-boot/src/main/java/org/springframework/boot/orm/jpa/EntityManagerFactoryBuilder.java
@@ -84,7 +84,7 @@ public class EntityManagerFactoryBuilder {
 			URL persistenceUnitRootLocation) {
 		this.jpaVendorAdapter = jpaVendorAdapter;
 		this.persistenceUnitManager = persistenceUnitManager;
-		this.jpaProperties = new LinkedHashMap<String, Object>(jpaProperties);
+		this.jpaProperties = new LinkedHashMap<>(jpaProperties);
 		this.persistenceUnitRootLocation = persistenceUnitRootLocation;
 	}
 
@@ -111,7 +111,7 @@ public class EntityManagerFactoryBuilder {
 
 		private String persistenceUnit;
 
-		private Map<String, Object> properties = new HashMap<String, Object>();
+		private Map<String, Object> properties = new HashMap<>();
 
 		private boolean jta;
 
@@ -135,7 +135,7 @@ public class EntityManagerFactoryBuilder {
 		 * @return the builder for fluent usage
 		 */
 		public Builder packages(Class<?>... basePackageClasses) {
-			Set<String> packages = new HashSet<String>();
+			Set<String> packages = new HashSet<>();
 			for (Class<?> type : basePackageClasses) {
 				packages.add(ClassUtils.getPackageName(type));
 			}
diff --git a/spring-boot/src/main/java/org/springframework/boot/system/ApplicationPidFileWriter.java b/spring-boot/src/main/java/org/springframework/boot/system/ApplicationPidFileWriter.java
index 18073ee275..afb0a2f565 100644
--- a/spring-boot/src/main/java/org/springframework/boot/system/ApplicationPidFileWriter.java
+++ b/spring-boot/src/main/java/org/springframework/boot/system/ApplicationPidFileWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -69,7 +69,7 @@ public class ApplicationPidFileWriter
 	private static final List<Property> FILE_PROPERTIES;
 
 	static {
-		List<Property> properties = new ArrayList<Property>();
+		List<Property> properties = new ArrayList<>();
 		properties.add(new SpringProperty("spring.pid.", "file"));
 		properties.add(new SpringProperty("spring.", "pidfile"));
 		properties.add(new SystemProperty("PIDFILE"));
@@ -79,7 +79,7 @@ public class ApplicationPidFileWriter
 	private static final List<Property> FAIL_ON_WRITE_ERROR_PROPERTIES;
 
 	static {
-		List<Property> properties = new ArrayList<Property>();
+		List<Property> properties = new ArrayList<>();
 		properties.add(new SpringProperty("spring.pid.", "fail-on-write-error"));
 		properties.add(new SystemProperty("PID_FAIL_ON_WRITE_ERROR"));
 		FAIL_ON_WRITE_ERROR_PROPERTIES = Collections.unmodifiableList(properties);
diff --git a/spring-boot/src/main/java/org/springframework/boot/type/classreading/ConcurrentReferenceCachingMetadataReaderFactory.java b/spring-boot/src/main/java/org/springframework/boot/type/classreading/ConcurrentReferenceCachingMetadataReaderFactory.java
index 6bcde54ea1..0a93bd7179 100644
--- a/spring-boot/src/main/java/org/springframework/boot/type/classreading/ConcurrentReferenceCachingMetadataReaderFactory.java
+++ b/spring-boot/src/main/java/org/springframework/boot/type/classreading/ConcurrentReferenceCachingMetadataReaderFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -39,7 +39,7 @@ import org.springframework.util.ConcurrentReferenceHashMap;
 public class ConcurrentReferenceCachingMetadataReaderFactory
 		extends SimpleMetadataReaderFactory {
 
-	private final Map<Resource, MetadataReader> cache = new ConcurrentReferenceHashMap<Resource, MetadataReader>();
+	private final Map<Resource, MetadataReader> cache = new ConcurrentReferenceHashMap<>();
 
 	/**
 	 * Create a new {@link ConcurrentReferenceCachingMetadataReaderFactory} instance for
diff --git a/spring-boot/src/main/java/org/springframework/boot/validation/MessageInterpolatorFactory.java b/spring-boot/src/main/java/org/springframework/boot/validation/MessageInterpolatorFactory.java
index c9c2ed9155..fb023b5740 100644
--- a/spring-boot/src/main/java/org/springframework/boot/validation/MessageInterpolatorFactory.java
+++ b/spring-boot/src/main/java/org/springframework/boot/validation/MessageInterpolatorFactory.java
@@ -41,7 +41,7 @@ public class MessageInterpolatorFactory implements ObjectFactory<MessageInterpol
 	private static final Set<String> FALLBACKS;
 
 	static {
-		Set<String> fallbacks = new LinkedHashSet<String>();
+		Set<String> fallbacks = new LinkedHashSet<>();
 		fallbacks.add("org.hibernate.validator.messageinterpolation"
 				+ ".ParameterMessageInterpolator");
 		FALLBACKS = Collections.unmodifiableSet(fallbacks);
diff --git a/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java b/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java
index 939a3d1503..c3df825a52 100644
--- a/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java
+++ b/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -65,7 +65,7 @@ public class RestTemplateBuilder {
 	private static final Map<String, String> REQUEST_FACTORY_CANDIDATES;
 
 	static {
-		Map<String, String> candidates = new LinkedHashMap<String, String>();
+		Map<String, String> candidates = new LinkedHashMap<>();
 		candidates.put("org.apache.http.client.HttpClient",
 				"org.springframework.http.client.HttpComponentsClientHttpRequestFactory");
 		candidates.put("okhttp3.OkHttpClient",
@@ -111,8 +111,8 @@ public class RestTemplateBuilder {
 		this.uriTemplateHandler = null;
 		this.errorHandler = null;
 		this.basicAuthorization = null;
-		this.restTemplateCustomizers = Collections.unmodifiableSet(
-				new LinkedHashSet<RestTemplateCustomizer>(Arrays.asList(customizers)));
+		this.restTemplateCustomizers = Collections
+				.unmodifiableSet(new LinkedHashSet<>(Arrays.asList(customizers)));
 		this.requestFactoryCustomizers = Collections.<RequestFactoryCustomizer>emptySet();
 		this.interceptors = Collections.<ClientHttpRequestInterceptor>emptySet();
 	}
@@ -237,8 +237,8 @@ public class RestTemplateBuilder {
 	 */
 	public RestTemplateBuilder defaultMessageConverters() {
 		return new RestTemplateBuilder(this.detectRequestFactory, this.rootUri,
-				Collections.unmodifiableSet(new LinkedHashSet<HttpMessageConverter<?>>(
-						new RestTemplate().getMessageConverters())),
+				Collections.unmodifiableSet(
+						new LinkedHashSet<>(new RestTemplate().getMessageConverters())),
 				this.requestFactory, this.uriTemplateHandler, this.errorHandler,
 				this.basicAuthorization, this.restTemplateCustomizers,
 				this.requestFactoryCustomizers, this.interceptors);
@@ -274,8 +274,8 @@ public class RestTemplateBuilder {
 		return new RestTemplateBuilder(this.detectRequestFactory, this.rootUri,
 				this.messageConverters, this.requestFactory, this.uriTemplateHandler,
 				this.errorHandler, this.basicAuthorization, this.restTemplateCustomizers,
-				this.requestFactoryCustomizers, Collections.unmodifiableSet(
-						new LinkedHashSet<ClientHttpRequestInterceptor>(interceptors)));
+				this.requestFactoryCustomizers,
+				Collections.unmodifiableSet(new LinkedHashSet<>(interceptors)));
 	}
 
 	/**
@@ -525,8 +525,7 @@ public class RestTemplateBuilder {
 	public <T extends RestTemplate> T configure(T restTemplate) {
 		configureRequestFactory(restTemplate);
 		if (!CollectionUtils.isEmpty(this.messageConverters)) {
-			restTemplate.setMessageConverters(
-					new ArrayList<HttpMessageConverter<?>>(this.messageConverters));
+			restTemplate.setMessageConverters(new ArrayList<>(this.messageConverters));
 		}
 		if (this.uriTemplateHandler != null) {
 			restTemplate.setUriTemplateHandler(this.uriTemplateHandler);
@@ -599,14 +598,14 @@ public class RestTemplateBuilder {
 	}
 
 	private <T> Set<T> append(Set<T> set, T addition) {
-		Set<T> result = new LinkedHashSet<T>(
+		Set<T> result = new LinkedHashSet<>(
 				set == null ? Collections.<T>emptySet() : set);
 		result.add(addition);
 		return Collections.unmodifiableSet(result);
 	}
 
 	private <T> Set<T> append(Set<T> set, Collection<? extends T> additions) {
-		Set<T> result = new LinkedHashSet<T>(
+		Set<T> result = new LinkedHashSet<>(
 				set == null ? Collections.<T>emptySet() : set);
 		result.addAll(additions);
 		return Collections.unmodifiableSet(result);
diff --git a/spring-boot/src/main/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBean.java b/spring-boot/src/main/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBean.java
index 7e7b2c8ee5..ce02d8f5d1 100644
--- a/spring-boot/src/main/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBean.java
+++ b/spring-boot/src/main/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBean.java
@@ -52,11 +52,11 @@ abstract class AbstractFilterRegistrationBean<T extends Filter> extends Registra
 
 	private static final String[] DEFAULT_URL_MAPPINGS = { "/*" };
 
-	private Set<ServletRegistrationBean<?>> servletRegistrationBeans = new LinkedHashSet<ServletRegistrationBean<?>>();
+	private Set<ServletRegistrationBean<?>> servletRegistrationBeans = new LinkedHashSet<>();
 
-	private Set<String> servletNames = new LinkedHashSet<String>();
+	private Set<String> servletNames = new LinkedHashSet<>();
 
-	private Set<String> urlPatterns = new LinkedHashSet<String>();
+	private Set<String> urlPatterns = new LinkedHashSet<>();
 
 	private EnumSet<DispatcherType> dispatcherTypes;
 
@@ -82,8 +82,7 @@ abstract class AbstractFilterRegistrationBean<T extends Filter> extends Registra
 			Collection<? extends ServletRegistrationBean<?>> servletRegistrationBeans) {
 		Assert.notNull(servletRegistrationBeans,
 				"ServletRegistrationBeans must not be null");
-		this.servletRegistrationBeans = new LinkedHashSet<ServletRegistrationBean<?>>(
-				servletRegistrationBeans);
+		this.servletRegistrationBeans = new LinkedHashSet<>(servletRegistrationBeans);
 	}
 
 	/**
@@ -118,7 +117,7 @@ abstract class AbstractFilterRegistrationBean<T extends Filter> extends Registra
 	 */
 	public void setServletNames(Collection<String> servletNames) {
 		Assert.notNull(servletNames, "ServletNames must not be null");
-		this.servletNames = new LinkedHashSet<String>(servletNames);
+		this.servletNames = new LinkedHashSet<>(servletNames);
 	}
 
 	/**
@@ -148,7 +147,7 @@ abstract class AbstractFilterRegistrationBean<T extends Filter> extends Registra
 	 */
 	public void setUrlPatterns(Collection<String> urlPatterns) {
 		Assert.notNull(urlPatterns, "UrlPatterns must not be null");
-		this.urlPatterns = new LinkedHashSet<String>(urlPatterns);
+		this.urlPatterns = new LinkedHashSet<>(urlPatterns);
 	}
 
 	/**
@@ -243,7 +242,7 @@ abstract class AbstractFilterRegistrationBean<T extends Filter> extends Registra
 		if (dispatcherTypes == null) {
 			dispatcherTypes = EnumSet.of(DispatcherType.REQUEST);
 		}
-		Set<String> servletNames = new LinkedHashSet<String>();
+		Set<String> servletNames = new LinkedHashSet<>();
 		for (ServletRegistrationBean<?> servletRegistrationBean : this.servletRegistrationBeans) {
 			servletNames.add(servletRegistrationBean.getServletName());
 		}
diff --git a/spring-boot/src/main/java/org/springframework/boot/web/servlet/ErrorPageRegistrarBeanPostProcessor.java b/spring-boot/src/main/java/org/springframework/boot/web/servlet/ErrorPageRegistrarBeanPostProcessor.java
index f314cafe0f..3b3b96300a 100644
--- a/spring-boot/src/main/java/org/springframework/boot/web/servlet/ErrorPageRegistrarBeanPostProcessor.java
+++ b/spring-boot/src/main/java/org/springframework/boot/web/servlet/ErrorPageRegistrarBeanPostProcessor.java
@@ -76,7 +76,7 @@ public class ErrorPageRegistrarBeanPostProcessor
 	private Collection<ErrorPageRegistrar> getRegistrars() {
 		if (this.registrars == null) {
 			// Look up does not include the parent context
-			this.registrars = new ArrayList<ErrorPageRegistrar>(this.beanFactory
+			this.registrars = new ArrayList<>(this.beanFactory
 					.getBeansOfType(ErrorPageRegistrar.class, false, false).values());
 			Collections.sort(this.registrars, AnnotationAwareOrderComparator.INSTANCE);
 			this.registrars = Collections.unmodifiableList(this.registrars);
diff --git a/spring-boot/src/main/java/org/springframework/boot/web/servlet/RegistrationBean.java b/spring-boot/src/main/java/org/springframework/boot/web/servlet/RegistrationBean.java
index 1f2f25082b..8c9c8911ea 100644
--- a/spring-boot/src/main/java/org/springframework/boot/web/servlet/RegistrationBean.java
+++ b/spring-boot/src/main/java/org/springframework/boot/web/servlet/RegistrationBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -45,7 +45,7 @@ public abstract class RegistrationBean implements ServletContextInitializer, Ord
 
 	private boolean enabled = true;
 
-	private Map<String, String> initParameters = new LinkedHashMap<String, String>();
+	private Map<String, String> initParameters = new LinkedHashMap<>();
 
 	/**
 	 * Set the name of this registration. If not specified the bean name will be used.
@@ -98,7 +98,7 @@ public abstract class RegistrationBean implements ServletContextInitializer, Ord
 	 */
 	public void setInitParameters(Map<String, String> initParameters) {
 		Assert.notNull(initParameters, "InitParameters must not be null");
-		this.initParameters = new LinkedHashMap<String, String>(initParameters);
+		this.initParameters = new LinkedHashMap<>(initParameters);
 	}
 
 	/**
diff --git a/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletComponentHandler.java b/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletComponentHandler.java
index 275defb3a8..fac24430c1 100644
--- a/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletComponentHandler.java
+++ b/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletComponentHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -62,7 +62,7 @@ abstract class ServletComponentHandler {
 
 	protected final Map<String, String> extractInitParameters(
 			Map<String, Object> attributes) {
-		Map<String, String> initParameters = new HashMap<String, String>();
+		Map<String, String> initParameters = new HashMap<>();
 		for (AnnotationAttributes initParam : (AnnotationAttributes[]) attributes
 				.get("initParams")) {
 			String name = (String) initParam.get("name");
diff --git a/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletComponentRegisteringPostProcessor.java b/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletComponentRegisteringPostProcessor.java
index abc4b90d07..1d3448461d 100644
--- a/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletComponentRegisteringPostProcessor.java
+++ b/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletComponentRegisteringPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -46,7 +46,7 @@ class ServletComponentRegisteringPostProcessor
 	private static final List<ServletComponentHandler> HANDLERS;
 
 	static {
-		List<ServletComponentHandler> handlers = new ArrayList<ServletComponentHandler>();
+		List<ServletComponentHandler> handlers = new ArrayList<>();
 		handlers.add(new WebServletHandler());
 		handlers.add(new WebFilterHandler());
 		handlers.add(new WebListenerHandler());
diff --git a/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletComponentScanRegistrar.java b/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletComponentScanRegistrar.java
index f3c6b98ac7..dc1d887cee 100644
--- a/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletComponentScanRegistrar.java
+++ b/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletComponentScanRegistrar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -78,7 +78,7 @@ class ServletComponentScanRegistrar implements ImportBeanDefinitionRegistrar {
 				metadata.getAnnotationAttributes(ServletComponentScan.class.getName()));
 		String[] basePackages = attributes.getStringArray("basePackages");
 		Class<?>[] basePackageClasses = attributes.getClassArray("basePackageClasses");
-		Set<String> packagesToScan = new LinkedHashSet<String>();
+		Set<String> packagesToScan = new LinkedHashSet<>();
 		packagesToScan.addAll(Arrays.asList(basePackages));
 		for (Class<?> basePackageClass : basePackageClasses) {
 			packagesToScan.add(ClassUtils.getPackageName(basePackageClass));
diff --git a/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletContextInitializerBeans.java b/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletContextInitializerBeans.java
index ba9e0c6b92..450199aa36 100644
--- a/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletContextInitializerBeans.java
+++ b/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletContextInitializerBeans.java
@@ -68,17 +68,17 @@ public class ServletContextInitializerBeans
 	/**
 	 * Seen bean instances or bean names.
 	 */
-	private final Set<Object> seen = new HashSet<Object>();
+	private final Set<Object> seen = new HashSet<>();
 
 	private final MultiValueMap<Class<?>, ServletContextInitializer> initializers;
 
 	private List<ServletContextInitializer> sortedList;
 
 	public ServletContextInitializerBeans(ListableBeanFactory beanFactory) {
-		this.initializers = new LinkedMultiValueMap<Class<?>, ServletContextInitializer>();
+		this.initializers = new LinkedMultiValueMap<>();
 		addServletContextInitializerBeans(beanFactory);
 		addAdaptableBeans(beanFactory);
-		List<ServletContextInitializer> sortedInitializers = new ArrayList<ServletContextInitializer>();
+		List<ServletContextInitializer> sortedInitializers = new ArrayList<>();
 		for (Map.Entry<?, List<ServletContextInitializer>> entry : this.initializers
 				.entrySet()) {
 			AnnotationAwareOrderComparator.sort(entry.getValue());
@@ -217,7 +217,7 @@ public class ServletContextInitializerBeans
 
 	private <T> List<Entry<String, T>> getOrderedBeansOfType(
 			ListableBeanFactory beanFactory, Class<T> type, Set<?> excludes) {
-		List<Entry<String, T>> beans = new ArrayList<Entry<String, T>>();
+		List<Entry<String, T>> beans = new ArrayList<>();
 		Comparator<Entry<String, T>> comparator = new Comparator<Entry<String, T>>() {
 
 			@Override
@@ -228,7 +228,7 @@ public class ServletContextInitializerBeans
 
 		};
 		String[] names = beanFactory.getBeanNamesForType(type, true, false);
-		Map<String, T> map = new LinkedHashMap<String, T>();
+		Map<String, T> map = new LinkedHashMap<>();
 		for (String name : names) {
 			if (!excludes.contains(name) && !ScopedProxyUtils.isScopedTarget(name)) {
 				T bean = beanFactory.getBean(name, type);
@@ -282,8 +282,8 @@ public class ServletContextInitializerBeans
 			if (name.equals(DISPATCHER_SERVLET_NAME)) {
 				url = "/"; // always map the main dispatcherServlet to "/"
 			}
-			ServletRegistrationBean<Servlet> bean = new ServletRegistrationBean<Servlet>(
-					source, url);
+			ServletRegistrationBean<Servlet> bean = new ServletRegistrationBean<>(source,
+					url);
 			bean.setMultipartConfig(this.multipartConfig);
 			return bean;
 		}
@@ -299,7 +299,7 @@ public class ServletContextInitializerBeans
 		@Override
 		public RegistrationBean createRegistrationBean(String name, Filter source,
 				int totalNumberOfSourceBeans) {
-			return new FilterRegistrationBean<Filter>(source);
+			return new FilterRegistrationBean<>(source);
 		}
 
 	}
@@ -313,7 +313,7 @@ public class ServletContextInitializerBeans
 		@Override
 		public RegistrationBean createRegistrationBean(String name, EventListener source,
 				int totalNumberOfSourceBeans) {
-			return new ServletListenerRegistrationBean<EventListener>(source);
+			return new ServletListenerRegistrationBean<>(source);
 		}
 
 	}
diff --git a/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletListenerRegistrationBean.java b/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletListenerRegistrationBean.java
index 35ef5ce576..6cef047dad 100644
--- a/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletListenerRegistrationBean.java
+++ b/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletListenerRegistrationBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -66,7 +66,7 @@ public class ServletListenerRegistrationBean<T extends EventListener>
 	private static final Set<Class<?>> SUPPORTED_TYPES;
 
 	static {
-		Set<Class<?>> types = new HashSet<Class<?>>();
+		Set<Class<?>> types = new HashSet<>();
 		types.add(ServletContextAttributeListener.class);
 		types.add(ServletRequestListener.class);
 		types.add(ServletRequestAttributeListener.class);
diff --git a/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletRegistrationBean.java b/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletRegistrationBean.java
index b908623810..65e57845f3 100644
--- a/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletRegistrationBean.java
+++ b/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletRegistrationBean.java
@@ -60,7 +60,7 @@ public class ServletRegistrationBean<T extends Servlet> extends RegistrationBean
 
 	private T servlet;
 
-	private Set<String> urlMappings = new LinkedHashSet<String>();
+	private Set<String> urlMappings = new LinkedHashSet<>();
 
 	private boolean alwaysMapUrl = true;
 
@@ -125,7 +125,7 @@ public class ServletRegistrationBean<T extends Servlet> extends RegistrationBean
 	 */
 	public void setUrlMappings(Collection<String> urlMappings) {
 		Assert.notNull(urlMappings, "UrlMappings must not be null");
-		this.urlMappings = new LinkedHashSet<String>(urlMappings);
+		this.urlMappings = new LinkedHashSet<>(urlMappings);
 	}
 
 	/**
diff --git a/spring-boot/src/main/java/org/springframework/boot/web/support/ErrorPageFilter.java b/spring-boot/src/main/java/org/springframework/boot/web/support/ErrorPageFilter.java
index 682c166f2a..717f635beb 100644
--- a/spring-boot/src/main/java/org/springframework/boot/web/support/ErrorPageFilter.java
+++ b/spring-boot/src/main/java/org/springframework/boot/web/support/ErrorPageFilter.java
@@ -77,9 +77,9 @@ public class ErrorPageFilter implements Filter, ErrorPageRegistry {
 
 	private String global;
 
-	private final Map<Integer, String> statuses = new HashMap<Integer, String>();
+	private final Map<Integer, String> statuses = new HashMap<>();
 
-	private final Map<Class<?>, String> exceptions = new HashMap<Class<?>, String>();
+	private final Map<Class<?>, String> exceptions = new HashMap<>();
 
 	private final OncePerRequestFilter delegate = new OncePerRequestFilter() {
 
diff --git a/spring-boot/src/main/java/org/springframework/boot/yaml/SpringProfileDocumentMatcher.java b/spring-boot/src/main/java/org/springframework/boot/yaml/SpringProfileDocumentMatcher.java
index 5fe82aa0e3..26340bdba4 100644
--- a/spring-boot/src/main/java/org/springframework/boot/yaml/SpringProfileDocumentMatcher.java
+++ b/spring-boot/src/main/java/org/springframework/boot/yaml/SpringProfileDocumentMatcher.java
@@ -60,7 +60,7 @@ public class SpringProfileDocumentMatcher implements DocumentMatcher {
 	}
 
 	public void addActiveProfiles(String... profiles) {
-		LinkedHashSet<String> set = new LinkedHashSet<String>(
+		LinkedHashSet<String> set = new LinkedHashSet<>(
 				Arrays.asList(this.activeProfiles));
 		Collections.addAll(set, profiles);
 		this.activeProfiles = set.toArray(new String[set.size()]);
@@ -97,14 +97,14 @@ public class SpringProfileDocumentMatcher implements DocumentMatcher {
 	private ProfilesMatcher getProfilesMatcher() {
 		return this.activeProfiles.length == 0 ? new EmptyProfilesMatcher()
 				: new ActiveProfilesMatcher(
-						new HashSet<String>(Arrays.asList(this.activeProfiles)));
+						new HashSet<>(Arrays.asList(this.activeProfiles)));
 	}
 
 	private Set<String> extractProfiles(List<String> profiles, ProfileType type) {
 		if (CollectionUtils.isEmpty(profiles)) {
 			return null;
 		}
-		Set<String> extractedProfiles = new HashSet<String>();
+		Set<String> extractedProfiles = new HashSet<>();
 		for (String candidate : profiles) {
 			ProfileType candidateType = ProfileType.POSITIVE;
 			if (candidate.startsWith("!")) {
@@ -198,7 +198,7 @@ public class SpringProfileDocumentMatcher implements DocumentMatcher {
 	 */
 	static class SpringProperties {
 
-		private List<String> profiles = new ArrayList<String>();
+		private List<String> profiles = new ArrayList<>();
 
 		public List<String> getProfiles() {
 			return this.profiles;
diff --git a/spring-boot/src/test/java/org/springframework/boot/DefaultApplicationArgumentsTests.java b/spring-boot/src/test/java/org/springframework/boot/DefaultApplicationArgumentsTests.java
index e8779d7064..79dfe1a82e 100644
--- a/spring-boot/src/test/java/org/springframework/boot/DefaultApplicationArgumentsTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/DefaultApplicationArgumentsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -55,7 +55,7 @@ public class DefaultApplicationArgumentsTests {
 	@Test
 	public void optionNames() throws Exception {
 		ApplicationArguments arguments = new DefaultApplicationArguments(ARGS);
-		Set<String> expected = new HashSet<String>(Arrays.asList("foo", "debug"));
+		Set<String> expected = new HashSet<>(Arrays.asList("foo", "debug"));
 		assertThat(arguments.getOptionNames()).isEqualTo(expected);
 	}
 
diff --git a/spring-boot/src/test/java/org/springframework/boot/SimpleMainTests.java b/spring-boot/src/test/java/org/springframework/boot/SimpleMainTests.java
index 176a074a72..cb8c77b103 100644
--- a/spring-boot/src/test/java/org/springframework/boot/SimpleMainTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/SimpleMainTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -76,7 +76,7 @@ public class SimpleMainTests {
 	}
 
 	private String[] getArgs(String... args) {
-		List<String> list = new ArrayList<String>(Arrays.asList(
+		List<String> list = new ArrayList<>(Arrays.asList(
 				"--spring.main.webEnvironment=false", "--spring.main.showBanner=OFF",
 				"--spring.main.registerShutdownHook=false"));
 		if (args.length > 0) {
diff --git a/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java b/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java
index e87b286409..2824d64b70 100644
--- a/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/SpringApplicationTests.java
@@ -304,7 +304,7 @@ public class SpringApplicationTests {
 	public void specificApplicationContextInitializer() throws Exception {
 		SpringApplication application = new SpringApplication(ExampleConfig.class);
 		application.setWebApplicationType(WebApplicationType.NONE);
-		final AtomicReference<ApplicationContext> reference = new AtomicReference<ApplicationContext>();
+		final AtomicReference<ApplicationContext> reference = new AtomicReference<>();
 		application.setInitializers(Arrays.asList(
 				new ApplicationContextInitializer<ConfigurableApplicationContext>() {
 					@Override
@@ -322,7 +322,7 @@ public class SpringApplicationTests {
 	public void applicationRunningEventListener() {
 		SpringApplication application = new SpringApplication(ExampleConfig.class);
 		application.setWebApplicationType(WebApplicationType.NONE);
-		final AtomicReference<SpringApplication> reference = new AtomicReference<SpringApplication>();
+		final AtomicReference<SpringApplication> reference = new AtomicReference<>();
 		class ApplicationReadyEventListener
 				implements ApplicationListener<ApplicationReadyEvent> {
 
@@ -341,7 +341,7 @@ public class SpringApplicationTests {
 	public void contextRefreshedEventListener() throws Exception {
 		SpringApplication application = new SpringApplication(ExampleConfig.class);
 		application.setWebApplicationType(WebApplicationType.NONE);
-		final AtomicReference<ApplicationContext> reference = new AtomicReference<ApplicationContext>();
+		final AtomicReference<ApplicationContext> reference = new AtomicReference<>();
 		class InitializerListener implements ApplicationListener<ContextRefreshedEvent> {
 
 			@Override
@@ -362,7 +362,7 @@ public class SpringApplicationTests {
 	public void eventsOrder() {
 		SpringApplication application = new SpringApplication(ExampleConfig.class);
 		application.setWebApplicationType(WebApplicationType.NONE);
-		final List<ApplicationEvent> events = new ArrayList<ApplicationEvent>();
+		final List<ApplicationEvent> events = new ArrayList<>();
 		class ApplicationRunningEventListener
 				implements ApplicationListener<ApplicationEvent> {
 
@@ -749,7 +749,7 @@ public class SpringApplicationTests {
 		SpringApplication application = new SpringApplication(ExampleConfig.class,
 				ListenerConfig.class);
 		application.setApplicationContextClass(SpyApplicationContext.class);
-		final LinkedHashSet<ApplicationEvent> events = new LinkedHashSet<ApplicationEvent>();
+		final LinkedHashSet<ApplicationEvent> events = new LinkedHashSet<>();
 		application.addListeners(new ApplicationListener<ApplicationEvent>() {
 
 			@Override
@@ -769,7 +769,7 @@ public class SpringApplicationTests {
 		SpringApplication application = new SpringApplication(ExampleConfig.class,
 				ListenerConfig.class, Multicaster.class);
 		application.setApplicationContextClass(SpyApplicationContext.class);
-		final LinkedHashSet<ApplicationEvent> events = new LinkedHashSet<ApplicationEvent>();
+		final LinkedHashSet<ApplicationEvent> events = new LinkedHashSet<>();
 		application.addListeners(new ApplicationListener<ApplicationEvent>() {
 
 			@Override
@@ -1238,7 +1238,7 @@ public class SpringApplicationTests {
 
 	private static class MockResourceLoader implements ResourceLoader {
 
-		private final Map<String, Resource> resources = new HashMap<String, Resource>();
+		private final Map<String, Resource> resources = new HashMap<>();
 
 		public void addResource(String source, String path) {
 			this.resources.put(source, new ClassPathResource(path, getClass()));
diff --git a/spring-boot/src/test/java/org/springframework/boot/bind/BindingPreparationTests.java b/spring-boot/src/test/java/org/springframework/boot/bind/BindingPreparationTests.java
index a0bb1810fa..0c7640fbf0 100644
--- a/spring-boot/src/test/java/org/springframework/boot/bind/BindingPreparationTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/bind/BindingPreparationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -186,7 +186,7 @@ public class BindingPreparationTests {
 		// what the user is trying to bind it to, e.g. if nested[foo][bar] then it's a map
 		wrapper.setPropertyValue("nested[foo]", new LinkedHashMap<String, Object>());
 		// But it might equally well be a collection, if nested[foo][0]
-		wrapper.setPropertyValue("nested[foo]", new ArrayList<Object>());
+		wrapper.setPropertyValue("nested[foo]", new ArrayList<>());
 		// Then it would have to be actually bound to get the list to auto-grow
 		wrapper.setPropertyValue("nested[foo][0]", "bar");
 		assertThat(wrapper.getPropertyValue("nested[foo][0]")).isNotNull();
@@ -222,7 +222,7 @@ public class BindingPreparationTests {
 	@Ignore("Work in progress")
 	public void testExpressionLists() throws Exception {
 		TargetWithNestedMapOfListOfString target = new TargetWithNestedMapOfListOfString();
-		LinkedHashMap<String, List<String>> map = new LinkedHashMap<String, List<String>>();
+		LinkedHashMap<String, List<String>> map = new LinkedHashMap<>();
 		// map.put("foo", Arrays.asList("bar"));
 		target.setNested(map);
 		SpelExpressionParser parser = new SpelExpressionParser();
diff --git a/spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryMapTests.java b/spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryMapTests.java
index aa547f3099..03e661ba8f 100644
--- a/spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryMapTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryMapTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -108,7 +108,7 @@ public class PropertiesConfigurationFactoryMapTests {
 	}
 
 	private void setupFactory() throws IOException {
-		this.factory = new PropertiesConfigurationFactory<Foo>(Foo.class);
+		this.factory = new PropertiesConfigurationFactory<>(Foo.class);
 		this.factory.setValidator(this.validator);
 		this.factory.setTargetName(this.targetName);
 		this.factory.setIgnoreUnknownFields(this.ignoreUnknownFields);
@@ -118,7 +118,7 @@ public class PropertiesConfigurationFactoryMapTests {
 	// Foo needs to be public and to have setters for all properties
 	public static class Foo {
 
-		private Map<String, Object> map = new HashMap<String, Object>();
+		private Map<String, Object> map = new HashMap<>();
 
 		public Map<String, Object> getMap() {
 			return this.map;
diff --git a/spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryParameterizedTests.java b/spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryParameterizedTests.java
index 056abf5e9c..6f6645918d 100644
--- a/spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryParameterizedTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryParameterizedTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -45,7 +45,7 @@ public class PropertiesConfigurationFactoryParameterizedTests {
 
 	private String targetName;
 
-	private PropertiesConfigurationFactory<Foo> factory = new PropertiesConfigurationFactory<Foo>(
+	private PropertiesConfigurationFactory<Foo> factory = new PropertiesConfigurationFactory<>(
 			Foo.class);
 
 	@Parameters
diff --git a/spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryPerformanceTests.java b/spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryPerformanceTests.java
index f8e8a7ea6c..73dfb1b76b 100644
--- a/spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryPerformanceTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryPerformanceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -75,7 +75,7 @@ public class PropertiesConfigurationFactoryPerformanceTests {
 	}
 
 	private void setupFactory() throws IOException {
-		this.factory = new PropertiesConfigurationFactory<Foo>(Foo.class);
+		this.factory = new PropertiesConfigurationFactory<>(Foo.class);
 		this.factory.setValidator(this.validator);
 		this.factory.setTargetName(this.targetName);
 		this.factory.setIgnoreUnknownFields(this.ignoreUnknownFields);
diff --git a/spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryTests.java
index 8a4e36e7ac..06a0136a35 100644
--- a/spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/bind/PropertiesConfigurationFactoryTests.java
@@ -215,7 +215,7 @@ public class PropertiesConfigurationFactoryTests {
 	}
 
 	private void setupFactory() throws IOException {
-		this.factory = new PropertiesConfigurationFactory<Foo>(Foo.class);
+		this.factory = new PropertiesConfigurationFactory<>(Foo.class);
 		this.factory.setValidator(this.validator);
 		this.factory.setTargetName(this.targetName);
 		this.factory.setIgnoreUnknownFields(this.ignoreUnknownFields);
diff --git a/spring-boot/src/test/java/org/springframework/boot/bind/PropertySourcesPropertyValuesTests.java b/spring-boot/src/test/java/org/springframework/boot/bind/PropertySourcesPropertyValuesTests.java
index 5a94321c05..536111c3d5 100644
--- a/spring-boot/src/test/java/org/springframework/boot/bind/PropertySourcesPropertyValuesTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/bind/PropertySourcesPropertyValuesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -81,7 +81,7 @@ public class PropertySourcesPropertyValuesTests {
 
 	@Test
 	public void testOrderPreserved() {
-		LinkedHashMap<String, Object> map = new LinkedHashMap<String, Object>();
+		LinkedHashMap<String, Object> map = new LinkedHashMap<>();
 		map.put("one", 1);
 		map.put("two", 2);
 		map.put("three", 3);
@@ -92,7 +92,7 @@ public class PropertySourcesPropertyValuesTests {
 				this.propertySources);
 		PropertyValue[] values = propertyValues.getPropertyValues();
 		assertThat(values).hasSize(6);
-		Collection<String> names = new ArrayList<String>();
+		Collection<String> names = new ArrayList<>();
 		for (PropertyValue value : values) {
 			names.add(value.getName());
 		}
@@ -200,7 +200,7 @@ public class PropertySourcesPropertyValuesTests {
 	public void testCollectionProperty() throws Exception {
 		ListBean target = new ListBean();
 		DataBinder binder = new DataBinder(target);
-		Map<String, Object> map = new LinkedHashMap<String, Object>();
+		Map<String, Object> map = new LinkedHashMap<>();
 		map.put("list[0]", "v0");
 		map.put("list[1]", "v1");
 		this.propertySources.addFirst(new MapPropertySource("values", map));
@@ -212,9 +212,9 @@ public class PropertySourcesPropertyValuesTests {
 	public void testFirstCollectionPropertyWins() throws Exception {
 		ListBean target = new ListBean();
 		DataBinder binder = new DataBinder(target);
-		Map<String, Object> first = new LinkedHashMap<String, Object>();
+		Map<String, Object> first = new LinkedHashMap<>();
 		first.put("list[0]", "f0");
-		Map<String, Object> second = new LinkedHashMap<String, Object>();
+		Map<String, Object> second = new LinkedHashMap<>();
 		second.put("list[0]", "s0");
 		second.put("list[1]", "s1");
 		this.propertySources.addFirst(new MapPropertySource("s", second));
@@ -227,9 +227,9 @@ public class PropertySourcesPropertyValuesTests {
 	public void testFirstCollectionPropertyWinsNestedAttributes() throws Exception {
 		ListTestBean target = new ListTestBean();
 		DataBinder binder = new DataBinder(target);
-		Map<String, Object> first = new LinkedHashMap<String, Object>();
+		Map<String, Object> first = new LinkedHashMap<>();
 		first.put("list[0].description", "another description");
-		Map<String, Object> second = new LinkedHashMap<String, Object>();
+		Map<String, Object> second = new LinkedHashMap<>();
 		second.put("list[0].name", "first name");
 		second.put("list[0].description", "first description");
 		second.put("list[1].name", "second name");
@@ -283,7 +283,7 @@ public class PropertySourcesPropertyValuesTests {
 
 	public static class ListBean {
 
-		private List<String> list = new ArrayList<String>();
+		private List<String> list = new ArrayList<>();
 
 		public List<String> getList() {
 			return this.list;
@@ -297,7 +297,7 @@ public class PropertySourcesPropertyValuesTests {
 
 	public static class ListTestBean {
 
-		private List<TestBean> list = new ArrayList<TestBean>();
+		private List<TestBean> list = new ArrayList<>();
 
 		public List<TestBean> getList() {
 			return this.list;
diff --git a/spring-boot/src/test/java/org/springframework/boot/bind/RelaxedDataBinderTests.java b/spring-boot/src/test/java/org/springframework/boot/bind/RelaxedDataBinderTests.java
index 3c3665891d..c2a9285b51 100644
--- a/spring-boot/src/test/java/org/springframework/boot/bind/RelaxedDataBinderTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/bind/RelaxedDataBinderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -520,7 +520,7 @@ public class RelaxedDataBinderTests {
 
 	@Test
 	public void testBindMap() throws Exception {
-		Map<String, Object> target = new LinkedHashMap<String, Object>();
+		Map<String, Object> target = new LinkedHashMap<>();
 		BindingResult result = bind(target, "spam: bar\n" + "vanilla.value: 123",
 				"vanilla");
 		assertThat(result.getErrorCount()).isEqualTo(0);
@@ -529,7 +529,7 @@ public class RelaxedDataBinderTests {
 
 	@Test
 	public void testBindMapWithClashInProperties() throws Exception {
-		Map<String, Object> target = new LinkedHashMap<String, Object>();
+		Map<String, Object> target = new LinkedHashMap<>();
 		BindingResult result = bind(target,
 				"vanilla.spam: bar\n" + "vanilla.spam.value: 123", "vanilla");
 		assertThat(result.getErrorCount()).isEqualTo(0);
@@ -540,7 +540,7 @@ public class RelaxedDataBinderTests {
 
 	@Test
 	public void testBindMapWithDeepClashInProperties() throws Exception {
-		Map<String, Object> target = new LinkedHashMap<String, Object>();
+		Map<String, Object> target = new LinkedHashMap<>();
 		BindingResult result = bind(target,
 				"vanilla.spam.foo: bar\n" + "vanilla.spam.foo.value: 123", "vanilla");
 		assertThat(result.getErrorCount()).isEqualTo(0);
@@ -551,7 +551,7 @@ public class RelaxedDataBinderTests {
 
 	@Test
 	public void testBindMapWithDifferentDeepClashInProperties() throws Exception {
-		Map<String, Object> target = new LinkedHashMap<String, Object>();
+		Map<String, Object> target = new LinkedHashMap<>();
 		BindingResult result = bind(target,
 				"vanilla.spam.bar: bar\n" + "vanilla.spam.bar.value: 123", "vanilla");
 		assertThat(result.getErrorCount()).isEqualTo(0);
@@ -562,7 +562,7 @@ public class RelaxedDataBinderTests {
 
 	@Test
 	public void testBindShallowMap() throws Exception {
-		Map<String, Object> target = new LinkedHashMap<String, Object>();
+		Map<String, Object> target = new LinkedHashMap<>();
 		BindingResult result = bind(target, "vanilla.spam: bar\n" + "vanilla.value: 123",
 				"vanilla");
 		assertThat(result.getErrorCount()).isEqualTo(0);
@@ -571,7 +571,7 @@ public class RelaxedDataBinderTests {
 
 	@Test
 	public void testBindMapNestedMap() throws Exception {
-		Map<String, Object> target = new LinkedHashMap<String, Object>();
+		Map<String, Object> target = new LinkedHashMap<>();
 		BindingResult result = bind(target, "spam: bar\n" + "vanilla.foo.value: 123",
 				"vanilla");
 		assertThat(result.getErrorCount()).isEqualTo(0);
@@ -583,7 +583,7 @@ public class RelaxedDataBinderTests {
 	@SuppressWarnings("unchecked")
 	@Test
 	public void testBindOverlappingNestedMaps() throws Exception {
-		Map<String, Object> target = new LinkedHashMap<String, Object>();
+		Map<String, Object> target = new LinkedHashMap<>();
 		BindingResult result = bind(target, "a.b.c.d: abc\na.b.c1.d1: efg");
 		assertThat(result.getErrorCount()).isEqualTo(0);
 
@@ -941,7 +941,7 @@ public class RelaxedDataBinderTests {
 
 	public static class TargetWithReadOnlyNestedList {
 
-		private final List<String> nested = new ArrayList<String>();
+		private final List<String> nested = new ArrayList<>();
 
 		public List<String> getNested() {
 			return this.nested;
@@ -961,7 +961,7 @@ public class RelaxedDataBinderTests {
 
 	public static class TargetWithReadOnlyNestedCollection {
 
-		private final Collection<String> nested = new ArrayList<String>();
+		private final Collection<String> nested = new ArrayList<>();
 
 		public Collection<String> getNested() {
 			return this.nested;
@@ -971,7 +971,7 @@ public class RelaxedDataBinderTests {
 
 	public static class TargetWithNestedSet {
 
-		private Set<String> nested = new LinkedHashSet<String>();
+		private Set<String> nested = new LinkedHashSet<>();
 
 		public Set<String> getNested() {
 			return this.nested;
diff --git a/spring-boot/src/test/java/org/springframework/boot/bind/RelaxedPropertyResolverTests.java b/spring-boot/src/test/java/org/springframework/boot/bind/RelaxedPropertyResolverTests.java
index 353a5f54a1..a73d0c8829 100644
--- a/spring-boot/src/test/java/org/springframework/boot/bind/RelaxedPropertyResolverTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/bind/RelaxedPropertyResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -52,7 +52,7 @@ public class RelaxedPropertyResolverTests {
 	@Before
 	public void setup() {
 		this.environment = new StandardEnvironment();
-		this.source = new LinkedHashMap<String, Object>();
+		this.source = new LinkedHashMap<>();
 		this.source.put("myString", "value");
 		this.source.put("myobject", "object");
 		this.source.put("myInteger", 123);
diff --git a/spring-boot/src/test/java/org/springframework/boot/bind/SpringApplicationBindContextLoader.java b/spring-boot/src/test/java/org/springframework/boot/bind/SpringApplicationBindContextLoader.java
index 4667e6234d..ad44ba61ec 100644
--- a/spring-boot/src/test/java/org/springframework/boot/bind/SpringApplicationBindContextLoader.java
+++ b/spring-boot/src/test/java/org/springframework/boot/bind/SpringApplicationBindContextLoader.java
@@ -50,7 +50,7 @@ class SpringApplicationBindContextLoader extends AbstractContextLoader {
 		application.setSources(
 				new LinkedHashSet<Object>(Arrays.asList(config.getClasses())));
 		ConfigurableEnvironment environment = new StandardEnvironment();
-		Map<String, Object> properties = new LinkedHashMap<String, Object>();
+		Map<String, Object> properties = new LinkedHashMap<>();
 		properties.put("spring.jmx.enabled", "false");
 		properties.putAll(TestPropertySourceUtils
 				.convertInlinedPropertiesToMap(config.getPropertySourceProperties()));
diff --git a/spring-boot/src/test/java/org/springframework/boot/bind/YamlConfigurationFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/bind/YamlConfigurationFactoryTests.java
index 34fee841e6..eb4270acc7 100644
--- a/spring-boot/src/test/java/org/springframework/boot/bind/YamlConfigurationFactoryTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/bind/YamlConfigurationFactoryTests.java
@@ -42,11 +42,10 @@ public class YamlConfigurationFactoryTests {
 
 	private Validator validator;
 
-	private final Map<Class<?>, Map<String, String>> aliases = new HashMap<Class<?>, Map<String, String>>();
+	private final Map<Class<?>, Map<String, String>> aliases = new HashMap<>();
 
 	private Foo createFoo(final String yaml) throws Exception {
-		YamlConfigurationFactory<Foo> factory = new YamlConfigurationFactory<Foo>(
-				Foo.class);
+		YamlConfigurationFactory<Foo> factory = new YamlConfigurationFactory<>(Foo.class);
 		factory.setYaml(yaml);
 		factory.setPropertyAliases(this.aliases);
 		factory.setValidator(this.validator);
@@ -56,8 +55,7 @@ public class YamlConfigurationFactoryTests {
 	}
 
 	private Jee createJee(final String yaml) throws Exception {
-		YamlConfigurationFactory<Jee> factory = new YamlConfigurationFactory<Jee>(
-				Jee.class);
+		YamlConfigurationFactory<Jee> factory = new YamlConfigurationFactory<>(Jee.class);
 		factory.setYaml(yaml);
 		factory.setPropertyAliases(this.aliases);
 		factory.setValidator(this.validator);
diff --git a/spring-boot/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderTests.java b/spring-boot/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderTests.java
index caa492d30f..37f52fe72d 100644
--- a/spring-boot/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/builder/SpringApplicationBuilderTests.java
@@ -284,7 +284,8 @@ public class SpringApplicationBuilderTests {
 	@Test
 	public void initializersCreatedOnceForChild() throws Exception {
 		SpringApplicationBuilder application = new SpringApplicationBuilder(
-				ExampleConfig.class).child(ChildConfig.class).web(WebApplicationType.NONE);
+				ExampleConfig.class).child(ChildConfig.class)
+						.web(WebApplicationType.NONE);
 		this.context = application.run();
 		assertThat(application.application().getInitializers()).hasSize(5);
 	}
diff --git a/spring-boot/src/test/java/org/springframework/boot/context/ConfigurationWarningsApplicationContextInitializerTests.java b/spring-boot/src/test/java/org/springframework/boot/context/ConfigurationWarningsApplicationContextInitializerTests.java
index ef7bb22e58..5d6e337444 100644
--- a/spring-boot/src/test/java/org/springframework/boot/context/ConfigurationWarningsApplicationContextInitializerTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/ConfigurationWarningsApplicationContextInitializerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -149,7 +149,7 @@ public class ConfigurationWarningsApplicationContextInitializerTests {
 		protected Set<String> getComponentScanningPackages(
 				BeanDefinitionRegistry registry) {
 			Set<String> scannedPackages = super.getComponentScanningPackages(registry);
-			Set<String> result = new LinkedHashSet<String>();
+			Set<String> result = new LinkedHashSet<>();
 			for (String scannedPackage : scannedPackages) {
 				if (scannedPackage.endsWith("dflt")) {
 					result.add("");
diff --git a/spring-boot/src/test/java/org/springframework/boot/context/config/AnsiOutputApplicationListenerTests.java b/spring-boot/src/test/java/org/springframework/boot/context/config/AnsiOutputApplicationListenerTests.java
index 086f8cb7cf..a544a8035c 100644
--- a/spring-boot/src/test/java/org/springframework/boot/context/config/AnsiOutputApplicationListenerTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/config/AnsiOutputApplicationListenerTests.java
@@ -62,7 +62,7 @@ public class AnsiOutputApplicationListenerTests {
 	public void enabled() {
 		SpringApplication application = new SpringApplication(Config.class);
 		application.setWebApplicationType(WebApplicationType.NONE);
-		Map<String, Object> props = new HashMap<String, Object>();
+		Map<String, Object> props = new HashMap<>();
 		props.put("spring.output.ansi.enabled", "ALWAYS");
 		application.setDefaultProperties(props);
 		this.context = application.run();
@@ -73,7 +73,7 @@ public class AnsiOutputApplicationListenerTests {
 	public void disabled() throws Exception {
 		SpringApplication application = new SpringApplication(Config.class);
 		application.setWebApplicationType(WebApplicationType.NONE);
-		Map<String, Object> props = new HashMap<String, Object>();
+		Map<String, Object> props = new HashMap<>();
 		props.put("spring.output.ansi.enabled", "never");
 		application.setDefaultProperties(props);
 		this.context = application.run();
diff --git a/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java b/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java
index a13e833b77..36e447b9ed 100644
--- a/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/config/ConfigFileApplicationListenerTests.java
@@ -508,7 +508,7 @@ public class ConfigFileApplicationListenerTests {
 		Collection<org.springframework.core.env.PropertySource<?>> sources = propertySource
 				.getSource();
 		assertThat(sources).hasSize(2);
-		List<String> names = new ArrayList<String>();
+		List<String> names = new ArrayList<>();
 		for (org.springframework.core.env.PropertySource<?> source : sources) {
 			if (source instanceof EnumerableCompositePropertySource) {
 				for (org.springframework.core.env.PropertySource<?> nested : ((EnumerableCompositePropertySource) source)
@@ -818,7 +818,7 @@ public class ConfigFileApplicationListenerTests {
 	@Test
 	public void activeProfilesCanBeConfiguredUsingPlaceholdersResolvedAgainstTheEnvironment()
 			throws Exception {
-		Map<String, Object> source = new HashMap<String, Object>();
+		Map<String, Object> source = new HashMap<>();
 		source.put("activeProfile", "testPropertySource");
 		org.springframework.core.env.PropertySource<?> propertySource = new MapPropertySource(
 				"test", source);
@@ -911,7 +911,7 @@ public class ConfigFileApplicationListenerTests {
 
 		@Override
 		List<EnvironmentPostProcessor> loadPostProcessors() {
-			return new ArrayList<EnvironmentPostProcessor>(
+			return new ArrayList<>(
 					Arrays.asList(new LowestPrecedenceEnvironmentPostProcessor()));
 		}
 
diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
index 8ab2157bb3..0405e8031b 100644
--- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
@@ -236,7 +236,7 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
 	public void startServletAndFilter() throws Exception {
 		AbstractEmbeddedServletContainerFactory factory = getFactory();
 		this.container = factory.getEmbeddedServletContainer(exampleServletRegistration(),
-				new FilterRegistrationBean<ExampleFilter>(new ExampleFilter()));
+				new FilterRegistrationBean<>(new ExampleFilter()));
 		this.container.start();
 		assertThat(getResponse(getLocalUrl("/hello"))).isEqualTo("[Hello World]");
 	}
@@ -409,9 +409,8 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
 		Ssl ssl = getSsl(null, "password", "classpath:test.jks");
 		ssl.setEnabled(false);
 		factory.setSsl(ssl);
-		this.container = factory
-				.getEmbeddedServletContainer(new ServletRegistrationBean<ExampleServlet>(
-						new ExampleServlet(true, false), "/hello"));
+		this.container = factory.getEmbeddedServletContainer(
+				new ServletRegistrationBean<>(new ExampleServlet(true, false), "/hello"));
 		this.container.start();
 		SSLConnectionSocketFactory socketFactory = new SSLConnectionSocketFactory(
 				new SSLContextBuilder()
@@ -428,9 +427,8 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
 	public void sslGetScheme() throws Exception { // gh-2232
 		AbstractEmbeddedServletContainerFactory factory = getFactory();
 		factory.setSsl(getSsl(null, "password", "src/test/resources/test.jks"));
-		this.container = factory
-				.getEmbeddedServletContainer(new ServletRegistrationBean<ExampleServlet>(
-						new ExampleServlet(true, false), "/hello"));
+		this.container = factory.getEmbeddedServletContainer(
+				new ServletRegistrationBean<>(new ExampleServlet(true, false), "/hello"));
 		this.container.start();
 		SSLConnectionSocketFactory socketFactory = new SSLConnectionSocketFactory(
 				new SSLContextBuilder()
@@ -447,9 +445,8 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
 	public void serverHeaderIsDisabledByDefaultWhenUsingSsl() throws Exception {
 		AbstractEmbeddedServletContainerFactory factory = getFactory();
 		factory.setSsl(getSsl(null, "password", "src/test/resources/test.jks"));
-		this.container = factory
-				.getEmbeddedServletContainer(new ServletRegistrationBean<ExampleServlet>(
-						new ExampleServlet(true, false), "/hello"));
+		this.container = factory.getEmbeddedServletContainer(
+				new ServletRegistrationBean<>(new ExampleServlet(true, false), "/hello"));
 		this.container.start();
 		SSLConnectionSocketFactory socketFactory = new SSLConnectionSocketFactory(
 				new SSLContextBuilder()
@@ -466,9 +463,8 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
 		AbstractEmbeddedServletContainerFactory factory = getFactory();
 		factory.setServerHeader("MyServer");
 		factory.setSsl(getSsl(null, "password", "src/test/resources/test.jks"));
-		this.container = factory
-				.getEmbeddedServletContainer(new ServletRegistrationBean<ExampleServlet>(
-						new ExampleServlet(true, false), "/hello"));
+		this.container = factory.getEmbeddedServletContainer(
+				new ServletRegistrationBean<>(new ExampleServlet(true, false), "/hello"));
 		this.container.start();
 		SSLConnectionSocketFactory socketFactory = new SSLConnectionSocketFactory(
 				new SSLContextBuilder()
@@ -689,9 +685,8 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
 		AbstractEmbeddedServletContainerFactory factory = getFactory();
 		factory.setSsl(getSsl(null, "password", "src/test/resources/test.jks", null,
 				protocols, ciphers));
-		this.container = factory
-				.getEmbeddedServletContainer(new ServletRegistrationBean<ExampleServlet>(
-						new ExampleServlet(true, false), "/hello"));
+		this.container = factory.getEmbeddedServletContainer(
+				new ServletRegistrationBean<>(new ExampleServlet(true, false), "/hello"));
 		this.container.start();
 
 		SSLConnectionSocketFactory socketFactory = new SSLConnectionSocketFactory(
@@ -811,9 +806,8 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
 		Compression compression = new Compression();
 		compression.setEnabled(true);
 		factory.setCompression(compression);
-		this.container = factory
-				.getEmbeddedServletContainer(new ServletRegistrationBean<ExampleServlet>(
-						new ExampleServlet(false, true), "/hello"));
+		this.container = factory.getEmbeddedServletContainer(
+				new ServletRegistrationBean<>(new ExampleServlet(false, true), "/hello"));
 		this.container.start();
 		TestGzipInputStreamFactory inputStreamFactory = new TestGzipInputStreamFactory();
 		Map<String, InputStreamFactory> contentDecoderMap = Collections
@@ -845,7 +839,7 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
 	@Test
 	public void rootServletContextResource() throws Exception {
 		AbstractEmbeddedServletContainerFactory factory = getFactory();
-		final AtomicReference<URL> rootResource = new AtomicReference<URL>();
+		final AtomicReference<URL> rootResource = new AtomicReference<>();
 		this.container = factory
 				.getEmbeddedServletContainer(new ServletContextInitializer() {
 					@Override
@@ -934,7 +928,7 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
 	@Test
 	public void localeCharsetMappingsAreConfigured() throws Exception {
 		AbstractEmbeddedServletContainerFactory factory = getFactory();
-		Map<Locale, Charset> mappings = new HashMap<Locale, Charset>();
+		Map<Locale, Charset> mappings = new HashMap<>();
 		mappings.put(Locale.GERMAN, Charset.forName("UTF-8"));
 		factory.setLocaleCharsetMappings(mappings);
 		this.container = factory.getEmbeddedServletContainer();
@@ -944,7 +938,7 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
 
 	@Test
 	public void jspServletInitParameters() throws Exception {
-		Map<String, String> initParameters = new HashMap<String, String>();
+		Map<String, String> initParameters = new HashMap<>();
 		initParameters.put("a", "alpha");
 		AbstractEmbeddedServletContainerFactory factory = getFactory();
 		factory.getJsp().setInitParameters(initParameters);
@@ -1123,9 +1117,8 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
 
 	protected void assertForwardHeaderIsUsed(EmbeddedServletContainerFactory factory)
 			throws IOException, URISyntaxException {
-		this.container = factory
-				.getEmbeddedServletContainer(new ServletRegistrationBean<ExampleServlet>(
-						new ExampleServlet(true, false), "/hello"));
+		this.container = factory.getEmbeddedServletContainer(
+				new ServletRegistrationBean<>(new ExampleServlet(true, false), "/hello"));
 		this.container.start();
 		assertThat(getResponse(getLocalUrl("/hello"), "X-Forwarded-For:140.211.11.130"))
 				.contains("remoteaddr=140.211.11.130");
@@ -1137,13 +1130,12 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
 			throws Exception;
 
 	protected ServletContextInitializer exampleServletRegistration() {
-		return new ServletRegistrationBean<ExampleServlet>(new ExampleServlet(),
-				"/hello");
+		return new ServletRegistrationBean<>(new ExampleServlet(), "/hello");
 	}
 
 	@SuppressWarnings("serial")
 	private ServletContextInitializer errorServletRegistration() {
-		ServletRegistrationBean<ExampleServlet> bean = new ServletRegistrationBean<ExampleServlet>(
+		ServletRegistrationBean<ExampleServlet> bean = new ServletRegistrationBean<>(
 				new ExampleServlet() {
 
 					@Override
@@ -1158,7 +1150,7 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
 	}
 
 	protected final ServletContextInitializer sessionServletRegistration() {
-		ServletRegistrationBean<ExampleServlet> bean = new ServletRegistrationBean<ExampleServlet>(
+		ServletRegistrationBean<ExampleServlet> bean = new ServletRegistrationBean<>(
 				new ExampleServlet() {
 
 					@Override
diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java
index a2f71c8161..4c53f0c2ed 100644
--- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java
@@ -191,7 +191,7 @@ public class EmbeddedServletContainerMvcIntegrationTests {
 
 		@Bean
 		public ServletRegistrationBean<DispatcherServlet> dispatcherRegistration() {
-			ServletRegistrationBean<DispatcherServlet> registration = new ServletRegistrationBean<DispatcherServlet>(
+			ServletRegistrationBean<DispatcherServlet> registration = new ServletRegistrationBean<>(
 					dispatcherServlet());
 			registration.addUrlMappings("/spring/*");
 			return registration;
diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/EmbeddedWebApplicationContextTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/EmbeddedWebApplicationContextTests.java
index 522b1c278c..e3cb540451 100644
--- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/EmbeddedWebApplicationContextTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/EmbeddedWebApplicationContextTests.java
@@ -228,7 +228,7 @@ public class EmbeddedWebApplicationContextTests {
 		addEmbeddedServletContainerFactoryBean();
 		OrderedFilter filter = new OrderedFilter();
 		this.context.registerBeanDefinition("filterBean", beanDefinition(filter));
-		FilterRegistrationBean<Filter> registration = new FilterRegistrationBean<Filter>();
+		FilterRegistrationBean<Filter> registration = new FilterRegistrationBean<>();
 		registration.setFilter(mock(Filter.class));
 		registration.setOrder(100);
 		this.context.registerBeanDefinition("filterRegistrationBean",
@@ -387,7 +387,7 @@ public class EmbeddedWebApplicationContextTests {
 		addEmbeddedServletContainerFactoryBean();
 		Servlet servlet = mock(Servlet.class);
 		Filter filter = mock(Filter.class);
-		ServletRegistrationBean<Servlet> initializer = new ServletRegistrationBean<Servlet>(
+		ServletRegistrationBean<Servlet> initializer = new ServletRegistrationBean<>(
 				servlet, "/foo");
 		this.context.registerBeanDefinition("initializerBean",
 				beanDefinition(initializer));
@@ -404,8 +404,7 @@ public class EmbeddedWebApplicationContextTests {
 	public void filterRegistrationBeansSkipsRegisteredFilters() throws Exception {
 		addEmbeddedServletContainerFactoryBean();
 		Filter filter = mock(Filter.class);
-		FilterRegistrationBean<Filter> initializer = new FilterRegistrationBean<Filter>(
-				filter);
+		FilterRegistrationBean<Filter> initializer = new FilterRegistrationBean<>(filter);
 		this.context.registerBeanDefinition("initializerBean",
 				beanDefinition(initializer));
 		this.context.registerBeanDefinition("filterBean", beanDefinition(filter));
diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/MimeMappingsTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/MimeMappingsTests.java
index 65bbe3db0b..295cdf8bdd 100644
--- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/MimeMappingsTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/MimeMappingsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -54,7 +54,7 @@ public class MimeMappingsTests {
 
 	@Test
 	public void createFromMap() throws Exception {
-		Map<String, String> mappings = new HashMap<String, String>();
+		Map<String, String> mappings = new HashMap<>();
 		mappings.put("foo", "bar");
 		MimeMappings clone = new MimeMappings(mappings);
 		mappings.put("baz", "bar");
@@ -67,7 +67,7 @@ public class MimeMappingsTests {
 		MimeMappings mappings = new MimeMappings();
 		mappings.add("foo", "bar");
 		mappings.add("baz", "boo");
-		List<MimeMappings.Mapping> mappingList = new ArrayList<MimeMappings.Mapping>();
+		List<MimeMappings.Mapping> mappingList = new ArrayList<>();
 		for (MimeMappings.Mapping mapping : mappings) {
 			mappingList.add(mapping);
 		}
@@ -82,7 +82,7 @@ public class MimeMappingsTests {
 		MimeMappings mappings = new MimeMappings();
 		mappings.add("foo", "bar");
 		mappings.add("baz", "boo");
-		List<MimeMappings.Mapping> mappingList = new ArrayList<MimeMappings.Mapping>();
+		List<MimeMappings.Mapping> mappingList = new ArrayList<>();
 		mappingList.addAll(mappings.getAll());
 		assertThat(mappingList.get(0).getExtension()).isEqualTo("foo");
 		assertThat(mappingList.get(0).getMimeType()).isEqualTo("bar");
diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/MockEmbeddedServletContainerFactory.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/MockEmbeddedServletContainerFactory.java
index af3c28095c..064893f4c7 100644
--- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/MockEmbeddedServletContainerFactory.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/MockEmbeddedServletContainerFactory.java
@@ -86,9 +86,9 @@ public class MockEmbeddedServletContainerFactory
 
 		private final ServletContextInitializer[] initializers;
 
-		private final List<RegisteredServlet> registeredServlets = new ArrayList<RegisteredServlet>();
+		private final List<RegisteredServlet> registeredServlets = new ArrayList<>();
 
-		private final List<RegisteredFilter> registeredFilters = new ArrayList<RegisteredFilter>();
+		private final List<RegisteredFilter> registeredFilters = new ArrayList<>();
 
 		private final int port;
 
@@ -126,7 +126,7 @@ public class MockEmbeddedServletContainerFactory
 								return registeredFilter.getRegistration();
 							}
 						});
-				final Map<String, String> initParameters = new HashMap<String, String>();
+				final Map<String, String> initParameters = new HashMap<>();
 				given(this.servletContext.setInitParameter(anyString(), anyString()))
 						.will(new Answer<Void>() {
 							@Override
@@ -199,7 +199,7 @@ public class MockEmbeddedServletContainerFactory
 
 		private static class EmptyEnumeration<E> implements Enumeration<E> {
 
-			static final EmptyEnumeration<Object> EMPTY_ENUMERATION = new EmptyEnumeration<Object>();
+			static final EmptyEnumeration<Object> EMPTY_ENUMERATION = new EmptyEnumeration<>();
 
 			@Override
 			public boolean hasMoreElements() {
diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/undertow/FileSessionPersistenceTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/undertow/FileSessionPersistenceTests.java
index e0c470e01e..482c1706e4 100644
--- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/undertow/FileSessionPersistenceTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/undertow/FileSessionPersistenceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -63,8 +63,8 @@ public class FileSessionPersistenceTests {
 
 	@Test
 	public void persistAndLoad() throws Exception {
-		Map<String, PersistentSession> sessionData = new LinkedHashMap<String, PersistentSession>();
-		Map<String, Object> data = new LinkedHashMap<String, Object>();
+		Map<String, PersistentSession> sessionData = new LinkedHashMap<>();
+		Map<String, Object> data = new LinkedHashMap<>();
 		data.put("spring", "boot");
 		PersistentSession session = new PersistentSession(this.expiration, data);
 		sessionData.put("abc", session);
@@ -79,8 +79,8 @@ public class FileSessionPersistenceTests {
 	@Test
 	public void dontRestoreExpired() throws Exception {
 		Date expired = new Date(System.currentTimeMillis() - 1000);
-		Map<String, PersistentSession> sessionData = new LinkedHashMap<String, PersistentSession>();
-		Map<String, Object> data = new LinkedHashMap<String, Object>();
+		Map<String, PersistentSession> sessionData = new LinkedHashMap<>();
+		Map<String, Object> data = new LinkedHashMap<>();
 		data.put("spring", "boot");
 		PersistentSession session = new PersistentSession(expired, data);
 		sessionData.put("abc", session);
@@ -94,7 +94,7 @@ public class FileSessionPersistenceTests {
 	@Test
 	public void deleteFileOnClear() throws Exception {
 		File sessionFile = new File(this.dir, "test.session");
-		Map<String, PersistentSession> sessionData = new LinkedHashMap<String, PersistentSession>();
+		Map<String, PersistentSession> sessionData = new LinkedHashMap<>();
 		this.persistence.persistSessions("test", sessionData);
 		assertThat(sessionFile.exists()).isTrue();
 		this.persistence.clear("test");
diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactoryTests.java
index a3c9a98875..bd4891fed8 100644
--- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactoryTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/undertow/UndertowEmbeddedServletContainerFactoryTests.java
@@ -73,8 +73,7 @@ public class UndertowEmbeddedServletContainerFactoryTests
 		AbstractEmbeddedServletContainerFactory factory = getFactory();
 		factory.addErrorPages(new ErrorPage(HttpStatus.NOT_FOUND, "/hello"));
 		this.container = factory.getEmbeddedServletContainer(
-				new ServletRegistrationBean<ExampleServlet>(new ExampleServlet(),
-						"/hello"));
+				new ServletRegistrationBean<>(new ExampleServlet(), "/hello"));
 		this.container.start();
 		assertThat(getResponse(getLocalUrl("/hello"))).isEqualTo("Hello World");
 		assertThat(getResponse(getLocalUrl("/not-found"))).isEqualTo("Hello World");
@@ -153,7 +152,7 @@ public class UndertowEmbeddedServletContainerFactoryTests
 	@Test
 	public void defaultContextPath() throws Exception {
 		UndertowEmbeddedServletContainerFactory factory = getFactory();
-		final AtomicReference<String> contextPath = new AtomicReference<String>();
+		final AtomicReference<String> contextPath = new AtomicReference<>();
 		factory.addDeploymentInfoCustomizers(new UndertowDeploymentInfoCustomizer() {
 
 			@Override
@@ -200,8 +199,7 @@ public class UndertowEmbeddedServletContainerFactoryTests
 		factory.setAccessLogDirectory(accessLogDirectory);
 		assertThat(accessLogDirectory.listFiles()).isEmpty();
 		this.container = factory.getEmbeddedServletContainer(
-				new ServletRegistrationBean<ExampleServlet>(new ExampleServlet(),
-						"/hello"));
+				new ServletRegistrationBean<>(new ExampleServlet(), "/hello"));
 		this.container.start();
 		assertThat(getResponse(getLocalUrl("/hello"))).isEqualTo("Hello World");
 		File accessLog = new File(accessLogDirectory, expectedFile);
@@ -281,8 +279,7 @@ public class UndertowEmbeddedServletContainerFactoryTests
 	protected Collection<Mapping> getExpectedMimeMappings() {
 		// Unlike Tomcat and Jetty, Undertow performs a case-sensitive match on file
 		// extension so it has a mapping for "z" and "Z".
-		Set<Mapping> expectedMappings = new HashSet<Mapping>(
-				super.getExpectedMimeMappings());
+		Set<Mapping> expectedMappings = new HashSet<>(super.getExpectedMimeMappings());
 		expectedMappings.add(new Mapping("Z", "application/x-compress"));
 		return expectedMappings;
 	}
diff --git a/spring-boot/src/test/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesTests.java b/spring-boot/src/test/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesTests.java
index 956512fa88..3f3b16befc 100644
--- a/spring-boot/src/test/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/properties/EnableConfigurationPropertiesTests.java
@@ -228,7 +228,7 @@ public class EnableConfigurationPropertiesTests {
 	@Test
 	public void testCollectionPropertiesBindingWithOver256Elements() {
 		this.context.register(TestConfiguration.class);
-		List<String> pairs = new ArrayList<String>();
+		List<String> pairs = new ArrayList<>();
 		pairs.add("name:foo");
 		for (int i = 0; i < 1000; i++) {
 			pairs.add("list[" + i + "]:" + i);
@@ -290,11 +290,9 @@ public class EnableConfigurationPropertiesTests {
 
 	@Test
 	public void testBindingWithParentContext() {
-		AnnotationConfigApplicationContext parent =
-				new AnnotationConfigApplicationContext();
+		AnnotationConfigApplicationContext parent = new AnnotationConfigApplicationContext();
 		parent.register(TestConfiguration.class);
-		TestPropertySourceUtils.addInlinedPropertiesToEnvironment(parent,
-				"name=parent");
+		TestPropertySourceUtils.addInlinedPropertiesToEnvironment(parent, "name=parent");
 		parent.refresh();
 		this.context.setParent(parent);
 		TestPropertySourceUtils.addInlinedPropertiesToEnvironment(this.context,
@@ -303,8 +301,7 @@ public class EnableConfigurationPropertiesTests {
 		this.context.refresh();
 		assertThat(this.context.getBeanNamesForType(TestProperties.class).length)
 				.isEqualTo(0);
-		assertThat(parent.getBeanNamesForType(TestProperties.class).length)
-				.isEqualTo(1);
+		assertThat(parent.getBeanNamesForType(TestProperties.class).length).isEqualTo(1);
 		assertThat(this.context.getBean(TestConsumer.class).getName())
 				.isEqualTo("parent");
 		parent.close();
@@ -626,7 +623,7 @@ public class EnableConfigurationPropertiesTests {
 
 		private int[] array;
 
-		private final List<Integer> list = new ArrayList<Integer>();
+		private final List<Integer> list = new ArrayList<>();
 
 		// No getter - you should be able to bind to a write-only bean
 
diff --git a/spring-boot/src/test/java/org/springframework/boot/diagnostics/FailureAnalyzersIntegrationTests.java b/spring-boot/src/test/java/org/springframework/boot/diagnostics/FailureAnalyzersIntegrationTests.java
index fcda319c33..7da7e32b35 100644
--- a/spring-boot/src/test/java/org/springframework/boot/diagnostics/FailureAnalyzersIntegrationTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/diagnostics/FailureAnalyzersIntegrationTests.java
@@ -43,8 +43,8 @@ public class FailureAnalyzersIntegrationTests {
 	@Test
 	public void analysisIsPerformed() {
 		try {
-			new SpringApplicationBuilder(TestConfiguration.class).web(WebApplicationType.NONE)
-					.run();
+			new SpringApplicationBuilder(TestConfiguration.class)
+					.web(WebApplicationType.NONE).run();
 			fail("Application started successfully");
 		}
 		catch (Exception ex) {
diff --git a/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BeanCurrentlyInCreationFailureAnalyzerTests.java b/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BeanCurrentlyInCreationFailureAnalyzerTests.java
index 0067c03d39..4b7fca5564 100644
--- a/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BeanCurrentlyInCreationFailureAnalyzerTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BeanCurrentlyInCreationFailureAnalyzerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -121,7 +121,7 @@ public class BeanCurrentlyInCreationFailureAnalyzerTests {
 		BufferedReader lineReader = new BufferedReader(
 				new StringReader(analysis.getDescription()));
 		try {
-			List<String> lines = new ArrayList<String>();
+			List<String> lines = new ArrayList<>();
 			String line;
 			while ((line = lineReader.readLine()) != null) {
 				lines.add(line);
diff --git a/spring-boot/src/test/java/org/springframework/boot/env/YamlPropertySourceLoaderTests.java b/spring-boot/src/test/java/org/springframework/boot/env/YamlPropertySourceLoaderTests.java
index 5804df513e..fa824a1770 100644
--- a/spring-boot/src/test/java/org/springframework/boot/env/YamlPropertySourceLoaderTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/env/YamlPropertySourceLoaderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -50,7 +50,7 @@ public class YamlPropertySourceLoaderTests {
 	@Test
 	public void orderedItems() throws Exception {
 		StringBuilder yaml = new StringBuilder();
-		List<String> expected = new ArrayList<String>();
+		List<String> expected = new ArrayList<>();
 		for (char c = 'a'; c <= 'z'; c++) {
 			yaml.append(c + ": value" + c + "\n");
 			expected.add(String.valueOf(c));
diff --git a/spring-boot/src/test/java/org/springframework/boot/jackson/JsonObjectDeserializerTests.java b/spring-boot/src/test/java/org/springframework/boot/jackson/JsonObjectDeserializerTests.java
index 1b6bf6e4cc..d7f0048cde 100644
--- a/spring-boot/src/test/java/org/springframework/boot/jackson/JsonObjectDeserializerTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/jackson/JsonObjectDeserializerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -48,7 +48,7 @@ public class JsonObjectDeserializerTests {
 	@Rule
 	public ExpectedException thrown = ExpectedException.none();
 
-	private TestJsonObjectDeserializer<Object> testDeserializer = new TestJsonObjectDeserializer<Object>();
+	private TestJsonObjectDeserializer<Object> testDeserializer = new TestJsonObjectDeserializer<>();
 
 	@Test
 	public void deserializeObjectShouldReadJson() throws Exception {
diff --git a/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverClassNameTests.java b/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverClassNameTests.java
index e4bcfa109c..e9b0480655 100644
--- a/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverClassNameTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverClassNameTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -52,7 +52,7 @@ public class DatabaseDriverClassNameTests {
 	@Parameters(name = "{0} {2}")
 	public static List<Object[]> parameters() {
 		DatabaseDriver[] databaseDrivers = DatabaseDriver.values();
-		List<Object[]> parameters = new ArrayList<Object[]>();
+		List<Object[]> parameters = new ArrayList<>();
 		for (DatabaseDriver databaseDriver : databaseDrivers) {
 			if (excludedDrivers.contains(databaseDriver)) {
 				continue;
@@ -83,7 +83,7 @@ public class DatabaseDriverClassNameTests {
 		// Use ASM to avoid unwanted side-effects of loading JDBC drivers
 		ClassReader classReader = new ClassReader(
 				getClass().getResourceAsStream("/" + className + ".class"));
-		List<String> interfaceNames = new ArrayList<String>();
+		List<String> interfaceNames = new ArrayList<>();
 		for (String name : classReader.getInterfaces()) {
 			interfaceNames.add(name);
 			interfaceNames.addAll(getInterfaceNames(name));
diff --git a/spring-boot/src/test/java/org/springframework/boot/jta/atomikos/AtomikosDependsOnBeanFactoryPostProcessorTests.java b/spring-boot/src/test/java/org/springframework/boot/jta/atomikos/AtomikosDependsOnBeanFactoryPostProcessorTests.java
index 9b1c8fbf3e..e7413d92f1 100644
--- a/spring-boot/src/test/java/org/springframework/boot/jta/atomikos/AtomikosDependsOnBeanFactoryPostProcessorTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/jta/atomikos/AtomikosDependsOnBeanFactoryPostProcessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -59,9 +59,9 @@ public class AtomikosDependsOnBeanFactoryPostProcessorTests {
 			assertThat(expected).as("No dependsOn expected for " + bean).isEmpty();
 			return;
 		}
-		HashSet<String> dependsOn = new HashSet<String>(
+		HashSet<String> dependsOn = new HashSet<>(
 				Arrays.asList(definition.getDependsOn()));
-		assertThat(dependsOn).isEqualTo(new HashSet<String>(Arrays.asList(expected)));
+		assertThat(dependsOn).isEqualTo(new HashSet<>(Arrays.asList(expected)));
 	}
 
 	@Configuration
diff --git a/spring-boot/src/test/java/org/springframework/boot/logging/LogFileTests.java b/spring-boot/src/test/java/org/springframework/boot/logging/LogFileTests.java
index e661c77e2c..8d59dc3be7 100644
--- a/spring-boot/src/test/java/org/springframework/boot/logging/LogFileTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/logging/LogFileTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -78,7 +78,7 @@ public class LogFileTests {
 	}
 
 	private PropertyResolver getPropertyResolver(String file, String path) {
-		Map<String, Object> properties = new LinkedHashMap<String, Object>();
+		Map<String, Object> properties = new LinkedHashMap<>();
 		properties.put("logging.file", file);
 		properties.put("logging.path", path);
 		PropertySource<?> propertySource = new MapPropertySource("properties",
diff --git a/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java b/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java
index 5f3e7baf66..2938ce72fe 100644
--- a/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java
@@ -284,7 +284,7 @@ public class Log4J2LoggingSystemTests extends AbstractLoggingSystemTests {
 
 	private static class TestLog4J2LoggingSystem extends Log4J2LoggingSystem {
 
-		private List<String> availableClasses = new ArrayList<String>();
+		private List<String> availableClasses = new ArrayList<>();
 
 		TestLog4J2LoggingSystem() {
 			super(TestLog4J2LoggingSystem.class.getClassLoader());
diff --git a/spring-boot/src/test/java/org/springframework/boot/system/EmbeddedServerPortFileWriterTests.java b/spring-boot/src/test/java/org/springframework/boot/system/EmbeddedServerPortFileWriterTests.java
index 441e3eed84..a06c1a7089 100644
--- a/spring-boot/src/test/java/org/springframework/boot/system/EmbeddedServerPortFileWriterTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/system/EmbeddedServerPortFileWriterTests.java
@@ -129,7 +129,7 @@ public class EmbeddedServerPortFileWriterTests {
 	}
 
 	private Set<String> collectFileNames(File directory) {
-		Set<String> names = new HashSet<String>();
+		Set<String> names = new HashSet<>();
 		if (directory.isDirectory()) {
 			for (File file : directory.listFiles()) {
 				names.add(file.getName());
diff --git a/spring-boot/src/test/java/org/springframework/boot/testutil/InternalOutputCapture.java b/spring-boot/src/test/java/org/springframework/boot/testutil/InternalOutputCapture.java
index 608a4079d2..34158b3a16 100644
--- a/spring-boot/src/test/java/org/springframework/boot/testutil/InternalOutputCapture.java
+++ b/spring-boot/src/test/java/org/springframework/boot/testutil/InternalOutputCapture.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -48,7 +48,7 @@ public class InternalOutputCapture implements TestRule {
 
 	private ByteArrayOutputStream copy;
 
-	private List<Matcher<? super String>> matchers = new ArrayList<Matcher<? super String>>();
+	private List<Matcher<? super String>> matchers = new ArrayList<>();
 
 	@Override
 	public Statement apply(final Statement base, Description description) {
diff --git a/spring-boot/src/test/java/org/springframework/boot/testutil/Matched.java b/spring-boot/src/test/java/org/springframework/boot/testutil/Matched.java
index 85652869b0..2bf302739e 100644
--- a/spring-boot/src/test/java/org/springframework/boot/testutil/Matched.java
+++ b/spring-boot/src/test/java/org/springframework/boot/testutil/Matched.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -54,7 +54,7 @@ public final class Matched<T> extends Condition<T> {
 	}
 
 	public static <T> Condition<T> by(Matcher<? extends T> matcher) {
-		return new Matched<T>(matcher);
+		return new Matched<>(matcher);
 	}
 
 }
diff --git a/spring-boot/src/test/java/org/springframework/boot/web/client/RootUriTemplateHandlerTests.java b/spring-boot/src/test/java/org/springframework/boot/web/client/RootUriTemplateHandlerTests.java
index 97eede3323..2b73ebaa01 100644
--- a/spring-boot/src/test/java/org/springframework/boot/web/client/RootUriTemplateHandlerTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/web/client/RootUriTemplateHandlerTests.java
@@ -80,7 +80,7 @@ public class RootUriTemplateHandlerTests {
 
 	@Test
 	public void expandMapVariablesShouldPrefixRoot() throws Exception {
-		HashMap<String, Object> uriVariables = new HashMap<String, Object>();
+		HashMap<String, Object> uriVariables = new HashMap<>();
 		URI expanded = this.handler.expand("/hello", uriVariables);
 		verify(this.delegate).expand("http://example.com/hello", uriVariables);
 		assertThat(expanded).isEqualTo(this.uri);
@@ -89,7 +89,7 @@ public class RootUriTemplateHandlerTests {
 	@Test
 	public void expandMapVariablesWhenPathDoesNotStartWithSlashShouldNotPrefixRoot()
 			throws Exception {
-		HashMap<String, Object> uriVariables = new HashMap<String, Object>();
+		HashMap<String, Object> uriVariables = new HashMap<>();
 		URI expanded = this.handler.expand("http://spring.io/hello", uriVariables);
 		verify(this.delegate).expand("http://spring.io/hello", uriVariables);
 		assertThat(expanded).isEqualTo(this.uri);
diff --git a/spring-boot/src/test/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBeanTests.java b/spring-boot/src/test/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBeanTests.java
index 23ee2a0fea..1539d6a419 100644
--- a/spring-boot/src/test/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBeanTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/web/servlet/AbstractFilterRegistrationBeanTests.java
@@ -83,9 +83,9 @@ public abstract class AbstractFilterRegistrationBeanTests {
 		bean.setAsyncSupported(false);
 		bean.setInitParameters(Collections.singletonMap("a", "b"));
 		bean.addInitParameter("c", "d");
-		bean.setUrlPatterns(new LinkedHashSet<String>(Arrays.asList("/a", "/b")));
+		bean.setUrlPatterns(new LinkedHashSet<>(Arrays.asList("/a", "/b")));
 		bean.addUrlPatterns("/c");
-		bean.setServletNames(new LinkedHashSet<String>(Arrays.asList("s1", "s2")));
+		bean.setServletNames(new LinkedHashSet<>(Arrays.asList("s1", "s2")));
 		bean.addServletNames("s3");
 		bean.setServletRegistrationBeans(
 				Collections.singleton(mockServletRegistration("s4")));
@@ -94,7 +94,7 @@ public abstract class AbstractFilterRegistrationBeanTests {
 		bean.onStartup(this.servletContext);
 		verify(this.servletContext).addFilter(eq("test"), getExpectedFilter());
 		verify(this.registration).setAsyncSupported(false);
-		Map<String, String> expectedInitParameters = new HashMap<String, String>();
+		Map<String, String> expectedInitParameters = new HashMap<>();
 		expectedInitParameters.put("a", "b");
 		expectedInitParameters.put("c", "d");
 		verify(this.registration).setInitParameters(expectedInitParameters);
@@ -221,7 +221,7 @@ public abstract class AbstractFilterRegistrationBeanTests {
 			ServletRegistrationBean<?>... servletRegistrationBeans);
 
 	protected final ServletRegistrationBean<?> mockServletRegistration(String name) {
-		ServletRegistrationBean<?> bean = new ServletRegistrationBean<Servlet>();
+		ServletRegistrationBean<?> bean = new ServletRegistrationBean<>();
 		bean.setName(name);
 		return bean;
 	}
diff --git a/spring-boot/src/test/java/org/springframework/boot/web/servlet/DelegatingFilterProxyRegistrationBeanTests.java b/spring-boot/src/test/java/org/springframework/boot/web/servlet/DelegatingFilterProxyRegistrationBeanTests.java
index 10881d1e8e..5b8bc310d3 100644
--- a/spring-boot/src/test/java/org/springframework/boot/web/servlet/DelegatingFilterProxyRegistrationBeanTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/web/servlet/DelegatingFilterProxyRegistrationBeanTests.java
@@ -48,7 +48,7 @@ import static org.mockito.ArgumentMatchers.isA;
 public class DelegatingFilterProxyRegistrationBeanTests
 		extends AbstractFilterRegistrationBeanTests {
 
-	private static ThreadLocal<Boolean> mockFilterInitialized = new ThreadLocal<Boolean>();
+	private static ThreadLocal<Boolean> mockFilterInitialized = new ThreadLocal<>();
 
 	private GenericWebApplicationContext applicationContext = new GenericWebApplicationContext(
 			new MockServletContext());
diff --git a/spring-boot/src/test/java/org/springframework/boot/web/servlet/FilterRegistrationBeanTests.java b/spring-boot/src/test/java/org/springframework/boot/web/servlet/FilterRegistrationBeanTests.java
index 19459f8a3c..6860c5253e 100644
--- a/spring-boot/src/test/java/org/springframework/boot/web/servlet/FilterRegistrationBeanTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/web/servlet/FilterRegistrationBeanTests.java
@@ -36,7 +36,7 @@ public class FilterRegistrationBeanTests extends AbstractFilterRegistrationBeanT
 
 	@Test
 	public void setFilter() throws Exception {
-		FilterRegistrationBean<Filter> bean = new FilterRegistrationBean<Filter>();
+		FilterRegistrationBean<Filter> bean = new FilterRegistrationBean<>();
 		bean.setFilter(this.filter);
 		bean.onStartup(this.servletContext);
 		verify(this.servletContext).addFilter("mockFilter", this.filter);
@@ -44,7 +44,7 @@ public class FilterRegistrationBeanTests extends AbstractFilterRegistrationBeanT
 
 	@Test
 	public void setFilterMustNotBeNull() throws Exception {
-		FilterRegistrationBean<Filter> bean = new FilterRegistrationBean<Filter>();
+		FilterRegistrationBean<Filter> bean = new FilterRegistrationBean<>();
 		this.thrown.expect(IllegalArgumentException.class);
 		this.thrown.expectMessage("Filter must not be null");
 		bean.onStartup(this.servletContext);
@@ -54,22 +54,20 @@ public class FilterRegistrationBeanTests extends AbstractFilterRegistrationBeanT
 	public void constructFilterMustNotBeNull() throws Exception {
 		this.thrown.expect(IllegalArgumentException.class);
 		this.thrown.expectMessage("Filter must not be null");
-		new FilterRegistrationBean<Filter>(null);
+		new FilterRegistrationBean<>(null);
 	}
 
 	@Test
 	public void createServletRegistrationBeanMustNotBeNull() throws Exception {
 		this.thrown.expect(IllegalArgumentException.class);
 		this.thrown.expectMessage("ServletRegistrationBeans must not be null");
-		new FilterRegistrationBean<MockFilter>(this.filter,
-				(ServletRegistrationBean[]) null);
+		new FilterRegistrationBean<>(this.filter, (ServletRegistrationBean[]) null);
 	}
 
 	@Override
 	protected AbstractFilterRegistrationBean<MockFilter> createFilterRegistrationBean(
 			ServletRegistrationBean<?>... servletRegistrationBeans) {
-		return new FilterRegistrationBean<MockFilter>(this.filter,
-				servletRegistrationBeans);
+		return new FilterRegistrationBean<>(this.filter, servletRegistrationBeans);
 	}
 
 	@Override
diff --git a/spring-boot/src/test/java/org/springframework/boot/web/servlet/ServletListenerRegistrationBeanTests.java b/spring-boot/src/test/java/org/springframework/boot/web/servlet/ServletListenerRegistrationBeanTests.java
index 17d4ebf981..65643fa313 100644
--- a/spring-boot/src/test/java/org/springframework/boot/web/servlet/ServletListenerRegistrationBeanTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/web/servlet/ServletListenerRegistrationBeanTests.java
@@ -55,7 +55,7 @@ public class ServletListenerRegistrationBeanTests {
 
 	@Test
 	public void startupWithDefaults() throws Exception {
-		ServletListenerRegistrationBean<ServletContextListener> bean = new ServletListenerRegistrationBean<ServletContextListener>(
+		ServletListenerRegistrationBean<ServletContextListener> bean = new ServletListenerRegistrationBean<>(
 				this.listener);
 		bean.onStartup(this.servletContext);
 		verify(this.servletContext).addListener(this.listener);
@@ -63,7 +63,7 @@ public class ServletListenerRegistrationBeanTests {
 
 	@Test
 	public void disable() throws Exception {
-		ServletListenerRegistrationBean<ServletContextListener> bean = new ServletListenerRegistrationBean<ServletContextListener>(
+		ServletListenerRegistrationBean<ServletContextListener> bean = new ServletListenerRegistrationBean<>(
 				this.listener);
 		bean.setEnabled(false);
 		bean.onStartup(this.servletContext);
diff --git a/spring-boot/src/test/java/org/springframework/boot/web/servlet/ServletRegistrationBeanTests.java b/spring-boot/src/test/java/org/springframework/boot/web/servlet/ServletRegistrationBeanTests.java
index 13af136d05..6331d46311 100644
--- a/spring-boot/src/test/java/org/springframework/boot/web/servlet/ServletRegistrationBeanTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/web/servlet/ServletRegistrationBeanTests.java
@@ -76,7 +76,7 @@ public class ServletRegistrationBeanTests {
 
 	@Test
 	public void startupWithDefaults() throws Exception {
-		ServletRegistrationBean<MockServlet> bean = new ServletRegistrationBean<MockServlet>(
+		ServletRegistrationBean<MockServlet> bean = new ServletRegistrationBean<>(
 				this.servlet);
 		bean.onStartup(this.servletContext);
 		verify(this.servletContext).addServlet("mockServlet", this.servlet);
@@ -86,7 +86,7 @@ public class ServletRegistrationBeanTests {
 
 	@Test
 	public void startupWithDoubleRegistration() throws Exception {
-		ServletRegistrationBean<MockServlet> bean = new ServletRegistrationBean<MockServlet>(
+		ServletRegistrationBean<MockServlet> bean = new ServletRegistrationBean<>(
 				this.servlet);
 		given(this.servletContext.addServlet(anyString(), (Servlet) any()))
 				.willReturn(null);
@@ -97,19 +97,19 @@ public class ServletRegistrationBeanTests {
 
 	@Test
 	public void startupWithSpecifiedValues() throws Exception {
-		ServletRegistrationBean<MockServlet> bean = new ServletRegistrationBean<MockServlet>();
+		ServletRegistrationBean<MockServlet> bean = new ServletRegistrationBean<>();
 		bean.setName("test");
 		bean.setServlet(this.servlet);
 		bean.setAsyncSupported(false);
 		bean.setInitParameters(Collections.singletonMap("a", "b"));
 		bean.addInitParameter("c", "d");
-		bean.setUrlMappings(new LinkedHashSet<String>(Arrays.asList("/a", "/b")));
+		bean.setUrlMappings(new LinkedHashSet<>(Arrays.asList("/a", "/b")));
 		bean.addUrlMappings("/c");
 		bean.setLoadOnStartup(10);
 		bean.onStartup(this.servletContext);
 		verify(this.servletContext).addServlet("test", this.servlet);
 		verify(this.registration).setAsyncSupported(false);
-		Map<String, String> expectedInitParameters = new HashMap<String, String>();
+		Map<String, String> expectedInitParameters = new HashMap<>();
 		expectedInitParameters.put("a", "b");
 		expectedInitParameters.put("c", "d");
 		verify(this.registration).setInitParameters(expectedInitParameters);
@@ -119,7 +119,7 @@ public class ServletRegistrationBeanTests {
 
 	@Test
 	public void specificName() throws Exception {
-		ServletRegistrationBean<MockServlet> bean = new ServletRegistrationBean<MockServlet>();
+		ServletRegistrationBean<MockServlet> bean = new ServletRegistrationBean<>();
 		bean.setName("specificName");
 		bean.setServlet(this.servlet);
 		bean.onStartup(this.servletContext);
@@ -128,7 +128,7 @@ public class ServletRegistrationBeanTests {
 
 	@Test
 	public void deducedName() throws Exception {
-		ServletRegistrationBean<MockServlet> bean = new ServletRegistrationBean<MockServlet>();
+		ServletRegistrationBean<MockServlet> bean = new ServletRegistrationBean<>();
 		bean.setServlet(this.servlet);
 		bean.onStartup(this.servletContext);
 		verify(this.servletContext).addServlet("mockServlet", this.servlet);
@@ -136,7 +136,7 @@ public class ServletRegistrationBeanTests {
 
 	@Test
 	public void disable() throws Exception {
-		ServletRegistrationBean<MockServlet> bean = new ServletRegistrationBean<MockServlet>();
+		ServletRegistrationBean<MockServlet> bean = new ServletRegistrationBean<>();
 		bean.setServlet(this.servlet);
 		bean.setEnabled(false);
 		bean.onStartup(this.servletContext);
@@ -145,7 +145,7 @@ public class ServletRegistrationBeanTests {
 
 	@Test
 	public void setServletMustNotBeNull() throws Exception {
-		ServletRegistrationBean<MockServlet> bean = new ServletRegistrationBean<MockServlet>();
+		ServletRegistrationBean<MockServlet> bean = new ServletRegistrationBean<>();
 		this.thrown.expect(IllegalArgumentException.class);
 		this.thrown.expectMessage("Servlet must not be null");
 		bean.onStartup(this.servletContext);
@@ -160,7 +160,7 @@ public class ServletRegistrationBeanTests {
 
 	@Test
 	public void setMappingMustNotBeNull() throws Exception {
-		ServletRegistrationBean<MockServlet> bean = new ServletRegistrationBean<MockServlet>(
+		ServletRegistrationBean<MockServlet> bean = new ServletRegistrationBean<>(
 				this.servlet);
 		this.thrown.expect(IllegalArgumentException.class);
 		this.thrown.expectMessage("UrlMappings must not be null");
@@ -171,12 +171,12 @@ public class ServletRegistrationBeanTests {
 	public void createMappingMustNotBeNull() throws Exception {
 		this.thrown.expect(IllegalArgumentException.class);
 		this.thrown.expectMessage("UrlMappings must not be null");
-		new ServletRegistrationBean<MockServlet>(this.servlet, (String[]) null);
+		new ServletRegistrationBean<>(this.servlet, (String[]) null);
 	}
 
 	@Test
 	public void addMappingMustNotBeNull() throws Exception {
-		ServletRegistrationBean<MockServlet> bean = new ServletRegistrationBean<MockServlet>(
+		ServletRegistrationBean<MockServlet> bean = new ServletRegistrationBean<>(
 				this.servlet);
 		this.thrown.expect(IllegalArgumentException.class);
 		this.thrown.expectMessage("UrlMappings must not be null");
@@ -185,16 +185,16 @@ public class ServletRegistrationBeanTests {
 
 	@Test
 	public void setMappingReplacesValue() throws Exception {
-		ServletRegistrationBean<MockServlet> bean = new ServletRegistrationBean<MockServlet>(
+		ServletRegistrationBean<MockServlet> bean = new ServletRegistrationBean<>(
 				this.servlet, "/a", "/b");
-		bean.setUrlMappings(new LinkedHashSet<String>(Arrays.asList("/c", "/d")));
+		bean.setUrlMappings(new LinkedHashSet<>(Arrays.asList("/c", "/d")));
 		bean.onStartup(this.servletContext);
 		verify(this.registration).addMapping("/c", "/d");
 	}
 
 	@Test
 	public void modifyInitParameters() throws Exception {
-		ServletRegistrationBean<MockServlet> bean = new ServletRegistrationBean<MockServlet>(
+		ServletRegistrationBean<MockServlet> bean = new ServletRegistrationBean<>(
 				this.servlet, "/a", "/b");
 		bean.addInitParameter("a", "b");
 		bean.getInitParameters().put("a", "c");
@@ -204,7 +204,7 @@ public class ServletRegistrationBeanTests {
 
 	@Test
 	public void withoutDefaultMappings() throws Exception {
-		ServletRegistrationBean<MockServlet> bean = new ServletRegistrationBean<MockServlet>(
+		ServletRegistrationBean<MockServlet> bean = new ServletRegistrationBean<>(
 				this.servlet, false);
 		bean.onStartup(this.servletContext);
 		verify(this.registration, never()).addMapping((String[]) any());
diff --git a/spring-boot/src/test/java/org/springframework/boot/web/support/ErrorPageFilterTests.java b/spring-boot/src/test/java/org/springframework/boot/web/support/ErrorPageFilterTests.java
index 53182442d7..4a6ac79f3e 100644
--- a/spring-boot/src/test/java/org/springframework/boot/web/support/ErrorPageFilterTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/web/support/ErrorPageFilterTests.java
@@ -524,7 +524,7 @@ public class ErrorPageFilterTests {
 	private void setUpAsyncDispatch() throws Exception {
 		this.request.setAsyncSupported(true);
 		this.request.setAsyncStarted(true);
-		DeferredResult<String> result = new DeferredResult<String>();
+		DeferredResult<String> result = new DeferredResult<>();
 		WebAsyncManager asyncManager = WebAsyncUtils.getAsyncManager(this.request);
 		asyncManager.setAsyncWebRequest(
 				new StandardServletAsyncWebRequest(this.request, this.response));
@@ -538,7 +538,7 @@ public class ErrorPageFilterTests {
 	private static final class DispatchRecordingMockHttpServletRequest
 			extends MockHttpServletRequest {
 
-		private final Map<String, AttributeCapturingRequestDispatcher> dispatchers = new HashMap<String, AttributeCapturingRequestDispatcher>();
+		private final Map<String, AttributeCapturingRequestDispatcher> dispatchers = new HashMap<>();
 
 		private DispatchRecordingMockHttpServletRequest() {
 			super("GET", "/test/path");
@@ -559,7 +559,7 @@ public class ErrorPageFilterTests {
 		private static final class AttributeCapturingRequestDispatcher
 				extends MockRequestDispatcher {
 
-			private final Map<String, Object> requestAttributes = new HashMap<String, Object>();
+			private final Map<String, Object> requestAttributes = new HashMap<>();
 
 			private AttributeCapturingRequestDispatcher(String resource) {
 				super(resource);