chore: fix NoEntityFrameworkExample project

Author: maurei

src/Examples/GettingStarted/Controllers/ArticlesController.cs

@@ -1,7 +1,6 @@
 using GettingStarted.Models;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Internal.Contracts;
 using JsonApiDotNetCore.Services;
 
 namespace GettingStarted

src/Examples/GettingStarted/Controllers/PeopleController.cs

@@ -1,7 +1,6 @@
 using GettingStarted.Models;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Internal.Contracts;
 using JsonApiDotNetCore.Services;
 
 namespace GettingStarted

src/Examples/GettingStarted/Data/SampleDbContext.cs

@@ -6,10 +6,7 @@ namespace GettingStarted
 {
     public class SampleDbContext : DbContext
     {
-        public SampleDbContext(DbContextOptions<SampleDbContext> options)
-        : base(options)
-        { }
-
+        public SampleDbContext(DbContextOptions<SampleDbContext> options) : base(options) { }
         public DbSet<Article> Articles { get; set; }
         public DbSet<Person> People { get; set; }
         public DbSet<Model> Models { get; set; }

src/Examples/GettingStarted/Models/Person.cs

@@ -7,7 +7,6 @@ public class Person : Identifiable
     {
         [Attr] 
         public string Name { get; set; }
-
         [HasMany] 
         public List<Article> Articles { get; set; }
     }

src/Examples/GettingStarted/ResourceDefinitionExample/ModelDefinition.cs

@@ -6,16 +6,14 @@ namespace GettingStarted.ResourceDefinitionExample
 {
     public class ModelDefinition : ResourceDefinition<Model>
     {
-        public ModelDefinition(IResourceContextProvider provider) : base(provider)
+        public ModelDefinition(IResourceGraph resourceGraph) : base(resourceGraph)
         {
+            // this allows POST / PATCH requests to set the value of a
+            // property, but we don't include this value in the response
+            // this might be used if the incoming value gets hashed or
+            // encrypted prior to being persisted and this value should
+            // never be sent back to the client
+            HideFields(model => model.DontExpose);
         }
-
-        // this allows POST / PATCH requests to set the value of a
-        // property, but we don't include this value in the response
-        // this might be used if the incoming value gets hashed or
-        // encrypted prior to being persisted and this value should
-        // never be sent back to the client
-        protected override List<AttrAttribute> OutputAttrs()
-            => Remove(model => model.DontExpose);
     }
 }

src/Examples/GettingStarted/ResourceDefinitionExample/ModelsController.cs

@@ -1,6 +1,5 @@
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Internal.Contracts;
 using JsonApiDotNetCore.Services;
 
 namespace GettingStarted.ResourceDefinitionExample

src/Examples/GettingStarted/Startup.cs

@@ -1,10 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.EntityFrameworkCore;
 using JsonApiDotNetCore.Extensions;
@@ -23,7 +18,7 @@ public void ConfigureServices(IServiceCollection services)
             var mvcBuilder = services.AddMvcCore();
             services.AddJsonApi(
                 options => options.Namespace = "api", 
-                discover => discover.AddCurrentAssembly(), mvcBuilder);
+                discover => discover.AddCurrentAssembly(), mvcBuilder: mvcBuilder);
         }
 
         public void Configure(IApplicationBuilder app, IHostingEnvironment env, SampleDbContext context)

src/JsonApiDotNetCore/Builders/JsonApiApplicationBuilder.cs

@@ -154,7 +154,7 @@ public void ConfigureServices()
             _services.AddScoped<IScopedServiceProvider, RequestScopedServiceProvider>();
             _services.AddScoped<IJsonApiWriter, JsonApiWriter>();
             _services.AddScoped<IJsonApiReader, JsonApiReader>();
-            _services.AddScoped<IGenericServiceFactory, genericServiceFactory>();
+            _services.AddScoped<IGenericServiceFactory, GenericServiceFactory>();
             _services.AddScoped(typeof(HasManyThroughUpdateHelper<>));
             _services.AddScoped<IQueryParameterDiscovery, QueryParameterDiscovery>();
             _services.AddScoped<ITargetedFields, TargetedFields>();

