Fix compiler warnings in 6.x (#3801)

codebrain · web-flow · commit b79e8790e900 · 2019-06-07T15:41:00.000+10:00
diff --git a/src/Nest/Mapping/Types/Geo/GeoShape/GeoShapeAttribute.cs b/src/Nest/Mapping/Types/Geo/GeoShape/GeoShapeAttribute.cs
@@ -1,11 +1,14 @@
-﻿namespace Nest
+﻿using System;
+
+namespace Nest
 {
 	/// <inheritdoc cref="IGeoShapeProperty" />
 	public class GeoShapeAttribute : ElasticsearchDocValuesPropertyAttributeBase, IGeoShapeProperty
 	{
 		public GeoShapeAttribute() : base(FieldType.GeoShape) { }
 
 		/// <inheritdoc cref="IGeoShapeProperty.DistanceErrorPercentage" />
+		[Obsolete("Removed in Elasticsearch 6.6")]
 		public double DistanceErrorPercentage
 		{
 			get => (Self.Precision != null) | (Self.TreeLevels != null)
@@ -36,27 +39,31 @@ public GeoOrientation Orientation
 		}
 
 		/// <inheritdoc cref="IGeoShapeProperty.PointsOnly" />
+		[Obsolete("Removed in Elasticsearch 6.6")]
 		public bool PointsOnly
 		{
 			get => Self.PointsOnly.GetValueOrDefault(false);
 			set => Self.PointsOnly = value;
 		}
 
 		/// <inheritdoc cref="IGeoShapeProperty.Strategy" />
+		[Obsolete("Removed in Elasticsearch 6.6")]
 		public GeoStrategy Strategy
 		{
 			get => Self.Strategy.GetValueOrDefault(GeoStrategy.Recursive);
 			set => Self.Strategy = value;
 		}
 
 		/// <inheritdoc cref="IGeoShapeProperty.Tree" />
+		[Obsolete("Removed in Elasticsearch 6.6")]
 		public GeoTree Tree
 		{
 			get => Self.Tree.GetValueOrDefault(GeoTree.Geohash);
 			set => Self.Tree = value;
 		}
 
 		/// <inheritdoc cref="IGeoShapeProperty.TreeLevels" />
+		[Obsolete("Removed in Elasticsearch 6.6")]
 		public int TreeLevels
 		{
 			get => Self.TreeLevels.GetValueOrDefault(50);
@@ -70,16 +77,30 @@ public bool Coerce
 			set => Self.Coerce = value;
 		}
 
+		[Obsolete("Removed in Elasticsearch 6.6")]
 		double? IGeoShapeProperty.DistanceErrorPercentage { get; set; }
+
 		bool? IGeoShapeProperty.IgnoreMalformed { get; set; }
+
 		bool? IGeoShapeProperty.IgnoreZValue { get; set; }
+
 		GeoOrientation? IGeoShapeProperty.Orientation { get; set; }
+
+		[Obsolete("Removed in Elasticsearch 6.6")]
 		bool? IGeoShapeProperty.PointsOnly { get; set; }
+
+		[Obsolete("Removed in Elasticsearch 6.6")]
 		Distance IGeoShapeProperty.Precision { get; set; }
+
 		private IGeoShapeProperty Self => this;
+
+		[Obsolete("Removed in Elasticsearch 6.6")]
 		GeoStrategy? IGeoShapeProperty.Strategy { get; set; }
 
+		[Obsolete("Removed in Elasticsearch 6.6")]
 		GeoTree? IGeoShapeProperty.Tree { get; set; }
+
+		[Obsolete("Removed in Elasticsearch 6.6")]
 		int? IGeoShapeProperty.TreeLevels { get; set; }
 
 		bool? IGeoShapeProperty.Coerce { get; set; }
diff --git a/src/Nest/Mapping/Types/Geo/GeoShape/GeoShapeProperty.cs b/src/Nest/Mapping/Types/Geo/GeoShape/GeoShapeProperty.cs
@@ -83,6 +83,7 @@ public interface IGeoShapeProperty : IDocValuesProperty
 		/// Elasticsearch set this parameter automatically.
 		/// </summary>
 		[JsonProperty("strategy")]
+		[Obsolete("Removed in Elasticsearch 6.6")]
 		GeoStrategy? Strategy { get; set; }
 
 		/// <summary>
@@ -139,6 +140,7 @@ public GeoShapeProperty() : base(FieldType.GeoShape) { }
 		public Distance Precision { get; set; }
 
 		/// <inheritdoc />
+		[Obsolete("Removed in Elasticsearch 6.6")]
 		public GeoStrategy? Strategy { get; set; }
 
 		/// <inheritdoc />
@@ -161,18 +163,23 @@ public class GeoShapePropertyDescriptor<T>
 	{
 		public GeoShapePropertyDescriptor() : base(FieldType.GeoShape) { }
 
-
-		[Obsolete("Removed in Elasticsearch 6.6")]
-		double? IGeoShapeProperty.DistanceErrorPercentage { get; set; }
 		bool? IGeoShapeProperty.IgnoreMalformed { get; set; }
 		bool? IGeoShapeProperty.IgnoreZValue { get; set; }
+
 		GeoOrientation? IGeoShapeProperty.Orientation { get; set; }
 
+		bool? IGeoShapeProperty.Coerce { get; set; }
+
+		[Obsolete("Removed in Elasticsearch 6.6")]
+		double? IGeoShapeProperty.DistanceErrorPercentage { get; set; }
+
 		[Obsolete("Removed in Elasticsearch 6.6")]
 		bool? IGeoShapeProperty.PointsOnly { get; set; }
 
 		[Obsolete("Removed in Elasticsearch 6.6")]
 		Distance IGeoShapeProperty.Precision { get; set; }
+
+		[Obsolete("Removed in Elasticsearch 6.6")]
 		GeoStrategy? IGeoShapeProperty.Strategy { get; set; }
 
 		[Obsolete("Removed in Elasticsearch 6.6")]
@@ -181,10 +188,7 @@ public GeoShapePropertyDescriptor() : base(FieldType.GeoShape) { }
 		[Obsolete("Removed in Elasticsearch 6.6")]
 		int? IGeoShapeProperty.TreeLevels { get; set; }
 
-		bool? IGeoShapeProperty.Coerce { get; set; }
-
 		/// <inheritdoc cref="IGeoShapeProperty.Tree" />
-
 		[Obsolete("Removed in Elasticsearch 6.6")]
 		public GeoShapePropertyDescriptor<T> Tree(GeoTree? tree) => Assign(tree, (a, v) => a.Tree = v);
 
@@ -193,6 +197,7 @@ public GeoShapePropertyDescriptor() : base(FieldType.GeoShape) { }
 		public GeoShapePropertyDescriptor<T> TreeLevels(int? treeLevels) => Assign(treeLevels, (a, v) => a.TreeLevels = v);
 
 		/// <inheritdoc cref="IGeoShapeProperty.Strategy" />
+		[Obsolete("Removed in Elasticsearch 6.6")]
 		public GeoShapePropertyDescriptor<T> Strategy(GeoStrategy? strategy) => Assign(strategy, (a, v) => a.Strategy = v);
 
 		/// <inheritdoc cref="IGeoShapeProperty.Precision" />
diff --git a/src/Tests/Tests/Mapping/Types/Geo/GeoShape/GeoShapeAttributeTests.cs b/src/Tests/Tests/Mapping/Types/Geo/GeoShape/GeoShapeAttributeTests.cs
@@ -1,4 +1,5 @@
-﻿using Nest;
+﻿#pragma warning disable 612, 618
+using Nest;
 
 namespace Tests.Mapping.Types.Geo.GeoShape
 {
@@ -43,3 +44,4 @@ public class GeoShapeAttributeTests : AttributeTestsBase<GeoShapeTest>
 		};
 	}
 }
+#pragma warning restore 612, 618
diff --git a/src/Tests/Tests/Mapping/Types/Geo/GeoShape/GeoShapeClusterMetadataApiTests.cs b/src/Tests/Tests/Mapping/Types/Geo/GeoShape/GeoShapeClusterMetadataApiTests.cs
@@ -1,3 +1,4 @@
+#pragma warning disable 612, 618
 using System;
 using System.Linq;
 using Elasticsearch.Net;
@@ -85,3 +86,4 @@ protected override void ExpectResponse(IPutMappingResponse response)
 		}
 	}
 }
