From a32604f4dc8b6b41e85c3e14f43dc66510591bc6 Mon Sep 17 00:00:00 2001
From: Zac Policzer <zacattackftw@gmail.com>
Date: Mon, 12 Aug 2024 11:53:07 -0700
Subject: [PATCH] fix unit test

---
 .../merge/TestMergeUpdateWithFieldLevelTimestamp.java           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clients/da-vinci-client/src/test/java/com/linkedin/davinci/replication/merge/TestMergeUpdateWithFieldLevelTimestamp.java b/clients/da-vinci-client/src/test/java/com/linkedin/davinci/replication/merge/TestMergeUpdateWithFieldLevelTimestamp.java
index d5d427622a..8ed300e372 100644
--- a/clients/da-vinci-client/src/test/java/com/linkedin/davinci/replication/merge/TestMergeUpdateWithFieldLevelTimestamp.java
+++ b/clients/da-vinci-client/src/test/java/com/linkedin/davinci/replication/merge/TestMergeUpdateWithFieldLevelTimestamp.java
@@ -145,7 +145,7 @@ public void testWholeFieldUpdate() {
     ByteBuffer writeComputeBytes1 = ByteBuffer.wrap(
         MapOrderPreservingSerDeFactory.getSerializer(writeComputeSchema).serialize(updateFieldPartialUpdateRecord1));
     MergeConflictResult mergeConflictResult = mergeConflictResolver.update(
-        null,
+        Lazy.of(() -> null),
         rmdWithValueSchemaId,
         writeComputeBytes1,
         incomingValueSchemaId,