fix: handle unmaterialized sets

fauna · Oct 23, 2024 · f5768ee · f5768ee
1 parent 605384a
commit f5768ee
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 2 deletions.
diff --git a/src/main/java/com/fauna/codec/UTF8FaunaParser.java b/src/main/java/com/fauna/codec/UTF8FaunaParser.java
@@ -54,11 +54,13 @@ public class UTF8FaunaParser {
     private final Stack<Object> tokenStack = new Stack<>();
     private FaunaTokenType currentFaunaTokenType = NONE;
     private FaunaTokenType bufferedFaunaTokenType;
+    private Object bufferedTokenValue;
     private String taggedTokenValue;
 
 
     private enum InternalTokenType {
-        START_ESCAPED_OBJECT
+        START_ESCAPED_OBJECT,
+        START_PAGE_UNMATERIALIZED
     }
 
     public UTF8FaunaParser(JsonParser jsonParser) {
@@ -128,6 +130,8 @@ public boolean read() throws CodecException {
             return true;
         }
 
+        bufferedTokenValue = null;
+
         if (!advance()) {
             return false;
         }
@@ -218,7 +222,20 @@ private void handleStartObject() throws CodecException {
                     case SET_TAG:
                         advanceTrue();
                         currentFaunaTokenType = FaunaTokenType.START_PAGE;
-                        tokenStack.push(FaunaTokenType.START_PAGE);
+
+                        if (jsonParser.currentToken() == JsonToken.VALUE_STRING) {
+                            bufferedFaunaTokenType = FaunaTokenType.STRING;
+
+                            try {
+                                bufferedTokenValue = jsonParser.getValueAsString();
+                            } catch (IOException e) {
+                                throw new CodecException(e.getMessage(), e);
+                            }
+
+                            tokenStack.push(InternalTokenType.START_PAGE_UNMATERIALIZED);
+                        } else {
+                            tokenStack.push(FaunaTokenType.START_PAGE);
+                        }
                         break;
                     case REF_TAG:
                         advanceTrue();
@@ -248,6 +265,8 @@ private void handleEndObject() {
         if (startToken.equals(FaunaTokenType.START_DOCUMENT)) {
             currentFaunaTokenType = END_DOCUMENT;
             advanceTrue();
+        } else if (startToken.equals(InternalTokenType.START_PAGE_UNMATERIALIZED)) {
+            currentFaunaTokenType = END_PAGE;
         } else if (startToken.equals(FaunaTokenType.START_PAGE)) {
             currentFaunaTokenType = END_PAGE;
             advanceTrue();
@@ -320,6 +339,9 @@ public Character getValueAsCharacter() {
 
     public String getValueAsString() {
         try {
+            if (bufferedTokenValue != null) {
+                return bufferedTokenValue.toString();
+            }
             return jsonParser.getValueAsString();
         } catch (IOException e) {
             throw new CodecException("Error getting the current token as String", e);

diff --git a/src/test/java/com/fauna/codec/UTF8FaunaParserTest.java b/src/test/java/com/fauna/codec/UTF8FaunaParserTest.java
@@ -372,6 +372,26 @@ public void testReadSet() throws IOException {
         assertReader(reader, expectedTokens);
     }
 
+
+    @Test
+    public void testReadUnmaterializedSet() {
+        String s = "{\"products\":{\"@set\":\"sometoken\"},\"name\":\"foo\"}";
+        UTF8FaunaParser reader = UTF8FaunaParser.fromInputStream(new ByteArrayInputStream(s.getBytes()));
+
+        List<Map.Entry<FaunaTokenType, Object>> expectedTokens = List.of(
+                new AbstractMap.SimpleEntry<>(FaunaTokenType.START_OBJECT, null),
+                Map.entry(FaunaTokenType.FIELD_NAME, "products"),
+                new AbstractMap.SimpleEntry<>(FaunaTokenType.START_PAGE, null),
+                Map.entry(FaunaTokenType.STRING, "sometoken"),
+                new AbstractMap.SimpleEntry<>(FaunaTokenType.END_PAGE, null),
+                Map.entry(FaunaTokenType.FIELD_NAME, "name"),
+                Map.entry(FaunaTokenType.STRING, "foo"),
+                new AbstractMap.SimpleEntry<>(FaunaTokenType.END_OBJECT, null)
+        );
+
+        assertReader(reader, expectedTokens);
+    }
+
     @Test
     public void testReadRef() throws IOException {
         String s = "{\"@ref\": {\"id\": \"123\", \"coll\": {\"@mod\": \"Col\"}}}";