revert rename of entity resource service

Author: roblankey

src/Examples/ResourceEntitySeparationExample/Startup.cs

@@ -5,7 +5,6 @@
 using JsonApiDotNetCore.Models;
 using JsonApiDotNetCore.Services;
 using JsonApiDotNetCoreExample.Data;
-using JsonApiDotNetCoreExample.Models;
 using JsonApiDotNetCoreExample.Models.Entities;
 using JsonApiDotNetCoreExample.Models.Resources;
 using Microsoft.AspNetCore.Builder;
@@ -15,7 +14,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using ResourceEntitySeparationExample.Models;
-using ResourceEntitySeparationExample.Profiles;
 
 namespace ResourceEntitySeparationExample
 {
@@ -61,9 +59,9 @@ public virtual IServiceProvider ConfigureServices(IServiceCollection services)
             services.AddAutoMapper();
             services.AddScoped<IResourceMapper, AutoMapperAdapter>();
 
-            services.AddScoped<IResourceService<CourseResource, int>, DefaultResourceService<CourseResource, CourseEntity, int>>();
-            services.AddScoped<IResourceService<DepartmentResource, int>, DefaultResourceService<DepartmentResource, DepartmentEntity, int>>();
-            services.AddScoped<IResourceService<StudentResource, int>, DefaultResourceService<StudentResource, StudentEntity, int>>();
+            services.AddScoped<IResourceService<CourseResource, int>, EntityResourceService<CourseResource, CourseEntity, int>>();
+            services.AddScoped<IResourceService<DepartmentResource, int>, EntityResourceService<DepartmentResource, DepartmentEntity, int>>();
+            services.AddScoped<IResourceService<StudentResource, int>, EntityResourceService<StudentResource, StudentEntity, int>>();
 
             var provider = services.BuildServiceProvider();
             var appContext = provider.GetRequiredService<AppDbContext>();

src/JsonApiDotNetCore/Builders/ContextGraphBuilder.cs

@@ -125,7 +125,7 @@ protected virtual List<RelationshipAttribute> GetRelationships(Type entityType)
             {
                 var attribute = (RelationshipAttribute)prop.GetCustomAttribute(typeof(RelationshipAttribute));
                 if (attribute == null) continue;
-                if (attribute.InternalRelationshipName == null) attribute.InternalRelationshipName = prop.Name;
+                attribute.InternalRelationshipName = prop.Name;
                 attribute.Type = GetRelationshipType(attribute, prop);
                 attributes.Add(attribute);
             }

src/JsonApiDotNetCore/Data/DefaultEntityRepository.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
 using System.Threading.Tasks;
 using JsonApiDotNetCore.Extensions;
 using JsonApiDotNetCore.Internal;

src/JsonApiDotNetCore/Extensions/IServiceCollectionExtensions.cs

@@ -102,26 +102,26 @@ public static void AddJsonApiInternals(
             services.AddScoped(typeof(IEntityRepository<>), typeof(DefaultEntityRepository<>));
             services.AddScoped(typeof(IEntityRepository<,>), typeof(DefaultEntityRepository<,>));
 
-            services.AddScoped(typeof(ICreateService<>), typeof(DefaultResourceService<>));
-            services.AddScoped(typeof(ICreateService<,>), typeof(DefaultResourceService<,>));
+            services.AddScoped(typeof(ICreateService<>), typeof(EntityResourceService<>));
+            services.AddScoped(typeof(ICreateService<,>), typeof(EntityResourceService<,>));
 
-            services.AddScoped(typeof(IGetAllService<>), typeof(DefaultResourceService<>));
-            services.AddScoped(typeof(IGetAllService<,>), typeof(DefaultResourceService<,>));
+            services.AddScoped(typeof(IGetAllService<>), typeof(EntityResourceService<>));
+            services.AddScoped(typeof(IGetAllService<,>), typeof(EntityResourceService<,>));
 
-            services.AddScoped(typeof(IGetByIdService<>), typeof(DefaultResourceService<>));
-            services.AddScoped(typeof(IGetByIdService<,>), typeof(DefaultResourceService<,>));
+            services.AddScoped(typeof(IGetByIdService<>), typeof(EntityResourceService<>));
+            services.AddScoped(typeof(IGetByIdService<,>), typeof(EntityResourceService<,>));
 
-            services.AddScoped(typeof(IGetRelationshipService<,>), typeof(DefaultResourceService<>));
-            services.AddScoped(typeof(IGetRelationshipService<,>), typeof(DefaultResourceService<,>));
+            services.AddScoped(typeof(IGetRelationshipService<,>), typeof(EntityResourceService<>));
+            services.AddScoped(typeof(IGetRelationshipService<,>), typeof(EntityResourceService<,>));
 
-            services.AddScoped(typeof(IUpdateService<>), typeof(DefaultResourceService<>));
-            services.AddScoped(typeof(IUpdateService<,>), typeof(DefaultResourceService<,>));
+            services.AddScoped(typeof(IUpdateService<>), typeof(EntityResourceService<>));
+            services.AddScoped(typeof(IUpdateService<,>), typeof(EntityResourceService<,>));
 
-            services.AddScoped(typeof(IDeleteService<>), typeof(DefaultResourceService<>));
-            services.AddScoped(typeof(IDeleteService<,>), typeof(DefaultResourceService<,>));
+            services.AddScoped(typeof(IDeleteService<>), typeof(EntityResourceService<>));
+            services.AddScoped(typeof(IDeleteService<,>), typeof(EntityResourceService<,>));
 
-            services.AddScoped(typeof(IResourceService<>), typeof(DefaultResourceService<>));
-            services.AddScoped(typeof(IResourceService<,>), typeof(DefaultResourceService<,>));
+            services.AddScoped(typeof(IResourceService<>), typeof(EntityResourceService<>));
+            services.AddScoped(typeof(IResourceService<,>), typeof(EntityResourceService<,>));
 
             services.AddSingleton(jsonApiOptions);
             services.AddSingleton(jsonApiOptions.ContextGraph);

src/JsonApiDotNetCore/Services/DefaultResourceService.cs renamed to src/JsonApiDotNetCore/Services/EntityResourceService.cs

@@ -9,31 +9,31 @@
 
 namespace JsonApiDotNetCore.Services
 {
-    public class DefaultResourceService<TResource> : DefaultResourceService<TResource, int>, 
+    public class EntityResourceService<TResource> : EntityResourceService<TResource, int>, 
         IResourceService<TResource>
         where TResource : class, IIdentifiable<int>
     {
-        public DefaultResourceService(
+        public EntityResourceService(
             IJsonApiContext jsonApiContext,
             IEntityRepository<TResource> entityRepository,
             ILoggerFactory loggerFactory) :
             base(jsonApiContext, entityRepository, loggerFactory)
         { }
     }
 
-    public class DefaultResourceService<TResource, TId> : DefaultResourceService<TResource, TResource, TId>, 
+    public class EntityResourceService<TResource, TId> : EntityResourceService<TResource, TResource, TId>, 
         IResourceService<TResource, TId>
         where TResource : class, IIdentifiable<TId>
     {
-        public DefaultResourceService(
+        public EntityResourceService(
             IJsonApiContext jsonApiContext,
             IEntityRepository<TResource, TId> entityRepository,
             ILoggerFactory loggerFactory) :
             base(jsonApiContext, entityRepository, loggerFactory)
         { }
     }
 
-    public class DefaultResourceService<TResource, TEntity, TId> : 
+    public class EntityResourceService<TResource, TEntity, TId> : 
         IResourceService<TResource, TId>
         where TResource : class, IIdentifiable<TId>
         where TEntity : class, IIdentifiable<TId>
@@ -43,7 +43,7 @@ public class DefaultResourceService<TResource, TEntity, TId> :
         private readonly ILogger _logger;
         private readonly IResourceMapper _mapper;
 
-        public DefaultResourceService(
+        public EntityResourceService(
                 IJsonApiContext jsonApiContext,
                 IEntityRepository<TEntity, TId> entityRepository,
                 ILoggerFactory loggerFactory)
@@ -57,18 +57,18 @@ public DefaultResourceService(
 
             _jsonApiContext = jsonApiContext;
             _entities = entityRepository;
-            _logger = loggerFactory.CreateLogger<DefaultResourceService<TResource, TEntity, TId>>();
+            _logger = loggerFactory.CreateLogger<EntityResourceService<TResource, TEntity, TId>>();
         }
 
-        public DefaultResourceService(
+        public EntityResourceService(
                 IJsonApiContext jsonApiContext,
                 IEntityRepository<TEntity, TId> entityRepository,
                 ILoggerFactory loggerFactory,
                 IResourceMapper mapper)
         {
             _jsonApiContext = jsonApiContext;
             _entities = entityRepository;
-            _logger = loggerFactory.CreateLogger<DefaultResourceService<TResource, TEntity, TId>>();
+            _logger = loggerFactory.CreateLogger<EntityResourceService<TResource, TEntity, TId>>();
             _mapper = mapper;
         }