Merge branch 'master' into updates

jaredcnance · web-flow · commit 2390669d0854 · 2018-06-13T20:34:52.000-05:00
diff --git a/benchmarks/Benchmarks.csproj b/benchmarks/Benchmarks.csproj
@@ -10,6 +10,6 @@
     <PackageReference Include="xunit" Version="$(xUnitVersion)" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\src\JsonApiDotNetCore\JsonApiDotNetCore.csproj" />
+    <ProjectReference Include="../src/JsonApiDotNetCore/JsonApiDotNetCore.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/Examples/JsonApiDotNetCoreExample/Startup.cs b/src/Examples/JsonApiDotNetCoreExample/Startup.cs
@@ -28,7 +28,7 @@ public Startup(IHostingEnvironment env)
         public virtual IServiceProvider ConfigureServices(IServiceCollection services)
         {
             var loggerFactory = new LoggerFactory();
-            loggerFactory.AddConsole(LogLevel.Trace);
+            loggerFactory.AddConsole(LogLevel.Warning);
 
             services
                 .AddSingleton<ILoggerFactory>(loggerFactory)
@@ -57,7 +57,6 @@ public virtual void Configure(
             context.Database.EnsureCreated();
 
             loggerFactory.AddConsole(Config.GetSection("Logging"));
-            loggerFactory.AddDebug();
 
             app.UseJsonApi();
         }
diff --git a/src/Examples/JsonApiDotNetCoreExample/appsettings.json b/src/Examples/JsonApiDotNetCoreExample/appsettings.json
@@ -5,9 +5,9 @@
     "Logging": {
         "IncludeScopes": false,
         "LogLevel": {
-            "Default": "Trace",
-            "System": "Trace",
-            "Microsoft": "Trace"
+            "Default": "Warning",
+            "System": "Warning",
+            "Microsoft": "Warning"
         }
     }
 }
diff --git a/src/Examples/NoEntityFrameworkExample/Startup.cs b/src/Examples/NoEntityFrameworkExample/Startup.cs
@@ -55,7 +55,6 @@ public virtual IServiceProvider ConfigureServices(IServiceCollection services)
         public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory, AppDbContext context)
         {
             loggerFactory.AddConsole(Configuration.GetSection("Logging"));
-            loggerFactory.AddDebug();
 
             context.Database.EnsureCreated();
 
diff --git a/src/Examples/OperationsExample/OperationsExample.csproj b/src/Examples/OperationsExample/OperationsExample.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <ProjectReference Include="../../JsonApiDotNetCore/JsonApiDotNetCore.csproj" />
-    <ProjectReference Include="..\JsonApiDotNetCoreExample\JsonApiDotNetCoreExample.csproj" />
+    <ProjectReference Include="../JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Examples/OperationsExample/Startup.cs b/src/Examples/OperationsExample/Startup.cs
@@ -27,7 +27,7 @@ public Startup(IHostingEnvironment env)
         public virtual IServiceProvider ConfigureServices(IServiceCollection services)
         {
             var loggerFactory = new LoggerFactory();
-            loggerFactory.AddConsole(LogLevel.Trace);
+            loggerFactory.AddConsole(LogLevel.Warning);
 
             services.AddSingleton<ILoggerFactory>(loggerFactory);
 
@@ -47,7 +47,6 @@ public virtual void Configure(
             context.Database.EnsureCreated();
 
             loggerFactory.AddConsole(Config.GetSection("Logging"));
-            loggerFactory.AddDebug();
             app.UseJsonApi();
         }
 
diff --git a/src/Examples/OperationsExample/appsettings.json b/src/Examples/OperationsExample/appsettings.json
@@ -5,9 +5,9 @@
     "Logging": {
         "IncludeScopes": false,
         "LogLevel": {
-            "Default": "Trace",
-            "System": "Trace",
-            "Microsoft": "Trace"
+            "Default": "Warning",
+            "System": "Warning",
+            "Microsoft": "Warning"
         }
     }
 }
diff --git a/src/Examples/ReportsExample/appsettings.json b/src/Examples/ReportsExample/appsettings.json
@@ -2,7 +2,7 @@
   "Logging": {
     "IncludeScopes": false,
     "LogLevel": {
-      "Default": "Information"
+      "Default": "Warning"
     }
   }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/JsonApiSerializer.cs b/src/JsonApiDotNetCore/Serialization/JsonApiSerializer.cs
@@ -65,7 +65,11 @@ private string GetErrorJson(object responseObject, ILogger logger)
             }
             else
             {
-                logger?.LogInformation("Response was not a JSONAPI entity. Serializing as plain JSON.");
+                if (logger?.IsEnabled(LogLevel.Information) == true)
+                {
+                    logger.LogInformation("Response was not a JSONAPI entity. Serializing as plain JSON.");
+                }
+                
                 return JsonConvert.SerializeObject(responseObject);
             }
         }