+#pragma warning restore 612, 618
diff --git a/src/Tests/Tests/Mapping/Types/Geo/GeoShape/GeoShapePropertyTests.cs b/src/Tests/Tests/Mapping/Types/Geo/GeoShape/GeoShapePropertyTests.cs
@@ -1,4 +1,5 @@
-﻿using System;
+﻿#pragma warning disable 612, 618
+using System;
 using Nest;
 using Tests.Core.ManagedElasticsearch.Clusters;
 using Tests.Domain;
@@ -58,3 +59,4 @@ public GeoShapePropertyTests(WritableCluster cluster, EndpointUsage usage) : bas
 		};
 	}
 }
+#pragma warning restore 612, 618
diff --git a/src/Tests/Tests/QueryDsl/Geo/GeoShapeSerializationTests.cs b/src/Tests/Tests/QueryDsl/Geo/GeoShapeSerializationTests.cs
@@ -1,4 +1,5 @@
-﻿using System;
+﻿#pragma warning disable 612, 618
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -253,3 +254,4 @@ protected override void ExpectResponse(ISearchResponse<Domain.Shape> response)
 		}
 	}
 }
+#pragma warning restore 612, 618
diff --git a/src/Tests/Tests/XPack/Ilm/IlmApiTests.cs b/src/Tests/Tests/XPack/Ilm/IlmApiTests.cs
@@ -1,3 +1,4 @@
+#pragma warning disable 612, 618
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -40,14 +41,15 @@ public IlmApiTests(XPackCluster cluster, EndpointUsage usage) : base(new Coordin
 				)
 			},
 			{
-				IlmExplainLifecycleStep, u => u.Calls<ExplainLifecycleDescriptor, ExplainLifecycleRequest, IExplainLifecycleRequest, IExplainLifecycleResponse>(
-					v => new ExplainLifecycleRequest("project"),
-					(v, d) => d,
-					(v, c, f) => c.ExplainLifecycle("project", f),
-					(v, c, f) => c.ExplainLifecycleAsync("project", f),
-					(v, c, r) => c.ExplainLifecycle(r),
-					(v, c, r) => c.ExplainLifecycleAsync(r)
-				)
+				IlmExplainLifecycleStep, u =>
+					u.Calls<ExplainLifecycleDescriptor, ExplainLifecycleRequest, IExplainLifecycleRequest, IExplainLifecycleResponse>(
+						v => new ExplainLifecycleRequest("project"),
+						(v, d) => d,
+						(v, c, f) => c.ExplainLifecycle("project", f),
+						(v, c, f) => c.ExplainLifecycleAsync("project", f),
+						(v, c, r) => c.ExplainLifecycle(r),
+						(v, c, r) => c.ExplainLifecycleAsync(r)
+					)
 			},
 			{
 				IlmGetStatusStep, u => u.Calls<GetIlmStatusDescriptor, GetIlmStatusRequest, IGetIlmStatusRequest, IGetIlmStatusResponse>(
@@ -81,7 +83,7 @@ public IlmApiTests(XPackCluster cluster, EndpointUsage usage) : base(new Coordin
 								Hot = new Phase
 								{
 									MinimumAge = "1d",
-									Actions	= new LifecycleActions
+									Actions = new LifecycleActions
 									{
 										new RolloverLifecycleAction
 										{
@@ -103,14 +105,12 @@ public IlmApiTests(XPackCluster cluster, EndpointUsage usage) : base(new Coordin
 					},
 					(v, d) => d
 						.Policy(p => p.Phases(a => a.Warm(w => w.MinimumAge("10d")
-																.Actions(ac => ac.ForceMerge(f => f.MaximumNumberOfSegments(1))))
-													.Hot(h => h.MinimumAge("1d")
-															    .Actions(ac => ac.Rollover(r => r.MaximumDocuments(1_000_000)
-#pragma warning disable 612, 618
-																								.MaximumSize(40_000_000_000))))
-#pragma warning restore 612, 618
-													.Delete(w => w.MinimumAge("30d")
-		       													  .Actions(ac => ac.Delete(f => f)))))
+								.Actions(ac => ac.ForceMerge(f => f.MaximumNumberOfSegments(1))))
+							.Hot(h => h.MinimumAge("1d")
+								.Actions(ac => ac.Rollover(r => r.MaximumDocuments(1_000_000)
+									.MaximumSize(40_000_000_000))))
+							.Delete(w => w.MinimumAge("30d")
+								.Actions(ac => ac.Delete(f => f)))))
 					,
 					(v, c, f) => c.PutLifecycle("policy" + v, f),
 					(v, c, f) => c.PutLifecycleAsync("policy" + v, f),
@@ -149,14 +149,15 @@ public IlmApiTests(XPackCluster cluster, EndpointUsage usage) : base(new Coordin
 				)
 			},
 			{
-				IlmDeleteLifecycleStep, u => u.Calls<DeleteLifecycleDescriptor, DeleteLifecycleRequest, IDeleteLifecycleRequest, IDeleteLifecycleResponse>(
-					v => new DeleteLifecycleRequest("policy" + v),
-					(v, d) => d,
-					(v, c, f) => c.DeleteLifecycle("policy" + v, f),
-					(v, c, f) => c.DeleteLifecycleAsync("policy" + v, f),
-					(v, c, r) => c.DeleteLifecycle(r),
-					(v, c, r) => c.DeleteLifecycleAsync(r)
-				)
+				IlmDeleteLifecycleStep, u =>
+					u.Calls<DeleteLifecycleDescriptor, DeleteLifecycleRequest, IDeleteLifecycleRequest, IDeleteLifecycleResponse>(
+						v => new DeleteLifecycleRequest("policy" + v),
+						(v, d) => d,
+						(v, c, f) => c.DeleteLifecycle("policy" + v, f),
+						(v, c, f) => c.DeleteLifecycleAsync("policy" + v, f),
+						(v, c, r) => c.DeleteLifecycle(r),
+						(v, c, r) => c.DeleteLifecycleAsync(r)
+					)
 			},
 			{
 				IlmStopStep, u => u.Calls<StopIlmDescriptor, StopIlmRequest, IStopIlmRequest, IStopIlmResponse>(
@@ -272,3 +273,4 @@ [I] public async Task IlmDeleteLifecycleResponse() => await Assert<DeleteLifecyc
 		});
 	}
 }
