From 8ced867e9584d1e93fa9a2b73ce9475acf8b033c Mon Sep 17 00:00:00 2001 From: igor-suhorukov Date: Sat, 29 Dec 2018 00:16:19 +0300 Subject: [PATCH 1/2] 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 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 getAdapter(Object handler) { From d57f831f5051c35616a6def20593a1f6f953754d Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Sat, 29 Dec 2018 11:26:56 +0100 Subject: [PATCH 2/2] Polish "Use Optional value in more functional style" Closes gh-15575 --- .../autoconfigure/web/servlet/CompositeHandlerAdapter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 42e4b47dd8..212a7c486c 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2017 the original author or authors. + * Copyright 2012-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.