From c17b4e7047bd9b758934caf63ff7939862cf9c21 Mon Sep 17 00:00:00 2001 From: Heath Stewart Date: Tue, 2 Jun 2020 17:37:45 -0700 Subject: [PATCH] Make collection properties read-only Fixes #11712. Removes the setters per .NET guidelines. --- .../Azure.Search.Documents/CHANGELOG.md | 4 + .../Azure.Search.Documents.netstandard2.0.cs | 72 ++-- .../Models/AnalyzeRequest.Serialization.cs | 5 +- .../src/Generated/Models/AnalyzeRequest.cs | 10 +- .../CjkBigramTokenFilter.Serialization.cs | 3 +- .../Generated/Models/CjkBigramTokenFilter.cs | 6 +- .../CommonGramTokenFilter.Serialization.cs | 18 +- .../Generated/Models/CommonGramTokenFilter.cs | 5 +- .../Models/ConditionalSkill.Serialization.cs | 35 +- .../Models/CorsOptions.Serialization.cs | 18 +- .../src/Generated/Models/CorsOptions.cs | 5 +- .../Models/CustomAnalyzer.Serialization.cs | 5 +- .../src/Generated/Models/CustomAnalyzer.cs | 10 +- ...ryDecompounderTokenFilter.Serialization.cs | 18 +- .../DictionaryDecompounderTokenFilter.cs | 5 +- .../EdgeNGramTokenizer.Serialization.cs | 3 +- .../Generated/Models/EdgeNGramTokenizer.cs | 5 +- .../ElisionTokenFilter.Serialization.cs | 3 +- .../Generated/Models/ElisionTokenFilter.cs | 6 +- .../EntityRecognitionSkill.Serialization.cs | 37 +- .../Models/EntityRecognitionSkill.cs | 6 +- .../FieldMappingFunction.Serialization.cs | 3 +- .../Generated/Models/FieldMappingFunction.cs | 5 +- .../ImageAnalysisSkill.Serialization.cs | 39 +- .../Generated/Models/ImageAnalysisSkill.cs | 10 +- .../IndexingParameters.Serialization.cs | 3 +- .../Generated/Models/IndexingParameters.cs | 5 +- .../InputFieldMappingEntry.Serialization.cs | 3 +- .../Models/InputFieldMappingEntry.cs | 5 +- .../Models/KeepTokenFilter.Serialization.cs | 18 +- .../src/Generated/Models/KeepTokenFilter.cs | 5 +- .../KeyPhraseExtractionSkill.Serialization.cs | 35 +- .../KeywordMarkerTokenFilter.Serialization.cs | 18 +- .../Models/KeywordMarkerTokenFilter.cs | 5 +- .../LanguageDetectionSkill.Serialization.cs | 35 +- .../LuceneStandardAnalyzer.Serialization.cs | 3 +- .../Models/LuceneStandardAnalyzer.cs | 5 +- .../Models/MappingCharFilter.Serialization.cs | 18 +- .../src/Generated/Models/MappingCharFilter.cs | 5 +- .../Models/MergeSkill.Serialization.cs | 35 +- .../Models/NGramTokenizer.Serialization.cs | 3 +- .../src/Generated/Models/NGramTokenizer.cs | 5 +- .../Models/OcrSkill.Serialization.cs | 35 +- ...PatternCaptureTokenFilter.Serialization.cs | 18 +- .../Models/PatternCaptureTokenFilter.cs | 5 +- .../Models/ScoringProfile.Serialization.cs | 3 +- .../src/Generated/Models/ScoringProfile.cs | 5 +- .../Models/SearchField.Serialization.cs | 5 +- .../src/Generated/Models/SearchField.cs | 4 +- .../Models/SearchIndexer.Serialization.cs | 5 +- .../src/Generated/Models/SearchIndexer.cs | 10 +- .../SearchIndexerSkill.Serialization.cs | 35 +- .../Generated/Models/SearchIndexerSkill.cs | 8 +- .../SearchIndexerSkillset.Serialization.cs | 18 +- .../Generated/Models/SearchIndexerSkillset.cs | 4 +- .../Models/SearchSuggester.Serialization.cs | 18 +- .../src/Generated/Models/SearchSuggester.cs | 4 +- .../Models/SentimentSkill.Serialization.cs | 35 +- .../Models/ShaperSkill.Serialization.cs | 35 +- .../Models/SplitSkill.Serialization.cs | 35 +- ...temmerOverrideTokenFilter.Serialization.cs | 18 +- .../Models/StemmerOverrideTokenFilter.cs | 5 +- .../Models/StopAnalyzer.Serialization.cs | 3 +- .../src/Generated/Models/StopAnalyzer.cs | 6 +- .../StopwordsTokenFilter.Serialization.cs | 3 +- .../Generated/Models/StopwordsTokenFilter.cs | 6 +- .../SynonymTokenFilter.Serialization.cs | 18 +- .../Generated/Models/SynonymTokenFilter.cs | 5 +- .../TextTranslationSkill.Serialization.cs | 35 +- .../Models/TextWeights.Serialization.cs | 20 +- .../src/Generated/Models/TextWeights.cs | 3 - .../Models/WebApiSkill.Serialization.cs | 37 +- .../src/Generated/Models/WebApiSkill.cs | 5 +- .../WordDelimiterTokenFilter.Serialization.cs | 3 +- .../Models/WordDelimiterTokenFilter.cs | 5 +- .../src/Indexes/Models/AnalyzeRequest.cs | 19 + .../Indexes/Models/CjkBigramTokenFilter.cs | 15 + .../Indexes/Models/CommonGramTokenFilter.cs | 15 + .../src/Indexes/Models/ComplexField.cs | 6 +- .../src/Indexes/Models/CorsOptions.cs | 15 + .../src/Indexes/Models/CustomAnalyzer.cs | 19 + .../DictionaryDecompounderTokenFilter.cs | 15 + .../src/Indexes/Models/EdgeNGramTokenizer.cs | 15 + .../src/Indexes/Models/ElisionTokenFilter.cs | 15 + .../Indexes/Models/EntityRecognitionSkill.cs | 15 + .../Indexes/Models/FieldMappingFunction.cs | 15 + .../src/Indexes/Models/ImageAnalysisSkill.cs | 19 + .../src/Indexes/Models/IndexingParameters.cs | 15 + .../Indexes/Models/InputFieldMappingEntry.cs | 15 + .../src/Indexes/Models/KeepTokenFilter.cs | 15 + .../Models/KeywordMarkerTokenFilter.cs | 15 + .../Indexes/Models/LuceneStandardAnalyzer.cs | 15 + .../src/Indexes/Models/MappingCharFilter.cs | 15 + .../src/Indexes/Models/NGramTokenizer.cs | 15 + .../Models/PatternCaptureTokenFilter.cs | 15 + .../src/Indexes/Models/ScoringProfile.cs | 15 + .../src/Indexes/Models/SearchField.cs | 11 +- .../src/Indexes/Models/SearchIndexer.cs | 9 + .../src/Indexes/Models/SearchIndexerSkill.cs | 12 +- .../Indexes/Models/SearchIndexerSkillset.cs | 5 + .../src/Indexes/Models/SearchSuggester.cs | 6 +- .../src/Indexes/Models/SearchableField.cs | 6 +- .../Models/StemmerOverrideTokenFilter.cs | 15 + .../src/Indexes/Models/StopAnalyzer.cs | 15 + .../Indexes/Models/StopwordsTokenFilter.cs | 15 + .../src/Indexes/Models/SynonymTokenFilter.cs | 15 + .../src/Indexes/Models/TextWeights.cs | 15 + .../src/Indexes/Models/WebApiSkill.cs | 15 + .../Models/WordDelimiterTokenFilter.cs | 15 + .../tests/SearchableFieldAttributeTests.cs | 3 +- .../SearchIndexClientTests/UpdateIndex.json | 142 +++---- .../UpdateIndexAsync.json | 142 +++---- .../CreateAzureBlobIndexer.json | 353 ++++++++++-------- .../CreateAzureBlobIndexerAsync.json | 329 +++++++--------- .../tests/Utilities/SearchResources.Data.cs | 2 +- 115 files changed, 1535 insertions(+), 904 deletions(-) create mode 100644 sdk/search/Azure.Search.Documents/src/Indexes/Models/AnalyzeRequest.cs create mode 100644 sdk/search/Azure.Search.Documents/src/Indexes/Models/CjkBigramTokenFilter.cs create mode 100644 sdk/search/Azure.Search.Documents/src/Indexes/Models/CommonGramTokenFilter.cs create mode 100644 sdk/search/Azure.Search.Documents/src/Indexes/Models/CorsOptions.cs create mode 100644 sdk/search/Azure.Search.Documents/src/Indexes/Models/CustomAnalyzer.cs create mode 100644 sdk/search/Azure.Search.Documents/src/Indexes/Models/DictionaryDecompounderTokenFilter.cs create mode 100644 sdk/search/Azure.Search.Documents/src/Indexes/Models/EdgeNGramTokenizer.cs create mode 100644 sdk/search/Azure.Search.Documents/src/Indexes/Models/ElisionTokenFilter.cs create mode 100644 sdk/search/Azure.Search.Documents/src/Indexes/Models/EntityRecognitionSkill.cs create mode 100644 sdk/search/Azure.Search.Documents/src/Indexes/Models/FieldMappingFunction.cs create mode 100644 sdk/search/Azure.Search.Documents/src/Indexes/Models/ImageAnalysisSkill.cs create mode 100644 sdk/search/Azure.Search.Documents/src/Indexes/Models/IndexingParameters.cs create mode 100644 sdk/search/Azure.Search.Documents/src/Indexes/Models/InputFieldMappingEntry.cs create mode 100644 sdk/search/Azure.Search.Documents/src/Indexes/Models/KeepTokenFilter.cs create mode 100644 sdk/search/Azure.Search.Documents/src/Indexes/Models/KeywordMarkerTokenFilter.cs create mode 100644 sdk/search/Azure.Search.Documents/src/Indexes/Models/LuceneStandardAnalyzer.cs create mode 100644 sdk/search/Azure.Search.Documents/src/Indexes/Models/MappingCharFilter.cs create mode 100644 sdk/search/Azure.Search.Documents/src/Indexes/Models/NGramTokenizer.cs create mode 100644 sdk/search/Azure.Search.Documents/src/Indexes/Models/PatternCaptureTokenFilter.cs create mode 100644 sdk/search/Azure.Search.Documents/src/Indexes/Models/ScoringProfile.cs create mode 100644 sdk/search/Azure.Search.Documents/src/Indexes/Models/StemmerOverrideTokenFilter.cs create mode 100644 sdk/search/Azure.Search.Documents/src/Indexes/Models/StopAnalyzer.cs create mode 100644 sdk/search/Azure.Search.Documents/src/Indexes/Models/StopwordsTokenFilter.cs create mode 100644 sdk/search/Azure.Search.Documents/src/Indexes/Models/SynonymTokenFilter.cs create mode 100644 sdk/search/Azure.Search.Documents/src/Indexes/Models/TextWeights.cs create mode 100644 sdk/search/Azure.Search.Documents/src/Indexes/Models/WebApiSkill.cs create mode 100644 sdk/search/Azure.Search.Documents/src/Indexes/Models/WordDelimiterTokenFilter.cs diff --git a/sdk/search/Azure.Search.Documents/CHANGELOG.md b/sdk/search/Azure.Search.Documents/CHANGELOG.md index 95addbdcf029..2a22af4dd40b 100644 --- a/sdk/search/Azure.Search.Documents/CHANGELOG.md +++ b/sdk/search/Azure.Search.Documents/CHANGELOG.md @@ -6,8 +6,10 @@ - Moved models for managing indexes, indexers, and skillsets to `Azure.Search.Documents.Indexes.Models`. - Split `SearchServiceClient` into `SearchIndexClient` for managing indexes, and `SearchIndexerClient` for managing indexers, both of which are now in `Azure.Search.Documents.Indexes`. +<<<<<<< Updated upstream - Renamed `SearchIndexerDataSource` to `SearchIndexerDataSourceConnection`. - Renamed methods on `SearchIndexerClient` matching "\*DataSource" to "\*DataSourceConnection". +- Made collection- and dictionary-type properties read-only, i.e. has only get-accessors, based on [.NET Guidelines][net-guidelines-collection-properties]. ## 1.0.0-preview.3 (2020-05-05) @@ -67,3 +69,5 @@ - Initial preview of the Azure.Search client library enabling you to query and update documents in search indexes. + +[net-guidelines-collection-properties]: https://docs.microsoft.com/dotnet/standard/design-guidelines/guidelines-for-collections#collection-properties-and-return-values diff --git a/sdk/search/Azure.Search.Documents/api/Azure.Search.Documents.netstandard2.0.cs b/sdk/search/Azure.Search.Documents/api/Azure.Search.Documents.netstandard2.0.cs index 7f5c62cd20e6..9d59f9e16d7f 100644 --- a/sdk/search/Azure.Search.Documents/api/Azure.Search.Documents.netstandard2.0.cs +++ b/sdk/search/Azure.Search.Documents/api/Azure.Search.Documents.netstandard2.0.cs @@ -241,9 +241,9 @@ public partial class AnalyzeRequest { public AnalyzeRequest(string text) { } public Azure.Search.Documents.Indexes.Models.LexicalAnalyzerName? Analyzer { get { throw null; } set { } } - public System.Collections.Generic.IList CharFilters { get { throw null; } set { } } + public System.Collections.Generic.IList CharFilters { get { throw null; } } public string Text { get { throw null; } } - public System.Collections.Generic.IList TokenFilters { get { throw null; } set { } } + public System.Collections.Generic.IList TokenFilters { get { throw null; } } public Azure.Search.Documents.Indexes.Models.LexicalTokenizerName? Tokenizer { get { throw null; } set { } } } public partial class AsciiFoldingTokenFilter : Azure.Search.Documents.Indexes.Models.TokenFilter @@ -265,7 +265,7 @@ internal CharFilter() { } public partial class CjkBigramTokenFilter : Azure.Search.Documents.Indexes.Models.TokenFilter { public CjkBigramTokenFilter(string name) { } - public System.Collections.Generic.IList IgnoreScripts { get { throw null; } set { } } + public System.Collections.Generic.IList IgnoreScripts { get { throw null; } } public bool? OutputUnigrams { get { throw null; } set { } } } public enum CjkBigramTokenFilterScripts @@ -297,7 +297,7 @@ public CognitiveServicesAccountKey(string key) { } public partial class CommonGramTokenFilter : Azure.Search.Documents.Indexes.Models.TokenFilter { public CommonGramTokenFilter(string name, System.Collections.Generic.IEnumerable commonWords) { } - public System.Collections.Generic.IList CommonWords { get { throw null; } set { } } + public System.Collections.Generic.IList CommonWords { get { throw null; } } public bool? IgnoreCase { get { throw null; } set { } } public bool? UseQueryMode { get { throw null; } set { } } } @@ -313,14 +313,14 @@ public ConditionalSkill(System.Collections.Generic.IEnumerable allowedOrigins) { } - public System.Collections.Generic.IList AllowedOrigins { get { throw null; } set { } } + public System.Collections.Generic.IList AllowedOrigins { get { throw null; } } public long? MaxAgeInSeconds { get { throw null; } set { } } } public partial class CustomAnalyzer : Azure.Search.Documents.Indexes.Models.LexicalAnalyzer { public CustomAnalyzer(string name, Azure.Search.Documents.Indexes.Models.LexicalTokenizerName tokenizer) { } - public System.Collections.Generic.IList CharFilters { get { throw null; } set { } } - public System.Collections.Generic.IList TokenFilters { get { throw null; } set { } } + public System.Collections.Generic.IList CharFilters { get { throw null; } } + public System.Collections.Generic.IList TokenFilters { get { throw null; } } public Azure.Search.Documents.Indexes.Models.LexicalTokenizerName Tokenizer { get { throw null; } set { } } } public partial class DataChangeDetectionPolicy @@ -342,7 +342,7 @@ public DictionaryDecompounderTokenFilter(string name, System.Collections.Generic public int? MinSubwordSize { get { throw null; } set { } } public int? MinWordSize { get { throw null; } set { } } public bool? OnlyLongestMatch { get { throw null; } set { } } - public System.Collections.Generic.IList WordList { get { throw null; } set { } } + public System.Collections.Generic.IList WordList { get { throw null; } } } public partial class DistanceScoringFunction : Azure.Search.Documents.Indexes.Models.ScoringFunction { @@ -372,12 +372,12 @@ public partial class EdgeNGramTokenizer : Azure.Search.Documents.Indexes.Models. public EdgeNGramTokenizer(string name) { } public int? MaxGram { get { throw null; } set { } } public int? MinGram { get { throw null; } set { } } - public System.Collections.Generic.IList TokenChars { get { throw null; } set { } } + public System.Collections.Generic.IList TokenChars { get { throw null; } } } public partial class ElisionTokenFilter : Azure.Search.Documents.Indexes.Models.TokenFilter { public ElisionTokenFilter(string name) { } - public System.Collections.Generic.IList Articles { get { throw null; } set { } } + public System.Collections.Generic.IList Articles { get { throw null; } } } [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] public readonly partial struct EntityCategory : System.IEquatable @@ -405,7 +405,7 @@ public ElisionTokenFilter(string name) { } public partial class EntityRecognitionSkill : Azure.Search.Documents.Indexes.Models.SearchIndexerSkill { public EntityRecognitionSkill(System.Collections.Generic.IEnumerable inputs, System.Collections.Generic.IEnumerable outputs) { } - public System.Collections.Generic.IList Categories { get { throw null; } set { } } + public System.Collections.Generic.IList Categories { get { throw null; } } public Azure.Search.Documents.Indexes.Models.EntityRecognitionSkillLanguage? DefaultLanguageCode { get { throw null; } set { } } public bool? IncludeTypelessEntities { get { throw null; } set { } } public double? MinimumPrecision { get { throw null; } set { } } @@ -460,7 +460,7 @@ public partial class FieldMappingFunction { public FieldMappingFunction(string name) { } public string Name { get { throw null; } set { } } - public System.Collections.Generic.IDictionary Parameters { get { throw null; } set { } } + public System.Collections.Generic.IDictionary Parameters { get { throw null; } } } public partial class FreshnessScoringFunction : Azure.Search.Documents.Indexes.Models.ScoringFunction { @@ -481,8 +481,8 @@ public partial class ImageAnalysisSkill : Azure.Search.Documents.Indexes.Models. { public ImageAnalysisSkill(System.Collections.Generic.IEnumerable inputs, System.Collections.Generic.IEnumerable outputs) { } public Azure.Search.Documents.Indexes.Models.ImageAnalysisSkillLanguage? DefaultLanguageCode { get { throw null; } set { } } - public System.Collections.Generic.IList Details { get { throw null; } set { } } - public System.Collections.Generic.IList VisualFeatures { get { throw null; } set { } } + public System.Collections.Generic.IList Details { get { throw null; } } + public System.Collections.Generic.IList VisualFeatures { get { throw null; } } } [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)] public readonly partial struct ImageAnalysisSkillLanguage : System.IEquatable @@ -554,7 +554,7 @@ public partial class IndexingParameters { public IndexingParameters() { } public int? BatchSize { get { throw null; } set { } } - public System.Collections.Generic.IDictionary Configuration { get { throw null; } set { } } + public System.Collections.Generic.IDictionary Configuration { get { throw null; } } public int? MaxFailedItems { get { throw null; } set { } } public int? MaxFailedItemsPerBatch { get { throw null; } set { } } } @@ -567,7 +567,7 @@ public IndexingSchedule(System.TimeSpan interval) { } public partial class InputFieldMappingEntry { public InputFieldMappingEntry(string name) { } - public System.Collections.Generic.IList Inputs { get { throw null; } set { } } + public System.Collections.Generic.IList Inputs { get { throw null; } } public string Name { get { throw null; } set { } } public string Source { get { throw null; } set { } } public string SourceContext { get { throw null; } set { } } @@ -575,7 +575,7 @@ public InputFieldMappingEntry(string name) { } public partial class KeepTokenFilter : Azure.Search.Documents.Indexes.Models.TokenFilter { public KeepTokenFilter(string name, System.Collections.Generic.IEnumerable keepWords) { } - public System.Collections.Generic.IList KeepWords { get { throw null; } set { } } + public System.Collections.Generic.IList KeepWords { get { throw null; } } public bool? LowerCaseKeepWords { get { throw null; } set { } } } public partial class KeyPhraseExtractionSkill : Azure.Search.Documents.Indexes.Models.SearchIndexerSkill @@ -620,7 +620,7 @@ public partial class KeywordMarkerTokenFilter : Azure.Search.Documents.Indexes.M { public KeywordMarkerTokenFilter(string name, System.Collections.Generic.IEnumerable keywords) { } public bool? IgnoreCase { get { throw null; } set { } } - public System.Collections.Generic.IList Keywords { get { throw null; } set { } } + public System.Collections.Generic.IList Keywords { get { throw null; } } } public partial class KeywordTokenizer : Azure.Search.Documents.Indexes.Models.LexicalTokenizer { @@ -796,7 +796,7 @@ public partial class LuceneStandardAnalyzer : Azure.Search.Documents.Indexes.Mod { public LuceneStandardAnalyzer(string name) { } public int? MaxTokenLength { get { throw null; } set { } } - public System.Collections.Generic.IList Stopwords { get { throw null; } set { } } + public System.Collections.Generic.IList Stopwords { get { throw null; } } } public partial class LuceneStandardTokenizer : Azure.Search.Documents.Indexes.Models.LexicalTokenizer { @@ -818,7 +818,7 @@ public MagnitudeScoringParameters(double boostingRangeStart, double boostingRang public partial class MappingCharFilter : Azure.Search.Documents.Indexes.Models.CharFilter { public MappingCharFilter(string name, System.Collections.Generic.IEnumerable mappings) { } - public System.Collections.Generic.IList Mappings { get { throw null; } set { } } + public System.Collections.Generic.IList Mappings { get { throw null; } } } public partial class MergeSkill : Azure.Search.Documents.Indexes.Models.SearchIndexerSkill { @@ -944,7 +944,7 @@ public partial class NGramTokenizer : Azure.Search.Documents.Indexes.Models.Lexi public NGramTokenizer(string name) { } public int? MaxGram { get { throw null; } set { } } public int? MinGram { get { throw null; } set { } } - public System.Collections.Generic.IList TokenChars { get { throw null; } set { } } + public System.Collections.Generic.IList TokenChars { get { throw null; } } } public partial class OcrSkill : Azure.Search.Documents.Indexes.Models.SearchIndexerSkill { @@ -1020,7 +1020,7 @@ public PatternAnalyzer(string name) { } public partial class PatternCaptureTokenFilter : Azure.Search.Documents.Indexes.Models.TokenFilter { public PatternCaptureTokenFilter(string name, System.Collections.Generic.IEnumerable patterns) { } - public System.Collections.Generic.IList Patterns { get { throw null; } set { } } + public System.Collections.Generic.IList Patterns { get { throw null; } } public bool? PreserveOriginal { get { throw null; } set { } } } public partial class PatternReplaceCharFilter : Azure.Search.Documents.Indexes.Models.CharFilter @@ -1112,7 +1112,7 @@ public partial class ScoringProfile { public ScoringProfile(string name) { } public Azure.Search.Documents.Indexes.Models.ScoringFunctionAggregation? FunctionAggregation { get { throw null; } set { } } - public System.Collections.Generic.IList Functions { get { throw null; } set { } } + public System.Collections.Generic.IList Functions { get { throw null; } } public string Name { get { throw null; } set { } } public Azure.Search.Documents.Indexes.Models.TextWeights TextWeights { get { throw null; } set { } } } @@ -1199,10 +1199,10 @@ public SearchIndexer(string name, string dataSourceName, string targetIndexName) public string DataSourceName { get { throw null; } set { } } public string Description { get { throw null; } set { } } public Azure.ETag? ETag { get { throw null; } set { } } - public System.Collections.Generic.IList FieldMappings { get { throw null; } set { } } + public System.Collections.Generic.IList FieldMappings { get { throw null; } } public bool? IsDisabled { get { throw null; } set { } } public string Name { get { throw null; } set { } } - public System.Collections.Generic.IList OutputFieldMappings { get { throw null; } set { } } + public System.Collections.Generic.IList OutputFieldMappings { get { throw null; } } public Azure.Search.Documents.Indexes.Models.IndexingParameters Parameters { get { throw null; } set { } } public Azure.Search.Documents.Indexes.Models.IndexingSchedule Schedule { get { throw null; } set { } } public string SkillsetName { get { throw null; } set { } } @@ -1269,9 +1269,9 @@ public partial class SearchIndexerSkill internal SearchIndexerSkill() { } public string Context { get { throw null; } set { } } public string Description { get { throw null; } set { } } - public System.Collections.Generic.IList Inputs { get { throw null; } set { } } + public System.Collections.Generic.IList Inputs { get { throw null; } } public string Name { get { throw null; } set { } } - public System.Collections.Generic.IList Outputs { get { throw null; } set { } } + public System.Collections.Generic.IList Outputs { get { throw null; } } } public partial class SearchIndexerSkillset { @@ -1280,7 +1280,7 @@ public SearchIndexerSkillset(string name, System.Collections.Generic.IEnumerable public string Description { get { throw null; } set { } } public Azure.ETag? ETag { get { throw null; } set { } } public string Name { get { throw null; } set { } } - public System.Collections.Generic.IList Skills { get { throw null; } set { } } + public System.Collections.Generic.IList Skills { get { throw null; } } } public partial class SearchIndexerStatus { @@ -1350,7 +1350,7 @@ public partial class SearchSuggester public SearchSuggester(string name, System.Collections.Generic.IEnumerable sourceFields) { } public SearchSuggester(string name, params string[] sourceFields) { } public string Name { get { throw null; } set { } } - public System.Collections.Generic.IList SourceFields { get { throw null; } set { } } + public System.Collections.Generic.IList SourceFields { get { throw null; } } } public partial class SentimentSkill : Azure.Search.Documents.Indexes.Models.SearchIndexerSkill { @@ -1490,7 +1490,7 @@ public SqlIntegratedChangeTrackingPolicy() { } public partial class StemmerOverrideTokenFilter : Azure.Search.Documents.Indexes.Models.TokenFilter { public StemmerOverrideTokenFilter(string name, System.Collections.Generic.IEnumerable rules) { } - public System.Collections.Generic.IList Rules { get { throw null; } set { } } + public System.Collections.Generic.IList Rules { get { throw null; } } } public partial class StemmerTokenFilter : Azure.Search.Documents.Indexes.Models.TokenFilter { @@ -1557,7 +1557,7 @@ public enum StemmerTokenFilterLanguage public partial class StopAnalyzer : Azure.Search.Documents.Indexes.Models.LexicalAnalyzer { public StopAnalyzer(string name) { } - public System.Collections.Generic.IList Stopwords { get { throw null; } set { } } + public System.Collections.Generic.IList Stopwords { get { throw null; } } } public enum StopwordsList { @@ -1598,7 +1598,7 @@ public partial class StopwordsTokenFilter : Azure.Search.Documents.Indexes.Model public StopwordsTokenFilter(string name) { } public bool? IgnoreCase { get { throw null; } set { } } public bool? RemoveTrailingStopWords { get { throw null; } set { } } - public System.Collections.Generic.IList Stopwords { get { throw null; } set { } } + public System.Collections.Generic.IList Stopwords { get { throw null; } } public Azure.Search.Documents.Indexes.Models.StopwordsList? StopwordsList { get { throw null; } set { } } } public partial class SynonymMap @@ -1616,7 +1616,7 @@ public partial class SynonymTokenFilter : Azure.Search.Documents.Indexes.Models. public SynonymTokenFilter(string name, System.Collections.Generic.IEnumerable synonyms) { } public bool? Expand { get { throw null; } set { } } public bool? IgnoreCase { get { throw null; } set { } } - public System.Collections.Generic.IList Synonyms { get { throw null; } set { } } + public System.Collections.Generic.IList Synonyms { get { throw null; } } } public partial class TagScoringFunction : Azure.Search.Documents.Indexes.Models.ScoringFunction { @@ -1735,7 +1735,7 @@ public TextTranslationSkill(System.Collections.Generic.IEnumerable weights) { } - public System.Collections.Generic.IDictionary Weights { get { throw null; } set { } } + public System.Collections.Generic.IDictionary Weights { get { throw null; } } } public enum TokenCharacterKind { @@ -1843,7 +1843,7 @@ public partial class WebApiSkill : Azure.Search.Documents.Indexes.Models.SearchI public WebApiSkill(System.Collections.Generic.IEnumerable inputs, System.Collections.Generic.IEnumerable outputs, string uri) { } public int? BatchSize { get { throw null; } set { } } public int? DegreeOfParallelism { get { throw null; } set { } } - public System.Collections.Generic.IDictionary HttpHeaders { get { throw null; } set { } } + public System.Collections.Generic.IDictionary HttpHeaders { get { throw null; } } public string HttpMethod { get { throw null; } set { } } public System.TimeSpan? Timeout { get { throw null; } set { } } public string Uri { get { throw null; } set { } } @@ -1857,7 +1857,7 @@ public WordDelimiterTokenFilter(string name) { } public bool? GenerateNumberParts { get { throw null; } set { } } public bool? GenerateWordParts { get { throw null; } set { } } public bool? PreserveOriginal { get { throw null; } set { } } - public System.Collections.Generic.IList ProtectedWords { get { throw null; } set { } } + public System.Collections.Generic.IList ProtectedWords { get { throw null; } } public bool? SplitOnCaseChange { get { throw null; } set { } } public bool? SplitOnNumerics { get { throw null; } set { } } public bool? StemEnglishPossessive { get { throw null; } set { } } diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/AnalyzeRequest.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/AnalyzeRequest.Serialization.cs index 6b4992d0a475..a5943ff2a735 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/AnalyzeRequest.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/AnalyzeRequest.Serialization.cs @@ -5,6 +5,7 @@ #nullable disable +using System.Linq; using System.Text.Json; using Azure.Core; @@ -27,7 +28,7 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WritePropertyName("tokenizer"); writer.WriteStringValue(Tokenizer.Value.ToString()); } - if (TokenFilters != null) + if (TokenFilters != null && TokenFilters.Any()) { writer.WritePropertyName("tokenFilters"); writer.WriteStartArray(); @@ -37,7 +38,7 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) } writer.WriteEndArray(); } - if (CharFilters != null) + if (CharFilters != null && CharFilters.Any()) { writer.WritePropertyName("charFilters"); writer.WriteStartArray(); diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/AnalyzeRequest.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/AnalyzeRequest.cs index 8588e8044bad..56ad05a5cfa4 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/AnalyzeRequest.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/AnalyzeRequest.cs @@ -23,6 +23,8 @@ public AnalyzeRequest(string text) } Text = text; + TokenFilters = new List(); + CharFilters = new List(); } /// Initializes a new instance of AnalyzeRequest. @@ -36,8 +38,8 @@ internal AnalyzeRequest(string text, LexicalAnalyzerName? analyzer, LexicalToken Text = text; Analyzer = analyzer; Tokenizer = tokenizer; - TokenFilters = tokenFilters; - CharFilters = charFilters; + TokenFilters = tokenFilters ?? new List(); + CharFilters = charFilters ?? new List(); } /// The text to break into tokens. @@ -46,9 +48,5 @@ internal AnalyzeRequest(string text, LexicalAnalyzerName? analyzer, LexicalToken public LexicalAnalyzerName? Analyzer { get; set; } /// The name of the tokenizer to use to break the given text. If this parameter is not specified, you must specify an analyzer instead. The tokenizer and analyzer parameters are mutually exclusive. public LexicalTokenizerName? Tokenizer { get; set; } - /// An optional list of token filters to use when breaking the given text. This parameter can only be set when using the tokenizer parameter. - public IList TokenFilters { get; set; } - /// An optional list of character filters to use when breaking the given text. This parameter can only be set when using the tokenizer parameter. - public IList CharFilters { get; set; } } } diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/CjkBigramTokenFilter.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/CjkBigramTokenFilter.Serialization.cs index dc556db934ea..2f6ecd9c6cde 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/CjkBigramTokenFilter.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/CjkBigramTokenFilter.Serialization.cs @@ -6,6 +6,7 @@ #nullable disable using System.Collections.Generic; +using System.Linq; using System.Text.Json; using Azure.Core; @@ -16,7 +17,7 @@ public partial class CjkBigramTokenFilter : IUtf8JsonSerializable void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { writer.WriteStartObject(); - if (IgnoreScripts != null) + if (IgnoreScripts != null && IgnoreScripts.Any()) { writer.WritePropertyName("ignoreScripts"); writer.WriteStartArray(); diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/CjkBigramTokenFilter.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/CjkBigramTokenFilter.cs index 6be97d353856..307b289d9a28 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/CjkBigramTokenFilter.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/CjkBigramTokenFilter.cs @@ -22,6 +22,7 @@ public CjkBigramTokenFilter(string name) : base(name) throw new ArgumentNullException(nameof(name)); } + IgnoreScripts = new List(); ODataType = "#Microsoft.Azure.Search.CjkBigramTokenFilter"; } @@ -32,13 +33,10 @@ public CjkBigramTokenFilter(string name) : base(name) /// A value indicating whether to output both unigrams and bigrams (if true), or just bigrams (if false). Default is false. internal CjkBigramTokenFilter(string oDataType, string name, IList ignoreScripts, bool? outputUnigrams) : base(oDataType, name) { - IgnoreScripts = ignoreScripts; + IgnoreScripts = ignoreScripts ?? new List(); OutputUnigrams = outputUnigrams; ODataType = oDataType ?? "#Microsoft.Azure.Search.CjkBigramTokenFilter"; } - - /// The scripts to ignore. - public IList IgnoreScripts { get; set; } /// A value indicating whether to output both unigrams and bigrams (if true), or just bigrams (if false). Default is false. public bool? OutputUnigrams { get; set; } } diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/CommonGramTokenFilter.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/CommonGramTokenFilter.Serialization.cs index a4ab47326ed2..5355d23618c3 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/CommonGramTokenFilter.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/CommonGramTokenFilter.Serialization.cs @@ -6,6 +6,7 @@ #nullable disable using System.Collections.Generic; +using System.Linq; using System.Text.Json; using Azure.Core; @@ -16,13 +17,16 @@ public partial class CommonGramTokenFilter : IUtf8JsonSerializable void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { writer.WriteStartObject(); - writer.WritePropertyName("commonWords"); - writer.WriteStartArray(); - foreach (var item in CommonWords) + if (CommonWords != null && CommonWords.Any()) { - writer.WriteStringValue(item); + writer.WritePropertyName("commonWords"); + writer.WriteStartArray(); + foreach (var item in CommonWords) + { + writer.WriteStringValue(item); + } + writer.WriteEndArray(); } - writer.WriteEndArray(); if (IgnoreCase != null) { writer.WritePropertyName("ignoreCase"); @@ -51,6 +55,10 @@ internal static CommonGramTokenFilter DeserializeCommonGramTokenFilter(JsonEleme { if (property.NameEquals("commonWords")) { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } List array = new List(); foreach (var item in property.Value.EnumerateArray()) { diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/CommonGramTokenFilter.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/CommonGramTokenFilter.cs index 91cc0267a3d4..33e3b6cad5fe 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/CommonGramTokenFilter.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/CommonGramTokenFilter.cs @@ -40,14 +40,11 @@ public CommonGramTokenFilter(string name, IEnumerable commonWords) : bas /// A value that indicates whether the token filter is in query mode. When in query mode, the token filter generates bigrams and then removes common words and single terms followed by a common word. Default is false. internal CommonGramTokenFilter(string oDataType, string name, IList commonWords, bool? ignoreCase, bool? useQueryMode) : base(oDataType, name) { - CommonWords = commonWords; + CommonWords = commonWords ?? new List(); IgnoreCase = ignoreCase; UseQueryMode = useQueryMode; ODataType = oDataType ?? "#Microsoft.Azure.Search.CommonGramTokenFilter"; } - - /// The set of common words. - public IList CommonWords { get; set; } /// A value indicating whether common words matching will be case insensitive. Default is false. public bool? IgnoreCase { get; set; } /// A value that indicates whether the token filter is in query mode. When in query mode, the token filter generates bigrams and then removes common words and single terms followed by a common word. Default is false. diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/ConditionalSkill.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/ConditionalSkill.Serialization.cs index f049226a35f2..f7b8cd27097c 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/ConditionalSkill.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/ConditionalSkill.Serialization.cs @@ -6,6 +6,7 @@ #nullable disable using System.Collections.Generic; +using System.Linq; using System.Text.Json; using Azure.Core; @@ -33,20 +34,26 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WritePropertyName("context"); writer.WriteStringValue(Context); } - writer.WritePropertyName("inputs"); - writer.WriteStartArray(); - foreach (var item in Inputs) + if (Inputs != null && Inputs.Any()) { - writer.WriteObjectValue(item); + writer.WritePropertyName("inputs"); + writer.WriteStartArray(); + foreach (var item in Inputs) + { + writer.WriteObjectValue(item); + } + writer.WriteEndArray(); } - writer.WriteEndArray(); - writer.WritePropertyName("outputs"); - writer.WriteStartArray(); - foreach (var item in Outputs) + if (Outputs != null && Outputs.Any()) { - writer.WriteObjectValue(item); + writer.WritePropertyName("outputs"); + writer.WriteStartArray(); + foreach (var item in Outputs) + { + writer.WriteObjectValue(item); + } + writer.WriteEndArray(); } - writer.WriteEndArray(); writer.WriteEndObject(); } @@ -94,6 +101,10 @@ internal static ConditionalSkill DeserializeConditionalSkill(JsonElement element } if (property.NameEquals("inputs")) { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } List array = new List(); foreach (var item in property.Value.EnumerateArray()) { @@ -111,6 +122,10 @@ internal static ConditionalSkill DeserializeConditionalSkill(JsonElement element } if (property.NameEquals("outputs")) { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } List array = new List(); foreach (var item in property.Value.EnumerateArray()) { diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/CorsOptions.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/CorsOptions.Serialization.cs index 04523e310283..88a11f40d9f5 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/CorsOptions.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/CorsOptions.Serialization.cs @@ -6,6 +6,7 @@ #nullable disable using System.Collections.Generic; +using System.Linq; using System.Text.Json; using Azure.Core; @@ -16,13 +17,16 @@ public partial class CorsOptions : IUtf8JsonSerializable void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { writer.WriteStartObject(); - writer.WritePropertyName("allowedOrigins"); - writer.WriteStartArray(); - foreach (var item in AllowedOrigins) + if (AllowedOrigins != null && AllowedOrigins.Any()) { - writer.WriteStringValue(item); + writer.WritePropertyName("allowedOrigins"); + writer.WriteStartArray(); + foreach (var item in AllowedOrigins) + { + writer.WriteStringValue(item); + } + writer.WriteEndArray(); } - writer.WriteEndArray(); if (MaxAgeInSeconds != null) { writer.WritePropertyName("maxAgeInSeconds"); @@ -39,6 +43,10 @@ internal static CorsOptions DeserializeCorsOptions(JsonElement element) { if (property.NameEquals("allowedOrigins")) { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } List array = new List(); foreach (var item in property.Value.EnumerateArray()) { diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/CorsOptions.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/CorsOptions.cs index 00df3a2a6193..bfb37bff104a 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/CorsOptions.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/CorsOptions.cs @@ -31,12 +31,9 @@ public CorsOptions(IEnumerable allowedOrigins) /// The duration for which browsers should cache CORS preflight responses. Defaults to 5 minutes. internal CorsOptions(IList allowedOrigins, long? maxAgeInSeconds) { - AllowedOrigins = allowedOrigins; + AllowedOrigins = allowedOrigins ?? new List(); MaxAgeInSeconds = maxAgeInSeconds; } - - /// The list of origins from which JavaScript code will be granted access to your index. Can contain a list of hosts of the form {protocol}://{fully-qualified-domain-name}[:{port#}], or a single '*' to allow all origins (not recommended). - public IList AllowedOrigins { get; set; } /// The duration for which browsers should cache CORS preflight responses. Defaults to 5 minutes. public long? MaxAgeInSeconds { get; set; } } diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/CustomAnalyzer.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/CustomAnalyzer.Serialization.cs index 00e647656760..10848d4d2dd2 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/CustomAnalyzer.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/CustomAnalyzer.Serialization.cs @@ -6,6 +6,7 @@ #nullable disable using System.Collections.Generic; +using System.Linq; using System.Text.Json; using Azure.Core; @@ -18,7 +19,7 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WriteStartObject(); writer.WritePropertyName("tokenizer"); writer.WriteStringValue(Tokenizer.ToString()); - if (TokenFilters != null) + if (TokenFilters != null && TokenFilters.Any()) { writer.WritePropertyName("tokenFilters"); writer.WriteStartArray(); @@ -28,7 +29,7 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) } writer.WriteEndArray(); } - if (CharFilters != null) + if (CharFilters != null && CharFilters.Any()) { writer.WritePropertyName("charFilters"); writer.WriteStartArray(); diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/CustomAnalyzer.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/CustomAnalyzer.cs index 15b5ab272219..240bc7a5fd29 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/CustomAnalyzer.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/CustomAnalyzer.cs @@ -24,6 +24,8 @@ public CustomAnalyzer(string name, LexicalTokenizerName tokenizer) : base(name) } Tokenizer = tokenizer; + TokenFilters = new List(); + CharFilters = new List(); ODataType = "#Microsoft.Azure.Search.CustomAnalyzer"; } @@ -36,16 +38,12 @@ public CustomAnalyzer(string name, LexicalTokenizerName tokenizer) : base(name) internal CustomAnalyzer(string oDataType, string name, LexicalTokenizerName tokenizer, IList tokenFilters, IList charFilters) : base(oDataType, name) { Tokenizer = tokenizer; - TokenFilters = tokenFilters; - CharFilters = charFilters; + TokenFilters = tokenFilters ?? new List(); + CharFilters = charFilters ?? new List(); ODataType = oDataType ?? "#Microsoft.Azure.Search.CustomAnalyzer"; } /// The name of the tokenizer to use to divide continuous text into a sequence of tokens, such as breaking a sentence into words. public LexicalTokenizerName Tokenizer { get; set; } - /// A list of token filters used to filter out or modify the tokens generated by a tokenizer. For example, you can specify a lowercase filter that converts all characters to lowercase. The filters are run in the order in which they are listed. - public IList TokenFilters { get; set; } - /// A list of character filters used to prepare input text before it is processed by the tokenizer. For instance, they can replace certain characters or symbols. The filters are run in the order in which they are listed. - public IList CharFilters { get; set; } } } diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/DictionaryDecompounderTokenFilter.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/DictionaryDecompounderTokenFilter.Serialization.cs index 82ceb033d07d..54c4f5760b94 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/DictionaryDecompounderTokenFilter.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/DictionaryDecompounderTokenFilter.Serialization.cs @@ -6,6 +6,7 @@ #nullable disable using System.Collections.Generic; +using System.Linq; using System.Text.Json; using Azure.Core; @@ -16,13 +17,16 @@ public partial class DictionaryDecompounderTokenFilter : IUtf8JsonSerializable void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { writer.WriteStartObject(); - writer.WritePropertyName("wordList"); - writer.WriteStartArray(); - foreach (var item in WordList) + if (WordList != null && WordList.Any()) { - writer.WriteStringValue(item); + writer.WritePropertyName("wordList"); + writer.WriteStartArray(); + foreach (var item in WordList) + { + writer.WriteStringValue(item); + } + writer.WriteEndArray(); } - writer.WriteEndArray(); if (MinWordSize != null) { writer.WritePropertyName("minWordSize"); @@ -63,6 +67,10 @@ internal static DictionaryDecompounderTokenFilter DeserializeDictionaryDecompoun { if (property.NameEquals("wordList")) { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } List array = new List(); foreach (var item in property.Value.EnumerateArray()) { diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/DictionaryDecompounderTokenFilter.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/DictionaryDecompounderTokenFilter.cs index 59156a8f457f..1ebea33973fb 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/DictionaryDecompounderTokenFilter.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/DictionaryDecompounderTokenFilter.cs @@ -42,16 +42,13 @@ public DictionaryDecompounderTokenFilter(string name, IEnumerable wordLi /// A value indicating whether to add only the longest matching subword to the output. Default is false. internal DictionaryDecompounderTokenFilter(string oDataType, string name, IList wordList, int? minWordSize, int? minSubwordSize, int? maxSubwordSize, bool? onlyLongestMatch) : base(oDataType, name) { - WordList = wordList; + WordList = wordList ?? new List(); MinWordSize = minWordSize; MinSubwordSize = minSubwordSize; MaxSubwordSize = maxSubwordSize; OnlyLongestMatch = onlyLongestMatch; ODataType = oDataType ?? "#Microsoft.Azure.Search.DictionaryDecompounderTokenFilter"; } - - /// The list of words to match against. - public IList WordList { get; set; } /// The minimum word size. Only words longer than this get processed. Default is 5. Maximum is 300. public int? MinWordSize { get; set; } /// The minimum subword size. Only subwords longer than this are outputted. Default is 2. Maximum is 300. diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/EdgeNGramTokenizer.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/EdgeNGramTokenizer.Serialization.cs index 14c0cab3740e..649d2d99ae17 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/EdgeNGramTokenizer.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/EdgeNGramTokenizer.Serialization.cs @@ -6,6 +6,7 @@ #nullable disable using System.Collections.Generic; +using System.Linq; using System.Text.Json; using Azure.Core; @@ -26,7 +27,7 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WritePropertyName("maxGram"); writer.WriteNumberValue(MaxGram.Value); } - if (TokenChars != null) + if (TokenChars != null && TokenChars.Any()) { writer.WritePropertyName("tokenChars"); writer.WriteStartArray(); diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/EdgeNGramTokenizer.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/EdgeNGramTokenizer.cs index 956c330b5561..8c3918216ee2 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/EdgeNGramTokenizer.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/EdgeNGramTokenizer.cs @@ -22,6 +22,7 @@ public EdgeNGramTokenizer(string name) : base(name) throw new ArgumentNullException(nameof(name)); } + TokenChars = new List(); ODataType = "#Microsoft.Azure.Search.EdgeNGramTokenizer"; } @@ -35,7 +36,7 @@ internal EdgeNGramTokenizer(string oDataType, string name, int? minGram, int? ma { MinGram = minGram; MaxGram = maxGram; - TokenChars = tokenChars; + TokenChars = tokenChars ?? new List(); ODataType = oDataType ?? "#Microsoft.Azure.Search.EdgeNGramTokenizer"; } @@ -43,7 +44,5 @@ internal EdgeNGramTokenizer(string oDataType, string name, int? minGram, int? ma public int? MinGram { get; set; } /// The maximum n-gram length. Default is 2. Maximum is 300. public int? MaxGram { get; set; } - /// Character classes to keep in the tokens. - public IList TokenChars { get; set; } } } diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/ElisionTokenFilter.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/ElisionTokenFilter.Serialization.cs index a04ae94d9d9e..95db573a530c 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/ElisionTokenFilter.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/ElisionTokenFilter.Serialization.cs @@ -6,6 +6,7 @@ #nullable disable using System.Collections.Generic; +using System.Linq; using System.Text.Json; using Azure.Core; @@ -16,7 +17,7 @@ public partial class ElisionTokenFilter : IUtf8JsonSerializable void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { writer.WriteStartObject(); - if (Articles != null) + if (Articles != null && Articles.Any()) { writer.WritePropertyName("articles"); writer.WriteStartArray(); diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/ElisionTokenFilter.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/ElisionTokenFilter.cs index 54d68dd801de..ea1a82956a7f 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/ElisionTokenFilter.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/ElisionTokenFilter.cs @@ -22,6 +22,7 @@ public ElisionTokenFilter(string name) : base(name) throw new ArgumentNullException(nameof(name)); } + Articles = new List(); ODataType = "#Microsoft.Azure.Search.ElisionTokenFilter"; } @@ -31,11 +32,8 @@ public ElisionTokenFilter(string name) : base(name) /// The set of articles to remove. internal ElisionTokenFilter(string oDataType, string name, IList articles) : base(oDataType, name) { - Articles = articles; + Articles = articles ?? new List(); ODataType = oDataType ?? "#Microsoft.Azure.Search.ElisionTokenFilter"; } - - /// The set of articles to remove. - public IList Articles { get; set; } } } diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/EntityRecognitionSkill.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/EntityRecognitionSkill.Serialization.cs index 849a9744eb9c..ef74be30c7e7 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/EntityRecognitionSkill.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/EntityRecognitionSkill.Serialization.cs @@ -6,6 +6,7 @@ #nullable disable using System.Collections.Generic; +using System.Linq; using System.Text.Json; using Azure.Core; @@ -16,7 +17,7 @@ public partial class EntityRecognitionSkill : IUtf8JsonSerializable void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { writer.WriteStartObject(); - if (Categories != null) + if (Categories != null && Categories.Any()) { writer.WritePropertyName("categories"); writer.WriteStartArray(); @@ -58,20 +59,26 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WritePropertyName("context"); writer.WriteStringValue(Context); } - writer.WritePropertyName("inputs"); - writer.WriteStartArray(); - foreach (var item in Inputs) + if (Inputs != null && Inputs.Any()) { - writer.WriteObjectValue(item); + writer.WritePropertyName("inputs"); + writer.WriteStartArray(); + foreach (var item in Inputs) + { + writer.WriteObjectValue(item); + } + writer.WriteEndArray(); } - writer.WriteEndArray(); - writer.WritePropertyName("outputs"); - writer.WriteStartArray(); - foreach (var item in Outputs) + if (Outputs != null && Outputs.Any()) { - writer.WriteObjectValue(item); + writer.WritePropertyName("outputs"); + writer.WriteStartArray(); + foreach (var item in Outputs) + { + writer.WriteObjectValue(item); + } + writer.WriteEndArray(); } - writer.WriteEndArray(); writer.WriteEndObject(); } @@ -164,6 +171,10 @@ internal static EntityRecognitionSkill DeserializeEntityRecognitionSkill(JsonEle } if (property.NameEquals("inputs")) { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } List array = new List(); foreach (var item in property.Value.EnumerateArray()) { @@ -181,6 +192,10 @@ internal static EntityRecognitionSkill DeserializeEntityRecognitionSkill(JsonEle } if (property.NameEquals("outputs")) { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } List array = new List(); foreach (var item in property.Value.EnumerateArray()) { diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/EntityRecognitionSkill.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/EntityRecognitionSkill.cs index 8a44de7c33ba..a3cda15ab227 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/EntityRecognitionSkill.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/EntityRecognitionSkill.cs @@ -27,6 +27,7 @@ public EntityRecognitionSkill(IEnumerable inputs, IEnume throw new ArgumentNullException(nameof(outputs)); } + Categories = new List(); ODataType = "#Microsoft.Skills.Text.EntityRecognitionSkill"; } @@ -43,15 +44,12 @@ public EntityRecognitionSkill(IEnumerable inputs, IEnume /// A value between 0 and 1 that be used to only include entities whose confidence score is greater than the value specified. If not set (default), or if explicitly set to null, all entities will be included. internal EntityRecognitionSkill(string oDataType, string name, string description, string context, IList inputs, IList outputs, IList categories, EntityRecognitionSkillLanguage? defaultLanguageCode, bool? includeTypelessEntities, double? minimumPrecision) : base(oDataType, name, description, context, inputs, outputs) { - Categories = categories; + Categories = categories ?? new List(); DefaultLanguageCode = defaultLanguageCode; IncludeTypelessEntities = includeTypelessEntities; MinimumPrecision = minimumPrecision; ODataType = oDataType ?? "#Microsoft.Skills.Text.EntityRecognitionSkill"; } - - /// A list of entity categories that should be extracted. - public IList Categories { get; set; } /// A value indicating which language code to use. Default is en. public EntityRecognitionSkillLanguage? DefaultLanguageCode { get; set; } /// Determines whether or not to include entities which are well known but don't conform to a pre-defined type. If this configuration is not set (default), set to null or set to false, entities which don't conform to one of the pre-defined types will not be surfaced. diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/FieldMappingFunction.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/FieldMappingFunction.Serialization.cs index 73fea3e2482e..8bcb7005aa54 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/FieldMappingFunction.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/FieldMappingFunction.Serialization.cs @@ -6,6 +6,7 @@ #nullable disable using System.Collections.Generic; +using System.Linq; using System.Text.Json; using Azure.Core; @@ -18,7 +19,7 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WriteStartObject(); writer.WritePropertyName("name"); writer.WriteStringValue(Name); - if (Parameters != null) + if (Parameters != null && Parameters.Any()) { writer.WritePropertyName("parameters"); writer.WriteStartObject(); diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/FieldMappingFunction.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/FieldMappingFunction.cs index e6d7cec9dd42..8d3d81c2eb7c 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/FieldMappingFunction.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/FieldMappingFunction.cs @@ -23,6 +23,7 @@ public FieldMappingFunction(string name) } Name = name; + Parameters = new Dictionary(); } /// Initializes a new instance of FieldMappingFunction. @@ -31,12 +32,10 @@ public FieldMappingFunction(string name) internal FieldMappingFunction(string name, IDictionary parameters) { Name = name; - Parameters = parameters; + Parameters = parameters ?? new Dictionary(); } /// The name of the field mapping function. public string Name { get; set; } - /// A dictionary of parameter name/value pairs to pass to the function. Each value must be of a primitive type. - public IDictionary Parameters { get; set; } } } diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/ImageAnalysisSkill.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/ImageAnalysisSkill.Serialization.cs index 363fba54803b..d419ef8a2be2 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/ImageAnalysisSkill.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/ImageAnalysisSkill.Serialization.cs @@ -6,6 +6,7 @@ #nullable disable using System.Collections.Generic; +using System.Linq; using System.Text.Json; using Azure.Core; @@ -21,7 +22,7 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WritePropertyName("defaultLanguageCode"); writer.WriteStringValue(DefaultLanguageCode.Value.ToString()); } - if (VisualFeatures != null) + if (VisualFeatures != null && VisualFeatures.Any()) { writer.WritePropertyName("visualFeatures"); writer.WriteStartArray(); @@ -31,7 +32,7 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) } writer.WriteEndArray(); } - if (Details != null) + if (Details != null && Details.Any()) { writer.WritePropertyName("details"); writer.WriteStartArray(); @@ -58,20 +59,26 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WritePropertyName("context"); writer.WriteStringValue(Context); } - writer.WritePropertyName("inputs"); - writer.WriteStartArray(); - foreach (var item in Inputs) + if (Inputs != null && Inputs.Any()) { - writer.WriteObjectValue(item); + writer.WritePropertyName("inputs"); + writer.WriteStartArray(); + foreach (var item in Inputs) + { + writer.WriteObjectValue(item); + } + writer.WriteEndArray(); } - writer.WriteEndArray(); - writer.WritePropertyName("outputs"); - writer.WriteStartArray(); - foreach (var item in Outputs) + if (Outputs != null && Outputs.Any()) { - writer.WriteObjectValue(item); + writer.WritePropertyName("outputs"); + writer.WriteStartArray(); + foreach (var item in Outputs) + { + writer.WriteObjectValue(item); + } + writer.WriteEndArray(); } - writer.WriteEndArray(); writer.WriteEndObject(); } @@ -159,6 +166,10 @@ internal static ImageAnalysisSkill DeserializeImageAnalysisSkill(JsonElement ele } if (property.NameEquals("inputs")) { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } List array = new List(); foreach (var item in property.Value.EnumerateArray()) { @@ -176,6 +187,10 @@ internal static ImageAnalysisSkill DeserializeImageAnalysisSkill(JsonElement ele } if (property.NameEquals("outputs")) { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } List array = new List(); foreach (var item in property.Value.EnumerateArray()) { diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/ImageAnalysisSkill.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/ImageAnalysisSkill.cs index 3af5b0d67acd..baeaf4103677 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/ImageAnalysisSkill.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/ImageAnalysisSkill.cs @@ -27,6 +27,8 @@ public ImageAnalysisSkill(IEnumerable inputs, IEnumerabl throw new ArgumentNullException(nameof(outputs)); } + VisualFeatures = new List(); + Details = new List(); ODataType = "#Microsoft.Skills.Vision.ImageAnalysisSkill"; } @@ -43,16 +45,12 @@ public ImageAnalysisSkill(IEnumerable inputs, IEnumerabl internal ImageAnalysisSkill(string oDataType, string name, string description, string context, IList inputs, IList outputs, ImageAnalysisSkillLanguage? defaultLanguageCode, IList visualFeatures, IList details) : base(oDataType, name, description, context, inputs, outputs) { DefaultLanguageCode = defaultLanguageCode; - VisualFeatures = visualFeatures; - Details = details; + VisualFeatures = visualFeatures ?? new List(); + Details = details ?? new List(); ODataType = oDataType ?? "#Microsoft.Skills.Vision.ImageAnalysisSkill"; } /// A value indicating which language code to use. Default is en. public ImageAnalysisSkillLanguage? DefaultLanguageCode { get; set; } - /// A list of visual features. - public IList VisualFeatures { get; set; } - /// A string indicating which domain-specific details to return. - public IList Details { get; set; } } } diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/IndexingParameters.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/IndexingParameters.Serialization.cs index 8bc1e75b7d75..ccb0fed078de 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/IndexingParameters.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/IndexingParameters.Serialization.cs @@ -6,6 +6,7 @@ #nullable disable using System.Collections.Generic; +using System.Linq; using System.Text.Json; using Azure.Core; @@ -31,7 +32,7 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WritePropertyName("maxFailedItemsPerBatch"); writer.WriteNumberValue(MaxFailedItemsPerBatch.Value); } - if (Configuration != null) + if (Configuration != null && Configuration.Any()) { writer.WritePropertyName("configuration"); writer.WriteStartObject(); diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/IndexingParameters.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/IndexingParameters.cs index f78d6f60f7d7..25833e6ad376 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/IndexingParameters.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/IndexingParameters.cs @@ -15,6 +15,7 @@ public partial class IndexingParameters /// Initializes a new instance of IndexingParameters. public IndexingParameters() { + Configuration = new Dictionary(); } /// Initializes a new instance of IndexingParameters. @@ -27,7 +28,7 @@ internal IndexingParameters(int? batchSize, int? maxFailedItems, int? maxFailedI BatchSize = batchSize; MaxFailedItems = maxFailedItems; MaxFailedItemsPerBatch = maxFailedItemsPerBatch; - Configuration = configuration; + Configuration = configuration ?? new Dictionary(); } /// The number of items that are read from the data source and indexed as a single batch in order to improve performance. The default depends on the data source type. @@ -36,7 +37,5 @@ internal IndexingParameters(int? batchSize, int? maxFailedItems, int? maxFailedI public int? MaxFailedItems { get; set; } /// The maximum number of items in a single batch that can fail indexing for the batch to still be considered successful. -1 means no limit. Default is 0. public int? MaxFailedItemsPerBatch { get; set; } - /// A dictionary of indexer-specific configuration properties. Each name is the name of a specific property. Each value must be of a primitive type. - public IDictionary Configuration { get; set; } } } diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/InputFieldMappingEntry.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/InputFieldMappingEntry.Serialization.cs index 459b4f7d0c5f..53a28041fdde 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/InputFieldMappingEntry.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/InputFieldMappingEntry.Serialization.cs @@ -6,6 +6,7 @@ #nullable disable using System.Collections.Generic; +using System.Linq; using System.Text.Json; using Azure.Core; @@ -28,7 +29,7 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WritePropertyName("sourceContext"); writer.WriteStringValue(SourceContext); } - if (Inputs != null) + if (Inputs != null && Inputs.Any()) { writer.WritePropertyName("inputs"); writer.WriteStartArray(); diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/InputFieldMappingEntry.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/InputFieldMappingEntry.cs index 3e4084eb03e5..c811feaeb671 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/InputFieldMappingEntry.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/InputFieldMappingEntry.cs @@ -23,6 +23,7 @@ public InputFieldMappingEntry(string name) } Name = name; + Inputs = new List(); } /// Initializes a new instance of InputFieldMappingEntry. @@ -35,7 +36,7 @@ internal InputFieldMappingEntry(string name, string source, string sourceContext Name = name; Source = source; SourceContext = sourceContext; - Inputs = inputs; + Inputs = inputs ?? new List(); } /// The name of the input. @@ -44,7 +45,5 @@ internal InputFieldMappingEntry(string name, string source, string sourceContext public string Source { get; set; } /// The source context used for selecting recursive inputs. public string SourceContext { get; set; } - /// The recursive inputs used when creating a complex type. - public IList Inputs { get; set; } } } diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/KeepTokenFilter.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/KeepTokenFilter.Serialization.cs index 4ffa03d291f5..f0f5c3b8f596 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/KeepTokenFilter.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/KeepTokenFilter.Serialization.cs @@ -6,6 +6,7 @@ #nullable disable using System.Collections.Generic; +using System.Linq; using System.Text.Json; using Azure.Core; @@ -16,13 +17,16 @@ public partial class KeepTokenFilter : IUtf8JsonSerializable void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { writer.WriteStartObject(); - writer.WritePropertyName("keepWords"); - writer.WriteStartArray(); - foreach (var item in KeepWords) + if (KeepWords != null && KeepWords.Any()) { - writer.WriteStringValue(item); + writer.WritePropertyName("keepWords"); + writer.WriteStartArray(); + foreach (var item in KeepWords) + { + writer.WriteStringValue(item); + } + writer.WriteEndArray(); } - writer.WriteEndArray(); if (LowerCaseKeepWords != null) { writer.WritePropertyName("keepWordsCase"); @@ -45,6 +49,10 @@ internal static KeepTokenFilter DeserializeKeepTokenFilter(JsonElement element) { if (property.NameEquals("keepWords")) { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } List array = new List(); foreach (var item in property.Value.EnumerateArray()) { diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/KeepTokenFilter.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/KeepTokenFilter.cs index 276b08b169b6..c10700e42849 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/KeepTokenFilter.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/KeepTokenFilter.cs @@ -39,13 +39,10 @@ public KeepTokenFilter(string name, IEnumerable keepWords) : base(name) /// A value indicating whether to lower case all words first. Default is false. internal KeepTokenFilter(string oDataType, string name, IList keepWords, bool? lowerCaseKeepWords) : base(oDataType, name) { - KeepWords = keepWords; + KeepWords = keepWords ?? new List(); LowerCaseKeepWords = lowerCaseKeepWords; ODataType = oDataType ?? "#Microsoft.Azure.Search.KeepTokenFilter"; } - - /// The list of words to keep. - public IList KeepWords { get; set; } /// A value indicating whether to lower case all words first. Default is false. public bool? LowerCaseKeepWords { get; set; } } diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/KeyPhraseExtractionSkill.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/KeyPhraseExtractionSkill.Serialization.cs index 7a062eeabf7e..9472dbea6cf0 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/KeyPhraseExtractionSkill.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/KeyPhraseExtractionSkill.Serialization.cs @@ -6,6 +6,7 @@ #nullable disable using System.Collections.Generic; +using System.Linq; using System.Text.Json; using Azure.Core; @@ -43,20 +44,26 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WritePropertyName("context"); writer.WriteStringValue(Context); } - writer.WritePropertyName("inputs"); - writer.WriteStartArray(); - foreach (var item in Inputs) + if (Inputs != null && Inputs.Any()) { - writer.WriteObjectValue(item); + writer.WritePropertyName("inputs"); + writer.WriteStartArray(); + foreach (var item in Inputs) + { + writer.WriteObjectValue(item); + } + writer.WriteEndArray(); } - writer.WriteEndArray(); - writer.WritePropertyName("outputs"); - writer.WriteStartArray(); - foreach (var item in Outputs) + if (Outputs != null && Outputs.Any()) { - writer.WriteObjectValue(item); + writer.WritePropertyName("outputs"); + writer.WriteStartArray(); + foreach (var item in Outputs) + { + writer.WriteObjectValue(item); + } + writer.WriteEndArray(); } - writer.WriteEndArray(); writer.WriteEndObject(); } @@ -124,6 +131,10 @@ internal static KeyPhraseExtractionSkill DeserializeKeyPhraseExtractionSkill(Jso } if (property.NameEquals("inputs")) { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } List array = new List(); foreach (var item in property.Value.EnumerateArray()) { @@ -141,6 +152,10 @@ internal static KeyPhraseExtractionSkill DeserializeKeyPhraseExtractionSkill(Jso } if (property.NameEquals("outputs")) { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } List array = new List(); foreach (var item in property.Value.EnumerateArray()) { diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/KeywordMarkerTokenFilter.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/KeywordMarkerTokenFilter.Serialization.cs index a8dd1fdcace4..06aac6f42659 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/KeywordMarkerTokenFilter.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/KeywordMarkerTokenFilter.Serialization.cs @@ -6,6 +6,7 @@ #nullable disable using System.Collections.Generic; +using System.Linq; using System.Text.Json; using Azure.Core; @@ -16,13 +17,16 @@ public partial class KeywordMarkerTokenFilter : IUtf8JsonSerializable void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { writer.WriteStartObject(); - writer.WritePropertyName("keywords"); - writer.WriteStartArray(); - foreach (var item in Keywords) + if (Keywords != null && Keywords.Any()) { - writer.WriteStringValue(item); + writer.WritePropertyName("keywords"); + writer.WriteStartArray(); + foreach (var item in Keywords) + { + writer.WriteStringValue(item); + } + writer.WriteEndArray(); } - writer.WriteEndArray(); if (IgnoreCase != null) { writer.WritePropertyName("ignoreCase"); @@ -45,6 +49,10 @@ internal static KeywordMarkerTokenFilter DeserializeKeywordMarkerTokenFilter(Jso { if (property.NameEquals("keywords")) { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } List array = new List(); foreach (var item in property.Value.EnumerateArray()) { diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/KeywordMarkerTokenFilter.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/KeywordMarkerTokenFilter.cs index e7e2d90dbb49..8734c8ef5ea3 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/KeywordMarkerTokenFilter.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/KeywordMarkerTokenFilter.cs @@ -39,13 +39,10 @@ public KeywordMarkerTokenFilter(string name, IEnumerable keywords) : bas /// A value indicating whether to ignore case. If true, all words are converted to lower case first. Default is false. internal KeywordMarkerTokenFilter(string oDataType, string name, IList keywords, bool? ignoreCase) : base(oDataType, name) { - Keywords = keywords; + Keywords = keywords ?? new List(); IgnoreCase = ignoreCase; ODataType = oDataType ?? "#Microsoft.Azure.Search.KeywordMarkerTokenFilter"; } - - /// A list of words to mark as keywords. - public IList Keywords { get; set; } /// A value indicating whether to ignore case. If true, all words are converted to lower case first. Default is false. public bool? IgnoreCase { get; set; } } diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/LanguageDetectionSkill.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/LanguageDetectionSkill.Serialization.cs index 9085a8ca3399..381789d04637 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/LanguageDetectionSkill.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/LanguageDetectionSkill.Serialization.cs @@ -6,6 +6,7 @@ #nullable disable using System.Collections.Generic; +using System.Linq; using System.Text.Json; using Azure.Core; @@ -33,20 +34,26 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WritePropertyName("context"); writer.WriteStringValue(Context); } - writer.WritePropertyName("inputs"); - writer.WriteStartArray(); - foreach (var item in Inputs) + if (Inputs != null && Inputs.Any()) { - writer.WriteObjectValue(item); + writer.WritePropertyName("inputs"); + writer.WriteStartArray(); + foreach (var item in Inputs) + { + writer.WriteObjectValue(item); + } + writer.WriteEndArray(); } - writer.WriteEndArray(); - writer.WritePropertyName("outputs"); - writer.WriteStartArray(); - foreach (var item in Outputs) + if (Outputs != null && Outputs.Any()) { - writer.WriteObjectValue(item); + writer.WritePropertyName("outputs"); + writer.WriteStartArray(); + foreach (var item in Outputs) + { + writer.WriteObjectValue(item); + } + writer.WriteEndArray(); } - writer.WriteEndArray(); writer.WriteEndObject(); } @@ -94,6 +101,10 @@ internal static LanguageDetectionSkill DeserializeLanguageDetectionSkill(JsonEle } if (property.NameEquals("inputs")) { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } List array = new List(); foreach (var item in property.Value.EnumerateArray()) { @@ -111,6 +122,10 @@ internal static LanguageDetectionSkill DeserializeLanguageDetectionSkill(JsonEle } if (property.NameEquals("outputs")) { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } List array = new List(); foreach (var item in property.Value.EnumerateArray()) { diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/LuceneStandardAnalyzer.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/LuceneStandardAnalyzer.Serialization.cs index 2873bd5db705..cc7e2a89f3eb 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/LuceneStandardAnalyzer.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/LuceneStandardAnalyzer.Serialization.cs @@ -6,6 +6,7 @@ #nullable disable using System.Collections.Generic; +using System.Linq; using System.Text.Json; using Azure.Core; @@ -21,7 +22,7 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WritePropertyName("maxTokenLength"); writer.WriteNumberValue(MaxTokenLength.Value); } - if (Stopwords != null) + if (Stopwords != null && Stopwords.Any()) { writer.WritePropertyName("stopwords"); writer.WriteStartArray(); diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/LuceneStandardAnalyzer.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/LuceneStandardAnalyzer.cs index 50bdc3ebf81c..24e8557e364e 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/LuceneStandardAnalyzer.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/LuceneStandardAnalyzer.cs @@ -22,6 +22,7 @@ public LuceneStandardAnalyzer(string name) : base(name) throw new ArgumentNullException(nameof(name)); } + Stopwords = new List(); ODataType = "#Microsoft.Azure.Search.StandardAnalyzer"; } @@ -33,13 +34,11 @@ public LuceneStandardAnalyzer(string name) : base(name) internal LuceneStandardAnalyzer(string oDataType, string name, int? maxTokenLength, IList stopwords) : base(oDataType, name) { MaxTokenLength = maxTokenLength; - Stopwords = stopwords; + Stopwords = stopwords ?? new List(); ODataType = oDataType ?? "#Microsoft.Azure.Search.StandardAnalyzer"; } /// The maximum token length. Default is 255. Tokens longer than the maximum length are split. The maximum token length that can be used is 300 characters. public int? MaxTokenLength { get; set; } - /// A list of stopwords. - public IList Stopwords { get; set; } } } diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/MappingCharFilter.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/MappingCharFilter.Serialization.cs index 78fcc5c34968..ddecc1e0f92f 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/MappingCharFilter.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/MappingCharFilter.Serialization.cs @@ -6,6 +6,7 @@ #nullable disable using System.Collections.Generic; +using System.Linq; using System.Text.Json; using Azure.Core; @@ -16,13 +17,16 @@ public partial class MappingCharFilter : IUtf8JsonSerializable void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { writer.WriteStartObject(); - writer.WritePropertyName("mappings"); - writer.WriteStartArray(); - foreach (var item in Mappings) + if (Mappings != null && Mappings.Any()) { - writer.WriteStringValue(item); + writer.WritePropertyName("mappings"); + writer.WriteStartArray(); + foreach (var item in Mappings) + { + writer.WriteStringValue(item); + } + writer.WriteEndArray(); } - writer.WriteEndArray(); writer.WritePropertyName("@odata.type"); writer.WriteStringValue(ODataType); writer.WritePropertyName("name"); @@ -39,6 +43,10 @@ internal static MappingCharFilter DeserializeMappingCharFilter(JsonElement eleme { if (property.NameEquals("mappings")) { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } List array = new List(); foreach (var item in property.Value.EnumerateArray()) { diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/MappingCharFilter.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/MappingCharFilter.cs index eb1e4022b2d1..cabd7fb0fa77 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/MappingCharFilter.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/MappingCharFilter.cs @@ -38,11 +38,8 @@ public MappingCharFilter(string name, IEnumerable mappings) : base(name) /// A list of mappings of the following format: "a=>b" (all occurrences of the character "a" will be replaced with character "b"). internal MappingCharFilter(string oDataType, string name, IList mappings) : base(oDataType, name) { - Mappings = mappings; + Mappings = mappings ?? new List(); ODataType = oDataType ?? "#Microsoft.Azure.Search.MappingCharFilter"; } - - /// A list of mappings of the following format: "a=>b" (all occurrences of the character "a" will be replaced with character "b"). - public IList Mappings { get; set; } } } diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/MergeSkill.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/MergeSkill.Serialization.cs index 50d616c63e21..f6e01c63c639 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/MergeSkill.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/MergeSkill.Serialization.cs @@ -6,6 +6,7 @@ #nullable disable using System.Collections.Generic; +using System.Linq; using System.Text.Json; using Azure.Core; @@ -43,20 +44,26 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WritePropertyName("context"); writer.WriteStringValue(Context); } - writer.WritePropertyName("inputs"); - writer.WriteStartArray(); - foreach (var item in Inputs) + if (Inputs != null && Inputs.Any()) { - writer.WriteObjectValue(item); + writer.WritePropertyName("inputs"); + writer.WriteStartArray(); + foreach (var item in Inputs) + { + writer.WriteObjectValue(item); + } + writer.WriteEndArray(); } - writer.WriteEndArray(); - writer.WritePropertyName("outputs"); - writer.WriteStartArray(); - foreach (var item in Outputs) + if (Outputs != null && Outputs.Any()) { - writer.WriteObjectValue(item); + writer.WritePropertyName("outputs"); + writer.WriteStartArray(); + foreach (var item in Outputs) + { + writer.WriteObjectValue(item); + } + writer.WriteEndArray(); } - writer.WriteEndArray(); writer.WriteEndObject(); } @@ -124,6 +131,10 @@ internal static MergeSkill DeserializeMergeSkill(JsonElement element) } if (property.NameEquals("inputs")) { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } List array = new List(); foreach (var item in property.Value.EnumerateArray()) { @@ -141,6 +152,10 @@ internal static MergeSkill DeserializeMergeSkill(JsonElement element) } if (property.NameEquals("outputs")) { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } List array = new List(); foreach (var item in property.Value.EnumerateArray()) { diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/NGramTokenizer.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/NGramTokenizer.Serialization.cs index 7026b9feb2fb..b7552dc53391 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/NGramTokenizer.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/NGramTokenizer.Serialization.cs @@ -6,6 +6,7 @@ #nullable disable using System.Collections.Generic; +using System.Linq; using System.Text.Json; using Azure.Core; @@ -26,7 +27,7 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WritePropertyName("maxGram"); writer.WriteNumberValue(MaxGram.Value); } - if (TokenChars != null) + if (TokenChars != null && TokenChars.Any()) { writer.WritePropertyName("tokenChars"); writer.WriteStartArray(); diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/NGramTokenizer.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/NGramTokenizer.cs index 909c8674929c..692dca65cf0d 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/NGramTokenizer.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/NGramTokenizer.cs @@ -22,6 +22,7 @@ public NGramTokenizer(string name) : base(name) throw new ArgumentNullException(nameof(name)); } + TokenChars = new List(); ODataType = "#Microsoft.Azure.Search.NGramTokenizer"; } @@ -35,7 +36,7 @@ internal NGramTokenizer(string oDataType, string name, int? minGram, int? maxGra { MinGram = minGram; MaxGram = maxGram; - TokenChars = tokenChars; + TokenChars = tokenChars ?? new List(); ODataType = oDataType ?? "#Microsoft.Azure.Search.NGramTokenizer"; } @@ -43,7 +44,5 @@ internal NGramTokenizer(string oDataType, string name, int? minGram, int? maxGra public int? MinGram { get; set; } /// The maximum n-gram length. Default is 2. Maximum is 300. public int? MaxGram { get; set; } - /// Character classes to keep in the tokens. - public IList TokenChars { get; set; } } } diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/OcrSkill.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/OcrSkill.Serialization.cs index 326e24d02561..881a744a7fe3 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/OcrSkill.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/OcrSkill.Serialization.cs @@ -6,6 +6,7 @@ #nullable disable using System.Collections.Generic; +using System.Linq; using System.Text.Json; using Azure.Core; @@ -43,20 +44,26 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WritePropertyName("context"); writer.WriteStringValue(Context); } - writer.WritePropertyName("inputs"); - writer.WriteStartArray(); - foreach (var item in Inputs) + if (Inputs != null && Inputs.Any()) { - writer.WriteObjectValue(item); + writer.WritePropertyName("inputs"); + writer.WriteStartArray(); + foreach (var item in Inputs) + { + writer.WriteObjectValue(item); + } + writer.WriteEndArray(); } - writer.WriteEndArray(); - writer.WritePropertyName("outputs"); - writer.WriteStartArray(); - foreach (var item in Outputs) + if (Outputs != null && Outputs.Any()) { - writer.WriteObjectValue(item); + writer.WritePropertyName("outputs"); + writer.WriteStartArray(); + foreach (var item in Outputs) + { + writer.WriteObjectValue(item); + } + writer.WriteEndArray(); } - writer.WriteEndArray(); writer.WriteEndObject(); } @@ -124,6 +131,10 @@ internal static OcrSkill DeserializeOcrSkill(JsonElement element) } if (property.NameEquals("inputs")) { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } List array = new List(); foreach (var item in property.Value.EnumerateArray()) { @@ -141,6 +152,10 @@ internal static OcrSkill DeserializeOcrSkill(JsonElement element) } if (property.NameEquals("outputs")) { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } List array = new List(); foreach (var item in property.Value.EnumerateArray()) { diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/PatternCaptureTokenFilter.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/PatternCaptureTokenFilter.Serialization.cs index 6c09916934d6..f572c47867bc 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/PatternCaptureTokenFilter.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/PatternCaptureTokenFilter.Serialization.cs @@ -6,6 +6,7 @@ #nullable disable using System.Collections.Generic; +using System.Linq; using System.Text.Json; using Azure.Core; @@ -16,13 +17,16 @@ public partial class PatternCaptureTokenFilter : IUtf8JsonSerializable void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { writer.WriteStartObject(); - writer.WritePropertyName("patterns"); - writer.WriteStartArray(); - foreach (var item in Patterns) + if (Patterns != null && Patterns.Any()) { - writer.WriteStringValue(item); + writer.WritePropertyName("patterns"); + writer.WriteStartArray(); + foreach (var item in Patterns) + { + writer.WriteStringValue(item); + } + writer.WriteEndArray(); } - writer.WriteEndArray(); if (PreserveOriginal != null) { writer.WritePropertyName("preserveOriginal"); @@ -45,6 +49,10 @@ internal static PatternCaptureTokenFilter DeserializePatternCaptureTokenFilter(J { if (property.NameEquals("patterns")) { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } List array = new List(); foreach (var item in property.Value.EnumerateArray()) { diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/PatternCaptureTokenFilter.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/PatternCaptureTokenFilter.cs index 16fe0ab5da75..be3034acd171 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/PatternCaptureTokenFilter.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/PatternCaptureTokenFilter.cs @@ -39,13 +39,10 @@ public PatternCaptureTokenFilter(string name, IEnumerable patterns) : ba /// A value indicating whether to return the original token even if one of the patterns matches. Default is true. internal PatternCaptureTokenFilter(string oDataType, string name, IList patterns, bool? preserveOriginal) : base(oDataType, name) { - Patterns = patterns; + Patterns = patterns ?? new List(); PreserveOriginal = preserveOriginal; ODataType = oDataType ?? "#Microsoft.Azure.Search.PatternCaptureTokenFilter"; } - - /// A list of patterns to match against each token. - public IList Patterns { get; set; } /// A value indicating whether to return the original token even if one of the patterns matches. Default is true. public bool? PreserveOriginal { get; set; } } diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/ScoringProfile.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/ScoringProfile.Serialization.cs index cf2e1b43f4e0..0d9dabfdff0d 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/ScoringProfile.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/ScoringProfile.Serialization.cs @@ -6,6 +6,7 @@ #nullable disable using System.Collections.Generic; +using System.Linq; using System.Text.Json; using Azure.Core; @@ -23,7 +24,7 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WritePropertyName("text"); writer.WriteObjectValue(TextWeights); } - if (Functions != null) + if (Functions != null && Functions.Any()) { writer.WritePropertyName("functions"); writer.WriteStartArray(); diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/ScoringProfile.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/ScoringProfile.cs index c5abccb42302..4de6b903f022 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/ScoringProfile.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/ScoringProfile.cs @@ -23,6 +23,7 @@ public ScoringProfile(string name) } Name = name; + Functions = new List(); } /// Initializes a new instance of ScoringProfile. @@ -34,7 +35,7 @@ internal ScoringProfile(string name, TextWeights textWeights, IList(); FunctionAggregation = functionAggregation; } @@ -42,8 +43,6 @@ internal ScoringProfile(string name, TextWeights textWeights, IList Parameters that boost scoring based on text matches in certain index fields. public TextWeights TextWeights { get; set; } - /// The collection of functions that influence the scoring of documents. - public IList Functions { get; set; } /// A value indicating how the results of individual scoring functions should be combined. Defaults to "Sum". Ignored if there are no scoring functions. public ScoringFunctionAggregation? FunctionAggregation { get; set; } } diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchField.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchField.Serialization.cs index 2ebcf8b3468c..7818d59277ef 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchField.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchField.Serialization.cs @@ -6,6 +6,7 @@ #nullable disable using System.Collections.Generic; +using System.Linq; using System.Text.Json; using Azure.Core; @@ -68,7 +69,7 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WritePropertyName("indexAnalyzer"); writer.WriteStringValue(IndexAnalyzerName.Value.ToString()); } - if (SynonymMapNames != null) + if (SynonymMapNames != null && SynonymMapNames.Any()) { writer.WritePropertyName("synonymMaps"); writer.WriteStartArray(); @@ -78,7 +79,7 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) } writer.WriteEndArray(); } - if (Fields != null) + if (Fields != null && Fields.Any()) { writer.WritePropertyName("fields"); writer.WriteStartArray(); diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchField.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchField.cs index c77084b0b734..79ad7ecff2eb 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchField.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchField.cs @@ -41,8 +41,8 @@ internal SearchField(string name, SearchFieldDataType type, bool? isKey, bool? i AnalyzerName = analyzerName; SearchAnalyzerName = searchAnalyzerName; IndexAnalyzerName = indexAnalyzerName; - SynonymMapNames = synonymMapNames; - Fields = fields; + SynonymMapNames = synonymMapNames ?? new List(); + Fields = fields ?? new List(); } } } diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchIndexer.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchIndexer.Serialization.cs index e00047263e50..8bd33f7e739d 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchIndexer.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchIndexer.Serialization.cs @@ -6,6 +6,7 @@ #nullable disable using System.Collections.Generic; +using System.Linq; using System.Text.Json; using Azure.Core; @@ -42,7 +43,7 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WritePropertyName("parameters"); writer.WriteObjectValue(Parameters); } - if (FieldMappings != null) + if (FieldMappings != null && FieldMappings.Any()) { writer.WritePropertyName("fieldMappings"); writer.WriteStartArray(); @@ -52,7 +53,7 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) } writer.WriteEndArray(); } - if (OutputFieldMappings != null) + if (OutputFieldMappings != null && OutputFieldMappings.Any()) { writer.WritePropertyName("outputFieldMappings"); writer.WriteStartArray(); diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchIndexer.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchIndexer.cs index 5d229e0dfcdb..fa9282253dab 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchIndexer.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchIndexer.cs @@ -35,6 +35,8 @@ public SearchIndexer(string name, string dataSourceName, string targetIndexName) Name = name; DataSourceName = dataSourceName; TargetIndexName = targetIndexName; + FieldMappings = new List(); + OutputFieldMappings = new List(); } /// Initializes a new instance of SearchIndexer. @@ -58,8 +60,8 @@ internal SearchIndexer(string name, string description, string dataSourceName, s TargetIndexName = targetIndexName; Schedule = schedule; Parameters = parameters; - FieldMappings = fieldMappings; - OutputFieldMappings = outputFieldMappings; + FieldMappings = fieldMappings ?? new List(); + OutputFieldMappings = outputFieldMappings ?? new List(); IsDisabled = isDisabled; _etag = Etag; } @@ -78,10 +80,6 @@ internal SearchIndexer(string name, string description, string dataSourceName, s public IndexingSchedule Schedule { get; set; } /// Parameters for indexer execution. public IndexingParameters Parameters { get; set; } - /// Defines mappings between fields in the data source and corresponding target fields in the index. - public IList FieldMappings { get; set; } - /// Output field mappings are applied after enrichment and immediately before indexing. - public IList OutputFieldMappings { get; set; } /// A value indicating whether the indexer is disabled. Default is false. public bool? IsDisabled { get; set; } } diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchIndexerSkill.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchIndexerSkill.Serialization.cs index 67f447b1ab00..0db7bd8be9ec 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchIndexerSkill.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchIndexerSkill.Serialization.cs @@ -6,6 +6,7 @@ #nullable disable using System.Collections.Generic; +using System.Linq; using System.Text.Json; using Azure.Core; @@ -33,20 +34,26 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WritePropertyName("context"); writer.WriteStringValue(Context); } - writer.WritePropertyName("inputs"); - writer.WriteStartArray(); - foreach (var item in Inputs) + if (Inputs != null && Inputs.Any()) { - writer.WriteObjectValue(item); + writer.WritePropertyName("inputs"); + writer.WriteStartArray(); + foreach (var item in Inputs) + { + writer.WriteObjectValue(item); + } + writer.WriteEndArray(); } - writer.WriteEndArray(); - writer.WritePropertyName("outputs"); - writer.WriteStartArray(); - foreach (var item in Outputs) + if (Outputs != null && Outputs.Any()) { - writer.WriteObjectValue(item); + writer.WritePropertyName("outputs"); + writer.WriteStartArray(); + foreach (var item in Outputs) + { + writer.WriteObjectValue(item); + } + writer.WriteEndArray(); } - writer.WriteEndArray(); writer.WriteEndObject(); } @@ -112,6 +119,10 @@ internal static SearchIndexerSkill DeserializeSearchIndexerSkill(JsonElement ele } if (property.NameEquals("inputs")) { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } List array = new List(); foreach (var item in property.Value.EnumerateArray()) { @@ -129,6 +140,10 @@ internal static SearchIndexerSkill DeserializeSearchIndexerSkill(JsonElement ele } if (property.NameEquals("outputs")) { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } List array = new List(); foreach (var item in property.Value.EnumerateArray()) { diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchIndexerSkill.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchIndexerSkill.cs index 8d3331dd2198..cb6641a113ae 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchIndexerSkill.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchIndexerSkill.cs @@ -28,8 +28,8 @@ internal SearchIndexerSkill(string oDataType, string name, string description, s Name = name; Description = description; Context = context; - Inputs = inputs; - Outputs = outputs; + Inputs = inputs ?? new List(); + Outputs = outputs ?? new List(); } /// Identifies the concrete type of the skill. @@ -40,9 +40,5 @@ internal SearchIndexerSkill(string oDataType, string name, string description, s public string Description { get; set; } /// Represents the level at which operations take place, such as the document root or document content (for example, /document or /document/content). The default is /document. public string Context { get; set; } - /// Inputs of the skills could be a column in the source data set, or the output of an upstream skill. - public IList Inputs { get; set; } - /// The output of a skill is either a field in a search index, or a value that can be consumed as an input by another skill. - public IList Outputs { get; set; } } } diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchIndexerSkillset.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchIndexerSkillset.Serialization.cs index b9279a1b0fde..1f9606900fa4 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchIndexerSkillset.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchIndexerSkillset.Serialization.cs @@ -6,6 +6,7 @@ #nullable disable using System.Collections.Generic; +using System.Linq; using System.Text.Json; using Azure.Core; @@ -23,13 +24,16 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WritePropertyName("description"); writer.WriteStringValue(Description); } - writer.WritePropertyName("skills"); - writer.WriteStartArray(); - foreach (var item in Skills) + if (Skills != null && Skills.Any()) { - writer.WriteObjectValue(item); + writer.WritePropertyName("skills"); + writer.WriteStartArray(); + foreach (var item in Skills) + { + writer.WriteObjectValue(item); + } + writer.WriteEndArray(); } - writer.WriteEndArray(); if (CognitiveServicesAccount != null) { writer.WritePropertyName("cognitiveServices"); @@ -68,6 +72,10 @@ internal static SearchIndexerSkillset DeserializeSearchIndexerSkillset(JsonEleme } if (property.NameEquals("skills")) { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } List array = new List(); foreach (var item in property.Value.EnumerateArray()) { diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchIndexerSkillset.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchIndexerSkillset.cs index 3e500102ce43..ebd2e51ff773 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchIndexerSkillset.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchIndexerSkillset.cs @@ -42,7 +42,7 @@ internal SearchIndexerSkillset(string name, string description, IList(); CognitiveServicesAccount = cognitiveServicesAccount; _etag = Etag; } @@ -51,8 +51,6 @@ internal SearchIndexerSkillset(string name, string description, IList The description of the skillset. public string Description { get; set; } - /// A list of skills in the skillset. - public IList Skills { get; set; } /// Details about cognitive services to be used when running skills. public CognitiveServicesAccount CognitiveServicesAccount { get; set; } } diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchSuggester.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchSuggester.Serialization.cs index 81e1a121f92c..617668ee8595 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchSuggester.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchSuggester.Serialization.cs @@ -6,6 +6,7 @@ #nullable disable using System.Collections.Generic; +using System.Linq; using System.Text.Json; using Azure.Core; @@ -23,13 +24,16 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WritePropertyName("searchMode"); writer.WriteStringValue(SearchMode); } - writer.WritePropertyName("sourceFields"); - writer.WriteStartArray(); - foreach (var item in SourceFields) + if (SourceFields != null && SourceFields.Any()) { - writer.WriteStringValue(item); + writer.WritePropertyName("sourceFields"); + writer.WriteStartArray(); + foreach (var item in SourceFields) + { + writer.WriteStringValue(item); + } + writer.WriteEndArray(); } - writer.WriteEndArray(); writer.WriteEndObject(); } @@ -56,6 +60,10 @@ internal static SearchSuggester DeserializeSearchSuggester(JsonElement element) } if (property.NameEquals("sourceFields")) { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } List array = new List(); foreach (var item in property.Value.EnumerateArray()) { diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchSuggester.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchSuggester.cs index 19cfac1595a8..8023e454a2b2 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchSuggester.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/SearchSuggester.cs @@ -23,12 +23,10 @@ internal SearchSuggester(string name, string searchMode, IList sourceFie { Name = name; SearchMode = searchMode; - SourceFields = sourceFields; + SourceFields = sourceFields ?? new List(); } /// The name of the suggester. public string Name { get; set; } - /// The list of field names to which the suggester applies. Each field must be searchable. - public IList SourceFields { get; set; } } } diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/SentimentSkill.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/SentimentSkill.Serialization.cs index b870324d248b..1f0dc759f572 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/SentimentSkill.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/SentimentSkill.Serialization.cs @@ -6,6 +6,7 @@ #nullable disable using System.Collections.Generic; +using System.Linq; using System.Text.Json; using Azure.Core; @@ -38,20 +39,26 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WritePropertyName("context"); writer.WriteStringValue(Context); } - writer.WritePropertyName("inputs"); - writer.WriteStartArray(); - foreach (var item in Inputs) + if (Inputs != null && Inputs.Any()) { - writer.WriteObjectValue(item); + writer.WritePropertyName("inputs"); + writer.WriteStartArray(); + foreach (var item in Inputs) + { + writer.WriteObjectValue(item); + } + writer.WriteEndArray(); } - writer.WriteEndArray(); - writer.WritePropertyName("outputs"); - writer.WriteStartArray(); - foreach (var item in Outputs) + if (Outputs != null && Outputs.Any()) { - writer.WriteObjectValue(item); + writer.WritePropertyName("outputs"); + writer.WriteStartArray(); + foreach (var item in Outputs) + { + writer.WriteObjectValue(item); + } + writer.WriteEndArray(); } - writer.WriteEndArray(); writer.WriteEndObject(); } @@ -109,6 +116,10 @@ internal static SentimentSkill DeserializeSentimentSkill(JsonElement element) } if (property.NameEquals("inputs")) { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } List array = new List(); foreach (var item in property.Value.EnumerateArray()) { @@ -126,6 +137,10 @@ internal static SentimentSkill DeserializeSentimentSkill(JsonElement element) } if (property.NameEquals("outputs")) { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } List array = new List(); foreach (var item in property.Value.EnumerateArray()) { diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/ShaperSkill.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/ShaperSkill.Serialization.cs index 402a8c54dd86..95460a8ac9c0 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/ShaperSkill.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/ShaperSkill.Serialization.cs @@ -6,6 +6,7 @@ #nullable disable using System.Collections.Generic; +using System.Linq; using System.Text.Json; using Azure.Core; @@ -33,20 +34,26 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WritePropertyName("context"); writer.WriteStringValue(Context); } - writer.WritePropertyName("inputs"); - writer.WriteStartArray(); - foreach (var item in Inputs) + if (Inputs != null && Inputs.Any()) { - writer.WriteObjectValue(item); + writer.WritePropertyName("inputs"); + writer.WriteStartArray(); + foreach (var item in Inputs) + { + writer.WriteObjectValue(item); + } + writer.WriteEndArray(); } - writer.WriteEndArray(); - writer.WritePropertyName("outputs"); - writer.WriteStartArray(); - foreach (var item in Outputs) + if (Outputs != null && Outputs.Any()) { - writer.WriteObjectValue(item); + writer.WritePropertyName("outputs"); + writer.WriteStartArray(); + foreach (var item in Outputs) + { + writer.WriteObjectValue(item); + } + writer.WriteEndArray(); } - writer.WriteEndArray(); writer.WriteEndObject(); } @@ -94,6 +101,10 @@ internal static ShaperSkill DeserializeShaperSkill(JsonElement element) } if (property.NameEquals("inputs")) { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } List array = new List(); foreach (var item in property.Value.EnumerateArray()) { @@ -111,6 +122,10 @@ internal static ShaperSkill DeserializeShaperSkill(JsonElement element) } if (property.NameEquals("outputs")) { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } List array = new List(); foreach (var item in property.Value.EnumerateArray()) { diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/SplitSkill.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/SplitSkill.Serialization.cs index e371859dc2dd..c41c5300c46d 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/SplitSkill.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/SplitSkill.Serialization.cs @@ -6,6 +6,7 @@ #nullable disable using System.Collections.Generic; +using System.Linq; using System.Text.Json; using Azure.Core; @@ -48,20 +49,26 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WritePropertyName("context"); writer.WriteStringValue(Context); } - writer.WritePropertyName("inputs"); - writer.WriteStartArray(); - foreach (var item in Inputs) + if (Inputs != null && Inputs.Any()) { - writer.WriteObjectValue(item); + writer.WritePropertyName("inputs"); + writer.WriteStartArray(); + foreach (var item in Inputs) + { + writer.WriteObjectValue(item); + } + writer.WriteEndArray(); } - writer.WriteEndArray(); - writer.WritePropertyName("outputs"); - writer.WriteStartArray(); - foreach (var item in Outputs) + if (Outputs != null && Outputs.Any()) { - writer.WriteObjectValue(item); + writer.WritePropertyName("outputs"); + writer.WriteStartArray(); + foreach (var item in Outputs) + { + writer.WriteObjectValue(item); + } + writer.WriteEndArray(); } - writer.WriteEndArray(); writer.WriteEndObject(); } @@ -139,6 +146,10 @@ internal static SplitSkill DeserializeSplitSkill(JsonElement element) } if (property.NameEquals("inputs")) { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } List array = new List(); foreach (var item in property.Value.EnumerateArray()) { @@ -156,6 +167,10 @@ internal static SplitSkill DeserializeSplitSkill(JsonElement element) } if (property.NameEquals("outputs")) { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } List array = new List(); foreach (var item in property.Value.EnumerateArray()) { diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/StemmerOverrideTokenFilter.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/StemmerOverrideTokenFilter.Serialization.cs index ecf46f86c914..26d21f6fbef0 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/StemmerOverrideTokenFilter.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/StemmerOverrideTokenFilter.Serialization.cs @@ -6,6 +6,7 @@ #nullable disable using System.Collections.Generic; +using System.Linq; using System.Text.Json; using Azure.Core; @@ -16,13 +17,16 @@ public partial class StemmerOverrideTokenFilter : IUtf8JsonSerializable void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { writer.WriteStartObject(); - writer.WritePropertyName("rules"); - writer.WriteStartArray(); - foreach (var item in Rules) + if (Rules != null && Rules.Any()) { - writer.WriteStringValue(item); + writer.WritePropertyName("rules"); + writer.WriteStartArray(); + foreach (var item in Rules) + { + writer.WriteStringValue(item); + } + writer.WriteEndArray(); } - writer.WriteEndArray(); writer.WritePropertyName("@odata.type"); writer.WriteStringValue(ODataType); writer.WritePropertyName("name"); @@ -39,6 +43,10 @@ internal static StemmerOverrideTokenFilter DeserializeStemmerOverrideTokenFilter { if (property.NameEquals("rules")) { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } List array = new List(); foreach (var item in property.Value.EnumerateArray()) { diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/StemmerOverrideTokenFilter.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/StemmerOverrideTokenFilter.cs index 03a993defe7d..067520821780 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/StemmerOverrideTokenFilter.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/StemmerOverrideTokenFilter.cs @@ -38,11 +38,8 @@ public StemmerOverrideTokenFilter(string name, IEnumerable rules) : base /// A list of stemming rules in the following format: "word => stem", for example: "ran => run". internal StemmerOverrideTokenFilter(string oDataType, string name, IList rules) : base(oDataType, name) { - Rules = rules; + Rules = rules ?? new List(); ODataType = oDataType ?? "#Microsoft.Azure.Search.StemmerOverrideTokenFilter"; } - - /// A list of stemming rules in the following format: "word => stem", for example: "ran => run". - public IList Rules { get; set; } } } diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/StopAnalyzer.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/StopAnalyzer.Serialization.cs index 42c388502e71..aeef51b612b6 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/StopAnalyzer.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/StopAnalyzer.Serialization.cs @@ -6,6 +6,7 @@ #nullable disable using System.Collections.Generic; +using System.Linq; using System.Text.Json; using Azure.Core; @@ -16,7 +17,7 @@ public partial class StopAnalyzer : IUtf8JsonSerializable void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { writer.WriteStartObject(); - if (Stopwords != null) + if (Stopwords != null && Stopwords.Any()) { writer.WritePropertyName("stopwords"); writer.WriteStartArray(); diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/StopAnalyzer.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/StopAnalyzer.cs index 2f99fc47487c..93617cd97699 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/StopAnalyzer.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/StopAnalyzer.cs @@ -22,6 +22,7 @@ public StopAnalyzer(string name) : base(name) throw new ArgumentNullException(nameof(name)); } + Stopwords = new List(); ODataType = "#Microsoft.Azure.Search.StopAnalyzer"; } @@ -31,11 +32,8 @@ public StopAnalyzer(string name) : base(name) /// A list of stopwords. internal StopAnalyzer(string oDataType, string name, IList stopwords) : base(oDataType, name) { - Stopwords = stopwords; + Stopwords = stopwords ?? new List(); ODataType = oDataType ?? "#Microsoft.Azure.Search.StopAnalyzer"; } - - /// A list of stopwords. - public IList Stopwords { get; set; } } } diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/StopwordsTokenFilter.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/StopwordsTokenFilter.Serialization.cs index 2a6cd1c38a8d..70efb414ade9 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/StopwordsTokenFilter.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/StopwordsTokenFilter.Serialization.cs @@ -6,6 +6,7 @@ #nullable disable using System.Collections.Generic; +using System.Linq; using System.Text.Json; using Azure.Core; @@ -16,7 +17,7 @@ public partial class StopwordsTokenFilter : IUtf8JsonSerializable void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { writer.WriteStartObject(); - if (Stopwords != null) + if (Stopwords != null && Stopwords.Any()) { writer.WritePropertyName("stopwords"); writer.WriteStartArray(); diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/StopwordsTokenFilter.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/StopwordsTokenFilter.cs index ac61cd1c9a09..c9b2b41ea927 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/StopwordsTokenFilter.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/StopwordsTokenFilter.cs @@ -22,6 +22,7 @@ public StopwordsTokenFilter(string name) : base(name) throw new ArgumentNullException(nameof(name)); } + Stopwords = new List(); ODataType = "#Microsoft.Azure.Search.StopwordsTokenFilter"; } @@ -34,15 +35,12 @@ public StopwordsTokenFilter(string name) : base(name) /// A value indicating whether to ignore the last search term if it's a stop word. Default is true. internal StopwordsTokenFilter(string oDataType, string name, IList stopwords, StopwordsList? stopwordsList, bool? ignoreCase, bool? removeTrailingStopWords) : base(oDataType, name) { - Stopwords = stopwords; + Stopwords = stopwords ?? new List(); StopwordsList = stopwordsList; IgnoreCase = ignoreCase; RemoveTrailingStopWords = removeTrailingStopWords; ODataType = oDataType ?? "#Microsoft.Azure.Search.StopwordsTokenFilter"; } - - /// The list of stopwords. This property and the stopwords list property cannot both be set. - public IList Stopwords { get; set; } /// A predefined list of stopwords to use. This property and the stopwords property cannot both be set. Default is English. public StopwordsList? StopwordsList { get; set; } /// A value indicating whether to ignore case. If true, all words are converted to lower case first. Default is false. diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/SynonymTokenFilter.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/SynonymTokenFilter.Serialization.cs index e5d0ee91c06d..5d6e7664513f 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/SynonymTokenFilter.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/SynonymTokenFilter.Serialization.cs @@ -6,6 +6,7 @@ #nullable disable using System.Collections.Generic; +using System.Linq; using System.Text.Json; using Azure.Core; @@ -16,13 +17,16 @@ public partial class SynonymTokenFilter : IUtf8JsonSerializable void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { writer.WriteStartObject(); - writer.WritePropertyName("synonyms"); - writer.WriteStartArray(); - foreach (var item in Synonyms) + if (Synonyms != null && Synonyms.Any()) { - writer.WriteStringValue(item); + writer.WritePropertyName("synonyms"); + writer.WriteStartArray(); + foreach (var item in Synonyms) + { + writer.WriteStringValue(item); + } + writer.WriteEndArray(); } - writer.WriteEndArray(); if (IgnoreCase != null) { writer.WritePropertyName("ignoreCase"); @@ -51,6 +55,10 @@ internal static SynonymTokenFilter DeserializeSynonymTokenFilter(JsonElement ele { if (property.NameEquals("synonyms")) { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } List array = new List(); foreach (var item in property.Value.EnumerateArray()) { diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/SynonymTokenFilter.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/SynonymTokenFilter.cs index fe3b941119c8..e9b7cf6cbd7e 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/SynonymTokenFilter.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/SynonymTokenFilter.cs @@ -40,14 +40,11 @@ public SynonymTokenFilter(string name, IEnumerable synonyms) : base(name /// A value indicating whether all words in the list of synonyms (if => notation is not used) will map to one another. If true, all words in the list of synonyms (if => notation is not used) will map to one another. The following list: incredible, unbelievable, fabulous, amazing is equivalent to: incredible, unbelievable, fabulous, amazing => incredible, unbelievable, fabulous, amazing. If false, the following list: incredible, unbelievable, fabulous, amazing will be equivalent to: incredible, unbelievable, fabulous, amazing => incredible. Default is true. internal SynonymTokenFilter(string oDataType, string name, IList synonyms, bool? ignoreCase, bool? expand) : base(oDataType, name) { - Synonyms = synonyms; + Synonyms = synonyms ?? new List(); IgnoreCase = ignoreCase; Expand = expand; ODataType = oDataType ?? "#Microsoft.Azure.Search.SynonymTokenFilter"; } - - /// A list of synonyms in following one of two formats: 1. incredible, unbelievable, fabulous => amazing - all terms on the left side of => symbol will be replaced with all terms on its right side; 2. incredible, unbelievable, fabulous, amazing - comma separated list of equivalent words. Set the expand option to change how this list is interpreted. - public IList Synonyms { get; set; } /// A value indicating whether to case-fold input for matching. Default is false. public bool? IgnoreCase { get; set; } /// A value indicating whether all words in the list of synonyms (if => notation is not used) will map to one another. If true, all words in the list of synonyms (if => notation is not used) will map to one another. The following list: incredible, unbelievable, fabulous, amazing is equivalent to: incredible, unbelievable, fabulous, amazing => incredible, unbelievable, fabulous, amazing. If false, the following list: incredible, unbelievable, fabulous, amazing will be equivalent to: incredible, unbelievable, fabulous, amazing => incredible. Default is true. diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/TextTranslationSkill.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/TextTranslationSkill.Serialization.cs index d15709efdf89..981c9a956a2b 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/TextTranslationSkill.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/TextTranslationSkill.Serialization.cs @@ -6,6 +6,7 @@ #nullable disable using System.Collections.Generic; +using System.Linq; using System.Text.Json; using Azure.Core; @@ -45,20 +46,26 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WritePropertyName("context"); writer.WriteStringValue(Context); } - writer.WritePropertyName("inputs"); - writer.WriteStartArray(); - foreach (var item in Inputs) + if (Inputs != null && Inputs.Any()) { - writer.WriteObjectValue(item); + writer.WritePropertyName("inputs"); + writer.WriteStartArray(); + foreach (var item in Inputs) + { + writer.WriteObjectValue(item); + } + writer.WriteEndArray(); } - writer.WriteEndArray(); - writer.WritePropertyName("outputs"); - writer.WriteStartArray(); - foreach (var item in Outputs) + if (Outputs != null && Outputs.Any()) { - writer.WriteObjectValue(item); + writer.WritePropertyName("outputs"); + writer.WriteStartArray(); + foreach (var item in Outputs) + { + writer.WriteObjectValue(item); + } + writer.WriteEndArray(); } - writer.WriteEndArray(); writer.WriteEndObject(); } @@ -132,6 +139,10 @@ internal static TextTranslationSkill DeserializeTextTranslationSkill(JsonElement } if (property.NameEquals("inputs")) { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } List array = new List(); foreach (var item in property.Value.EnumerateArray()) { @@ -149,6 +160,10 @@ internal static TextTranslationSkill DeserializeTextTranslationSkill(JsonElement } if (property.NameEquals("outputs")) { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } List array = new List(); foreach (var item in property.Value.EnumerateArray()) { diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/TextWeights.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/TextWeights.Serialization.cs index 7a072712fbea..e54505ed5315 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/TextWeights.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/TextWeights.Serialization.cs @@ -6,6 +6,7 @@ #nullable disable using System.Collections.Generic; +using System.Linq; using System.Text.Json; using Azure.Core; @@ -16,15 +17,18 @@ public partial class TextWeights : IUtf8JsonSerializable void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) { writer.WriteStartObject(); - writer.WritePropertyName("weights"); - writer.WriteStartObject(); - foreach (var item in Weights) + if (Weights != null && Weights.Any()) { - writer.WritePropertyName(item.Key); - writer.WriteNumberValue(item.Value); + writer.WritePropertyName("weights"); + writer.WriteStartObject(); + foreach (var item in Weights) + { + writer.WritePropertyName(item.Key); + writer.WriteNumberValue(item.Value); + } + writer.WriteEndObject(); } writer.WriteEndObject(); - writer.WriteEndObject(); } internal static TextWeights DeserializeTextWeights(JsonElement element) @@ -34,6 +38,10 @@ internal static TextWeights DeserializeTextWeights(JsonElement element) { if (property.NameEquals("weights")) { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } Dictionary dictionary = new Dictionary(); foreach (var property0 in property.Value.EnumerateObject()) { diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/TextWeights.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/TextWeights.cs index de820479c0da..d8cf354612dc 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/TextWeights.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/TextWeights.cs @@ -24,8 +24,5 @@ public TextWeights(IDictionary weights) Weights = weights; } - - /// The dictionary of per-field weights to boost document scoring. The keys are field names and the values are the weights for each field. - public IDictionary Weights { get; set; } } } diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/WebApiSkill.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/WebApiSkill.Serialization.cs index 8157cba3b678..63567670da10 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/WebApiSkill.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/WebApiSkill.Serialization.cs @@ -7,6 +7,7 @@ using System; using System.Collections.Generic; +using System.Linq; using System.Text.Json; using Azure.Core; @@ -19,7 +20,7 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WriteStartObject(); writer.WritePropertyName("uri"); writer.WriteStringValue(Uri); - if (HttpHeaders != null) + if (HttpHeaders != null && HttpHeaders.Any()) { writer.WritePropertyName("httpHeaders"); writer.WriteStartObject(); @@ -67,20 +68,26 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WritePropertyName("context"); writer.WriteStringValue(Context); } - writer.WritePropertyName("inputs"); - writer.WriteStartArray(); - foreach (var item in Inputs) + if (Inputs != null && Inputs.Any()) { - writer.WriteObjectValue(item); + writer.WritePropertyName("inputs"); + writer.WriteStartArray(); + foreach (var item in Inputs) + { + writer.WriteObjectValue(item); + } + writer.WriteEndArray(); } - writer.WriteEndArray(); - writer.WritePropertyName("outputs"); - writer.WriteStartArray(); - foreach (var item in Outputs) + if (Outputs != null && Outputs.Any()) { - writer.WriteObjectValue(item); + writer.WritePropertyName("outputs"); + writer.WriteStartArray(); + foreach (var item in Outputs) + { + writer.WriteObjectValue(item); + } + writer.WriteEndArray(); } - writer.WriteEndArray(); writer.WriteEndObject(); } @@ -196,6 +203,10 @@ internal static WebApiSkill DeserializeWebApiSkill(JsonElement element) } if (property.NameEquals("inputs")) { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } List array = new List(); foreach (var item in property.Value.EnumerateArray()) { @@ -213,6 +224,10 @@ internal static WebApiSkill DeserializeWebApiSkill(JsonElement element) } if (property.NameEquals("outputs")) { + if (property.Value.ValueKind == JsonValueKind.Null) + { + continue; + } List array = new List(); foreach (var item in property.Value.EnumerateArray()) { diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/WebApiSkill.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/WebApiSkill.cs index 2df99ccd1656..5878690996fc 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/WebApiSkill.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/WebApiSkill.cs @@ -33,6 +33,7 @@ public WebApiSkill(IEnumerable inputs, IEnumerable(); ODataType = "#Microsoft.Skills.Custom.WebApiSkill"; } @@ -52,7 +53,7 @@ public WebApiSkill(IEnumerable inputs, IEnumerable inputs, IList outputs, string uri, IDictionary httpHeaders, string httpMethod, TimeSpan? timeout, int? batchSize, int? degreeOfParallelism) : base(oDataType, name, description, context, inputs, outputs) { Uri = uri; - HttpHeaders = httpHeaders; + HttpHeaders = httpHeaders ?? new Dictionary(); HttpMethod = httpMethod; Timeout = timeout; BatchSize = batchSize; @@ -62,8 +63,6 @@ internal WebApiSkill(string oDataType, string name, string description, string c /// The url for the Web API. public string Uri { get; set; } - /// The headers required to make the http request. - public IDictionary HttpHeaders { get; set; } /// The method for the http request. public string HttpMethod { get; set; } /// The desired timeout for the request. Default is 30 seconds. diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/WordDelimiterTokenFilter.Serialization.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/WordDelimiterTokenFilter.Serialization.cs index da9a11dfd4bf..f3f7e548b2fb 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/WordDelimiterTokenFilter.Serialization.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/WordDelimiterTokenFilter.Serialization.cs @@ -6,6 +6,7 @@ #nullable disable using System.Collections.Generic; +using System.Linq; using System.Text.Json; using Azure.Core; @@ -61,7 +62,7 @@ void IUtf8JsonSerializable.Write(Utf8JsonWriter writer) writer.WritePropertyName("stemEnglishPossessive"); writer.WriteBooleanValue(StemEnglishPossessive.Value); } - if (ProtectedWords != null) + if (ProtectedWords != null && ProtectedWords.Any()) { writer.WritePropertyName("protectedWords"); writer.WriteStartArray(); diff --git a/sdk/search/Azure.Search.Documents/src/Generated/Models/WordDelimiterTokenFilter.cs b/sdk/search/Azure.Search.Documents/src/Generated/Models/WordDelimiterTokenFilter.cs index 696d2fae3df9..ad10c10811f4 100644 --- a/sdk/search/Azure.Search.Documents/src/Generated/Models/WordDelimiterTokenFilter.cs +++ b/sdk/search/Azure.Search.Documents/src/Generated/Models/WordDelimiterTokenFilter.cs @@ -22,6 +22,7 @@ public WordDelimiterTokenFilter(string name) : base(name) throw new ArgumentNullException(nameof(name)); } + ProtectedWords = new List(); ODataType = "#Microsoft.Azure.Search.WordDelimiterTokenFilter"; } @@ -49,7 +50,7 @@ internal WordDelimiterTokenFilter(string oDataType, string name, bool? generateW PreserveOriginal = preserveOriginal; SplitOnNumerics = splitOnNumerics; StemEnglishPossessive = stemEnglishPossessive; - ProtectedWords = protectedWords; + ProtectedWords = protectedWords ?? new List(); ODataType = oDataType ?? "#Microsoft.Azure.Search.WordDelimiterTokenFilter"; } @@ -71,7 +72,5 @@ internal WordDelimiterTokenFilter(string oDataType, string name, bool? generateW public bool? SplitOnNumerics { get; set; } /// A value indicating whether to remove trailing "'s" for each subword. Default is true. public bool? StemEnglishPossessive { get; set; } - /// A list of tokens to protect from being delimited. - public IList ProtectedWords { get; set; } } } diff --git a/sdk/search/Azure.Search.Documents/src/Indexes/Models/AnalyzeRequest.cs b/sdk/search/Azure.Search.Documents/src/Indexes/Models/AnalyzeRequest.cs new file mode 100644 index 000000000000..1b9f1bc3eead --- /dev/null +++ b/sdk/search/Azure.Search.Documents/src/Indexes/Models/AnalyzeRequest.cs @@ -0,0 +1,19 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.Collections.Generic; +using Azure.Core; + +namespace Azure.Search.Documents.Indexes.Models +{ + public partial class AnalyzeRequest + { + /// An optional list of token filters to use when breaking the given text. This parameter can only be set when using the tokenizer parameter. + [CodeGenMember(EmptyAsUndefined = true, Initialize = true)] + public IList TokenFilters { get; } + + /// An optional list of character filters to use when breaking the given text. This parameter can only be set when using the tokenizer parameter. + [CodeGenMember(EmptyAsUndefined = true, Initialize = true)] + public IList CharFilters { get; } + } +} diff --git a/sdk/search/Azure.Search.Documents/src/Indexes/Models/CjkBigramTokenFilter.cs b/sdk/search/Azure.Search.Documents/src/Indexes/Models/CjkBigramTokenFilter.cs new file mode 100644 index 000000000000..9e6d161204b4 --- /dev/null +++ b/sdk/search/Azure.Search.Documents/src/Indexes/Models/CjkBigramTokenFilter.cs @@ -0,0 +1,15 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.Collections.Generic; +using Azure.Core; + +namespace Azure.Search.Documents.Indexes.Models +{ + public partial class CjkBigramTokenFilter + { + /// The scripts to ignore. + [CodeGenMember(EmptyAsUndefined = true, Initialize = true)] + public IList IgnoreScripts { get; } + } +} diff --git a/sdk/search/Azure.Search.Documents/src/Indexes/Models/CommonGramTokenFilter.cs b/sdk/search/Azure.Search.Documents/src/Indexes/Models/CommonGramTokenFilter.cs new file mode 100644 index 000000000000..79f07c700daf --- /dev/null +++ b/sdk/search/Azure.Search.Documents/src/Indexes/Models/CommonGramTokenFilter.cs @@ -0,0 +1,15 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.Collections.Generic; +using Azure.Core; + +namespace Azure.Search.Documents.Indexes.Models +{ + public partial class CommonGramTokenFilter + { + /// The set of common words. + [CodeGenMember(EmptyAsUndefined = true, Initialize = true)] + public IList CommonWords { get; } + } +} diff --git a/sdk/search/Azure.Search.Documents/src/Indexes/Models/ComplexField.cs b/sdk/search/Azure.Search.Documents/src/Indexes/Models/ComplexField.cs index e8d733e051e2..13536e53811f 100644 --- a/sdk/search/Azure.Search.Documents/src/Indexes/Models/ComplexField.cs +++ b/sdk/search/Azure.Search.Documents/src/Indexes/Models/ComplexField.cs @@ -31,15 +31,11 @@ public ComplexField(string name, bool collection = false) : base(name, collectio /// private protected override void Save(SearchField field) { - // TODO: Remove allocation when https://github.com/Azure/autorest.csharp/issues/521 is fixed. - IList fields = field.Fields ?? new List(); - + IList fields = field.Fields; foreach (SearchFieldTemplate child in Fields) { fields.Add(child); } - - field.Fields = fields; } } } diff --git a/sdk/search/Azure.Search.Documents/src/Indexes/Models/CorsOptions.cs b/sdk/search/Azure.Search.Documents/src/Indexes/Models/CorsOptions.cs new file mode 100644 index 000000000000..afe743a06a32 --- /dev/null +++ b/sdk/search/Azure.Search.Documents/src/Indexes/Models/CorsOptions.cs @@ -0,0 +1,15 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.Collections.Generic; +using Azure.Core; + +namespace Azure.Search.Documents.Indexes.Models +{ + public partial class CorsOptions + { + /// The list of origins from which JavaScript code will be granted access to your index. Can contain a list of hosts of the form {protocol}://{fully-qualified-domain-name}[:{port#}], or a single '*' to allow all origins (not recommended). + [CodeGenMember(EmptyAsUndefined = true, Initialize = true)] + public IList AllowedOrigins { get; } + } +} diff --git a/sdk/search/Azure.Search.Documents/src/Indexes/Models/CustomAnalyzer.cs b/sdk/search/Azure.Search.Documents/src/Indexes/Models/CustomAnalyzer.cs new file mode 100644 index 000000000000..bb60990ae83d --- /dev/null +++ b/sdk/search/Azure.Search.Documents/src/Indexes/Models/CustomAnalyzer.cs @@ -0,0 +1,19 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.Collections.Generic; +using Azure.Core; + +namespace Azure.Search.Documents.Indexes.Models +{ + public partial class CustomAnalyzer + { + /// A list of token filters used to filter out or modify the tokens generated by a tokenizer. For example, you can specify a lowercase filter that converts all characters to lowercase. The filters are run in the order in which they are listed. + [CodeGenMember(EmptyAsUndefined = true, Initialize = true)] + public IList TokenFilters { get; } + + /// A list of character filters used to prepare input text before it is processed by the tokenizer. For instance, they can replace certain characters or symbols. The filters are run in the order in which they are listed. + [CodeGenMember(EmptyAsUndefined = true, Initialize = true)] + public IList CharFilters { get; } + } +} diff --git a/sdk/search/Azure.Search.Documents/src/Indexes/Models/DictionaryDecompounderTokenFilter.cs b/sdk/search/Azure.Search.Documents/src/Indexes/Models/DictionaryDecompounderTokenFilter.cs new file mode 100644 index 000000000000..da72328fa140 --- /dev/null +++ b/sdk/search/Azure.Search.Documents/src/Indexes/Models/DictionaryDecompounderTokenFilter.cs @@ -0,0 +1,15 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.Collections.Generic; +using Azure.Core; + +namespace Azure.Search.Documents.Indexes.Models +{ + public partial class DictionaryDecompounderTokenFilter + { + /// The list of words to match against. + [CodeGenMember(EmptyAsUndefined = true, Initialize = true)] + public IList WordList { get; } + } +} diff --git a/sdk/search/Azure.Search.Documents/src/Indexes/Models/EdgeNGramTokenizer.cs b/sdk/search/Azure.Search.Documents/src/Indexes/Models/EdgeNGramTokenizer.cs new file mode 100644 index 000000000000..878c23aa1107 --- /dev/null +++ b/sdk/search/Azure.Search.Documents/src/Indexes/Models/EdgeNGramTokenizer.cs @@ -0,0 +1,15 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.Collections.Generic; +using Azure.Core; + +namespace Azure.Search.Documents.Indexes.Models +{ + public partial class EdgeNGramTokenizer + { + /// Character classes to keep in the tokens. + [CodeGenMember(EmptyAsUndefined = true, Initialize = true)] + public IList TokenChars { get; } + } +} diff --git a/sdk/search/Azure.Search.Documents/src/Indexes/Models/ElisionTokenFilter.cs b/sdk/search/Azure.Search.Documents/src/Indexes/Models/ElisionTokenFilter.cs new file mode 100644 index 000000000000..fbaaecbf342d --- /dev/null +++ b/sdk/search/Azure.Search.Documents/src/Indexes/Models/ElisionTokenFilter.cs @@ -0,0 +1,15 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.Collections.Generic; +using Azure.Core; + +namespace Azure.Search.Documents.Indexes.Models +{ + public partial class ElisionTokenFilter + { + /// The set of articles to remove. + [CodeGenMember(EmptyAsUndefined = true, Initialize = true)] + public IList Articles { get; } + } +} diff --git a/sdk/search/Azure.Search.Documents/src/Indexes/Models/EntityRecognitionSkill.cs b/sdk/search/Azure.Search.Documents/src/Indexes/Models/EntityRecognitionSkill.cs new file mode 100644 index 000000000000..72aaaf235ca6 --- /dev/null +++ b/sdk/search/Azure.Search.Documents/src/Indexes/Models/EntityRecognitionSkill.cs @@ -0,0 +1,15 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.Collections.Generic; +using Azure.Core; + +namespace Azure.Search.Documents.Indexes.Models +{ + public partial class EntityRecognitionSkill + { + /// A list of entity categories that should be extracted. + [CodeGenMember(EmptyAsUndefined = true, Initialize = true)] + public IList Categories { get; } + } +} diff --git a/sdk/search/Azure.Search.Documents/src/Indexes/Models/FieldMappingFunction.cs b/sdk/search/Azure.Search.Documents/src/Indexes/Models/FieldMappingFunction.cs new file mode 100644 index 000000000000..9d900cbda0d8 --- /dev/null +++ b/sdk/search/Azure.Search.Documents/src/Indexes/Models/FieldMappingFunction.cs @@ -0,0 +1,15 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.Collections.Generic; +using Azure.Core; + +namespace Azure.Search.Documents.Indexes.Models +{ + public partial class FieldMappingFunction + { + /// A dictionary of parameter name/value pairs to pass to the function. Each value must be of a primitive type. + [CodeGenMember(EmptyAsUndefined = true, Initialize = true)] + public IDictionary Parameters { get; } + } +} diff --git a/sdk/search/Azure.Search.Documents/src/Indexes/Models/ImageAnalysisSkill.cs b/sdk/search/Azure.Search.Documents/src/Indexes/Models/ImageAnalysisSkill.cs new file mode 100644 index 000000000000..52efabae7963 --- /dev/null +++ b/sdk/search/Azure.Search.Documents/src/Indexes/Models/ImageAnalysisSkill.cs @@ -0,0 +1,19 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.Collections.Generic; +using Azure.Core; + +namespace Azure.Search.Documents.Indexes.Models +{ + public partial class ImageAnalysisSkill + { + /// A list of visual features. + [CodeGenMember(EmptyAsUndefined = true, Initialize = true)] + public IList VisualFeatures { get; } + + /// A string indicating which domain-specific details to return. + [CodeGenMember(EmptyAsUndefined = true, Initialize = true)] + public IList Details { get; } + } +} diff --git a/sdk/search/Azure.Search.Documents/src/Indexes/Models/IndexingParameters.cs b/sdk/search/Azure.Search.Documents/src/Indexes/Models/IndexingParameters.cs new file mode 100644 index 000000000000..25c228333168 --- /dev/null +++ b/sdk/search/Azure.Search.Documents/src/Indexes/Models/IndexingParameters.cs @@ -0,0 +1,15 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.Collections.Generic; +using Azure.Core; + +namespace Azure.Search.Documents.Indexes.Models +{ + public partial class IndexingParameters + { + /// A dictionary of indexer-specific configuration properties. Each name is the name of a specific property. Each value must be of a primitive type. + [CodeGenMember(EmptyAsUndefined = true, Initialize = true)] + public IDictionary Configuration { get; } + } +} diff --git a/sdk/search/Azure.Search.Documents/src/Indexes/Models/InputFieldMappingEntry.cs b/sdk/search/Azure.Search.Documents/src/Indexes/Models/InputFieldMappingEntry.cs new file mode 100644 index 000000000000..e56129203c26 --- /dev/null +++ b/sdk/search/Azure.Search.Documents/src/Indexes/Models/InputFieldMappingEntry.cs @@ -0,0 +1,15 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.Collections.Generic; +using Azure.Core; + +namespace Azure.Search.Documents.Indexes.Models +{ + public partial class InputFieldMappingEntry + { + /// The recursive inputs used when creating a complex type. + [CodeGenMember(EmptyAsUndefined = true, Initialize = true)] + public IList Inputs { get; } + } +} diff --git a/sdk/search/Azure.Search.Documents/src/Indexes/Models/KeepTokenFilter.cs b/sdk/search/Azure.Search.Documents/src/Indexes/Models/KeepTokenFilter.cs new file mode 100644 index 000000000000..6bcb3af36d52 --- /dev/null +++ b/sdk/search/Azure.Search.Documents/src/Indexes/Models/KeepTokenFilter.cs @@ -0,0 +1,15 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.Collections.Generic; +using Azure.Core; + +namespace Azure.Search.Documents.Indexes.Models +{ + public partial class KeepTokenFilter + { + /// The list of words to keep. + [CodeGenMember(EmptyAsUndefined = true, Initialize = true)] + public IList KeepWords { get; } + } +} diff --git a/sdk/search/Azure.Search.Documents/src/Indexes/Models/KeywordMarkerTokenFilter.cs b/sdk/search/Azure.Search.Documents/src/Indexes/Models/KeywordMarkerTokenFilter.cs new file mode 100644 index 000000000000..6a0d315e2163 --- /dev/null +++ b/sdk/search/Azure.Search.Documents/src/Indexes/Models/KeywordMarkerTokenFilter.cs @@ -0,0 +1,15 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.Collections.Generic; +using Azure.Core; + +namespace Azure.Search.Documents.Indexes.Models +{ + public partial class KeywordMarkerTokenFilter + { + /// A list of words to mark as keywords. + [CodeGenMember(EmptyAsUndefined = true, Initialize = true)] + public IList Keywords { get; } + } +} diff --git a/sdk/search/Azure.Search.Documents/src/Indexes/Models/LuceneStandardAnalyzer.cs b/sdk/search/Azure.Search.Documents/src/Indexes/Models/LuceneStandardAnalyzer.cs new file mode 100644 index 000000000000..c931e9f3c915 --- /dev/null +++ b/sdk/search/Azure.Search.Documents/src/Indexes/Models/LuceneStandardAnalyzer.cs @@ -0,0 +1,15 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.Collections.Generic; +using Azure.Core; + +namespace Azure.Search.Documents.Indexes.Models +{ + public partial class LuceneStandardAnalyzer + { + /// A list of stopwords. + [CodeGenMember(EmptyAsUndefined = true, Initialize = true)] + public IList Stopwords { get; } + } +} diff --git a/sdk/search/Azure.Search.Documents/src/Indexes/Models/MappingCharFilter.cs b/sdk/search/Azure.Search.Documents/src/Indexes/Models/MappingCharFilter.cs new file mode 100644 index 000000000000..32de753766e8 --- /dev/null +++ b/sdk/search/Azure.Search.Documents/src/Indexes/Models/MappingCharFilter.cs @@ -0,0 +1,15 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.Collections.Generic; +using Azure.Core; + +namespace Azure.Search.Documents.Indexes.Models +{ + public partial class MappingCharFilter + { + /// A list of mappings of the following format: "a=>b" (all occurrences of the character "a" will be replaced with character "b"). + [CodeGenMember(EmptyAsUndefined = true, Initialize = true)] + public IList Mappings { get; } + } +} diff --git a/sdk/search/Azure.Search.Documents/src/Indexes/Models/NGramTokenizer.cs b/sdk/search/Azure.Search.Documents/src/Indexes/Models/NGramTokenizer.cs new file mode 100644 index 000000000000..72bc9093f614 --- /dev/null +++ b/sdk/search/Azure.Search.Documents/src/Indexes/Models/NGramTokenizer.cs @@ -0,0 +1,15 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.Collections.Generic; +using Azure.Core; + +namespace Azure.Search.Documents.Indexes.Models +{ + public partial class NGramTokenizer + { + /// Character classes to keep in the tokens. + [CodeGenMember(EmptyAsUndefined = true, Initialize = true)] + public IList TokenChars { get; } + } +} diff --git a/sdk/search/Azure.Search.Documents/src/Indexes/Models/PatternCaptureTokenFilter.cs b/sdk/search/Azure.Search.Documents/src/Indexes/Models/PatternCaptureTokenFilter.cs new file mode 100644 index 000000000000..1445274d8b8f --- /dev/null +++ b/sdk/search/Azure.Search.Documents/src/Indexes/Models/PatternCaptureTokenFilter.cs @@ -0,0 +1,15 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.Collections.Generic; +using Azure.Core; + +namespace Azure.Search.Documents.Indexes.Models +{ + public partial class PatternCaptureTokenFilter + { + /// A list of patterns to match against each token. + [CodeGenMember(EmptyAsUndefined = true, Initialize = true)] + public IList Patterns { get; } + } +} diff --git a/sdk/search/Azure.Search.Documents/src/Indexes/Models/ScoringProfile.cs b/sdk/search/Azure.Search.Documents/src/Indexes/Models/ScoringProfile.cs new file mode 100644 index 000000000000..8df97daadd7c --- /dev/null +++ b/sdk/search/Azure.Search.Documents/src/Indexes/Models/ScoringProfile.cs @@ -0,0 +1,15 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.Collections.Generic; +using Azure.Core; + +namespace Azure.Search.Documents.Indexes.Models +{ + public partial class ScoringProfile + { + /// The collection of functions that influence the scoring of documents. + [CodeGenMember(EmptyAsUndefined = true, Initialize = true)] + public IList Functions { get; } + } +} diff --git a/sdk/search/Azure.Search.Documents/src/Indexes/Models/SearchField.cs b/sdk/search/Azure.Search.Documents/src/Indexes/Models/SearchField.cs index cf55743ea6b2..eeae79bf2de4 100644 --- a/sdk/search/Azure.Search.Documents/src/Indexes/Models/SearchField.cs +++ b/sdk/search/Azure.Search.Documents/src/Indexes/Models/SearchField.cs @@ -33,6 +33,9 @@ public SearchField(string name, SearchFieldDataType type) Name = name; Type = type; + + Fields = new List(); + SynonymMapNames = new List(); } /// @@ -180,14 +183,14 @@ public bool? IsHidden /// /// Gets a list of names of synonym maps associated with this field. Only fields where is true can have associated synonym maps. /// - [CodeGenMember("synonymMaps")] - public IList SynonymMapNames { get; internal set; } + [CodeGenMember("synonymMaps", EmptyAsUndefined = true, Initialize = true)] + public IList SynonymMapNames { get; } /// /// Gets a list of nested fields if this field is of type or "Collection(DataType.Complex)". /// - [CodeGenMember("fields")] - public IList Fields { get; internal set; } + [CodeGenMember("fields", EmptyAsUndefined = true, Initialize = true)] + public IList Fields { get; } /// diff --git a/sdk/search/Azure.Search.Documents/src/Indexes/Models/SearchIndexer.cs b/sdk/search/Azure.Search.Documents/src/Indexes/Models/SearchIndexer.cs index 1fccd4c68c02..d707dd3ea9bb 100644 --- a/sdk/search/Azure.Search.Documents/src/Indexes/Models/SearchIndexer.cs +++ b/sdk/search/Azure.Search.Documents/src/Indexes/Models/SearchIndexer.cs @@ -1,6 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. +using System.Collections.Generic; using Azure.Core; namespace Azure.Search.Documents.Indexes.Models @@ -18,5 +19,13 @@ public ETag? ETag get => _etag is null ? (ETag?)null : new ETag(_etag); set => _etag = value?.ToString(); } + + /// Defines mappings between fields in the data source and corresponding target fields in the index. + [CodeGenMember(EmptyAsUndefined = true, Initialize = true)] + public IList FieldMappings { get; } + + /// Output field mappings are applied after enrichment and immediately before indexing. + [CodeGenMember(EmptyAsUndefined = true, Initialize = true)] + public IList OutputFieldMappings { get; } } } diff --git a/sdk/search/Azure.Search.Documents/src/Indexes/Models/SearchIndexerSkill.cs b/sdk/search/Azure.Search.Documents/src/Indexes/Models/SearchIndexerSkill.cs index f08da023cbf6..58d367bb60d3 100644 --- a/sdk/search/Azure.Search.Documents/src/Indexes/Models/SearchIndexerSkill.cs +++ b/sdk/search/Azure.Search.Documents/src/Indexes/Models/SearchIndexerSkill.cs @@ -19,8 +19,16 @@ private protected SearchIndexerSkill(IEnumerable inputs, Argument.AssertNotNull(inputs, nameof(inputs)); Argument.AssertNotNull(outputs, nameof(outputs)); - Inputs = inputs.ToArray(); - Outputs = outputs.ToArray(); + Inputs = inputs.ToList(); + Outputs = outputs.ToList(); } + + /// Inputs of the skills could be a column in the source data set, or the output of an upstream skill. + [CodeGenMember(EmptyAsUndefined = true, Initialize = true)] + public IList Inputs { get; } + + /// The output of a skill is either a field in a search index, or a value that can be consumed as an input by another skill. + [CodeGenMember(EmptyAsUndefined = true, Initialize = true)] + public IList Outputs { get; } } } diff --git a/sdk/search/Azure.Search.Documents/src/Indexes/Models/SearchIndexerSkillset.cs b/sdk/search/Azure.Search.Documents/src/Indexes/Models/SearchIndexerSkillset.cs index ed9ad0849914..f2c7bfb28fb4 100644 --- a/sdk/search/Azure.Search.Documents/src/Indexes/Models/SearchIndexerSkillset.cs +++ b/sdk/search/Azure.Search.Documents/src/Indexes/Models/SearchIndexerSkillset.cs @@ -1,6 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. +using System.Collections.Generic; using Azure.Core; namespace Azure.Search.Documents.Indexes.Models @@ -18,5 +19,9 @@ public ETag? ETag get => _etag is null ? (ETag?)null : new ETag(_etag); set => _etag = value?.ToString(); } + + /// A list of skills in the skillset. + [CodeGenMember(EmptyAsUndefined = true, Initialize = true)] + public IList Skills { get; } } } diff --git a/sdk/search/Azure.Search.Documents/src/Indexes/Models/SearchSuggester.cs b/sdk/search/Azure.Search.Documents/src/Indexes/Models/SearchSuggester.cs index c942dc9e8b3f..b95e703ec4be 100644 --- a/sdk/search/Azure.Search.Documents/src/Indexes/Models/SearchSuggester.cs +++ b/sdk/search/Azure.Search.Documents/src/Indexes/Models/SearchSuggester.cs @@ -40,9 +40,9 @@ public SearchSuggester(string name, params string[] sourceFields) : this(name, ( { } - private SearchSuggester() - { - } + /// The list of field names to which the suggester applies. Each field must be searchable. + [CodeGenMember(EmptyAsUndefined = true, Initialize = true)] + public IList SourceFields { get; } [CodeGenMember("searchMode")] private string SearchMode { get; } = AnalyzingInfixMatching; diff --git a/sdk/search/Azure.Search.Documents/src/Indexes/Models/SearchableField.cs b/sdk/search/Azure.Search.Documents/src/Indexes/Models/SearchableField.cs index 5a3797fd3b71..758b937baa18 100644 --- a/sdk/search/Azure.Search.Documents/src/Indexes/Models/SearchableField.cs +++ b/sdk/search/Azure.Search.Documents/src/Indexes/Models/SearchableField.cs @@ -80,7 +80,11 @@ private protected override void Save(SearchField field) if (SynonymMapNames.Count > 0) { - field.SynonymMapNames = SynonymMapNames; + IList fields = field.SynonymMapNames; + foreach (string name in SynonymMapNames) + { + fields.Add(name); + } } } } diff --git a/sdk/search/Azure.Search.Documents/src/Indexes/Models/StemmerOverrideTokenFilter.cs b/sdk/search/Azure.Search.Documents/src/Indexes/Models/StemmerOverrideTokenFilter.cs new file mode 100644 index 000000000000..f9eff812560d --- /dev/null +++ b/sdk/search/Azure.Search.Documents/src/Indexes/Models/StemmerOverrideTokenFilter.cs @@ -0,0 +1,15 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.Collections.Generic; +using Azure.Core; + +namespace Azure.Search.Documents.Indexes.Models +{ + public partial class StemmerOverrideTokenFilter + { + /// A list of stemming rules in the following format: "word => stem", for example: "ran => run". + [CodeGenMember(EmptyAsUndefined = true, Initialize = true)] + public IList Rules { get; } + } +} diff --git a/sdk/search/Azure.Search.Documents/src/Indexes/Models/StopAnalyzer.cs b/sdk/search/Azure.Search.Documents/src/Indexes/Models/StopAnalyzer.cs new file mode 100644 index 000000000000..435a8d992ece --- /dev/null +++ b/sdk/search/Azure.Search.Documents/src/Indexes/Models/StopAnalyzer.cs @@ -0,0 +1,15 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.Collections.Generic; +using Azure.Core; + +namespace Azure.Search.Documents.Indexes.Models +{ + public partial class StopAnalyzer + { + /// A list of stopwords. + [CodeGenMember(EmptyAsUndefined = true, Initialize = true)] + public IList Stopwords { get; } + } +} diff --git a/sdk/search/Azure.Search.Documents/src/Indexes/Models/StopwordsTokenFilter.cs b/sdk/search/Azure.Search.Documents/src/Indexes/Models/StopwordsTokenFilter.cs new file mode 100644 index 000000000000..ddca781dc053 --- /dev/null +++ b/sdk/search/Azure.Search.Documents/src/Indexes/Models/StopwordsTokenFilter.cs @@ -0,0 +1,15 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.Collections.Generic; +using Azure.Core; + +namespace Azure.Search.Documents.Indexes.Models +{ + public partial class StopwordsTokenFilter + { + /// The list of stopwords. This property and the stopwords list property cannot both be set. + [CodeGenMember(EmptyAsUndefined = true, Initialize = true)] + public IList Stopwords { get; } + } +} diff --git a/sdk/search/Azure.Search.Documents/src/Indexes/Models/SynonymTokenFilter.cs b/sdk/search/Azure.Search.Documents/src/Indexes/Models/SynonymTokenFilter.cs new file mode 100644 index 000000000000..14e1fca9ba74 --- /dev/null +++ b/sdk/search/Azure.Search.Documents/src/Indexes/Models/SynonymTokenFilter.cs @@ -0,0 +1,15 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.Collections.Generic; +using Azure.Core; + +namespace Azure.Search.Documents.Indexes.Models +{ + public partial class SynonymTokenFilter + { + /// A list of synonyms in following one of two formats: 1. incredible, unbelievable, fabulous => amazing - all terms on the left side of => symbol will be replaced with all terms on its right side; 2. incredible, unbelievable, fabulous, amazing - comma separated list of equivalent words. Set the expand option to change how this list is interpreted. + [CodeGenMember(EmptyAsUndefined = true, Initialize = true)] + public IList Synonyms { get; } + } +} diff --git a/sdk/search/Azure.Search.Documents/src/Indexes/Models/TextWeights.cs b/sdk/search/Azure.Search.Documents/src/Indexes/Models/TextWeights.cs new file mode 100644 index 000000000000..9f32f8921fdf --- /dev/null +++ b/sdk/search/Azure.Search.Documents/src/Indexes/Models/TextWeights.cs @@ -0,0 +1,15 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.Collections.Generic; +using Azure.Core; + +namespace Azure.Search.Documents.Indexes.Models +{ + public partial class TextWeights + { + /// The dictionary of per-field weights to boost document scoring. The keys are field names and the values are the weights for each field. + [CodeGenMember(EmptyAsUndefined = true, Initialize = true)] + public IDictionary Weights { get; } + } +} diff --git a/sdk/search/Azure.Search.Documents/src/Indexes/Models/WebApiSkill.cs b/sdk/search/Azure.Search.Documents/src/Indexes/Models/WebApiSkill.cs new file mode 100644 index 000000000000..2a460f00aeed --- /dev/null +++ b/sdk/search/Azure.Search.Documents/src/Indexes/Models/WebApiSkill.cs @@ -0,0 +1,15 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.Collections.Generic; +using Azure.Core; + +namespace Azure.Search.Documents.Indexes.Models +{ + public partial class WebApiSkill + { + /// The headers required to make the http request. + [CodeGenMember(EmptyAsUndefined = true, Initialize = true)] + public IDictionary HttpHeaders { get; } + } +} diff --git a/sdk/search/Azure.Search.Documents/src/Indexes/Models/WordDelimiterTokenFilter.cs b/sdk/search/Azure.Search.Documents/src/Indexes/Models/WordDelimiterTokenFilter.cs new file mode 100644 index 000000000000..f3b5de45545a --- /dev/null +++ b/sdk/search/Azure.Search.Documents/src/Indexes/Models/WordDelimiterTokenFilter.cs @@ -0,0 +1,15 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +using System.Collections.Generic; +using Azure.Core; + +namespace Azure.Search.Documents.Indexes.Models +{ + public partial class WordDelimiterTokenFilter + { + /// A list of tokens to protect from being delimited. + [CodeGenMember(EmptyAsUndefined = true, Initialize = true)] + public IList ProtectedWords { get; } + } +} diff --git a/sdk/search/Azure.Search.Documents/tests/SearchableFieldAttributeTests.cs b/sdk/search/Azure.Search.Documents/tests/SearchableFieldAttributeTests.cs index 144990379ced..fa3987e97f97 100644 --- a/sdk/search/Azure.Search.Documents/tests/SearchableFieldAttributeTests.cs +++ b/sdk/search/Azure.Search.Documents/tests/SearchableFieldAttributeTests.cs @@ -1,6 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. +using System.Linq; using Azure.Search.Documents.Indexes; using Azure.Search.Documents.Indexes.Models; using NUnit.Framework; @@ -65,7 +66,7 @@ public void CreatesEquivalentField( Assert.AreEqual(analyzerName, field.AnalyzerName?.ToString()); Assert.AreEqual(searchAnalyzerName, field.SearchAnalyzerName?.ToString()); Assert.AreEqual(indexAnalyzerName, field.IndexAnalyzerName?.ToString()); - Assert.AreEqual(synonymMapNames, field.SynonymMapNames); + Assert.AreEqual(synonymMapNames ?? Enumerable.Empty(), field.SynonymMapNames); } } } diff --git a/sdk/search/Azure.Search.Documents/tests/SessionRecords/SearchIndexClientTests/UpdateIndex.json b/sdk/search/Azure.Search.Documents/tests/SessionRecords/SearchIndexClientTests/UpdateIndex.json index 97f38b43aaec..c1a8b9831398 100644 --- a/sdk/search/Azure.Search.Documents/tests/SessionRecords/SearchIndexClientTests/UpdateIndex.json +++ b/sdk/search/Azure.Search.Documents/tests/SessionRecords/SearchIndexClientTests/UpdateIndex.json @@ -1,17 +1,17 @@ { "Entries": [ { - "RequestUri": "https://azs-net-heathsearch2.search.windows.net/indexes?api-version=2019-05-06-Preview", + "RequestUri": "https://azs-net-heathsrchtst.search.windows.net/indexes?api-version=2019-05-06-Preview", "RequestMethod": "POST", "RequestHeaders": { "Accept": "application/json; odata.metadata=minimal", "api-key": "Sanitized", "Content-Length": "4032", "Content-Type": "application/json", - "traceparent": "00-5c0dcaa5f4f54d4d8d123c2a5f127f56-d797b7211423f544-00", + "traceparent": "00-19d98fb555532243bb05abb41589c33d-749f801a4ab12c4b-00", "User-Agent": [ - "azsdk-net-Search.Documents/1.0.0-dev.20200507.1", - "(.NET Core 4.6.28619.01; Microsoft Windows 10.0.19041 )" + "azsdk-net-Search.Documents/1.0.0-dev.20200603.1", + "(.NET Core 4.6.28801.04; Microsoft Windows 10.0.19041 )" ], "x-ms-client-request-id": "26f7066d315f5ab3f827c83cbd605a50", "x-ms-return-client-request-id": "true" @@ -307,22 +307,24 @@ "StatusCode": 201, "ResponseHeaders": { "Cache-Control": "no-cache", + "client-request-id": "26f7066d-315f-5ab3-f827-c83cbd605a50", "Content-Length": "6162", "Content-Type": "application/json; odata.metadata=minimal", - "Date": "Fri, 08 May 2020 07:03:24 GMT", - "elapsed-time": "563", - "ETag": "W/\u00220x8D7F31DE746F889\u0022", + "Date": "Wed, 03 Jun 2020 09:12:37 GMT", + "elapsed-time": "3371", + "ETag": "W/\u00220x8D8079E42686F6C\u0022", "Expires": "-1", - "Location": "https://azs-net-heathsearch2.search.windows.net/indexes(\u0027ptbgbued\u0027)?api-version=2019-05-06-Preview", + "Location": "https://azs-net-heathsrchtst.search.windows.net/indexes(\u0027ptbgbued\u0027)?api-version=2019-05-06-Preview", "OData-Version": "4.0", "Pragma": "no-cache", "Preference-Applied": "odata.include-annotations=\u0022*\u0022", "request-id": "26f7066d-315f-5ab3-f827-c83cbd605a50", - "Strict-Transport-Security": "max-age=15724800; includeSubDomains" + "Strict-Transport-Security": "max-age=15724800; includeSubDomains", + "x-ms-client-request-id": "26f7066d-315f-5ab3-f827-c83cbd605a50" }, "ResponseBody": { - "@odata.context": "https://azs-net-heathsearch2.search.windows.net/$metadata#indexes/$entity", - "@odata.etag": "\u00220x8D7F31DE746F889\u0022", + "@odata.context": "https://azs-net-heathsrchtst.search.windows.net/$metadata#indexes/$entity", + "@odata.etag": "\u00220x8D8079E42686F6C\u0022", "name": "ptbgbued", "defaultScoringProfile": null, "fields": [ @@ -717,19 +719,19 @@ } }, { - "RequestUri": "https://azs-net-heathsearch2.search.windows.net/indexes(\u0027ptbgbued\u0027)?allowIndexDowntime=true\u0026api-version=2019-05-06-Preview", + "RequestUri": "https://azs-net-heathsrchtst.search.windows.net/indexes(\u0027ptbgbued\u0027)?allowIndexDowntime=true\u0026api-version=2019-05-06-Preview", "RequestMethod": "PUT", "RequestHeaders": { "Accept": "application/json; odata.metadata=minimal", "api-key": "Sanitized", - "Content-Length": "4873", + "Content-Length": "4465", "Content-Type": "application/json", - "If-Match": "\u00220x8D7F31DE746F889\u0022", + "If-Match": "\u00220x8D8079E42686F6C\u0022", "Prefer": "return=representation", - "traceparent": "00-96f7529c0eafce40aefc3b6140a7aa68-fe5b71c4e898e347-00", + "traceparent": "00-19650928b8423149b4ecf7e79897a4f3-0c2925762cdabf43-00", "User-Agent": [ - "azsdk-net-Search.Documents/1.0.0-dev.20200507.1", - "(.NET Core 4.6.28619.01; Microsoft Windows 10.0.19041 )" + "azsdk-net-Search.Documents/1.0.0-dev.20200603.1", + "(.NET Core 4.6.28801.04; Microsoft Windows 10.0.19041 )" ], "x-ms-client-request-id": "5c92b4cdda72b9dbb6ec10cb1f481d99", "x-ms-return-client-request-id": "true" @@ -745,8 +747,7 @@ "searchable": false, "filterable": true, "sortable": true, - "facetable": true, - "synonymMaps": [] + "facetable": true }, { "name": "hotelName", @@ -756,8 +757,7 @@ "searchable": true, "filterable": true, "sortable": true, - "facetable": false, - "synonymMaps": [] + "facetable": false }, { "name": "description", @@ -768,8 +768,7 @@ "filterable": false, "sortable": false, "facetable": false, - "analyzer": "en.lucene", - "synonymMaps": [] + "analyzer": "en.lucene" }, { "name": "descriptionFr", @@ -780,8 +779,7 @@ "filterable": false, "sortable": false, "facetable": false, - "analyzer": "fr.lucene", - "synonymMaps": [] + "analyzer": "fr.lucene" }, { "name": "category", @@ -791,8 +789,7 @@ "searchable": true, "filterable": true, "sortable": true, - "facetable": true, - "synonymMaps": [] + "facetable": true }, { "name": "tags", @@ -802,8 +799,7 @@ "searchable": true, "filterable": true, "sortable": false, - "facetable": true, - "synonymMaps": [] + "facetable": true }, { "name": "parkingIncluded", @@ -813,8 +809,7 @@ "searchable": false, "filterable": true, "sortable": true, - "facetable": true, - "synonymMaps": [] + "facetable": true }, { "name": "smokingAllowed", @@ -824,8 +819,7 @@ "searchable": false, "filterable": true, "sortable": true, - "facetable": true, - "synonymMaps": [] + "facetable": true }, { "name": "lastRenovationDate", @@ -835,8 +829,7 @@ "searchable": false, "filterable": true, "sortable": true, - "facetable": true, - "synonymMaps": [] + "facetable": true }, { "name": "rating", @@ -846,8 +839,7 @@ "searchable": false, "filterable": true, "sortable": true, - "facetable": true, - "synonymMaps": [] + "facetable": true }, { "name": "location", @@ -857,8 +849,7 @@ "searchable": false, "filterable": true, "sortable": true, - "facetable": false, - "synonymMaps": [] + "facetable": false }, { "name": "address", @@ -872,8 +863,7 @@ "searchable": true, "filterable": false, "sortable": false, - "facetable": false, - "synonymMaps": [] + "facetable": false }, { "name": "city", @@ -883,8 +873,7 @@ "searchable": true, "filterable": true, "sortable": true, - "facetable": true, - "synonymMaps": [] + "facetable": true }, { "name": "stateProvince", @@ -894,8 +883,7 @@ "searchable": true, "filterable": true, "sortable": true, - "facetable": true, - "synonymMaps": [] + "facetable": true }, { "name": "country", @@ -905,8 +893,7 @@ "searchable": true, "filterable": true, "sortable": true, - "facetable": true, - "synonymMaps": [] + "facetable": true }, { "name": "postalCode", @@ -916,8 +903,7 @@ "searchable": true, "filterable": true, "sortable": true, - "facetable": true, - "synonymMaps": [] + "facetable": true } ] }, @@ -934,8 +920,7 @@ "filterable": false, "sortable": false, "facetable": false, - "analyzer": "en.lucene", - "synonymMaps": [] + "analyzer": "en.lucene" }, { "name": "descriptionFr", @@ -946,8 +931,7 @@ "filterable": false, "sortable": false, "facetable": false, - "analyzer": "fr.lucene", - "synonymMaps": [] + "analyzer": "fr.lucene" }, { "name": "type", @@ -957,8 +941,7 @@ "searchable": true, "filterable": true, "sortable": false, - "facetable": true, - "synonymMaps": [] + "facetable": true }, { "name": "baseRate", @@ -968,8 +951,7 @@ "searchable": false, "filterable": true, "sortable": false, - "facetable": true, - "synonymMaps": [] + "facetable": true }, { "name": "bedOptions", @@ -979,8 +961,7 @@ "searchable": true, "filterable": true, "sortable": false, - "facetable": true, - "synonymMaps": [] + "facetable": true }, { "name": "sleepsCount", @@ -990,8 +971,7 @@ "searchable": false, "filterable": true, "sortable": false, - "facetable": true, - "synonymMaps": [] + "facetable": true }, { "name": "smokingAllowed", @@ -1001,8 +981,7 @@ "searchable": false, "filterable": true, "sortable": false, - "facetable": true, - "synonymMaps": [] + "facetable": true }, { "name": "tags", @@ -1012,8 +991,7 @@ "searchable": true, "filterable": true, "sortable": false, - "facetable": true, - "synonymMaps": [] + "facetable": true } ] }, @@ -1070,26 +1048,28 @@ "name": "asciiTags" } ], - "@odata.etag": "\u00220x8D7F31DE746F889\u0022" + "@odata.etag": "\u00220x8D8079E42686F6C\u0022" }, "StatusCode": 200, "ResponseHeaders": { "Cache-Control": "no-cache", + "client-request-id": "5c92b4cd-da72-b9db-b6ec-10cb1f481d99", "Content-Length": "6581", "Content-Type": "application/json; odata.metadata=minimal", - "Date": "Fri, 08 May 2020 07:03:26 GMT", - "elapsed-time": "843", - "ETag": "W/\u00220x8D7F31DE7CE1B01\u0022", + "Date": "Wed, 03 Jun 2020 09:12:42 GMT", + "elapsed-time": "5005", + "ETag": "W/\u00220x8D8079E4575D162\u0022", "Expires": "-1", "OData-Version": "4.0", "Pragma": "no-cache", "Preference-Applied": "odata.include-annotations=\u0022*\u0022", "request-id": "5c92b4cd-da72-b9db-b6ec-10cb1f481d99", - "Strict-Transport-Security": "max-age=15724800; includeSubDomains" + "Strict-Transport-Security": "max-age=15724800; includeSubDomains", + "x-ms-client-request-id": "5c92b4cd-da72-b9db-b6ec-10cb1f481d99" }, "ResponseBody": { - "@odata.context": "https://azs-net-heathsearch2.search.windows.net/$metadata#indexes/$entity", - "@odata.etag": "\u00220x8D7F31DE7CE1B01\u0022", + "@odata.context": "https://azs-net-heathsrchtst.search.windows.net/$metadata#indexes/$entity", + "@odata.etag": "\u00220x8D8079E4575D162\u0022", "name": "ptbgbued", "defaultScoringProfile": null, "fields": [ @@ -1511,15 +1491,15 @@ } }, { - "RequestUri": "https://azs-net-heathsearch2.search.windows.net/indexes(\u0027ptbgbued\u0027)?api-version=2019-05-06-Preview", + "RequestUri": "https://azs-net-heathsrchtst.search.windows.net/indexes(\u0027ptbgbued\u0027)?api-version=2019-05-06-Preview", "RequestMethod": "DELETE", "RequestHeaders": { "Accept": "application/json; odata.metadata=minimal", "api-key": "Sanitized", - "traceparent": "00-75c8778e4e14ce44b7e125e7a48ff392-27614b9913936c40-00", + "traceparent": "00-9c66277609542a4dac0fff14087ec0dd-1f0609b8d0c2a940-00", "User-Agent": [ - "azsdk-net-Search.Documents/1.0.0-dev.20200507.1", - "(.NET Core 4.6.28619.01; Microsoft Windows 10.0.19041 )" + "azsdk-net-Search.Documents/1.0.0-dev.20200603.1", + "(.NET Core 4.6.28801.04; Microsoft Windows 10.0.19041 )" ], "x-ms-client-request-id": "bcb37215e67e50e3b4d10c4369758711", "x-ms-return-client-request-id": "true" @@ -1528,12 +1508,14 @@ "StatusCode": 204, "ResponseHeaders": { "Cache-Control": "no-cache", - "Date": "Fri, 08 May 2020 07:03:26 GMT", - "elapsed-time": "297", + "client-request-id": "bcb37215-e67e-50e3-b4d1-0c4369758711", + "Date": "Wed, 03 Jun 2020 09:12:42 GMT", + "elapsed-time": "526", "Expires": "-1", "Pragma": "no-cache", "request-id": "bcb37215-e67e-50e3-b4d1-0c4369758711", - "Strict-Transport-Security": "max-age=15724800; includeSubDomains" + "Strict-Transport-Security": "max-age=15724800; includeSubDomains", + "x-ms-client-request-id": "bcb37215-e67e-50e3-b4d1-0c4369758711" }, "ResponseBody": [] } @@ -1542,6 +1524,6 @@ "RandomSeed": "1669853055", "SearchIndexName": "ptbgbued", "SEARCH_ADMIN_API_KEY": "Sanitized", - "SEARCH_SERVICE_NAME": "azs-net-heathsearch2" + "SEARCH_SERVICE_NAME": "azs-net-heathsrchtst" } } \ No newline at end of file diff --git a/sdk/search/Azure.Search.Documents/tests/SessionRecords/SearchIndexClientTests/UpdateIndexAsync.json b/sdk/search/Azure.Search.Documents/tests/SessionRecords/SearchIndexClientTests/UpdateIndexAsync.json index a23b5392ec18..9aa45ceb2319 100644 --- a/sdk/search/Azure.Search.Documents/tests/SessionRecords/SearchIndexClientTests/UpdateIndexAsync.json +++ b/sdk/search/Azure.Search.Documents/tests/SessionRecords/SearchIndexClientTests/UpdateIndexAsync.json @@ -1,17 +1,17 @@ { "Entries": [ { - "RequestUri": "https://azs-net-heathsearch2.search.windows.net/indexes?api-version=2019-05-06-Preview", + "RequestUri": "https://azs-net-heathsrchtst.search.windows.net/indexes?api-version=2019-05-06-Preview", "RequestMethod": "POST", "RequestHeaders": { "Accept": "application/json; odata.metadata=minimal", "api-key": "Sanitized", "Content-Length": "4032", "Content-Type": "application/json", - "traceparent": "00-551b82784a85cb4696807a63724b4718-c0ed601407e6ac4d-00", + "traceparent": "00-fc6bd5003e2abb44b9921fe44f36e733-a2c57f1336eb144a-00", "User-Agent": [ - "azsdk-net-Search.Documents/1.0.0-dev.20200507.1", - "(.NET Core 4.6.28619.01; Microsoft Windows 10.0.19041 )" + "azsdk-net-Search.Documents/1.0.0-dev.20200603.1", + "(.NET Core 4.6.28801.04; Microsoft Windows 10.0.19041 )" ], "x-ms-client-request-id": "62e943843b5a3dfda55d7936ea8d46fa", "x-ms-return-client-request-id": "true" @@ -307,22 +307,24 @@ "StatusCode": 201, "ResponseHeaders": { "Cache-Control": "no-cache", + "client-request-id": "62e94384-3b5a-3dfd-a55d-7936ea8d46fa", "Content-Length": "6162", "Content-Type": "application/json; odata.metadata=minimal", - "Date": "Fri, 08 May 2020 07:04:44 GMT", - "elapsed-time": "857", - "ETag": "W/\u00220x8D7F31E16591548\u0022", + "Date": "Wed, 03 Jun 2020 09:12:46 GMT", + "elapsed-time": "1052", + "ETag": "W/\u00220x8D8079E47C2737E\u0022", "Expires": "-1", - "Location": "https://azs-net-heathsearch2.search.windows.net/indexes(\u0027mvqfigik\u0027)?api-version=2019-05-06-Preview", + "Location": "https://azs-net-heathsrchtst.search.windows.net/indexes(\u0027mvqfigik\u0027)?api-version=2019-05-06-Preview", "OData-Version": "4.0", "Pragma": "no-cache", "Preference-Applied": "odata.include-annotations=\u0022*\u0022", "request-id": "62e94384-3b5a-3dfd-a55d-7936ea8d46fa", - "Strict-Transport-Security": "max-age=15724800; includeSubDomains" + "Strict-Transport-Security": "max-age=15724800; includeSubDomains", + "x-ms-client-request-id": "62e94384-3b5a-3dfd-a55d-7936ea8d46fa" }, "ResponseBody": { - "@odata.context": "https://azs-net-heathsearch2.search.windows.net/$metadata#indexes/$entity", - "@odata.etag": "\u00220x8D7F31E16591548\u0022", + "@odata.context": "https://azs-net-heathsrchtst.search.windows.net/$metadata#indexes/$entity", + "@odata.etag": "\u00220x8D8079E47C2737E\u0022", "name": "mvqfigik", "defaultScoringProfile": null, "fields": [ @@ -717,19 +719,19 @@ } }, { - "RequestUri": "https://azs-net-heathsearch2.search.windows.net/indexes(\u0027mvqfigik\u0027)?allowIndexDowntime=true\u0026api-version=2019-05-06-Preview", + "RequestUri": "https://azs-net-heathsrchtst.search.windows.net/indexes(\u0027mvqfigik\u0027)?allowIndexDowntime=true\u0026api-version=2019-05-06-Preview", "RequestMethod": "PUT", "RequestHeaders": { "Accept": "application/json; odata.metadata=minimal", "api-key": "Sanitized", - "Content-Length": "4873", + "Content-Length": "4465", "Content-Type": "application/json", - "If-Match": "\u00220x8D7F31E16591548\u0022", + "If-Match": "\u00220x8D8079E47C2737E\u0022", "Prefer": "return=representation", - "traceparent": "00-d6bb0442cde45243862cdeb53f598e37-55cc01b22ff32a4d-00", + "traceparent": "00-c7c5c8f6512ca04299cb8fa452e57fb9-38da7be64c930242-00", "User-Agent": [ - "azsdk-net-Search.Documents/1.0.0-dev.20200507.1", - "(.NET Core 4.6.28619.01; Microsoft Windows 10.0.19041 )" + "azsdk-net-Search.Documents/1.0.0-dev.20200603.1", + "(.NET Core 4.6.28801.04; Microsoft Windows 10.0.19041 )" ], "x-ms-client-request-id": "b20370b178072cf624850527937d7829", "x-ms-return-client-request-id": "true" @@ -745,8 +747,7 @@ "searchable": false, "filterable": true, "sortable": true, - "facetable": true, - "synonymMaps": [] + "facetable": true }, { "name": "hotelName", @@ -756,8 +757,7 @@ "searchable": true, "filterable": true, "sortable": true, - "facetable": false, - "synonymMaps": [] + "facetable": false }, { "name": "description", @@ -768,8 +768,7 @@ "filterable": false, "sortable": false, "facetable": false, - "analyzer": "en.lucene", - "synonymMaps": [] + "analyzer": "en.lucene" }, { "name": "descriptionFr", @@ -780,8 +779,7 @@ "filterable": false, "sortable": false, "facetable": false, - "analyzer": "fr.lucene", - "synonymMaps": [] + "analyzer": "fr.lucene" }, { "name": "category", @@ -791,8 +789,7 @@ "searchable": true, "filterable": true, "sortable": true, - "facetable": true, - "synonymMaps": [] + "facetable": true }, { "name": "tags", @@ -802,8 +799,7 @@ "searchable": true, "filterable": true, "sortable": false, - "facetable": true, - "synonymMaps": [] + "facetable": true }, { "name": "parkingIncluded", @@ -813,8 +809,7 @@ "searchable": false, "filterable": true, "sortable": true, - "facetable": true, - "synonymMaps": [] + "facetable": true }, { "name": "smokingAllowed", @@ -824,8 +819,7 @@ "searchable": false, "filterable": true, "sortable": true, - "facetable": true, - "synonymMaps": [] + "facetable": true }, { "name": "lastRenovationDate", @@ -835,8 +829,7 @@ "searchable": false, "filterable": true, "sortable": true, - "facetable": true, - "synonymMaps": [] + "facetable": true }, { "name": "rating", @@ -846,8 +839,7 @@ "searchable": false, "filterable": true, "sortable": true, - "facetable": true, - "synonymMaps": [] + "facetable": true }, { "name": "location", @@ -857,8 +849,7 @@ "searchable": false, "filterable": true, "sortable": true, - "facetable": false, - "synonymMaps": [] + "facetable": false }, { "name": "address", @@ -872,8 +863,7 @@ "searchable": true, "filterable": false, "sortable": false, - "facetable": false, - "synonymMaps": [] + "facetable": false }, { "name": "city", @@ -883,8 +873,7 @@ "searchable": true, "filterable": true, "sortable": true, - "facetable": true, - "synonymMaps": [] + "facetable": true }, { "name": "stateProvince", @@ -894,8 +883,7 @@ "searchable": true, "filterable": true, "sortable": true, - "facetable": true, - "synonymMaps": [] + "facetable": true }, { "name": "country", @@ -905,8 +893,7 @@ "searchable": true, "filterable": true, "sortable": true, - "facetable": true, - "synonymMaps": [] + "facetable": true }, { "name": "postalCode", @@ -916,8 +903,7 @@ "searchable": true, "filterable": true, "sortable": true, - "facetable": true, - "synonymMaps": [] + "facetable": true } ] }, @@ -934,8 +920,7 @@ "filterable": false, "sortable": false, "facetable": false, - "analyzer": "en.lucene", - "synonymMaps": [] + "analyzer": "en.lucene" }, { "name": "descriptionFr", @@ -946,8 +931,7 @@ "filterable": false, "sortable": false, "facetable": false, - "analyzer": "fr.lucene", - "synonymMaps": [] + "analyzer": "fr.lucene" }, { "name": "type", @@ -957,8 +941,7 @@ "searchable": true, "filterable": true, "sortable": false, - "facetable": true, - "synonymMaps": [] + "facetable": true }, { "name": "baseRate", @@ -968,8 +951,7 @@ "searchable": false, "filterable": true, "sortable": false, - "facetable": true, - "synonymMaps": [] + "facetable": true }, { "name": "bedOptions", @@ -979,8 +961,7 @@ "searchable": true, "filterable": true, "sortable": false, - "facetable": true, - "synonymMaps": [] + "facetable": true }, { "name": "sleepsCount", @@ -990,8 +971,7 @@ "searchable": false, "filterable": true, "sortable": false, - "facetable": true, - "synonymMaps": [] + "facetable": true }, { "name": "smokingAllowed", @@ -1001,8 +981,7 @@ "searchable": false, "filterable": true, "sortable": false, - "facetable": true, - "synonymMaps": [] + "facetable": true }, { "name": "tags", @@ -1012,8 +991,7 @@ "searchable": true, "filterable": true, "sortable": false, - "facetable": true, - "synonymMaps": [] + "facetable": true } ] }, @@ -1070,26 +1048,28 @@ "name": "asciiTags" } ], - "@odata.etag": "\u00220x8D7F31E16591548\u0022" + "@odata.etag": "\u00220x8D8079E47C2737E\u0022" }, "StatusCode": 200, "ResponseHeaders": { "Cache-Control": "no-cache", + "client-request-id": "b20370b1-7807-2cf6-2485-0527937d7829", "Content-Length": "6581", "Content-Type": "application/json; odata.metadata=minimal", - "Date": "Fri, 08 May 2020 07:04:45 GMT", - "elapsed-time": "830", - "ETag": "W/\u00220x8D7F31E16DFC280\u0022", + "Date": "Wed, 03 Jun 2020 09:12:48 GMT", + "elapsed-time": "3424", + "ETag": "W/\u00220x8D8079E49D9C7D9\u0022", "Expires": "-1", "OData-Version": "4.0", "Pragma": "no-cache", "Preference-Applied": "odata.include-annotations=\u0022*\u0022", "request-id": "b20370b1-7807-2cf6-2485-0527937d7829", - "Strict-Transport-Security": "max-age=15724800; includeSubDomains" + "Strict-Transport-Security": "max-age=15724800; includeSubDomains", + "x-ms-client-request-id": "b20370b1-7807-2cf6-2485-0527937d7829" }, "ResponseBody": { - "@odata.context": "https://azs-net-heathsearch2.search.windows.net/$metadata#indexes/$entity", - "@odata.etag": "\u00220x8D7F31E16DFC280\u0022", + "@odata.context": "https://azs-net-heathsrchtst.search.windows.net/$metadata#indexes/$entity", + "@odata.etag": "\u00220x8D8079E49D9C7D9\u0022", "name": "mvqfigik", "defaultScoringProfile": null, "fields": [ @@ -1511,15 +1491,15 @@ } }, { - "RequestUri": "https://azs-net-heathsearch2.search.windows.net/indexes(\u0027mvqfigik\u0027)?api-version=2019-05-06-Preview", + "RequestUri": "https://azs-net-heathsrchtst.search.windows.net/indexes(\u0027mvqfigik\u0027)?api-version=2019-05-06-Preview", "RequestMethod": "DELETE", "RequestHeaders": { "Accept": "application/json; odata.metadata=minimal", "api-key": "Sanitized", - "traceparent": "00-5b4426e384b18a4b9ab03dccacba9727-e307ce5a4d28c24a-00", + "traceparent": "00-7735de25416b5f43bb4ec2b101bfcc24-ef606e1d78dd5f4f-00", "User-Agent": [ - "azsdk-net-Search.Documents/1.0.0-dev.20200507.1", - "(.NET Core 4.6.28619.01; Microsoft Windows 10.0.19041 )" + "azsdk-net-Search.Documents/1.0.0-dev.20200603.1", + "(.NET Core 4.6.28801.04; Microsoft Windows 10.0.19041 )" ], "x-ms-client-request-id": "2f006d0b543d6ef41f058a4a0d2e28c5", "x-ms-return-client-request-id": "true" @@ -1528,12 +1508,14 @@ "StatusCode": 204, "ResponseHeaders": { "Cache-Control": "no-cache", - "Date": "Fri, 08 May 2020 07:04:45 GMT", - "elapsed-time": "367", + "client-request-id": "2f006d0b-543d-6ef4-1f05-8a4a0d2e28c5", + "Date": "Wed, 03 Jun 2020 09:12:50 GMT", + "elapsed-time": "712", "Expires": "-1", "Pragma": "no-cache", "request-id": "2f006d0b-543d-6ef4-1f05-8a4a0d2e28c5", - "Strict-Transport-Security": "max-age=15724800; includeSubDomains" + "Strict-Transport-Security": "max-age=15724800; includeSubDomains", + "x-ms-client-request-id": "2f006d0b-543d-6ef4-1f05-8a4a0d2e28c5" }, "ResponseBody": [] } @@ -1542,6 +1524,6 @@ "RandomSeed": "1673829715", "SearchIndexName": "mvqfigik", "SEARCH_ADMIN_API_KEY": "Sanitized", - "SEARCH_SERVICE_NAME": "azs-net-heathsearch2" + "SEARCH_SERVICE_NAME": "azs-net-heathsrchtst" } } \ No newline at end of file diff --git a/sdk/search/Azure.Search.Documents/tests/SessionRecords/SearchIndexerClientTests/CreateAzureBlobIndexer.json b/sdk/search/Azure.Search.Documents/tests/SessionRecords/SearchIndexerClientTests/CreateAzureBlobIndexer.json index 9f2d9b85fc5e..cb84568a245c 100644 --- a/sdk/search/Azure.Search.Documents/tests/SessionRecords/SearchIndexerClientTests/CreateAzureBlobIndexer.json +++ b/sdk/search/Azure.Search.Documents/tests/SessionRecords/SearchIndexerClientTests/CreateAzureBlobIndexer.json @@ -1,50 +1,52 @@ { "Entries": [ { - "RequestUri": "https://azs-net-heathsearch2.search.windows.net/datasources?api-version=2019-05-06-Preview", + "RequestUri": "https://azs-net-heathsrchtst.search.windows.net/datasources?api-version=2019-05-06-Preview", "RequestMethod": "POST", "RequestHeaders": { "Accept": "application/json; odata.metadata=minimal", "api-key": "Sanitized", - "Content-Length": "219", + "Content-Length": "216", "Content-Type": "application/json", - "traceparent": "00-09e9c7977e73f0458d016eda24ddc16f-93689a46726f0640-00", + "traceparent": "00-811853813260b94abbd669bff8614a35-89d2688721bc8847-00", "User-Agent": [ - "azsdk-net-Search.Documents/1.0.0-dev.20200507.1", - "(.NET Core 4.6.28619.01; Microsoft Windows 10.0.19041 )" + "azsdk-net-Search.Documents/1.0.0-dev.20200603.1", + "(.NET Core 4.6.28801.04; Microsoft Windows 10.0.19041 )" ], - "x-ms-client-request-id": "486ad252-5430-9070-c808-3a9e1cef25f0", + "x-ms-client-request-id": "486ad25254309070c8083a9e1cef25f0", "x-ms-return-client-request-id": "true" }, "RequestBody": { "name": "frgsqbma", "type": "azureblob", "credentials": { - "connectionString": "DefaultEndpointsProtocol=https;AccountName=heathsearch2stg;AccountKey=Sanitized;EndpointSuffix=core.windows.net" + "connectionString": "DefaultEndpointsProtocol=https;AccountName=heathsrchstg;AccountKey=Sanitized;EndpointSuffix=core.windows.net" }, "container": { - "name": "uangflsr" + "name": "gonnfoex" } }, "StatusCode": 201, "ResponseHeaders": { "Cache-Control": "no-cache", + "client-request-id": "486ad252-5430-9070-c808-3a9e1cef25f0", "Content-Length": "360", "Content-Type": "application/json; odata.metadata=minimal", - "Date": "Fri, 08 May 2020 07:02:19 GMT", - "elapsed-time": "84", - "ETag": "W/\u00220x8D7F31DBF9AE2C9\u0022", + "Date": "Wed, 03 Jun 2020 09:13:16 GMT", + "elapsed-time": "50", + "ETag": "W/\u00220x8D8079E59DAB1A7\u0022", "Expires": "-1", - "Location": "https://azs-net-heathsearch2.search.windows.net/datasources(\u0027frgsqbma\u0027)?api-version=2019-05-06-Preview", + "Location": "https://azs-net-heathsrchtst.search.windows.net/datasources(\u0027frgsqbma\u0027)?api-version=2019-05-06-Preview", "OData-Version": "4.0", "Pragma": "no-cache", "Preference-Applied": "odata.include-annotations=\u0022*\u0022", "request-id": "486ad252-5430-9070-c808-3a9e1cef25f0", - "Strict-Transport-Security": "max-age=15724800; includeSubDomains" + "Strict-Transport-Security": "max-age=15724800; includeSubDomains", + "x-ms-client-request-id": "486ad252-5430-9070-c808-3a9e1cef25f0" }, "ResponseBody": { - "@odata.context": "https://azs-net-heathsearch2.search.windows.net/$metadata#datasources/$entity", - "@odata.etag": "\u00220x8D7F31DBF9AE2C9\u0022", + "@odata.context": "https://azs-net-heathsrchtst.search.windows.net/$metadata#datasources/$entity", + "@odata.etag": "\u00220x8D8079E59DAB1A7\u0022", "name": "frgsqbma", "description": null, "type": "azureblob", @@ -53,7 +55,7 @@ "connectionString": null }, "container": { - "name": "uangflsr", + "name": "gonnfoex", "query": null }, "dataChangeDetectionPolicy": null, @@ -61,50 +63,52 @@ } }, { - "RequestUri": "https://azs-net-heathsearch2.search.windows.net/indexers?api-version=2019-05-06-Preview", + "RequestUri": "https://azs-net-heathsrchtst.search.windows.net/indexers?api-version=2019-05-06-Preview", "RequestMethod": "POST", "RequestHeaders": { "Accept": "application/json; odata.metadata=minimal", "api-key": "Sanitized", "Content-Length": "76", "Content-Type": "application/json", - "traceparent": "00-db63707a8e057746801600f3ce59c360-9446ea61c1ba9046-00", + "traceparent": "00-342878ce106921498df83cad93a87f63-3c9de6c8b7eac84e-00", "User-Agent": [ - "azsdk-net-Search.Documents/1.0.0-dev.20200507.1", - "(.NET Core 4.6.28619.01; Microsoft Windows 10.0.19041 )" + "azsdk-net-Search.Documents/1.0.0-dev.20200603.1", + "(.NET Core 4.6.28801.04; Microsoft Windows 10.0.19041 )" ], - "x-ms-client-request-id": "7b39b864-f7dd-c6f9-0db9-5c5e460013d7", + "x-ms-client-request-id": "2170341e0943733f7c962833f7f456dc", "x-ms-return-client-request-id": "true" }, "RequestBody": { "name": "mqmuncer", "dataSourceName": "frgsqbma", - "targetIndexName": "fexlvtnn" + "targetIndexName": "oaqoatsp" }, "StatusCode": 201, "ResponseHeaders": { "Cache-Control": "no-cache", + "client-request-id": "2170341e-0943-733f-7c96-2833f7f456dc", "Content-Length": "354", "Content-Type": "application/json; odata.metadata=minimal", - "Date": "Fri, 08 May 2020 07:02:28 GMT", - "elapsed-time": "9815", - "ETag": "W/\u00220x8D7F31DC56CBB11\u0022", + "Date": "Wed, 03 Jun 2020 09:13:18 GMT", + "elapsed-time": "1546", + "ETag": "W/\u00220x8D8079E5AAED6F2\u0022", "Expires": "-1", - "Location": "https://azs-net-heathsearch2.search.windows.net/indexers(\u0027mqmuncer\u0027)?api-version=2019-05-06-Preview", + "Location": "https://azs-net-heathsrchtst.search.windows.net/indexers(\u0027mqmuncer\u0027)?api-version=2019-05-06-Preview", "OData-Version": "4.0", "Pragma": "no-cache", "Preference-Applied": "odata.include-annotations=\u0022*\u0022", - "request-id": "7b39b864-f7dd-c6f9-0db9-5c5e460013d7", - "Strict-Transport-Security": "max-age=15724800; includeSubDomains" + "request-id": "2170341e-0943-733f-7c96-2833f7f456dc", + "Strict-Transport-Security": "max-age=15724800; includeSubDomains", + "x-ms-client-request-id": "2170341e-0943-733f-7c96-2833f7f456dc" }, "ResponseBody": { - "@odata.context": "https://azs-net-heathsearch2.search.windows.net/$metadata#indexers/$entity", - "@odata.etag": "\u00220x8D7F31DC56CBB11\u0022", + "@odata.context": "https://azs-net-heathsrchtst.search.windows.net/$metadata#indexers/$entity", + "@odata.etag": "\u00220x8D8079E5AAED6F2\u0022", "name": "mqmuncer", "description": null, "dataSourceName": "frgsqbma", "skillsetName": null, - "targetIndexName": "fexlvtnn", + "targetIndexName": "oaqoatsp", "disabled": null, "schedule": null, "parameters": null, @@ -114,55 +118,55 @@ } }, { - "RequestUri": "https://azs-net-heathsearch2.search.windows.net/indexers(\u0027mqmuncer\u0027)?api-version=2019-05-06-Preview", + "RequestUri": "https://azs-net-heathsrchtst.search.windows.net/indexers(\u0027mqmuncer\u0027)?api-version=2019-05-06-Preview", "RequestMethod": "PUT", "RequestHeaders": { "Accept": "application/json; odata.metadata=minimal", "api-key": "Sanitized", - "Content-Length": "202", + "Content-Length": "158", "Content-Type": "application/json", - "If-Match": "\u00220x8D7F31DC56CBB11\u0022", + "If-Match": "\u00220x8D8079E5AAED6F2\u0022", "Prefer": "return=representation", - "traceparent": "00-6e4a5fa7b739864eab50687ccf4522e4-0d75a8f56dc21746-00", + "traceparent": "00-6e4a056a0d9ab44792ea228e19c8c721-362abdf4f8dce542-00", "User-Agent": [ - "azsdk-net-Search.Documents/1.0.0-dev.20200507.1", - "(.NET Core 4.6.28619.01; Microsoft Windows 10.0.19041 )" + "azsdk-net-Search.Documents/1.0.0-dev.20200603.1", + "(.NET Core 4.6.28801.04; Microsoft Windows 10.0.19041 )" ], - "x-ms-client-request-id": "228a0aea-6d41-269a-3ba9-1489ade12c7c", + "x-ms-client-request-id": "7b39b864f7ddc6f90db95c5e460013d7", "x-ms-return-client-request-id": "true" }, "RequestBody": { "name": "mqmuncer", "description": "Updated description", "dataSourceName": "frgsqbma", - "targetIndexName": "fexlvtnn", - "fieldMappings": [], - "outputFieldMappings": [], - "@odata.etag": "\u00220x8D7F31DC56CBB11\u0022" + "targetIndexName": "oaqoatsp", + "@odata.etag": "\u00220x8D8079E5AAED6F2\u0022" }, "StatusCode": 200, "ResponseHeaders": { "Cache-Control": "no-cache", + "client-request-id": "7b39b864-f7dd-c6f9-0db9-5c5e460013d7", "Content-Length": "371", "Content-Type": "application/json; odata.metadata=minimal", - "Date": "Fri, 08 May 2020 07:02:28 GMT", - "elapsed-time": "112", - "ETag": "W/\u00220x8D7F31DC598DC19\u0022", + "Date": "Wed, 03 Jun 2020 09:13:18 GMT", + "elapsed-time": "170", + "ETag": "W/\u00220x8D8079E5AF73C3B\u0022", "Expires": "-1", "OData-Version": "4.0", "Pragma": "no-cache", "Preference-Applied": "odata.include-annotations=\u0022*\u0022", - "request-id": "228a0aea-6d41-269a-3ba9-1489ade12c7c", - "Strict-Transport-Security": "max-age=15724800; includeSubDomains" + "request-id": "7b39b864-f7dd-c6f9-0db9-5c5e460013d7", + "Strict-Transport-Security": "max-age=15724800; includeSubDomains", + "x-ms-client-request-id": "7b39b864-f7dd-c6f9-0db9-5c5e460013d7" }, "ResponseBody": { - "@odata.context": "https://azs-net-heathsearch2.search.windows.net/$metadata#indexers/$entity", - "@odata.etag": "\u00220x8D7F31DC598DC19\u0022", + "@odata.context": "https://azs-net-heathsrchtst.search.windows.net/$metadata#indexers/$entity", + "@odata.etag": "\u00220x8D8079E5AF73C3B\u0022", "name": "mqmuncer", "description": "Updated description", "dataSourceName": "frgsqbma", "skillsetName": null, - "targetIndexName": "fexlvtnn", + "targetIndexName": "oaqoatsp", "disabled": null, "schedule": null, "parameters": null, @@ -172,52 +176,68 @@ } }, { - "RequestUri": "https://azs-net-heathsearch2.search.windows.net/indexers(\u0027mqmuncer\u0027)/search.status?api-version=2019-05-06-Preview", + "RequestUri": "https://azs-net-heathsrchtst.search.windows.net/indexers(\u0027mqmuncer\u0027)/search.status?api-version=2019-05-06-Preview", "RequestMethod": "GET", "RequestHeaders": { "Accept": "application/json; odata.metadata=minimal", "api-key": "Sanitized", - "traceparent": "00-0ce52b70210d8644990975e1934557b1-9ecf9ccb8204d64d-00", + "traceparent": "00-e01fea8f1aa5f64597b03756c9a94b41-23d928204e8e3842-00", "User-Agent": [ - "azsdk-net-Search.Documents/1.0.0-dev.20200507.1", - "(.NET Core 4.6.28619.01; Microsoft Windows 10.0.19041 )" + "azsdk-net-Search.Documents/1.0.0-dev.20200603.1", + "(.NET Core 4.6.28801.04; Microsoft Windows 10.0.19041 )" ], - "x-ms-client-request-id": "3b74c8c0-f076-7c96-5803-bf3a3ac310e7", + "x-ms-client-request-id": "fb2af2e94ee4be4cc8c62185c6f1f893", "x-ms-return-client-request-id": "true" }, "RequestBody": null, "StatusCode": 200, "ResponseHeaders": { "Cache-Control": "no-cache", - "Content-Length": "556", + "client-request-id": "fb2af2e9-4ee4-be4c-c8c6-2185c6f1f893", + "Content-Length": "1521", "Content-Type": "application/json; odata.metadata=minimal", - "Date": "Fri, 08 May 2020 07:02:38 GMT", - "elapsed-time": "14", + "Date": "Wed, 03 Jun 2020 09:13:28 GMT", + "elapsed-time": "13", "Expires": "-1", "OData-Version": "4.0", "Pragma": "no-cache", "Preference-Applied": "odata.include-annotations=\u0022*\u0022", - "request-id": "3b74c8c0-f076-7c96-5803-bf3a3ac310e7", - "Strict-Transport-Security": "max-age=15724800; includeSubDomains" + "request-id": "fb2af2e9-4ee4-be4c-c8c6-2185c6f1f893", + "Strict-Transport-Security": "max-age=15724800; includeSubDomains", + "x-ms-client-request-id": "fb2af2e9-4ee4-be4c-c8c6-2185c6f1f893" }, "ResponseBody": { - "@odata.context": "https://azs-net-heathsearch2.search.windows.net/$metadata#Microsoft.Azure.Search.V2019_05_06_Preview.IndexerExecutionInfo", + "@odata.context": "https://azs-net-heathsrchtst.search.windows.net/$metadata#Microsoft.Azure.Search.V2019_05_06_Preview.IndexerExecutionInfo", "name": "mqmuncer", "status": "running", "lastResult": { - "status": "inProgress", + "status": "success", "errorMessage": null, - "startTime": "2020-05-08T07:02:30.506Z", - "endTime": null, - "itemsProcessed": 0, + "startTime": "2020-06-03T09:13:21.864Z", + "endTime": "2020-06-03T09:13:23.489Z", + "itemsProcessed": 10, "itemsFailed": 0, - "initialTrackingState": null, - "finalTrackingState": null, + "initialTrackingState": "{\r\n \u0022lastFullEnumerationStartTime\u0022: \u00220001-01-01T00:00:00Z\u0022,\r\n \u0022lastAttemptedEnumerationStartTime\u0022: \u00222020-06-03T09:13:21.864Z\u0022,\r\n \u0022nameHighWaterMark\u0022: null\r\n}", + "finalTrackingState": "{\u0022LastFullEnumerationStartTime\u0022:\u00222020-06-03T09:12:51.8642266\u002B00:00\u0022,\u0022LastAttemptedEnumerationStartTime\u0022:\u00222020-06-03T09:12:51.8642266\u002B00:00\u0022,\u0022NameHighWaterMark\u0022:null}", "errors": [], "warnings": [], "metrics": null }, - "executionHistory": [], + "executionHistory": [ + { + "status": "success", + "errorMessage": null, + "startTime": "2020-06-03T09:13:21.864Z", + "endTime": "2020-06-03T09:13:23.489Z", + "itemsProcessed": 10, + "itemsFailed": 0, + "initialTrackingState": "{\r\n \u0022lastFullEnumerationStartTime\u0022: \u00220001-01-01T00:00:00Z\u0022,\r\n \u0022lastAttemptedEnumerationStartTime\u0022: \u00222020-06-03T09:13:21.864Z\u0022,\r\n \u0022nameHighWaterMark\u0022: null\r\n}", + "finalTrackingState": "{\u0022LastFullEnumerationStartTime\u0022:\u00222020-06-03T09:12:51.8642266\u002B00:00\u0022,\u0022LastAttemptedEnumerationStartTime\u0022:\u00222020-06-03T09:12:51.8642266\u002B00:00\u0022,\u0022NameHighWaterMark\u0022:null}", + "errors": [], + "warnings": [], + "metrics": null + } + ], "limits": { "maxRunTime": "PT2M", "maxDocumentExtractionSize": 16777216, @@ -226,47 +246,79 @@ } }, { - "RequestUri": "https://azs-net-heathsearch2.search.windows.net/indexers(\u0027mqmuncer\u0027)/search.status?api-version=2019-05-06-Preview", + "RequestUri": "https://azs-net-heathsrchtst.search.windows.net/indexers(\u0027mqmuncer\u0027)/search.run?api-version=2019-05-06-Preview", + "RequestMethod": "POST", + "RequestHeaders": { + "Accept": "application/json; odata.metadata=minimal", + "api-key": "Sanitized", + "traceparent": "00-3c43f90207ceb24aa83b53a6ce0c9447-265a052f74549b4d-00", + "User-Agent": [ + "azsdk-net-Search.Documents/1.0.0-dev.20200603.1", + "(.NET Core 4.6.28801.04; Microsoft Windows 10.0.19041 )" + ], + "x-ms-client-request-id": "228a0aea6d41269a3ba91489ade12c7c", + "x-ms-return-client-request-id": "true" + }, + "RequestBody": null, + "StatusCode": 202, + "ResponseHeaders": { + "Cache-Control": "no-cache", + "client-request-id": "228a0aea-6d41-269a-3ba9-1489ade12c7c", + "Content-Length": "0", + "Date": "Wed, 03 Jun 2020 09:13:28 GMT", + "elapsed-time": "39", + "Expires": "-1", + "Pragma": "no-cache", + "request-id": "228a0aea-6d41-269a-3ba9-1489ade12c7c", + "Strict-Transport-Security": "max-age=15724800; includeSubDomains", + "x-ms-client-request-id": "228a0aea-6d41-269a-3ba9-1489ade12c7c" + }, + "ResponseBody": [] + }, + { + "RequestUri": "https://azs-net-heathsrchtst.search.windows.net/indexers(\u0027mqmuncer\u0027)/search.status?api-version=2019-05-06-Preview", "RequestMethod": "GET", "RequestHeaders": { "Accept": "application/json; odata.metadata=minimal", "api-key": "Sanitized", - "traceparent": "00-ac819c808d94cb4fb014d8179909cfa7-e3f3aa98a6e7dd4b-00", + "traceparent": "00-fb0e35afbbab6444a510638ec1bfae7b-49545e7b7efc6d4d-00", "User-Agent": [ - "azsdk-net-Search.Documents/1.0.0-dev.20200507.1", - "(.NET Core 4.6.28619.01; Microsoft Windows 10.0.19041 )" + "azsdk-net-Search.Documents/1.0.0-dev.20200603.1", + "(.NET Core 4.6.28801.04; Microsoft Windows 10.0.19041 )" ], - "x-ms-client-request-id": "e5c9f8aa-f16d-9205-bace-acc79bbddba9", + "x-ms-client-request-id": "044a51835bca15f86c7ab316d674ff1c", "x-ms-return-client-request-id": "true" }, "RequestBody": null, "StatusCode": 200, "ResponseHeaders": { "Cache-Control": "no-cache", - "Content-Length": "1521", + "client-request-id": "044a5183-5bca-15f8-6c7a-b316d674ff1c", + "Content-Length": "1325", "Content-Type": "application/json; odata.metadata=minimal", - "Date": "Fri, 08 May 2020 07:02:49 GMT", - "elapsed-time": "29", + "Date": "Wed, 03 Jun 2020 09:13:38 GMT", + "elapsed-time": "13", "Expires": "-1", "OData-Version": "4.0", "Pragma": "no-cache", "Preference-Applied": "odata.include-annotations=\u0022*\u0022", - "request-id": "e5c9f8aa-f16d-9205-bace-acc79bbddba9", - "Strict-Transport-Security": "max-age=15724800; includeSubDomains" + "request-id": "044a5183-5bca-15f8-6c7a-b316d674ff1c", + "Strict-Transport-Security": "max-age=15724800; includeSubDomains", + "x-ms-client-request-id": "044a5183-5bca-15f8-6c7a-b316d674ff1c" }, "ResponseBody": { - "@odata.context": "https://azs-net-heathsearch2.search.windows.net/$metadata#Microsoft.Azure.Search.V2019_05_06_Preview.IndexerExecutionInfo", + "@odata.context": "https://azs-net-heathsrchtst.search.windows.net/$metadata#Microsoft.Azure.Search.V2019_05_06_Preview.IndexerExecutionInfo", "name": "mqmuncer", "status": "running", "lastResult": { - "status": "success", + "status": "inProgress", "errorMessage": null, - "startTime": "2020-05-08T07:02:30.522Z", - "endTime": "2020-05-08T07:02:40.208Z", - "itemsProcessed": 10, + "startTime": "2020-06-03T09:13:31.917Z", + "endTime": null, + "itemsProcessed": 0, "itemsFailed": 0, - "initialTrackingState": "{\r\n \u0022lastFullEnumerationStartTime\u0022: \u00220001-01-01T00:00:00Z\u0022,\r\n \u0022lastAttemptedEnumerationStartTime\u0022: \u00222020-05-08T07:02:30.553Z\u0022,\r\n \u0022nameHighWaterMark\u0022: null\r\n}", - "finalTrackingState": "{\u0022LastFullEnumerationStartTime\u0022:\u00222020-05-08T07:02:00.5534559\u002B00:00\u0022,\u0022LastAttemptedEnumerationStartTime\u0022:\u00222020-05-08T07:02:00.5534559\u002B00:00\u0022,\u0022NameHighWaterMark\u0022:null}", + "initialTrackingState": "{\u0022LastFullEnumerationStartTime\u0022:\u00222020-06-03T09:12:51.8642266\u002B00:00\u0022,\u0022LastAttemptedEnumerationStartTime\u0022:\u00222020-06-03T09:12:51.8642266\u002B00:00\u0022,\u0022NameHighWaterMark\u0022:null}", + "finalTrackingState": null, "errors": [], "warnings": [], "metrics": null @@ -275,12 +327,12 @@ { "status": "success", "errorMessage": null, - "startTime": "2020-05-08T07:02:30.522Z", - "endTime": "2020-05-08T07:02:40.208Z", + "startTime": "2020-06-03T09:13:21.864Z", + "endTime": "2020-06-03T09:13:23.489Z", "itemsProcessed": 10, "itemsFailed": 0, - "initialTrackingState": "{\r\n \u0022lastFullEnumerationStartTime\u0022: \u00220001-01-01T00:00:00Z\u0022,\r\n \u0022lastAttemptedEnumerationStartTime\u0022: \u00222020-05-08T07:02:30.553Z\u0022,\r\n \u0022nameHighWaterMark\u0022: null\r\n}", - "finalTrackingState": "{\u0022LastFullEnumerationStartTime\u0022:\u00222020-05-08T07:02:00.5534559\u002B00:00\u0022,\u0022LastAttemptedEnumerationStartTime\u0022:\u00222020-05-08T07:02:00.5534559\u002B00:00\u0022,\u0022NameHighWaterMark\u0022:null}", + "initialTrackingState": "{\r\n \u0022lastFullEnumerationStartTime\u0022: \u00220001-01-01T00:00:00Z\u0022,\r\n \u0022lastAttemptedEnumerationStartTime\u0022: \u00222020-06-03T09:13:21.864Z\u0022,\r\n \u0022nameHighWaterMark\u0022: null\r\n}", + "finalTrackingState": "{\u0022LastFullEnumerationStartTime\u0022:\u00222020-06-03T09:12:51.8642266\u002B00:00\u0022,\u0022LastAttemptedEnumerationStartTime\u0022:\u00222020-06-03T09:12:51.8642266\u002B00:00\u0022,\u0022NameHighWaterMark\u0022:null}", "errors": [], "warnings": [], "metrics": null @@ -294,75 +346,49 @@ } }, { - "RequestUri": "https://azs-net-heathsearch2.search.windows.net/indexers(\u0027mqmuncer\u0027)/search.run?api-version=2019-05-06-Preview", - "RequestMethod": "POST", - "RequestHeaders": { - "Accept": "application/json; odata.metadata=minimal", - "api-key": "Sanitized", - "traceparent": "00-9fecc864d155724ba64fdbae82b660e9-eef4a4143e88e247-00", - "User-Agent": [ - "azsdk-net-Search.Documents/1.0.0-dev.20200507.1", - "(.NET Core 4.6.28619.01; Microsoft Windows 10.0.19041 )" - ], - "x-ms-client-request-id": "4190f8b3-2bf9-a879-9f6f-bad84701f355", - "x-ms-return-client-request-id": "true" - }, - "RequestBody": null, - "StatusCode": 202, - "ResponseHeaders": { - "Cache-Control": "no-cache", - "Content-Length": "0", - "Date": "Fri, 08 May 2020 07:02:49 GMT", - "elapsed-time": "37", - "Expires": "-1", - "Pragma": "no-cache", - "request-id": "4190f8b3-2bf9-a879-9f6f-bad84701f355", - "Strict-Transport-Security": "max-age=15724800; includeSubDomains" - }, - "ResponseBody": [] - }, - { - "RequestUri": "https://azs-net-heathsearch2.search.windows.net/indexers(\u0027mqmuncer\u0027)/search.status?api-version=2019-05-06-Preview", + "RequestUri": "https://azs-net-heathsrchtst.search.windows.net/indexers(\u0027mqmuncer\u0027)/search.status?api-version=2019-05-06-Preview", "RequestMethod": "GET", "RequestHeaders": { "Accept": "application/json; odata.metadata=minimal", "api-key": "Sanitized", - "traceparent": "00-74d0845b7d53264b8e603ab26f18f8e1-0de22a4af7ee2849-00", + "traceparent": "00-7a2322640627a64198959a62f982c4ad-4c79a1975409ed49-00", "User-Agent": [ - "azsdk-net-Search.Documents/1.0.0-dev.20200507.1", - "(.NET Core 4.6.28619.01; Microsoft Windows 10.0.19041 )" + "azsdk-net-Search.Documents/1.0.0-dev.20200603.1", + "(.NET Core 4.6.28801.04; Microsoft Windows 10.0.19041 )" ], - "x-ms-client-request-id": "a214d70b-992d-3daf-52d4-9003cf9c85fd", + "x-ms-client-request-id": "3b74c8c0f0767c965803bf3a3ac310e7", "x-ms-return-client-request-id": "true" }, "RequestBody": null, "StatusCode": 200, "ResponseHeaders": { "Cache-Control": "no-cache", - "Content-Length": "2122", + "client-request-id": "3b74c8c0-f076-7c96-5803-bf3a3ac310e7", + "Content-Length": "2126", "Content-Type": "application/json; odata.metadata=minimal", - "Date": "Fri, 08 May 2020 07:02:59 GMT", + "Date": "Wed, 03 Jun 2020 09:13:48 GMT", "elapsed-time": "13", "Expires": "-1", "OData-Version": "4.0", "Pragma": "no-cache", "Preference-Applied": "odata.include-annotations=\u0022*\u0022", - "request-id": "a214d70b-992d-3daf-52d4-9003cf9c85fd", - "Strict-Transport-Security": "max-age=15724800; includeSubDomains" + "request-id": "3b74c8c0-f076-7c96-5803-bf3a3ac310e7", + "Strict-Transport-Security": "max-age=15724800; includeSubDomains", + "x-ms-client-request-id": "3b74c8c0-f076-7c96-5803-bf3a3ac310e7" }, "ResponseBody": { - "@odata.context": "https://azs-net-heathsearch2.search.windows.net/$metadata#Microsoft.Azure.Search.V2019_05_06_Preview.IndexerExecutionInfo", + "@odata.context": "https://azs-net-heathsrchtst.search.windows.net/$metadata#Microsoft.Azure.Search.V2019_05_06_Preview.IndexerExecutionInfo", "name": "mqmuncer", "status": "running", "lastResult": { "status": "success", "errorMessage": null, - "startTime": "2020-05-08T07:02:50.77Z", - "endTime": "2020-05-08T07:02:51.567Z", + "startTime": "2020-06-03T09:13:31.933Z", + "endTime": "2020-06-03T09:13:42.442Z", "itemsProcessed": 10, "itemsFailed": 0, - "initialTrackingState": "{\r\n \u0022lastFullEnumerationStartTime\u0022: \u00222020-05-08T07:02:00.553Z\u0022,\r\n \u0022lastAttemptedEnumerationStartTime\u0022: \u00222020-05-08T07:02:50.77Z\u0022,\r\n \u0022nameHighWaterMark\u0022: null\r\n}", - "finalTrackingState": "{\u0022LastFullEnumerationStartTime\u0022:\u00222020-05-08T07:02:20.7709281\u002B00:00\u0022,\u0022LastAttemptedEnumerationStartTime\u0022:\u00222020-05-08T07:02:20.7709281\u002B00:00\u0022,\u0022NameHighWaterMark\u0022:null}", + "initialTrackingState": "{\r\n \u0022lastFullEnumerationStartTime\u0022: \u00222020-06-03T09:12:51.864Z\u0022,\r\n \u0022lastAttemptedEnumerationStartTime\u0022: \u00222020-06-03T09:13:31.933Z\u0022,\r\n \u0022nameHighWaterMark\u0022: null\r\n}", + "finalTrackingState": "{\u0022LastFullEnumerationStartTime\u0022:\u00222020-06-03T09:13:01.9332554\u002B00:00\u0022,\u0022LastAttemptedEnumerationStartTime\u0022:\u00222020-06-03T09:13:01.9332554\u002B00:00\u0022,\u0022NameHighWaterMark\u0022:null}", "errors": [], "warnings": [], "metrics": null @@ -371,12 +397,12 @@ { "status": "success", "errorMessage": null, - "startTime": "2020-05-08T07:02:50.77Z", - "endTime": "2020-05-08T07:02:51.567Z", + "startTime": "2020-06-03T09:13:31.933Z", + "endTime": "2020-06-03T09:13:42.442Z", "itemsProcessed": 10, "itemsFailed": 0, - "initialTrackingState": "{\r\n \u0022lastFullEnumerationStartTime\u0022: \u00222020-05-08T07:02:00.553Z\u0022,\r\n \u0022lastAttemptedEnumerationStartTime\u0022: \u00222020-05-08T07:02:50.77Z\u0022,\r\n \u0022nameHighWaterMark\u0022: null\r\n}", - "finalTrackingState": "{\u0022LastFullEnumerationStartTime\u0022:\u00222020-05-08T07:02:20.7709281\u002B00:00\u0022,\u0022LastAttemptedEnumerationStartTime\u0022:\u00222020-05-08T07:02:20.7709281\u002B00:00\u0022,\u0022NameHighWaterMark\u0022:null}", + "initialTrackingState": "{\r\n \u0022lastFullEnumerationStartTime\u0022: \u00222020-06-03T09:12:51.864Z\u0022,\r\n \u0022lastAttemptedEnumerationStartTime\u0022: \u00222020-06-03T09:13:31.933Z\u0022,\r\n \u0022nameHighWaterMark\u0022: null\r\n}", + "finalTrackingState": "{\u0022LastFullEnumerationStartTime\u0022:\u00222020-06-03T09:13:01.9332554\u002B00:00\u0022,\u0022LastAttemptedEnumerationStartTime\u0022:\u00222020-06-03T09:13:01.9332554\u002B00:00\u0022,\u0022NameHighWaterMark\u0022:null}", "errors": [], "warnings": [], "metrics": null @@ -384,12 +410,12 @@ { "status": "success", "errorMessage": null, - "startTime": "2020-05-08T07:02:30.522Z", - "endTime": "2020-05-08T07:02:40.208Z", + "startTime": "2020-06-03T09:13:21.864Z", + "endTime": "2020-06-03T09:13:23.489Z", "itemsProcessed": 10, "itemsFailed": 0, - "initialTrackingState": "{\r\n \u0022lastFullEnumerationStartTime\u0022: \u00220001-01-01T00:00:00Z\u0022,\r\n \u0022lastAttemptedEnumerationStartTime\u0022: \u00222020-05-08T07:02:30.553Z\u0022,\r\n \u0022nameHighWaterMark\u0022: null\r\n}", - "finalTrackingState": "{\u0022LastFullEnumerationStartTime\u0022:\u00222020-05-08T07:02:00.5534559\u002B00:00\u0022,\u0022LastAttemptedEnumerationStartTime\u0022:\u00222020-05-08T07:02:00.5534559\u002B00:00\u0022,\u0022NameHighWaterMark\u0022:null}", + "initialTrackingState": "{\r\n \u0022lastFullEnumerationStartTime\u0022: \u00220001-01-01T00:00:00Z\u0022,\r\n \u0022lastAttemptedEnumerationStartTime\u0022: \u00222020-06-03T09:13:21.864Z\u0022,\r\n \u0022nameHighWaterMark\u0022: null\r\n}", + "finalTrackingState": "{\u0022LastFullEnumerationStartTime\u0022:\u00222020-06-03T09:12:51.8642266\u002B00:00\u0022,\u0022LastAttemptedEnumerationStartTime\u0022:\u00222020-06-03T09:12:51.8642266\u002B00:00\u0022,\u0022NameHighWaterMark\u0022:null}", "errors": [], "warnings": [], "metrics": null @@ -403,70 +429,75 @@ } }, { - "RequestUri": "https://azs-net-heathsearch2.search.windows.net/indexes(\u0027fexlvtnn\u0027)/docs/$count?api-version=2019-05-06-Preview", + "RequestUri": "https://azs-net-heathsrchtst.search.windows.net/indexes(\u0027oaqoatsp\u0027)/docs/$count?api-version=2019-05-06-Preview", "RequestMethod": "GET", "RequestHeaders": { "Accept": "application/json; odata.metadata=none", "api-key": "Sanitized", + "traceparent": "00-3aacaabb6cd5364e858cd9bc8f79f590-6f1d9bb5d0e63b4b-00", "User-Agent": [ - "azsdk-net-Search.Documents/1.0.0-dev.20200507.1", - "(.NET Core 4.6.28619.01; Microsoft Windows 10.0.19041 )" + "azsdk-net-Search.Documents/1.0.0-dev.20200603.1", + "(.NET Core 4.6.28801.04; Microsoft Windows 10.0.19041 )" ], - "x-ms-client-request-id": "6fccce16-51ed-ff27-5e1f-9b318f5050e7", + "x-ms-client-request-id": "7501a599f4a68ec81274b6c6ba8350c7", "x-ms-return-client-request-id": "true" }, "RequestBody": null, "StatusCode": 200, "ResponseHeaders": { "Cache-Control": "no-cache", + "client-request-id": "7501a599-f4a6-8ec8-1274-b6c6ba8350c7", "Content-Length": "5", "Content-Type": "text/plain", - "Date": "Fri, 08 May 2020 07:02:59 GMT", - "elapsed-time": "3", + "Date": "Wed, 03 Jun 2020 09:13:48 GMT", + "elapsed-time": "52", "Expires": "-1", "OData-Version": "4.0", "Pragma": "no-cache", "Preference-Applied": "odata.include-annotations=\u0022*\u0022", - "request-id": "6fccce16-51ed-ff27-5e1f-9b318f5050e7", - "Strict-Transport-Security": "max-age=15724800; includeSubDomains" + "request-id": "7501a599-f4a6-8ec8-1274-b6c6ba8350c7", + "Strict-Transport-Security": "max-age=15724800; includeSubDomains", + "x-ms-client-request-id": "7501a599-f4a6-8ec8-1274-b6c6ba8350c7" }, "ResponseBody": "\uFEFF10" }, { - "RequestUri": "https://azs-net-heathsearch2.search.windows.net/indexes(\u0027fexlvtnn\u0027)?api-version=2019-05-06-Preview", + "RequestUri": "https://azs-net-heathsrchtst.search.windows.net/indexes(\u0027oaqoatsp\u0027)?api-version=2019-05-06-Preview", "RequestMethod": "DELETE", "RequestHeaders": { "Accept": "application/json; odata.metadata=minimal", "api-key": "Sanitized", - "traceparent": "00-c5e2b950bfa9104ea99a2492b86ab9a1-75b2e928f2071e49-00", + "traceparent": "00-5b4b0d067249f540a9e0004fb7466810-8b1745fd6f815a4f-00", "User-Agent": [ - "azsdk-net-Search.Documents/1.0.0-dev.20200507.1", - "(.NET Core 4.6.28619.01; Microsoft Windows 10.0.19041 )" + "azsdk-net-Search.Documents/1.0.0-dev.20200603.1", + "(.NET Core 4.6.28801.04; Microsoft Windows 10.0.19041 )" ], - "x-ms-client-request-id": "00ecf5f415cfa010ac68ce52389c0353", + "x-ms-client-request-id": "e5c9f8aaf16d9205baceacc79bbddba9", "x-ms-return-client-request-id": "true" }, "RequestBody": null, "StatusCode": 204, "ResponseHeaders": { "Cache-Control": "no-cache", - "Date": "Fri, 08 May 2020 07:02:59 GMT", - "elapsed-time": "168", + "client-request-id": "e5c9f8aa-f16d-9205-bace-acc79bbddba9", + "Date": "Wed, 03 Jun 2020 09:13:49 GMT", + "elapsed-time": "837", "Expires": "-1", "Pragma": "no-cache", - "request-id": "00ecf5f4-15cf-a010-ac68-ce52389c0353", - "Strict-Transport-Security": "max-age=15724800; includeSubDomains" + "request-id": "e5c9f8aa-f16d-9205-bace-acc79bbddba9", + "Strict-Transport-Security": "max-age=15724800; includeSubDomains", + "x-ms-client-request-id": "e5c9f8aa-f16d-9205-bace-acc79bbddba9" }, "ResponseBody": [] } ], "Variables": { - "BlobContainerName": "uangflsr", + "BlobContainerName": "gonnfoex", "RandomSeed": "1401021797", - "SearchIndexName": "fexlvtnn", + "SearchIndexName": "oaqoatsp", "SEARCH_ADMIN_API_KEY": "Sanitized", - "SEARCH_SERVICE_NAME": "azs-net-heathsearch2", + "SEARCH_SERVICE_NAME": "azs-net-heathsrchtst", "SEARCH_STORAGE_KEY": "Sanitized", - "SEARCH_STORAGE_NAME": "heathsearch2stg" + "SEARCH_STORAGE_NAME": "heathsrchstg" } -} +} \ No newline at end of file diff --git a/sdk/search/Azure.Search.Documents/tests/SessionRecords/SearchIndexerClientTests/CreateAzureBlobIndexerAsync.json b/sdk/search/Azure.Search.Documents/tests/SessionRecords/SearchIndexerClientTests/CreateAzureBlobIndexerAsync.json index 47a93afefc07..3bf573c09154 100644 --- a/sdk/search/Azure.Search.Documents/tests/SessionRecords/SearchIndexerClientTests/CreateAzureBlobIndexerAsync.json +++ b/sdk/search/Azure.Search.Documents/tests/SessionRecords/SearchIndexerClientTests/CreateAzureBlobIndexerAsync.json @@ -1,50 +1,52 @@ { "Entries": [ { - "RequestUri": "https://azs-net-heathsearch2.search.windows.net/datasources?api-version=2019-05-06-Preview", + "RequestUri": "https://azs-net-heathsrchtst.search.windows.net/datasources?api-version=2019-05-06-Preview", "RequestMethod": "POST", "RequestHeaders": { "Accept": "application/json; odata.metadata=minimal", "api-key": "Sanitized", - "Content-Length": "219", + "Content-Length": "216", "Content-Type": "application/json", - "traceparent": "00-542f3c5ac1cc6b49ad752b3dc8830b5c-8c9f2f9bc4484c4f-00", + "traceparent": "00-399e13a8ca2489439f45566e05363359-c7c62b2da6bacb49-00", "User-Agent": [ - "azsdk-net-Search.Documents/1.0.0-dev.20200507.1", - "(.NET Core 4.6.28619.01; Microsoft Windows 10.0.19041 )" + "azsdk-net-Search.Documents/1.0.0-dev.20200603.1", + "(.NET Core 4.6.28801.04; Microsoft Windows 10.0.19041 )" ], - "x-ms-client-request-id": "6d419776-14fa-bfa0-e581-cdfe6ec10adf", + "x-ms-client-request-id": "6d41977614fabfa0e581cdfe6ec10adf", "x-ms-return-client-request-id": "true" }, "RequestBody": { "name": "tnufhitt", "type": "azureblob", "credentials": { - "connectionString": "DefaultEndpointsProtocol=https;AccountName=heathsearch2stg;AccountKey=Sanitized;EndpointSuffix=core.windows.net" + "connectionString": "DefaultEndpointsProtocol=https;AccountName=heathsrchstg;AccountKey=Sanitized;EndpointSuffix=core.windows.net" }, "container": { - "name": "ftnpmwkr" + "name": "awshfspy" } }, "StatusCode": 201, "ResponseHeaders": { "Cache-Control": "no-cache", + "client-request-id": "6d419776-14fa-bfa0-e581-cdfe6ec10adf", "Content-Length": "360", "Content-Type": "application/json; odata.metadata=minimal", - "Date": "Fri, 08 May 2020 07:03:48 GMT", - "elapsed-time": "55", - "ETag": "W/\u00220x8D7F31DF4AE5517\u0022", + "Date": "Wed, 03 Jun 2020 09:14:14 GMT", + "elapsed-time": "47", + "ETag": "W/\u00220x8D8079E7CB95558\u0022", "Expires": "-1", - "Location": "https://azs-net-heathsearch2.search.windows.net/datasources(\u0027tnufhitt\u0027)?api-version=2019-05-06-Preview", + "Location": "https://azs-net-heathsrchtst.search.windows.net/datasources(\u0027tnufhitt\u0027)?api-version=2019-05-06-Preview", "OData-Version": "4.0", "Pragma": "no-cache", "Preference-Applied": "odata.include-annotations=\u0022*\u0022", "request-id": "6d419776-14fa-bfa0-e581-cdfe6ec10adf", - "Strict-Transport-Security": "max-age=15724800; includeSubDomains" + "Strict-Transport-Security": "max-age=15724800; includeSubDomains", + "x-ms-client-request-id": "6d419776-14fa-bfa0-e581-cdfe6ec10adf" }, "ResponseBody": { - "@odata.context": "https://azs-net-heathsearch2.search.windows.net/$metadata#datasources/$entity", - "@odata.etag": "\u00220x8D7F31DF4AE5517\u0022", + "@odata.context": "https://azs-net-heathsrchtst.search.windows.net/$metadata#datasources/$entity", + "@odata.etag": "\u00220x8D8079E7CB95558\u0022", "name": "tnufhitt", "description": null, "type": "azureblob", @@ -53,7 +55,7 @@ "connectionString": null }, "container": { - "name": "ftnpmwkr", + "name": "awshfspy", "query": null }, "dataChangeDetectionPolicy": null, @@ -61,50 +63,52 @@ } }, { - "RequestUri": "https://azs-net-heathsearch2.search.windows.net/indexers?api-version=2019-05-06-Preview", + "RequestUri": "https://azs-net-heathsrchtst.search.windows.net/indexers?api-version=2019-05-06-Preview", "RequestMethod": "POST", "RequestHeaders": { "Accept": "application/json; odata.metadata=minimal", "api-key": "Sanitized", "Content-Length": "76", "Content-Type": "application/json", - "traceparent": "00-1028ffa7e7d6d74aac33b357db444c9a-47f26bd611ca5240-00", + "traceparent": "00-d32791adbcb9324483e19fdc2ff8dc44-356fa9f4bd151942-00", "User-Agent": [ - "azsdk-net-Search.Documents/1.0.0-dev.20200507.1", - "(.NET Core 4.6.28619.01; Microsoft Windows 10.0.19041 )" + "azsdk-net-Search.Documents/1.0.0-dev.20200603.1", + "(.NET Core 4.6.28801.04; Microsoft Windows 10.0.19041 )" ], - "x-ms-client-request-id": "586dc143-0e6f-715c-3948-eb4695f8a235", + "x-ms-client-request-id": "3ee4de424fcff29c8e30f4957851a581", "x-ms-return-client-request-id": "true" }, "RequestBody": { "name": "hoxoyjdj", "dataSourceName": "tnufhitt", - "targetIndexName": "fsfjbuge" + "targetIndexName": "pcdmcoxv" }, "StatusCode": 201, "ResponseHeaders": { "Cache-Control": "no-cache", + "client-request-id": "3ee4de42-4fcf-f29c-8e30-f4957851a581", "Content-Length": "354", "Content-Type": "application/json; odata.metadata=minimal", - "Date": "Fri, 08 May 2020 07:03:48 GMT", - "elapsed-time": "199", - "ETag": "W/\u00220x8D7F31DF4C711AE\u0022", + "Date": "Wed, 03 Jun 2020 09:14:15 GMT", + "elapsed-time": "178", + "ETag": "W/\u00220x8D8079E7CD3E8AC\u0022", "Expires": "-1", - "Location": "https://azs-net-heathsearch2.search.windows.net/indexers(\u0027hoxoyjdj\u0027)?api-version=2019-05-06-Preview", + "Location": "https://azs-net-heathsrchtst.search.windows.net/indexers(\u0027hoxoyjdj\u0027)?api-version=2019-05-06-Preview", "OData-Version": "4.0", "Pragma": "no-cache", "Preference-Applied": "odata.include-annotations=\u0022*\u0022", - "request-id": "586dc143-0e6f-715c-3948-eb4695f8a235", - "Strict-Transport-Security": "max-age=15724800; includeSubDomains" + "request-id": "3ee4de42-4fcf-f29c-8e30-f4957851a581", + "Strict-Transport-Security": "max-age=15724800; includeSubDomains", + "x-ms-client-request-id": "3ee4de42-4fcf-f29c-8e30-f4957851a581" }, "ResponseBody": { - "@odata.context": "https://azs-net-heathsearch2.search.windows.net/$metadata#indexers/$entity", - "@odata.etag": "\u00220x8D7F31DF4C711AE\u0022", + "@odata.context": "https://azs-net-heathsrchtst.search.windows.net/$metadata#indexers/$entity", + "@odata.etag": "\u00220x8D8079E7CD3E8AC\u0022", "name": "hoxoyjdj", "description": null, "dataSourceName": "tnufhitt", "skillsetName": null, - "targetIndexName": "fsfjbuge", + "targetIndexName": "pcdmcoxv", "disabled": null, "schedule": null, "parameters": null, @@ -114,55 +118,55 @@ } }, { - "RequestUri": "https://azs-net-heathsearch2.search.windows.net/indexers(\u0027hoxoyjdj\u0027)?api-version=2019-05-06-Preview", + "RequestUri": "https://azs-net-heathsrchtst.search.windows.net/indexers(\u0027hoxoyjdj\u0027)?api-version=2019-05-06-Preview", "RequestMethod": "PUT", "RequestHeaders": { "Accept": "application/json; odata.metadata=minimal", "api-key": "Sanitized", - "Content-Length": "202", + "Content-Length": "158", "Content-Type": "application/json", - "If-Match": "\u00220x8D7F31DF4C711AE\u0022", + "If-Match": "\u00220x8D8079E7CD3E8AC\u0022", "Prefer": "return=representation", - "traceparent": "00-69595e3dac00b040845a8797707e44c9-93eda3b7a6333d4e-00", + "traceparent": "00-2df215ca3d4a5543af48b09a0d4c7fff-f845b23d9e56aa44-00", "User-Agent": [ - "azsdk-net-Search.Documents/1.0.0-dev.20200507.1", - "(.NET Core 4.6.28619.01; Microsoft Windows 10.0.19041 )" + "azsdk-net-Search.Documents/1.0.0-dev.20200603.1", + "(.NET Core 4.6.28801.04; Microsoft Windows 10.0.19041 )" ], - "x-ms-client-request-id": "3780faa3-f2d2-3351-8172-058763555c95", + "x-ms-client-request-id": "586dc1430e6f715c3948eb4695f8a235", "x-ms-return-client-request-id": "true" }, "RequestBody": { "name": "hoxoyjdj", "description": "Updated description", "dataSourceName": "tnufhitt", - "targetIndexName": "fsfjbuge", - "fieldMappings": [], - "outputFieldMappings": [], - "@odata.etag": "\u00220x8D7F31DF4C711AE\u0022" + "targetIndexName": "pcdmcoxv", + "@odata.etag": "\u00220x8D8079E7CD3E8AC\u0022" }, "StatusCode": 200, "ResponseHeaders": { "Cache-Control": "no-cache", + "client-request-id": "586dc143-0e6f-715c-3948-eb4695f8a235", "Content-Length": "371", "Content-Type": "application/json; odata.metadata=minimal", - "Date": "Fri, 08 May 2020 07:03:48 GMT", - "elapsed-time": "99", - "ETag": "W/\u00220x8D7F31DF4E8A97B\u0022", + "Date": "Wed, 03 Jun 2020 09:14:15 GMT", + "elapsed-time": "103", + "ETag": "W/\u00220x8D8079E7CF1D838\u0022", "Expires": "-1", "OData-Version": "4.0", "Pragma": "no-cache", "Preference-Applied": "odata.include-annotations=\u0022*\u0022", - "request-id": "3780faa3-f2d2-3351-8172-058763555c95", - "Strict-Transport-Security": "max-age=15724800; includeSubDomains" + "request-id": "586dc143-0e6f-715c-3948-eb4695f8a235", + "Strict-Transport-Security": "max-age=15724800; includeSubDomains", + "x-ms-client-request-id": "586dc143-0e6f-715c-3948-eb4695f8a235" }, "ResponseBody": { - "@odata.context": "https://azs-net-heathsearch2.search.windows.net/$metadata#indexers/$entity", - "@odata.etag": "\u00220x8D7F31DF4E8A97B\u0022", + "@odata.context": "https://azs-net-heathsrchtst.search.windows.net/$metadata#indexers/$entity", + "@odata.etag": "\u00220x8D8079E7CF1D838\u0022", "name": "hoxoyjdj", "description": "Updated description", "dataSourceName": "tnufhitt", "skillsetName": null, - "targetIndexName": "fsfjbuge", + "targetIndexName": "pcdmcoxv", "disabled": null, "schedule": null, "parameters": null, @@ -172,47 +176,49 @@ } }, { - "RequestUri": "https://azs-net-heathsearch2.search.windows.net/indexers(\u0027hoxoyjdj\u0027)/search.status?api-version=2019-05-06-Preview", + "RequestUri": "https://azs-net-heathsrchtst.search.windows.net/indexers(\u0027hoxoyjdj\u0027)/search.status?api-version=2019-05-06-Preview", "RequestMethod": "GET", "RequestHeaders": { "Accept": "application/json; odata.metadata=minimal", "api-key": "Sanitized", - "traceparent": "00-3dce2bd08f8e6c408b902952df7967ae-ba85748afd7fd94c-00", + "traceparent": "00-c14b6771c667164c820832e09ab2bfc4-095154b9cb98194d-00", "User-Agent": [ - "azsdk-net-Search.Documents/1.0.0-dev.20200507.1", - "(.NET Core 4.6.28619.01; Microsoft Windows 10.0.19041 )" + "azsdk-net-Search.Documents/1.0.0-dev.20200603.1", + "(.NET Core 4.6.28801.04; Microsoft Windows 10.0.19041 )" ], - "x-ms-client-request-id": "9aa334e0-6a77-5963-2ef7-9abe5c68318f", + "x-ms-client-request-id": "1c2b7f4b613095efe5db703ecd7567b7", "x-ms-return-client-request-id": "true" }, "RequestBody": null, "StatusCode": 200, "ResponseHeaders": { "Cache-Control": "no-cache", - "Content-Length": "1517", + "client-request-id": "1c2b7f4b-6130-95ef-e5db-703ecd7567b7", + "Content-Length": "1521", "Content-Type": "application/json; odata.metadata=minimal", - "Date": "Fri, 08 May 2020 07:03:58 GMT", - "elapsed-time": "18", + "Date": "Wed, 03 Jun 2020 09:14:24 GMT", + "elapsed-time": "14", "Expires": "-1", "OData-Version": "4.0", "Pragma": "no-cache", "Preference-Applied": "odata.include-annotations=\u0022*\u0022", - "request-id": "9aa334e0-6a77-5963-2ef7-9abe5c68318f", - "Strict-Transport-Security": "max-age=15724800; includeSubDomains" + "request-id": "1c2b7f4b-6130-95ef-e5db-703ecd7567b7", + "Strict-Transport-Security": "max-age=15724800; includeSubDomains", + "x-ms-client-request-id": "1c2b7f4b-6130-95ef-e5db-703ecd7567b7" }, "ResponseBody": { - "@odata.context": "https://azs-net-heathsearch2.search.windows.net/$metadata#Microsoft.Azure.Search.V2019_05_06_Preview.IndexerExecutionInfo", + "@odata.context": "https://azs-net-heathsrchtst.search.windows.net/$metadata#Microsoft.Azure.Search.V2019_05_06_Preview.IndexerExecutionInfo", "name": "hoxoyjdj", "status": "running", "lastResult": { "status": "success", "errorMessage": null, - "startTime": "2020-05-08T07:03:51.504Z", - "endTime": "2020-05-08T07:03:52.02Z", + "startTime": "2020-06-03T09:14:17.834Z", + "endTime": "2020-06-03T09:14:18.334Z", "itemsProcessed": 10, "itemsFailed": 0, - "initialTrackingState": "{\r\n \u0022lastFullEnumerationStartTime\u0022: \u00220001-01-01T00:00:00Z\u0022,\r\n \u0022lastAttemptedEnumerationStartTime\u0022: \u00222020-05-08T07:03:51.52Z\u0022,\r\n \u0022nameHighWaterMark\u0022: null\r\n}", - "finalTrackingState": "{\u0022LastFullEnumerationStartTime\u0022:\u00222020-05-08T07:03:21.5202412\u002B00:00\u0022,\u0022LastAttemptedEnumerationStartTime\u0022:\u00222020-05-08T07:03:21.5202412\u002B00:00\u0022,\u0022NameHighWaterMark\u0022:null}", + "initialTrackingState": "{\r\n \u0022lastFullEnumerationStartTime\u0022: \u00220001-01-01T00:00:00Z\u0022,\r\n \u0022lastAttemptedEnumerationStartTime\u0022: \u00222020-06-03T09:14:17.834Z\u0022,\r\n \u0022nameHighWaterMark\u0022: null\r\n}", + "finalTrackingState": "{\u0022LastFullEnumerationStartTime\u0022:\u00222020-06-03T09:13:47.8345111\u002B00:00\u0022,\u0022LastAttemptedEnumerationStartTime\u0022:\u00222020-06-03T09:13:47.8345111\u002B00:00\u0022,\u0022NameHighWaterMark\u0022:null}", "errors": [], "warnings": [], "metrics": null @@ -221,12 +227,12 @@ { "status": "success", "errorMessage": null, - "startTime": "2020-05-08T07:03:51.504Z", - "endTime": "2020-05-08T07:03:52.02Z", + "startTime": "2020-06-03T09:14:17.834Z", + "endTime": "2020-06-03T09:14:18.334Z", "itemsProcessed": 10, "itemsFailed": 0, - "initialTrackingState": "{\r\n \u0022lastFullEnumerationStartTime\u0022: \u00220001-01-01T00:00:00Z\u0022,\r\n \u0022lastAttemptedEnumerationStartTime\u0022: \u00222020-05-08T07:03:51.52Z\u0022,\r\n \u0022nameHighWaterMark\u0022: null\r\n}", - "finalTrackingState": "{\u0022LastFullEnumerationStartTime\u0022:\u00222020-05-08T07:03:21.5202412\u002B00:00\u0022,\u0022LastAttemptedEnumerationStartTime\u0022:\u00222020-05-08T07:03:21.5202412\u002B00:00\u0022,\u0022NameHighWaterMark\u0022:null}", + "initialTrackingState": "{\r\n \u0022lastFullEnumerationStartTime\u0022: \u00220001-01-01T00:00:00Z\u0022,\r\n \u0022lastAttemptedEnumerationStartTime\u0022: \u00222020-06-03T09:14:17.834Z\u0022,\r\n \u0022nameHighWaterMark\u0022: null\r\n}", + "finalTrackingState": "{\u0022LastFullEnumerationStartTime\u0022:\u00222020-06-03T09:13:47.8345111\u002B00:00\u0022,\u0022LastAttemptedEnumerationStartTime\u0022:\u00222020-06-03T09:13:47.8345111\u002B00:00\u0022,\u0022NameHighWaterMark\u0022:null}", "errors": [], "warnings": [], "metrics": null @@ -240,143 +246,79 @@ } }, { - "RequestUri": "https://azs-net-heathsearch2.search.windows.net/indexers(\u0027hoxoyjdj\u0027)/search.run?api-version=2019-05-06-Preview", + "RequestUri": "https://azs-net-heathsrchtst.search.windows.net/indexers(\u0027hoxoyjdj\u0027)/search.run?api-version=2019-05-06-Preview", "RequestMethod": "POST", "RequestHeaders": { "Accept": "application/json; odata.metadata=minimal", "api-key": "Sanitized", - "traceparent": "00-be167dcc80c5ea47a2b710021161469c-ae2b0d7220788842-00", + "traceparent": "00-6b63ea3c75485247a8a33081d5b426e8-8ac6f1d296e1a54b-00", "User-Agent": [ - "azsdk-net-Search.Documents/1.0.0-dev.20200507.1", - "(.NET Core 4.6.28619.01; Microsoft Windows 10.0.19041 )" + "azsdk-net-Search.Documents/1.0.0-dev.20200603.1", + "(.NET Core 4.6.28801.04; Microsoft Windows 10.0.19041 )" ], - "x-ms-client-request-id": "2fa640ce-c1b1-221d-5bef-ca2eee928569", + "x-ms-client-request-id": "3780faa3f2d233518172058763555c95", "x-ms-return-client-request-id": "true" }, "RequestBody": null, "StatusCode": 202, "ResponseHeaders": { "Cache-Control": "no-cache", + "client-request-id": "3780faa3-f2d2-3351-8172-058763555c95", "Content-Length": "0", - "Date": "Fri, 08 May 2020 07:03:58 GMT", - "elapsed-time": "44", + "Date": "Wed, 03 Jun 2020 09:14:24 GMT", + "elapsed-time": "46", "Expires": "-1", "Pragma": "no-cache", - "request-id": "2fa640ce-c1b1-221d-5bef-ca2eee928569", - "Strict-Transport-Security": "max-age=15724800; includeSubDomains" + "request-id": "3780faa3-f2d2-3351-8172-058763555c95", + "Strict-Transport-Security": "max-age=15724800; includeSubDomains", + "x-ms-client-request-id": "3780faa3-f2d2-3351-8172-058763555c95" }, "ResponseBody": [] }, { - "RequestUri": "https://azs-net-heathsearch2.search.windows.net/indexers(\u0027hoxoyjdj\u0027)/search.status?api-version=2019-05-06-Preview", + "RequestUri": "https://azs-net-heathsrchtst.search.windows.net/indexers(\u0027hoxoyjdj\u0027)/search.status?api-version=2019-05-06-Preview", "RequestMethod": "GET", "RequestHeaders": { "Accept": "application/json; odata.metadata=minimal", "api-key": "Sanitized", - "traceparent": "00-73f09becf5fe8847a1a6a5971c291387-486b4b6e7673254d-00", + "traceparent": "00-cfae884a1179044a87dd2859f50f7e72-42a3b0c31d819049-00", "User-Agent": [ - "azsdk-net-Search.Documents/1.0.0-dev.20200507.1", - "(.NET Core 4.6.28619.01; Microsoft Windows 10.0.19041 )" + "azsdk-net-Search.Documents/1.0.0-dev.20200603.1", + "(.NET Core 4.6.28801.04; Microsoft Windows 10.0.19041 )" ], - "x-ms-client-request-id": "1bf03761-02c1-bcdd-bc8e-b33ba4632b17", + "x-ms-client-request-id": "f849be8d8926e150d1d873949d1ea4c4", "x-ms-return-client-request-id": "true" }, "RequestBody": null, "StatusCode": 200, "ResponseHeaders": { "Cache-Control": "no-cache", - "Content-Length": "1323", + "client-request-id": "f849be8d-8926-e150-d1d8-73949d1ea4c4", + "Content-Length": "2126", "Content-Type": "application/json; odata.metadata=minimal", - "Date": "Fri, 08 May 2020 07:04:08 GMT", - "elapsed-time": "57", + "Date": "Wed, 03 Jun 2020 09:14:35 GMT", + "elapsed-time": "27", "Expires": "-1", "OData-Version": "4.0", "Pragma": "no-cache", "Preference-Applied": "odata.include-annotations=\u0022*\u0022", - "request-id": "1bf03761-02c1-bcdd-bc8e-b33ba4632b17", - "Strict-Transport-Security": "max-age=15724800; includeSubDomains" + "request-id": "f849be8d-8926-e150-d1d8-73949d1ea4c4", + "Strict-Transport-Security": "max-age=15724800; includeSubDomains", + "x-ms-client-request-id": "f849be8d-8926-e150-d1d8-73949d1ea4c4" }, "ResponseBody": { - "@odata.context": "https://azs-net-heathsearch2.search.windows.net/$metadata#Microsoft.Azure.Search.V2019_05_06_Preview.IndexerExecutionInfo", - "name": "hoxoyjdj", - "status": "running", - "lastResult": { - "status": "inProgress", - "errorMessage": null, - "startTime": "2020-05-08T07:04:02.046Z", - "endTime": null, - "itemsProcessed": 0, - "itemsFailed": 0, - "initialTrackingState": "{\u0022LastFullEnumerationStartTime\u0022:\u00222020-05-08T07:03:21.5202412\u002B00:00\u0022,\u0022LastAttemptedEnumerationStartTime\u0022:\u00222020-05-08T07:03:21.5202412\u002B00:00\u0022,\u0022NameHighWaterMark\u0022:null}", - "finalTrackingState": null, - "errors": [], - "warnings": [], - "metrics": null - }, - "executionHistory": [ - { - "status": "success", - "errorMessage": null, - "startTime": "2020-05-08T07:03:51.504Z", - "endTime": "2020-05-08T07:03:52.02Z", - "itemsProcessed": 10, - "itemsFailed": 0, - "initialTrackingState": "{\r\n \u0022lastFullEnumerationStartTime\u0022: \u00220001-01-01T00:00:00Z\u0022,\r\n \u0022lastAttemptedEnumerationStartTime\u0022: \u00222020-05-08T07:03:51.52Z\u0022,\r\n \u0022nameHighWaterMark\u0022: null\r\n}", - "finalTrackingState": "{\u0022LastFullEnumerationStartTime\u0022:\u00222020-05-08T07:03:21.5202412\u002B00:00\u0022,\u0022LastAttemptedEnumerationStartTime\u0022:\u00222020-05-08T07:03:21.5202412\u002B00:00\u0022,\u0022NameHighWaterMark\u0022:null}", - "errors": [], - "warnings": [], - "metrics": null - } - ], - "limits": { - "maxRunTime": "PT2M", - "maxDocumentExtractionSize": 16777216, - "maxDocumentContentCharactersToExtract": 32768 - } - } - }, - { - "RequestUri": "https://azs-net-heathsearch2.search.windows.net/indexers(\u0027hoxoyjdj\u0027)/search.status?api-version=2019-05-06-Preview", - "RequestMethod": "GET", - "RequestHeaders": { - "Accept": "application/json; odata.metadata=minimal", - "api-key": "Sanitized", - "traceparent": "00-9b3adeade462ca4cb3d2d2ec1200a213-7bfb584ac0529544-00", - "User-Agent": [ - "azsdk-net-Search.Documents/1.0.0-dev.20200507.1", - "(.NET Core 4.6.28619.01; Microsoft Windows 10.0.19041 )" - ], - "x-ms-client-request-id": "b6cc5814-69a2-a4a8-0659-06dfe15dcd3e", - "x-ms-return-client-request-id": "true" - }, - "RequestBody": null, - "StatusCode": 200, - "ResponseHeaders": { - "Cache-Control": "no-cache", - "Content-Length": "2122", - "Content-Type": "application/json; odata.metadata=minimal", - "Date": "Fri, 08 May 2020 07:04:18 GMT", - "elapsed-time": "17", - "Expires": "-1", - "OData-Version": "4.0", - "Pragma": "no-cache", - "Preference-Applied": "odata.include-annotations=\u0022*\u0022", - "request-id": "b6cc5814-69a2-a4a8-0659-06dfe15dcd3e", - "Strict-Transport-Security": "max-age=15724800; includeSubDomains" - }, - "ResponseBody": { - "@odata.context": "https://azs-net-heathsearch2.search.windows.net/$metadata#Microsoft.Azure.Search.V2019_05_06_Preview.IndexerExecutionInfo", + "@odata.context": "https://azs-net-heathsrchtst.search.windows.net/$metadata#Microsoft.Azure.Search.V2019_05_06_Preview.IndexerExecutionInfo", "name": "hoxoyjdj", "status": "running", "lastResult": { "status": "success", "errorMessage": null, - "startTime": "2020-05-08T07:04:02.062Z", - "endTime": "2020-05-08T07:04:12.248Z", + "startTime": "2020-06-03T09:14:27.917Z", + "endTime": "2020-06-03T09:14:28.417Z", "itemsProcessed": 10, "itemsFailed": 0, - "initialTrackingState": "{\r\n \u0022lastFullEnumerationStartTime\u0022: \u00222020-05-08T07:03:21.52Z\u0022,\r\n \u0022lastAttemptedEnumerationStartTime\u0022: \u00222020-05-08T07:04:02.124Z\u0022,\r\n \u0022nameHighWaterMark\u0022: null\r\n}", - "finalTrackingState": "{\u0022LastFullEnumerationStartTime\u0022:\u00222020-05-08T07:03:32.1249372\u002B00:00\u0022,\u0022LastAttemptedEnumerationStartTime\u0022:\u00222020-05-08T07:03:32.1249372\u002B00:00\u0022,\u0022NameHighWaterMark\u0022:null}", + "initialTrackingState": "{\r\n \u0022lastFullEnumerationStartTime\u0022: \u00222020-06-03T09:13:47.834Z\u0022,\r\n \u0022lastAttemptedEnumerationStartTime\u0022: \u00222020-06-03T09:14:27.917Z\u0022,\r\n \u0022nameHighWaterMark\u0022: null\r\n}", + "finalTrackingState": "{\u0022LastFullEnumerationStartTime\u0022:\u00222020-06-03T09:13:57.9176737\u002B00:00\u0022,\u0022LastAttemptedEnumerationStartTime\u0022:\u00222020-06-03T09:13:57.9176737\u002B00:00\u0022,\u0022NameHighWaterMark\u0022:null}", "errors": [], "warnings": [], "metrics": null @@ -385,12 +327,12 @@ { "status": "success", "errorMessage": null, - "startTime": "2020-05-08T07:04:02.062Z", - "endTime": "2020-05-08T07:04:12.248Z", + "startTime": "2020-06-03T09:14:27.917Z", + "endTime": "2020-06-03T09:14:28.417Z", "itemsProcessed": 10, "itemsFailed": 0, - "initialTrackingState": "{\r\n \u0022lastFullEnumerationStartTime\u0022: \u00222020-05-08T07:03:21.52Z\u0022,\r\n \u0022lastAttemptedEnumerationStartTime\u0022: \u00222020-05-08T07:04:02.124Z\u0022,\r\n \u0022nameHighWaterMark\u0022: null\r\n}", - "finalTrackingState": "{\u0022LastFullEnumerationStartTime\u0022:\u00222020-05-08T07:03:32.1249372\u002B00:00\u0022,\u0022LastAttemptedEnumerationStartTime\u0022:\u00222020-05-08T07:03:32.1249372\u002B00:00\u0022,\u0022NameHighWaterMark\u0022:null}", + "initialTrackingState": "{\r\n \u0022lastFullEnumerationStartTime\u0022: \u00222020-06-03T09:13:47.834Z\u0022,\r\n \u0022lastAttemptedEnumerationStartTime\u0022: \u00222020-06-03T09:14:27.917Z\u0022,\r\n \u0022nameHighWaterMark\u0022: null\r\n}", + "finalTrackingState": "{\u0022LastFullEnumerationStartTime\u0022:\u00222020-06-03T09:13:57.9176737\u002B00:00\u0022,\u0022LastAttemptedEnumerationStartTime\u0022:\u00222020-06-03T09:13:57.9176737\u002B00:00\u0022,\u0022NameHighWaterMark\u0022:null}", "errors": [], "warnings": [], "metrics": null @@ -398,12 +340,12 @@ { "status": "success", "errorMessage": null, - "startTime": "2020-05-08T07:03:51.504Z", - "endTime": "2020-05-08T07:03:52.02Z", + "startTime": "2020-06-03T09:14:17.834Z", + "endTime": "2020-06-03T09:14:18.334Z", "itemsProcessed": 10, "itemsFailed": 0, - "initialTrackingState": "{\r\n \u0022lastFullEnumerationStartTime\u0022: \u00220001-01-01T00:00:00Z\u0022,\r\n \u0022lastAttemptedEnumerationStartTime\u0022: \u00222020-05-08T07:03:51.52Z\u0022,\r\n \u0022nameHighWaterMark\u0022: null\r\n}", - "finalTrackingState": "{\u0022LastFullEnumerationStartTime\u0022:\u00222020-05-08T07:03:21.5202412\u002B00:00\u0022,\u0022LastAttemptedEnumerationStartTime\u0022:\u00222020-05-08T07:03:21.5202412\u002B00:00\u0022,\u0022NameHighWaterMark\u0022:null}", + "initialTrackingState": "{\r\n \u0022lastFullEnumerationStartTime\u0022: \u00220001-01-01T00:00:00Z\u0022,\r\n \u0022lastAttemptedEnumerationStartTime\u0022: \u00222020-06-03T09:14:17.834Z\u0022,\r\n \u0022nameHighWaterMark\u0022: null\r\n}", + "finalTrackingState": "{\u0022LastFullEnumerationStartTime\u0022:\u00222020-06-03T09:13:47.8345111\u002B00:00\u0022,\u0022LastAttemptedEnumerationStartTime\u0022:\u00222020-06-03T09:13:47.8345111\u002B00:00\u0022,\u0022NameHighWaterMark\u0022:null}", "errors": [], "warnings": [], "metrics": null @@ -417,70 +359,75 @@ } }, { - "RequestUri": "https://azs-net-heathsearch2.search.windows.net/indexes(\u0027fsfjbuge\u0027)/docs/$count?api-version=2019-05-06-Preview", + "RequestUri": "https://azs-net-heathsrchtst.search.windows.net/indexes(\u0027pcdmcoxv\u0027)/docs/$count?api-version=2019-05-06-Preview", "RequestMethod": "GET", "RequestHeaders": { "Accept": "application/json; odata.metadata=none", "api-key": "Sanitized", + "traceparent": "00-f34bbcfd2e14324e801481a9f4bbfca9-45d98859fb3a8f46-00", "User-Agent": [ - "azsdk-net-Search.Documents/1.0.0-dev.20200507.1", - "(.NET Core 4.6.28619.01; Microsoft Windows 10.0.19041 )" + "azsdk-net-Search.Documents/1.0.0-dev.20200603.1", + "(.NET Core 4.6.28801.04; Microsoft Windows 10.0.19041 )" ], - "x-ms-client-request-id": "4b27c070-7596-af75-54af-934ccc16574a", + "x-ms-client-request-id": "9aa334e06a7759632ef79abe5c68318f", "x-ms-return-client-request-id": "true" }, "RequestBody": null, "StatusCode": 200, "ResponseHeaders": { "Cache-Control": "no-cache", + "client-request-id": "9aa334e0-6a77-5963-2ef7-9abe5c68318f", "Content-Length": "5", "Content-Type": "text/plain", - "Date": "Fri, 08 May 2020 07:04:18 GMT", - "elapsed-time": "52", + "Date": "Wed, 03 Jun 2020 09:14:35 GMT", + "elapsed-time": "109", "Expires": "-1", "OData-Version": "4.0", "Pragma": "no-cache", "Preference-Applied": "odata.include-annotations=\u0022*\u0022", - "request-id": "4b27c070-7596-af75-54af-934ccc16574a", - "Strict-Transport-Security": "max-age=15724800; includeSubDomains" + "request-id": "9aa334e0-6a77-5963-2ef7-9abe5c68318f", + "Strict-Transport-Security": "max-age=15724800; includeSubDomains", + "x-ms-client-request-id": "9aa334e0-6a77-5963-2ef7-9abe5c68318f" }, "ResponseBody": "\uFEFF10" }, { - "RequestUri": "https://azs-net-heathsearch2.search.windows.net/indexes(\u0027fsfjbuge\u0027)?api-version=2019-05-06-Preview", + "RequestUri": "https://azs-net-heathsrchtst.search.windows.net/indexes(\u0027pcdmcoxv\u0027)?api-version=2019-05-06-Preview", "RequestMethod": "DELETE", "RequestHeaders": { "Accept": "application/json; odata.metadata=minimal", "api-key": "Sanitized", - "traceparent": "00-84080885e97dfa4c9296b98869339538-036d27654f39ef43-00", + "traceparent": "00-01fda8b5c15ded478663040a209429f4-d685c584a0e1644c-00", "User-Agent": [ - "azsdk-net-Search.Documents/1.0.0-dev.20200507.1", - "(.NET Core 4.6.28619.01; Microsoft Windows 10.0.19041 )" + "azsdk-net-Search.Documents/1.0.0-dev.20200603.1", + "(.NET Core 4.6.28801.04; Microsoft Windows 10.0.19041 )" ], - "x-ms-client-request-id": "206e8d6e8135e7a86310b264ae7ec32b", + "x-ms-client-request-id": "0fb0da7e6e2b1a91a99e66fa7ebc9563", "x-ms-return-client-request-id": "true" }, "RequestBody": null, "StatusCode": 204, "ResponseHeaders": { "Cache-Control": "no-cache", - "Date": "Fri, 08 May 2020 07:04:18 GMT", - "elapsed-time": "165", + "client-request-id": "0fb0da7e-6e2b-1a91-a99e-66fa7ebc9563", + "Date": "Wed, 03 Jun 2020 09:14:36 GMT", + "elapsed-time": "760", "Expires": "-1", "Pragma": "no-cache", - "request-id": "206e8d6e-8135-e7a8-6310-b264ae7ec32b", - "Strict-Transport-Security": "max-age=15724800; includeSubDomains" + "request-id": "0fb0da7e-6e2b-1a91-a99e-66fa7ebc9563", + "Strict-Transport-Security": "max-age=15724800; includeSubDomains", + "x-ms-client-request-id": "0fb0da7e-6e2b-1a91-a99e-66fa7ebc9563" }, "ResponseBody": [] } ], "Variables": { - "BlobContainerName": "ftnpmwkr", + "BlobContainerName": "awshfspy", "RandomSeed": "939854059", - "SearchIndexName": "fsfjbuge", + "SearchIndexName": "pcdmcoxv", "SEARCH_ADMIN_API_KEY": "Sanitized", - "SEARCH_SERVICE_NAME": "azs-net-heathsearch2", + "SEARCH_SERVICE_NAME": "azs-net-heathsrchtst", "SEARCH_STORAGE_KEY": "Sanitized", - "SEARCH_STORAGE_NAME": "heathsearch2stg" + "SEARCH_STORAGE_NAME": "heathsrchstg" } -} +} \ No newline at end of file diff --git a/sdk/search/Azure.Search.Documents/tests/Utilities/SearchResources.Data.cs b/sdk/search/Azure.Search.Documents/tests/Utilities/SearchResources.Data.cs index 261f0ee262f2..f29128cd631c 100644 --- a/sdk/search/Azure.Search.Documents/tests/Utilities/SearchResources.Data.cs +++ b/sdk/search/Azure.Search.Documents/tests/Utilities/SearchResources.Data.cs @@ -78,7 +78,7 @@ internal static SearchIndex GetHotelIndex(string name) => new ScoringProfile("nearest") { FunctionAggregation = ScoringFunctionAggregation.Sum, - Functions = new[] + Functions = { new DistanceScoringFunction("location", 2, new DistanceScoringParameters("myloc", 100)), },