Avoid declaring RazorPage<T>.Model as nullable by default (#39332) (#39416)

pranavkm · web-flow · commit 2bd9de67f14d · 2022-01-10T13:40:51.000-08:00
Contributes to #37510
diff --git a/src/Mvc/Mvc.Razor/src/PublicAPI.Unshipped.txt b/src/Mvc/Mvc.Razor/src/PublicAPI.Unshipped.txt
@@ -1 +1,3 @@
 #nullable enable
+*REMOVED*Microsoft.AspNetCore.Mvc.Razor.RazorPage<TModel>.Model.get -> TModel?
+Microsoft.AspNetCore.Mvc.Razor.RazorPage<TModel>.Model.get -> TModel
diff --git a/src/Mvc/Mvc.Razor/src/RazorPageOfT.cs b/src/Mvc/Mvc.Razor/src/RazorPageOfT.cs
@@ -15,13 +15,12 @@ public abstract class RazorPage<TModel> : RazorPage
         /// <summary>
         /// Gets the Model property of the <see cref="ViewData"/> property.
         /// </summary>
-        public TModel? Model => ViewData == null ? default(TModel) : ViewData.Model;
+        public TModel Model => ViewData.Model;
 
         /// <summary>
         /// Gets or sets the dictionary for view data.
         /// </summary>
         [RazorInject]
         public ViewDataDictionary<TModel> ViewData { get; set; } = default!;
-
     }
 }
diff --git a/src/Mvc/Mvc.ViewFeatures/src/PublicAPI.Unshipped.txt b/src/Mvc/Mvc.ViewFeatures/src/PublicAPI.Unshipped.txt
@@ -1 +1,3 @@
 #nullable enable
+*REMOVED*Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TModel>.Model.get -> TModel?
+Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TModel>.Model.get -> TModel
diff --git a/src/Mvc/Mvc.ViewFeatures/src/ViewDataDictionaryOfT.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewDataDictionaryOfT.cs
@@ -86,16 +86,10 @@ internal ViewDataDictionary(IModelMetadataProvider metadataProvider)
         }
 
         /// <inheritdoc />
-        public new TModel? Model
+        public new TModel Model
         {
-            get
-            {
-                return (base.Model == null) ? default(TModel) : (TModel)base.Model;
-            }
-            set
-            {
-                base.Model = value;
-            }
+            get => (base.Model is null) ? default! : (TModel)base.Model;
+            set => base.Model = value;
         }
     }
 }
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/Error.cshtml b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/Error.cshtml
@@ -6,10 +6,10 @@
 <h1 class="text-danger">Error.</h1>
 <h2 class="text-danger">An error occurred while processing your request.</h2>
 
-@if (Model?.ShowRequestId ?? false)
+@if (Model.ShowRequestId)
 {
     <p>
-        <strong>Request ID:</strong> <code>@Model?.RequestId</code>
+        <strong>Request ID:</strong> <code>@Model.RequestId</code>
     </p>
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
`1`	`1`	`#nullable enable`
	`2`	`+REMOVEDMicrosoft.AspNetCore.Mvc.Razor.RazorPage<TModel>.Model.get -> TModel?`
	`3`	`+Microsoft.AspNetCore.Mvc.Razor.RazorPage<TModel>.Model.get -> TModel`
Original file line number	Diff line number	Diff line change
`@@ -15,13 +15,12 @@ public abstract class RazorPage<TModel> : RazorPage`
`15`	`15`	`/// <summary>`
`16`	`16`	`/// Gets the Model property of the <see cref="ViewData"/> property.`
`17`	`17`	`/// </summary>`
`18`		`- public TModel? Model => ViewData == null ? default(TModel) : ViewData.Model;`
	`18`	`+ public TModel Model => ViewData.Model;`
`19`	`19`
`20`	`20`	`/// <summary>`
`21`	`21`	`/// Gets or sets the dictionary for view data.`
`22`	`22`	`/// </summary>`
`23`	`23`	`[RazorInject]`
`24`	`24`	`public ViewDataDictionary<TModel> ViewData { get; set; } = default!;`
`25`		`-`
`26`	`25`	`}`
`27`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
`1`	`1`	`#nullable enable`
	`2`	`+REMOVEDMicrosoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TModel>.Model.get -> TModel?`
	`3`	`+Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TModel>.Model.get -> TModel`
Original file line number	Diff line number	Diff line change
`@@ -86,16 +86,10 @@ internal ViewDataDictionary(IModelMetadataProvider metadataProvider)`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`/// <inheritdoc />`
`89`		`- public new TModel? Model`
	`89`	`+ public new TModel Model`
`90`	`90`	`{`
`91`		`- get`
`92`		`- {`
`93`		`- return (base.Model == null) ? default(TModel) : (TModel)base.Model;`
`94`		`- }`
`95`		`- set`
`96`		`- {`
`97`		`- base.Model = value;`
`98`		`- }`
	`91`	`+ get => (base.Model is null) ? default! : (TModel)base.Model;`
	`92`	`+ set => base.Model = value;`
`99`	`93`	`}`
`100`	`94`	`}`
`101`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,10 @@`
`6`	`6`	`<h1 class="text-danger">Error.</h1>`
`7`	`7`	`<h2 class="text-danger">An error occurred while processing your request.</h2>`
`8`	`8`
`9`		`-@if (Model?.ShowRequestId ?? false)`
	`9`	`+@if (Model.ShowRequestId)`
`10`	`10`	`{`
`11`	`11`	`<p>`
`12`		`- <strong>Request ID:</strong> <code>@Model?.RequestId</code>`
	`12`	`+ <strong>Request ID:</strong> <code>@Model.RequestId</code>`
`13`	`13`	`</p>`
`14`	`14`	`}`
`15`	`15`