From 8ced867e9584d1e93fa9a2b73ce9475acf8b033c Mon Sep 17 00:00:00 2001
From: igor-suhorukov <igor.suhorukov@gmail.com>
Date: Sat, 29 Dec 2018 00:16:19 +0300
Subject: [PATCH] Use Optional value in more functional style

See gh-15575
---
 .../autoconfigure/web/servlet/CompositeHandlerAdapter.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/CompositeHandlerAdapter.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/CompositeHandlerAdapter.java
index a599f668a5..42e4b47dd8 100644
--- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/CompositeHandlerAdapter.java
+++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/CompositeHandlerAdapter.java
@@ -63,10 +63,9 @@ class CompositeHandlerAdapter implements HandlerAdapter {
 	@Override
 	public long getLastModified(HttpServletRequest request, Object handler) {
 		Optional<HandlerAdapter> adapter = getAdapter(handler);
-		if (adapter.isPresent()) {
-			return adapter.get().getLastModified(request, handler);
-		}
-		return 0;
+		return adapter
+				.map((handlerAdapter) -> handlerAdapter.getLastModified(request, handler))
+				.orElse(0L);
 	}
 
 	private Optional<HandlerAdapter> getAdapter(Object handler) {