Browse Source

Avoid `NullPointerException´ and `IllegalArgumentException` for control flow in `Sort`.

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

Closes #3081
3.2.x
Jan Kurella 2 years ago committed by Mark Paluch
parent
commit
23de76de35
No known key found for this signature in database
GPG Key ID: 55BC6374BAA9D973
  1. 7
      src/main/java/org/springframework/data/domain/Sort.java

7
src/main/java/org/springframework/data/domain/Sort.java

@ -41,6 +41,7 @@ import org.springframework.util.StringUtils; @@ -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 @@ -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 @@ -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) {

Loading…
Cancel
Save