Skip to content

add GenericQueryable.Abstractions #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iatsuta merged 1 commit into from
Feb 3, 2026
Merged

add GenericQueryable.Abstractions #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,19 @@
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="IvAt.CommonFramework" Version="2.0.4" />
<PackageVersion Include="IvAt.CommonFramework.DependencyInjection" Version="2.0.4" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.1" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.1" />
<PackageVersion Include="IvAt.CommonFramework" Version="2.1.4" />
<PackageVersion Include="IvAt.CommonFramework.DependencyInjection" Version="2.1.4" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.2" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.2" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.2" />
</ItemGroup>
<!-- Tests -->
<ItemGroup>
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageVersion Include="FluentValidation" Version="12.0.0" />
<PackageVersion Include="FluentAssertions" Version="8.8.0" />
<PackageVersion Include="NSubstitute" Version="5.3.0" />
<PackageVersion Include="xunit.v3" Version="3.2.1" />
<PackageVersion Include="xunit.v3" Version="3.2.2" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
0 src/GenericQueryable/Fetching/FetchPath.cs → ...ryable.Abstractions/Fetching/FetchPath.cs
View file
Open in desktop
File renamed without changes.
0 src/GenericQueryable/Fetching/FetchRule.cs → ...ryable.Abstractions/Fetching/FetchRule.cs
View file
Open in desktop
File renamed without changes.
0 ...enericQueryable/Fetching/IFetchService.cs → ...le.Abstractions/Fetching/IFetchService.cs
View file
Open in desktop
File renamed without changes.
0 ...cQueryable/Fetching/IPropertyFetchRule.cs → ...stractions/Fetching/IPropertyFetchRule.cs
View file
Open in desktop
File renamed without changes.
0 ...icQueryable/Fetching/PropertyFetchRule.cs → ...bstractions/Fetching/PropertyFetchRule.cs
View file
Open in desktop
File renamed without changes.
0 ...ricQueryable/Fetching/UntypedFetchRule.cs → ...Abstractions/Fetching/UntypedFetchRule.cs
View file
Open in desktop
File renamed without changes.
12 changes: 12 additions & 0 deletions src/GenericQueryable.Abstractions/GenericQueryable.Abstractions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<PackageId>IvAt.GenericQueryable.Abstractions</PackageId>
<RootNamespace>GenericQueryable</RootNamespace>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="IvAt.CommonFramework" />
</ItemGroup>

</Project>
0 ...icQueryable/GenericQueryableExtensions.cs → ...bstractions/GenericQueryableExtensions.cs
View file
Open in desktop
File renamed without changes.
0 ...ryable/GenericQueryableFetchExtensions.cs → ...ctions/GenericQueryableFetchExtensions.cs
View file
Open in desktop
File renamed without changes.
0 ...cQueryable/PropertyFetchRuleExtensions.cs → ...stractions/PropertyFetchRuleExtensions.cs
View file
Open in desktop
File renamed without changes.
0 ...ervices/AsyncEnumerableMethodExtractor.cs → ...ervices/AsyncEnumerableMethodExtractor.cs
View file
Open in desktop
File renamed without changes.
0 ...rvices/AsyncEnumerableMethodRedirector.cs → ...rvices/AsyncEnumerableMethodRedirector.cs
View file
Open in desktop
File renamed without changes.
0 ...able/Services/GenericQueryableExecutor.cs → ...ions/Services/GenericQueryableExecutor.cs
View file
Open in desktop
File renamed without changes.
0 ...eryable/Services/IGenericQueryProvider.cs → ...actions/Services/IGenericQueryProvider.cs
View file
Open in desktop
File renamed without changes.
0 ...ble/Services/IGenericQueryableExecutor.cs → ...ons/Services/IGenericQueryableExecutor.cs
View file
Open in desktop
File renamed without changes.
0 ...icQueryable/Services/IMethodRedirector.cs → ...bstractions/Services/IMethodRedirector.cs
View file
Open in desktop
File renamed without changes.
0 ...ryable/Services/ITargetMethodExtractor.cs → ...ctions/Services/ITargetMethodExtractor.cs
View file
Open in desktop
File renamed without changes.
0 ...cQueryable/Fetching/IgnoreFetchService.cs → ...stractions/Services/IgnoreFetchService.cs
View file
Open in desktop
File renamed without changes.
0 ...ricQueryable/Services/MethodRedirector.cs → ...Abstractions/Services/MethodRedirector.cs
View file
Open in desktop
File renamed without changes.
0 ...ueryable/Services/SyncMethodRedirector.cs → ...ractions/Services/SyncMethodRedirector.cs
View file
Open in desktop
File renamed without changes.
0 ...ble/Services/SyncTargetMethodExtractor.cs → ...ons/Services/SyncTargetMethodExtractor.cs
View file
Open in desktop
File renamed without changes.
0 ...eryable/Services/TargetMethodExtractor.cs → ...actions/Services/TargetMethodExtractor.cs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/GenericQueryable.UnitTests/GenericQueryable.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\GenericQueryable\GenericQueryable.csproj" />
<ProjectReference Include="..\GenericQueryable.Abstractions\GenericQueryable.Abstractions.csproj" />
</ItemGroup>


