Fix nullable compile error due to SCM version bump (Azure#51174)

live1206 · web-flow · commit 4d9ab80ce80d · 2025-07-10T13:56:06.000+08:00
diff --git a/eng/packages/http-client-csharp/generator/Azure.Generator/test/common/ModelTests.cs b/eng/packages/http-client-csharp/generator/Azure.Generator/test/common/ModelTests.cs
@@ -73,17 +73,18 @@ protected void RoundTripTest(string format, RoundTripStrategy<T> strategy)
             if (AssertFailures(strategy, format, serviceResponse, options))
                 return;
 
-            T model = (T)strategy.Read(serviceResponse, ModelInstance, options);
-
-            VerifyModel(model, format);
-            var data = strategy.Write(model, options);
+            var model = (T?)strategy.Read(serviceResponse, ModelInstance, options);
+            Assert.NotNull(model);
+            VerifyModel(model!, format);
+            var data = strategy.Write(model!, options);
             string roundTrip = data.ToString();
 
             // we validate those are equivalent element, representing the same json object (ignoring the spaces and orders, etc)
             AssertJsonEquivalency(expectedSerializedString, roundTrip);
 
-            T model2 = (T)strategy.Read(roundTrip, ModelInstance, options);
-            CompareModels(model, model2, format);
+            var model2 = (T?)strategy.Read(roundTrip, ModelInstance, options);
+            Assert.NotNull(model2);
+            CompareModels(model!, model2!, format);
         }
 
         private void AssertJsonEquivalency(string expected, string result)
@@ -167,12 +168,12 @@ private bool AssertFailures(RoundTripStrategy<T> strategy, string format, string
                     if (strategy.GetType().Name.StartsWith("ModelJsonConverterStrategy"))
                     {
                         //we never get to the interface implementation because JsonSerializer errors before that
-                        Assert.Throws<JsonException>(() => { T model = (T)strategy.Read(serviceResponse, ModelInstance, options); });
+                        Assert.Throws<JsonException>(() => { var model = (T?)strategy.Read(serviceResponse, ModelInstance, options); });
                         result = true;
                     }
                     else
                     {
-                        Assert.Throws<InvalidOperationException>(() => { T model = (T)strategy.Read(serviceResponse, ModelInstance, options); });
+                        Assert.Throws<InvalidOperationException>(() => { var model = (T?)strategy.Read(serviceResponse, ModelInstance, options); });
                         result = true;
                     }
                 }
@@ -185,7 +186,7 @@ private bool AssertFailures(RoundTripStrategy<T> strategy, string format, string
             }
             else if (ModelInstance is not IJsonModel<T> && format == "J")
             {
-                Assert.Throws<FormatException>(() => { T model = (T)strategy.Read(serviceResponse, ModelInstance, options); });
+                Assert.Throws<FormatException>(() => { T model = (T)strategy.Read(serviceResponse, ModelInstance, options)!; });
                 Assert.Throws<FormatException>(() => { var data = strategy.Write(ModelInstance, options); });
                 result = true;
             }
diff --git a/eng/packages/http-client-csharp/generator/Azure.Generator/test/common/RoundTripStrategy.cs b/eng/packages/http-client-csharp/generator/Azure.Generator/test/common/RoundTripStrategy.cs
@@ -14,7 +14,7 @@ namespace Azure.Generator.Tests.Common
 #pragma warning disable SA1402
     public abstract class RoundTripStrategy<T>
     {
-        public abstract object Read(string payload, object model, ModelReaderWriterOptions options);
+        public abstract object? Read(string payload, object model, ModelReaderWriterOptions options);
         public abstract BinaryData Write(T model, ModelReaderWriterOptions options);
         public abstract bool IsExplicitJsonWrite { get; }
         public abstract bool IsExplicitJsonRead { get; }
@@ -77,7 +77,7 @@ public override BinaryData Write(T model, ModelReaderWriterOptions options)
             return model.Write(options);
         }
 
-        public override object Read(string payload, object model, ModelReaderWriterOptions options)
+        public override object? Read(string payload, object model, ModelReaderWriterOptions options)
         {
             return ((IPersistableModel<T>)model).Create(new BinaryData(Encoding.UTF8.GetBytes(payload)), options);
         }
@@ -93,7 +93,7 @@ public override BinaryData Write(T model, ModelReaderWriterOptions options)
             return ((IPersistableModel<object>)model).Write(options);
         }
 
-        public override object Read(string payload, object model, ModelReaderWriterOptions options)
+        public override object? Read(string payload, object model, ModelReaderWriterOptions options)
         {
             return ((IPersistableModel<object>)model).Create(new BinaryData(Encoding.UTF8.GetBytes(payload)), options);
         }
@@ -109,7 +109,7 @@ public override BinaryData Write(T model, ModelReaderWriterOptions options)
             return WriteWithJsonInterface(model, options);
         }
 
