Add allocation_id to IndicesShardStores API

Author: russcam

src/Nest/Indices/Monitoring/IndicesShardStores/IndicesShardStoresResponse.cs

@@ -41,10 +41,13 @@ public class ShardStore
 		[JsonProperty("transport_address")]
 		public string TransportAddress { get; set; }
 
-		[JsonProperty("version")]
-		public long Version { get; set; }
+		[JsonProperty("legacy_version")]
+		public long? LegacyVersion { get; set; }
 
-		[JsonProperty("store_exeption")]
+		[JsonProperty("allocation_id")]
+		public string AllocationId { get; set; }
+
+		[JsonProperty("store_exception")]
 		public ShardStoreException StoreException { get; set; }
 
 		[JsonProperty("allocation")]

src/Nest/Indices/Monitoring/IndicesShardStores/ShardStoreJsonConverter.cs

@@ -11,8 +11,6 @@ internal class ShardStoreJsonConverter : JsonConverter
 		private readonly VerbatimDictionaryKeysJsonConverter _dictionaryConverter =
 		new VerbatimDictionaryKeysJsonConverter();
 
-		private readonly PropertyJsonConverter _elasticTypeConverter = new PropertyJsonConverter();
-
 		public override bool CanRead => true;
 		public override bool CanWrite => false;
 		public override bool CanConvert(Type objectType) => objectType == typeof(IDictionary<string, IFieldMapping>);
@@ -42,15 +40,18 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 					case "transport_address":
 						r.TransportAddress = p.Value.Value<string>();
 						break;
-					case "version":
-						r.Version = p.Value.Value<long>();
+					case "legacy_version":
+						r.LegacyVersion = p.Value.Value<long?>();
 						break;
 					case "store_exception":
 						r.StoreException = p.Value.ToObject<ShardStoreException>();
 						break;
 					case "allocation":
 						r.Allocation = p.Value.ToObject<ShardStoreAllocation>();
 						break;
+					case "allocation_id":
+						r.AllocationId = p.Value.Value<string>();
+						break;
 					case "attributes":
 						r.Attributes = p.Value.ToObject<Dictionary<string, object>>();
 						break;

src/Tests/ClientConcepts/HighLevel/Mapping/AutoMap.doc.cs

@@ -583,7 +583,7 @@ public void OverridingAutoMappedAttributes()
 					.Map<EmployeeWithAttributes>(m => m
 						.AutoMap()
 						.TtlField(ttl => ttl
-							.Enable()
+							.Enabled()
 							.Default("10m")
 						)
 						.Properties(ps => ps

src/Tests/Indices/Monitoring/IndicesShardStores/IndicesShardStoresApiTests.cs

@@ -66,7 +66,8 @@ [I] public Task AssertResponse() => AssertOnAllResponses(r =>
 			shardStore.Id.Should().NotBeNullOrWhiteSpace();
 			shardStore.Name.Should().NotBeNullOrWhiteSpace();
 			shardStore.TransportAddress.Should().NotBeNullOrWhiteSpace();
-			shardStore.Version.Should().BeGreaterThan(0);
+			shardStore.LegacyVersion.Should().Be(null);
+			shardStore.AllocationId.Should().NotBeNullOrWhiteSpace();
 			shardStore.Allocation.Should().Be(ShardStoreAllocation.Primary);
 		});
 	}

src/Tests/Mapping/Metafields/Ttl/TypeMappingTestBase.cs

@@ -22,12 +22,12 @@ public TtlMetafieldApiTest(ReadOnlyCluster cluster, EndpointUsage usage) : base(
 		protected override Func<PutMappingDescriptor<Project>, IPutMappingRequest> Fluent => d => d.Index(CallIsolatedValue)
 			.TtlField(ttl => ttl
 				.Default("30m")
-				.Enable()
+				.Enabled()
 			);
 
 		protected override PutMappingRequest<Project> Initializer => new PutMappingRequest<Project>(CallIsolatedValue, Type<Project>())
 		{
-			TtlField = new TtlField {  Default = TimeSpan.FromMinutes(30), Enabled = true } 
+			TtlField = new TtlField {  Default = TimeSpan.FromMinutes(30), Enabled = true }
 		};
 	}
 }

src/Tests/tests.yaml

@@ -1,7 +1,7 @@
 # mode either u (unit test), i (integration test) or m (mixed mode)
-mode: u
+mode: i
 # the elasticsearch version that should be started
-elasticsearch_version: 5.0.0-alpha1-SNAPSHOT
+elasticsearch_version: 5.0.0-alpha1
 # whether we want to forcefully reseed on the node, if you are starting the tests with a node already running
 force_reseed: true
 # do not spawn nodes as part of the test setup but rely on a manually started es node being up