Static analysis: use null propagation

ajcvickers · ajcvickers · commit cd2a031e0e66 · 2021-12-07T09:36:55.000Z
Part of #26805
diff --git a/src/EFCore.Cosmos/Query/Internal/CosmosShapedQueryCompilingExpressionVisitor.CosmosProjectionBindingRemovingExpressionVisitorBase.cs b/src/EFCore.Cosmos/Query/Internal/CosmosShapedQueryCompilingExpressionVisitor.CosmosProjectionBindingRemovingExpressionVisitorBase.cs
@@ -461,10 +461,7 @@ private static void IncludeCollection<TIncludingEntity, TIncludedEntity>(
                     foreach (var relatedEntity in relatedEntities)
                     {
                         fixup(includingEntity, relatedEntity);
-                        if (inverseNavigation != null)
-                        {
-                            inverseNavigation.SetIsLoadedWhenNoTracking(relatedEntity);
-                        }
+                        inverseNavigation?.SetIsLoadedWhenNoTracking(relatedEntity);
                     }
                 }
                 else
diff --git a/src/EFCore.InMemory/Query/Internal/InMemoryQueryableMethodTranslatingExpressionVisitor.cs b/src/EFCore.InMemory/Query/Internal/InMemoryQueryableMethodTranslatingExpressionVisitor.cs
@@ -1218,12 +1218,7 @@ protected override Expression VisitExtension(Expression extensionExpression)
                 ? entityType.FindNavigation(member.MemberInfo)
                 : entityType.FindNavigation(member.Name!);
 
-            if (navigation == null)
-            {
-                return null;
-            }
-
-            var targetEntityType = navigation.TargetEntityType;
+            var targetEntityType = navigation?.TargetEntityType;
             if (targetEntityType == null
                 || !targetEntityType.IsOwned())
             {
diff --git a/src/EFCore.InMemory/Query/Internal/InMemoryShapedQueryCompilingExpressionVisitor.ShaperExpressionProcessingExpressionVisitor.cs b/src/EFCore.InMemory/Query/Internal/InMemoryShapedQueryCompilingExpressionVisitor.ShaperExpressionProcessingExpressionVisitor.cs
@@ -330,10 +330,7 @@ private static void IncludeCollection<TEntity, TIncludingEntity, TIncludedEntity
                     if (!trackingQuery)
                     {
                         fixup(includingEntity, relatedEntity);
-                        if (inverseNavigation != null)
-                        {
-                            inverseNavigation.SetIsLoadedWhenNoTracking(relatedEntity);
-                        }
+                        inverseNavigation?.SetIsLoadedWhenNoTracking(relatedEntity);
                     }
                 }
             }
diff --git a/src/EFCore.Relational/Query/RelationalQueryableMethodTranslatingExpressionVisitor.cs b/src/EFCore.Relational/Query/RelationalQueryableMethodTranslatingExpressionVisitor.cs
@@ -1068,12 +1068,7 @@ protected override Expression VisitExtension(Expression extensionExpression)
                 ? entityType.FindNavigation(member.MemberInfo)
                 : entityType.FindNavigation(member.Name!);
 
