Skip to content

Commit

Permalink
Remove Temporary Serialization Shim (actions#2549)
Browse files Browse the repository at this point in the history
  • Loading branch information
jww3 authored and nikola-jokic committed May 12, 2023
1 parent 7b629c8 commit 195f070
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 10 deletions.
5 changes: 0 additions & 5 deletions src/Sdk/RSWebApi/Contracts/AcquireJobRequest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,5 @@ public class AcquireJobRequest
{
[DataMember(Name = "jobMessageId", EmitDefaultValue = false)]
public string JobMessageId { get; set; }

// This field will be removed in an upcoming Runner release.
// It's left here temporarily to facilitate the transition to the new field name, JobMessageId.
[DataMember(Name = "streamId", EmitDefaultValue = false)]
public string StreamId { get; set; }
}
}
1 change: 0 additions & 1 deletion src/Sdk/RSWebApi/RunServiceHttpClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ public async Task<AgentJobRequestMessage> GetJobMessageAsync(
var payload = new AcquireJobRequest
{
JobMessageId = messageId,
StreamId = messageId,
};

requestUri = new Uri(requestUri, "acquirejob");
Expand Down
6 changes: 2 additions & 4 deletions src/Test/L0/Sdk/RSWebApi/AcquireJobRequestL0.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,9 @@ public sealed class AcquireJobRequestL0
[Trait("Category", "Common")]
public void VerifySerialization()
{
var jobMessageId = "1526919030369-33";
var request = new AcquireJobRequest
{
JobMessageId = jobMessageId,
StreamId = jobMessageId
JobMessageId = "1526919030369-33"
};
var serializer = new DataContractJsonSerializer(typeof(AcquireJobRequest));
using var stream = new MemoryStream();
Expand All @@ -27,7 +25,7 @@ public void VerifySerialization()
stream.Position = 0;
using var reader = new StreamReader(stream, Encoding.UTF8);
string json = reader.ReadToEnd();
string expected = DoubleQuotify(string.Format("{{'jobMessageId':'{0}','streamId':'{0}'}}", request.JobMessageId));
string expected = DoubleQuotify(string.Format("{{'jobMessageId':'{0}'}}", request.JobMessageId));
Assert.Equal(expected, json);

}
Expand Down

0 comments on commit 195f070

Please sign in to comment.