Convert dependency objects to records

Closes #22076
dotnet · Nov 18, 2020 · 675a0cc · 675a0cc
1 parent 624781d
commit 675a0cc
Show file tree

Hide file tree

Showing 79 changed files with 295 additions and 2,725 deletions.
diff --git a/src/EFCore.Design/Migrations/Design/CSharpMigrationOperationGeneratorDependencies.cs b/src/EFCore.Design/Migrations/Design/CSharpMigrationOperationGeneratorDependencies.cs
@@ -25,7 +25,7 @@ namespace Microsoft.EntityFrameworkCore.Migrations.Design
     ///         services using the 'With...' methods. Do not call the constructor at any point in this process.
     ///     </para>
     /// </summary>
-    public sealed class CSharpMigrationOperationGeneratorDependencies
+    public sealed record CSharpMigrationOperationGeneratorDependencies
     {
         /// <summary>
         ///     <para>
@@ -58,14 +58,6 @@ public CSharpMigrationOperationGeneratorDependencies([NotNull] ICSharpHelper csh
         /// <summary>
         ///     The C# helper.
         /// </summary>
-        public ICSharpHelper CSharpHelper { get; }
-
-        /// <summary>
-        ///     Clones this dependency parameter object with one service replaced.
-        /// </summary>
-        /// <param name="csharpHelper"> A replacement for the current dependency of this type. </param>
-        /// <returns> A new parameter object with the given service replaced. </returns>
-        public CSharpMigrationOperationGeneratorDependencies With([NotNull] ICSharpHelper csharpHelper)
-            => new CSharpMigrationOperationGeneratorDependencies(csharpHelper);
+        public ICSharpHelper CSharpHelper { get; [param: NotNull] init; }
     }
 }
diff --git a/src/EFCore.Design/Migrations/Design/CSharpMigrationsGeneratorDependencies.cs b/src/EFCore.Design/Migrations/Design/CSharpMigrationsGeneratorDependencies.cs
@@ -24,7 +24,7 @@ namespace Microsoft.EntityFrameworkCore.Migrations.Design
     ///         services using the 'With...' methods. Do not call the constructor at any point in this process.
     ///     </para>
     /// </summary>
-    public sealed class CSharpMigrationsGeneratorDependencies
+    public sealed record CSharpMigrationsGeneratorDependencies
     {
         /// <summary>
         ///     <para>
@@ -59,49 +59,16 @@ public CSharpMigrationsGeneratorDependencies(
         /// <summary>
         ///     The C# helper.
         /// </summary>
-        public ICSharpHelper CSharpHelper { get; }
+        public ICSharpHelper CSharpHelper { get; [param: NotNull] init; }
 
         /// <summary>
         ///     The C# migration operation generator.
         /// </summary>
-        public ICSharpMigrationOperationGenerator CSharpMigrationOperationGenerator { get; }
+        public ICSharpMigrationOperationGenerator CSharpMigrationOperationGenerator { get; [param: NotNull] init; }
 
         /// <summary>
         ///     The C# model snapshot generator.
         /// </summary>
-        public ICSharpSnapshotGenerator CSharpSnapshotGenerator { get; }
-
-        /// <summary>
-        ///     Clones this dependency parameter object with one service replaced.
-        /// </summary>
-        /// <param name="csharpHelper"> A replacement for the current dependency of this type. </param>
-        /// <returns> A new parameter object with the given service replaced. </returns>
-        public CSharpMigrationsGeneratorDependencies With([NotNull] ICSharpHelper csharpHelper)
-            => new CSharpMigrationsGeneratorDependencies(
-                csharpHelper,
-                CSharpMigrationOperationGenerator,
-                CSharpSnapshotGenerator);
-
-        /// <summary>
-        ///     Clones this dependency parameter object with one service replaced.
-        /// </summary>
-        /// <param name="csharpMigrationOperationGenerator"> A replacement for the current dependency of this type. </param>
-        /// <returns> A new parameter object with the given service replaced. </returns>
-        public CSharpMigrationsGeneratorDependencies With([NotNull] ICSharpMigrationOperationGenerator csharpMigrationOperationGenerator)
-            => new CSharpMigrationsGeneratorDependencies(
-                CSharpHelper,
-                csharpMigrationOperationGenerator,
-                CSharpSnapshotGenerator);
-
-        /// <summary>
-        ///     Clones this dependency parameter object with one service replaced.
-        /// </summary>
-        /// <param name="csharpSnapshotGenerator"> A replacement for the current dependency of this type. </param>
-        /// <returns> A new parameter object with the given service replaced. </returns>
-        public CSharpMigrationsGeneratorDependencies With([NotNull] ICSharpSnapshotGenerator csharpSnapshotGenerator)
-            => new CSharpMigrationsGeneratorDependencies(
-                CSharpHelper,
-                CSharpMigrationOperationGenerator,
-                csharpSnapshotGenerator);
+        public ICSharpSnapshotGenerator CSharpSnapshotGenerator { get; [param: NotNull] init; }
     }
 }
