Fix FasterXML#311 by wrapping IonExceptions in IonParser

Author: popematt

ion/src/main/java/com/fasterxml/jackson/dataformat/ion/IonParser.java

@@ -265,7 +265,13 @@ public String getText() throws IOException
             case FIELD_NAME:
                 return getCurrentName();
             case VALUE_STRING:
-                return _reader.stringValue();
+                try {
+                    // stringValue() will throw an UnknownSymbolException if we're
+                    // trying to get the text for a symbol id that cannot be resolved.
+                    return _reader.stringValue();
+                } catch (UnknownSymbolException e) {
+                    throw _constructError(e.getMessage(), e);
+                }
             case VALUE_NUMBER_INT:
             case VALUE_NUMBER_FLOAT:
                 Number n = getNumberValue();
@@ -512,7 +518,12 @@ public JsonToken nextToken() throws IOException
         }
 
         // any more tokens in this scope?
-        IonType type = _reader.next();
+        IonType type = null;
+        try {
+            type = _reader.next();
+        } catch (IonException e) {
+            _wrapError(e.getMessage(), e);
+        }
         if (type == null) {
             if (_parsingContext.inRoot()) { // EOF?
                 close();
@@ -528,7 +539,13 @@ public JsonToken nextToken() throws IOException
         boolean inStruct = !_parsingContext.inRoot() && _reader.isInStruct();
         // (isInStruct can return true for the first value read if the reader
         // was created from an IonValue that has a parent container)
-        _parsingContext.setCurrentName(inStruct ? _reader.getFieldName() : null);
+        try {
+            // getFieldName() can throw an UnknownSymbolException if the text of the
+            // field name symbol cannot be resolved.
+            _parsingContext.setCurrentName(inStruct ? _reader.getFieldName() : null);
+        } catch (UnknownSymbolException e) {
+            _wrapError(e.getMessage(), e);
+        }
         JsonToken t = _tokenFromType(type);
         // and return either field name first
         if (inStruct) {
@@ -542,9 +559,15 @@ public JsonToken nextToken() throws IOException
     /**
      * @see com.fasterxml.jackson.dataformat.ion.polymorphism.IonAnnotationTypeDeserializer
      */
-    public String[] getTypeAnnotations() {
-        // Per its spec, will not return null
-        return _reader.getTypeAnnotations();
+    public String[] getTypeAnnotations() throws JsonParseException {
+        try {
+            // Per its spec, will not return null
+            return _reader.getTypeAnnotations();
+        } catch (UnknownSymbolException e) {
+            // IonReader.getTypeAnnotations() can throw an UnknownSymbolException if the text of any
+            // the annotation symbols cannot be resolved.
+            throw _constructError(e.getMessage(), e);
+        }
     }
 
     @Override

ion/src/test/java/com/fasterxml/jackson/dataformat/ion/IonParserTest.java

@@ -14,9 +14,7 @@
 
 package com.fasterxml.jackson.dataformat.ion;
 
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.core.StreamReadCapability;
+import com.fasterxml.jackson.core.*;
 
 import org.junit.Assert;
 
@@ -28,8 +26,12 @@
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.List;
+
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+
 @SuppressWarnings("resource")
 public class IonParserTest
 {
@@ -125,4 +127,109 @@ public void testParserCapabilities() throws Exception {
         }
     }
 
+
+    @Test(expected = JsonParseException.class)
+    public void testIonExceptionIsWrapped() throws IOException
+    {
+        IonFactory f = new IonFactory();
+        try (IonParser parser = (IonParser) f.createParser("[  12, true ) ]")) {
+            assertEquals(JsonToken.START_ARRAY, parser.nextToken());
+            assertEquals(JsonToken.VALUE_NUMBER_INT, parser.nextValue());
+            assertEquals(12, parser.getIntValue());
+            assertEquals(JsonToken.VALUE_TRUE, parser.nextValue());
+            parser.nextValue();
+        }
+    }
+
+    @Test(expected = JsonParseException.class)
+    public void testUnknownSymbolExceptionForValueIsWrapped() throws IOException
+    {
+        IonFactory f = new IonFactory();
+        try (IonParser parser = (IonParser) f.createParser("[  12, $99 ]")) {
+            assertEquals(JsonToken.START_ARRAY, parser.nextToken());
+            assertEquals(JsonToken.VALUE_NUMBER_INT, parser.nextValue());
+            assertEquals(12, parser.getIntValue());
+            assertEquals(JsonToken.VALUE_STRING, parser.nextValue());
+            parser.getValueAsString(); // Should encounter unknown symbol and fail
+        }
+    }
+
+    @Test(expected = JsonParseException.class)
+    public void testUnknownSymbolExceptionForFieldNameIsWrapped() throws IOException
+    {
+        IonFactory f = new IonFactory();
+        try (IonParser parser = (IonParser) f.createParser("{  a: 1, $99: 2 }")) {
+            assertEquals(JsonToken.START_OBJECT, parser.nextToken());
+            assertEquals(JsonToken.FIELD_NAME, parser.nextToken());
+            assertEquals("a", parser.getCurrentName());
+            assertEquals(JsonToken.VALUE_NUMBER_INT, parser.nextValue());
+            assertEquals(1, parser.getIntValue());
+            parser.nextValue(); // Should encounter unknown symbol and fail
+        }
+    }
+
+    @Test(expected = JsonParseException.class)
+    public void testUnknownSymbolExceptionForAnnotationIsWrapped() throws IOException
+    {
+        IonFactory f = new IonFactory();
+        try (IonParser parser = (IonParser) f.createParser("{  a: $99::1 }")) {
+            assertEquals(JsonToken.START_OBJECT, parser.nextToken());
+            assertEquals(JsonToken.FIELD_NAME, parser.nextToken());
+            assertEquals("a", parser.getCurrentName());
+            assertEquals(JsonToken.VALUE_NUMBER_INT, parser.nextValue());
+            assertEquals(1, parser.getIntValue());
+            parser.getTypeAnnotations(); // Should encounter unknown symbol and fail
+        }
+    }
+
+    static class FooBar {
+        public int foo;
+        public List<Object> bar;
+    }
+
+
+    public static class IonExceptionTests {
+        IonObjectMapper mapper = new IonObjectMapper();
+
+        // throws JsonMapperException, depends on IonParser.nextToken()
+        // mapper.reader().readValue("{ foo: \"boo\", bar: (1 null.string 2e0 3d0 { )  }", FooBar.class)
+
+        // throws JsonMapperException, depends on IonParser.nextToken(), IonObjectMapper._readMapAndClose()
+        // mapper.readValue("{ foo: \"boo\", bar: (1 null.string 2e0 3d0 { )  }", FooBar.class)
+
+
+        // FooBar fb = mapper.readValue("{ foo: 1, bar: ( ] ) }", FooBar.class);
+        // FooBar fb = mapper.readValue("{ foo: 1, bar: ( ] ) }", FooBar.class);
+
+
+        @Test(expected = JacksonException.class)
+        public void testIonObjectMapper1() throws IOException {
+            mapper.readValue("{ foo: 1, bar: ( ] )  }", FooBar.class);
+        }
+
+        @Test(expected = JacksonException.class)
+        public void testIonObjectMapper2() throws IOException {
+            mapper.readValue("{ foo: 1, bar: (1 null.string 2e0 3d0 { )  }", FooBar.class);
+        }
+
+        @Test(expected = JacksonException.class)
+        public void testIonObjectMapper3() throws IOException {
+            mapper.readValue("{ foo: 1, bar: ( ) ]  }", FooBar.class);
+        }
+
+        @Test(expected = JacksonException.class)
+        public void testIonObjectMapper4() throws IOException {
+            mapper.reader().readValue("{ foo: 1, bar: ( ] )  }", FooBar.class);
+        }
+
+        @Test(expected = JacksonException.class)
+        public void testIonObjectMapper5() throws IOException {
+            mapper.reader().readValue("{ foo: 1, bar: (1 null.string 2e0 3d0 { )  }", FooBar.class);
+        }
+
+        @Test(expected = JacksonException.class)
+        public void testIonObjectMapper6() throws IOException {
+            mapper.reader().readValue("{ foo: 1, bar: ( ) ]  }", FooBar.class);
+        }
+    }
 }