-        public override object Read(string payload, object model, ModelReaderWriterOptions options)
+        public override object? Read(string payload, object model, ModelReaderWriterOptions options)
         {
             return ((IJsonModel<T>)model).Create(new BinaryData(Encoding.UTF8.GetBytes(payload)), options);
         }
@@ -125,7 +125,7 @@ public override BinaryData Write(T model, ModelReaderWriterOptions options)
             return WriteWithJsonInterface((IJsonModel<object>)model, options);
         }
 
-        public override object Read(string payload, object model, ModelReaderWriterOptions options)
+        public override object? Read(string payload, object model, ModelReaderWriterOptions options)
         {
             return ((IJsonModel<object>)model).Create(new BinaryData(Encoding.UTF8.GetBytes(payload)), options);
         }
@@ -141,7 +141,7 @@ public override BinaryData Write(T model, ModelReaderWriterOptions options)
             return WriteWithJsonInterface(model, options);
         }
 
-        public override object Read(string payload, object model, ModelReaderWriterOptions options)
+        public override object? Read(string payload, object model, ModelReaderWriterOptions options)
         {
             var reader = new Utf8JsonReader(new BinaryData(Encoding.UTF8.GetBytes(payload)));
             return ((IJsonModel<T>)model).Create(ref reader, options);
@@ -158,7 +158,7 @@ public override BinaryData Write(T model, ModelReaderWriterOptions options)
             return WriteWithJsonInterface((IJsonModel<object>)model, options);
         }
 