diff --git a/src/JsonApiDotNetCore/Services/EntityResourceService.cs b/src/JsonApiDotNetCore/Services/EntityResourceService.cs
@@ -89,8 +89,10 @@ public virtual async Task<object> GetRelationshipAsync(TId id, string relationsh
 
             if (relationshipName == null)
                 throw new JsonApiException(422, "Relationship name not specified.");
-
-            _logger.LogTrace($"Looking up '{relationshipName}'...");
+            if (_logger.IsEnabled(LogLevel.Trace))
+            {
+                _logger.LogTrace($"Looking up '{relationshipName}'...");
+            }
 
             var entity = await _entities.GetAndIncludeAsync(id, relationshipName);
             // TODO: it would be better if we could distinguish whether or not the relationship was not found,
@@ -166,7 +168,10 @@ protected virtual async Task<IEnumerable<T>> ApplyPageQueryAsync(IQueryable<T> e
             if (!pageManager.IsPaginated)
                 return await _entities.ToListAsync(entities);
 
-            _logger?.LogInformation($"Applying paging query. Fetching page {pageManager.CurrentPage} with {pageManager.PageSize} entities");
+            if (_logger?.IsEnabled(LogLevel.Information) == true)
+            {
+                _logger?.LogInformation($"Applying paging query. Fetching page {pageManager.CurrentPage} with {pageManager.PageSize} entities");
+            }
 
             return await _entities.PageAsync(entities, pageManager.PageSize, pageManager.CurrentPage);
         }
diff --git a/src/JsonApiDotNetCore/Services/QueryAccessor.cs b/src/JsonApiDotNetCore/Services/QueryAccessor.cs
@@ -45,7 +45,11 @@ public bool TryGetValue<T>(string key, out T value)
             var stringValue = GetFilterValue(key);
             if (stringValue == null)
             {
-                _logger.LogInformation($"'{key}' was not found in the query collection");
+                if (_logger.IsEnabled(LogLevel.Information))
+                {
+                    _logger.LogInformation($"'{key}' was not found in the query collection");
+                }
+
                 return false;
             }
 
@@ -56,7 +60,12 @@ public bool TryGetValue<T>(string key, out T value)
             }
             catch (FormatException)
             {
-                _logger.LogInformation($"'{value}' is not a valid '{typeof(T).Name}' value for query parameter {key}");
+                if (_logger.IsEnabled(LogLevel.Information))
+                {
+                    _logger.LogInformation(
+                        $"'{value}' is not a valid '{typeof(T).Name}' value for query parameter {key}");
+                }
+
                 return false;
             }
         }
