Minor refactoring of error reporting of invalid surrogates with CBOR generation

Author: cowtowncoder

cbor/src/main/java/com/fasterxml/jackson/dataformat/cbor/CBORGenerator.java

@@ -1450,7 +1450,8 @@ protected final void _writeChunkedString(char[] text, int offset, int len)
      * Helper method called when the whole character sequence is known to fit in
      * the output buffer regardless of UTF-8 expansion.
      */
-    private final int _encode(int outputPtr, char[] str, int i, int end) {
+    private final int _encode(int outputPtr, char[] str, int i, int end) throws IOException
+    {
         // First: let's see if it's all ASCII: that's rather fast
         final byte[] outBuf = _outputBuffer;
         final int outputStart = outputPtr;
@@ -1470,7 +1471,8 @@ private final int _encode(int outputPtr, char[] str, int i, int end) {
      * characters.
      */
     private final int _shortUTF8Encode2(char[] str, int i, int end,
-            int outputPtr, int outputStart) {
+            int outputPtr, int outputStart) throws IOException
+    {
         final byte[] outBuf = _outputBuffer;
         while (i < end) {
             int c = str[i++];
@@ -1508,7 +1510,7 @@ private final int _shortUTF8Encode2(char[] str, int i, int end,
         return (outputPtr - outputStart);
     }
 
-    private final int _encode(int outputPtr, String str, int len) {
+    private final int _encode(int outputPtr, String str, int len) throws IOException {
         final byte[] outBuf = _outputBuffer;
         final int outputStart = outputPtr;
 
@@ -1523,7 +1525,8 @@ private final int _encode(int outputPtr, String str, int len) {
     }
 
     private final int _encode2(int i, int outputPtr, String str, int len,
-            int outputStart) {
+            int outputStart) throws IOException
+    {
         final byte[] outBuf = _outputBuffer;
         // no; non-ASCII stuff, slower loop
         while (i < len) {
@@ -1562,7 +1565,9 @@ private final int _encode2(int i, int outputPtr, String str, int len,
         return (outputPtr - outputStart);
     }
 
-    private int _invalidSurrogateStart(int code, byte[] outBuf, int outputPtr) {
+    private int _invalidSurrogateStart(int code, byte[] outBuf, int outputPtr)
+        throws IOException
+    {
         if (isEnabled(Feature.LENIENT_UTF_ENCODING)) {
             return _appendReplacementChar(outBuf, outputPtr);
         }
@@ -1571,25 +1576,28 @@ private int _invalidSurrogateStart(int code, byte[] outBuf, int outputPtr) {
         // but there is no second part to encode
         if (code <= SURR1_LAST) {
             // Unmatched first part (closing without second part?)
-            throw new IllegalArgumentException(String.format(
+            _reportError(String.format(
 "Unmatched surrogate pair, starts with valid high surrogate (0x%04X) but ends without low surrogate",
 code));
         }
-        throw new IllegalArgumentException(String.format(
+        _reportError(String.format(
 "Invalid surrogate pair, starts with invalid high surrogate (0x%04X), not in valid range [0xD800, 0xDBFF]",
 code));
+        return 0; // never gets here
     }
 
     private int _invalidSurrogateEnd(int surr1, int surr2,
             byte[] outBuf, int outputPtr)
+        throws IOException
     {
         if (isEnabled(Feature.LENIENT_UTF_ENCODING)) {
             return _appendReplacementChar(outBuf, outputPtr);
         }
-        throw new IllegalArgumentException(String.format(
+        _reportError(String.format(
 "Invalid surrogate pair, starts with valid high surrogate (0x%04X)"
 +" but ends with invalid low surrogate (0x%04X), not in valid range [0xDC00, 0xDFFF]",
 surr1, surr2));
+        return 0; // never gets here
     }
 
     private int _appendReplacementChar(byte[] outBuf, int outputPtr) {

cbor/src/test/java/com/fasterxml/jackson/dataformat/cbor/gen/LenientUnicodeGenerationTest.java renamed to cbor/src/test/java/com/fasterxml/jackson/dataformat/cbor/gen/LenientUnicodeCBORGenerationTest.java

@@ -2,9 +2,11 @@
 
 import java.io.ByteArrayOutputStream;
 
+import com.fasterxml.jackson.core.exc.StreamWriteException;
+
 import com.fasterxml.jackson.dataformat.cbor.*;
 
-public class LenientUnicodeGenerationTest extends CBORTestBase
+public class LenientUnicodeCBORGenerationTest extends CBORTestBase
 {
     /**
      * Test that encoding a String containing invalid surrogates fail with an exception
@@ -17,29 +19,32 @@ public void testFailForInvalidSurrogate() throws Exception
         assertEquals(0, gen.getOutputBuffered());
 
         // Invalid first surrogate character
-        try { 
+        try {
             gen.writeString("x\ud83d");
-        } catch (IllegalArgumentException e) {
+            fail("Should not pass");
+        } catch (StreamWriteException e) {
             verifyException(e, "Unmatched surrogate pair");
             verifyException(e, "0xD83D");
             verifyException(e, "without low surrogate");
         }
         assertEquals(0, gen.getOutputBuffered());
 
         // Missing second surrogate character
-        try { 
+        try {
             gen.writeString("x\ude01");
-        } catch (IllegalArgumentException e) {
+            fail("Should not pass");
+        } catch (StreamWriteException e) {
             verifyException(e, "Invalid surrogate pair");
             verifyException(e, "0xDE01");
             verifyException(e, "invalid high surrogate");
         }
         assertEquals(0, gen.getOutputBuffered());
 
         // Invalid second surrogate character (1)
-        try { 
+        try {
             gen.writeString("x\ud801\ud802");
-        } catch (IllegalArgumentException e) {
+            fail("Should not pass");
+        } catch (StreamWriteException e) {
             verifyException(e, "Invalid surrogate pair");
             verifyException(e, "0xD801");
             verifyException(e, "0xD802");
@@ -49,9 +54,10 @@ public void testFailForInvalidSurrogate() throws Exception
         assertEquals(0, gen.getOutputBuffered());
 
         // Invalid second surrogate character (2)
-        try { 
+        try {
             gen.writeString("x\ud83dx");
-        } catch (IllegalArgumentException e) {
+            fail("Should not pass");
+        } catch (StreamWriteException e) {
             verifyException(e, "Invalid surrogate pair");
             verifyException(e, "0xD83D");
             verifyException(e, "0x0078");

smile/src/test/java/com/fasterxml/jackson/dataformat/smile/gen/GeneratorInvalidCallsTest.java

@@ -8,7 +8,7 @@
 
 public class GeneratorInvalidCallsTest extends BaseTestForSmile
 {
-    final SmileFactory SMILE_F = new SmileFactory();
+    private final SmileFactory SMILE_F = new SmileFactory();
 
     public void testInvalidFieldNameInRoot() throws Exception
     {