Use lambdas when possible

Replace anonymous inner classes with lambda declarations (when possible
using method references).

See gh-9781

Author: emacampolo

spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/EndpointDocumentation.java

@@ -52,8 +52,6 @@
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 import org.springframework.test.web.servlet.MockMvc;
-import org.springframework.test.web.servlet.MvcResult;
-import org.springframework.test.web.servlet.ResultHandler;
 import org.springframework.util.FileCopyUtils;
 import org.springframework.util.StringUtils;
 
@@ -161,32 +159,9 @@ public void auditEventsByPrincipalAndType() throws Exception {
 
 	@Test
 	public void endpoints() throws Exception {
-		final File docs = new File("src/main/asciidoc");
-		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())
-					? endpoint.getPath() : "/");
-			if (!SKIPPED.contains(endpointPath)) {
-				String output = endpointPath.substring(1);
-				output = output.length() > 0 ? output : "./";
-				this.mockMvc
-						.perform(get("/application" + endpointPath)
-								.accept(ActuatorMediaTypes.APPLICATION_ACTUATOR_V2_JSON))
-						.andExpect(status().isOk()).andDo(document(output))
-						.andDo(new ResultHandler() {
-
-							@Override
-							public void handle(MvcResult mvcResult) throws Exception {
-								EndpointDoc endpoint = new EndpointDoc(docs,
-										endpointPath);
-								endpoints.add(endpoint);
-							}
-
-						});
-			}
-		}
+		File docs = new File("src/main/asciidoc");
+		Map<String, Object> model = new LinkedHashMap<>();
+		model.put("endpoints", getEndpointDocs(docs));
 		File file = new File(RESTDOCS_OUTPUT_DIR + "/endpoints.adoc");
 		file.getParentFile().mkdirs();
 		try (PrintWriter writer = new PrintWriter(file, "UTF-8")) {
@@ -196,18 +171,36 @@ public void handle(MvcResult mvcResult) throws Exception {
 		}
 	}
 
+	private List<EndpointDoc> getEndpointDocs(File docs) throws Exception {
+		final List<EndpointDoc> endpoints = new ArrayList<>();
+		for (MvcEndpoint endpoint : getEndpoints()) {
+			String path = endpoint.getPath();
+			path = (StringUtils.hasText(path) ? path : "/");
+			if (!SKIPPED.contains(path)) {
+				documentEndpoint(path);
+				endpoints.add(new EndpointDoc(docs, path));
+			}
+		}
+		return endpoints;
+	}
+
 	private Collection<? extends MvcEndpoint> getEndpoints() {
 		List<? extends MvcEndpoint> endpoints = new ArrayList<>(
 				this.mvcEndpoints.getEndpoints());
-		endpoints.sort(new Comparator<MvcEndpoint>() {
-			@Override
-			public int compare(MvcEndpoint o1, MvcEndpoint o2) {
-				return o1.getPath().compareTo(o2.getPath());
-			}
-		});
+		endpoints.sort(Comparator.comparing(MvcEndpoint::getPath));
 		return endpoints;
 	}
 
