From 6bb1ed0f8ffa09a8fa0d4b3a57f0a001f04c93fa Mon Sep 17 00:00:00 2001 From: Axel Heer Date: Thu, 9 Jan 2025 20:19:54 +0100 Subject: [PATCH] Proper naming --- .../RewriteDbContextOptionsExtension.cs | 6 +++--- ...ntityQueryCompilerAdapter.cs => RewriteQueryCompiler.cs} | 6 +++--- ...ilerAdapterOptions.cs => RewriteQueryCompilerOptions.cs} | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) rename src/NeinLinq.EntityFrameworkCore/{EntityQueryCompilerAdapter.cs => RewriteQueryCompiler.cs} (89%) rename src/NeinLinq.EntityFrameworkCore/{EntityQueryCompilerAdapterOptions.cs => RewriteQueryCompilerOptions.cs} (53%) diff --git a/src/NeinLinq.EntityFrameworkCore/RewriteDbContextOptionsExtension.cs b/src/NeinLinq.EntityFrameworkCore/RewriteDbContextOptionsExtension.cs index a41b78c..94220a9 100644 --- a/src/NeinLinq.EntityFrameworkCore/RewriteDbContextOptionsExtension.cs +++ b/src/NeinLinq.EntityFrameworkCore/RewriteDbContextOptionsExtension.cs @@ -30,12 +30,12 @@ public void ApplyServices(IServiceCollection services) var descriptor = services[index]; if (descriptor.ServiceType != typeof(IQueryCompiler)) continue; - if (!typeof(EntityQueryCompilerAdapter).IsAssignableTo(descriptor.ImplementationType)) + if (!typeof(RewriteQueryCompiler).IsAssignableTo(descriptor.ImplementationType)) continue; services[index] = new ServiceDescriptor( descriptor.ServiceType, - typeof(EntityQueryCompilerAdapter), + typeof(RewriteQueryCompiler), descriptor.Lifetime ); @@ -46,7 +46,7 @@ public void ApplyServices(IServiceCollection services) if (!adapterAdded) throw new InvalidOperationException("Unable to create rewrite adapter for actual query compiler. Please configure your query provider first!"); - _ = services.AddSingleton(new EntityQueryCompilerAdapterOptions(rewriters)); + _ = services.AddSingleton(new RewriteQueryCompilerOptions(rewriters)); } public RewriteDbContextOptionsExtension WithRewriter(ExpressionVisitor rewriter) diff --git a/src/NeinLinq.EntityFrameworkCore/EntityQueryCompilerAdapter.cs b/src/NeinLinq.EntityFrameworkCore/RewriteQueryCompiler.cs similarity index 89% rename from src/NeinLinq.EntityFrameworkCore/EntityQueryCompilerAdapter.cs rename to src/NeinLinq.EntityFrameworkCore/RewriteQueryCompiler.cs index c2ea9e5..858fbb9 100644 --- a/src/NeinLinq.EntityFrameworkCore/EntityQueryCompilerAdapter.cs +++ b/src/NeinLinq.EntityFrameworkCore/RewriteQueryCompiler.cs @@ -10,11 +10,11 @@ namespace NeinLinq; #pragma warning disable EF1001 -internal sealed class EntityQueryCompilerAdapter : QueryCompiler +internal sealed class RewriteQueryCompiler : QueryCompiler { - private readonly EntityQueryCompilerAdapterOptions options; + private readonly RewriteQueryCompilerOptions options; - public EntityQueryCompilerAdapter(EntityQueryCompilerAdapterOptions options, + public RewriteQueryCompiler(RewriteQueryCompilerOptions options, IQueryContextFactory queryContextFactory, ICompiledQueryCache compiledQueryCache, ICompiledQueryCacheKeyGenerator compiledQueryCacheKeyGenerator, diff --git a/src/NeinLinq.EntityFrameworkCore/EntityQueryCompilerAdapterOptions.cs b/src/NeinLinq.EntityFrameworkCore/RewriteQueryCompilerOptions.cs similarity index 53% rename from src/NeinLinq.EntityFrameworkCore/EntityQueryCompilerAdapterOptions.cs rename to src/NeinLinq.EntityFrameworkCore/RewriteQueryCompilerOptions.cs index f22b3f0..058f8d2 100644 --- a/src/NeinLinq.EntityFrameworkCore/EntityQueryCompilerAdapterOptions.cs +++ b/src/NeinLinq.EntityFrameworkCore/RewriteQueryCompilerOptions.cs @@ -1,10 +1,10 @@ namespace NeinLinq; -internal sealed class EntityQueryCompilerAdapterOptions +internal sealed class RewriteQueryCompilerOptions { public IReadOnlyList Rewriters { get; } - public EntityQueryCompilerAdapterOptions(params ExpressionVisitor[] rewriters) + public RewriteQueryCompilerOptions(params ExpressionVisitor[] rewriters) { Rewriters = new List(rewriters); }