Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix - Avoid usage of JsonConvert in test host process #1881

Merged
merged 4 commits into from
Jan 3, 2019
Merged

Fix - Avoid usage of JsonConvert in test host process #1881

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c7263b2
Removing json convert
abhishkk Dec 28, 2018
651b940
Merge branch 'master' into removeJsonConvert
abhishkk Jan 2, 2019
33fd4de
Reorganizing code
abhishkk Jan 2, 2019
3ead2b8
Removinf default settings usage for json serializer
abhishkk Jan 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions src/Microsoft.TestPlatform.CommunicationUtilities/JsonDataSerializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ public class JsonDataSerializer : IDataSerializer

private static JsonSerializer payloadSerializer;
private static JsonSerializer payloadSerializer2;
private static JsonSerializer messageSerializer;

/// <summary>
/// Prevents a default instance of the <see cref="JsonDataSerializer"/> class from being created.
Expand All @@ -36,6 +37,7 @@ private JsonDataSerializer()
ReferenceLoopHandling = ReferenceLoopHandling.Ignore
};

messageSerializer = JsonSerializer.Create();
payloadSerializer = JsonSerializer.Create(jsonSettings);
payloadSerializer2 = JsonSerializer.Create(jsonSettings);

Expand Down Expand Up @@ -72,7 +74,11 @@ public Message DeserializeMessage(string rawMessage)
{
// Convert to VersionedMessage
// Message can be deserialized to VersionedMessage where version will be 0
return JsonConvert.DeserializeObject<VersionedMessage>(rawMessage);
using (var stringReader = new StringReader(rawMessage))
using (var jsonReader = new JsonTextReader(stringReader))
{
return messageSerializer.Deserialize<VersionedMessage>(jsonReader);
}
}

/// <summary>
Expand Down Expand Up @@ -117,7 +123,12 @@ public T Deserialize<T>(string json, int version = 1)
/// <returns>Serialized message.</returns>
public string SerializeMessage(string messageType)
{
return JsonConvert.SerializeObject(new Message { MessageType = messageType });
using (var stringWriter = new StringWriter())
using (var jsonWriter = new JsonTextWriter(stringWriter))
{
messageSerializer.Serialize(jsonWriter, new Message { MessageType = messageType });
return stringWriter.ToString();
}
}

/// <summary>
Expand All @@ -130,7 +141,7 @@ public string SerializePayload(string messageType, object payload)
{
var serializedPayload = JToken.FromObject(payload, payloadSerializer);

return JsonConvert.SerializeObject(new Message { MessageType = messageType, Payload = serializedPayload });
return this.SerializePayload(messageType, payload, 1);
}

/// <summary>
Expand All @@ -149,7 +160,12 @@ public string SerializePayload(string messageType, object payload, int version)
new VersionedMessage { MessageType = messageType, Version = version, Payload = serializedPayload } :
new Message { MessageType = messageType, Payload = serializedPayload };

return JsonConvert.SerializeObject(message);
using (var stringWriter = new StringWriter())
using (var jsonWriter = new JsonTextWriter(stringWriter))
{
messageSerializer.Serialize(jsonWriter, message);
return stringWriter.ToString();
}
}

/// <inheritdoc/>
Expand Down