From 229b9b8ecca730e6005435f3396eccbb4b8cb038 Mon Sep 17 00:00:00 2001
From: John Wesley Walker III <81404201+jww3@users.noreply.github.com>
Date: Wed, 3 May 2023 15:29:19 +0200
Subject: [PATCH] Remove Temporary Serialization Shim (#2549)

---
 src/Sdk/RSWebApi/Contracts/AcquireJobRequest.cs | 5 -----
 src/Sdk/RSWebApi/RunServiceHttpClient.cs        | 1 -
 src/Test/L0/Sdk/RSWebApi/AcquireJobRequestL0.cs | 6 ++----
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/Sdk/RSWebApi/Contracts/AcquireJobRequest.cs b/src/Sdk/RSWebApi/Contracts/AcquireJobRequest.cs
index 895e29afa..d3f155cde 100644
--- a/src/Sdk/RSWebApi/Contracts/AcquireJobRequest.cs
+++ b/src/Sdk/RSWebApi/Contracts/AcquireJobRequest.cs
@@ -7,10 +7,5 @@ namespace GitHub.Actions.RunService.WebApi
     {
         [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; }
     }
 }
diff --git a/src/Sdk/RSWebApi/RunServiceHttpClient.cs b/src/Sdk/RSWebApi/RunServiceHttpClient.cs
index 3b910403d..8d45ece06 100644
--- a/src/Sdk/RSWebApi/RunServiceHttpClient.cs
+++ b/src/Sdk/RSWebApi/RunServiceHttpClient.cs
@@ -65,7 +65,6 @@ namespace GitHub.Actions.RunService.WebApi
             var payload = new AcquireJobRequest
             {
                 JobMessageId = messageId,
-                StreamId = messageId,
             };
 
             requestUri = new Uri(requestUri, "acquirejob");
diff --git a/src/Test/L0/Sdk/RSWebApi/AcquireJobRequestL0.cs b/src/Test/L0/Sdk/RSWebApi/AcquireJobRequestL0.cs
index c8883b071..e9889ec09 100644
--- a/src/Test/L0/Sdk/RSWebApi/AcquireJobRequestL0.cs
+++ b/src/Test/L0/Sdk/RSWebApi/AcquireJobRequestL0.cs
@@ -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();
@@ -27,7 +25,7 @@ public sealed class AcquireJobRequestL0
         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);
 
     }