From 81cf3cba61032195484ffb0cd97369a758e62b3d Mon Sep 17 00:00:00 2001
From: AndroidX Test Team <copybara-androidxtest@google.com>
Date: Mon, 1 Dec 2025 13:14:21 -0800
Subject: [PATCH] Use Consumer instead of Function1 in DisplayDataMatcher.

PiperOrigin-RevId: 838903556
---
 .../core/java/androidx/test/espresso/DataInteraction.java  | 7 +++----
 .../test/espresso/DisplayDataMatcherRemoteMsgTest.java     | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/espresso/core/java/androidx/test/espresso/DataInteraction.java b/espresso/core/java/androidx/test/espresso/DataInteraction.java
index 56ae230a3..6bca8e610 100644
--- a/espresso/core/java/androidx/test/espresso/DataInteraction.java
+++ b/espresso/core/java/androidx/test/espresso/DataInteraction.java
@@ -41,8 +41,8 @@
 import androidx.test.espresso.remote.annotation.RemoteMsgConstructor;
 import androidx.test.espresso.remote.annotation.RemoteMsgField;
 import androidx.test.espresso.util.EspressoOptional;
+import java.util.function.Consumer;
 import javax.annotation.CheckReturnValue;
-import kotlin.jvm.functions.Function1;
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeMatcher;
@@ -219,14 +219,13 @@ private DisplayDataMatcher(
         @NonNull Matcher<? extends Object> dataMatcher,
         @NonNull AdapterViewProtocol adapterViewProtocol,
         @NonNull AdapterDataLoaderAction adapterDataLoaderAction,
-        @NonNull Function1<AdapterDataLoaderAction, ViewInteraction> loadDataFunction) {
+        @NonNull Consumer<AdapterDataLoaderAction> loadDataFunction) {
       this.adapterMatcher = checkNotNull(adapterMatcher);
       this.dataMatcher = checkNotNull(dataMatcher);
       this.adapterViewProtocol = checkNotNull(adapterViewProtocol);
       this.adapterViewProtocolClass = adapterViewProtocol.getClass();
       this.adapterDataLoaderAction = checkNotNull(adapterDataLoaderAction);
-      // TODO(b/223229374): This return value was unused, but likely should have been used.
-      Object unused = checkNotNull(loadDataFunction).invoke(adapterDataLoaderAction);
+      checkNotNull(loadDataFunction).accept(adapterDataLoaderAction);
     }
 
     /**
diff --git a/espresso/remote/javatests/androidx/test/espresso/DisplayDataMatcherRemoteMsgTest.java b/espresso/remote/javatests/androidx/test/espresso/DisplayDataMatcherRemoteMsgTest.java
index e3ad4f251..cca0720da 100644
--- a/espresso/remote/javatests/androidx/test/espresso/DisplayDataMatcherRemoteMsgTest.java
+++ b/espresso/remote/javatests/androidx/test/espresso/DisplayDataMatcherRemoteMsgTest.java
@@ -70,7 +70,7 @@ private static DisplayDataMatcherProto toProto() {
             stringMatcher,
             adapterViewProtocol,
             adapterDataLoaderAction,
-            adapterDataLoaderAction1 -> null);
+            adapterDataLoaderAction1 -> {});
     return (DisplayDataMatcherProto) new GenericRemoteMessage(displayDataMatcher).toProto();
   }