Merge branch '2.15'

Author: cowtowncoder

avro/src/main/java/tools/jackson/dataformat/avro/deser/AvroParserImpl.java

@@ -669,5 +669,5 @@ protected final  JsonToken setNumber(double v) {
         return JsonToken.VALUE_NUMBER_FLOAT;
     }
 
-    protected abstract JsonToken setString(String str);
+    protected abstract JsonToken setString(String str) throws IOException;
 }

avro/src/main/java/tools/jackson/dataformat/avro/deser/JacksonAvroParserImpl.java

@@ -1034,7 +1034,7 @@ public boolean checkInputEnd() throws IOException {
      */
 
     @Override
-    protected JsonToken setString(String str) {
+    protected JsonToken setString(String str) throws IOException {
         _textBuffer.resetWithString(str);
         return JsonToken.VALUE_STRING;
     }

avro/src/main/java/tools/jackson/dataformat/avro/deser/ScalarDefaults.java

@@ -53,7 +53,7 @@ public StringDefaults(String name, String v) {
         }
 
         @Override
-        public JsonToken readValue(AvroReadContext parent, AvroParserImpl parser) {
+        public JsonToken readValue(AvroReadContext parent, AvroParserImpl parser) throws IOException {
             return parser.setString(_defaults);
         }
     }

avro/src/test/java/tools/jackson/dataformat/avro/RoundtripTest.java

@@ -2,7 +2,7 @@
 
 import tools.jackson.core.StreamReadConstraints;
 import tools.jackson.core.StreamWriteFeature;
-
+import tools.jackson.core.exc.StreamConstraintsException;
 import tools.jackson.databind.*;
 
 public class RoundtripTest extends MapTest
@@ -105,8 +105,8 @@ public void testCharSequencesLowStringLimit() throws Exception
         try {
             mapper.reader(CHARSEQ_SCHEMA)
                     .forType(CharSeqBean.class).readValue(avroData);
-            fail("expected IllegalStateException");
-        } catch (IllegalStateException ise) {
+            fail("expected StreamConstraintsException");
+        } catch (StreamConstraintsException ise) {
             assertEquals("String length (3) exceeds the maximum length (1)", ise.getMessage());
         }
     }

cbor/src/test/java/tools/jackson/dataformat/cbor/parse/ParserNumbersTest.java

@@ -7,6 +7,7 @@
 
 import tools.jackson.core.*;
 import tools.jackson.core.JsonParser.NumberType;
+import tools.jackson.core.exc.StreamConstraintsException;
 import tools.jackson.dataformat.cbor.*;
 import tools.jackson.dataformat.cbor.testutil.ThrottledInputStream;
 
@@ -363,9 +364,9 @@ public void testVeryBigDecimalType() throws IOException {
         try (CBORParser parser = cborParser(b)) {
             try {
                 parser.nextToken();
-                fail("expected NumberFormatException");
-            } catch (NumberFormatException nfe) {
-                assertEquals("Number length (4153) exceeds the maximum length (1000)", nfe.getMessage());
+                fail("expected StreamConstraintsException");
+            } catch (StreamConstraintsException e) {
+                assertEquals("Number length (4153) exceeds the maximum length (1000)", e.getMessage());
             }
         }
     }

cbor/src/test/java/tools/jackson/dataformat/cbor/seq/ReadTreesTest.java

@@ -3,7 +3,9 @@
 import java.util.List;
 
 import tools.jackson.core.StreamReadConstraints;
+import tools.jackson.core.exc.StreamConstraintsException;
 import tools.jackson.databind.*;
+
 import tools.jackson.dataformat.cbor.CBORFactory;
 import tools.jackson.dataformat.cbor.CBORTestBase;
 
@@ -81,7 +83,7 @@ public void testReadTreeSequenceLowStringLimit() throws Exception
             try {
                 it.nextValue();
                 fail("expected IllegalStateException");
-            } catch (IllegalStateException ise) {
+            } catch (StreamConstraintsException ise) {
                 assertEquals("String length (2) exceeds the maximum length (1)", ise.getMessage());
             }
         }

smile/src/test/java/tools/jackson/dataformat/smile/async/SimpleStringArrayTest.java

@@ -6,6 +6,7 @@
 import tools.jackson.core.JsonGenerator;
 import tools.jackson.core.JsonToken;
 import tools.jackson.core.StreamReadConstraints;
+import tools.jackson.core.exc.StreamConstraintsException;
 import tools.jackson.databind.ObjectWriter;
 
 import tools.jackson.dataformat.smile.SmileFactory;
@@ -130,8 +131,8 @@ public void testLongAsciiStringsLowStringLimit() throws IOException
         assertToken(JsonToken.VALUE_STRING, r.nextToken());
         try {
             r.currentText();
-            fail("expected IllegalStateException");
-        } catch (IllegalStateException ise) {
+            fail("expected StreamConstraintsException");
+        } catch (StreamConstraintsException ise) {
             assertEquals("String length (98) exceeds the maximum length (10)", ise.getMessage());
         }
     }

smile/src/test/java/tools/jackson/dataformat/smile/parse/NumberParsingTest.java

@@ -5,6 +5,7 @@
 import java.math.BigInteger;
 
 import tools.jackson.core.*;
+import tools.jackson.core.exc.StreamConstraintsException;
 import tools.jackson.core.exc.StreamReadException;
 
 import tools.jackson.dataformat.smile.BaseTestForSmile;
@@ -400,8 +401,8 @@ public void testVeryBigDecimal() throws IOException
             assertToken(JsonToken.VALUE_NUMBER_FLOAT, p.nextToken());
             try {
                 p.getNumberType();
-                fail("expected NumberFormatException");
-            } catch (NumberFormatException nfe) {
+                fail("expected StreamConstraintsException");
+            } catch (StreamConstraintsException nfe) {
                 assertEquals("Number length (4153) exceeds the maximum length (1000)", nfe.getMessage());
             }
         }