Merge pull request #299 from btecu/services

Make `AddJsonApi` chainable

Author: jaredcnance

src/Examples/JsonApiDotNetCoreExample/Startup.cs

@@ -29,19 +29,16 @@ public virtual IServiceProvider ConfigureServices(IServiceCollection services)
         {
             var loggerFactory = new LoggerFactory();
             loggerFactory.AddConsole(LogLevel.Trace);
-            services.AddSingleton<ILoggerFactory>(loggerFactory);
 
-            services.AddDbContext<AppDbContext>(options =>
-            {
-                options.UseNpgsql(GetDbConnectionString());
-            }, ServiceLifetime.Transient);
-
-            services.AddJsonApi<AppDbContext>(opt =>
-            {
-                opt.Namespace = "api/v1";
-                opt.DefaultPageSize = 5;
-                opt.IncludeTotalRecordCount = true;
-            });
+            services
+                .AddSingleton<ILoggerFactory>(loggerFactory)
+                .AddDbContext<AppDbContext>(options =>
+                    options.UseNpgsql(GetDbConnectionString()), ServiceLifetime.Transient)
+                .AddJsonApi<AppDbContext>(options => {
+                    options.Namespace = "api/v1";
+                    options.DefaultPageSize = 5;
+                    options.IncludeTotalRecordCount = true;
+                });
 
             var provider = services.BuildServiceProvider();
             var appContext = provider.GetRequiredService<AppDbContext>();
@@ -67,4 +64,4 @@ public virtual void Configure(
 
         public string GetDbConnectionString() => Config["Data:DefaultConnection"];
     }
-}
+}

src/JsonApiDotNetCore/Extensions/IServiceCollectionExtensions.cs

@@ -20,21 +20,21 @@ namespace JsonApiDotNetCore.Extensions
     // ReSharper disable once InconsistentNaming
     public static class IServiceCollectionExtensions
     {
-        public static void AddJsonApi<TContext>(this IServiceCollection services)
+        public static IServiceCollection AddJsonApi<TContext>(this IServiceCollection services)
             where TContext : DbContext
         {
             var mvcBuilder = services.AddMvc();
-            AddJsonApi<TContext>(services, (opt) => { }, mvcBuilder);
+            return AddJsonApi<TContext>(services, (opt) => { }, mvcBuilder);
         }
 
-        public static void AddJsonApi<TContext>(this IServiceCollection services, Action<JsonApiOptions> options)
+        public static IServiceCollection AddJsonApi<TContext>(this IServiceCollection services, Action<JsonApiOptions> options)
             where TContext : DbContext
         {
             var mvcBuilder = services.AddMvc();
-            AddJsonApi<TContext>(services, options, mvcBuilder);
+            return AddJsonApi<TContext>(services, options, mvcBuilder);
         }
 
-        public static void AddJsonApi<TContext>(this IServiceCollection services,
+        public static IServiceCollection AddJsonApi<TContext>(this IServiceCollection services,
            Action<JsonApiOptions> options,
            IMvcBuilder mvcBuilder) where TContext : DbContext
         {
@@ -52,9 +52,10 @@ public static void AddJsonApi<TContext>(this IServiceCollection services,
                 });
 
             AddJsonApiInternals<TContext>(services, config);
+            return services;
         }
 
-        public static void AddJsonApi(this IServiceCollection services,
+        public static IServiceCollection AddJsonApi(this IServiceCollection services,
             Action<JsonApiOptions> options,
             IMvcBuilder mvcBuilder)
         {
@@ -70,6 +71,7 @@ public static void AddJsonApi(this IServiceCollection services,
                 });
 
             AddJsonApiInternals(services, config);
+            return services;
         }
 
         public static void AddJsonApiInternals<TContext>(

test/JsonApiDotNetCoreExampleTests/Helpers/Startups/MetaStartup.cs

@@ -20,25 +20,18 @@ public MetaStartup(IHostingEnvironment env)
         public override IServiceProvider ConfigureServices(IServiceCollection services)
         {
             var loggerFactory = new LoggerFactory();
-
-            loggerFactory
-              .AddConsole(LogLevel.Trace);
-
-            services.AddSingleton<ILoggerFactory>(loggerFactory);
-
-            services.AddDbContext<AppDbContext>(options =>
-            {
-                options.UseNpgsql(GetDbConnectionString());
-            }, ServiceLifetime.Transient);
-
-            services.AddJsonApi<AppDbContext>(opt =>
-            {
-                opt.Namespace = "api/v1";
-                opt.DefaultPageSize = 5;
-                opt.IncludeTotalRecordCount = true;
-            });
-
-            services.AddScoped<IRequestMeta, MetaService>();
+            loggerFactory.AddConsole(LogLevel.Trace);
+
+            services
+                .AddSingleton<ILoggerFactory>(loggerFactory)
+                .AddDbContext<AppDbContext>(options => 
+                    options.UseNpgsql(GetDbConnectionString()), ServiceLifetime.Transient)
+                .AddJsonApi<AppDbContext>(options => {
+                    options.Namespace = "api/v1";
+                    options.DefaultPageSize = 5;
+                    options.IncludeTotalRecordCount = true;
+                })
+                .AddScoped<IRequestMeta, MetaService>();
 
             return services.BuildServiceProvider();
         }