Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9dd0f803 authored by Daulet Zhanguzin's avatar Daulet Zhanguzin
Browse files

Deprecate checkNotNull in favor of Objects.requireNonNull(). 

Remove one of unused overloads. The same change passed on master:
ag/10013392

Bug: 126528330

Test: Treehugger
Test: made equivalent change in internal branch to verify that removed method is not in use

Change-Id: I37c5b93e2ffbfa38a5b9feb4cae2062ef24acec5
parent 07dcca55

core/java/com/android/internal/util/Preconditions.java

+4 −20
Original line number Diff line number Diff line
@@ -126,7 +126,9 @@ public class Preconditions { 
     * @param reference an object reference

     * @return the non-null reference that was validated

     * @throws NullPointerException if {@code reference} is null

     * @deprecated - use {@link java.util.Objects.requireNonNull} instead.

     */

    @Deprecated

    @UnsupportedAppUsage

    public static @NonNull <T> T checkNotNull(final T reference) {

        if (reference == null) {
@@ -144,7 +146,9 @@ public class Preconditions { 
     *     be converted to a string using {@link String#valueOf(Object)}

     * @return the non-null reference that was validated

     * @throws NullPointerException if {@code reference} is null

     * @deprecated - use {@link java.util.Objects.requireNonNull} instead.

     */

    @Deprecated

    @UnsupportedAppUsage

    public static @NonNull <T> T checkNotNull(final T reference, final Object errorMessage) {

        if (reference == null) {
@@ -153,26 +157,6 @@ public class Preconditions { 
        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

     * instance, but not involving any parameters to the calling method.