Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Deprecate checkNotNull in favor of Objects.requireNonNull()."

Browse Source
This commit is contained in:
Daulet Zhanguzin
2020-01-10 16:36:15 +00:00
committed by Gerrit Code Review
parent b93ab62135 9dd0f80341
commit 7b511f0dd8
1 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/java/com/android/internal/util/Preconditions.java
View File

@@ -126,7 +126,9 @@ public class Preconditions {
* @param reference an object reference * @param reference an object reference
* @return the non-null reference that was validated * @return the non-null reference that was validated
* @throws NullPointerException if {@code reference} is null * @throws NullPointerException if {@code reference} is null
* @deprecated - use {@link java.util.Objects.requireNonNull} instead.
*/ */
@Deprecated
@UnsupportedAppUsage @UnsupportedAppUsage
public static @NonNull <T> T checkNotNull(final T reference) { public static @NonNull <T> T checkNotNull(final T reference) {
if (reference == null) { if (reference == null) {
@@ -144,7 +146,9 @@ public class Preconditions {
* be converted to a string using {@link String#valueOf(Object)} * be converted to a string using {@link String#valueOf(Object)}
* @return the non-null reference that was validated * @return the non-null reference that was validated
* @throws NullPointerException if {@code reference} is null * @throws NullPointerException if {@code reference} is null
* @deprecated - use {@link java.util.Objects.requireNonNull} instead.
*/ */
@Deprecated
@UnsupportedAppUsage @UnsupportedAppUsage
public static @NonNull <T> T checkNotNull(final T reference, final Object errorMessage) { public static @NonNull <T> T checkNotNull(final T reference, final Object errorMessage) {
if (reference == null) { if (reference == null) {
@@ -153,26 +157,6 @@ public class Preconditions {
return reference; return reference;
} }
/**
* Ensures that an object reference passed as a parameter to the calling
* method is not null.
*
* @param reference an object reference
* @param messageTemplate a printf-style message template to use if the check fails; will
* be converted to a string using {@link String#format(String, Object...)}
* @param messageArgs arguments for {@code messageTemplate}
* @return the non-null reference that was validated
* @throws NullPointerException if {@code reference} is null
*/
public static @NonNull <T> T checkNotNull(final T reference,
final String messageTemplate,
final Object... messageArgs) {
if (reference == null) {
throw new NullPointerException(String.format(messageTemplate, messageArgs));
}
return reference;
}
/** /**
* Ensures the truth of an expression involving the state of the calling * Ensures the truth of an expression involving the state of the calling
* instance, but not involving any parameters to the calling method. * instance, but not involving any parameters to the calling method.