-            if (navigation == null)
-            {
-                return null;
-            }
-
-            var targetEntityType = navigation.TargetEntityType;
+            var targetEntityType = navigation?.TargetEntityType;
             if (targetEntityType == null
                 || !targetEntityType.IsOwned())
             {
diff --git a/src/EFCore.Relational/Query/RelationalShapedQueryCompilingExpressionVisitor.ShaperProcessingExpressionVisitor.cs b/src/EFCore.Relational/Query/RelationalShapedQueryCompilingExpressionVisitor.ShaperProcessingExpressionVisitor.cs
@@ -1425,10 +1425,7 @@ static RelationalDataReader InitializeReader(
                     if (!trackingQuery)
                     {
                         fixup(entity, relatedEntity);
-                        if (inverseNavigation != null)
-                        {
-                            inverseNavigation.SetIsLoadedWhenNoTracking(relatedEntity);
-                        }
+                        inverseNavigation?.SetIsLoadedWhenNoTracking(relatedEntity);
                     }
                 }
 
@@ -1519,10 +1516,7 @@ static async Task<RelationalDataReader> InitializeReaderAsync(
                     if (!trackingQuery)
                     {
                         fixup(entity, relatedEntity);
-                        if (inverseNavigation != null)
-                        {
-                            inverseNavigation.SetIsLoadedWhenNoTracking(relatedEntity);
-                        }
+                        inverseNavigation?.SetIsLoadedWhenNoTracking(relatedEntity);
                     }
                 }
 
diff --git a/src/EFCore.SqlServer/Metadata/Conventions/SqlServerTemporalConvention.cs b/src/EFCore.SqlServer/Metadata/Conventions/SqlServerTemporalConvention.cs
@@ -113,12 +113,9 @@ public virtual void ProcessEntityTypeAnnotationChanged(
                     typeof(DateTime),
                     periodPropertyName);
 
-                if (periodPropertyBuilder != null)
-                {
-                    // set column name explicitly so that we don't try to uniquefy it to some other column
-                    // in case another property is defined that maps to the same column
-                    periodPropertyBuilder.HasColumnName(periodPropertyName);
-                }
+                // set column name explicitly so that we don't try to uniquefy it to some other column
+                // in case another property is defined that maps to the same column
+                periodPropertyBuilder?.HasColumnName(periodPropertyName);
             }
         }
     }
diff --git a/src/EFCore.SqlServer/Metadata/Conventions/SqlServerValueGenerationConvention.cs b/src/EFCore.SqlServer/Metadata/Conventions/SqlServerValueGenerationConvention.cs
@@ -75,20 +75,14 @@ public override void ProcessEntityTypeAnnotationChanged(
             && annotation?.Value is string propertyName)
         {
             var periodProperty = entityTypeBuilder.Metadata.FindProperty(propertyName);
-            if (periodProperty != null)
-            {
-                periodProperty.Builder.ValueGenerated(GetValueGenerated(periodProperty));
-            }
+            periodProperty?.Builder.ValueGenerated(GetValueGenerated(periodProperty));
 
             // cleanup the previous period property - its possible that it won't be deleted
             // (e.g. when removing period with default name, while the property with that same name has been explicitly defined)
             if (oldAnnotation?.Value is string oldPropertyName)
             {
                 var oldPeriodProperty = entityTypeBuilder.Metadata.FindProperty(oldPropertyName);
-                if (oldPeriodProperty != null)
-                {
-                    oldPeriodProperty.Builder.ValueGenerated(GetValueGenerated(oldPeriodProperty));
-                }
+                oldPeriodProperty?.Builder.ValueGenerated(GetValueGenerated(oldPeriodProperty));
             }
         }
 
