Define onlyIfUnchanged parameter for CreateOrUpdate and Delete operat…

…ions (Azure#11420)

* Combine MatchConditions and SearchRequestOptions

Fixes Azure#11052

* Redefine ETag properties as Azure.ETag?

Fixes Azure#11385

* Update public APIs

* Define onlyIfUnchanged for ETag support (#2)

This was suggested to match what AppConfiguration does. It simplifies it, with no practical reason for IfNoneMatch. We could always add that later as well.

* Update CHANGELOG and public APIs

sdk/search/Azure.Search.Documents/CHANGELOG.md

@@ -6,6 +6,8 @@
 
 - Removed constructor from `SynonymMap` with `IEnumerable<string>` parameter.
 - `SearchServiceClient.GetIndexes` and `SearchServiceClient.GetIndexesAsync` now return `Pageable<SearchIndex>` and `AsyncPageable<SearchIndex>` respectively.
+- Replaced `MatchConditions` parameters with `bool onlyIfUnchanged` parameters that require a model with an `ETag` property.
+- `ETag` properties have been redefined from `string` to `Azure.ETag?` consistent with other packages.
 
 ## 1.0.0-preview.2 (2020-04-06)
 

sdk/search/Azure.Search.Documents/src/Models/DataSource.cs

@@ -0,0 +1,22 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using Azure.Core;
+
+namespace Azure.Search.Documents.Models
+{
+    public partial class DataSource
+    {
+        [CodeGenMember("etag")]
+        private string _etag;
+
+        /// <summary>
+        /// The <see cref="Azure.ETag"/> of the <see cref="DataSource"/>.
+        /// </summary>
+        public ETag? ETag
+        {
+            get => _etag is null ? (ETag?)null : new ETag(_etag);
+            set => _etag = value?.ToString();
+        }
+    }
+}

sdk/search/Azure.Search.Documents/src/Models/SearchIndex.cs

@@ -10,7 +10,8 @@ namespace Azure.Search.Documents.Models
     [CodeGenModel("Index")]
     public partial class SearchIndex
     {
-        // TODO: Replace constructor and read-only properties when https://github.com/Azure/autorest.csharp/issues/554 is fixed.
+        [CodeGenMember("etag")]
+        private string _etag;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="SearchIndex"/> class.
@@ -105,5 +106,14 @@ public SearchIndex(string name, IEnumerable<SearchField> fields)
         /// </summary>
         [CodeGenMember(Initialize = true, EmptyAsUndefined = true)]
         public IList<Tokenizer> Tokenizers { get; }
+
+        /// <summary>
+        /// The <see cref="Azure.ETag"/> of the <see cref="SearchIndex"/>.
+        /// </summary>
+        public ETag? ETag
+        {
+            get => _etag is null ? (ETag?)null : new ETag(_etag);
+            set => _etag = value?.ToString();
+        }
     }
 }

sdk/search/Azure.Search.Documents/src/Models/SearchIndexer.cs

@@ -8,5 +8,16 @@ namespace Azure.Search.Documents.Models
     [CodeGenModel("Indexer")]
     public partial class SearchIndexer
     {
+        [CodeGenMember("etag")]
+        private string _etag;
+
+        /// <summary>
+        /// The <see cref="Azure.ETag"/> of the <see cref="SearchIndexer"/>.
+        /// </summary>
+        public ETag? ETag
+        {
+            get => _etag is null ? (ETag?)null : new ETag(_etag);
+            set => _etag = value?.ToString();
+        }
     }
 }

sdk/search/Azure.Search.Documents/src/Models/Skillset.cs

@@ -0,0 +1,22 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using Azure.Core;
+
+namespace Azure.Search.Documents.Models
+{
+    public partial class Skillset
+    {
+        [CodeGenMember("etag")]
+        private string _etag;
+
+        /// <summary>
+        /// The <see cref="Azure.ETag"/> of the <see cref="Skillset"/>.
+        /// </summary>
+        public ETag? ETag
+        {
+            get => _etag is null ? (ETag?)null : new ETag(_etag);
+            set => _etag = value?.ToString();
+        }
+    }
+}

sdk/search/Azure.Search.Documents/src/Models/SynonymMap.cs

@@ -14,6 +14,9 @@ public partial class SynonymMap
     {
         private const string DefaultFormat = "solr";
 
+        [CodeGenMember("etag")]
+        private string _etag;
+
         // TODO: Replace constructor and read-only properties when https://github.com/Azure/autorest.csharp/issues/554 is fixed.
 
         /// <summary>
@@ -56,6 +59,15 @@ public SynonymMap(string name, TextReader reader)
             Synonyms = reader.ReadToEnd();
         }
 
+        /// <summary>
+        /// The <see cref="Azure.ETag"/> of the <see cref="SynonymMap"/>.
+        /// </summary>
+        public ETag? ETag
+        {
+            get => _etag is null ? (ETag?)null : new ETag(_etag);
+            set => _etag = value?.ToString();
+        }
+
         /// <summary>
         /// Canonicalizes property names from how they appear on <see cref="SynonymMap"/> to those expected by the Search service.
         /// </summary>

sdk/search/Azure.Search.Documents/src/Options/SearchConditionalOptions.cs

@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+namespace Azure.Search.Documents
+{
+    /// <summary>
+    /// Options to customize Search service operations conditioned on <see cref="IfMatch"/> or <see cref="IfNoneMatch"/> ETags.
+    /// </summary>
+    public class SearchConditionalOptions : SearchRequestOptions
+    {
+        /// <summary>
+        /// Optionally limit requests to resources that have a matching ETag.
+        /// </summary>
+        public ETag? IfMatch { get; set; }
+
+        /// <summary>
+        /// Optionally limit requests to resources that do not match the ETag.
+        /// </summary>
+        public ETag? IfNoneMatch { get; set; }
+    }
+}