Update release notes wrt #1218

Author: cowtowncoder

release-notes/CREDITS-2.x

@@ -432,3 +432,5 @@ Antonin Janec (@xtonic)
   (2.17.0)
  * Contributed #1217: Optimize char comparison using bitwise OR
   (2.17.0)
+ * Contributed #1218: Simplify Unicode surrogate pair conversion for generation
+ (2.17.0)

release-notes/VERSION-2.x

@@ -45,6 +45,8 @@ a pure JSON library.
  (reported by @denizk)
 #1217: Optimize char comparison using bitwise OR
  (contributed by @xtonik)
+#1218: Simplify Unicode surrogate pair conversion for generation
+ (contributed by @xtonik)
 
 2.16.2 (not yet released)
 

src/main/java/com/fasterxml/jackson/core/io/UTF8Writer.java

@@ -9,6 +9,9 @@ public final class UTF8Writer extends Writer
     final static int SURR2_FIRST = 0xDC00;
     final static int SURR2_LAST = 0xDFFF;
 
+    /**
+     * @since 2.17
+     */
     public static final int SURROGATE_BASE = 0x10000 - UTF8Writer.SURR2_FIRST - (UTF8Writer.SURR1_FIRST << 10);
 
     final private IOContext _context;

src/test/java/com/fasterxml/jackson/core/io/UTF8WriterTest.java

@@ -3,7 +3,6 @@
 import java.io.*;
 
 import org.junit.Assert;
-import org.junit.Ignore;
 
 public class UTF8WriterTest
     extends com.fasterxml.jackson.core.BaseTest
@@ -137,13 +136,18 @@ public void testSurrogatesFail() throws Exception
         }
     }
 
-    @Ignore
-    public void testSurrogateConversion() {
+    // For [core#1218]
+    // @since 2.17
+    public void testSurrogateConversion()
+    {
         for (int first = UTF8Writer.SURR1_FIRST; first <= UTF8Writer.SURR1_LAST; first++) {
             for (int second = UTF8Writer.SURR2_FIRST; second <= UTF8Writer.SURR2_LAST; second++) {
                 int expected = 0x10000 + ((first - UTF8Writer.SURR1_FIRST) << 10) + (second - UTF8Writer.SURR2_FIRST);
                 int actual = (first << 10) + second + UTF8Writer.SURROGATE_BASE;
-                assertEquals(Integer.toHexString(first) + " " + Integer.toHexString(second), expected, actual);
+                if (expected != actual) {
+                    fail("Mismatch on: "+Integer.toHexString(first) + " " + Integer.toHexString(second)
+                        +"; expected: "+expected+", actual: "+actual);
+                }
             }
         }
     }