Expand Down
1 change: 1 addition & 0 deletions src/GenericQueryable.slnx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<Project Path="GenericQueryable.IntegrationTests/GenericQueryable.IntegrationTests.csproj" />
<Project Path="GenericQueryable.UnitTests/GenericQueryable.UnitTests.csproj" />
<Project Path="GenericQueryable/GenericQueryable.csproj" />
<Project Path="GenericQueryable.Abstractions/GenericQueryable.Abstractions.csproj" />
<Project Path="GenericQueryable.EntityFramework/GenericQueryable.EntityFramework.csproj" />

</Solution>
42 changes: 32 additions & 10 deletions src/GenericQueryable/DependencyInjection/GenericQueryableSetup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,51 @@
using GenericQueryable.Fetching;
using CommonFramework.DependencyInjection;

using GenericQueryable.Fetching;
using GenericQueryable.Services;

using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;

namespace GenericQueryable.DependencyInjection;

public class GenericQueryableSetup : IGenericQueryableSetup
{
private Type targetMethodExtractorType = typeof(SyncTargetMethodExtractor);

private Type fetchServiceType = typeof(IgnoreFetchService);

private readonly List<Type> fetchRuleExpanderTypeList = [typeof(FetchRuleHeaderExpander)];
private Type targetMethodExtractorType = typeof(SyncTargetMethodExtractor);

private readonly List<Type> fetchRuleExpanderTypeList = [];

private readonly List<FetchRuleHeaderInfo> fetchRuleHeaderInfoList = new();
private readonly List<FetchRuleHeaderInfo> fetchRuleHeaderInfoList = [];

public void Initialize(IServiceCollection services)
{
services.AddSingleton<IGenericQueryableExecutor, GenericQueryableExecutor>();
services.AddSingleton<IMethodRedirector, MethodRedirector>();
if (!services.AlreadyInitialized<IFetchRuleExpander>())
{
services.TryAddSingleton<IGenericQueryableExecutor, GenericQueryableExecutor>();
services.TryAddSingleton<IMethodRedirector, MethodRedirector>();

services.AddSingleton<IFetchRuleExpander, FetchRuleHeaderExpander>();
services.AddKeyedSingleton<IFetchRuleExpander, RootFetchRuleExpander>(RootFetchRuleExpander.Key);
}

services.AddSingleton(typeof(IFetchService), this.fetchServiceType);
services.AddSingleton(typeof(ITargetMethodExtractor), this.targetMethodExtractorType);
if (services.AlreadyInitialized<IFetchService, IgnoreFetchService>())
{
services.ReplaceSingleton(typeof(IFetchService), this.fetchServiceType);
}
else
{
services.AddSingleton(typeof(IFetchService), this.fetchServiceType);
}

services.AddKeyedSingleton<IFetchRuleExpander, RootFetchRuleExpander>(RootFetchRuleExpander.Key);
if (services.AlreadyInitialized<ITargetMethodExtractor, SyncTargetMethodExtractor>())
{
services.ReplaceSingleton(typeof(ITargetMethodExtractor), this.targetMethodExtractorType);
}
else
{
services.AddSingleton(typeof(ITargetMethodExtractor), this.targetMethodExtractorType);
}

foreach (var fetchRuleExpanderType in this.fetchRuleExpanderTypeList)
{
Expand Down
5 changes: 4 additions & 1 deletion src/GenericQueryable/GenericQueryable.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="IvAt.CommonFramework" />
<PackageReference Include="IvAt.CommonFramework.DependencyInjection" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\GenericQueryable.Abstractions\GenericQueryable.Abstractions.csproj" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/__SolutionItems/CommonAssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[assembly: AssemblyProduct("GenericQueryable")]
[assembly: AssemblyCompany("IvAt")]

[assembly: AssemblyVersion("2.0.6.0")]
[assembly: AssemblyVersion("2.1.4.0")]
[assembly: AssemblyInformationalVersion("changes at build")]

#if DEBUG
Expand Down
Loading