From 34d85ef53e265fd2c1e7ec450f16da57d181cf1c Mon Sep 17 00:00:00 2001
From: David Griffin <david.griffin@fauna.com>
Date: Wed, 11 Sep 2024 10:14:34 -0700
Subject: [PATCH] Fix some more merge conflicts.

---
 src/test/java/com/fauna/e2e/E2EQueryTest.java | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/test/java/com/fauna/e2e/E2EQueryTest.java b/src/test/java/com/fauna/e2e/E2EQueryTest.java
index 1b1e3cf2..f832ead8 100644
--- a/src/test/java/com/fauna/e2e/E2EQueryTest.java
+++ b/src/test/java/com/fauna/e2e/E2EQueryTest.java
@@ -20,7 +20,7 @@
 import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 
-import static com.fauna.codec.Generic.nullableOf;
+import static com.fauna.codec.Generic.nullableDocumentOf;
 import static com.fauna.query.builder.Query.fql;
 import static com.fauna.codec.Generic.listOf;
 import static com.fauna.codec.Generic.mapOf;
@@ -200,19 +200,19 @@ public void query_optionalNotNull() {
     public void query_nullableOf() {
         var q = fql("Author.byId('9090090')");
 
-        var qs = c.query(q, nullableOf(Author.class));
-        Nullable<Author> actual = qs.getData();
-        assertInstanceOf(NullDoc.class, actual);
-        assertEquals("not found", ((NullDoc<Author>)actual).getCause());
+        var qs = c.query(q, nullableDocumentOf(Author.class));
+        NullableDocument<Author> actual = qs.getData();
+        assertInstanceOf(NullDocument.class, actual);
+        assertEquals("not found", ((NullDocument<Author>)actual).getCause());
     }
 
     @Test
     public void query_nullableOfNotNull() {
         var q = fql("Author.all().first()");
-        var qs = c.query(q, nullableOf(Author.class));
-        Nullable<Author> actual = qs.getData();
-        assertInstanceOf(NonNull.class, actual);
-        assertEquals("Alice", ((NonNull<Author>)actual).getValue().getFirstName());
+        var qs = c.query(q, nullableDocumentOf(Author.class));
+        NullableDocument<Author> actual = qs.getData();
+        assertInstanceOf(NonNullDocument.class, actual);
+        assertEquals("Alice", ((NonNullDocument<Author>)actual).getValue().getFirstName());
     }
 
     @Test