Skip to content

P
protobuf
Commit ad2d775e authored by avgweb's avatar avgweb
Browse files
Options

Replace StringBuilder with TextWriter in JsonFormatter

parent 9242d9b7
Show whitespace changes
Inline Side-by-side
Showing with 157 additions and 131 deletions
csharp/src/Google.Protobuf.Test/GeneratedMessageTest.cs
View file @ ad2d775e
...@@ -710,5 +710,14 @@ namespace Google.Protobuf ...@@ -710,5 +710,14 @@ namespace Google.Protobuf
Assert.AreEqual("{ \"singleForeignMessage\": { \"c\": 16, \"@cInHex\": \"10\" } }", message.ToString()); Assert.AreEqual("{ \"singleForeignMessage\": { \"c\": 16, \"@cInHex\": \"10\" } }", message.ToString());
Assert.AreEqual("{ \"singleForeignMessage\": { \"c\": 16 } }", JsonFormatter.Default.Format(message)); Assert.AreEqual("{ \"singleForeignMessage\": { \"c\": 16 } }", JsonFormatter.Default.Format(message));
} }
[Test]
public void CustomDiagnosticMessage_DirectToTextWriterCall()
{
var message = new ForeignMessage { C = 31 };
var writer = new StringWriter();
JsonFormatter.Default.Format(message, writer);
Assert.AreEqual("{ \"c\": 31 }", writer.ToString());
}
} }
} }
csharp/src/Google.Protobuf/Collections/MapField.cs
View file @ ad2d775e
...@@ -34,6 +34,7 @@ using Google.Protobuf.Reflection; ...@@ -34,6 +34,7 @@ using Google.Protobuf.Reflection;
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using Google.Protobuf.Compatibility; using Google.Protobuf.Compatibility;
...@@ -474,9 +475,9 @@ namespace Google.Protobuf.Collections ...@@ -474,9 +475,9 @@ namespace Google.Protobuf.Collections
/// </summary> /// </summary>
public override string ToString() public override string ToString()
{ {
var builder = new StringBuilder(); var writer = new StringWriter();
JsonFormatter.Default.WriteDictionary(builder, this); JsonFormatter.Default.WriteDictionary(writer, this);
return builder.ToString(); return writer.ToString();
} }
#region IDictionary explicit interface implementation #region IDictionary explicit interface implementation
......
csharp/src/Google.Protobuf/Collections/RepeatedField.cs
View file @ ad2d775e
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO;
using System.Text; using System.Text;
namespace Google.Protobuf.Collections namespace Google.Protobuf.Collections
...@@ -474,9 +475,9 @@ namespace Google.Protobuf.Collections ...@@ -474,9 +475,9 @@ namespace Google.Protobuf.Collections
/// </summary> /// </summary>
public override string ToString() public override string ToString()
{ {
var builder = new StringBuilder(); var writer = new StringWriter();
JsonFormatter.Default.WriteList(builder, this); JsonFormatter.Default.WriteList(writer, this);
return builder.ToString(); return writer.ToString();
} }
/// <summary> /// <summary>
......
csharp/src/Google.Protobuf/JsonFormatter.cs
View file @ ad2d775e
...@@ -36,6 +36,7 @@ using System.Globalization; ...@@ -36,6 +36,7 @@ using System.Globalization;
using System.Text; using System.Text;
using Google.Protobuf.Reflection; using Google.Protobuf.Reflection;
using Google.Protobuf.WellKnownTypes; using Google.Protobuf.WellKnownTypes;
using System.IO;
using System.Linq; using System.Linq;
using System.Collections.Generic; using System.Collections.Generic;
...@@ -140,18 +141,31 @@ namespace Google.Protobuf ...@@ -140,18 +141,31 @@ namespace Google.Protobuf
/// <param name="message">The message to format.</param> /// <param name="message">The message to format.</param>
/// <returns>The formatted message.</returns> /// <returns>The formatted message.</returns>
public string Format(IMessage message) public string Format(IMessage message)
{
var writer = new StringWriter();
Format(message, writer);
return writer.ToString();
}
/// <summary>
/// Formats the specified message as JSON.
/// </summary>
/// <param name="message">The message to format.</param>
/// <param name="writer">The TextWriter to write the formatted message to.</param>
/// <returns>The formatted message.</returns>
public void Format(IMessage message, TextWriter writer)
{ {
ProtoPreconditions.CheckNotNull(message, nameof(message)); ProtoPreconditions.CheckNotNull(message, nameof(message));
StringBuilder builder = new StringBuilder(); ProtoPreconditions.CheckNotNull(writer, nameof(writer));
if (message.Descriptor.IsWellKnownType) if (message.Descriptor.IsWellKnownType)
{ {
WriteWellKnownTypeValue(builder, message.Descriptor, message); WriteWellKnownTypeValue(writer, message.Descriptor, message);
} }
else else
{ {
WriteMessage(builder, message); WriteMessage(writer, message);
} }
return builder.ToString();
} }
/// <summary> /// <summary>
...@@ -177,11 +191,11 @@ namespace Google.Protobuf ...@@ -177,11 +191,11 @@ namespace Google.Protobuf
return diagnosticFormatter.Format(message); return diagnosticFormatter.Format(message);
} }
private void WriteMessage(StringBuilder builder, IMessage message) private void WriteMessage(TextWriter writer, IMessage message)
{ {
if (message == null) if (message == null)
{ {
WriteNull(builder); WriteNull(writer);
return; return;
} }
if (DiagnosticOnly) if (DiagnosticOnly)
...@@ -189,16 +203,16 @@ namespace Google.Protobuf ...@@ -189,16 +203,16 @@ namespace Google.Protobuf
ICustomDiagnosticMessage customDiagnosticMessage = message as ICustomDiagnosticMessage; ICustomDiagnosticMessage customDiagnosticMessage = message as ICustomDiagnosticMessage;
if (customDiagnosticMessage != null) if (customDiagnosticMessage != null)
{ {
builder.Append(customDiagnosticMessage.ToDiagnosticString()); writer.Write(customDiagnosticMessage.ToDiagnosticString());
return; return;
} }
} }
builder.Append("{ "); writer.Write("{ ");
bool writtenFields = WriteMessageFields(builder, message, false); bool writtenFields = WriteMessageFields(writer, message, false);
builder.Append(writtenFields ? " }" : "}"); writer.Write(writtenFields ? " }" : "}");
} }
private bool WriteMessageFields(StringBuilder builder, IMessage message, bool assumeFirstFieldWritten) private bool WriteMessageFields(TextWriter writer, IMessage message, bool assumeFirstFieldWritten)
{ {
var fields = message.Descriptor.Fields; var fields = message.Descriptor.Fields;
bool first = !assumeFirstFieldWritten; bool first = !assumeFirstFieldWritten;
...@@ -221,11 +235,11 @@ namespace Google.Protobuf ...@@ -221,11 +235,11 @@ namespace Google.Protobuf
// Okay, all tests complete: let's write the field value... // Okay, all tests complete: let's write the field value...
if (!first) if (!first)
{ {
builder.Append(PropertySeparator); writer.Write(PropertySeparator);
} }
WriteString(builder, ToCamelCase(accessor.Descriptor.Name)); WriteString(writer, ToCamelCase(accessor.Descriptor.Name));
builder.Append(NameValueSeparator); writer.Write(NameValueSeparator);
WriteValue(builder, value); WriteValue(writer, value);
first = false; first = false;
} }
return !first; return !first;
...@@ -309,9 +323,9 @@ namespace Google.Protobuf ...@@ -309,9 +323,9 @@ namespace Google.Protobuf
return result.ToString(); return result.ToString();
} }
private static void WriteNull(StringBuilder builder) private static void WriteNull(TextWriter writer)
{ {
builder.Append("null"); writer.Write("null");
} }
private static bool IsDefaultValue(IFieldAccessor accessor, object value) private static bool IsDefaultValue(IFieldAccessor accessor, object value)
...@@ -361,56 +375,56 @@ namespace Google.Protobuf ...@@ -361,56 +375,56 @@ namespace Google.Protobuf
} }
} }
private void WriteValue(StringBuilder builder, object value) private void WriteValue(TextWriter writer, object value)
{ {
if (value == null) if (value == null)
{ {
WriteNull(builder); WriteNull(writer);
} }
else if (value is bool) else if (value is bool)
{ {
builder.Append((bool) value ? "true" : "false"); writer.Write((bool)value ? "true" : "false");
} }
else if (value is ByteString) else if (value is ByteString)
{ {
// Nothing in Base64 needs escaping // Nothing in Base64 needs escaping
builder.Append('"'); writer.Write('"');
builder.Append(((ByteString) value).ToBase64()); writer.Write(((ByteString)value).ToBase64());
builder.Append('"'); writer.Write('"');
} }
else if (value is string) else if (value is string)
{ {
WriteString(builder, (string) value); WriteString(writer, (string)value);
} }
else if (value is IDictionary) else if (value is IDictionary)
{ {
WriteDictionary(builder, (IDictionary) value); WriteDictionary(writer, (IDictionary)value);
} }
else if (value is IList) else if (value is IList)
{ {
WriteList(builder, (IList) value); WriteList(writer, (IList)value);
} }
else if (value is int || value is uint) else if (value is int || value is uint)
{ {
IFormattable formattable = (IFormattable) value; IFormattable formattable = (IFormattable) value;
builder.Append(formattable.ToString("d", CultureInfo.InvariantCulture)); writer.Write(formattable.ToString("d", CultureInfo.InvariantCulture));
} }
else if (value is long || value is ulong) else if (value is long || value is ulong)
{ {
builder.Append('"'); writer.Write('"');
IFormattable formattable = (IFormattable) value; IFormattable formattable = (IFormattable) value;
builder.Append(formattable.ToString("d", CultureInfo.InvariantCulture)); writer.Write(formattable.ToString("d", CultureInfo.InvariantCulture));
builder.Append('"'); writer.Write('"');
} }
else if (value is System.Enum) else if (value is System.Enum)
{ {
if (System.Enum.IsDefined(value.GetType(), value)) if (System.Enum.IsDefined(value.GetType(), value))
{ {
WriteString(builder, value.ToString()); WriteString(writer, value.ToString());
} }
else else
{ {
WriteValue(builder, (int) value); WriteValue(writer, (int)value);
} }
} }
else if (value is float || value is double) else if (value is float || value is double)
...@@ -418,13 +432,13 @@ namespace Google.Protobuf ...@@ -418,13 +432,13 @@ namespace Google.Protobuf
string text = ((IFormattable) value).ToString("r", CultureInfo.InvariantCulture); string text = ((IFormattable) value).ToString("r", CultureInfo.InvariantCulture);
if (text == "NaN" || text == "Infinity" || text == "-Infinity") if (text == "NaN" || text == "Infinity" || text == "-Infinity")
{ {
builder.Append('"'); writer.Write('"');
builder.Append(text); writer.Write(text);
builder.Append('"'); writer.Write('"');
} }
else else
{ {
builder.Append(text); writer.Write(text);
} }
} }
else if (value is IMessage) else if (value is IMessage)
...@@ -432,11 +446,11 @@ namespace Google.Protobuf ...@@ -432,11 +446,11 @@ namespace Google.Protobuf
IMessage message = (IMessage) value; IMessage message = (IMessage) value;
if (message.Descriptor.IsWellKnownType) if (message.Descriptor.IsWellKnownType)
{ {
WriteWellKnownTypeValue(builder, message.Descriptor, value); WriteWellKnownTypeValue(writer, message.Descriptor, value);
} }
else else
{ {
WriteMessage(builder, (IMessage) value); WriteMessage(writer, (IMessage)value);
} }
} }
else else
...@@ -451,13 +465,13 @@ namespace Google.Protobuf ...@@ -451,13 +465,13 @@ namespace Google.Protobuf
/// values are using the embedded well-known types, in order to allow for dynamic messages /// values are using the embedded well-known types, in order to allow for dynamic messages
/// in the future. /// in the future.
/// </summary> /// </summary>
private void WriteWellKnownTypeValue(StringBuilder builder, MessageDescriptor descriptor, object value) private void WriteWellKnownTypeValue(TextWriter writer, MessageDescriptor descriptor, object value)
{ {
// Currently, we can never actually get here, because null values are always handled by the caller. But if we *could*, // Currently, we can never actually get here, because null values are always handled by the caller. But if we *could*,
// this would do the right thing. // this would do the right thing.
if (value == null) if (value == null)
{ {
WriteNull(builder); WriteNull(writer);
return; return;
} }
// For wrapper types, the value will either be the (possibly boxed) "native" value, // For wrapper types, the value will either be the (possibly boxed) "native" value,
...@@ -472,49 +486,49 @@ namespace Google.Protobuf ...@@ -472,49 +486,49 @@ namespace Google.Protobuf
var message = (IMessage) value; var message = (IMessage) value;
value = message.Descriptor.Fields[WrappersReflection.WrapperValueFieldNumber].Accessor.GetValue(message); value = message.Descriptor.Fields[WrappersReflection.WrapperValueFieldNumber].Accessor.GetValue(message);
} }
WriteValue(builder, value); WriteValue(writer, value);
return; return;
} }
if (descriptor.FullName == Timestamp.Descriptor.FullName) if (descriptor.FullName == Timestamp.Descriptor.FullName)
{ {
WriteTimestamp(builder, (IMessage) value); WriteTimestamp(writer, (IMessage)value);
return; return;
} }
if (descriptor.FullName == Duration.Descriptor.FullName) if (descriptor.FullName == Duration.Descriptor.FullName)
{ {
WriteDuration(builder, (IMessage) value); WriteDuration(writer, (IMessage)value);
return; return;
} }
if (descriptor.FullName == FieldMask.Descriptor.FullName) if (descriptor.FullName == FieldMask.Descriptor.FullName)
{ {
WriteFieldMask(builder, (IMessage) value); WriteFieldMask(writer, (IMessage)value);
return; return;
} }
if (descriptor.FullName == Struct.Descriptor.FullName) if (descriptor.FullName == Struct.Descriptor.FullName)
{ {
WriteStruct(builder, (IMessage) value); WriteStruct(writer, (IMessage)value);
return; return;
} }
if (descriptor.FullName == ListValue.Descriptor.FullName) if (descriptor.FullName == ListValue.Descriptor.FullName)
{ {
var fieldAccessor = descriptor.Fields[ListValue.ValuesFieldNumber].Accessor; var fieldAccessor = descriptor.Fields[ListValue.ValuesFieldNumber].Accessor;
WriteList(builder, (IList) fieldAccessor.GetValue((IMessage) value)); WriteList(writer, (IList)fieldAccessor.GetValue((IMessage)value));
return; return;
} }
if (descriptor.FullName == Value.Descriptor.FullName) if (descriptor.FullName == Value.Descriptor.FullName)
{ {
WriteStructFieldValue(builder, (IMessage) value); WriteStructFieldValue(writer, (IMessage)value);
return; return;
} }
if (descriptor.FullName == Any.Descriptor.FullName) if (descriptor.FullName == Any.Descriptor.FullName)
{ {
WriteAny(builder, (IMessage) value); WriteAny(writer, (IMessage)value);
return; return;
} }
WriteMessage(builder, (IMessage) value); WriteMessage(writer, (IMessage)value);
} }
private void WriteTimestamp(StringBuilder builder, IMessage value) private void WriteTimestamp(TextWriter writer, IMessage value)
{ {
// TODO: In the common case where this *is* using the built-in Timestamp type, we could // TODO: In the common case where this *is* using the built-in Timestamp type, we could
// avoid all the reflection at this point, by casting to Timestamp. In the interests of // avoid all the reflection at this point, by casting to Timestamp. In the interests of
...@@ -522,28 +536,28 @@ namespace Google.Protobuf ...@@ -522,28 +536,28 @@ namespace Google.Protobuf
// it still works in that case. // it still works in that case.
int nanos = (int) value.Descriptor.Fields[Timestamp.NanosFieldNumber].Accessor.GetValue(value); int nanos = (int) value.Descriptor.Fields[Timestamp.NanosFieldNumber].Accessor.GetValue(value);
long seconds = (long) value.Descriptor.Fields[Timestamp.SecondsFieldNumber].Accessor.GetValue(value); long seconds = (long) value.Descriptor.Fields[Timestamp.SecondsFieldNumber].Accessor.GetValue(value);
builder.Append(Timestamp.ToJson(seconds, nanos, DiagnosticOnly)); writer.Write(Timestamp.ToJson(seconds, nanos, DiagnosticOnly));
} }
private void WriteDuration(StringBuilder builder, IMessage value) private void WriteDuration(TextWriter writer, IMessage value)
{ {
// TODO: Same as for WriteTimestamp // TODO: Same as for WriteTimestamp
int nanos = (int) value.Descriptor.Fields[Duration.NanosFieldNumber].Accessor.GetValue(value); int nanos = (int) value.Descriptor.Fields[Duration.NanosFieldNumber].Accessor.GetValue(value);
long seconds = (long) value.Descriptor.Fields[Duration.SecondsFieldNumber].Accessor.GetValue(value); long seconds = (long) value.Descriptor.Fields[Duration.SecondsFieldNumber].Accessor.GetValue(value);
builder.Append(Duration.ToJson(seconds, nanos, DiagnosticOnly)); writer.Write(Duration.ToJson(seconds, nanos, DiagnosticOnly));
} }
private void WriteFieldMask(StringBuilder builder, IMessage value) private void WriteFieldMask(TextWriter writer, IMessage value)
{ {
var paths = (IList<string>) value.Descriptor.Fields[FieldMask.PathsFieldNumber].Accessor.GetValue(value); var paths = (IList<string>) value.Descriptor.Fields[FieldMask.PathsFieldNumber].Accessor.GetValue(value);
builder.Append(FieldMask.ToJson(paths, DiagnosticOnly)); writer.Write(FieldMask.ToJson(paths, DiagnosticOnly));
} }
private void WriteAny(StringBuilder builder, IMessage value) private void WriteAny(TextWriter writer, IMessage value)
{ {
if (DiagnosticOnly) if (DiagnosticOnly)
{ {
WriteDiagnosticOnlyAny(builder, value); WriteDiagnosticOnlyAny(writer, value);
return; return;
} }
...@@ -556,40 +570,40 @@ namespace Google.Protobuf ...@@ -556,40 +570,40 @@ namespace Google.Protobuf
throw new InvalidOperationException($"Type registry has no descriptor for type name '{typeName}'"); throw new InvalidOperationException($"Type registry has no descriptor for type name '{typeName}'");
} }
IMessage message = descriptor.Parser.ParseFrom(data); IMessage message = descriptor.Parser.ParseFrom(data);
builder.Append("{ "); writer.Write("{ ");
WriteString(builder, AnyTypeUrlField); WriteString(writer, AnyTypeUrlField);
builder.Append(NameValueSeparator); writer.Write(NameValueSeparator);
WriteString(builder, typeUrl); WriteString(writer, typeUrl);
if (descriptor.IsWellKnownType) if (descriptor.IsWellKnownType)
{ {
builder.Append(PropertySeparator); writer.Write(PropertySeparator);
WriteString(builder, AnyWellKnownTypeValueField); WriteString(writer, AnyWellKnownTypeValueField);
builder.Append(NameValueSeparator); writer.Write(NameValueSeparator);
WriteWellKnownTypeValue(builder, descriptor, message); WriteWellKnownTypeValue(writer, descriptor, message);
} }
else else
{ {
WriteMessageFields(builder, message, true); WriteMessageFields(writer, message, true);
} }
builder.Append(" }"); writer.Write(" }");
} }
private void WriteDiagnosticOnlyAny(StringBuilder builder, IMessage value) private void WriteDiagnosticOnlyAny(TextWriter writer, IMessage value)
{ {
string typeUrl = (string) value.Descriptor.Fields[Any.TypeUrlFieldNumber].Accessor.GetValue(value); string typeUrl = (string) value.Descriptor.Fields[Any.TypeUrlFieldNumber].Accessor.GetValue(value);
ByteString data = (ByteString) value.Descriptor.Fields[Any.ValueFieldNumber].Accessor.GetValue(value); ByteString data = (ByteString) value.Descriptor.Fields[Any.ValueFieldNumber].Accessor.GetValue(value);
builder.Append("{ "); writer.Write("{ ");
WriteString(builder, AnyTypeUrlField); WriteString(writer, AnyTypeUrlField);
builder.Append(NameValueSeparator); writer.Write(NameValueSeparator);
WriteString(builder, typeUrl); WriteString(writer, typeUrl);
builder.Append(PropertySeparator); writer.Write(PropertySeparator);
WriteString(builder, AnyDiagnosticValueField); WriteString(writer, AnyDiagnosticValueField);
builder.Append(NameValueSeparator); writer.Write(NameValueSeparator);
builder.Append('"'); writer.Write('"');
builder.Append(data.ToBase64()); writer.Write(data.ToBase64());
builder.Append('"'); writer.Write('"');
builder.Append(" }"); writer.Write(" }");
} }
internal static string GetTypeName(String typeUrl) internal static string GetTypeName(String typeUrl)
...@@ -602,9 +616,9 @@ namespace Google.Protobuf ...@@ -602,9 +616,9 @@ namespace Google.Protobuf
return parts[1]; return parts[1];
} }
private void WriteStruct(StringBuilder builder, IMessage message) private void WriteStruct(TextWriter writer, IMessage message)
{ {
builder.Append("{ "); writer.Write("{ ");
IDictionary fields = (IDictionary) message.Descriptor.Fields[Struct.FieldsFieldNumber].Accessor.GetValue(message); IDictionary fields = (IDictionary) message.Descriptor.Fields[Struct.FieldsFieldNumber].Accessor.GetValue(message);
bool first = true; bool first = true;
foreach (DictionaryEntry entry in fields) foreach (DictionaryEntry entry in fields)
...@@ -618,17 +632,17 @@ namespace Google.Protobuf ...@@ -618,17 +632,17 @@ namespace Google.Protobuf
if (!first) if (!first)
{ {
builder.Append(PropertySeparator); writer.Write(PropertySeparator);
} }
WriteString(builder, key); WriteString(writer, key);
builder.Append(NameValueSeparator); writer.Write(NameValueSeparator);
WriteStructFieldValue(builder, value); WriteStructFieldValue(writer, value);
first = false; first = false;
} }
builder.Append(first ? "}" : " }"); writer.Write(first ? "}" : " }");
} }
private void WriteStructFieldValue(StringBuilder builder, IMessage message) private void WriteStructFieldValue(TextWriter writer, IMessage message)
{ {
var specifiedField = message.Descriptor.Oneofs[0].Accessor.GetCaseFieldDescriptor(message); var specifiedField = message.Descriptor.Oneofs[0].Accessor.GetCaseFieldDescriptor(message);
if (specifiedField == null) if (specifiedField == null)
...@@ -643,48 +657,48 @@ namespace Google.Protobuf ...@@ -643,48 +657,48 @@ namespace Google.Protobuf
case Value.BoolValueFieldNumber: case Value.BoolValueFieldNumber:
case Value.StringValueFieldNumber: case Value.StringValueFieldNumber:
case Value.NumberValueFieldNumber: case Value.NumberValueFieldNumber:
WriteValue(builder, value); WriteValue(writer, value);
return; return;
case Value.StructValueFieldNumber: case Value.StructValueFieldNumber:
case Value.ListValueFieldNumber: case Value.ListValueFieldNumber:
// Structs and ListValues are nested messages, and already well-known types. // Structs and ListValues are nested messages, and already well-known types.
var nestedMessage = (IMessage) specifiedField.Accessor.GetValue(message); var nestedMessage = (IMessage) specifiedField.Accessor.GetValue(message);
WriteWellKnownTypeValue(builder, nestedMessage.Descriptor, nestedMessage); WriteWellKnownTypeValue(writer, nestedMessage.Descriptor, nestedMessage);
return; return;
case Value.NullValueFieldNumber: case Value.NullValueFieldNumber:
WriteNull(builder); WriteNull(writer);
return; return;
default: default:
throw new InvalidOperationException("Unexpected case in struct field: " + specifiedField.FieldNumber); throw new InvalidOperationException("Unexpected case in struct field: " + specifiedField.FieldNumber);
} }
} }
internal void WriteList(StringBuilder builder, IList list) internal void WriteList(TextWriter writer, IList list)
{ {
builder.Append("[ "); writer.Write("[ ");
bool first = true; bool first = true;
foreach (var value in list) foreach (var value in list)
{ {
if (!first) if (!first)
{ {
builder.Append(PropertySeparator); writer.Write(PropertySeparator);
} }
WriteValue(builder, value); WriteValue(writer, value);
first = false; first = false;
} }
builder.Append(first ? "]" : " ]"); writer.Write(first ? "]" : " ]");
} }
internal void WriteDictionary(StringBuilder builder, IDictionary dictionary) internal void WriteDictionary(TextWriter writer, IDictionary dictionary)
{ {
builder.Append("{ "); writer.Write("{ ");
bool first = true; bool first = true;
// This will box each pair. Could use IDictionaryEnumerator, but that's ugly in terms of disposal. // This will box each pair. Could use IDictionaryEnumerator, but that's ugly in terms of disposal.
foreach (DictionaryEntry pair in dictionary) foreach (DictionaryEntry pair in dictionary)
{ {
if (!first) if (!first)
{ {
builder.Append(PropertySeparator); writer.Write(PropertySeparator);
} }
string keyText; string keyText;
if (pair.Key is string) if (pair.Key is string)
...@@ -707,12 +721,12 @@ namespace Google.Protobuf ...@@ -707,12 +721,12 @@ namespace Google.Protobuf
} }
throw new ArgumentException("Unhandled dictionary key type: " + pair.Key.GetType()); throw new ArgumentException("Unhandled dictionary key type: " + pair.Key.GetType());
} }
WriteString(builder, keyText); WriteString(writer, keyText);
builder.Append(NameValueSeparator); writer.Write(NameValueSeparator);
WriteValue(builder, pair.Value); WriteValue(writer, pair.Value);
first = false; first = false;
} }
builder.Append(first ? "}" : " }"); writer.Write(first ? "}" : " }");
} }
/// <summary> /// <summary>
...@@ -735,15 +749,15 @@ namespace Google.Protobuf ...@@ -735,15 +749,15 @@ namespace Google.Protobuf
/// <remarks> /// <remarks>
/// Other than surrogate pair handling, this code is mostly taken from src/google/protobuf/util/internal/json_escaping.cc. /// Other than surrogate pair handling, this code is mostly taken from src/google/protobuf/util/internal/json_escaping.cc.
/// </remarks> /// </remarks>
internal static void WriteString(StringBuilder builder, string text) internal static void WriteString(TextWriter writer, string text)
{ {
builder.Append('"'); writer.Write('"');
for (int i = 0; i < text.Length; i++) for (int i = 0; i < text.Length; i++)
{ {
char c = text[i]; char c = text[i];
if (c < 0xa0) if (c < 0xa0)
{ {
builder.Append(CommonRepresentations[c]); writer.Write(CommonRepresentations[c]);
continue; continue;
} }
if (char.IsHighSurrogate(c)) if (char.IsHighSurrogate(c))
...@@ -755,8 +769,8 @@ namespace Google.Protobuf ...@@ -755,8 +769,8 @@ namespace Google.Protobuf
{ {
throw new ArgumentException("String contains low surrogate not followed by high surrogate"); throw new ArgumentException("String contains low surrogate not followed by high surrogate");
} }
HexEncodeUtf16CodeUnit(builder, c); HexEncodeUtf16CodeUnit(writer, c);
HexEncodeUtf16CodeUnit(builder, text[i]); HexEncodeUtf16CodeUnit(writer, text[i]);
continue; continue;
} }
else if (char.IsLowSurrogate(c)) else if (char.IsLowSurrogate(c))
...@@ -777,7 +791,7 @@ namespace Google.Protobuf ...@@ -777,7 +791,7 @@ namespace Google.Protobuf
case 0x070f: // Syriac abbreviation mark case 0x070f: // Syriac abbreviation mark
case 0x17b4: // Khmer vowel inherent Aq case 0x17b4: // Khmer vowel inherent Aq
case 0x17b5: // Khmer vowel inherent Aa case 0x17b5: // Khmer vowel inherent Aa
HexEncodeUtf16CodeUnit(builder, c); HexEncodeUtf16CodeUnit(writer, c);
break; break;
default: default:
...@@ -787,27 +801,27 @@ namespace Google.Protobuf ...@@ -787,27 +801,27 @@ namespace Google.Protobuf
(c >= 0x2060 && c <= 0x2064) || // Invisible etc. (c >= 0x2060 && c <= 0x2064) || // Invisible etc.
(c >= 0x206a && c <= 0x206f)) (c >= 0x206a && c <= 0x206f))
{ {
HexEncodeUtf16CodeUnit(builder, c); HexEncodeUtf16CodeUnit(writer, c);
} }
else else
{ {
// No handling of surrogates here - that's done earlier // No handling of surrogates here - that's done earlier
builder.Append(c); writer.Write(c);
} }
break; break;
} }
} }
builder.Append('"'); writer.Write('"');
} }
private const string Hex = "0123456789abcdef"; private const string Hex = "0123456789abcdef";
private static void HexEncodeUtf16CodeUnit(StringBuilder builder, char c) private static void HexEncodeUtf16CodeUnit(TextWriter writer, char c)
{ {
builder.Append("\\u"); writer.Write("\\u");
builder.Append(Hex[(c >> 12) & 0xf]); writer.Write(Hex[(c >> 12) & 0xf]);
builder.Append(Hex[(c >> 8) & 0xf]); writer.Write(Hex[(c >> 8) & 0xf]);
builder.Append(Hex[(c >> 4) & 0xf]); writer.Write(Hex[(c >> 4) & 0xf]);
builder.Append(Hex[(c >> 0) & 0xf]); writer.Write(Hex[(c >> 0) & 0xf]);
} }
/// <summary> /// <summary>
......
csharp/src/Google.Protobuf/WellKnownTypes/FieldMaskPartial.cs
View file @ ad2d775e
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
...@@ -57,19 +58,19 @@ namespace Google.Protobuf.WellKnownTypes ...@@ -57,19 +58,19 @@ namespace Google.Protobuf.WellKnownTypes
var firstInvalid = paths.FirstOrDefault(p => !ValidatePath(p)); var firstInvalid = paths.FirstOrDefault(p => !ValidatePath(p));
if (firstInvalid == null) if (firstInvalid == null)
{ {
var builder = new StringBuilder(); var writer = new StringWriter();
JsonFormatter.WriteString(builder, string.Join(",", paths.Select(JsonFormatter.ToCamelCase))); JsonFormatter.WriteString(writer, string.Join(",", paths.Select(JsonFormatter.ToCamelCase)));
return builder.ToString(); return writer.ToString();
} }
else else
{ {
if (diagnosticOnly) if (diagnosticOnly)
{ {
var builder = new StringBuilder(); var writer = new StringWriter();
builder.Append("{ \"@warning\": \"Invalid FieldMask\", \"paths\": "); writer.Write("{ \"@warning\": \"Invalid FieldMask\", \"paths\": ");
JsonFormatter.Default.WriteList(builder, (IList) paths); JsonFormatter.Default.WriteList(writer, (IList)paths);
builder.Append(" }"); writer.Write(" }");
return builder.ToString(); return writer.ToString();
} }
else else
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment