root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge branch '5.2.x'

This commit is contained in:
Sam Brannen 2020-09-15 17:18:39 +02:00
parent e9065402f2 a6daed1b71
commit 9c8a8d82b9
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
spring-core/src/main/java/org/springframework/util/Assert.java
View File

@ -83,8 +83,8 @@ public abstract class Assert {
* <p>Call {@link #isTrue} if you wish to throw an {@code IllegalArgumentException} * <p>Call {@link #isTrue} if you wish to throw an {@code IllegalArgumentException}
* on an assertion failure. * on an assertion failure.
* <pre class="code"> * <pre class="code">
* Assert.state(id == null, * Assert.state(entity.getId() == null,
* () -&gt; "ID for " + entity.getName() + " must not already be initialized"); * () -&gt; "ID for entity " + entity.getName() + " must not already be initialized");
* </pre> * </pre>
* @param expression a boolean expression * @param expression a boolean expression
* @param messageSupplier a supplier for the exception message to use if the * @param messageSupplier a supplier for the exception message to use if the
@ -205,7 +205,8 @@ public abstract class Assert {
/** /**
* Assert that an object is not {@code null}. * Assert that an object is not {@code null}.
* <pre class="code"> * <pre class="code">
* Assert.notNull(clazz, () -&gt; "The class '" + clazz.getName() + "' must not be null"); * Assert.notNull(entity.getId(),
* () -&gt; "ID for entity " + entity.getName() + " must not be null");
* </pre> * </pre>
* @param object the object to check * @param object the object to check
* @param messageSupplier a supplier for the exception message to use if the * @param messageSupplier a supplier for the exception message to use if the
@ -247,7 +248,8 @@ public abstract class Assert {
* Assert that the given String is not empty; that is, * Assert that the given String is not empty; that is,
* it must not be {@code null} and not the empty String. * it must not be {@code null} and not the empty String.
* <pre class="code"> * <pre class="code">
* Assert.hasLength(name, () -&gt; "Name for account '" + account.getId() + "' must not be empty"); * Assert.hasLength(account.getName(),
* () -&gt; "Name for account '" + account.getId() + "' must not be empty");
* </pre> * </pre>
* @param text the String to check * @param text the String to check
* @param messageSupplier a supplier for the exception message to use if the * @param messageSupplier a supplier for the exception message to use if the
@ -292,7 +294,8 @@ public abstract class Assert {
* Assert that the given String contains valid text content; that is, it must not * Assert that the given String contains valid text content; that is, it must not
* be {@code null} and must contain at least one non-whitespace character. * be {@code null} and must contain at least one non-whitespace character.
* <pre class="code"> * <pre class="code">
* Assert.hasText(name, () -&gt; "Name for account '" + account.getId() + "' must not be empty"); * Assert.hasText(account.getName(),
* () -&gt; "Name for account '" + account.getId() + "' must not be empty");
* </pre> * </pre>
* @param text the String to check * @param text the String to check
* @param messageSupplier a supplier for the exception message to use if the * @param messageSupplier a supplier for the exception message to use if the