Code cleanup for Relational (#22183)

dotnet · Aug 23, 2020 · 18f47ea · 18f47ea
1 parent cd38a21
commit 18f47ea
Show file tree

Hide file tree

Showing 286 changed files with 3,576 additions and 2,329 deletions.
diff --git a/src/EFCore.Relational/Design/AnnotationCodeGenerator.cs b/src/EFCore.Relational/Design/AnnotationCodeGenerator.cs
@@ -79,7 +79,8 @@ public virtual void RemoveAnnotationsHandledByConventions(IModel model, IDiction
 
         /// <inheritdoc />
         public virtual void RemoveAnnotationsHandledByConventions(
-            IEntityType entityType, IDictionary<string, IAnnotation> annotations)
+            IEntityType entityType,
+            IDictionary<string, IAnnotation> annotations)
         {
             annotations.Remove(RelationalAnnotationNames.IsTableExcludedFromMigrations);
 
@@ -88,7 +89,8 @@ public virtual void RemoveAnnotationsHandledByConventions(
 
         /// <inheritdoc />
         public virtual void RemoveAnnotationsHandledByConventions(
-            IProperty property, IDictionary<string, IAnnotation> annotations)
+            IProperty property,
+            IDictionary<string, IAnnotation> annotations)
         {
             var columnName = property.GetColumnName();
             if (columnName == property.Name)
@@ -105,7 +107,8 @@ public virtual void RemoveAnnotationsHandledByConventions(IKey key, IDictionary<
 
         /// <inheritdoc />
         public virtual void RemoveAnnotationsHandledByConventions(
-            IForeignKey foreignKey, IDictionary<string, IAnnotation> annotations)
+            IForeignKey foreignKey,
+            IDictionary<string, IAnnotation> annotations)
             => RemoveConventionalAnnotationsHelper(foreignKey, annotations, IsHandledByConvention);
 
         /// <inheritdoc />
@@ -114,7 +117,8 @@ public virtual void RemoveAnnotationsHandledByConventions(IIndex index, IDiction
 
         /// <inheritdoc />
         public virtual IReadOnlyList<MethodCallCodeFragment> GenerateFluentApiCalls(
-            IModel model, IDictionary<string, IAnnotation> annotations)
+            IModel model,
+            IDictionary<string, IAnnotation> annotations)
         {
             var methodCallCodeFragments = new List<MethodCallCodeFragment>();
 
@@ -129,7 +133,8 @@ public virtual IReadOnlyList<MethodCallCodeFragment> GenerateFluentApiCalls(
 
         /// <inheritdoc />
         public virtual IReadOnlyList<MethodCallCodeFragment> GenerateFluentApiCalls(
-            IEntityType entityType, IDictionary<string, IAnnotation> annotations)
+            IEntityType entityType,
+            IDictionary<string, IAnnotation> annotations)
         {
             var methodCallCodeFragments = new List<MethodCallCodeFragment>();
 
@@ -144,7 +149,8 @@ public virtual IReadOnlyList<MethodCallCodeFragment> GenerateFluentApiCalls(
 
         /// <inheritdoc />
         public virtual IReadOnlyList<MethodCallCodeFragment> GenerateFluentApiCalls(
-            IProperty property, IDictionary<string, IAnnotation> annotations)
+            IProperty property,
+            IDictionary<string, IAnnotation> annotations)
         {
             var methodCallCodeFragments = new List<MethodCallCodeFragment>();
 
@@ -167,16 +173,16 @@ public virtual IReadOnlyList<MethodCallCodeFragment> GenerateFluentApiCalls(
             {
                 methodCallCodeFragments.Add(
                     computedColumnSql?.Length == 0
-                    ? new MethodCallCodeFragment(
-                        nameof(RelationalPropertyBuilderExtensions.HasComputedColumnSql))
-                    : TryGetAndRemove(annotations, RelationalAnnotationNames.IsStored, out bool isStored)
                         ? new MethodCallCodeFragment(
-                            nameof(RelationalPropertyBuilderExtensions.HasComputedColumnSql),
-                            computedColumnSql,
-                            isStored)
-                        : new MethodCallCodeFragment(
-                            nameof(RelationalPropertyBuilderExtensions.HasComputedColumnSql),
-                            computedColumnSql));
+                            nameof(RelationalPropertyBuilderExtensions.HasComputedColumnSql))
+                        : TryGetAndRemove(annotations, RelationalAnnotationNames.IsStored, out bool isStored)
+                            ? new MethodCallCodeFragment(
+                                nameof(RelationalPropertyBuilderExtensions.HasComputedColumnSql),
+                                computedColumnSql,
+                                isStored)
+                            : new MethodCallCodeFragment(
+                                nameof(RelationalPropertyBuilderExtensions.HasComputedColumnSql),
+                                computedColumnSql));
             }
 
             GenerateSimpleFluentApiCall(
@@ -199,7 +205,8 @@ public virtual IReadOnlyList<MethodCallCodeFragment> GenerateFluentApiCalls(
 
         /// <inheritdoc />
         public virtual IReadOnlyList<MethodCallCodeFragment> GenerateFluentApiCalls(
-            IKey key, IDictionary<string, IAnnotation> annotations)
+            IKey key,
+            IDictionary<string, IAnnotation> annotations)
         {
             var methodCallCodeFragments = new List<MethodCallCodeFragment>();
 
@@ -214,7 +221,8 @@ public virtual IReadOnlyList<MethodCallCodeFragment> GenerateFluentApiCalls(
 
         /// <inheritdoc />
         public virtual IReadOnlyList<MethodCallCodeFragment> GenerateFluentApiCalls(
-            IForeignKey navigation, IDictionary<string, IAnnotation> annotations)
+            IForeignKey navigation,
+            IDictionary<string, IAnnotation> annotations)
         {
             var methodCallCodeFragments = new List<MethodCallCodeFragment>();
 
@@ -229,7 +237,8 @@ public virtual IReadOnlyList<MethodCallCodeFragment> GenerateFluentApiCalls(
 
         /// <inheritdoc />
         public virtual IReadOnlyList<MethodCallCodeFragment> GenerateFluentApiCalls(
-            INavigation navigation, IDictionary<string, IAnnotation> annotations)
+            INavigation navigation,
+            IDictionary<string, IAnnotation> annotations)
         {
             var methodCallCodeFragments = new List<MethodCallCodeFragment>();
 
@@ -240,7 +249,8 @@ public virtual IReadOnlyList<MethodCallCodeFragment> GenerateFluentApiCalls(
 
         /// <inheritdoc />
         public virtual IReadOnlyList<MethodCallCodeFragment> GenerateFluentApiCalls(
-            ISkipNavigation navigation, IDictionary<string, IAnnotation> annotations)
+            ISkipNavigation navigation,
+            IDictionary<string, IAnnotation> annotations)
         {
             var methodCallCodeFragments = new List<MethodCallCodeFragment>();
 
@@ -251,7 +261,8 @@ public virtual IReadOnlyList<MethodCallCodeFragment> GenerateFluentApiCalls(
 
         /// <inheritdoc />
         public virtual IReadOnlyList<MethodCallCodeFragment> GenerateFluentApiCalls(
-            IIndex index, IDictionary<string, IAnnotation> annotations)
+            IIndex index,
+            IDictionary<string, IAnnotation> annotations)
         {
             var methodCallCodeFragments = new List<MethodCallCodeFragment>();
 
@@ -270,7 +281,8 @@ public virtual IReadOnlyList<MethodCallCodeFragment> GenerateFluentApiCalls(
 
         /// <inheritdoc />
         public virtual IReadOnlyList<AttributeCodeFragment> GenerateDataAnnotationAttributes(
-            IEntityType entityType, IDictionary<string, IAnnotation> annotations)
+            IEntityType entityType,
+            IDictionary<string, IAnnotation> annotations)
         {
             var attributeCodeFragments = new List<AttributeCodeFragment>();
 
@@ -281,7 +293,8 @@ public virtual IReadOnlyList<AttributeCodeFragment> GenerateDataAnnotationAttrib
 
         /// <inheritdoc />
         public virtual IReadOnlyList<AttributeCodeFragment> GenerateDataAnnotationAttributes(
-            IProperty property, IDictionary<string, IAnnotation> annotations)
+            IProperty property,
+            IDictionary<string, IAnnotation> annotations)
         {
             var attributeCodeFragments = new List<AttributeCodeFragment>();
 
@@ -312,8 +325,8 @@ public virtual IReadOnlyList<AttributeCodeFragment> GenerateDataAnnotationAttrib
         /// <param name="model"> The <see cref="IModel" />. </param>
         /// <param name="annotation"> The <see cref="IAnnotation" />. </param>
         /// <returns>
-        ///     <see langword="true"/> if the annotation is handled by convention;
-        ///     <see langword="false"/> if code must be generated.
+        ///     <see langword="true" /> if the annotation is handled by convention;
+        ///     <see langword="false" /> if code must be generated.
         /// </returns>
         protected virtual bool IsHandledByConvention([NotNull] IModel model, [NotNull] IAnnotation annotation)
         {

diff --git a/src/EFCore.Relational/Design/AttributeCodeFragment.cs b/src/EFCore.Relational/Design/AttributeCodeFragment.cs
@@ -39,6 +39,7 @@ public AttributeCodeFragment([NotNull] Type type, [NotNull] params object[] argu
         ///     Gets the method call's arguments.
         /// </summary>
         /// <value> The method call's arguments. </value>
-        public virtual IReadOnlyList<object> Arguments => _arguments;
+        public virtual IReadOnlyList<object> Arguments
+            => _arguments;
     }
 }
diff --git a/src/EFCore.Relational/Design/IAnnotationCodeGenerator.cs b/src/EFCore.Relational/Design/IAnnotationCodeGenerator.cs
@@ -61,7 +61,9 @@ void RemoveAnnotationsHandledByConventions([NotNull] IKey key, [NotNull] IDictio
         /// </summary>
         /// <param name="foreignKey"> The foreign key to which the annotations are applied. </param>
         /// <param name="annotations"> The set of annotations from which to remove the conventional ones. </param>
-        void RemoveAnnotationsHandledByConventions([NotNull] IForeignKey foreignKey, [NotNull] IDictionary<string, IAnnotation> annotations) { }
+        void RemoveAnnotationsHandledByConventions([NotNull] IForeignKey foreignKey, [NotNull] IDictionary<string, IAnnotation> annotations)
+        {
+        }
 
         /// <summary>
         ///     Removes annotation whose configuration is already applied by convention, and do not need to be
@@ -78,7 +80,8 @@ void RemoveAnnotationsHandledByConventions([NotNull] IIndex index, [NotNull] IDi
         /// <param name="model"> The model to which the annotations are applied. </param>
         /// <param name="annotations"> The set of annotations from which to generate fluent API calls. </param>
         IReadOnlyList<MethodCallCodeFragment> GenerateFluentApiCalls(
-            [NotNull] IModel model, [NotNull] IDictionary<string, IAnnotation> annotations)
+            [NotNull] IModel model,
+            [NotNull] IDictionary<string, IAnnotation> annotations)
             => Array.Empty<MethodCallCodeFragment>();
 
         /// <summary>
@@ -88,7 +91,8 @@ IReadOnlyList<MethodCallCodeFragment> GenerateFluentApiCalls(
         /// <param name="entityType"> The entity type to which the annotations are applied. </param>
         /// <param name="annotations"> The set of annotations from which to generate fluent API calls. </param>
         IReadOnlyList<MethodCallCodeFragment> GenerateFluentApiCalls(
-            [NotNull] IEntityType entityType, [NotNull] IDictionary<string, IAnnotation> annotations)
+            [NotNull] IEntityType entityType,
+            [NotNull] IDictionary<string, IAnnotation> annotations)
             => Array.Empty<MethodCallCodeFragment>();
 
         /// <summary>
@@ -98,7 +102,8 @@ IReadOnlyList<MethodCallCodeFragment> GenerateFluentApiCalls(
         /// <param name="property"> The property to which the annotations are applied. </param>
         /// <param name="annotations"> The set of annotations from which to generate fluent API calls. </param>
         IReadOnlyList<MethodCallCodeFragment> GenerateFluentApiCalls(
-            [NotNull] IProperty property, [NotNull] IDictionary<string, IAnnotation> annotations)
+            [NotNull] IProperty property,
+            [NotNull] IDictionary<string, IAnnotation> annotations)
             => Array.Empty<MethodCallCodeFragment>();
 
         /// <summary>
@@ -108,7 +113,8 @@ IReadOnlyList<MethodCallCodeFragment> GenerateFluentApiCalls(
         /// <param name="key"> The key to which the annotations are applied. </param>
         /// <param name="annotations"> The set of annotations from which to generate fluent API calls. </param>
         IReadOnlyList<MethodCallCodeFragment> GenerateFluentApiCalls(
-            [NotNull] IKey key, [NotNull] IDictionary<string, IAnnotation> annotations)
+            [NotNull] IKey key,
+            [NotNull] IDictionary<string, IAnnotation> annotations)
             => Array.Empty<MethodCallCodeFragment>();
 
         /// <summary>
@@ -118,7 +124,8 @@ IReadOnlyList<MethodCallCodeFragment> GenerateFluentApiCalls(
         /// <param name="foreignKey"> The foreign key to which the annotations are applied. </param>
         /// <param name="annotations"> The set of annotations from which to generate fluent API calls. </param>
         IReadOnlyList<MethodCallCodeFragment> GenerateFluentApiCalls(
-            [NotNull] IForeignKey foreignKey, [NotNull] IDictionary<string, IAnnotation> annotations)
+            [NotNull] IForeignKey foreignKey,
+            [NotNull] IDictionary<string, IAnnotation> annotations)
             => Array.Empty<MethodCallCodeFragment>();
 
         /// <summary>
@@ -128,7 +135,8 @@ IReadOnlyList<MethodCallCodeFragment> GenerateFluentApiCalls(
         /// <param name="navigation"> The navigation to which the annotations are applied. </param>
         /// <param name="annotations"> The set of annotations from which to generate fluent API calls. </param>
         IReadOnlyList<MethodCallCodeFragment> GenerateFluentApiCalls(
-            [NotNull] INavigation navigation, [NotNull] IDictionary<string, IAnnotation> annotations)
+            [NotNull] INavigation navigation,
+            [NotNull] IDictionary<string, IAnnotation> annotations)
             => Array.Empty<MethodCallCodeFragment>();
 
         /// <summary>
@@ -138,7 +146,8 @@ IReadOnlyList<MethodCallCodeFragment> GenerateFluentApiCalls(
         /// <param name="navigation"> The skip navigation to which the annotations are applied. </param>
         /// <param name="annotations"> The set of annotations from which to generate fluent API calls. </param>
         IReadOnlyList<MethodCallCodeFragment> GenerateFluentApiCalls(
-            [NotNull] ISkipNavigation navigation, [NotNull] IDictionary<string, IAnnotation> annotations)
+            [NotNull] ISkipNavigation navigation,
+            [NotNull] IDictionary<string, IAnnotation> annotations)
             => Array.Empty<MethodCallCodeFragment>();
 
         /// <summary>
@@ -148,7 +157,8 @@ IReadOnlyList<MethodCallCodeFragment> GenerateFluentApiCalls(
         /// <param name="index"> The index to which the annotations are applied. </param>
         /// <param name="annotations"> The set of annotations from which to generate fluent API calls. </param>
         IReadOnlyList<MethodCallCodeFragment> GenerateFluentApiCalls(
-            [NotNull] IIndex index, [NotNull] IDictionary<string, IAnnotation> annotations)
+            [NotNull] IIndex index,
+            [NotNull] IDictionary<string, IAnnotation> annotations)
             => Array.Empty<MethodCallCodeFragment>();
 
         /// <summary>
@@ -158,7 +168,8 @@ IReadOnlyList<MethodCallCodeFragment> GenerateFluentApiCalls(
         /// <param name="entityType"> The entity type to which the annotations are applied. </param>
         /// <param name="annotations"> The set of annotations from which to generate fluent API calls. </param>
         IReadOnlyList<AttributeCodeFragment> GenerateDataAnnotationAttributes(
-            [NotNull] IEntityType entityType, [NotNull] IDictionary<string, IAnnotation> annotations)
+            [NotNull] IEntityType entityType,
+            [NotNull] IDictionary<string, IAnnotation> annotations)
             => Array.Empty<AttributeCodeFragment>();
 
         /// <summary>
@@ -168,7 +179,8 @@ IReadOnlyList<AttributeCodeFragment> GenerateDataAnnotationAttributes(
         /// <param name="property"> The property to which the annotations are applied. </param>
         /// <param name="annotations"> The set of annotations from which to generate fluent API calls. </param>
         IReadOnlyList<AttributeCodeFragment> GenerateDataAnnotationAttributes(
-            [NotNull] IProperty property, [NotNull] IDictionary<string, IAnnotation> annotations)
+            [NotNull] IProperty property,
+            [NotNull] IDictionary<string, IAnnotation> annotations)
             => Array.Empty<AttributeCodeFragment>();
     }
 }
diff --git a/src/EFCore.Relational/Design/MethodCallCodeFragment.cs b/src/EFCore.Relational/Design/MethodCallCodeFragment.cs
@@ -55,7 +55,8 @@ public MethodCallCodeFragment(
         ///     Gets the method call's arguments.
         /// </summary>
         /// <value> The method call's arguments. </value>
-        public virtual IReadOnlyList<object> Arguments => _arguments;
+        public virtual IReadOnlyList<object> Arguments
+            => _arguments;
 
         /// <summary>
         ///     Gets the next method call to chain after this.