From 23de76de35e5aefd21de06fb1b166a6606a96da0 Mon Sep 17 00:00:00 2001
From: Jan Kurella <kurellajunior@gmail.com>
Date: Tue, 16 Apr 2024 13:48:06 +0200
Subject: [PATCH] =?UTF-8?q?Avoid=20`NullPointerException=C2=B4=20and=20`Il?=
 =?UTF-8?q?legalArgumentException`=20for=20control=20flow=20in=20`Sort`.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Checking for null explicitly is cheap and prevents two unnecessary Exception
objects creations.

Closes #3081
---
 src/main/java/org/springframework/data/domain/Sort.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/springframework/data/domain/Sort.java b/src/main/java/org/springframework/data/domain/Sort.java
index 95017b059..9376885c5 100644
--- a/src/main/java/org/springframework/data/domain/Sort.java
+++ b/src/main/java/org/springframework/data/domain/Sort.java
@@ -41,6 +41,7 @@ import org.springframework.util.StringUtils;
  * @author Thomas Darimont
  * @author Mark Paluch
  * @author Johannes Englmeier
+ * @author Jan Kurella
  */
 public class Sort implements Streamable<org.springframework.data.domain.Sort.Order>, Serializable {
 
@@ -341,7 +342,7 @@ public class Sort implements Streamable<org.springframework.data.domain.Sort.Ord
 		}
 
 		/**
-		 * Returns the {@link Direction} enum for the given {@link String} or null if it cannot be parsed into an enum
+		 * Returns the {@link Direction} enum for the given {@link String} or empty if it cannot be parsed into an enum
 		 * value.
 		 *
 		 * @param value
@@ -349,6 +350,10 @@ public class Sort implements Streamable<org.springframework.data.domain.Sort.Ord
 		 */
 		public static Optional<Direction> fromOptionalString(String value) {
 
+			if (value == null) {
+				return Optional.empty();
+			}
+
 			try {
 				return Optional.of(fromString(value));
 			} catch (IllegalArgumentException e) {