Fix #484

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -19,6 +19,8 @@ JSON library.
 #467: Create `JsonReadFeature` to move JSON-specific `JsonParser.Feature`s to
 #480: `SerializableString` value can not directly render to Writer
  (requested by Philippe M)
+#484: Implement `UTF8JsonGenerator.writeRawValue(SerializableString)` (and
+  `writeRaw(..)`) more efficiently
 
 2.9.7 (not yet released)
 

src/main/java/com/fasterxml/jackson/core/JsonGenerator.java

@@ -34,7 +34,7 @@ public abstract class JsonGenerator
      */
     public enum Feature {
         // // Low-level I/O / content features
-        
+
         /**
          * Feature that determines whether generator will automatically
          * close underlying output target that is NOT owned by the
@@ -1095,6 +1095,7 @@ public abstract void writeUTF8String(byte[] text, int offset, int length)
      * 
      * @since 2.1
      */
+//    public abstract void writeRaw(SerializableString raw) throws IOException;
     public void writeRaw(SerializableString raw) throws IOException {
         writeRaw(raw.getValue());
     }

src/main/java/com/fasterxml/jackson/core/json/UTF8JsonGenerator.java

@@ -424,7 +424,12 @@ protected final void _writePPFieldName(SerializableString name) throws IOExcepti
             }
             _outputBuffer[_outputTail++] = _quoteChar;
         }
-        _writeBytes(name.asQuotedUTF8());
+        int len = name.appendQuotedUTF8(_outputBuffer, _outputTail);
+        if (len < 0) {
+            _writeBytes(name.asQuotedUTF8());
+        } else {
+            _outputTail += len;
+        }
         if (addQuotes) {
             if (_outputTail >= _outputEnd) {
                 _flushBuffer();
@@ -651,19 +656,23 @@ public void writeRaw(String text, int offset, int len) throws IOException
     @Override
     public void writeRaw(SerializableString text) throws IOException
     {
-        byte[] raw = text.asUnquotedUTF8();
-        if (raw.length > 0) {
-            _writeBytes(raw);
+        int len = text.appendUnquotedUTF8(_outputBuffer, _outputTail);
+        if (len < 0) {
+            _writeBytes(text.asUnquotedUTF8());
+        } else {
+            _outputTail += len;
         }
     }
 
     // since 2.5
     @Override
     public void writeRawValue(SerializableString text) throws IOException {
         _verifyValueWrite(WRITE_RAW);
-        byte[] raw = text.asUnquotedUTF8();
-        if (raw.length > 0) {
-            _writeBytes(raw);
+        int len = text.appendUnquotedUTF8(_outputBuffer, _outputTail);
+        if (len < 0) {
+            _writeBytes(text.asUnquotedUTF8());
+        } else {
+            _outputTail += len;
         }
     }
 

src/main/java/com/fasterxml/jackson/core/json/WriterBasedJsonGenerator.java

@@ -193,29 +193,37 @@ protected final void _writeFieldName(SerializableString name, boolean commaBefor
             _outputBuffer[_outputTail++] = ',';
         }
         // Alternate mode, in which quoting of field names disabled?
-        final char[] quoted = name.asQuotedChars();
         if (_cfgUnqNames) {
-            writeRaw(quoted, 0, quoted.length);
+            final char[] ch = name.asQuotedChars();
+            writeRaw(ch, 0, ch.length);
             return;
         }
         // we know there's room for at least one more char
         _outputBuffer[_outputTail++] = _quoteChar;
         // The beef:
-        final int qlen = quoted.length;
-        if ((_outputTail + qlen + 1) >= _outputEnd) {
-            writeRaw(quoted, 0, qlen);
-            // and closing quotes; need room for one more char:
-            if (_outputTail >= _outputEnd) {
-                _flushBuffer();
-            }
-            _outputBuffer[_outputTail++] = _quoteChar;
-        } else {
-            System.arraycopy(quoted, 0, _outputBuffer, _outputTail, qlen);
-            _outputTail += qlen;
-            _outputBuffer[_outputTail++] = _quoteChar;
+        
+        int len = name.appendQuoted(_outputBuffer, _outputTail);
+        if (len < 0) {
+            _writeFieldNameTail(name);
+            return;
+        }
+        _outputTail += len;
+        if (_outputTail >= _outputEnd) {
+            _flushBuffer();
         }
+        _outputBuffer[_outputTail++] = _quoteChar;
     }
-    
+
+    private final void _writeFieldNameTail(SerializableString name) throws IOException
+    {
+        final char[] quoted = name.asQuotedChars();
+        writeRaw(quoted, 0, quoted.length);
+        if (_outputTail >= _outputEnd) {
+            _flushBuffer();
+        }
+        _outputBuffer[_outputTail++] = _quoteChar;
+    }
+
     /*
     /**********************************************************
     /* Output method implementations, structural
@@ -339,7 +347,6 @@ protected final void _writePPFieldName(SerializableString name, boolean commaBef
         } else {
             _cfgPrettyPrinter.beforeObjectEntries(this);
         }
-    
         final char[] quoted = name.asQuotedChars();
         if (_cfgUnqNames) {// non-standard, omit quotes
             writeRaw(quoted, 0, quoted.length);
@@ -540,7 +547,12 @@ public void writeRaw(String text, int start, int len) throws IOException
     // @since 2.1
     @Override
     public void writeRaw(SerializableString text) throws IOException {
-        writeRaw(text.getValue());
+        int len = text.appendUnquoted(_outputBuffer, _outputTail);
+        if (len < 0) {
+            writeRaw(text.getValue());
+            return;
+        }
+        _outputTail += len;
     }
 
     @Override