Skip to content

Update master with dev-v4 #591

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
merged 68 commits into from
Oct 30, 2019
Merged

Update master with dev-v4 #591

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
446cba4
Feat/context decoupling (#557)
maurei Sep 27, 2019
343912e
Feat/serializer context decoupling (#558)
maurei Oct 10, 2019
6204a16
chore: remove example projects
maurei Oct 10, 2019
54ff111
chore: remove bulk related code
maurei Oct 10, 2019
e4a4d9c
chore: remove bulk related tests
maurei Oct 10, 2019
3b5a12c
chore: remove logic related to ER splitting
maurei Oct 10, 2019
4c321fb
chore: remove split test project
maurei Oct 10, 2019
40c9203
chore: update other test projects to pass again
maurei Oct 10, 2019
622875a
chore: fix typo
maurei Oct 10, 2019
d7c6353
Added value types support to the filters isnull & isnotnull. (#549) (…
maurei Oct 10, 2019
e9980c2
fix: missing reference'
maurei Oct 10, 2019
82766b5
chore: fix spacing
maurei Oct 10, 2019
2790843
Merge pull request #571 from json-api-dotnet/chore/remove-bulk-and-split
wisepotato Oct 10, 2019
54942de
feat: draft of reflectively retrieving all query parameters
maurei Oct 10, 2019
0180c5d
Merge branch 'dev-v4' into feat/562
maurei Oct 10, 2019
44eb2c4
chore: scaffolded required query parameter service
maurei Oct 10, 2019
a33fdac
chore: migrate parsing logic sparsefields
maurei Oct 10, 2019
32b3c64
chore: reorganising test models in unit test project
maurei Oct 10, 2019
b9c03b0
tests: add includeservicetests
maurei Oct 10, 2019
9e6b004
chore: migrate parsing logic of filter to filter service
maurei Oct 10, 2019
3812189
chore: prefix private variables underscore in editorconfig
maurei Oct 11, 2019
72a289a
feat: common query parameter base service
maurei Oct 14, 2019
e27d56d
feat: interfaces of query parameter services
maurei Oct 14, 2019
90ab4cf
feat: sort service and filter service
maurei Oct 14, 2019
40cd129
feat: wired up filter and sort service with refactored data and repo …
maurei Oct 14, 2019
5925a29
feat: new omit default and null value services, wired them up in seri…
maurei Oct 14, 2019
bd24e04
feat: refactored remaining query services, introduced new queryparser…
maurei Oct 14, 2019
eec6de4
feat: wired up new query parser in action filter, slimmed down curren…
maurei Oct 14, 2019
0e74d79
chores: various test fixes, minor fixes
maurei Oct 14, 2019
db7157b
chores: various test fixes, minor fixes
maurei Oct 14, 2019
b88d8e7
chore: add more unit tests
maurei Oct 15, 2019
7f59641
docs: query parameters wiki
maurei Oct 15, 2019
73221db
fix: typo
maurei Oct 15, 2019
f78a188
chore: rename, update wiki
maurei Oct 15, 2019
d1af7cc
chore: various minor fixes, PR self review
maurei Oct 15, 2019
8d90ac9
Merge pull request #574 from json-api-dotnet/feat/queryparams
wisepotato Oct 15, 2019
ee7b2c8
feat: added new overload in query controllers (#580)
maurei Oct 17, 2019
4c067db
Cleaning repository of remaining business logic (#579)
maurei Oct 17, 2019
a94f318
Allow for multiple naming conventions (camelCase vs kebab-case) (#581)
maurei Oct 17, 2019
b02445c
fix: #583
maurei Oct 17, 2019
f5d0e8f
feat: throw error on deeply nested selections
maurei Oct 18, 2019
b8e628d
docs: add extra comment
maurei Oct 22, 2019
b24bb60
chore: processed Wisepotatos review
maurei Oct 22, 2019
928ac1e
Merge pull request #584 from json-api-dotnet/fix/sparse-field-navigation
wisepotato Oct 22, 2019
d6c403c
Separation of concerns ResourceGraph (#586)
maurei Oct 22, 2019
811f8ee
Update variable / class naming conventions (#589)
maurei Oct 22, 2019
97d94d2
chore: merge master into dev-v4
maurei Oct 23, 2019
34cffeb
Fix DiscoveryTests and NoEntityFrameworkExample project/tests (#590)
maurei Oct 23, 2019
a2331cb
Simplify DefaultResourceService constructor (#592)
maurei Oct 23, 2019
0a330cb
fix: fix build.sh
maurei Oct 23, 2019
76771d9
fix: appveyor build
maurei Oct 23, 2019
6c83bd8
fix: hotfix constructor ServiceDiscoveryFacadeTests
maurei Oct 23, 2019
b6fccd3
upgrade to .net core 2.1
wisepotato Oct 23, 2019
8a26a2d
.NET core 2.1 -> 2.2 (#594)
wisepotato Oct 23, 2019
f0a0625
chore: rm whitespace
maurei Oct 24, 2019
1be2236
Merge branch 'dev-v4' of https://github.com/json-api-dotnet/JsonApiDo…
maurei Oct 24, 2019
5281350
fix: public setters to allow testing
maurei Oct 24, 2019
c885de2
.NET Core 2.2 -> 3.0 (#597)
wisepotato Oct 29, 2019
d4de3c4
chore: update travis.yml
maurei Oct 29, 2019
504bf20
chore: retry travis.yml
maurei Oct 29, 2019
b3635b2
chore: retry .travis.yml
maurei Oct 29, 2019
40218ce
chore: appveyor.yml
maurei Oct 29, 2019
0bf496b
fix: CI builds
maurei Oct 29, 2019
58253a3
chore: attempt to fix travis.yml
maurei Oct 29, 2019
8ab07de
chore: spacing
wisepotato Oct 30, 2019
b28dc48
chore: postgres version bump
wisepotato Oct 30, 2019
966e606
chore: fix readme + downgrade postgres
wisepotato Oct 30, 2019
6412284
chore: revert
wisepotato Oct 30, 2019
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 0 additions & 60 deletions JsonApiDotnetCore.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NoEntityFrameworkExample",
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReportsExample", "src\Examples\ReportsExample\ReportsExample.csproj", "{1CC0831C-ED1D-442E-8421-331D50BD41F1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OperationsExample", "src\Examples\OperationsExample\OperationsExample.csproj", "{3AB43764-C57A-4B75-8C03-C671D3925BF3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceEntitySeparationExample", "src\Examples\ResourceEntitySeparationExample\ResourceEntitySeparationExample.csproj", "{623792C0-5B7D-4D7D-A276-73F908FD4C34}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JsonApiDotNetCoreExampleTests", "test\JsonApiDotNetCoreExampleTests\JsonApiDotNetCoreExampleTests.csproj", "{CAF331F8-9255-4D72-A1A8-A54141E99F1E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NoEntityFrameworkTests", "test\NoEntityFrameworkTests\NoEntityFrameworkTests.csproj", "{4F15A8F8-5BC6-45A1-BC51-03F921B726A4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "test\UnitTests\UnitTests.csproj", "{8788FF65-C2B6-40B2-A3A0-1E3D91C02664}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OperationsExampleTests", "test\OperationsExampleTests\OperationsExampleTests.csproj", "{65BF5960-3D9B-4230-99F4-A12CAA130792}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceEntitySeparationExampleTests", "test\ResourceEntitySeparationExampleTests\ResourceEntitySeparationExampleTests.csproj", "{778C4EB9-BD65-4C0F-9230-B5CB1D72186A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscoveryTests", "test\DiscoveryTests\DiscoveryTests.csproj", "{03032A2F-664D-4DD8-A82F-AD8A482EDD85}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GettingStarted", "src\Examples\GettingStarted\GettingStarted.csproj", "{92BFF50F-BF96-43AD-AB86-A8B861C32412}"
Expand Down Expand Up @@ -99,30 +91,6 @@ Global
{1CC0831C-ED1D-442E-8421-331D50BD41F1}.Release|x64.Build.0 = Release|Any CPU
{1CC0831C-ED1D-442E-8421-331D50BD41F1}.Release|x86.ActiveCfg = Release|Any CPU
{1CC0831C-ED1D-442E-8421-331D50BD41F1}.Release|x86.Build.0 = Release|Any CPU
{3AB43764-C57A-4B75-8C03-C671D3925BF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3AB43764-C57A-4B75-8C03-C671D3925BF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3AB43764-C57A-4B75-8C03-C671D3925BF3}.Debug|x64.ActiveCfg = Debug|Any CPU
{3AB43764-C57A-4B75-8C03-C671D3925BF3}.Debug|x64.Build.0 = Debug|Any CPU
{3AB43764-C57A-4B75-8C03-C671D3925BF3}.Debug|x86.ActiveCfg = Debug|Any CPU
{3AB43764-C57A-4B75-8C03-C671D3925BF3}.Debug|x86.Build.0 = Debug|Any CPU
{3AB43764-C57A-4B75-8C03-C671D3925BF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3AB43764-C57A-4B75-8C03-C671D3925BF3}.Release|Any CPU.Build.0 = Release|Any CPU
{3AB43764-C57A-4B75-8C03-C671D3925BF3}.Release|x64.ActiveCfg = Release|Any CPU
{3AB43764-C57A-4B75-8C03-C671D3925BF3}.Release|x64.Build.0 = Release|Any CPU
{3AB43764-C57A-4B75-8C03-C671D3925BF3}.Release|x86.ActiveCfg = Release|Any CPU
{3AB43764-C57A-4B75-8C03-C671D3925BF3}.Release|x86.Build.0 = Release|Any CPU
{623792C0-5B7D-4D7D-A276-73F908FD4C34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{623792C0-5B7D-4D7D-A276-73F908FD4C34}.Debug|Any CPU.Build.0 = Debug|Any CPU
{623792C0-5B7D-4D7D-A276-73F908FD4C34}.Debug|x64.ActiveCfg = Debug|Any CPU
{623792C0-5B7D-4D7D-A276-73F908FD4C34}.Debug|x64.Build.0 = Debug|Any CPU
{623792C0-5B7D-4D7D-A276-73F908FD4C34}.Debug|x86.ActiveCfg = Debug|Any CPU
{623792C0-5B7D-4D7D-A276-73F908FD4C34}.Debug|x86.Build.0 = Debug|Any CPU
{623792C0-5B7D-4D7D-A276-73F908FD4C34}.Release|Any CPU.ActiveCfg = Release|Any CPU
{623792C0-5B7D-4D7D-A276-73F908FD4C34}.Release|Any CPU.Build.0 = Release|Any CPU
{623792C0-5B7D-4D7D-A276-73F908FD4C34}.Release|x64.ActiveCfg = Release|Any CPU
{623792C0-5B7D-4D7D-A276-73F908FD4C34}.Release|x64.Build.0 = Release|Any CPU
{623792C0-5B7D-4D7D-A276-73F908FD4C34}.Release|x86.ActiveCfg = Release|Any CPU
{623792C0-5B7D-4D7D-A276-73F908FD4C34}.Release|x86.Build.0 = Release|Any CPU
{CAF331F8-9255-4D72-A1A8-A54141E99F1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CAF331F8-9255-4D72-A1A8-A54141E99F1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CAF331F8-9255-4D72-A1A8-A54141E99F1E}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -155,30 +123,6 @@ Global
{8788FF65-C2B6-40B2-A3A0-1E3D91C02664}.Release|x64.Build.0 = Release|Any CPU
{8788FF65-C2B6-40B2-A3A0-1E3D91C02664}.Release|x86.ActiveCfg = Release|Any CPU
{8788FF65-C2B6-40B2-A3A0-1E3D91C02664}.Release|x86.Build.0 = Release|Any CPU
{65BF5960-3D9B-4230-99F4-A12CAA130792}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{65BF5960-3D9B-4230-99F4-A12CAA130792}.Debug|Any CPU.Build.0 = Debug|Any CPU
{65BF5960-3D9B-4230-99F4-A12CAA130792}.Debug|x64.ActiveCfg = Debug|Any CPU
{65BF5960-3D9B-4230-99F4-A12CAA130792}.Debug|x64.Build.0 = Debug|Any CPU
{65BF5960-3D9B-4230-99F4-A12CAA130792}.Debug|x86.ActiveCfg = Debug|Any CPU
{65BF5960-3D9B-4230-99F4-A12CAA130792}.Debug|x86.Build.0 = Debug|Any CPU
{65BF5960-3D9B-4230-99F4-A12CAA130792}.Release|Any CPU.ActiveCfg = Release|Any CPU
{65BF5960-3D9B-4230-99F4-A12CAA130792}.Release|Any CPU.Build.0 = Release|Any CPU
{65BF5960-3D9B-4230-99F4-A12CAA130792}.Release|x64.ActiveCfg = Release|Any CPU
{65BF5960-3D9B-4230-99F4-A12CAA130792}.Release|x64.Build.0 = Release|Any CPU
{65BF5960-3D9B-4230-99F4-A12CAA130792}.Release|x86.ActiveCfg = Release|Any CPU
{65BF5960-3D9B-4230-99F4-A12CAA130792}.Release|x86.Build.0 = Release|Any CPU
{778C4EB9-BD65-4C0F-9230-B5CB1D72186A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{778C4EB9-BD65-4C0F-9230-B5CB1D72186A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{778C4EB9-BD65-4C0F-9230-B5CB1D72186A}.Debug|x64.ActiveCfg = Debug|Any CPU
{778C4EB9-BD65-4C0F-9230-B5CB1D72186A}.Debug|x64.Build.0 = Debug|Any CPU
{778C4EB9-BD65-4C0F-9230-B5CB1D72186A}.Debug|x86.ActiveCfg = Debug|Any CPU
{778C4EB9-BD65-4C0F-9230-B5CB1D72186A}.Debug|x86.Build.0 = Debug|Any CPU
{778C4EB9-BD65-4C0F-9230-B5CB1D72186A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{778C4EB9-BD65-4C0F-9230-B5CB1D72186A}.Release|Any CPU.Build.0 = Release|Any CPU
{778C4EB9-BD65-4C0F-9230-B5CB1D72186A}.Release|x64.ActiveCfg = Release|Any CPU
{778C4EB9-BD65-4C0F-9230-B5CB1D72186A}.Release|x64.Build.0 = Release|Any CPU
{778C4EB9-BD65-4C0F-9230-B5CB1D72186A}.Release|x86.ActiveCfg = Release|Any CPU
{778C4EB9-BD65-4C0F-9230-B5CB1D72186A}.Release|x86.Build.0 = Release|Any CPU
{03032A2F-664D-4DD8-A82F-AD8A482EDD85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{03032A2F-664D-4DD8-A82F-AD8A482EDD85}.Debug|Any CPU.Build.0 = Debug|Any CPU
{03032A2F-664D-4DD8-A82F-AD8A482EDD85}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -225,13 +169,9 @@ Global
{27FA7CD3-8DCD-4104-9AB4-B2D927F421B5} = {026FBC6C-AF76-4568-9B87-EC73457899FD}
{99BAF03C-362B-41FA-9FFF-67F697EFC28C} = {026FBC6C-AF76-4568-9B87-EC73457899FD}
{1CC0831C-ED1D-442E-8421-331D50BD41F1} = {026FBC6C-AF76-4568-9B87-EC73457899FD}
{3AB43764-C57A-4B75-8C03-C671D3925BF3} = {026FBC6C-AF76-4568-9B87-EC73457899FD}
{623792C0-5B7D-4D7D-A276-73F908FD4C34} = {026FBC6C-AF76-4568-9B87-EC73457899FD}
{CAF331F8-9255-4D72-A1A8-A54141E99F1E} = {24B15015-62E5-42E1-9BA0-ECE6BE7AA15F}
{4F15A8F8-5BC6-45A1-BC51-03F921B726A4} = {24B15015-62E5-42E1-9BA0-ECE6BE7AA15F}
{8788FF65-C2B6-40B2-A3A0-1E3D91C02664} = {24B15015-62E5-42E1-9BA0-ECE6BE7AA15F}
{65BF5960-3D9B-4230-99F4-A12CAA130792} = {24B15015-62E5-42E1-9BA0-ECE6BE7AA15F}
{778C4EB9-BD65-4C0F-9230-B5CB1D72186A} = {24B15015-62E5-42E1-9BA0-ECE6BE7AA15F}
{03032A2F-664D-4DD8-A82F-AD8A482EDD85} = {24B15015-62E5-42E1-9BA0-ECE6BE7AA15F}
{DF0FCFB2-CB12-44BA-BBB5-1BE0BCFCD14C} = {076E1AE4-FD25-4684-B826-CAAE37FEA0AA}
EndGlobalSection
Expand Down
7 changes: 6 additions & 1 deletion src/Examples/JsonApiDotNetCoreExample/Services/CustomArticleService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,12 @@ namespace JsonApiDotNetCoreExample.Services
{
public class CustomArticleService : EntityResourceService<Article>
{
public CustomArticleService(IEntityRepository<Article, int> repository, IJsonApiOptions options, ITargetedFields updatedFields, ICurrentRequest currentRequest, IIncludeService includeService, ISparseFieldsService sparseFieldsService, IPageQueryService pageManager, IResourceGraph resourceGraph, IResourceHookExecutor hookExecutor = null, IResourceMapper mapper = null, ILoggerFactory loggerFactory = null) : base(repository, options, updatedFields, currentRequest, includeService, sparseFieldsService, pageManager, resourceGraph, hookExecutor, mapper, loggerFactory)
public CustomArticleService(IEntityRepository<Article, int> repository, IJsonApiOptions options,
ITargetedFields updatedFields, ICurrentRequest currentRequest,
IIncludeService includeService, ISparseFieldsService sparseFieldsService,
IPageQueryService pageManager, IResourceGraph resourceGraph,
IResourceHookExecutor hookExecutor = null, ILoggerFactory loggerFactory = null)
: base(repository, options, updatedFields, currentRequest, includeService, sparseFieldsService, pageManager, resourceGraph, hookExecutor, loggerFactory)
{
}

Expand Down
236 changes: 0 additions & 236 deletions src/Examples/OperationsExample/.gitignore
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions src/Examples/OperationsExample/Controllers/OperationsController.cs
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions src/Examples/OperationsExample/OperationsExample.csproj
View file
Open in desktop

This file was deleted.

Loading