Deserialize aggregation metadata to Dictionary<string,object> (#3073)

This commit uses the JsonSerializer to deserialize the aggregation metadata to a Dictionary<string,object> from the JsonReader.
Add integration test to assert behaviour.

Closes #3072
(cherry picked from commit 188d2d7)

Author: russcam

.paket/Paket.Restore.targets

@@ -18,6 +18,14 @@
     <PaketExePath Condition=" '$(PaketExePath)' == '' ">$(PaketToolsPath)paket.exe</PaketExePath>
     <PaketCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
     <PaketCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"</PaketCommand>
+
+    <!-- .net core fdd -->
+    <_PaketExeExtension>$([System.IO.Path]::GetExtension("$(PaketExePath)"))</_PaketExeExtension>
+    <PaketCommand Condition=" '$(_PaketExeExtension)' == '.dll' ">dotnet "$(PaketExePath)"</PaketCommand>
+
+    <!-- no extension is a shell script -->
+    <PaketCommand Condition=" '$(_PaketExeExtension)' == '' ">"$(PaketExePath)"</PaketCommand>
+
     <PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' AND Exists('$(PaketRootPath)paket.bootstrapper.exe')">$(PaketRootPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
     <PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
     <PaketBootStrapperCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketBootStrapperExePath)"</PaketBootStrapperCommand>
@@ -114,9 +122,11 @@
       <PaketReferencesFileLinesInfo Include="@(PaketReferencesFileLines)" >
         <PackageName>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0])</PackageName>
         <PackageVersion>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1])</PackageVersion>
+        <AllPrivateAssets>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[4])</AllPrivateAssets>
       </PaketReferencesFileLinesInfo>
       <PackageReference Include="%(PaketReferencesFileLinesInfo.PackageName)">
         <Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
+        <PrivateAssets Condition="%(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'true'">All</PrivateAssets>
       </PackageReference>
     </ItemGroup>
 
@@ -138,9 +148,10 @@
       </DotNetCliToolReference>
     </ItemGroup>
 
+    <!-- Disabled for now until we know what to do with runtime deps - https://github.com/fsprojects/Paket/issues/2964
     <PropertyGroup>
       <RestoreConfigFile>$(MSBuildProjectDirectory)/obj/$(MSBuildProjectFile).NuGet.Config</RestoreConfigFile>
-    </PropertyGroup>
+    </PropertyGroup> -->
 
   </Target>
 

src/Nest/Aggregations/AggregateJsonConverter.cs

@@ -105,7 +105,7 @@ private IAggregate ReadAggregate(JsonReader reader, JsonSerializer serializer)
 				aggregate = GetPercentilesAggregate(reader, serializer, oldFormat: true);
 
 			var meta = propertyName == Parser.Meta
-				? GetMetadata(reader)
+				? GetMetadata(serializer, reader)
 				: null;
 
 			if (aggregate != null)
@@ -183,19 +183,12 @@ private IBucket ReadBucket(JsonReader reader, JsonSerializer serializer)
 			return item;
 		}
 
-		private Dictionary<string, object> GetMetadata(JsonReader reader)
+		private Dictionary<string, object> GetMetadata(JsonSerializer serializer, JsonReader reader)
 		{
-			var meta = new Dictionary<string, object>();
+			// read past "meta" property name to start of object
 			reader.Read();
-			reader.Read();
-			while (reader.TokenType != JsonToken.EndObject)
-			{
-				var key = (string)reader.Value;
-				reader.Read();
-				var value = reader.Value;
-				meta.Add(key, value);
-				reader.Read();
-			}
+			var meta = serializer.Deserialize<Dictionary<string, object>>(reader);
+			// read past the closing end object of "meta" object
 			reader.Read();
 			return meta;
 		}

src/Tests/Aggregations/AggregationMetaUsageTests.cs

@@ -0,0 +1,77 @@
+using System;
+using System.Collections.Generic;
+using FluentAssertions;
+using Nest;
+using Tests.Framework;
+using Tests.Framework.Integration;
+using Tests.Framework.ManagedElasticsearch.Clusters;
+using Tests.Framework.MockData;
+
+namespace Tests.Aggregations
+{
+	/**
+	*=== Aggregation Metadata
+	* Metadata can be provided per aggregation, and will be returned in the aggregation response
+	*/
+	public class AggregationMetaUsageTests : AggregationUsageTestBase
+	{
+		public AggregationMetaUsageTests(ReadOnlyCluster i, EndpointUsage usage) : base(i, usage) { }
+
+		protected override object ExpectJson => new
+		{
+			size = 0,
+			aggs = new {
+				min_last_activity = new
+				{
+					min = new
+					{
+						field = "lastActivity"
+					},
+					meta = new
+					{
+						meta_1 = "value_1",
+						meta_2 = 2,
+						meta_3 = new
+						{
+							meta_3 = "value_3"
+						}
+					}
+				}
+			}
+		};
+
+		protected override Func<SearchDescriptor<Project>, ISearchRequest> Fluent => s => s
+			.Size(0)
+			.Aggregations(a => a
+				.Min("min_last_activity", m => m
+					.Field(p => p.LastActivity)
+					.Meta(d => d
+						.Add("meta_1", "value_1")
+						.Add("meta_2", 2)
+						.Add("meta_3", new { meta_3 = "value_3" })
+					)
+				)
+			);
+
+		protected override SearchRequest<Project> Initializer => new SearchRequest<Project>()
+			{
+				Size = 0,
+				Aggregations = new MinAggregation("min_last_activity", Infer.Field<Project>(p => p.LastActivity))
+				{
+					Meta = new Dictionary<string,object>
+					{
+						{ "meta_1", "value_1" },
+						{ "meta_2", 2 },
+						{ "meta_3", new { meta_3 = "value_3" } }
+					}
+				}
+			};
+
+		protected override void ExpectResponse(ISearchResponse<Project> response)
+		{
+			response.ShouldBeValid();
+			var min = response.Aggs.Min("min_last_activity");
+			min.Meta.Should().NotBeNull().And.ContainKeys("meta_1", "meta_2", "meta_3");
+		}
+	}
+}