+#pragma warning restore 612, 618

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using Nest;`
	`1`	`+#pragma warning disable 612, 618`
	`2`	`+using Nest;`
`2`	`3`
`3`	`4`	`namespace Tests.Mapping.Types.Geo.GeoShape`
`4`	`5`	`{`
`@@ -43,3 +44,4 @@ public class GeoShapeAttributeTests : AttributeTestsBase<GeoShapeTest>`
`43`	`44`	`};`
`44`	`45`	`}`
`45`	`46`	`}`
	`47`	`+#pragma warning restore 612, 618`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#pragma warning disable 612, 618`
`1`	`2`	`using System;`
`2`	`3`	`using System.Linq;`
`3`	`4`	`using Elasticsearch.Net;`
`@@ -85,3 +86,4 @@ protected override void ExpectResponse(IPutMappingResponse response)`
`85`	`86`	`}`
`86`	`87`	`}`
`87`	`88`	`}`
	`89`	`+#pragma warning restore 612, 618`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using System;`
	`1`	`+#pragma warning disable 612, 618`
	`2`	`+using System;`
`2`	`3`	`using Nest;`
`3`	`4`	`using Tests.Core.ManagedElasticsearch.Clusters;`
`4`	`5`	`using Tests.Domain;`
`@@ -58,3 +59,4 @@ public GeoShapePropertyTests(WritableCluster cluster, EndpointUsage usage) : bas`
`58`	`59`	`};`
`59`	`60`	`}`
`60`	`61`	`}`
	`62`	`+#pragma warning restore 612, 618`