diff --git a/src/EFCore/Metadata/Conventions/InversePropertyAttributeConvention.cs b/src/EFCore/Metadata/Conventions/InversePropertyAttributeConvention.cs
@@ -273,11 +273,9 @@ private static bool TryRemoveIfAmbiguous(
 
                 var existingAmbiguousNavigation = FindActualEntityType(ambiguousInverse.Value.Item2)!
                     .FindSkipNavigation(ambiguousInverse.Value.Item1);
-                if (existingAmbiguousNavigation != null)
-                {
-                    existingAmbiguousNavigation.DeclaringEntityType.Builder.HasNoSkipNavigation(
-                        existingAmbiguousNavigation, fromDataAnnotation: true);
-                }
+
+                existingAmbiguousNavigation?.DeclaringEntityType.Builder.HasNoSkipNavigation(
+                    existingAmbiguousNavigation, fromDataAnnotation: true);
 
                 remainingInverseNavigation = entityType.FindSkipNavigation(navigationMemberInfo)?.ForeignKey!.Builder;
                 return true;
diff --git a/src/EFCore/Metadata/Internal/InternalSkipNavigationBuilder.cs b/src/EFCore/Metadata/Internal/InternalSkipNavigationBuilder.cs
@@ -141,10 +141,7 @@ public virtual bool CanSetForeignKey(ForeignKey? foreignKey, ConfigurationSource
             return null;
         }
 
-        if (inverse != null)
-        {
-            inverse.UpdateConfigurationSource(configurationSource);
-        }
+        inverse?.UpdateConfigurationSource(configurationSource);
 
         using var _ = Metadata.DeclaringEntityType.Model.DelayConventions();
 
@@ -156,10 +153,7 @@ public virtual bool CanSetForeignKey(ForeignKey? foreignKey, ConfigurationSource
 
         Metadata.SetInverse(inverse, configurationSource);
 
-        if (inverse != null)
-        {
-            inverse.SetInverse(Metadata, configurationSource);
-        }
+        inverse?.SetInverse(Metadata, configurationSource);
 
         return this;
     }
diff --git a/src/EFCore/Query/Internal/NavigationExpandingExpressionVisitor.ExpressionVisitors.cs b/src/EFCore/Query/Internal/NavigationExpandingExpressionVisitor.ExpressionVisitors.cs
@@ -328,10 +328,7 @@ private Expression ExpandForeignKey(
                     && entityReference.IncludePaths.TryGetValue(navigation, out var pendingIncludeTree))
                 {
                     var cachedEntityReference = UnwrapEntityReference(expansion);
-                    if (cachedEntityReference != null)
-                    {
-                        cachedEntityReference.IncludePaths.Merge(pendingIncludeTree);
-                    }
+                    cachedEntityReference?.IncludePaths.Merge(pendingIncludeTree);
                 }
 
                 return expansion;

Original file line number	Diff line number	Diff line change
`@@ -461,10 +461,7 @@ private static void IncludeCollection<TIncludingEntity, TIncludedEntity>(`
`461`	`461`	`foreach (var relatedEntity in relatedEntities)`
`462`	`462`	`{`
`463`	`463`	`fixup(includingEntity, relatedEntity);`
`464`		`- if (inverseNavigation != null)`
`465`		`- {`
`466`		`- inverseNavigation.SetIsLoadedWhenNoTracking(relatedEntity);`
`467`		`- }`
	`464`	`+ inverseNavigation?.SetIsLoadedWhenNoTracking(relatedEntity);`
`468`	`465`	`}`
`469`	`466`	`}`
`470`	`467`	`else`
Original file line number	Diff line number	Diff line change
`@@ -330,10 +330,7 @@ private static void IncludeCollection<TEntity, TIncludingEntity, TIncludedEntity`
`330`	`330`	`if (!trackingQuery)`
`331`	`331`	`{`
`332`	`332`	`fixup(includingEntity, relatedEntity);`
`333`		`- if (inverseNavigation != null)`
`334`		`- {`
`335`		`- inverseNavigation.SetIsLoadedWhenNoTracking(relatedEntity);`
`336`		`- }`
	`333`	`+ inverseNavigation?.SetIsLoadedWhenNoTracking(relatedEntity);`
`337`	`334`	`}`
`338`	`335`	`}`
`339`	`336`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1425,10 +1425,7 @@ static RelationalDataReader InitializeReader(`
`1425`	`1425`	`if (!trackingQuery)`
`1426`	`1426`	`{`
`1427`	`1427`	`fixup(entity, relatedEntity);`
`1428`		`- if (inverseNavigation != null)`
`1429`		`- {`
`1430`		`- inverseNavigation.SetIsLoadedWhenNoTracking(relatedEntity);`
`1431`		`- }`
	`1428`	`+ inverseNavigation?.SetIsLoadedWhenNoTracking(relatedEntity);`
`1432`	`1429`	`}`
`1433`	`1430`	`}`
`1434`	`1431`
`@@ -1519,10 +1516,7 @@ static async Task<RelationalDataReader> InitializeReaderAsync(`
`1519`	`1516`	`if (!trackingQuery)`
`1520`	`1517`	`{`
`1521`	`1518`	`fixup(entity, relatedEntity);`
`1522`		`- if (inverseNavigation != null)`
`1523`		`- {`
`1524`		`- inverseNavigation.SetIsLoadedWhenNoTracking(relatedEntity);`
`1525`		`- }`
	`1519`	`+ inverseNavigation?.SetIsLoadedWhenNoTracking(relatedEntity);`
`1526`	`1520`	`}`
`1527`	`1521`	`}`
`1528`	`1522`
Original file line number	Diff line number	Diff line change
`@@ -113,12 +113,9 @@ public virtual void ProcessEntityTypeAnnotationChanged(`
`113`	`113`	`typeof(DateTime),`
`114`	`114`	`periodPropertyName);`
`115`	`115`
`116`		`- if (periodPropertyBuilder != null)`
`117`		`- {`
`118`		`- // set column name explicitly so that we don't try to uniquefy it to some other column`
`119`		`- // in case another property is defined that maps to the same column`
`120`		`- periodPropertyBuilder.HasColumnName(periodPropertyName);`
`121`		`- }`
	`116`	`+ // set column name explicitly so that we don't try to uniquefy it to some other column`
	`117`	`+ // in case another property is defined that maps to the same column`
	`118`	`+ periodPropertyBuilder?.HasColumnName(periodPropertyName);`
`122`	`119`	`}`
`123`	`120`	`}`
`124`	`121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,20 +75,14 @@ public override void ProcessEntityTypeAnnotationChanged(`
`75`	`75`	`&& annotation?.Value is string propertyName)`
`76`	`76`	`{`
`77`	`77`	`var periodProperty = entityTypeBuilder.Metadata.FindProperty(propertyName);`
`78`		`- if (periodProperty != null)`
`79`		`- {`
`80`		`- periodProperty.Builder.ValueGenerated(GetValueGenerated(periodProperty));`
`81`		`- }`
	`78`	`+ periodProperty?.Builder.ValueGenerated(GetValueGenerated(periodProperty));`
`82`	`79`
`83`	`80`	`// cleanup the previous period property - its possible that it won't be deleted`
`84`	`81`	`// (e.g. when removing period with default name, while the property with that same name has been explicitly defined)`
`85`	`82`	`if (oldAnnotation?.Value is string oldPropertyName)`
`86`	`83`	`{`
`87`	`84`	`var oldPeriodProperty = entityTypeBuilder.Metadata.FindProperty(oldPropertyName);`
`88`		`- if (oldPeriodProperty != null)`
`89`		`- {`
`90`		`- oldPeriodProperty.Builder.ValueGenerated(GetValueGenerated(oldPeriodProperty));`
`91`		`- }`
	`85`	`+ oldPeriodProperty?.Builder.ValueGenerated(GetValueGenerated(oldPeriodProperty));`
`92`	`86`	`}`
`93`	`87`	`}`
`94`	`88`
Original file line number	Diff line number	Diff line change
`@@ -328,10 +328,7 @@ private Expression ExpandForeignKey(`
`328`	`328`	`&& entityReference.IncludePaths.TryGetValue(navigation, out var pendingIncludeTree))`
`329`	`329`	`{`
`330`	`330`	`var cachedEntityReference = UnwrapEntityReference(expansion);`
`331`		`- if (cachedEntityReference != null)`
`332`		`- {`
`333`		`- cachedEntityReference.IncludePaths.Merge(pendingIncludeTree);`
`334`		`- }`
	`331`	`+ cachedEntityReference?.IncludePaths.Merge(pendingIncludeTree);`
`335`	`332`	`}`
`336`	`333`
`337`	`334`	`return expansion;`