From 5475f6b66b6698fb7dd9724992c01bd13108fa40 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Sat, 6 Jun 2020 19:14:26 +0200
Subject: [PATCH] Avoid unnecessary creation of not-found entity in
 ResponseEntity#of

Closes gh-25183
---
 .../springframework/http/ResponseEntity.java  | 38 ++++++++++---------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/spring-web/src/main/java/org/springframework/http/ResponseEntity.java b/spring-web/src/main/java/org/springframework/http/ResponseEntity.java
index 1f71b7957fc4..96c229c100c5 100644
--- a/spring-web/src/main/java/org/springframework/http/ResponseEntity.java
+++ b/spring-web/src/main/java/org/springframework/http/ResponseEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 the original author 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,6 +69,10 @@
  * @since 3.0.2
  * @param <T> the body type
  * @see #getStatusCode()
+ * @see org.springframework.web.client.RestOperations#getForEntity(String, Class, Object...)
+ * @see org.springframework.web.client.RestOperations#getForEntity(String, Class, java.util.Map)
+ * @see org.springframework.web.client.RestOperations#getForEntity(URI, Class)
+ * @see RequestEntity
  */
 public class ResponseEntity<T> extends HttpEntity<T> {
 
@@ -216,19 +220,6 @@ public static BodyBuilder status(int status) {
 		return new DefaultBuilder(status);
 	}
 
-	/**
-	 * A shortcut for creating a {@code ResponseEntity} with the given body
-	 * and the {@linkplain HttpStatus#OK OK} status, or an empty body and a
-	 * {@linkplain HttpStatus#NOT_FOUND NOT FOUND} status in case of a
-	 * {@linkplain Optional#empty()} parameter.
-	 * @return the created {@code ResponseEntity}
-	 * @since 5.1
-	 */
-	public static <T> ResponseEntity<T> of(Optional<T> body) {
-		Assert.notNull(body, "Body must not be null");
-		return body.map(ResponseEntity::ok).orElse(notFound().build());
-	}
-
 	/**
 	 * Create a builder with the status set to {@linkplain HttpStatus#OK OK}.
 	 * @return the created builder
@@ -245,8 +236,20 @@ public static BodyBuilder ok() {
 	 * @since 4.1
 	 */
 	public static <T> ResponseEntity<T> ok(T body) {
-		BodyBuilder builder = ok();
-		return builder.body(body);
+		return ok().body(body);
+	}
+
+	/**
+	 * A shortcut for creating a {@code ResponseEntity} with the given body
+	 * and the {@linkplain HttpStatus#OK OK} status, or an empty body and a
+	 * {@linkplain HttpStatus#NOT_FOUND NOT FOUND} status in case of an
+	 * {@linkplain Optional#empty()} parameter.
+	 * @return the created {@code ResponseEntity}
+	 * @since 5.1
+	 */
+	public static <T> ResponseEntity<T> of(Optional<T> body) {
+		Assert.notNull(body, "Body must not be null");
+		return body.map(ResponseEntity::ok).orElseGet(() -> notFound().build());
 	}
 
 	/**
@@ -257,8 +260,7 @@ public static <T> ResponseEntity<T> ok(T body) {
 	 * @since 4.1
 	 */
 	public static BodyBuilder created(URI location) {
-		BodyBuilder builder = status(HttpStatus.CREATED);
-		return builder.location(location);
+		return status(HttpStatus.CREATED).location(location);
 	}
 
 	/**