Remove inheritance from InternalEntityEntry (#24905)

I think this is a good change in of itself since the subtypes are even less useful now than when it was originally written, and it allows this type to be sealed. In addition, this is part of #13947, since the two subclasses will no longer cover the different ways of reading a property value.
dotnet · May 14, 2021 · 260f3ab · 260f3ab
1 parent d277e0c
commit 260f3ab
Show file tree

Hide file tree

Showing 20 changed files with 167 additions and 505 deletions.
diff --git a/.../Query/Internal/CosmosShapedQueryCompilingExpressionVisitor.ReadItemQueryingEnumerable.cs b/.../Query/Internal/CosmosShapedQueryCompilingExpressionVisitor.ReadItemQueryingEnumerable.cs
@@ -143,7 +143,7 @@ private bool TryGenerateIdFromKeys(IProperty idProperty, out object value)
                 var entityEntry = Activator.CreateInstance(_readItemExpression.EntityType.ClrType);
 
 #pragma warning disable EF1001 // Internal EF Core API usage.
-                var internalEntityEntry = new InternalEntityEntryFactory().Create(
+                var internalEntityEntry = new InternalEntityEntry(
                     _cosmosQueryContext.Context.GetDependencies().StateManager, _readItemExpression.EntityType, entityEntry);
 #pragma warning restore EF1001 // Internal EF Core API usage.
 

diff --git a/src/EFCore/ChangeTracking/Internal/IInternalEntityEntryFactory.cs b/src/EFCore/ChangeTracking/Internal/IInternalEntityEntryFactory.cs
diff --git a/src/EFCore/ChangeTracking/Internal/InternalClrEntityEntry.cs b/src/EFCore/ChangeTracking/Internal/InternalClrEntityEntry.cs