Merge branch '2.17'

Author: cowtowncoder

release-notes/CREDITS-2.x

@@ -395,6 +395,9 @@ Armin Samii (@artoonie)
 Joo Hyuk Kim (@JooHyukKim)
  * Contributed #1067: Add `ErrorReportConfiguration`
   (2.16.0)
+ * Contributed #507: Add `JsonWriteFeature.ESCAPE_FORWARD_SLASHES`
+   to allow escaping of '/' for String values
+  (2.17.0)
 
 David Schlosnagle (@schlosna)
  * Contributed #1081: Make `ByteSourceJsonBootstrapper` use `StringReader` for < 8KiB

release-notes/VERSION-2.x

@@ -16,6 +16,9 @@ a pure JSON library.
 
 2.17.0 (not yet released)
 
+#507: Add `JsonWriteFeature.ESCAPE_FORWARD_SLASHES` to allow escaping of '/' for
+  String values
+ (contributed by Joo-Hyuk K)
 #1137: Improve detection of "is a NaN" to only consider explicit cases,
   not `double` overflow/underflow
 #1145: `JsonPointer.appendProperty(String)` does not escape the property name

src/main/java/tools/jackson/core/io/CharTypes.java

@@ -173,6 +173,16 @@ public final class CharTypes
         sOutputEscapes128 = table;
     }
 
+    /**
+     * Lookup table same as {@link #sOutputEscapes128} except that
+     * forward slash ('/') is also escaped
+     */
+    protected final static int[] sOutputEscapes128WithSlash;
+    static {
+        sOutputEscapes128WithSlash = Arrays.copyOf(sOutputEscapes128, sOutputEscapes128.length);
+        sOutputEscapes128WithSlash['/'] = '/';
+    }
+
     /**
      * Lookup table for the first 256 Unicode characters (ASCII / UTF-8)
      * range. For actual hex digits, contains corresponding value;
@@ -228,6 +238,28 @@ public static int[] get7BitOutputEscapes(int quoteChar) {
         return AltEscapes.instance.escapesFor(quoteChar);
     }
 
+    /**
+     * Alternative to {@link #get7BitOutputEscapes()} when either a non-standard
+     * quote character is used, or forward slash is to be escaped.
+     *
+     * @param quoteChar Character used for quoting textual values and property names;
+     *    usually double-quote but sometimes changed to single-quote (apostrophe)
+     * @param escapeSlash
+     *
+     * @return 128-entry {@code int[]} that contains escape definitions
+     *
+     * @since 2.17
+     */
+    public static int[] get7BitOutputEscapes(int quoteChar, boolean escapeSlash) {
+        if (quoteChar == '"') {
+            if (escapeSlash) {
+                return sOutputEscapes128WithSlash;
+            }
+            return sOutputEscapes128;
+        }
+        return AltEscapes.instance.escapesFor(quoteChar, escapeSlash);
+    }
+
     public static int charToHex(int ch)
     {
         // 08-Nov-2019, tatu: As per [core#540] and [core#578], changed to
@@ -241,7 +273,6 @@ public static char hexToChar(int ch)
         return HC[ch];
     }
 
-
     /**
      * Helper method for appending JSON-escaped version of contents
      * into specific {@link StringBuilder}, using default JSON specification
@@ -301,6 +332,9 @@ private static class AltEscapes {
 
         private int[][] _altEscapes = new int[128][];
 
+        // @since 2.17
+        private int[][] _altEscapesWithSlash = new int[128][];
+
         public int[] escapesFor(int quoteChar) {
             int[] esc = _altEscapes[quoteChar];
             if (esc == null) {
@@ -313,6 +347,20 @@ public int[] escapesFor(int quoteChar) {
             }
             return esc;
         }
+
+        // @since 2.17
+        public int[] escapesFor(int quoteChar, boolean escapeSlash)
+        {
+            if (!escapeSlash) {
+                return escapesFor(quoteChar);
+            }
+            int[] esc = _altEscapesWithSlash[quoteChar];
+            if (esc == null) {
+                esc = escapesFor(quoteChar);
+                esc['/'] = '/';
+                _altEscapesWithSlash[quoteChar] = esc;
+            }
+            return esc;
+        }
     }
 }
-

src/main/java/tools/jackson/core/json/JsonWriteFeature.java

@@ -100,6 +100,15 @@ public enum JsonWriteFeature
      */
 //    ESCAPE_UTF8_SURROGATES(false, JsonGenerator.Feature.ESCAPE_UTF8_SURROGATES),
 