diff --git a/src/EFCore.Design/Migrations/Design/CSharpSnapshotGeneratorDependencies.cs b/src/EFCore.Design/Migrations/Design/CSharpSnapshotGeneratorDependencies.cs
@@ -26,7 +26,7 @@ namespace Microsoft.EntityFrameworkCore.Migrations.Design
     ///         services using the 'With...' methods. Do not call the constructor at any point in this process.
     ///     </para>
     /// </summary>
-    public sealed class CSharpSnapshotGeneratorDependencies
+    public sealed record CSharpSnapshotGeneratorDependencies
     {
         /// <summary>
         ///     <para>
@@ -63,40 +63,16 @@ public CSharpSnapshotGeneratorDependencies(
         /// <summary>
         ///     The C# helper.
         /// </summary>
-        public ICSharpHelper CSharpHelper { get; }
+        public ICSharpHelper CSharpHelper { get; [param: NotNull] init; }
 
         /// <summary>
         ///     The type mapper.
         /// </summary>
-        public IRelationalTypeMappingSource RelationalTypeMappingSource { get; }
+        public IRelationalTypeMappingSource RelationalTypeMappingSource { get; [param: NotNull] init; }
 
         /// <summary>
         ///     The annotation code generator.
         /// </summary>
-        public IAnnotationCodeGenerator AnnotationCodeGenerator { get; }
-
-        /// <summary>
-        ///     Clones this dependency parameter object with one service replaced.
-        /// </summary>
-        /// <param name="csharpHelper"> A replacement for the current dependency of this type. </param>
-        /// <returns> A new parameter object with the given service replaced. </returns>
-        public CSharpSnapshotGeneratorDependencies With([NotNull] ICSharpHelper csharpHelper)
-            => new CSharpSnapshotGeneratorDependencies(csharpHelper, RelationalTypeMappingSource, AnnotationCodeGenerator);
-
-        /// <summary>
-        ///     Clones this dependency parameter object with one service replaced.
-        /// </summary>
-        /// <param name="relationalTypeMappingSource"> A replacement for the current dependency of this type. </param>
-        /// <returns> A new parameter object with the given service replaced. </returns>
-        public CSharpSnapshotGeneratorDependencies With([NotNull] IRelationalTypeMappingSource relationalTypeMappingSource)
-            => new CSharpSnapshotGeneratorDependencies(CSharpHelper, relationalTypeMappingSource, AnnotationCodeGenerator);
-
-        /// <summary>
-        ///     Clones this dependency parameter object with one service replaced.
-        /// </summary>
-        /// <param name="annotationCodeGenerator"> A replacement for the current dependency of this type. </param>
-        /// <returns> A new parameter object with the given service replaced. </returns>
-        public CSharpSnapshotGeneratorDependencies With([NotNull] IAnnotationCodeGenerator annotationCodeGenerator)
-            => new CSharpSnapshotGeneratorDependencies(CSharpHelper, RelationalTypeMappingSource, annotationCodeGenerator);
+        public IAnnotationCodeGenerator AnnotationCodeGenerator { get; [param: NotNull] init; }
     }
 }
diff --git a/src/EFCore.Design/Migrations/Design/MigrationsCodeGeneratorDependencies.cs b/src/EFCore.Design/Migrations/Design/MigrationsCodeGeneratorDependencies.cs
@@ -25,7 +25,7 @@ namespace Microsoft.EntityFrameworkCore.Migrations.Design
     ///         services using the 'With...' methods. Do not call the constructor at any point in this process.
     ///     </para>
     /// </summary>
-    public sealed class MigrationsCodeGeneratorDependencies
+    public sealed record MigrationsCodeGeneratorDependencies
     {
         /// <summary>
         ///     <para>
@@ -58,27 +58,11 @@ public MigrationsCodeGeneratorDependencies(
         /// <summary>
         ///     The type mapper.
         /// </summary>
-        public IRelationalTypeMappingSource RelationalTypeMappingSource { get; }
+        public IRelationalTypeMappingSource RelationalTypeMappingSource { get; [param: NotNull] init; }
 
         /// <summary>
         ///     The annotation code generator.
         /// </summary>
-        public IAnnotationCodeGenerator AnnotationCodeGenerator { get; }
-
-        /// <summary>
-        ///     Clones this dependency parameter object with one service replaced.
-        /// </summary>
-        /// <param name="relationalTypeMappingSource"> A replacement for the current dependency of this type. </param>
-        /// <returns> A new parameter object with the given service replaced. </returns>
-        public MigrationsCodeGeneratorDependencies With([NotNull] IRelationalTypeMappingSource relationalTypeMappingSource)
-            => new MigrationsCodeGeneratorDependencies(relationalTypeMappingSource, AnnotationCodeGenerator);
-
-        /// <summary>
-        ///     Clones this dependency parameter object with one service replaced.
-        /// </summary>
-        /// <param name="annotationCodeGenerator"> A replacement for the current dependency of this type. </param>
-        /// <returns> A new parameter object with the given service replaced. </returns>
-        public MigrationsCodeGeneratorDependencies With([NotNull] IAnnotationCodeGenerator annotationCodeGenerator)
-            => new MigrationsCodeGeneratorDependencies(RelationalTypeMappingSource, annotationCodeGenerator);
+        public IAnnotationCodeGenerator AnnotationCodeGenerator { get; [param: NotNull] init; }
     }
 }