Renaming and consistency

benchmarks/Query/QueryParser_Benchmarks.cs

@@ -23,7 +23,7 @@ public class QueryParser_Benchmarks {
 
         public QueryParser_Benchmarks() {
             var requestMock = new Mock<IRequestContext>();
-            requestMock.Setup(m => m.GetRequestResource()).Returns(new ContextEntity {
+            requestMock.Setup(m => m.GetRequestResource()).Returns(new ResourceContext {
                 Attributes = new List<AttrAttribute> {
                     new AttrAttribute(ATTRIBUTE, ATTRIBUTE)
                 }

benchmarks/Serialization/JsonApiSerializer_Benchmarks.cs

@@ -34,7 +34,7 @@
 //            jsonApiOptions.SerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver();
 //            jsonApiContextMock.Setup(m => m.Options).Returns(jsonApiOptions);
 
-//            var genericProcessorFactoryMock = new Mock<IGenericProcessorFactory>();
+//            var genericServiceFactoryMock = new Mock<IgenericServiceFactory>();
 
 //            var documentBuilder = new BaseDocumentBuilder(jsonApiContextMock.Object);
 //            _jsonApiSerializer = new JsonApiSerializer(jsonApiContextMock.Object, documentBuilder);

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(IContextEntityProvider 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/Examples/JsonApiDotNetCoreExample/Services/CustomArticleService.cs

@@ -11,16 +11,16 @@
 
 namespace JsonApiDotNetCoreExample.Services
 {
-    public class CustomArticleService : EntityResourceService<Article>
+    public class CustomArticleService : DefaultResourceService<Article>
     {
         public CustomArticleService(ISortService sortService,
                                     IFilterService filterService,
-                                    IEntityRepository<Article, int> repository,
+                                    IResourceRepository<Article, int> repository,
                                     IJsonApiOptions options,
                                     IIncludeService includeService,
                                     ISparseFieldsService sparseFieldsService,
                                     IPageService pageService,
-                                    IContextEntityProvider provider,
+                                    IResourceContextProvider provider,
                                     IResourceHookExecutor hookExecutor = null,
                                     ILoggerFactory loggerFactory = null)
             : base(sortService, filterService, repository, options, includeService, sparseFieldsService,

src/JsonApiDotNetCore/Builders/IResourceGraphBuilder.cs

@@ -1,5 +1,5 @@
 using System;
-using JsonApiDotNetCore.Configuration;
+using JsonApiDotNetCore.Graph;
 using JsonApiDotNetCore.Internal;
 using JsonApiDotNetCore.Internal.Contracts;
 using JsonApiDotNetCore.Models;
@@ -21,7 +21,7 @@ public interface IResourceGraphBuilder
         /// <param name="pluralizedTypeName">
         /// The pluralized name that should be exposed by the API. 
         /// If nothing is specified, the configured name formatter will be used.
-        /// See <see cref="JsonApiOptions.ResourceNameFormatter" />.
+        /// See <see cref="IResourceNameFormatter" />.
         /// </param>
         IResourceGraphBuilder AddResource<TResource>(string pluralizedTypeName = null) where TResource : class, IIdentifiable<int>;
 
@@ -34,7 +34,7 @@ public interface IResourceGraphBuilder
         /// <param name="pluralizedTypeName">
         /// The pluralized name that should be exposed by the API. 
         /// If nothing is specified, the configured name formatter will be used.
-        /// See <see cref="JsonApiOptions.ResourceNameFormatter" />.
+        /// See <see cref="IResourceNameFormatter" />.
         /// </param>
         IResourceGraphBuilder AddResource<TResource, TId>(string pluralizedTypeName = null) where TResource : class, IIdentifiable<TId>;
 
@@ -46,7 +46,7 @@ public interface IResourceGraphBuilder
         /// <param name="pluralizedTypeName">
         /// The pluralized name that should be exposed by the API. 
         /// If nothing is specified, the configured name formatter will be used.
-        /// See <see cref="JsonApiOptions.ResourceNameFormatter" />.
+        /// See <see cref="IResourceNameFormatter" />.
         /// </param>
         IResourceGraphBuilder AddResource(Type entityType, Type idType, string pluralizedTypeName = null);
 

src/JsonApiDotNetCore/Builders/JsonApiApplicationBuilder.cs

@@ -73,7 +73,7 @@ public void ConfigureMvc()
 
             var routingConvention = intermediateProvider.GetRequiredService<IJsonApiRoutingConvention>();
             _mvcBuilder.AddMvcOptions(opt => opt.Conventions.Insert(0, routingConvention));
-            _services.AddSingleton<IControllerResourceMapping>(routingConvention); 
+            _services.AddSingleton<IControllerResourceMapping>(routingConvention);
         }
 
         /// <summary>
@@ -118,44 +118,44 @@ public void ConfigureServices()
                 _services.AddSingleton(new DbContextOptionsBuilder().Options);
             }
 
-            _services.AddScoped(typeof(IEntityRepository<>), typeof(DefaultEntityRepository<>));
-            _services.AddScoped(typeof(IEntityRepository<,>), typeof(DefaultEntityRepository<,>));
+            _services.AddScoped(typeof(IResourceRepository<>), typeof(DefaultResourceRepository<>));
+            _services.AddScoped(typeof(IResourceRepository<,>), typeof(DefaultResourceRepository<,>));
 
-            _services.AddScoped(typeof(IEntityReadRepository<,>), typeof(DefaultEntityRepository<,>));
-            _services.AddScoped(typeof(IEntityWriteRepository<,>), typeof(DefaultEntityRepository<,>));
+            _services.AddScoped(typeof(IResourceReadRepository<,>), typeof(DefaultResourceRepository<,>));
+            _services.AddScoped(typeof(IResourceWriteRepository<,>), typeof(DefaultResourceRepository<,>));
 
-            _services.AddScoped(typeof(ICreateService<>), typeof(EntityResourceService<>));
-            _services.AddScoped(typeof(ICreateService<,>), typeof(EntityResourceService<,>));
+            _services.AddScoped(typeof(ICreateService<>), typeof(DefaultResourceService<>));
+            _services.AddScoped(typeof(ICreateService<,>), typeof(DefaultResourceService<,>));
 
-            _services.AddScoped(typeof(IGetAllService<>), typeof(EntityResourceService<>));
-            _services.AddScoped(typeof(IGetAllService<,>), typeof(EntityResourceService<,>));
+            _services.AddScoped(typeof(IGetAllService<>), typeof(DefaultResourceService<>));
+            _services.AddScoped(typeof(IGetAllService<,>), typeof(DefaultResourceService<,>));
 
-            _services.AddScoped(typeof(IGetByIdService<>), typeof(EntityResourceService<>));
-            _services.AddScoped(typeof(IGetByIdService<,>), typeof(EntityResourceService<,>));
+            _services.AddScoped(typeof(IGetByIdService<>), typeof(DefaultResourceService<>));
+            _services.AddScoped(typeof(IGetByIdService<,>), typeof(DefaultResourceService<,>));
 
-            _services.AddScoped(typeof(IGetRelationshipService<,>), typeof(EntityResourceService<>));
-            _services.AddScoped(typeof(IGetRelationshipService<,>), typeof(EntityResourceService<,>));
+            _services.AddScoped(typeof(IGetRelationshipService<,>), typeof(DefaultResourceService<>));
+            _services.AddScoped(typeof(IGetRelationshipService<,>), typeof(DefaultResourceService<,>));
 
-            _services.AddScoped(typeof(IUpdateService<>), typeof(EntityResourceService<>));
-            _services.AddScoped(typeof(IUpdateService<,>), typeof(EntityResourceService<,>));
+            _services.AddScoped(typeof(IUpdateService<>), typeof(DefaultResourceService<>));
+            _services.AddScoped(typeof(IUpdateService<,>), typeof(DefaultResourceService<,>));
 
-            _services.AddScoped(typeof(IDeleteService<>), typeof(EntityResourceService<>));
-            _services.AddScoped(typeof(IDeleteService<,>), typeof(EntityResourceService<,>));
+            _services.AddScoped(typeof(IDeleteService<>), typeof(DefaultResourceService<>));
+            _services.AddScoped(typeof(IDeleteService<,>), typeof(DefaultResourceService<,>));
 
-            _services.AddScoped(typeof(IResourceService<>), typeof(EntityResourceService<>));
-            _services.AddScoped(typeof(IResourceService<,>), typeof(EntityResourceService<,>));
+            _services.AddScoped(typeof(IResourceService<>), typeof(DefaultResourceService<>));
+            _services.AddScoped(typeof(IResourceService<,>), typeof(DefaultResourceService<,>));
 
             _services.AddSingleton<ILinksConfiguration>(JsonApiOptions);
             _services.AddSingleton(resourceGraph);
             _services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
             _services.AddSingleton<IResourceGraph>(resourceGraph);
-            _services.AddSingleton<IContextEntityProvider>(resourceGraph);
+            _services.AddSingleton<IResourceContextProvider>(resourceGraph);
             _services.AddScoped<ICurrentRequest, CurrentRequest>();
             _services.AddScoped<IScopedServiceProvider, RequestScopedServiceProvider>();
             _services.AddScoped<IJsonApiWriter, JsonApiWriter>();
             _services.AddScoped<IJsonApiReader, JsonApiReader>();
-            _services.AddScoped<IGenericProcessorFactory, GenericProcessorFactory>();
-            _services.AddScoped(typeof(GenericProcessor<>));
+            _services.AddScoped<IGenericServiceFactory, GenericServiceFactory>();
+            _services.AddScoped(typeof(HasManyThroughUpdateHelper<>));
             _services.AddScoped<IQueryParameterDiscovery, QueryParameterDiscovery>();
             _services.AddScoped<ITargetedFields, TargetedFields>();
             _services.AddScoped<IResourceDefinitionProvider, ResourceDefinitionProvider>();

src/JsonApiDotNetCore/Builders/ResourceGraphBuilder.cs

@@ -17,7 +17,7 @@ namespace JsonApiDotNetCore.Builders
 {
     public class ResourceGraphBuilder : IResourceGraphBuilder
     {
-        private readonly List<ContextEntity> _entities = new List<ContextEntity>();
+        private readonly List<ResourceContext> _entities = new List<ResourceContext>();
         private readonly List<ValidationResult> _validationResults = new List<ValidationResult>();
         private readonly IResourceNameFormatter _resourceNameFormatter = new KebabCaseFormatter();
 
@@ -36,9 +36,9 @@ public IResourceGraph Build()
             return resourceGraph;
         }
 
-        private void SetResourceLinksOptions(ContextEntity resourceContext)
+        private void SetResourceLinksOptions(ResourceContext resourceContext)
         {
-            var attribute = (LinksAttribute)resourceContext.EntityType.GetCustomAttribute(typeof(LinksAttribute));
+            var attribute = (LinksAttribute)resourceContext.ResourceType.GetCustomAttribute(typeof(LinksAttribute));
             if (attribute != null)
             {
                 resourceContext.RelationshipLinks = attribute.RelationshipLinks;
@@ -67,14 +67,14 @@ public IResourceGraphBuilder AddResource(Type entityType, Type idType, string pl
             return this;
         }
 
-        private ContextEntity GetEntity(string pluralizedTypeName, Type entityType, Type idType) => new ContextEntity
+        private ResourceContext GetEntity(string pluralizedTypeName, Type entityType, Type idType) => new ResourceContext
         {
-            EntityName = pluralizedTypeName,
-            EntityType = entityType,
+            ResourceName = pluralizedTypeName,
+            ResourceType = entityType,
             IdentityType = idType,
             Attributes = GetAttributes(entityType),
             Relationships = GetRelationships(entityType),
-            ResourceType = GetResourceDefinitionType(entityType)
+            ResourceDefinitionType = GetResourceDefinitionType(entityType)
         };
 
 
@@ -125,8 +125,8 @@ protected virtual List<RelationshipAttribute> GetRelationships(Type entityType)
 
                 attribute.PublicRelationshipName = attribute.PublicRelationshipName ?? _resourceNameFormatter.FormatPropertyName(prop);
                 attribute.InternalRelationshipName = prop.Name;
-                attribute.DependentType = GetRelationshipType(attribute, prop);
-                attribute.PrincipalType = entityType;
+                attribute.RightType = GetRelationshipType(attribute, prop);
+                attribute.LeftType = entityType;
                 attributes.Add(attribute);
 
                 if (attribute is HasManyThroughAttribute hasManyThroughAttribute)
@@ -160,13 +160,13 @@ protected virtual List<RelationshipAttribute> GetRelationships(Type entityType)
                         ?? throw new JsonApiSetupException($"{hasManyThroughAttribute.ThroughType} does not contain a relationship id property to type {entityType} with name {leftIdPropertyName}");
 
                     // Article → ArticleTag.Tag
-                    hasManyThroughAttribute.RightProperty = throughProperties.SingleOrDefault(x => x.PropertyType == hasManyThroughAttribute.DependentType)
-                        ?? throw new JsonApiSetupException($"{hasManyThroughAttribute.ThroughType} does not contain a navigation property to type {hasManyThroughAttribute.DependentType}");
+                    hasManyThroughAttribute.RightProperty = throughProperties.SingleOrDefault(x => x.PropertyType == hasManyThroughAttribute.RightType)
+                        ?? throw new JsonApiSetupException($"{hasManyThroughAttribute.ThroughType} does not contain a navigation property to type {hasManyThroughAttribute.RightType}");
 
                     // ArticleTag.TagId
                     var rightIdPropertyName = JsonApiOptions.RelatedIdMapper.GetRelatedIdPropertyName(hasManyThroughAttribute.RightProperty.Name);
                     hasManyThroughAttribute.RightIdProperty = throughProperties.SingleOrDefault(x => x.Name == rightIdPropertyName)
-                        ?? throw new JsonApiSetupException($"{hasManyThroughAttribute.ThroughType} does not contain a relationship id property to type {hasManyThroughAttribute.DependentType} with name {rightIdPropertyName}");
+                        ?? throw new JsonApiSetupException($"{hasManyThroughAttribute.ThroughType} does not contain a relationship id property to type {hasManyThroughAttribute.RightType} with name {rightIdPropertyName}");
                 }
             }
 
@@ -234,7 +234,7 @@ private string GetResourceNameFromDbSetProperty(PropertyInfo property, Type reso
 
         private void AssertEntityIsNotAlreadyDefined(Type entityType)
         {
-            if (_entities.Any(e => e.EntityType == entityType))
+            if (_entities.Any(e => e.ResourceType == entityType))
                 throw new InvalidOperationException($"Cannot add entity type {entityType} to context resourceGraph, there is already an entity of that type configured.");
         }
     }

src/JsonApiDotNetCore/Configuration/IJsonApiOptions.cs

@@ -1,5 +1,3 @@
-using JsonApiDotNetCore.Internal.Contracts;
-
 namespace JsonApiDotNetCore.Configuration
 {
     public interface IJsonApiOptions : ILinksConfiguration, ISerializerOptions

src/JsonApiDotNetCore/Configuration/JsonApiOptions.cs

@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using JsonApiDotNetCore.Builders;
 using JsonApiDotNetCore.Graph;
 using JsonApiDotNetCore.Models;
 using JsonApiDotNetCore.Models.Links;

src/JsonApiDotNetCore/Controllers/BaseJsonApiController.cs

@@ -4,7 +4,6 @@
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Extensions;
 using JsonApiDotNetCore.Internal;
-using JsonApiDotNetCore.Internal.Contracts;
 using JsonApiDotNetCore.Models;
 using JsonApiDotNetCore.Services;
 using Microsoft.AspNetCore.Mvc;
@@ -32,14 +31,11 @@ public BaseJsonApiController(
             IResourceService<T, TId> resourceService,
             ILoggerFactory loggerFactory)
         {
-            if(loggerFactory != null)
-            {
+            if (loggerFactory != null)
                 _logger = loggerFactory.CreateLogger<BaseJsonApiController<T, TId>>();
-            }
             else
-            {
                 _logger = new Logger<BaseJsonApiController<T, TId>>(new LoggerFactory());
-            }
+
             _jsonApiOptions = jsonApiOptions;
             _getAll = resourceService;
             _getById = resourceService;
@@ -51,7 +47,6 @@ public BaseJsonApiController(
             _delete = resourceService;
         }
 
-
         public BaseJsonApiController(
             IJsonApiOptions jsonApiOptions,
             IResourceQueryService<T, TId> queryService = null,
@@ -68,11 +63,7 @@ public BaseJsonApiController(
             _delete = cmdService;
         }
 
-        /// <summary>
-        /// Base constructor
-        /// </summary>
         /// <param name="jsonApiOptions"></param>
-        /// <param name="resourceGraph"></param>
         /// <param name="getAll"></param>
         /// <param name="getById"></param>
         /// <param name="getRelationship"></param>

src/JsonApiDotNetCore/Controllers/JsonApiCmdController.cs

@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using System.Threading.Tasks;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Models;