Skip to content

Commit e824d85

Browse files
Removes pretty print serialisation as it is not used. (#4504) (#4515)
Co-authored-by: Stuart Cam <stuart.cam@elastic.co>
1 parent 625c13e commit e824d85

File tree

1 file changed

+1
-173
lines changed

1 file changed

+1
-173
lines changed

src/Elasticsearch.Net/Utf8Json/JsonSerializer.cs

Lines changed: 1 addition & 173 deletions
Original file line numberDiff line numberDiff line change
@@ -44,26 +44,7 @@ internal static partial class JsonSerializer
4444
/// </summary>
4545
public static IJsonFormatterResolver DefaultResolver
4646
{
47-
get
48-
{
49-
if (defaultResolver == null)
50-
{
51-
defaultResolver = StandardResolver.Default;
52-
}
53-
54-
return defaultResolver;
55-
}
56-
}
57-
58-
/// <summary>
59-
/// Is resolver decided?
60-
/// </summary>
61-
public static bool IsInitialized
62-
{
63-
get
64-
{
65-
return defaultResolver != null;
66-
}
47+
get { return defaultResolver ??= StandardResolver.Default; }
6748
}
6849

6950
/// <summary>
@@ -389,159 +370,6 @@ public static async Task<T> DeserializeAsync<T>(Stream stream, IJsonFormatterRes
389370
}
390371
}
391372

392-
public static string PrettyPrint(byte[] json) => PrettyPrint(json, 0);
393-
394-
public static string PrettyPrint(byte[] json, int offset)
395-
{
396-
var reader = new JsonReader(json, offset);
397-
var buffer = MemoryPool.Rent();
398-
try
399-
{
400-
var writer = new JsonWriter(buffer);
401-
WritePrettyPrint(ref reader, ref writer, 0);
402-
return writer.ToString();
403-
}
404-
finally
405-
{
406-
MemoryPool.Return(buffer);
407-
}
408-
}
409-
410-
public static string PrettyPrint(string json)
411-
{
412-
var reader = new JsonReader(Encoding.UTF8.GetBytes(json));
413-
var buffer = MemoryPool.Rent();
414-
415-
try
416-
{
417-
var writer = new JsonWriter(buffer);
418-
WritePrettyPrint(ref reader, ref writer, 0);
419-
return writer.ToString();
420-
}
421-
finally
422-
{
423-
MemoryPool.Return(buffer);
424-
}
425-
}
426-
427-
public static byte[] PrettyPrintByteArray(byte[] json)
428-
{
429-
return PrettyPrintByteArray(json, 0);
430-
}
431-
432-
public static byte[] PrettyPrintByteArray(byte[] json, int offset)
433-
{
434-
var reader = new JsonReader(json, offset);
435-
var buffer = MemoryPool.Rent();
436-
437-
try
438-
{
439-
var writer = new JsonWriter(buffer);
440-
WritePrettyPrint(ref reader, ref writer, 0);
441-
return writer.ToUtf8ByteArray();
442-
}
443-
finally
444-
{
445-
MemoryPool.Return(buffer);
446-
}
447-
}
448-
449-
public static byte[] PrettyPrintByteArray(string json)
450-
{
451-
var reader = new JsonReader(Encoding.UTF8.GetBytes(json));
452-
var buffer = MemoryPool.Rent();
453-
try
454-
{
455-
var writer = new JsonWriter(buffer);
456-
WritePrettyPrint(ref reader, ref writer, 0);
457-
return writer.ToUtf8ByteArray();
458-
}
459-
finally
460-
{
461-
MemoryPool.Return(buffer);
462-
}
463-
}
464-
465-
static readonly byte[][] indent = Enumerable.Range(0, 100).Select(x => Encoding.UTF8.GetBytes(new string(' ', x * 2))).ToArray();
466-
static readonly byte[] newLine = Encoding.UTF8.GetBytes(Environment.NewLine);
467-
468-
static void WritePrettyPrint(ref JsonReader reader, ref JsonWriter writer, int depth)
469-
{
470-
var token = reader.GetCurrentJsonToken();
471-
switch (token)
472-
{
473-
case JsonToken.BeginObject:
474-
{
475-
writer.WriteBeginObject();
476-
writer.WriteRaw(newLine);
477-
var c = 0;
478-
while (reader.ReadIsInObject(ref c))
479-
{
480-
if (c != 1)
481-
{
482-
writer.WriteRaw((byte)',');
483-
writer.WriteRaw(newLine);
484-
}
485-
writer.WriteRaw(indent[depth + 1]);
486-
writer.WritePropertyName(reader.ReadPropertyName());
487-
writer.WriteRaw((byte)' ');
488-
WritePrettyPrint(ref reader, ref writer, depth + 1);
489-
}
490-
writer.WriteRaw(newLine);
491-
writer.WriteRaw(indent[depth]);
492-
writer.WriteEndObject();
493-
}
494-
break;
495-
case JsonToken.BeginArray:
496-
{
497-
writer.WriteBeginArray();
498-
writer.WriteRaw(newLine);
499-
var c = 0;
500-
while (reader.ReadIsInArray(ref c))
501-
{
502-
if (c != 1)
503-
{
504-
writer.WriteRaw((byte)',');
505-
writer.WriteRaw(newLine);
506-
}
507-
writer.WriteRaw(indent[depth + 1]);
508-
WritePrettyPrint(ref reader, ref writer, depth + 1);
509-
}
510-
writer.WriteRaw(newLine);
511-
writer.WriteRaw(indent[depth]);
512-
writer.WriteEndArray();
513-
}
514-
break;
515-
case JsonToken.Number:
516-
{
517-
var v = reader.ReadDouble();
518-
writer.WriteDouble(v);
519-
}
520-
break;
521-
case JsonToken.String:
522-
{
523-
var v = reader.ReadString();
524-
writer.WriteString(v);
525-
}
526-
break;
527-
case JsonToken.True:
528-
case JsonToken.False:
529-
{
530-
var v = reader.ReadBoolean();
531-
writer.WriteBoolean(v);
532-
}
533-
break;
534-
case JsonToken.Null:
535-
{
536-
reader.ReadIsNull();
537-
writer.WriteNull();
538-
}
539-
break;
540-
default:
541-
break;
542-
}
543-
}
544-
545373
static int FillFromStream(Stream input, ref byte[] buffer)
546374
{
547375
int length = 0;

0 commit comments

Comments
 (0)