+	private String documentEndpoint(final String endpointPath) throws Exception {
+		String output = endpointPath.substring(1);
+		output = (output.length() > 0 ? output : "./");
+		this.mockMvc
+				.perform(get("/application" + endpointPath)
+						.accept(ActuatorMediaTypes.APPLICATION_ACTUATOR_V2_JSON))
+				.andExpect(status().isOk()).andDo(document(output));
+		return output;
+	}
+
 	public static class EndpointDoc {
 
 		private String path;

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CacheStatisticsAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author 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,15 +137,11 @@ static class NoOpCacheStatisticsConfiguration {
 
 		@Bean
 		public CacheStatisticsProvider<Cache> noOpCacheStatisticsProvider() {
-			return new CacheStatisticsProvider<Cache>() {
-				@Override
-				public CacheStatistics getCacheStatistics(CacheManager cacheManager,
-						Cache cache) {
-					if (cacheManager instanceof NoOpCacheManager) {
-						return NO_OP_STATS;
-					}
-					return null;
+			return (cacheManager, cache) -> {
+				if (cacheManager instanceof NoOpCacheManager) {
+					return NO_OP_STATS;
 				}
+				return null;
 			};
 		}
 

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java

@@ -120,14 +120,7 @@ public ManagementContextResolver managementContextResolver() {
 	@Bean
 	public ManagementServletContext managementServletContext(
 			final ManagementServerProperties properties) {
-		return new ManagementServletContext() {
-
-			@Override
-			public String getContextPath() {
-				return properties.getContextPath();
-			}
-
-		};
+		return properties::getContextPath;
 	}
 
 	@Override

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcHypermediaManagementContextConfiguration.java

@@ -101,14 +101,7 @@ public class EndpointWebMvcHypermediaManagementContextConfiguration {
 	@Bean
 	public ManagementServletContext managementServletContext(
 			final ManagementServerProperties properties) {
-		return new ManagementServletContext() {
-
-			@Override
-			public String getContextPath() {
-				return properties.getContextPath();
-			}
-
-		};
+		return properties::getContextPath;
 	}
 
 	@ConditionalOnEnabledEndpoint("actuator")

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author 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,23 +62,22 @@ public Map<String, Object> invoke() {
 			return SHUTDOWN_MESSAGE;
 		}
 		finally {
-			Thread thread = new Thread(new Runnable() {
-				@Override
-				public void run() {
-					try {
-						Thread.sleep(500L);
-					}
-					catch (InterruptedException ex) {
-						Thread.currentThread().interrupt();
-					}
-					ShutdownEndpoint.this.context.close();
-				}
-			});
+			Thread thread = new Thread(this::performShutdown);
 			thread.setContextClassLoader(getClass().getClassLoader());
 			thread.start();
 		}
 	}
 
+	private void performShutdown() {
+		try {
+			Thread.sleep(500L);
+		}
+		catch (InterruptedException ex) {
+			Thread.currentThread().interrupt();
+		}
+		this.context.close();
+	}
+
 	@Override
 	public void setApplicationContext(ApplicationContext context) throws BeansException {
 		if (context instanceof ConfigurableApplicationContext) {

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DataSourceHealthIndicator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,6 @@
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.boot.jdbc.DatabaseDriver;
-import org.springframework.dao.DataAccessException;
 import org.springframework.dao.support.DataAccessUtils;
 import org.springframework.jdbc.IncorrectResultSetColumnCountException;
 import org.springframework.jdbc.core.ConnectionCallback;
@@ -120,13 +119,11 @@ private void doDataSourceHealthCheck(Health.Builder builder) throws Exception {
 	}
 
 	private String getProduct() {
-		return this.jdbcTemplate.execute(new ConnectionCallback<String>() {
-			@Override
-			public String doInConnection(Connection connection)
-					throws SQLException, DataAccessException {
-				return connection.getMetaData().getDatabaseProductName();
-			}
-		});
+		return this.jdbcTemplate.execute((ConnectionCallback<String>) this::getProduct);
+	}
+
+	private String getProduct(Connection connection) throws SQLException {
+		return connection.getMetaData().getDatabaseProductName();
 	}
 
 	protected String getValidationQuery(String product) {

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/RabbitHealthIndicator.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.
@@ -16,11 +16,6 @@
 
 package org.springframework.boot.actuate.health;
 
-import java.util.Map;
-
-import com.rabbitmq.client.Channel;
-
-import org.springframework.amqp.rabbit.core.ChannelCallback;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.util.Assert;
 
@@ -46,14 +41,8 @@ protected void doHealthCheck(Health.Builder builder) throws Exception {
 	}
 
 	private String getVersion() {
-		return this.rabbitTemplate.execute(new ChannelCallback<String>() {
-			@Override
-			public String doInRabbit(Channel channel) throws Exception {
-				Map<String, Object> serverProperties = channel.getConnection()
-						.getServerProperties();
-				return serverProperties.get("version").toString();
-			}
-		});
+		return this.rabbitTemplate.execute((channel) -> channel.getConnection()
+				.getServerProperties().get("version").toString());
 	}
 
 }

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/BufferMetricReader.java

@@ -19,7 +19,6 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.function.BiConsumer;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
@@ -48,7 +47,7 @@ public BufferMetricReader(CounterBuffers counterBuffers, GaugeBuffers gaugeBuffe
 	}
 
 	@Override
-	public Metric<?> findOne(final String name) {
+	public Metric<?> findOne(String name) {
 		Buffer<?> buffer = this.counterBuffers.find(name);
 		if (buffer == null) {
 			buffer = this.gaugeBuffers.find(name);
@@ -81,17 +80,10 @@ private Iterable<Metric<?>> findAll(Predicate<String> predicate) {
 	private <T extends Number, B extends Buffer<T>> void collectMetrics(
 			Buffers<B> buffers, Predicate<String> predicate,
 			final List<Metric<?>> metrics) {
-		buffers.forEach(predicate, new BiConsumer<String, B>() {
-
-			@Override
-			public void accept(String name, B value) {
-				metrics.add(asMetric(name, value));
-			}
-
-		});
+		buffers.forEach(predicate, (name, value) -> metrics.add(asMetric(name, value)));
 	}
 
-	private <T extends Number> Metric<T> asMetric(final String name, Buffer<T> buffer) {
+	private <T extends Number> Metric<T> asMetric(String name, Buffer<T> buffer) {
 		return new Metric<>(name, buffer.getValue(), new Date(buffer.getTimestamp()));
 	}
 

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/Buffers.java

@@ -19,7 +19,6 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
-import java.util.function.Function;
 import java.util.function.Predicate;
 
 /**
@@ -34,36 +33,26 @@ abstract class Buffers<B extends Buffer<?>> {
 	private final ConcurrentHashMap<String, B> buffers = new ConcurrentHashMap<>();
 
 	public void forEach(final Predicate<String> predicate,
-			final BiConsumer<String, B> consumer) {
-		this.buffers.forEach(new BiConsumer<String, B>() {
-
-			@Override
-			public void accept(String name, B value) {
-				if (predicate.test(name)) {
-					consumer.accept(name, value);
-				}
+			BiConsumer<String, B> consumer) {
+		this.buffers.forEach((name, value) -> {
+			if (predicate.test(name)) {
+				consumer.accept(name, value);
 			}
-
 		});
 	}
 
-	public B find(final String name) {
+	public B find(String name) {
 		return this.buffers.get(name);
 	}
 
 	public int count() {
 		return this.buffers.size();
 	}
 
-	protected final void doWith(final String name, final Consumer<B> consumer) {
+	protected final void doWith(String name, Consumer<B> consumer) {
 		B buffer = this.buffers.get(name);
 		if (buffer == null) {
-			buffer = this.buffers.computeIfAbsent(name, new Function<String, B>() {
-				@Override
-				public B apply(String name) {
-					return createBuffer();
-				}
-			});
+			buffer = this.buffers.computeIfAbsent(name, (k) -> createBuffer());
 		}
 		consumer.accept(buffer);
 	}

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/CounterBuffers.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,6 @@
 
 package org.springframework.boot.actuate.metrics.buffer;
 
-import java.util.function.Consumer;
-
 /**
  * Fast writes to in-memory metrics store using {@link CounterBuffer}.
  *
@@ -26,27 +24,17 @@
  */
 public class CounterBuffers extends Buffers<CounterBuffer> {
 
-	public void increment(final String name, final long delta) {
-		doWith(name, new Consumer<CounterBuffer>() {
-
-			@Override
-			public void accept(CounterBuffer buffer) {
-				buffer.setTimestamp(System.currentTimeMillis());
-				buffer.add(delta);
-			}
-
+	public void increment(String name, long delta) {
+		doWith(name, (buffer) -> {
+			buffer.setTimestamp(System.currentTimeMillis());
+			buffer.add(delta);
 		});
 	}
 
-	public void reset(final String name) {
-		doWith(name, new Consumer<CounterBuffer>() {
-
-			@Override
-			public void accept(CounterBuffer buffer) {
-				buffer.setTimestamp(System.currentTimeMillis());
-				buffer.reset();
-			}
-
+	public void reset(String name) {
+		doWith(name, (buffer) -> {
+			buffer.setTimestamp(System.currentTimeMillis());
+			buffer.reset();
 		});
 	}