CSHARP-3045: Deprecate geoHaystack and geoSearch.

DmitryLukyanov · DmitryLukyanov · commit 4b2a63af6fad · 2020-04-15T15:50:50.000+03:00
diff --git a/src/MongoDB.Driver.Core/Core/Operations/CreateIndexRequest.cs b/src/MongoDB.Driver.Core/Core/Operations/CreateIndexRequest.cs
@@ -100,6 +100,7 @@ public int? Bits
         /// <value>
         /// The size of the bucket for geo haystack indexes.
         /// </value>
+        [Obsolete("GeoHaystack indexes were deprecated in server version 4.4.")]
         public double? BucketSize
         {
             get { return _bucketSize; }
diff --git a/src/MongoDB.Driver.Core/Core/Operations/GeoSearchOperation.cs b/src/MongoDB.Driver.Core/Core/Operations/GeoSearchOperation.cs
@@ -30,6 +30,7 @@ namespace MongoDB.Driver.Core.Operations
     /// Represents the geoSearch command.
     /// </summary>
     /// <typeparam name="TResult">The type of the result.</typeparam>
+    [Obsolete("The geoSearch command was deprecated in server version 4.4.")]
     public sealed class GeoSearchOperation<TResult> : IReadOperation<TResult>
     {
         private readonly CollectionNamespace _collectionNamespace;
diff --git a/src/MongoDB.Driver.Legacy/Builders/IndexKeysBuilder.cs b/src/MongoDB.Driver.Legacy/Builders/IndexKeysBuilder.cs
@@ -66,6 +66,7 @@ public static IndexKeysBuilder GeoSpatial(string name)
         /// </summary>
         /// <param name="name">The key name.</param>
         /// <returns>The builder (so method calls can be chained).</returns>
+        [Obsolete("GeoHaystack indexes were deprecated in server version 4.4.")]
         public static IndexKeysBuilder GeoSpatialHaystack(string name)
         {
             return new IndexKeysBuilder().GeoSpatialHaystack(name);
@@ -77,6 +78,7 @@ public static IndexKeysBuilder GeoSpatialHaystack(string name)
         /// <param name="name">The key name.</param>
         /// <param name="additionalName">The name of an additional field to index.</param>
         /// <returns>The builder (so method calls can be chained).</returns>
+        [Obsolete("GeoHaystack indexes were deprecated in server version 4.4.")]
         public static IndexKeysBuilder GeoSpatialHaystack(string name, string additionalName)
         {
             return new IndexKeysBuilder().GeoSpatialHaystack(name, additionalName);
@@ -198,6 +200,7 @@ public IndexKeysBuilder GeoSpatial(string name)
         /// </summary>
         /// <param name="name">The key name.</param>
         /// <returns>The builder (so method calls can be chained).</returns>
+        [Obsolete("GeoHaystack indexes were deprecated in server version 4.4.")]
         public IndexKeysBuilder GeoSpatialHaystack(string name)
         {
             return GeoSpatialHaystack(name, null);
@@ -209,6 +212,7 @@ public IndexKeysBuilder GeoSpatialHaystack(string name)
         /// <param name="name">The key name.</param>
         /// <param name="additionalName">The name of an additional field to index.</param>
         /// <returns>The builder (so method calls can be chained).</returns>
+        [Obsolete("GeoHaystack indexes were deprecated in server version 4.4.")]
         public IndexKeysBuilder GeoSpatialHaystack(string name, string additionalName)
         {
             _document.Add(name, "geoHaystack");
@@ -355,6 +359,7 @@ public static IndexKeysBuilder<TDocument> GeoSpatial<TMember>(Expression<Func<TD
         /// <returns>
         /// The builder (so method calls can be chained).
         /// </returns>
+        [Obsolete("GeoHaystack indexes were deprecated in server version 4.4.")]
         public static IndexKeysBuilder<TDocument> GeoSpatialHaystack<TMember>(Expression<Func<TDocument, TMember>> memberExpression)
         {
             return new IndexKeysBuilder<TDocument>().GeoSpatialHaystack(memberExpression);
@@ -370,6 +375,7 @@ public static IndexKeysBuilder<TDocument> GeoSpatialHaystack<TMember>(Expression
         /// <returns>
         /// The builder (so method calls can be chained).
         /// </returns>
+        [Obsolete("GeoHaystack indexes were deprecated in server version 4.4.")]
         public static IndexKeysBuilder<TDocument> GeoSpatialHaystack<TMember, TAdditionalMember>(Expression<Func<TDocument, TMember>> memberExpression, Expression<Func<TDocument, TAdditionalMember>> additionalMemberExpression)
         {
             return new IndexKeysBuilder<TDocument>().GeoSpatialHaystack(memberExpression, additionalMemberExpression);
@@ -516,6 +522,7 @@ public IndexKeysBuilder<TDocument> GeoSpatial<TMember>(Expression<Func<TDocument
         /// <returns>
         /// The builder (so method calls can be chained).
         /// </returns>
+        [Obsolete("GeoHaystack indexes were deprecated in server version 4.4.")]
         public IndexKeysBuilder<TDocument> GeoSpatialHaystack<TMember>(Expression<Func<TDocument, TMember>> memberExpression)
         {
             _indexKeysBuilder = _indexKeysBuilder.GeoSpatialHaystack(GetElementName(memberExpression));
@@ -532,6 +539,7 @@ public IndexKeysBuilder<TDocument> GeoSpatialHaystack<TMember>(Expression<Func<T
         /// <returns>
         /// The builder (so method calls can be chained).
         /// </returns>
+        [Obsolete("GeoHaystack indexes were deprecated in server version 4.4.")]
         public IndexKeysBuilder<TDocument> GeoSpatialHaystack<TMember, TAdditionalMember>(Expression<Func<TDocument, TMember>> memberExpression, Expression<Func<TDocument, TAdditionalMember>> additionalMemberExpression)
         {
             _indexKeysBuilder = _indexKeysBuilder.GeoSpatialHaystack(GetElementName(memberExpression), GetElementName(additionalMemberExpression));
diff --git a/src/MongoDB.Driver.Legacy/Builders/IndexOptionsBuilder.cs b/src/MongoDB.Driver.Legacy/Builders/IndexOptionsBuilder.cs
@@ -63,6 +63,7 @@ public static IndexOptionsBuilder SetBits(int value)
         /// </summary>
         /// <param name="value">The bucket size.</param>
         /// <returns>The builder (so method calls can be chained).</returns>
+        [Obsolete("GeoHaystack indexes were deprecated in server version 4.4.")]
         public static IndexOptionsBuilder SetBucketSize(double value)
         {
             return new IndexOptionsBuilder().SetBucketSize(value);
@@ -245,6 +246,7 @@ public IndexOptionsBuilder SetBits(int value)
         /// </summary>
         /// <param name="value">The bucket size.</param>
         /// <returns>The builder (so method calls can be chained).</returns>
+        [Obsolete("GeoHaystack indexes were deprecated in server version 4.4.")]
         public IndexOptionsBuilder SetBucketSize(double value)
         {
             _document["bucketSize"] = value;
@@ -463,6 +465,7 @@ public static IndexOptionsBuilder<TDocument> SetBits(int value)
         /// </summary>
         /// <param name="value">The bucket size.</param>
         /// <returns>The builder (so method calls can be chained).</returns>
+        [Obsolete("GeoHaystack indexes were deprecated in server version 4.4.")]
         public static IndexOptionsBuilder<TDocument> SetBucketSize(double value)
         {
             return new IndexOptionsBuilder<TDocument>().SetBucketSize(value);
@@ -652,6 +655,7 @@ public IndexOptionsBuilder<TDocument> SetBits(int value)
         /// </summary>
         /// <param name="value">The bucket size.</param>
         /// <returns>The builder (so method calls can be chained).</returns>
+        [Obsolete("GeoHaystack indexes were deprecated in server version 4.4.")]
         public IndexOptionsBuilder<TDocument> SetBucketSize(double value)
         {
             _indexOptionsBuilder.SetBucketSize(value);
diff --git a/src/MongoDB.Driver.Legacy/CommandResults/GeoHaystackSearchResult.cs b/src/MongoDB.Driver.Legacy/CommandResults/GeoHaystackSearchResult.cs
@@ -30,6 +30,7 @@ namespace MongoDB.Driver
 #if NET452
     [Serializable]
 #endif
+    [Obsolete("GeoHaystack indexes were deprecated in server version 4.4.")]
     public abstract class GeoHaystackSearchResult : CommandResult
     {
         // private fields
@@ -235,6 +236,7 @@ public int NumberOfHits
     [Serializable]
 #endif
     [BsonSerializer(typeof(GeoHaystackSearchResult<>.Serializer))]
+    [Obsolete("GeoHaystack indexes were deprecated in server version 4.4.")]
     public class GeoHaystackSearchResult<TDocument> : GeoHaystackSearchResult
     {
         // private fields
diff --git a/src/MongoDB.Driver.Legacy/GeoHaystackSearchArgs.cs b/src/MongoDB.Driver.Legacy/GeoHaystackSearchArgs.cs
@@ -24,6 +24,7 @@ namespace MongoDB.Driver
     /// <summary>
     /// Represents the arguments to the GeoHaystackSearch method.
     /// </summary>
+    [Obsolete("GeoHaystack indexes were deprecated in server version 4.4.")]
     public class GeoHaystackSearchArgs
     {
         // private fields
diff --git a/src/MongoDB.Driver.Legacy/MongoCollection.cs b/src/MongoDB.Driver.Legacy/MongoCollection.cs
@@ -987,11 +987,13 @@ public virtual GeoHaystackSearchResult<TDocument> GeoHaystackSearchAs<TDocument>
         /// <typeparam name="TDocument">The type of the found documents.</typeparam>
         /// <param name="args">The args.</param>
         /// <returns>A <see cref="GeoNearResult{TDocument}"/>.</returns>
+        [Obsolete("GeoHaystack indexes were deprecated in server version 4.4.")]
         public virtual GeoHaystackSearchResult<TDocument> GeoHaystackSearchAs<TDocument>(GeoHaystackSearchArgs args)
         {
             return UsingImplicitSession(session => GeoHaystackSearchAs<TDocument>(session, args));
         }
 
+#pragma warning disable 618
         private GeoHaystackSearchResult<TDocument> GeoHaystackSearchAs<TDocument>(IClientSessionHandle session, GeoHaystackSearchArgs args)
         {
             if (args == null) { throw new ArgumentNullException("args"); }
@@ -1018,6 +1020,7 @@ private GeoHaystackSearchResult<TDocument> GeoHaystackSearchAs<TDocument>(IClien
 
             return ExecuteReadOperation(session, operation);
         }
+#pragma warning restore 618
 
         /// <summary>
         /// Runs a geoHaystack search command on this collection.
@@ -1045,6 +1048,7 @@ public virtual GeoHaystackSearchResult GeoHaystackSearchAs(
         /// <param name="documentType">The type to deserialize the documents as.</param>
         /// <param name="args">The args.</param>
         /// <returns>A <see cref="GeoNearResult{TDocument}"/>.</returns>
+        [Obsolete("GeoHaystack indexes were deprecated in server version 4.4.")]
         public virtual GeoHaystackSearchResult GeoHaystackSearchAs(Type documentType, GeoHaystackSearchArgs args)
         {
             var methodDefinition = GetType().GetTypeInfo().GetMethod("GeoHaystackSearchAs", new Type[] { typeof(GeoHaystackSearchArgs) });
@@ -2410,6 +2414,7 @@ public virtual GeoHaystackSearchResult<TDefaultDocument> GeoHaystackSearch(
         /// </summary>
         /// <param name="args">The args.</param>
         /// <returns>A <see cref="GeoHaystackSearchResult{TDocument}"/>.</returns>
+        [Obsolete("GeoHaystack indexes were deprecated in server version 4.4.")]
         public virtual GeoHaystackSearchResult<TDefaultDocument> GeoHaystackSearch(GeoHaystackSearchArgs args)
         {
             return GeoHaystackSearchAs<TDefaultDocument>(args);
diff --git a/src/MongoDB.Driver/CreateIndexOptions.cs b/src/MongoDB.Driver/CreateIndexOptions.cs
@@ -64,6 +64,7 @@ public int? Bits
         /// <summary>
         /// Gets or sets the size of a geohash bucket.
         /// </summary>
+        [Obsolete("GeoHaystack indexes were deprecated in server version 4.4.")]
         public double? BucketSize
         {
             get { return _bucketSize; }
@@ -218,7 +219,9 @@ internal static CreateIndexOptions<TDocument> CoercedFrom(CreateIndexOptions opt
                 {
                     Background = options.Background,
                     Bits = options.Bits,
+#pragma warning disable 618
                     BucketSize = options.BucketSize,
+#pragma warning restore 618
                     Collation = options.Collation,
                     DefaultLanguage = options.DefaultLanguage,
                     ExpireAfter = options.ExpireAfter,
diff --git a/src/MongoDB.Driver/IndexKeysDefinitionBuilder.cs b/src/MongoDB.Driver/IndexKeysDefinitionBuilder.cs
@@ -129,6 +129,7 @@ public static IndexKeysDefinition<TDocument> Geo2D<TDocument>(this IndexKeysDefi
         /// <returns>
         /// A combined index keys definition.
         /// </returns>
+        [Obsolete("GeoHaystack indexes were deprecated in server version 4.4.")]
         public static IndexKeysDefinition<TDocument> GeoHaystack<TDocument>(this IndexKeysDefinition<TDocument> keys, FieldDefinition<TDocument> field, FieldDefinition<TDocument> additionalFieldName = null)
         {
             var builder = Builders<TDocument>.IndexKeys;
@@ -145,6 +146,7 @@ public static IndexKeysDefinition<TDocument> GeoHaystack<TDocument>(this IndexKe
         /// <returns>
         /// A combined index keys definition.
         /// </returns>
+        [Obsolete("GeoHaystack indexes were deprecated in server version 4.4.")]
         public static IndexKeysDefinition<TDocument> GeoHaystack<TDocument>(this IndexKeysDefinition<TDocument> keys, Expression<Func<TDocument, object>> field, Expression<Func<TDocument, object>> additionalFieldName = null)
         {
             var builder = Builders<TDocument>.IndexKeys;
@@ -336,6 +338,7 @@ public IndexKeysDefinition<TDocument> Geo2D(Expression<Func<TDocument, object>>
         /// <returns>
         /// A geo haystack index key definition.
         /// </returns>
+        [Obsolete("GeoHaystack indexes were deprecated in server version 4.4.")]
         public IndexKeysDefinition<TDocument> GeoHaystack(FieldDefinition<TDocument> field, FieldDefinition<TDocument> additionalFieldName = null)
         {
             return new GeoHaystackIndexKeyDefinition<TDocument>(field, additionalFieldName);
@@ -349,6 +352,7 @@ public IndexKeysDefinition<TDocument> GeoHaystack(FieldDefinition<TDocument> fie
         /// <returns>
         /// A geo haystack index key definition.
         /// </returns>
+        [Obsolete("GeoHaystack indexes were deprecated in server version 4.4.")]
         public IndexKeysDefinition<TDocument> GeoHaystack(Expression<Func<TDocument, object>> field, Expression<Func<TDocument, object>> additionalFieldName = null)
         {
             FieldDefinition<TDocument> additional = additionalFieldName == null ? null : new ExpressionFieldDefinition<TDocument>(additionalFieldName);
@@ -502,6 +506,7 @@ public override BsonDocument Render(IBsonSerializer<TDocument> documentSerialize
         }
     }
 
+    [Obsolete("GeoHaystack indexes were deprecated in server version 4.4.")]
     internal sealed class GeoHaystackIndexKeyDefinition<TDocument> : IndexKeysDefinition<TDocument>
     {
         private readonly FieldDefinition<TDocument> _field;
diff --git a/src/MongoDB.Driver/MongoCollectionImpl.cs b/src/MongoDB.Driver/MongoCollectionImpl.cs
@@ -1559,7 +1559,9 @@ private IEnumerable<CreateIndexRequest> CreateCreateIndexRequests(IEnumerable<Cr
                         Name = options.Name,
                         Background = options.Background,
                         Bits = options.Bits,
+#pragma warning disable 618
                         BucketSize = options.BucketSize,
+#pragma warning restore 618
                         Collation = options.Collation,
                         DefaultLanguage = options.DefaultLanguage,
                         ExpireAfter = options.ExpireAfter,
diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/CreateIndexRequestTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/CreateIndexRequestTests.cs
@@ -75,8 +75,10 @@ public void BucketSize_get_and_set_should_work(
         {
             var subject = new CreateIndexRequest(new BsonDocument("x", 1));
 
+#pragma warning disable 618
             subject.BucketSize = value;
             var result = subject.BucketSize;
+#pragma warning restore 618
 
             result.Should().Be(value);
         }
@@ -108,7 +110,9 @@ public void constructor_should_initialize_subject()
             subject.AdditionalOptions.Should().BeNull();
             subject.Background.Should().NotHaveValue();
             subject.Bits.Should().NotHaveValue();
+#pragma warning disable 618
             subject.BucketSize.Should().NotHaveValue();
+#pragma warning restore 618
             subject.Collation.Should().BeNull();
             subject.DefaultLanguage.Should().BeNull();
             subject.ExpireAfter.Should().NotHaveValue();
@@ -232,7 +236,9 @@ public void CreateIndexDocument_should_return_expected_result_when_BucketSize_is
             var keys = new BsonDocument("x", 1);
             var subject = new CreateIndexRequest(keys)
             {
+#pragma warning disable 618
                 BucketSize = bucketSize
+#pragma warning restore 618
             };
 
             var result = subject.CreateIndexDocument(null);
diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Operations/GeoSearchOperationTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Operations/GeoSearchOperationTests.cs
@@ -15,8 +15,6 @@
 
 using System;
 using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using FluentAssertions;
 using MongoDB.Bson;
 using MongoDB.Bson.Serialization.Serializers;
@@ -29,6 +27,7 @@
 
 namespace MongoDB.Driver.Core.Operations
 {
+#pragma warning disable 618
     public class GeoSearchOperationTests : OperationTestBase
     {
         [Fact]
@@ -258,4 +257,5 @@ private void EnsureTestData()
             });
         }
     }
+#pragma warning restore 618
 }
diff --git a/tests/MongoDB.Driver.Legacy.Tests/MongoCollectionTests.cs b/tests/MongoDB.Driver.Legacy.Tests/MongoCollectionTests.cs
@@ -1629,6 +1629,7 @@ public void TestGeoHaystackSearch()
                 _collection.Insert(new Place { Location = new[] { 34.2, 33.3 }, Type = "restaurant" });
                 _collection.Insert(new Place { Location = new[] { 34.2, 37.3 }, Type = "restaurant" });
                 _collection.Insert(new Place { Location = new[] { 59.1, 87.2 }, Type = "office" });
+#pragma warning disable 618
                 _collection.CreateIndex(IndexKeys.GeoSpatialHaystack("Location", "Type"), IndexOptions.SetBucketSize(1));
 
                 var args = new GeoHaystackSearchArgs
@@ -1640,6 +1641,7 @@ public void TestGeoHaystackSearch()
                     MaxDistance = 6
                 };
                 var result = _collection.GeoHaystackSearchAs<Place>(args);
+#pragma warning restore 618
 
                 Assert.True(result.Ok);
                 Assert.True(result.Stats.Duration >= TimeSpan.Zero);
@@ -1667,6 +1669,7 @@ public void TestGeoHaystackSearchWithMaxTime()
                         _collection.Insert(new Place { Location = new[] { 34.2, 33.3 }, Type = "restaurant" });
                         _collection.Insert(new Place { Location = new[] { 34.2, 37.3 }, Type = "restaurant" });
                         _collection.Insert(new Place { Location = new[] { 59.1, 87.2 }, Type = "office" });
+#pragma warning disable 618
                         _collection.CreateIndex(IndexKeys.GeoSpatialHaystack("Location", "Type"), IndexOptions.SetBucketSize(1));
 
                         failpoint.SetAlwaysOn();
@@ -1680,6 +1683,7 @@ public void TestGeoHaystackSearchWithMaxTime()
                             MaxTime = TimeSpan.FromMilliseconds(1)
                         };
                         Assert.Throws<MongoExecutionTimeoutException>(() => _collection.GeoHaystackSearchAs<Place>(args));
+#pragma warning restore 618
                     }
                 }
             }
@@ -1694,6 +1698,7 @@ public void TestGeoHaystackSearch_Typed()
                 _collection.Insert(new Place { Location = new[] { 34.2, 33.3 }, Type = "restaurant" });
                 _collection.Insert(new Place { Location = new[] { 34.2, 37.3 }, Type = "restaurant" });
                 _collection.Insert(new Place { Location = new[] { 59.1, 87.2 }, Type = "office" });
+#pragma warning disable 618
                 _collection.CreateIndex(IndexKeys<Place>.GeoSpatialHaystack(x => x.Location, x => x.Type), IndexOptions.SetBucketSize(1));
 
                 var args = new GeoHaystackSearchArgs
@@ -1704,6 +1709,7 @@ public void TestGeoHaystackSearch_Typed()
                 }
                 .SetAdditionalField<Place, string>(x => x.Type, "restaurant");
                 var result = _collection.GeoHaystackSearchAs<Place>(args);
+#pragma warning restore 618
 
                 Assert.True(result.Ok);
                 Assert.True(result.Stats.Duration >= TimeSpan.Zero);
diff --git a/tests/MongoDB.Driver.Tests/IndexKeysDefinitionBuilderTests.cs b/tests/MongoDB.Driver.Tests/IndexKeysDefinitionBuilderTests.cs
@@ -134,18 +134,22 @@ public void GeoHaystack()
         {
             var subject = CreateSubject<BsonDocument>();
 
+#pragma warning disable 618
             Assert(subject.GeoHaystack("a"), "{a: 'geoHaystack'}");
             Assert(subject.GeoHaystack("a", "b"), "{a: 'geoHaystack', b: 1 }");
+#pragma warning restore 618
         }
 
         [Fact]
         public void GeoHaystack_Typed()
         {
             var subject = CreateSubject<Person>();
 
+#pragma warning disable 618
             Assert(subject.GeoHaystack(x => x.FirstName), "{fn: 'geoHaystack'}");
             Assert(subject.GeoHaystack(x => x.FirstName, x => x.LastName), "{fn: 'geoHaystack', ln: 1}");
             Assert(subject.GeoHaystack("FirstName", "LastName"), "{fn: 'geoHaystack', ln: 1}");
+#pragma warning restore 618
         }
 
         [Fact]
diff --git a/tests/MongoDB.Driver.Tests/MongoCollectionImplTests.cs b/tests/MongoDB.Driver.Tests/MongoCollectionImplTests.cs

Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,7 @@ public int? Bits`
`100`	`100`	`/// <value>`
`101`	`101`	`/// The size of the bucket for geo haystack indexes.`
`102`	`102`	`/// </value>`
	`103`	`+ [Obsolete("GeoHaystack indexes were deprecated in server version 4.4.")]`
`103`	`104`	`public double? BucketSize`
`104`	`105`	`{`
`105`	`106`	`get { return _bucketSize; }`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ namespace MongoDB.Driver.Core.Operations`
`30`	`30`	`/// Represents the geoSearch command.`
`31`	`31`	`/// </summary>`
`32`	`32`	`/// <typeparam name="TResult">The type of the result.</typeparam>`
	`33`	`+ [Obsolete("The geoSearch command was deprecated in server version 4.4.")]`
`33`	`34`	`public sealed class GeoSearchOperation<TResult> : IReadOperation<TResult>`
`34`	`35`	`{`
`35`	`36`	`private readonly CollectionNamespace _collectionNamespace;`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ namespace MongoDB.Driver`
`24`	`24`	`/// <summary>`
`25`	`25`	`/// Represents the arguments to the GeoHaystackSearch method.`
`26`	`26`	`/// </summary>`
	`27`	`+ [Obsolete("GeoHaystack indexes were deprecated in server version 4.4.")]`
`27`	`28`	`public class GeoHaystackSearchArgs`
`28`	`29`	`{`
`29`	`30`	`// private fields`
Original file line number	Diff line number	Diff line change
`@@ -987,11 +987,13 @@ public virtual GeoHaystackSearchResult<TDocument> GeoHaystackSearchAs<TDocument>`
`987`	`987`	`/// <typeparam name="TDocument">The type of the found documents.</typeparam>`
`988`	`988`	`/// <param name="args">The args.</param>`
`989`	`989`	`/// <returns>A <see cref="GeoNearResult{TDocument}"/>.</returns>`
	`990`	`+ [Obsolete("GeoHaystack indexes were deprecated in server version 4.4.")]`
`990`	`991`	`public virtual GeoHaystackSearchResult<TDocument> GeoHaystackSearchAs<TDocument>(GeoHaystackSearchArgs args)`
`991`	`992`	`{`
`992`	`993`	`return UsingImplicitSession(session => GeoHaystackSearchAs<TDocument>(session, args));`
`993`	`994`	`}`
`994`	`995`
	`996`	`+#pragma warning disable 618`
`995`	`997`	`private GeoHaystackSearchResult<TDocument> GeoHaystackSearchAs<TDocument>(IClientSessionHandle session, GeoHaystackSearchArgs args)`
`996`	`998`	`{`
`997`	`999`	`if (args == null) { throw new ArgumentNullException("args"); }`
`@@ -1018,6 +1020,7 @@ private GeoHaystackSearchResult<TDocument> GeoHaystackSearchAs<TDocument>(IClien`
`1018`	`1020`
`1019`	`1021`	`return ExecuteReadOperation(session, operation);`
`1020`	`1022`	`}`
	`1023`	`+#pragma warning restore 618`
`1021`	`1024`
`1022`	`1025`	`/// <summary>`
`1023`	`1026`	`/// Runs a geoHaystack search command on this collection.`
`@@ -1045,6 +1048,7 @@ public virtual GeoHaystackSearchResult GeoHaystackSearchAs(`
`1045`	`1048`	`/// <param name="documentType">The type to deserialize the documents as.</param>`
`1046`	`1049`	`/// <param name="args">The args.</param>`
`1047`	`1050`	`/// <returns>A <see cref="GeoNearResult{TDocument}"/>.</returns>`
	`1051`	`+ [Obsolete("GeoHaystack indexes were deprecated in server version 4.4.")]`
`1048`	`1052`	`public virtual GeoHaystackSearchResult GeoHaystackSearchAs(Type documentType, GeoHaystackSearchArgs args)`
`1049`	`1053`	`{`
`1050`	`1054`	`var methodDefinition = GetType().GetTypeInfo().GetMethod("GeoHaystackSearchAs", new Type[] { typeof(GeoHaystackSearchArgs) });`
`@@ -2410,6 +2414,7 @@ public virtual GeoHaystackSearchResult<TDefaultDocument> GeoHaystackSearch(`
`2410`	`2414`	`/// </summary>`
`2411`	`2415`	`/// <param name="args">The args.</param>`
`2412`	`2416`	`/// <returns>A <see cref="GeoHaystackSearchResult{TDocument}"/>.</returns>`
	`2417`	`+ [Obsolete("GeoHaystack indexes were deprecated in server version 4.4.")]`
`2413`	`2418`	`public virtual GeoHaystackSearchResult<TDefaultDocument> GeoHaystackSearch(GeoHaystackSearchArgs args)`
`2414`	`2419`	`{`
`2415`	`2420`	`return GeoHaystackSearchAs<TDefaultDocument>(args);`
Original file line number	Diff line number	Diff line change
`@@ -129,6 +129,7 @@ public static IndexKeysDefinition<TDocument> Geo2D<TDocument>(this IndexKeysDefi`
`129`	`129`	`/// <returns>`
`130`	`130`	`/// A combined index keys definition.`
`131`	`131`	`/// </returns>`
	`132`	`+ [Obsolete("GeoHaystack indexes were deprecated in server version 4.4.")]`
`132`	`133`	`public static IndexKeysDefinition<TDocument> GeoHaystack<TDocument>(this IndexKeysDefinition<TDocument> keys, FieldDefinition<TDocument> field, FieldDefinition<TDocument> additionalFieldName = null)`
`133`	`134`	`{`
`134`	`135`	`var builder = Builders<TDocument>.IndexKeys;`
`@@ -145,6 +146,7 @@ public static IndexKeysDefinition<TDocument> GeoHaystack<TDocument>(this IndexKe`
`145`	`146`	`/// <returns>`
`146`	`147`	`/// A combined index keys definition.`
`147`	`148`	`/// </returns>`
	`149`	`+ [Obsolete("GeoHaystack indexes were deprecated in server version 4.4.")]`
`148`	`150`	`public static IndexKeysDefinition<TDocument> GeoHaystack<TDocument>(this IndexKeysDefinition<TDocument> keys, Expression<Func<TDocument, object>> field, Expression<Func<TDocument, object>> additionalFieldName = null)`
`149`	`151`	`{`
`150`	`152`	`var builder = Builders<TDocument>.IndexKeys;`
`@@ -336,6 +338,7 @@ public IndexKeysDefinition<TDocument> Geo2D(Expression<Func<TDocument, object>>`
`336`	`338`	`/// <returns>`
`337`	`339`	`/// A geo haystack index key definition.`
`338`	`340`	`/// </returns>`
	`341`	`+ [Obsolete("GeoHaystack indexes were deprecated in server version 4.4.")]`
`339`	`342`	`public IndexKeysDefinition<TDocument> GeoHaystack(FieldDefinition<TDocument> field, FieldDefinition<TDocument> additionalFieldName = null)`
`340`	`343`	`{`
`341`	`344`	`return new GeoHaystackIndexKeyDefinition<TDocument>(field, additionalFieldName);`
`@@ -349,6 +352,7 @@ public IndexKeysDefinition<TDocument> GeoHaystack(FieldDefinition<TDocument> fie`
`349`	`352`	`/// <returns>`
`350`	`353`	`/// A geo haystack index key definition.`
`351`	`354`	`/// </returns>`
	`355`	`+ [Obsolete("GeoHaystack indexes were deprecated in server version 4.4.")]`
`352`	`356`	`public IndexKeysDefinition<TDocument> GeoHaystack(Expression<Func<TDocument, object>> field, Expression<Func<TDocument, object>> additionalFieldName = null)`
`353`	`357`	`{`
`354`	`358`	`FieldDefinition<TDocument> additional = additionalFieldName == null ? null : new ExpressionFieldDefinition<TDocument>(additionalFieldName);`
`@@ -502,6 +506,7 @@ public override BsonDocument Render(IBsonSerializer<TDocument> documentSerialize`
`502`	`506`	`}`
`503`	`507`	`}`
`504`	`508`
	`509`	`+ [Obsolete("GeoHaystack indexes were deprecated in server version 4.4.")]`
`505`	`510`	`internal sealed class GeoHaystackIndexKeyDefinition<TDocument> : IndexKeysDefinition<TDocument>`
`506`	`511`	`{`
`507`	`512`	`private readonly FieldDefinition<TDocument> _field;`