+    /**
+     * Feature that specifies whether {@link JsonGenerator} should escape forward slashes.
+     * <p>
+     * Feature is disabled by default for Jackson 2.x version, and enabled by default in Jackson 3.0.
+     *
+     * @since 2.17
+     */
+    ESCAPE_FORWARD_SLASHES(false),
+
     ;
 
     final private boolean _defaultState;

src/main/java/tools/jackson/core/json/UTF8JsonGenerator.java

@@ -163,8 +163,8 @@ public JsonGenerator setCharacterEscapes(CharacterEscapes esc)
     {
         _characterEscapes = esc;
         if (esc == null) {
-            _outputEscapes =  (_quoteChar == '"') ? DEFAULT_OUTPUT_ESCAPES
-                    : CharTypes.get7BitOutputEscapes(_quoteChar);
+            _outputEscapes = CharTypes.get7BitOutputEscapes(_quoteChar,
+                    JsonWriteFeature.ESCAPE_FORWARD_SLASHES.enabledIn(_formatWriteFeatures));
         } else {
             _outputEscapes = esc.getEscapeCodesForAscii();
         }

src/main/java/tools/jackson/core/json/WriterBasedJsonGenerator.java

@@ -112,8 +112,8 @@ public JsonGenerator setCharacterEscapes(CharacterEscapes esc)
     {
         _characterEscapes = esc;
         if (esc == null) {
-            _outputEscapes =  (_quoteChar == '"') ? DEFAULT_OUTPUT_ESCAPES
-                    : CharTypes.get7BitOutputEscapes(_quoteChar);
+            _outputEscapes = CharTypes.get7BitOutputEscapes(_quoteChar,
+                    JsonWriteFeature.ESCAPE_FORWARD_SLASHES.enabledIn(_formatWriteFeatures));
         } else {
             _outputEscapes = esc.getEscapeCodesForAscii();
         }

src/test/java/tools/jackson/core/write/JsonWriteFeatureEscapeForwardSlashTest.java

@@ -0,0 +1,69 @@
+package tools.jackson.core.write;
+
+import java.io.*;
+
+import org.junit.jupiter.api.Test;
+
+import tools.jackson.core.JsonGenerator;
+import tools.jackson.core.ObjectWriteContext;
+import tools.jackson.core.json.JsonFactory;
+import tools.jackson.core.json.JsonWriteFeature;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ * @since 2.17
+ */
+public class JsonWriteFeatureEscapeForwardSlashTest
+{
+    @Test
+    public void testDontEscapeForwardSlash() throws Exception {
+        final JsonFactory jsonF = JsonFactory.builder()
+                .disable(JsonWriteFeature.ESCAPE_FORWARD_SLASHES)
+                .build();
+        final String expJson = "{\"url\":\"http://example.com\"}";
+
+        _testWithStringWriter(jsonF, expJson);
+        _testWithByteArrayOutputStream(jsonF, expJson); // Also test with byte-backed output
+    }
+
+    @Test
+    public void testEscapeForwardSlash() throws Exception {
+        final JsonFactory jsonF = JsonFactory.builder()
+                .enable(JsonWriteFeature.ESCAPE_FORWARD_SLASHES)
+                .build();
+        final String expJson = "{\"url\":\"http:\\/\\/example.com\"}";
+
+        _testWithStringWriter(jsonF, expJson);
+        _testWithByteArrayOutputStream(jsonF, expJson); // Also test with byte-backed output
+    }
+
+    private void _testWithStringWriter(JsonFactory jsonF, String expJson) throws Exception {
+        // Given
+        Writer jsonWriter = new StringWriter();
+        // When
+        try (JsonGenerator generator = jsonF.createGenerator(ObjectWriteContext.empty(), jsonWriter)) {
+            _writeDoc(generator);
+        }
+        // Then
+        assertEquals(expJson, jsonWriter.toString());
+    }
+
+    private void _testWithByteArrayOutputStream(JsonFactory jsonF, String expJson) throws Exception {
+        // Given
+        ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+        // When
+        try (JsonGenerator generator = jsonF.createGenerator(ObjectWriteContext.empty(), bytes)) {
+            _writeDoc(generator);
+        }
+        // Then
+        assertEquals(expJson, bytes.toString());
+    }
+
+    private void _writeDoc(JsonGenerator generator) throws Exception
+    {
+        generator.writeStartObject(); // start object
+        generator.writeStringProperty("url", "http://example.com");
+        generator.writeEndObject(); // end object
+    }
+}