diff --git a/test/JsonApiDotNetCoreExampleTests/Helpers/Startups/MetaStartup.cs b/test/JsonApiDotNetCoreExampleTests/Helpers/Startups/MetaStartup.cs
@@ -20,7 +20,7 @@ public MetaStartup(IHostingEnvironment env)
         public override IServiceProvider ConfigureServices(IServiceCollection services)
         {
             var loggerFactory = new LoggerFactory();
-            loggerFactory.AddConsole(LogLevel.Trace);
+            loggerFactory.AddConsole(LogLevel.Warning);
 
             services
                 .AddSingleton<ILoggerFactory>(loggerFactory)
diff --git a/test/JsonApiDotNetCoreExampleTests/JsonApiDotNetCoreExampleTests.csproj b/test/JsonApiDotNetCoreExampleTests/JsonApiDotNetCoreExampleTests.csproj
@@ -13,7 +13,7 @@
   <ItemGroup>
     <ProjectReference Include="../../src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj" />
     <ProjectReference Include="../../src/Examples/NoEntityFrameworkExample/NoEntityFrameworkExample.csproj" />
-    <ProjectReference Include="..\UnitTests\UnitTests.csproj" />
+    <ProjectReference Include="../UnitTests/UnitTests.csproj" />
   </ItemGroup>
 
   <ItemGroup>
@@ -28,6 +28,5 @@
 
   <ItemGroup>
     <DotNetCliToolReference Include="dotnet-xunit" Version="$(XUnitVersion)" />
-    <DotNetCliToolReference Include="Microsoft.DotNet.Watcher.Tools" Version="1.0.0" />
   </ItemGroup>
 </Project>
diff --git a/test/JsonApiDotNetCoreExampleTests/appsettings.json b/test/JsonApiDotNetCoreExampleTests/appsettings.json
@@ -5,9 +5,9 @@
     "Logging": {
         "IncludeScopes": false,
         "LogLevel": {
-            "Default": "Error",
-            "System": "Information",
-            "Microsoft": "Information"
+            "Default": "Warning",
+            "System": "Warning",
+            "Microsoft": "Warning"
         }
     }
 }
diff --git a/test/NoEntityFrameworkTests/NoEntityFrameworkTests.csproj b/test/NoEntityFrameworkTests/NoEntityFrameworkTests.csproj
@@ -17,7 +17,7 @@
     <ProjectReference Include="../../src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj" />
     <ProjectReference Include="../../test/JsonApiDotNetCoreExampleTests/JsonApiDotNetCoreExampleTests.csproj" />
     <ProjectReference Include="../../src/Examples/NoEntityFrameworkExample/NoEntityFrameworkExample.csproj" />
-    <ProjectReference Include="..\UnitTests\UnitTests.csproj" />
+    <ProjectReference Include="../UnitTests/UnitTests.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
diff --git a/test/NoEntityFrameworkTests/appsettings.json b/test/NoEntityFrameworkTests/appsettings.json
@@ -5,9 +5,9 @@
     "Logging": {
         "IncludeScopes": false,
         "LogLevel": {
-            "Default": "Debug",
-            "System": "Information",
-            "Microsoft": "Information"
+            "Default": "Warning",
+            "System": "Warning",
+            "Microsoft": "Warning"
         }
     }
 }
diff --git a/test/OperationsExampleTests/OperationsExampleTests.csproj b/test/OperationsExampleTests/OperationsExampleTests.csproj
@@ -13,8 +13,8 @@
     <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitVersion)" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Examples\OperationsExample\OperationsExample.csproj" />
-    <ProjectReference Include="..\UnitTests\UnitTests.csproj" />
+    <ProjectReference Include="../../src/Examples/OperationsExample/OperationsExample.csproj" />
+    <ProjectReference Include="../UnitTests/UnitTests.csproj" />
   </ItemGroup>
   <ItemGroup>
     <None Update="xunit.runner.json;appsettings.json">
diff --git a/test/OperationsExampleTests/appsettings.json b/test/OperationsExampleTests/appsettings.json
@@ -5,9 +5,9 @@
     "Logging": {
         "IncludeScopes": false,
         "LogLevel": {
-            "Default": "Trace",
-            "System": "Trace",
-            "Microsoft": "Trace"
+            "Default": "Warning",
+            "System": "Warning",
+            "Microsoft": "Warning"
         }
     }
 }