-        public override object Read(string payload, object model, ModelReaderWriterOptions options)
+        public override object? Read(string payload, object model, ModelReaderWriterOptions options)
         {
             var reader = new Utf8JsonReader(new BinaryData(Encoding.UTF8.GetBytes(payload)));
             return ((IJsonModel<object>)model).Create(ref reader, options);

Original file line number	Diff line number	Diff line change
`@@ -73,17 +73,18 @@ protected void RoundTripTest(string format, RoundTripStrategy<T> strategy)`
`73`	`73`	`if (AssertFailures(strategy, format, serviceResponse, options))`
`74`	`74`	`return;`
`75`	`75`
`76`		`- T model = (T)strategy.Read(serviceResponse, ModelInstance, options);`
`77`		`-`
`78`		`- VerifyModel(model, format);`
`79`		`- var data = strategy.Write(model, options);`
	`76`	`+ var model = (T?)strategy.Read(serviceResponse, ModelInstance, options);`
	`77`	`+ Assert.NotNull(model);`
	`78`	`+ VerifyModel(model!, format);`
	`79`	`+ var data = strategy.Write(model!, options);`
`80`	`80`	`string roundTrip = data.ToString();`
`81`	`81`
`82`	`82`	`// we validate those are equivalent element, representing the same json object (ignoring the spaces and orders, etc)`
`83`	`83`	`AssertJsonEquivalency(expectedSerializedString, roundTrip);`
`84`	`84`
`85`		`- T model2 = (T)strategy.Read(roundTrip, ModelInstance, options);`
`86`		`- CompareModels(model, model2, format);`
	`85`	`+ var model2 = (T?)strategy.Read(roundTrip, ModelInstance, options);`
	`86`	`+ Assert.NotNull(model2);`
	`87`	`+ CompareModels(model!, model2!, format);`
`87`	`88`	`}`
`88`	`89`
`89`	`90`	`private void AssertJsonEquivalency(string expected, string result)`
`@@ -167,12 +168,12 @@ private bool AssertFailures(RoundTripStrategy<T> strategy, string format, string`
`167`	`168`	`if (strategy.GetType().Name.StartsWith("ModelJsonConverterStrategy"))`
`168`	`169`	`{`
`169`	`170`	`//we never get to the interface implementation because JsonSerializer errors before that`
`170`		`- Assert.Throws<JsonException>(() => { T model = (T)strategy.Read(serviceResponse, ModelInstance, options); });`
	`171`	`+ Assert.Throws<JsonException>(() => { var model = (T?)strategy.Read(serviceResponse, ModelInstance, options); });`
`171`	`172`	`result = true;`
`172`	`173`	`}`
`173`	`174`	`else`
`174`	`175`	`{`
`175`		`- Assert.Throws<InvalidOperationException>(() => { T model = (T)strategy.Read(serviceResponse, ModelInstance, options); });`
	`176`	`+ Assert.Throws<InvalidOperationException>(() => { var model = (T?)strategy.Read(serviceResponse, ModelInstance, options); });`
`176`	`177`	`result = true;`
`177`	`178`	`}`
`178`	`179`	`}`
`@@ -185,7 +186,7 @@ private bool AssertFailures(RoundTripStrategy<T> strategy, string format, string`
`185`	`186`	`}`
`186`	`187`	`else if (ModelInstance is not IJsonModel<T> && format == "J")`
`187`	`188`	`{`
`188`		`- Assert.Throws<FormatException>(() => { T model = (T)strategy.Read(serviceResponse, ModelInstance, options); });`
	`189`	`+ Assert.Throws<FormatException>(() => { T model = (T)strategy.Read(serviceResponse, ModelInstance, options)!; });`
`189`	`190`	`Assert.Throws<FormatException>(() => { var data = strategy.Write(ModelInstance, options); });`
`190`	`191`	`result = true;`
`191`	`192`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ namespace Azure.Generator.Tests.Common`
`14`	`14`	`#pragma warning disable SA1402`
`15`	`15`	`public abstract class RoundTripStrategy<T>`
`16`	`16`	`{`
`17`		`- public abstract object Read(string payload, object model, ModelReaderWriterOptions options);`
	`17`	`+ public abstract object? Read(string payload, object model, ModelReaderWriterOptions options);`
`18`	`18`	`public abstract BinaryData Write(T model, ModelReaderWriterOptions options);`
`19`	`19`	`public abstract bool IsExplicitJsonWrite { get; }`
`20`	`20`	`public abstract bool IsExplicitJsonRead { get; }`
`@@ -77,7 +77,7 @@ public override BinaryData Write(T model, ModelReaderWriterOptions options)`
`77`	`77`	`return model.Write(options);`
`78`	`78`	`}`
`79`	`79`
`80`		`- public override object Read(string payload, object model, ModelReaderWriterOptions options)`
	`80`	`+ public override object? Read(string payload, object model, ModelReaderWriterOptions options)`
`81`	`81`	`{`
`82`	`82`	`return ((IPersistableModel<T>)model).Create(new BinaryData(Encoding.UTF8.GetBytes(payload)), options);`
`83`	`83`	`}`
`@@ -93,7 +93,7 @@ public override BinaryData Write(T model, ModelReaderWriterOptions options)`
`93`	`93`	`return ((IPersistableModel<object>)model).Write(options);`
`94`	`94`	`}`
`95`	`95`
`96`		`- public override object Read(string payload, object model, ModelReaderWriterOptions options)`
	`96`	`+ public override object? Read(string payload, object model, ModelReaderWriterOptions options)`
`97`	`97`	`{`
`98`	`98`	`return ((IPersistableModel<object>)model).Create(new BinaryData(Encoding.UTF8.GetBytes(payload)), options);`
`99`	`99`	`}`
`@@ -109,7 +109,7 @@ public override BinaryData Write(T model, ModelReaderWriterOptions options)`
`109`	`109`	`return WriteWithJsonInterface(model, options);`
`110`	`110`	`}`
`111`	`111`
`112`		`- public override object Read(string payload, object model, ModelReaderWriterOptions options)`
	`112`	`+ public override object? Read(string payload, object model, ModelReaderWriterOptions options)`
`113`	`113`	`{`
`114`	`114`	`return ((IJsonModel<T>)model).Create(new BinaryData(Encoding.UTF8.GetBytes(payload)), options);`
`115`	`115`	`}`
`@@ -125,7 +125,7 @@ public override BinaryData Write(T model, ModelReaderWriterOptions options)`
`125`	`125`	`return WriteWithJsonInterface((IJsonModel<object>)model, options);`
`126`	`126`	`}`
`127`	`127`
`128`		`- public override object Read(string payload, object model, ModelReaderWriterOptions options)`
	`128`	`+ public override object? Read(string payload, object model, ModelReaderWriterOptions options)`
`129`	`129`	`{`
`130`	`130`	`return ((IJsonModel<object>)model).Create(new BinaryData(Encoding.UTF8.GetBytes(payload)), options);`
`131`	`131`	`}`
`@@ -141,7 +141,7 @@ public override BinaryData Write(T model, ModelReaderWriterOptions options)`
`141`	`141`	`return WriteWithJsonInterface(model, options);`
`142`	`142`	`}`
`143`	`143`
`144`		`- public override object Read(string payload, object model, ModelReaderWriterOptions options)`
	`144`	`+ public override object? Read(string payload, object model, ModelReaderWriterOptions options)`
`145`	`145`	`{`
`146`	`146`	`var reader = new Utf8JsonReader(new BinaryData(Encoding.UTF8.GetBytes(payload)));`
`147`	`147`	`return ((IJsonModel<T>)model).Create(ref reader, options);`
`@@ -158,7 +158,7 @@ public override BinaryData Write(T model, ModelReaderWriterOptions options)`
`158`	`158`	`return WriteWithJsonInterface((IJsonModel<object>)model, options);`
`159`	`159`	`}`
`160`	`160`
`161`		`- public override object Read(string payload, object model, ModelReaderWriterOptions options)`
	`161`	`+ public override object? Read(string payload, object model, ModelReaderWriterOptions options)`
`162`	`162`	`{`
`163`	`163`	`var reader = new Utf8JsonReader(new BinaryData(Encoding.UTF8.GetBytes(payload)));`
`164`	`164`	`return ((IJsonModel<object>)model).Create(ref reader, options);`