Review non-public TryXXX methods

Bart Koelman · Bart Koelman · commit 4f23fc25b651 · 2021-11-02T10:11:53.000+01:00
diff --git a/src/JsonApiDotNetCore/CollectionConverter.cs b/src/JsonApiDotNetCore/CollectionConverter.cs
@@ -92,7 +92,7 @@ public ICollection<IIdentifiable> ExtractResources(object? value)
         /// <summary>
         /// Returns the element type if the specified type is a generic collection, for example: IList{string} -> string or IList -> null.
         /// </summary>
-        public Type? TryGetCollectionElementType(Type? type)
+        public Type? FindCollectionElementType(Type? type)
         {
             if (type != null)
             {
diff --git a/src/JsonApiDotNetCore/Configuration/ResourceDescriptorAssemblyCache.cs b/src/JsonApiDotNetCore/Configuration/ResourceDescriptorAssemblyCache.cs
@@ -47,7 +47,7 @@ private IEnumerable<ResourceDescriptor> ScanForResourceDescriptors(Assembly asse
         {
             foreach (Type type in assembly.GetTypes())
             {
-                ResourceDescriptor? resourceDescriptor = _typeLocator.TryGetResourceDescriptor(type);
+                ResourceDescriptor? resourceDescriptor = _typeLocator.ResolveResourceDescriptor(type);
 
                 if (resourceDescriptor != null)
                 {
diff --git a/src/JsonApiDotNetCore/Configuration/ResourceGraphBuilder.cs b/src/JsonApiDotNetCore/Configuration/ResourceGraphBuilder.cs
@@ -131,7 +131,7 @@ public ResourceGraphBuilder Add(Type resourceClrType, Type? idClrType = null, st
             if (resourceClrType.IsOrImplementsInterface(typeof(IIdentifiable)))
             {
                 string effectivePublicName = publicName ?? FormatResourceName(resourceClrType);
-                Type? effectiveIdType = idClrType ?? _typeLocator.TryGetIdType(resourceClrType);
+                Type? effectiveIdType = idClrType ?? _typeLocator.LookupIdType(resourceClrType);
 
                 if (effectiveIdType == null)
                 {
diff --git a/src/JsonApiDotNetCore/Configuration/ServiceCollectionExtensions.cs b/src/JsonApiDotNetCore/Configuration/ServiceCollectionExtensions.cs
@@ -96,7 +96,7 @@ public static IServiceCollection AddResourceDefinition<TResourceDefinition>(this
         private static void RegisterForConstructedType(IServiceCollection services, Type implementationType, IEnumerable<Type> openGenericInterfaces)
         {
             bool seenCompatibleInterface = false;
-            ResourceDescriptor? resourceDescriptor = TryGetResourceTypeFromServiceImplementation(implementationType);
+            ResourceDescriptor? resourceDescriptor = ResolveResourceTypeFromServiceImplementation(implementationType);
 
             if (resourceDescriptor != null)
             {
@@ -118,14 +118,14 @@ private static void RegisterForConstructedType(IServiceCollection services, Type
             }
         }
 
-        private static ResourceDescriptor? TryGetResourceTypeFromServiceImplementation(Type? serviceType)
+        private static ResourceDescriptor? ResolveResourceTypeFromServiceImplementation(Type? serviceType)
         {
             if (serviceType != null)
             {
                 foreach (Type @interface in serviceType.GetInterfaces())
                 {
                     Type? firstGenericArgument = @interface.IsGenericType ? @interface.GenericTypeArguments.First() : null;
-                    ResourceDescriptor? resourceDescriptor = TypeLocator.TryGetResourceDescriptor(firstGenericArgument);
+                    ResourceDescriptor? resourceDescriptor = TypeLocator.ResolveResourceDescriptor(firstGenericArgument);
 
                     if (resourceDescriptor != null)
                     {
diff --git a/src/JsonApiDotNetCore/Configuration/TypeLocator.cs b/src/JsonApiDotNetCore/Configuration/TypeLocator.cs
@@ -14,7 +14,7 @@ internal sealed class TypeLocator
         /// <summary>
         /// Attempts to lookup the ID type of the specified resource type. Returns <c>null</c> if it does not implement <see cref="IIdentifiable{TId}" />.
         /// </summary>
-        public Type? TryGetIdType(Type? resourceClrType)
+        public Type? LookupIdType(Type? resourceClrType)
         {
             Type? identifiableInterface = resourceClrType?.GetInterfaces().FirstOrDefault(@interface =>
                 @interface.IsGenericType && @interface.GetGenericTypeDefinition() == typeof(IIdentifiable<>));
@@ -25,11 +25,11 @@ internal sealed class TypeLocator
         /// <summary>
         /// Attempts to get a descriptor for the specified resource type.
         /// </summary>
-        public ResourceDescriptor? TryGetResourceDescriptor(Type? type)
+        public ResourceDescriptor? ResolveResourceDescriptor(Type? type)
         {
             if (type != null && type.IsOrImplementsInterface(typeof(IIdentifiable)))
             {
-                Type? idType = TryGetIdType(type);
+                Type? idType = LookupIdType(type);
 
                 if (idType != null)
                 {
diff --git a/src/JsonApiDotNetCore/Errors/InvalidModelStateException.cs b/src/JsonApiDotNetCore/Errors/InvalidModelStateException.cs
@@ -341,7 +341,7 @@ private Type GetDeclaredCollectionElementType()
             {
                 if (ModelType != typeof(string))
                 {
-                    Type? elementType = CollectionConverter.TryGetCollectionElementType(ModelType);
+                    Type? elementType = CollectionConverter.FindCollectionElementType(ModelType);
 
                     if (elementType != null)
                     {
diff --git a/src/JsonApiDotNetCore/Middleware/JsonApiMiddleware.cs b/src/JsonApiDotNetCore/Middleware/JsonApiMiddleware.cs
@@ -55,7 +55,7 @@ public async Task InvokeAsync(HttpContext httpContext, IControllerResourceMappin
                 }
 
                 RouteValueDictionary routeValues = httpContext.GetRouteData().Values;
-                ResourceType? primaryResourceType = TryCreatePrimaryResourceType(httpContext, controllerResourceMapping);
+                ResourceType? primaryResourceType = CreatePrimaryResourceType(httpContext, controllerResourceMapping);
 
                 if (primaryResourceType != null)
                 {
@@ -121,7 +121,7 @@ private async Task<bool> ValidateIfMatchHeaderAsync(HttpContext httpContext, Jso
             return true;
         }
 
-        private static ResourceType? TryCreatePrimaryResourceType(HttpContext httpContext, IControllerResourceMapping controllerResourceMapping)
+        private static ResourceType? CreatePrimaryResourceType(HttpContext httpContext, IControllerResourceMapping controllerResourceMapping)
         {
             Endpoint? endpoint = httpContext.GetEndpoint();
             var controllerActionDescriptor = endpoint?.Metadata.GetMetadata<ControllerActionDescriptor>();
diff --git a/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/QueryClauseBuilder.cs b/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/QueryClauseBuilder.cs
@@ -25,7 +25,7 @@ public override Expression VisitCount(CountExpression expression, TArgument argu
         {
             Expression collectionExpression = Visit(expression.TargetCollection, argument);
 
-            Expression? propertyExpression = TryGetCollectionCount(collectionExpression);
+            Expression? propertyExpression = GetCollectionCount(collectionExpression);
 
             if (propertyExpression == null)
             {
@@ -35,7 +35,7 @@ public override Expression VisitCount(CountExpression expression, TArgument argu
             return propertyExpression;
         }
 
-        private static Expression? TryGetCollectionCount(Expression? collectionExpression)
+        private static Expression? GetCollectionCount(Expression? collectionExpression)
         {
             if (collectionExpression != null)
             {
diff --git a/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/SelectClauseBuilder.cs b/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/SelectClauseBuilder.cs
@@ -155,7 +155,7 @@ private MemberAssignment CreatePropertyAssignment(PropertySelector selector, Lam
         private Expression CreateAssignmentRightHandSideForLayer(QueryLayer layer, LambdaScope outerLambdaScope, MemberExpression propertyAccess,
             PropertyInfo selectorPropertyInfo, LambdaScopeFactory lambdaScopeFactory)
         {
-            Type? collectionElementType = CollectionConverter.TryGetCollectionElementType(selectorPropertyInfo.PropertyType);
+            Type? collectionElementType = CollectionConverter.FindCollectionElementType(selectorPropertyInfo.PropertyType);
             Type bodyElementType = collectionElementType ?? selectorPropertyInfo.PropertyType;
 
             if (collectionElementType != null)
diff --git a/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/WhereClauseBuilder.cs b/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/WhereClauseBuilder.cs
@@ -60,7 +60,7 @@ public override Expression VisitHas(HasExpression expression, Type? argument)
         {
             Expression property = Visit(expression.TargetCollection, argument);
 
-            Type? elementType = CollectionConverter.TryGetCollectionElementType(property.Type);
+            Type? elementType = CollectionConverter.FindCollectionElementType(property.Type);
 
             if (elementType == null)
             {
diff --git a/src/JsonApiDotNetCore/Repositories/EntityFrameworkCoreRepository.cs b/src/JsonApiDotNetCore/Repositories/EntityFrameworkCoreRepository.cs
@@ -296,7 +296,7 @@ protected void AssertIsNotClearingRequiredToOneRelationship(RelationshipAttribut
         {
             if (relationship is HasOneAttribute)
             {
-                INavigation? navigation = TryGetNavigation(relationship);
+                INavigation? navigation = GetNavigation(relationship);
                 bool isRelationshipRequired = navigation?.ForeignKey?.IsRequired ?? false;
 
                 bool isClearingRelationship = rightValue == null;
@@ -369,15 +369,15 @@ private NavigationEntry GetNavigationEntry(TResource resource, RelationshipAttri
 
         private bool RequiresLoadOfRelationshipForDeletion(RelationshipAttribute relationship)
         {
-            INavigation? navigation = TryGetNavigation(relationship);
+            INavigation? navigation = GetNavigation(relationship);
             bool isClearOfForeignKeyRequired = navigation?.ForeignKey.DeleteBehavior == DeleteBehavior.ClientSetNull;
 
             bool hasForeignKeyAtLeftSide = HasForeignKeyAtLeftSide(relationship, navigation);
 
             return isClearOfForeignKeyRequired && !hasForeignKeyAtLeftSide;
         }
 
-        private INavigation? TryGetNavigation(RelationshipAttribute relationship)
+        private INavigation? GetNavigation(RelationshipAttribute relationship)
         {
             IEntityType entityType = _dbContext.Model.FindEntityType(typeof(TResource));
             return entityType?.FindNavigation(relationship.Property.Name);
diff --git a/src/JsonApiDotNetCore/Resources/Annotations/HasManyAttribute.cs b/src/JsonApiDotNetCore/Resources/Annotations/HasManyAttribute.cs
@@ -37,7 +37,7 @@ private bool EvaluateIsManyToMany()
         {
             if (InverseNavigationProperty != null)
             {
-                Type? elementType = CollectionConverter.TryGetCollectionElementType(InverseNavigationProperty.PropertyType);
+                Type? elementType = CollectionConverter.FindCollectionElementType(InverseNavigationProperty.PropertyType);
                 return elementType != null;
             }
 
diff --git a/src/JsonApiDotNetCore/Resources/Annotations/HasOneAttribute.cs b/src/JsonApiDotNetCore/Resources/Annotations/HasOneAttribute.cs
@@ -36,7 +36,7 @@ private bool EvaluateIsOneToOne()
         {
             if (InverseNavigationProperty != null)
             {
-                Type? elementType = CollectionConverter.TryGetCollectionElementType(InverseNavigationProperty.PropertyType);
+                Type? elementType = CollectionConverter.FindCollectionElementType(InverseNavigationProperty.PropertyType);
                 return elementType == null;
             }
 
diff --git a/src/JsonApiDotNetCore/Serialization/JsonConverters/ResourceObjectConverter.cs b/src/JsonApiDotNetCore/Serialization/JsonConverters/ResourceObjectConverter.cs
@@ -48,7 +48,7 @@ public override ResourceObject Read(ref Utf8JsonReader reader, Type typeToConver
             {
                 // The 'attributes' element may occur before 'type', but we need to know the resource type before we can deserialize attributes
                 // into their corresponding CLR types.
-                Type = TryPeekType(ref reader)
+                Type = PeekType(ref reader)
             };
 
             ResourceType? resourceType = resourceObject.Type != null ? _resourceGraph.FindResourceType(resourceObject.Type) : null;
@@ -129,7 +129,7 @@ public override ResourceObject Read(ref Utf8JsonReader reader, Type typeToConver
             throw GetEndOfStreamError();
         }
 
-        private static string? TryPeekType(ref Utf8JsonReader reader)
+        private static string? PeekType(ref Utf8JsonReader reader)
         {
             // https://docs.microsoft.com/en-us/dotnet/standard/serialization/system-text-json-converters-how-to?pivots=dotnet-5-0#an-alternative-way-to-do-polymorphic-deserialization
             Utf8JsonReader readerClone = reader;
diff --git a/src/JsonApiDotNetCore/Services/JsonApiResourceService.cs b/src/JsonApiDotNetCore/Services/JsonApiResourceService.cs
@@ -196,7 +196,7 @@ public virtual async Task<TResource> GetAsync(TId id, CancellationToken cancella
                 if (!Equals(resourceFromRequest.Id, default(TId)))
                 {
                     TResource? existingResource =
-                        await TryGetPrimaryResourceByIdAsync(resourceFromRequest.Id, TopFieldSelection.OnlyIdAttribute, cancellationToken);
+                        await GetPrimaryResourceByIdOrDefaultAsync(resourceFromRequest.Id, TopFieldSelection.OnlyIdAttribute, cancellationToken);
 
                     if (existingResource != null)
                     {
@@ -462,13 +462,13 @@ public virtual async Task RemoveFromToManyRelationshipAsync(TId leftId, string r
 
         protected async Task<TResource> GetPrimaryResourceByIdAsync(TId id, TopFieldSelection fieldSelection, CancellationToken cancellationToken)
         {
-            TResource? primaryResource = await TryGetPrimaryResourceByIdAsync(id, fieldSelection, cancellationToken);
+            TResource? primaryResource = await GetPrimaryResourceByIdOrDefaultAsync(id, fieldSelection, cancellationToken);
             AssertPrimaryResourceExists(primaryResource);
 
             return primaryResource;
         }
 
-        private async Task<TResource?> TryGetPrimaryResourceByIdAsync(TId id, TopFieldSelection fieldSelection, CancellationToken cancellationToken)
+        private async Task<TResource?> GetPrimaryResourceByIdOrDefaultAsync(TId id, TopFieldSelection fieldSelection, CancellationToken cancellationToken)
         {
             AssertPrimaryResourceTypeInJsonApiRequestIsNotNull(_request.PrimaryResourceType);
 
diff --git a/test/UnitTests/Graph/TypeLocatorTests.cs b/test/UnitTests/Graph/TypeLocatorTests.cs
@@ -62,7 +62,7 @@ public void GetIdType_Correctly_Identifies_JsonApiResource()
             var typeLocator = new TypeLocator();
 
             // Act
-            Type? idType = typeLocator.TryGetIdType(type);
+            Type? idType = typeLocator.LookupIdType(type);
 
             // Assert
             idType.Should().Be(typeof(int));
@@ -77,22 +77,22 @@ public void GetIdType_Correctly_Identifies_NonJsonApiResource()
             var typeLocator = new TypeLocator();
 
             // Act
-            Type? idType = typeLocator.TryGetIdType(type);
+            Type? idType = typeLocator.LookupIdType(type);
 
             // Assert
             idType.Should().BeNull();
         }
 
         [Fact]
-        public void TryGetResourceDescriptor_Returns_Type_If_Type_Is_IIdentifiable()
+        public void ResolveResourceDescriptor_Returns_Type_If_Type_Is_IIdentifiable()
         {
             // Arrange
             Type resourceClrType = typeof(Model);
 
             var typeLocator = new TypeLocator();
 
             // Act
-            ResourceDescriptor? descriptor = typeLocator.TryGetResourceDescriptor(resourceClrType);
+            ResourceDescriptor? descriptor = typeLocator.ResolveResourceDescriptor(resourceClrType);
 
             // Assert
             descriptor.ShouldNotBeNull();
@@ -101,15 +101,15 @@ public void TryGetResourceDescriptor_Returns_Type_If_Type_Is_IIdentifiable()
         }
 
         [Fact]
-        public void TryGetResourceDescriptor_Returns_False_If_Type_Is_IIdentifiable()
+        public void ResolveResourceDescriptor_Returns_False_If_Type_Is_IIdentifiable()
         {
             // Arrange
             Type resourceClrType = typeof(string);
 
             var typeLocator = new TypeLocator();
 
             // Act
-            ResourceDescriptor? descriptor = typeLocator.TryGetResourceDescriptor(resourceClrType);
+            ResourceDescriptor? descriptor = typeLocator.ResolveResourceDescriptor(resourceClrType);
 
             // Assert
             descriptor.Should().BeNull();

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public ICollection<IIdentifiable> ExtractResources(object? value)`
`92`	`92`	`/// <summary>`
`93`	`93`	`/// Returns the element type if the specified type is a generic collection, for example: IList{string} -> string or IList -> null.`
`94`	`94`	`/// </summary>`
`95`		`- public Type? TryGetCollectionElementType(Type? type)`
	`95`	`+ public Type? FindCollectionElementType(Type? type)`
`96`	`96`	`{`
`97`	`97`	`if (type != null)`
`98`	`98`	`{`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ private IEnumerable<ResourceDescriptor> ScanForResourceDescriptors(Assembly asse`
`47`	`47`	`{`
`48`	`48`	`foreach (Type type in assembly.GetTypes())`
`49`	`49`	`{`
`50`		`- ResourceDescriptor? resourceDescriptor = _typeLocator.TryGetResourceDescriptor(type);`
	`50`	`+ ResourceDescriptor? resourceDescriptor = _typeLocator.ResolveResourceDescriptor(type);`
`51`	`51`
`52`	`52`	`if (resourceDescriptor != null)`
`53`	`53`	`{`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ public ResourceGraphBuilder Add(Type resourceClrType, Type? idClrType = null, st`
`131`	`131`	`if (resourceClrType.IsOrImplementsInterface(typeof(IIdentifiable)))`
`132`	`132`	`{`
`133`	`133`	`string effectivePublicName = publicName ?? FormatResourceName(resourceClrType);`
`134`		`- Type? effectiveIdType = idClrType ?? _typeLocator.TryGetIdType(resourceClrType);`
	`134`	`+ Type? effectiveIdType = idClrType ?? _typeLocator.LookupIdType(resourceClrType);`
`135`	`135`
`136`	`136`	`if (effectiveIdType == null)`
`137`	`137`	`{`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public static IServiceCollection AddResourceDefinition<TResourceDefinition>(this`
`96`	`96`	`private static void RegisterForConstructedType(IServiceCollection services, Type implementationType, IEnumerable<Type> openGenericInterfaces)`
`97`	`97`	`{`
`98`	`98`	`bool seenCompatibleInterface = false;`
`99`		`- ResourceDescriptor? resourceDescriptor = TryGetResourceTypeFromServiceImplementation(implementationType);`
	`99`	`+ ResourceDescriptor? resourceDescriptor = ResolveResourceTypeFromServiceImplementation(implementationType);`
`100`	`100`
`101`	`101`	`if (resourceDescriptor != null)`
`102`	`102`	`{`
`@@ -118,14 +118,14 @@ private static void RegisterForConstructedType(IServiceCollection services, Type`
`118`	`118`	`}`
`119`	`119`	`}`
`120`	`120`
`121`		`- private static ResourceDescriptor? TryGetResourceTypeFromServiceImplementation(Type? serviceType)`
	`121`	`+ private static ResourceDescriptor? ResolveResourceTypeFromServiceImplementation(Type? serviceType)`
`122`	`122`	`{`
`123`	`123`	`if (serviceType != null)`
`124`	`124`	`{`
`125`	`125`	`foreach (Type @interface in serviceType.GetInterfaces())`
`126`	`126`	`{`
`127`	`127`	`Type? firstGenericArgument = @interface.IsGenericType ? @interface.GenericTypeArguments.First() : null;`
`128`		`- ResourceDescriptor? resourceDescriptor = TypeLocator.TryGetResourceDescriptor(firstGenericArgument);`
	`128`	`+ ResourceDescriptor? resourceDescriptor = TypeLocator.ResolveResourceDescriptor(firstGenericArgument);`
`129`	`129`
`130`	`130`	`if (resourceDescriptor != null)`
`131`	`131`	`{`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ internal sealed class TypeLocator`
`14`	`14`	`/// <summary>`
`15`	`15`	`/// Attempts to lookup the ID type of the specified resource type. Returns <c>null</c> if it does not implement <see cref="IIdentifiable{TId}" />.`
`16`	`16`	`/// </summary>`
`17`		`- public Type? TryGetIdType(Type? resourceClrType)`
	`17`	`+ public Type? LookupIdType(Type? resourceClrType)`
`18`	`18`	`{`
`19`	`19`	`Type? identifiableInterface = resourceClrType?.GetInterfaces().FirstOrDefault(@interface =>`
`20`	`20`	`@interface.IsGenericType && @interface.GetGenericTypeDefinition() == typeof(IIdentifiable<>));`
`@@ -25,11 +25,11 @@ internal sealed class TypeLocator`
`25`	`25`	`/// <summary>`
`26`	`26`	`/// Attempts to get a descriptor for the specified resource type.`
`27`	`27`	`/// </summary>`
`28`		`- public ResourceDescriptor? TryGetResourceDescriptor(Type? type)`
	`28`	`+ public ResourceDescriptor? ResolveResourceDescriptor(Type? type)`
`29`	`29`	`{`
`30`	`30`	`if (type != null && type.IsOrImplementsInterface(typeof(IIdentifiable)))`
`31`	`31`	`{`
`32`		`- Type? idType = TryGetIdType(type);`
	`32`	`+ Type? idType = LookupIdType(type);`
`33`	`33`
`34`	`34`	`if (idType != null)`
`35`	`35`	`{`
Original file line number	Diff line number	Diff line change
`@@ -341,7 +341,7 @@ private Type GetDeclaredCollectionElementType()`
`341`	`341`	`{`
`342`	`342`	`if (ModelType != typeof(string))`
`343`	`343`	`{`
`344`		`- Type? elementType = CollectionConverter.TryGetCollectionElementType(ModelType);`
	`344`	`+ Type? elementType = CollectionConverter.FindCollectionElementType(ModelType);`
`345`	`345`
`346`	`346`	`if (elementType != null)`
`347`	`347`	`{`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public async Task InvokeAsync(HttpContext httpContext, IControllerResourceMappin`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`RouteValueDictionary routeValues = httpContext.GetRouteData().Values;`
`58`		`- ResourceType? primaryResourceType = TryCreatePrimaryResourceType(httpContext, controllerResourceMapping);`
	`58`	`+ ResourceType? primaryResourceType = CreatePrimaryResourceType(httpContext, controllerResourceMapping);`
`59`	`59`
`60`	`60`	`if (primaryResourceType != null)`
`61`	`61`	`{`
`@@ -121,7 +121,7 @@ private async Task<bool> ValidateIfMatchHeaderAsync(HttpContext httpContext, Jso`
`121`	`121`	`return true;`
`122`	`122`	`}`
`123`	`123`
`124`		`- private static ResourceType? TryCreatePrimaryResourceType(HttpContext httpContext, IControllerResourceMapping controllerResourceMapping)`
	`124`	`+ private static ResourceType? CreatePrimaryResourceType(HttpContext httpContext, IControllerResourceMapping controllerResourceMapping)`
`125`	`125`	`{`
`126`	`126`	`Endpoint? endpoint = httpContext.GetEndpoint();`
`127`	`127`	`var controllerActionDescriptor = endpoint?.Metadata.GetMetadata<ControllerActionDescriptor>();`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public override Expression VisitCount(CountExpression expression, TArgument argu`
`25`	`25`	`{`
`26`	`26`	`Expression collectionExpression = Visit(expression.TargetCollection, argument);`
`27`	`27`
`28`		`- Expression? propertyExpression = TryGetCollectionCount(collectionExpression);`
	`28`	`+ Expression? propertyExpression = GetCollectionCount(collectionExpression);`
`29`	`29`
`30`	`30`	`if (propertyExpression == null)`
`31`	`31`	`{`
`@@ -35,7 +35,7 @@ public override Expression VisitCount(CountExpression expression, TArgument argu`
`35`	`35`	`return propertyExpression;`
`36`	`36`	`}`
`37`	`37`
`38`		`- private static Expression? TryGetCollectionCount(Expression? collectionExpression)`
	`38`	`+ private static Expression? GetCollectionCount(Expression? collectionExpression)`
`39`	`39`	`{`
`40`	`40`	`if (collectionExpression != null)`
`41`	`41`	`{`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ private MemberAssignment CreatePropertyAssignment(PropertySelector selector, Lam`
`155`	`155`	`private Expression CreateAssignmentRightHandSideForLayer(QueryLayer layer, LambdaScope outerLambdaScope, MemberExpression propertyAccess,`
`156`	`156`	`PropertyInfo selectorPropertyInfo, LambdaScopeFactory lambdaScopeFactory)`
`157`	`157`	`{`
`158`		`- Type? collectionElementType = CollectionConverter.TryGetCollectionElementType(selectorPropertyInfo.PropertyType);`
	`158`	`+ Type? collectionElementType = CollectionConverter.FindCollectionElementType(selectorPropertyInfo.PropertyType);`
`159`	`159`	`Type bodyElementType = collectionElementType ?? selectorPropertyInfo.PropertyType;`
`160`	`160`
`161`	`161`	`if (collectionElementType != null)`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public override Expression VisitHas(HasExpression expression, Type? argument)`
`60`	`60`	`{`
`61`	`61`	`Expression property = Visit(expression.TargetCollection, argument);`
`62`	`62`
`63`		`- Type? elementType = CollectionConverter.TryGetCollectionElementType(property.Type);`
	`63`	`+ Type? elementType = CollectionConverter.FindCollectionElementType(property.Type);`
`64`	`64`
`65`	`65`	`if (elementType == null)`
`66`	`66`	`{`