src/JsonApiDotNetCore/Data/DefaultResourceRepository.cs

@@ -423,18 +423,18 @@ public class DefaultResourceRepository<TResource> : DefaultResourceRepository<TR
     {
         public DefaultResourceRepository(ITargetedFields targetedFields,
                                        IDbContextResolver contextResolver,
-                                       IResourceGraph contextEntityProvider,
+                                       IResourceGraph resourceContextProvider,
                                        IGenericServiceFactory genericServiceFactory)
-            : base(targetedFields, contextResolver, contextEntityProvider, genericServiceFactory)
+            : base(targetedFields, contextResolver, resourceContextProvider, genericServiceFactory)
         {
         }
 
         public DefaultResourceRepository(ITargetedFields targetedFields,
                                        IDbContextResolver contextResolver,
-                                       IResourceGraph contextEntityProvider,
+                                       IResourceGraph resourceContextProvider,
                                        IGenericServiceFactory genericServiceFactory,
                                        ILoggerFactory loggerFactory = null)
-            : base(targetedFields, contextResolver, contextEntityProvider, genericServiceFactory, loggerFactory)
+            : base(targetedFields, contextResolver, resourceContextProvider, genericServiceFactory, loggerFactory)
         {
         }
     }

src/JsonApiDotNetCore/Hooks/Execution/HookExecutorHelper.cs

@@ -19,12 +19,12 @@ internal class HookExecutorHelper : IHookExecutorHelper
     {
         private readonly IdentifiableComparer _comparer = new IdentifiableComparer();
         private readonly IJsonApiOptions _options;
-        protected readonly IGenericProcessorFactory _genericProcessorFactory;
+        protected readonly IGenericServiceFactory _genericProcessorFactory;
         protected readonly Dictionary<RightType, IResourceHookContainer> _hookContainers;
         protected readonly Dictionary<RightType, IHooksDiscovery> _hookDiscoveries;
         protected readonly List<ResourceHook> _targetedHooksForRelatedEntities;
 
-        public HookExecutorHelper(IGenericProcessorFactory genericProcessorFactory,
+        public HookExecutorHelper(IGenericServiceFactory genericProcessorFactory,
                                   IJsonApiOptions options)
         {
             _options = options;
@@ -43,7 +43,7 @@ public IResourceHookContainer GetResourceHookContainer(RightType rightType, Reso
             /// so we need not even bother.
             if (!_hookContainers.TryGetValue(rightType, out IResourceHookContainer container))
             {
-                container = (_genericProcessorFactory.GetProcessor<IResourceHookContainer>(typeof(ResourceDefinition<>), rightType));
+                container = (_genericProcessorFactory.Get<IResourceHookContainer>(typeof(ResourceDefinition<>), rightType));
                 _hookContainers[rightType] = container;
             }
             if (container == null) return container;
@@ -123,7 +123,7 @@ IHooksDiscovery GetHookDiscovery(Type entityType)
         {
             if (!_hookDiscoveries.TryGetValue(entityType, out IHooksDiscovery discovery))
             {
-                discovery = _genericProcessorFactory.GetProcessor<IHooksDiscovery>(typeof(IHooksDiscovery<>), entityType);
+                discovery = _genericProcessorFactory.Get<IHooksDiscovery>(typeof(IHooksDiscovery<>), entityType);
                 _hookDiscoveries[entityType] = discovery;
             }
             return discovery;
@@ -138,7 +138,7 @@ IEnumerable<TResource> GetWhereAndInclude<TResource, TId>(IEnumerable<TId> ids,
 
         IResourceReadRepository<TResource, TId> GetRepository<TResource, TId>() where TResource : class, IIdentifiable<TId>
         {
-            return _genericProcessorFactory.GetProcessor<IResourceReadRepository<TResource, TId>>(typeof(IResourceReadRepository<,>), typeof(TResource), typeof(TId));
+            return _genericProcessorFactory.Get<IResourceReadRepository<TResource, TId>>(typeof(IResourceReadRepository<,>), typeof(TResource), typeof(TId));
         }