diff --git a/test/UnitTests/UnitTests.csproj b/test/UnitTests/UnitTests.csproj
@@ -4,8 +4,8 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\JsonApiDotNetCore\JsonApiDotNetCore.csproj" />
-    <ProjectReference Include="..\..\src\Examples\JsonApiDotNetCoreExample\JsonApiDotNetCoreExample.csproj" />
+    <ProjectReference Include="../../src/JsonApiDotNetCore/JsonApiDotNetCore.csproj" />
+    <ProjectReference Include="../../src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj" />
   </ItemGroup>
   <ItemGroup>
   <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public Startup(IHostingEnvironment env)`
`28`	`28`	`public virtual IServiceProvider ConfigureServices(IServiceCollection services)`
`29`	`29`	`{`
`30`	`30`	`var loggerFactory = new LoggerFactory();`
`31`		`- loggerFactory.AddConsole(LogLevel.Trace);`
	`31`	`+ loggerFactory.AddConsole(LogLevel.Warning);`
`32`	`32`
`33`	`33`	`services`
`34`	`34`	`.AddSingleton<ILoggerFactory>(loggerFactory)`
`@@ -57,7 +57,6 @@ public virtual void Configure(`
`57`	`57`	`context.Database.EnsureCreated();`
`58`	`58`
`59`	`59`	`loggerFactory.AddConsole(Config.GetSection("Logging"));`
`60`		`- loggerFactory.AddDebug();`
`61`	`60`
`62`	`61`	`app.UseJsonApi();`
`63`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@`
`5`	`5`	`"Logging": {`
`6`	`6`	`"IncludeScopes": false,`
`7`	`7`	`"LogLevel": {`
`8`		`- "Default": "Trace",`
`9`		`- "System": "Trace",`
`10`		`- "Microsoft": "Trace"`
	`8`	`+ "Default": "Warning",`
	`9`	`+ "System": "Warning",`
	`10`	`+ "Microsoft": "Warning"`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,6 @@ public virtual IServiceProvider ConfigureServices(IServiceCollection services)`
`55`	`55`	`public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory, AppDbContext context)`
`56`	`56`	`{`
`57`	`57`	`loggerFactory.AddConsole(Configuration.GetSection("Logging"));`
`58`		`- loggerFactory.AddDebug();`
`59`	`58`
`60`	`59`	`context.Database.EnsureCreated();`
`61`	`60`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public Startup(IHostingEnvironment env)`
`27`	`27`	`public virtual IServiceProvider ConfigureServices(IServiceCollection services)`
`28`	`28`	`{`
`29`	`29`	`var loggerFactory = new LoggerFactory();`
`30`		`- loggerFactory.AddConsole(LogLevel.Trace);`
	`30`	`+ loggerFactory.AddConsole(LogLevel.Warning);`
`31`	`31`
`32`	`32`	`services.AddSingleton<ILoggerFactory>(loggerFactory);`
`33`	`33`
`@@ -47,7 +47,6 @@ public virtual void Configure(`
`47`	`47`	`context.Database.EnsureCreated();`
`48`	`48`
`49`	`49`	`loggerFactory.AddConsole(Config.GetSection("Logging"));`
`50`		`- loggerFactory.AddDebug();`
`51`	`50`	`app.UseJsonApi();`
`52`	`51`	`}`
`53`	`52`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"Logging": {`
`3`	`3`	`"IncludeScopes": false,`
`4`	`4`	`"LogLevel": {`
`5`		`- "Default": "Information"`
	`5`	`+ "Default": "Warning"`
`6`	`6`	`}`
`7`	`7`	`}`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,11 @@ private string GetErrorJson(object responseObject, ILogger logger)`
`65`	`65`	`}`
`66`	`66`	`else`
`67`	`67`	`{`
`68`		`- logger?.LogInformation("Response was not a JSONAPI entity. Serializing as plain JSON.");`
	`68`	`+ if (logger?.IsEnabled(LogLevel.Information) == true)`
	`69`	`+ {`
	`70`	`+ logger.LogInformation("Response was not a JSONAPI entity. Serializing as plain JSON.");`
	`71`	`+ }`
	`72`	`+`
`69`	`73`	`return JsonConvert.SerializeObject(responseObject);`
`70`	`74`	`}`
`71`	`75`	`}`