Some more work for #2177: resolved half of errors (now down to under 200...), tests compile

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/JsonDeserializer.java

@@ -1,6 +1,5 @@
 package com.fasterxml.jackson.databind;
 
-import java.io.IOException;
 import java.util.Collection;
 
 import com.fasterxml.jackson.core.*;
@@ -186,7 +185,7 @@ public T deserialize(JsonParser p, DeserializationContext ctxt, T intoValue)
      */
     public Object deserializeWithType(JsonParser p, DeserializationContext ctxt,
             TypeDeserializer typeDeserializer)
-        throws IOException
+        throws JacksonException
     {
         // We could try calling 
         return typeDeserializer.deserializeTypedFromAny(p, ctxt);
@@ -197,12 +196,10 @@ public Object deserializeWithType(JsonParser p, DeserializationContext ctxt,
      * but called when merging value. Considered "bad merge" by default implementation,
      * but if {@link MapperFeature#IGNORE_MERGE_FOR_UNMERGEABLE} is enabled will simple delegate to
      * {@link #deserializeWithType(JsonParser, DeserializationContext, TypeDeserializer)}.
-     *
-     * @since 2.10
      */
     public Object deserializeWithType(JsonParser p, DeserializationContext ctxt,
             TypeDeserializer typeDeserializer, T intoValue)
-        throws IOException
+        throws JacksonException
     {
         ctxt.handleBadMerge(this);
         return deserializeWithType(p, ctxt, typeDeserializer);

src/main/java/com/fasterxml/jackson/databind/JsonNode.java

@@ -1,6 +1,5 @@
 package com.fasterxml.jackson.databind;
 
-import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.*;

src/main/java/com/fasterxml/jackson/databind/KeyDeserializer.java

@@ -1,6 +1,6 @@
 package com.fasterxml.jackson.databind;
 
-import java.io.IOException;
+import com.fasterxml.jackson.core.JacksonException;
 
 /**
  * Abstract class that defines API used for deserializing JSON content
@@ -25,7 +25,7 @@ public abstract class KeyDeserializer
      * @param ctxt Context to use for accessing configuration, resolving
      *    secondary deserializers
      */
-    public void resolve(DeserializationContext ctxt) throws JsonMappingException {
+    public void resolve(DeserializationContext ctxt) throws JacksonException {
         // Default implementation does nothing
     }
 
@@ -39,7 +39,7 @@ public void resolve(DeserializationContext ctxt) throws JsonMappingException {
      * Method called to deserialize a {@link java.util.Map} key from JSON property name.
      */
     public abstract Object deserializeKey(String key, DeserializationContext ctxt)
-        throws IOException;
+        throws JacksonException;
 
     /**
      * This marker class is only to be used with annotations, to

src/main/java/com/fasterxml/jackson/databind/MappingIterator.java

@@ -1,17 +1,14 @@
 package com.fasterxml.jackson.databind;
 
 import java.io.Closeable;
-import java.io.IOException;
-import java.io.UncheckedIOException;
 import java.util.*;
 
 import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.databind.exc.RuntimeJsonMappingException;
 
 /**
  * Iterator exposed by {@link ObjectMapper} when binding sequence of
- * objects. Extension is done to allow more convenient exposing of
- * {@link IOException} (which basic {@link Iterator} does not expose)
+ * objects. Extension is done to allow more convenient access
+ * (in Jackson 2.x exception handling required it, too, but not in 3.x)
  */
 public class MappingIterator<T> implements Iterator<T>, Closeable
 {
@@ -167,8 +164,6 @@ protected MappingIterator(JavaType type, JsonParser p, DeserializationContext ct
     /**
      * Method for getting an "empty" iterator instance: one that never
      * has more values; may be freely shared.
-     *
-     * @since 2.10 Existed earlier but {@code public} since 2.10
      */
     @SuppressWarnings("unchecked")
     public static <T> MappingIterator<T> emptyIterator() {
@@ -184,25 +179,13 @@ public static <T> MappingIterator<T> emptyIterator() {
     @Override
     public boolean hasNext()
     {
-        try {
-            return hasNextValue();
-        } catch (JsonMappingException e) {
-            return (Boolean) _handleMappingException(e);
-        } catch (IOException e) {
-            return (Boolean) _handleIOException(e);
-        }
+        return hasNextValue();
     }
 
     @Override
     public T next()
     {
-        try {
-            return nextValue();
-        } catch (JsonMappingException e) {
-            return _handleMappingException(e);
-        } catch (IOException e) {
-            return _handleIOException(e);
-        }
+        return nextValue();
     }
 
     @Override
@@ -211,7 +194,7 @@ public void remove() {
     }
 
     @Override
-    public void close() throws IOException {
+    public void close() {
         if (_state != STATE_CLOSED) {
             _state = STATE_CLOSED;
             if (_parser != null) {
@@ -230,7 +213,7 @@ public void close() throws IOException {
      * Equivalent of {@link #next} but one that may throw checked
      * exceptions from Jackson due to invalid input.
      */
-    public boolean hasNextValue() throws IOException
+    public boolean hasNextValue() throws JacksonException
     {
         switch (_state) {
         case STATE_CLOSED:
@@ -259,7 +242,7 @@ public boolean hasNextValue() throws IOException
         return true;
     }
 
-    public T nextValue() throws IOException
+    public T nextValue() throws JacksonException
     {
         switch (_state) {
         case STATE_CLOSED:
@@ -299,7 +282,7 @@ public T nextValue() throws IOException
      * 
      * @return List of entries read
      */
-    public List<T> readAll() throws IOException {
+    public List<T> readAll() throws JacksonException {
         return readAll(new ArrayList<T>());
     }
 
@@ -309,7 +292,7 @@ public List<T> readAll() throws IOException {
      * 
      * @return List of entries read (same as passed-in argument)
      */
-    public <L extends List<? super T>> L readAll(L resultList) throws IOException
+    public <L extends List<? super T>> L readAll(L resultList) throws JacksonException
     {
         while (hasNextValue()) {
             resultList.add(nextValue());
@@ -321,7 +304,7 @@ public <L extends List<? super T>> L readAll(L resultList) throws IOException
      * Convenience method for reading all entries accessible via
      * this iterator
      */
-    public <C extends Collection<? super T>> C readAll(C results) throws IOException
+    public <C extends Collection<? super T>> C readAll(C results) throws JacksonException
     {
         while (hasNextValue()) {
             results.add(nextValue());
@@ -369,7 +352,7 @@ public JsonLocation getCurrentLocation() {
     /**********************************************************************
      */
 
-    protected void _resync() throws IOException
+    protected void _resync() throws JacksonException
     {
         final JsonParser p = _parser;
         // First, a quick check to see if we might have been lucky and no re-sync needed
@@ -395,12 +378,4 @@ protected void _resync() throws IOException
     protected <R> R _throwNoSuchElement() {
         throw new NoSuchElementException();
     }
-    
-    protected <R> R _handleMappingException(JsonMappingException e) {
-        throw new RuntimeJsonMappingException(e.getMessage(), e);
-    }
-
-    protected <R> R _handleIOException(IOException e) {
-        throw new UncheckedIOException(e.getMessage(), e);
-    }
 }

src/main/java/com/fasterxml/jackson/databind/ObjectWriter.java

@@ -14,7 +14,6 @@
 import com.fasterxml.jackson.databind.cfg.ContextAttributes;
 import com.fasterxml.jackson.databind.cfg.GeneratorSettings;
 import com.fasterxml.jackson.databind.cfg.SerializationContexts;
-import com.fasterxml.jackson.databind.exc.RuntimeJsonMappingException;
 import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
 import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
 import com.fasterxml.jackson.databind.node.ArrayNode;
@@ -1130,15 +1129,7 @@ public Prefetch forRootType(ObjectWriter parent, JavaType newType) {
             // have `TypeSerializer` to use
             if (newType.isJavaLangObject()) {
                 DefaultSerializerProvider ctxt = parent._serializerProvider();
-                TypeSerializer typeSer;
-
-                try {
-                    typeSer = ctxt.findTypeSerializer(newType);
-                } catch (JsonMappingException e) {
-                    // Unlike with value serializer pre-fetch, let's not allow exception
-                    // for TypeSerializer be swallowed
-                    throw new RuntimeJsonMappingException(e);
-                }
+                TypeSerializer typeSer = ctxt.findTypeSerializer(newType);
                 return new Prefetch(null, null, typeSer);
             }
 

src/main/java/com/fasterxml/jackson/databind/SerializerProvider.java

@@ -1,6 +1,5 @@
 package com.fasterxml.jackson.databind;
 
-import java.io.IOException;
 import java.text.DateFormat;
 import java.util.Date;
 import java.util.Locale;
@@ -1296,7 +1295,8 @@ public JsonMappingException invalidTypeIdException(JavaType baseType, String typ
         return InvalidTypeIdException.from(null, _colonConcat(msg, extraDesc), baseType, typeId);
     }
 
-    protected void _reportIncompatibleRootType(Object value, JavaType rootType) throws IOException
+    protected void _reportIncompatibleRootType(Object value, JavaType rootType)
+        throws JacksonException
     {
         // One special case: allow primitive/wrapper type coercion
         if (rootType.isPrimitive()) {

src/main/java/com/fasterxml/jackson/databind/deser/AbstractDeserializer.java

@@ -1,6 +1,5 @@
 package com.fasterxml.jackson.databind.deser;
 
-import java.io.IOException;
 import java.util.*;
 
 import com.fasterxml.jackson.annotation.ObjectIdGenerator;
@@ -217,7 +216,7 @@ public SettableBeanProperty findBackReference(String logicalName) {
     @Override
     public Object deserializeWithType(JsonParser p, DeserializationContext ctxt,
             TypeDeserializer typeDeserializer)
-        throws IOException
+        throws JacksonException
     {
         // Hmmh. One tricky question; for scalar, is it an Object Id, or "Natural" type?
         // for now, prefer Object Id:
@@ -264,7 +263,8 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt)
     /**********************************************************
      */
 
-    protected Object _deserializeIfNatural(JsonParser p, DeserializationContext ctxt) throws IOException
+    protected Object _deserializeIfNatural(JsonParser p, DeserializationContext ctxt)
+        throws JacksonException
     {
         /* There is a chance we might be "natural" types
          * (String, Boolean, Integer, Double), which do not include any type information...
@@ -306,7 +306,8 @@ protected Object _deserializeIfNatural(JsonParser p, DeserializationContext ctxt
      * Method called in cases where it looks like we got an Object Id
      * to parse and use as a reference.
      */
-    protected Object _deserializeFromObjectId(JsonParser p, DeserializationContext ctxt) throws IOException
+    protected Object _deserializeFromObjectId(JsonParser p, DeserializationContext ctxt)
+        throws JacksonException
     {
         Object id = _objectIdReader.readObjectReference(p, ctxt);
         ReadableObjectId roid = ctxt.findObjectId(id, _objectIdReader.generator, _objectIdReader.resolver);

src/main/java/com/fasterxml/jackson/databind/deser/CreatorProperty.java

@@ -1,9 +1,9 @@
 package com.fasterxml.jackson.databind.deser;
 
-import java.io.IOException;
 import java.lang.annotation.Annotation;
 
 import com.fasterxml.jackson.annotation.JacksonInject;
+import com.fasterxml.jackson.core.JacksonException;
 import com.fasterxml.jackson.core.JsonParser;
 
 import com.fasterxml.jackson.databind.*;
@@ -215,29 +215,29 @@ public <A extends Annotation> A getAnnotation(Class<A> acls) {
 
     @Override
     public void deserializeAndSet(JsonParser p, DeserializationContext ctxt,
-            Object instance) throws IOException
+            Object instance) throws JacksonException
     {
         _verifySetter();
         _fallbackSetter.set(instance, deserialize(p, ctxt));
     }
 
     @Override
     public Object deserializeSetAndReturn(JsonParser p,
-            DeserializationContext ctxt, Object instance) throws IOException
+            DeserializationContext ctxt, Object instance) throws JacksonException
     {
         _verifySetter();
         return _fallbackSetter.setAndReturn(instance, deserialize(p, ctxt));
     }
 
     @Override
-    public void set(Object instance, Object value) throws IOException
+    public void set(Object instance, Object value)
     {
         _verifySetter();
         _fallbackSetter.set(instance, value);
     }
 
     @Override
-    public Object setAndReturn(Object instance, Object value) throws IOException
+    public Object setAndReturn(Object instance, Object value)
     {
         _verifySetter();
         return _fallbackSetter.setAndReturn(instance, value);
@@ -285,13 +285,14 @@ public boolean isInjectionOnly() {
     /**********************************************************************
      */
 
-    private final void _verifySetter() throws IOException {
+    private final void _verifySetter() throws JacksonException {
         if (_fallbackSetter == null) {
             _reportMissingSetter(null, null);
         }
     }
 
-    private void _reportMissingSetter(JsonParser p, DeserializationContext ctxt) throws IOException
+    private void _reportMissingSetter(JsonParser p, DeserializationContext ctxt)
+            throws JacksonException
     {
         final String msg = "No fallback setter/field defined for creator property "+ClassUtil.name(getName());
         // Hmmmh. Should we return quietly (NOP), or error?

src/main/java/com/fasterxml/jackson/databind/deser/DefaultDeserializationContext.java

@@ -1,6 +1,5 @@
 package com.fasterxml.jackson.databind.deser;
 
-import java.io.IOException;
 import java.util.*;
 import java.util.Map.Entry;
 

src/main/java/com/fasterxml/jackson/databind/deser/SettableAnyProperty.java

@@ -144,7 +144,7 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOEx
     }
 
     @SuppressWarnings("unchecked")
-    public void set(Object instance, Object propName, Object value) throws IOException
+    public void set(Object instance, Object propName, Object value) throws JacksonException
     {
         try {
             // if annotation in the field (only map is supported now)
@@ -196,7 +196,7 @@ protected void _throwAsIOE(Exception e, Object propName, Object value)
             }
             throw new JsonMappingException(null, msg.toString(), e);
         }
-        ClassUtil.throwIfIOE(e);
+        ClassUtil.throwIfJacksonE(e);
         ClassUtil.throwIfRTE(e);
         // let's wrap the innermost problem
         Throwable t = ClassUtil.getRootCause(e);
@@ -223,7 +223,7 @@ public AnySetterReferring(SettableAnyProperty parent,
 
         @Override
         public void handleResolvedForwardReference(Object id, Object value)
-            throws IOException
+            throws JacksonException
         {
             if (!hasId(id)) {
                 throw new IllegalArgumentException("Trying to resolve a forward reference with id [" + id.toString()