rebased on master

gregsdennis · Mar 6, 2020 · 167f750 · 167f750
1 parent 2d9ed82
commit 167f750
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/Manatee.Json.Tests.Benchmark/SchemaPerformance.cs b/Manatee.Json.Tests.Benchmark/SchemaPerformance.cs
@@ -94,13 +94,12 @@ private static void _NewtonDeserializeAndValidate(string dataString, string sche
 
 			_manateeWatch.Reset();
 			_manateeWatch.Start();
-			JSchema schema = JSchema.Parse(schemaString);
+			var schema = JSchema.Parse(schemaString);
 
-			JObject json = JObject.Parse(dataString);
+			var json = JObject.Parse(dataString);
 			var result = json.IsValid(schema);
 
 			_manateeWatch.Stop();
-
 		}
 	}
 }
diff --git a/Manatee.Json.Tests/JsonOptionsTest.cs b/Manatee.Json.Tests/JsonOptionsTest.cs
@@ -1,4 +1,5 @@
 using System;
+using Manatee.Json.Tests.Common;
 using NUnit.Framework;
 
 namespace Manatee.Json.Tests
@@ -379,7 +380,7 @@ int PrintValue(int value)
 			var log = JsonOptions.Log;
 			try
 			{
-				JsonOptions.Log = new OptionsConfigurator.ConsoleLog();
+				JsonOptions.Log = new ConsoleLog();
 				JsonOptions.Log?.Verbose($"changing storedValue to {PrintValue(4)}");
 
 				Assert.AreEqual(4, storedValue);

diff --git a/Manatee.Json/Schema/JsonSchema.cs b/Manatee.Json/Schema/JsonSchema.cs
@@ -317,21 +317,19 @@ internal SchemaValidationResults Validate(SchemaValidationContext context)
 			if (context.BaseUri != null && context.BaseUri.OriginalString.EndsWith("#"))
 				context.BaseUri = new Uri(context.BaseUri.OriginalString.TrimEnd('#'), UriKind.RelativeOrAbsolute);
 
-			var nestedResults = new List<SchemaValidationResults>();
-
 			if (refKeyword != null && !context.Root.SupportedVersions.HasFlag(JsonSchemaVersion.Draft2019_09))
 				return refKeyword.Validate(context);
 
 			var nestedResults = new List<SchemaValidationResults>();
 
 			foreach (var keyword in this.OrderBy(k => k.ValidationSequence))
 			{
-				Log.Schema($"Processing `{keyword.Name}`");
+				Log.Schema(() => $"Processing `{keyword.Name}`");
 				var localResults = keyword.Validate(context);
-				Log.Schema($"`{keyword.Name}` complete: {(localResults.IsValid ? "valid" : "invalid")}");
+				Log.Schema(() => $"`{keyword.Name}` complete: {(localResults.IsValid ? "valid" : "invalid")}");
 				if (JsonSchemaOptions.OutputFormat == SchemaValidationOutputFormat.Flag && !localResults.IsValid)
 				{
-					Log.Schema("Found fail condition with flag output enabled; halting validation early.");
+					Log.Schema(() => "Found fail condition with flag output enabled; halting validation early.");
 					return new SchemaValidationResults {IsValid = false};
 				}
 				nestedResults.Add(localResults);