From 818c51ed6de4e43006757648e6b4217225cc2405 Mon Sep 17 00:00:00 2001 From: codebrain Date: Tue, 14 Nov 2017 16:39:43 +1100 Subject: [PATCH] Rename MetaData to Metadata Remove [JsonProperty(PropertyName = "....")] --- .../Bucket/DateRange/DateRangeAggregation.cs | 4 +- .../Bucket/DateRange/DateRangeExpression.cs | 10 +- .../GeoDistance/GeoDistanceAggregation.cs | 2 +- .../Aggregations/Bucket/IpRange/IpRange.cs | 8 +- .../Bucket/IpRange/IpRangeAggregation.cs | 2 +- .../Bucket/Range/RangeAggregation.cs | 2 +- src/Nest/Analysis/Analyzers/AnalyzerBase.cs | 4 +- .../Analysis/Normalizers/NormalizerBase.cs | 4 +- src/Nest/Analysis/Tokenizers/TokenizerBase.cs | 6 +- .../ClusterHealth/ClusterHealthResponse.cs | 22 +-- .../Cluster/ClusterHealth/IndexHealthStats.cs | 18 +-- .../Cluster/ClusterHealth/ShardHealthStats.cs | 12 +- .../ClusterGetSettingsResponse.cs | 4 +- .../ClusterPutSettingsRequest.cs | 12 +- .../ClusterPutSettingsResponse.cs | 6 +- src/Nest/Cluster/NodesInfo/NodeInfo.cs | 140 +++++++++--------- .../Cluster/NodesInfo/NodesInfoResponse.cs | 4 +- .../Cluster/NodesStats/NodeStatsResponse.cs | 4 +- .../Cluster/NodesUsage/NodeUsageResponse.cs | 6 +- .../RootNodeInfo/RootVersionInfoResponse.cs | 10 +- .../Response/ElasticsearchVersionInfo.cs | 4 +- .../Response/IndicesResponseBase.cs | 8 +- .../Response/ShardsOperationResponseBase.cs | 6 +- src/Nest/CommonOptions/Hit/ShardsMetaData.cs | 2 +- .../CommonOptions/Range/AggregationRange.cs | 6 +- src/Nest/CommonOptions/Stats/DocStats.cs | 4 +- src/Nest/CommonOptions/Stats/FlushStats.cs | 8 +- src/Nest/CommonOptions/Stats/GetStats.cs | 20 +-- src/Nest/CommonOptions/Stats/MergesStats.cs | 34 ++--- src/Nest/CommonOptions/Stats/RefreshStats.cs | 8 +- src/Nest/CommonOptions/Stats/SearchStats.cs | 26 ++-- src/Nest/CommonOptions/Stats/StoreStats.cs | 4 +- .../BulkResponseItem/BulkIndexResponseItem.cs | 2 +- .../BulkResponseItem/BulkResponseItemBase.cs | 4 +- .../MultiGet/Request/IMultiGetOperation.cs | 12 +- .../Document/Single/Create/CreateResponse.cs | 4 +- .../Document/Single/Delete/DeleteResponse.cs | 4 +- .../Document/Single/Index/IndexResponse.cs | 4 +- .../Document/Single/Update/UpdateRequest.cs | 12 +- .../Document/Single/Update/UpdateResponse.cs | 16 +- src/Nest/Indices/Analyze/AnalyzeResponse.cs | 2 +- .../IndicesSegments/IndexSegment.cs | 2 +- .../Monitoring/IndicesSegments/Segment.cs | 16 +- .../IndicesSegments/SegmentsResponse.cs | 8 +- .../IndicesSegments/ShardSegmentRouting.cs | 6 +- .../IndicesSegments/ShardsSegment.cs | 6 +- .../IndicesShardStoresResponse.cs | 6 +- .../Monitoring/IndicesStats/IndexStats.cs | 32 ++-- .../Monitoring/IndicesStats/IndicesStats.cs | 4 +- .../IndicesStats/IndicesStatsResponse.cs | 10 +- .../Upgrade/UpgradeResponse.cs | 4 +- .../VerifyRepository/CompactNodeInfo.cs | 4 +- .../VerifyRepositoryResponse.cs | 2 +- .../Restore/SnapshotRestore.cs | 2 +- .../SnapshotAndRestore/Snapshot/Snapshot.cs | 2 +- .../QueryDsl/Abstractions/Query/QueryBase.cs | 4 +- .../ConstantScore/ConstantScoreQuery.cs | 2 +- .../QueryDsl/Compound/Dismax/DismaxQuery.cs | 4 +- .../Functions/Decay/DecayFunctionBase.cs | 10 +- .../Functions/Random/RandomScoreFunction.cs | 4 +- .../ScriptScore/ScriptScoreFunction.cs | 2 +- .../FullText/CommonTerms/CommonTermsQuery.cs | 14 +- .../FullText/MatchPhrase/MatchPhraseQuery.cs | 6 +- .../MatchPhrasePrefixQuery.cs | 8 +- .../SimpleQueryStringQuery.cs | 18 +-- src/Nest/QueryDsl/MatchAllQuery.cs | 2 +- .../Span/Containing/SpanContainingQuery.cs | 4 +- .../QueryDsl/Span/First/SpanFirstQuery.cs | 8 +- src/Nest/QueryDsl/Span/Near/SpanNearQuery.cs | 8 +- src/Nest/QueryDsl/Span/Not/SpanNotQuery.cs | 10 +- src/Nest/QueryDsl/Span/Or/SpanOrQuery.cs | 4 +- .../QueryDsl/Span/Within/SpanWithinQuery.cs | 4 +- .../MoreLikeThis/Like/LikeDocument.cs | 14 +- .../MoreLikeThis/MoreLikeThisQuery.cs | 28 ++-- .../Specialized/Percolate/PercolateQuery.cs | 16 +- .../Specialized/Script/ScriptQuery.cs | 8 +- src/Nest/QueryDsl/TermLevel/Ids/IdsQuery.cs | 4 +- .../QueryDsl/TermLevel/Regexp/RegexpQuery.cs | 4 +- src/Nest/QueryDsl/TermLevel/Type/TypeQuery.cs | 8 +- src/Nest/Search/Count/CountResponse.cs | 8 +- src/Nest/Search/Explain/ExplainGet.cs | 6 +- src/Nest/Search/Explain/ExplainResponse.cs | 8 +- src/Nest/Search/Explain/Explanation.cs | 6 +- src/Nest/Search/Explain/ExplanationDetail.cs | 6 +- .../FieldCapabilitiesResponse.cs | 2 +- .../Search/Search/Highlighting/Highlight.cs | 2 +- src/Nest/Search/Search/Hits/HitsMetaData.cs | 2 +- .../Search/Search/Hits/InnerHitsMetaData.cs | 4 +- .../Search/Search/Hits/InnerHitsResult.cs | 6 +- src/Nest/Search/Search/InnerHits/InnerHits.cs | 12 +- src/Nest/Search/Search/SearchRequest.cs | 4 +- src/Nest/Search/Search/SearchResponse.cs | 30 ++-- .../Search/Search/Sort/SortGeoDistance.cs | 6 +- src/Nest/Search/Search/Sort/SortScript.cs | 6 +- .../CompletionSuggester/FuzzySuggest.cs | 12 +- .../PhraseSuggester/DirectGenerator.cs | 22 +-- .../PhraseSuggester/PhraseSuggestCollate.cs | 4 +- .../PhraseSuggester/PhraseSuggestHighlight.cs | 4 +- .../Search/Validate/ValidateQueryResponse.cs | 10 +- .../Search/Validate/ValidationExplanation.cs | 12 +- .../Cluster/NodesUsage/NodesUsageApiTests.cs | 8 +- .../Cluster/NodesUsage/NodesUsageUnitTests.cs | 8 +- .../Collapsing/FieldCollapseUsageTests.cs | 2 +- src/Tests/Search/WritingQueries.doc.cs | 4 +- 104 files changed, 481 insertions(+), 481 deletions(-) diff --git a/src/Nest/Aggregations/Bucket/DateRange/DateRangeAggregation.cs b/src/Nest/Aggregations/Bucket/DateRange/DateRangeAggregation.cs index 441840616b6..5d8b5d5a014 100644 --- a/src/Nest/Aggregations/Bucket/DateRange/DateRangeAggregation.cs +++ b/src/Nest/Aggregations/Bucket/DateRange/DateRangeAggregation.cs @@ -16,10 +16,10 @@ public interface IDateRangeAggregation : IBucketAggregation [JsonProperty("format")] string Format { get; set; } - [JsonProperty(PropertyName = "ranges")] + [JsonProperty("ranges")] IEnumerable Ranges { get; set; } - [JsonProperty(PropertyName = "time_zone")] + [JsonProperty("time_zone")] string TimeZone { get; set; } } diff --git a/src/Nest/Aggregations/Bucket/DateRange/DateRangeExpression.cs b/src/Nest/Aggregations/Bucket/DateRange/DateRangeExpression.cs index c00dcab05fe..b1472e4ce78 100644 --- a/src/Nest/Aggregations/Bucket/DateRange/DateRangeExpression.cs +++ b/src/Nest/Aggregations/Bucket/DateRange/DateRangeExpression.cs @@ -3,15 +3,15 @@ namespace Nest { [JsonConverter(typeof(ReadAsTypeJsonConverter))] - public interface IDateRangeExpression + public interface IDateRangeExpression { - [JsonProperty(PropertyName = "from")] + [JsonProperty("from")] DateMath From { get; set; } - [JsonProperty(PropertyName = "to")] + [JsonProperty("to")] DateMath To { get; set; } - [JsonProperty(PropertyName = "key")] + [JsonProperty("key")] string Key { get; set; } } @@ -36,4 +36,4 @@ public class DateRangeExpressionDescriptor string IDateRangeExpression.Key { get; set; } public DateRangeExpressionDescriptor Key(string key) => Assign(a => a.Key = key); } -} \ No newline at end of file +} diff --git a/src/Nest/Aggregations/Bucket/GeoDistance/GeoDistanceAggregation.cs b/src/Nest/Aggregations/Bucket/GeoDistance/GeoDistanceAggregation.cs index 555179e4d54..495585f09ca 100644 --- a/src/Nest/Aggregations/Bucket/GeoDistance/GeoDistanceAggregation.cs +++ b/src/Nest/Aggregations/Bucket/GeoDistance/GeoDistanceAggregation.cs @@ -22,7 +22,7 @@ public interface IGeoDistanceAggregation : IBucketAggregation [JsonProperty("distance_type")] GeoDistanceType? DistanceType { get; set; } - [JsonProperty(PropertyName = "ranges")] + [JsonProperty("ranges")] #pragma warning disable 618 IEnumerable Ranges { get; set; } #pragma warning restore 618 diff --git a/src/Nest/Aggregations/Bucket/IpRange/IpRange.cs b/src/Nest/Aggregations/Bucket/IpRange/IpRange.cs index 8e5c04c4d63..a79beed37c7 100644 --- a/src/Nest/Aggregations/Bucket/IpRange/IpRange.cs +++ b/src/Nest/Aggregations/Bucket/IpRange/IpRange.cs @@ -4,15 +4,15 @@ namespace Nest { [JsonObject(MemberSerialization = MemberSerialization.OptIn)] [JsonConverter(typeof(ReadAsTypeJsonConverter))] - public interface IIpRange + public interface IIpRange { - [JsonProperty(PropertyName = "from")] + [JsonProperty("from")] string From { get; set; } - [JsonProperty(PropertyName = "to")] + [JsonProperty("to")] string To { get; set; } - [JsonProperty(PropertyName = "mask")] + [JsonProperty("mask")] string Mask { get; set; } } diff --git a/src/Nest/Aggregations/Bucket/IpRange/IpRangeAggregation.cs b/src/Nest/Aggregations/Bucket/IpRange/IpRangeAggregation.cs index 05b909995b6..e6c179393aa 100644 --- a/src/Nest/Aggregations/Bucket/IpRange/IpRangeAggregation.cs +++ b/src/Nest/Aggregations/Bucket/IpRange/IpRangeAggregation.cs @@ -13,7 +13,7 @@ public interface IIpRangeAggregation : IBucketAggregation [JsonProperty("field")] Field Field { get; set; } - [JsonProperty(PropertyName = "ranges")] + [JsonProperty("ranges")] IEnumerable Ranges { get; set; } } diff --git a/src/Nest/Aggregations/Bucket/Range/RangeAggregation.cs b/src/Nest/Aggregations/Bucket/Range/RangeAggregation.cs index 98572724d5a..557fd325e8c 100644 --- a/src/Nest/Aggregations/Bucket/Range/RangeAggregation.cs +++ b/src/Nest/Aggregations/Bucket/Range/RangeAggregation.cs @@ -16,7 +16,7 @@ public interface IRangeAggregation : IBucketAggregation [JsonProperty("script")] IScript Script { get; set; } - [JsonProperty(PropertyName = "ranges")] + [JsonProperty("ranges")] #pragma warning disable 618 IEnumerable Ranges { get; set; } #pragma warning restore 618 diff --git a/src/Nest/Analysis/Analyzers/AnalyzerBase.cs b/src/Nest/Analysis/Analyzers/AnalyzerBase.cs index 222424bec0c..6bad979cb01 100644 --- a/src/Nest/Analysis/Analyzers/AnalyzerBase.cs +++ b/src/Nest/Analysis/Analyzers/AnalyzerBase.cs @@ -5,10 +5,10 @@ namespace Nest [ContractJsonConverter(typeof(AnalyzerJsonConverter))] public interface IAnalyzer { - [JsonProperty(PropertyName = "version")] + [JsonProperty("version")] string Version { get; set; } - [JsonProperty(PropertyName = "type")] + [JsonProperty("type")] string Type { get; } } diff --git a/src/Nest/Analysis/Normalizers/NormalizerBase.cs b/src/Nest/Analysis/Normalizers/NormalizerBase.cs index 95d2a35a559..49088415885 100644 --- a/src/Nest/Analysis/Normalizers/NormalizerBase.cs +++ b/src/Nest/Analysis/Normalizers/NormalizerBase.cs @@ -5,10 +5,10 @@ namespace Nest [ContractJsonConverter(typeof(NormalizerJsonConverter))] public interface INormalizer { - [JsonProperty(PropertyName = "version")] + [JsonProperty("version")] string Version { get; set; } - [JsonProperty(PropertyName = "type")] + [JsonProperty("type")] string Type { get; } } diff --git a/src/Nest/Analysis/Tokenizers/TokenizerBase.cs b/src/Nest/Analysis/Tokenizers/TokenizerBase.cs index ef32dae565f..e484092dcce 100644 --- a/src/Nest/Analysis/Tokenizers/TokenizerBase.cs +++ b/src/Nest/Analysis/Tokenizers/TokenizerBase.cs @@ -5,10 +5,10 @@ namespace Nest [ContractJsonConverter(typeof(TokenizerJsonConverter))] public interface ITokenizer { - [JsonProperty(PropertyName = "version")] + [JsonProperty("version")] string Version { get; set; } - [JsonProperty(PropertyName = "type")] + [JsonProperty("type")] string Type { get; } } @@ -19,7 +19,7 @@ public abstract class TokenizerBase : ITokenizer public string Type { get; protected set; } } - public abstract class TokenizerDescriptorBase + public abstract class TokenizerDescriptorBase : DescriptorBase, ITokenizer where TTokenizer : TokenizerDescriptorBase, TTokenizerInterface where TTokenizerInterface : class, ITokenizer diff --git a/src/Nest/Cluster/ClusterHealth/ClusterHealthResponse.cs b/src/Nest/Cluster/ClusterHealth/ClusterHealthResponse.cs index db2809922f0..cbb80cb2d2e 100644 --- a/src/Nest/Cluster/ClusterHealth/ClusterHealthResponse.cs +++ b/src/Nest/Cluster/ClusterHealth/ClusterHealthResponse.cs @@ -22,31 +22,31 @@ public interface IClusterHealthResponse : IResponse [JsonObject] public class ClusterHealthResponse : ResponseBase, IClusterHealthResponse { - [JsonProperty(PropertyName = "cluster_name")] + [JsonProperty("cluster_name")] public string ClusterName { get; internal set; } - [JsonProperty(PropertyName = "status")] + [JsonProperty("status")] public string Status { get; internal set; } - [JsonProperty(PropertyName = "timed_out")] + [JsonProperty("timed_out")] public bool TimedOut { get; internal set; } - [JsonProperty(PropertyName = "number_of_nodes")] + [JsonProperty("number_of_nodes")] public int NumberOfNodes { get; internal set; } - [JsonProperty(PropertyName = "number_of_data_nodes")] + [JsonProperty("number_of_data_nodes")] public int NumberOfDataNodes { get; internal set; } - [JsonProperty(PropertyName = "active_primary_shards")] + [JsonProperty("active_primary_shards")] public int ActivePrimaryShards { get; internal set; } - [JsonProperty(PropertyName = "active_shards")] + [JsonProperty("active_shards")] public int ActiveShards { get; internal set; } - [JsonProperty(PropertyName = "relocating_shards")] + [JsonProperty("relocating_shards")] public int RelocatingShards { get; internal set; } - [JsonProperty(PropertyName = "initializing_shards")] + [JsonProperty("initializing_shards")] public int InitializingShards { get; internal set; } - [JsonProperty(PropertyName = "unassigned_shards")] + [JsonProperty("unassigned_shards")] public int UnassignedShards { get; internal set; } [JsonProperty(PropertyName="number_of_pending_tasks")] public int NumberOfPendingTasks { get; internal set; } - [JsonProperty(PropertyName = "indices")] + [JsonProperty("indices")] [JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter))] public IReadOnlyDictionary Indices { get; internal set; } = EmptyReadOnly.Dictionary; } diff --git a/src/Nest/Cluster/ClusterHealth/IndexHealthStats.cs b/src/Nest/Cluster/ClusterHealth/IndexHealthStats.cs index 2fafc799169..e27b045f37c 100644 --- a/src/Nest/Cluster/ClusterHealth/IndexHealthStats.cs +++ b/src/Nest/Cluster/ClusterHealth/IndexHealthStats.cs @@ -6,26 +6,26 @@ namespace Nest [JsonObject] public class IndexHealthStats { - [JsonProperty(PropertyName = "status")] + [JsonProperty("status")] public string Status { get; internal set; } - [JsonProperty(PropertyName = "number_of_shards")] + [JsonProperty("number_of_shards")] public int NumberOfShards { get; internal set; } - [JsonProperty(PropertyName = "number_of_replicas")] + [JsonProperty("number_of_replicas")] public int NumberOfReplicas { get; internal set; } - [JsonProperty(PropertyName = "active_primary_shards")] + [JsonProperty("active_primary_shards")] public int ActivePrimaryShards { get; internal set; } - [JsonProperty(PropertyName = "active_shards")] + [JsonProperty("active_shards")] public int ActiveShards { get; internal set; } - [JsonProperty(PropertyName = "relocating_shards")] + [JsonProperty("relocating_shards")] public int RelocatingShards { get; internal set; } - [JsonProperty(PropertyName = "initializing_shards")] + [JsonProperty("initializing_shards")] public int InitializingShards { get; internal set; } - [JsonProperty(PropertyName = "unassigned_shards")] + [JsonProperty("unassigned_shards")] public int UnassignedShards { get; internal set; } - [JsonProperty(PropertyName = "shards")] + [JsonProperty("shards")] [JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter))] public IReadOnlyDictionary Shards { get; internal set; } = EmptyReadOnly.Dictionary; diff --git a/src/Nest/Cluster/ClusterHealth/ShardHealthStats.cs b/src/Nest/Cluster/ClusterHealth/ShardHealthStats.cs index f63ec068e45..dfec508e080 100644 --- a/src/Nest/Cluster/ClusterHealth/ShardHealthStats.cs +++ b/src/Nest/Cluster/ClusterHealth/ShardHealthStats.cs @@ -5,17 +5,17 @@ namespace Nest [JsonObject] public class ShardHealthStats { - [JsonProperty(PropertyName = "status")] + [JsonProperty("status")] public string Status { get; internal set; } - [JsonProperty(PropertyName = "primary_active")] + [JsonProperty("primary_active")] public bool PrimaryActive { get; internal set; } - [JsonProperty(PropertyName = "active_shards")] + [JsonProperty("active_shards")] public int ActiveShards { get; internal set; } - [JsonProperty(PropertyName = "relocating_shards")] + [JsonProperty("relocating_shards")] public int RelocatingShards { get; internal set; } - [JsonProperty(PropertyName = "initializing_shards")] + [JsonProperty("initializing_shards")] public int InitializingShards { get; internal set; } - [JsonProperty(PropertyName = "unassigned_shards")] + [JsonProperty("unassigned_shards")] public int UnassignedShards { get; internal set; } } } diff --git a/src/Nest/Cluster/ClusterSettings/ClusterGetSettings/ClusterGetSettingsResponse.cs b/src/Nest/Cluster/ClusterSettings/ClusterGetSettings/ClusterGetSettingsResponse.cs index 7bf334687e0..6a04adf5c61 100644 --- a/src/Nest/Cluster/ClusterSettings/ClusterGetSettings/ClusterGetSettingsResponse.cs +++ b/src/Nest/Cluster/ClusterSettings/ClusterGetSettings/ClusterGetSettingsResponse.cs @@ -5,10 +5,10 @@ namespace Nest { public interface IClusterGetSettingsResponse : IResponse { - [JsonProperty(PropertyName = "persistent")] + [JsonProperty("persistent")] IReadOnlyDictionary Persistent { get; } - [JsonProperty(PropertyName = "transient")] + [JsonProperty("transient")] IReadOnlyDictionary Transient { get; } } diff --git a/src/Nest/Cluster/ClusterSettings/ClusterPutSettings/ClusterPutSettingsRequest.cs b/src/Nest/Cluster/ClusterSettings/ClusterPutSettings/ClusterPutSettingsRequest.cs index da1b6f65136..825c460ddb9 100644 --- a/src/Nest/Cluster/ClusterSettings/ClusterPutSettings/ClusterPutSettingsRequest.cs +++ b/src/Nest/Cluster/ClusterSettings/ClusterPutSettings/ClusterPutSettingsRequest.cs @@ -4,17 +4,17 @@ namespace Nest { - public partial interface IClusterPutSettingsRequest + public partial interface IClusterPutSettingsRequest { - [JsonProperty(PropertyName = "persistent")] + [JsonProperty("persistent")] IDictionary Persistent { get; set; } - [JsonProperty(PropertyName = "transient")] + [JsonProperty("transient")] IDictionary Transient { get; set; } } - - public partial class ClusterPutSettingsRequest + + public partial class ClusterPutSettingsRequest { public IDictionary Persistent { get; set; } @@ -22,7 +22,7 @@ public partial class ClusterPutSettingsRequest } [DescriptorFor("ClusterPutSettings")] - public partial class ClusterPutSettingsDescriptor + public partial class ClusterPutSettingsDescriptor { IDictionary IClusterPutSettingsRequest.Persistent { get; set; } diff --git a/src/Nest/Cluster/ClusterSettings/ClusterPutSettings/ClusterPutSettingsResponse.cs b/src/Nest/Cluster/ClusterSettings/ClusterPutSettings/ClusterPutSettingsResponse.cs index 1793eba6ed4..5d45c78f87f 100644 --- a/src/Nest/Cluster/ClusterSettings/ClusterPutSettings/ClusterPutSettingsResponse.cs +++ b/src/Nest/Cluster/ClusterSettings/ClusterPutSettings/ClusterPutSettingsResponse.cs @@ -5,13 +5,13 @@ namespace Nest { public interface IClusterPutSettingsResponse : IResponse { - [JsonProperty(PropertyName = "acknowledged")] + [JsonProperty("acknowledged")] bool Acknowledged { get; } - [JsonProperty(PropertyName = "persistent")] + [JsonProperty("persistent")] IReadOnlyDictionary Persistent { get; } - [JsonProperty(PropertyName = "transient")] + [JsonProperty("transient")] IReadOnlyDictionary Transient { get; } } diff --git a/src/Nest/Cluster/NodesInfo/NodeInfo.cs b/src/Nest/Cluster/NodesInfo/NodeInfo.cs index 86b7350a325..d9c6f3998ad 100644 --- a/src/Nest/Cluster/NodesInfo/NodeInfo.cs +++ b/src/Nest/Cluster/NodesInfo/NodeInfo.cs @@ -7,22 +7,22 @@ namespace Nest [JsonObject] public class NodeInfo { - [JsonProperty(PropertyName = "name")] + [JsonProperty("name")] public string Name { get; internal set; } - [JsonProperty(PropertyName = "transport_address")] + [JsonProperty("transport_address")] public string TransportAddress { get; internal set; } - [JsonProperty(PropertyName = "host")] + [JsonProperty("host")] public string Host { get; internal set; } - [JsonProperty(PropertyName = "ip")] + [JsonProperty("ip")] public string Ip { get; internal set; } - [JsonProperty(PropertyName = "version")] + [JsonProperty("version")] public string Version { get; internal set; } - [JsonProperty(PropertyName = "build_hash")] + [JsonProperty("build_hash")] public string BuildHash { get; internal set; } /// @@ -32,30 +32,30 @@ public class NodeInfo [JsonProperty("roles")] public List Roles { get; internal set; } - [JsonProperty(PropertyName = "settings")] + [JsonProperty("settings")] [JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter))] public DynamicResponse Settings { get; internal set; } - [JsonProperty(PropertyName = "os")] + [JsonProperty("os")] public NodeOperatingSystemInfo OperatingSystem { get; internal set; } - [JsonProperty(PropertyName = "process")] + [JsonProperty("process")] public NodeProcessInfo Process { get; internal set; } - [JsonProperty(PropertyName = "jvm")] + [JsonProperty("jvm")] public NodeJvmInfo Jvm { get; internal set; } - [JsonProperty(PropertyName = "thread_pool")] + [JsonProperty("thread_pool")] [JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter))] public Dictionary ThreadPool { get; internal set; } - [JsonProperty(PropertyName = "network")] + [JsonProperty("network")] public NodeInfoNetwork Network { get; internal set; } - [JsonProperty(PropertyName = "transport")] + [JsonProperty("transport")] public NodeInfoTransport Transport { get; internal set; } - [JsonProperty(PropertyName = "http")] + [JsonProperty("http")] public NodeInfoHttp Http { get; internal set; } [JsonProperty("plugins")] @@ -65,176 +65,176 @@ public class NodeInfo [JsonObject] public class NodeOperatingSystemInfo { - [JsonProperty(PropertyName = "name")] + [JsonProperty("name")] public string Name { get; internal set; } - [JsonProperty(PropertyName = "arch")] + [JsonProperty("arch")] public string Architecture { get; internal set; } - [JsonProperty(PropertyName = "version")] + [JsonProperty("version")] public string Version { get; internal set; } - [JsonProperty(PropertyName = "refresh_interval_in_millis")] + [JsonProperty("refresh_interval_in_millis")] public int RefreshInterval { get; internal set; } - [JsonProperty(PropertyName = "available_processors")] + [JsonProperty("available_processors")] public int AvailableProcessors { get; internal set; } - [JsonProperty(PropertyName = "cpu")] + [JsonProperty("cpu")] public NodeInfoOSCPU Cpu { get; internal set; } - [JsonProperty(PropertyName = "mem")] + [JsonProperty("mem")] public NodeInfoMemory Mem { get; internal set; } - [JsonProperty(PropertyName = "swap")] + [JsonProperty("swap")] public NodeInfoMemory Swap { get; internal set; } } [JsonObject] public class NodeInfoOSCPU { - [JsonProperty(PropertyName = "vendor")] + [JsonProperty("vendor")] public string Vendor { get; internal set; } - [JsonProperty(PropertyName = "model")] + [JsonProperty("model")] public string Model { get; internal set; } - [JsonProperty(PropertyName = "mhz")] + [JsonProperty("mhz")] public int Mhz { get; internal set; } - [JsonProperty(PropertyName = "total_cores")] + [JsonProperty("total_cores")] public int TotalCores { get; internal set; } - [JsonProperty(PropertyName = "total_sockets")] + [JsonProperty("total_sockets")] public int TotalSockets { get; internal set; } - [JsonProperty(PropertyName = "cores_per_socket")] + [JsonProperty("cores_per_socket")] public int CoresPerSocket { get; internal set; } - [JsonProperty(PropertyName = "cache_size")] + [JsonProperty("cache_size")] public string CacheSize { get; internal set; } - [JsonProperty(PropertyName = "cache_size_in_bytes")] + [JsonProperty("cache_size_in_bytes")] public int CacheSizeInBytes { get; internal set; } } [JsonObject] public class NodeInfoMemory { - [JsonProperty(PropertyName = "total")] + [JsonProperty("total")] public string Total { get; internal set; } - [JsonProperty(PropertyName = "total_in_bytes")] + [JsonProperty("total_in_bytes")] public long TotalInBytes { get; internal set; } } [JsonObject] public class NodeProcessInfo { - [JsonProperty(PropertyName = "refresh_interval_in_millis")] + [JsonProperty("refresh_interval_in_millis")] public long RefreshIntervalInMilliseconds { get; internal set; } - [JsonProperty(PropertyName = "id")] + [JsonProperty("id")] public long Id { get; internal set; } - [JsonProperty(PropertyName = "mlockall")] + [JsonProperty("mlockall")] public bool MlockAll { get; internal set; } } [JsonObject] public class NodeJvmInfo { - [JsonProperty(PropertyName = "pid")] + [JsonProperty("pid")] public int PID { get; internal set; } - [JsonProperty(PropertyName = "version")] + [JsonProperty("version")] public string Version { get; internal set; } - [JsonProperty(PropertyName = "vm_name")] + [JsonProperty("vm_name")] public string VMName { get; internal set; } - [JsonProperty(PropertyName = "vm_version")] + [JsonProperty("vm_version")] public string VMVersion { get; internal set; } - [JsonProperty(PropertyName = "vm_vendor")] + [JsonProperty("vm_vendor")] public string VMVendor { get; internal set; } - [JsonProperty(PropertyName = "memory_pools")] + [JsonProperty("memory_pools")] public IEnumerable MemoryPools { get; internal set; } - [JsonProperty(PropertyName = "gc_collectors")] + [JsonProperty("gc_collectors")] public IEnumerable GCCollectors { get; internal set; } - [JsonProperty(PropertyName = "start_time_in_millis")] + [JsonProperty("start_time_in_millis")] public long StartTime { get; internal set; } - [JsonProperty(PropertyName = "mem")] + [JsonProperty("mem")] public NodeInfoJVMMemory Memory { get; internal set; } } [JsonObject] public class NodeInfoJVMMemory { - [JsonProperty(PropertyName = "heap_init")] + [JsonProperty("heap_init")] public string HeapInit { get; internal set; } - [JsonProperty(PropertyName = "heap_init_in_bytes")] + [JsonProperty("heap_init_in_bytes")] public long HeapInitInBytes { get; internal set; } - [JsonProperty(PropertyName = "heap_max")] + [JsonProperty("heap_max")] public string HeapMax { get; internal set; } - [JsonProperty(PropertyName = "heap_max_in_bytes")] + [JsonProperty("heap_max_in_bytes")] public long HeapMaxInBytes { get; internal set; } - [JsonProperty(PropertyName = "non_heap_init")] + [JsonProperty("non_heap_init")] public string NonHeapInit { get; internal set; } - [JsonProperty(PropertyName = "non_heap_init_in_bytes")] + [JsonProperty("non_heap_init_in_bytes")] public long NonHeapInitInBytes { get; internal set; } - [JsonProperty(PropertyName = "non_heap_max")] + [JsonProperty("non_heap_max")] public string NonHeapMax { get; internal set; } - [JsonProperty(PropertyName = "non_heap_max_in_bytes")] + [JsonProperty("non_heap_max_in_bytes")] public long NonHeapMaxInBytes { get; internal set; } - [JsonProperty(PropertyName = "direct_max")] + [JsonProperty("direct_max")] public string DirectMax { get; internal set; } - [JsonProperty(PropertyName = "direct_max_in_bytes")] + [JsonProperty("direct_max_in_bytes")] public long DirectMaxInBytes { get; internal set; } } [JsonObject] public class NodeThreadPoolInfo { - [JsonProperty(PropertyName = "type")] + [JsonProperty("type")] public string Type { get; internal set; } - [JsonProperty(PropertyName = "min")] + [JsonProperty("min")] public int? Min { get; internal set; } - [JsonProperty(PropertyName = "max")] + [JsonProperty("max")] public int? Max { get; internal set; } - [JsonProperty(PropertyName = "queue_size")] + [JsonProperty("queue_size")] public int? QueueSize { get; internal set; } - [JsonProperty(PropertyName = "keep_alive")] + [JsonProperty("keep_alive")] public string KeepAlive { get; internal set; } } [JsonObject] public class NodeInfoNetwork { - [JsonProperty(PropertyName = "refresh_interval")] + [JsonProperty("refresh_interval")] public int RefreshInterval { get; internal set; } - [JsonProperty(PropertyName = "primary_interface")] + [JsonProperty("primary_interface")] public NodeInfoNetworkInterface PrimaryInterface { get; internal set; } } [JsonObject] public class NodeInfoNetworkInterface { - [JsonProperty(PropertyName = "address")] + [JsonProperty("address")] public string Address { get; internal set; } - [JsonProperty(PropertyName = "name")] + [JsonProperty("name")] public string Name { get; internal set; } - [JsonProperty(PropertyName = "mac_address")] + [JsonProperty("mac_address")] public string MacAddress { get; internal set; } } [JsonObject] public class NodeInfoTransport { - [JsonProperty(PropertyName = "bound_address")] + [JsonProperty("bound_address")] public IEnumerable BoundAddress { get; internal set; } - [JsonProperty(PropertyName = "publish_address")] + [JsonProperty("publish_address")] public string PublishAddress { get; internal set; } } [JsonObject] public class NodeInfoHttp { - [JsonProperty(PropertyName = "bound_address")] + [JsonProperty("bound_address")] public IEnumerable BoundAddress { get; internal set; } - [JsonProperty(PropertyName = "publish_address")] + [JsonProperty("publish_address")] public string PublishAddress { get; internal set; } - [JsonProperty(PropertyName = "max_content_length")] + [JsonProperty("max_content_length")] public string MaxContentLength { get; internal set; } - [JsonProperty(PropertyName = "max_content_length_in_bytes")] + [JsonProperty("max_content_length_in_bytes")] public long MaxContentLengthInBytes { get; internal set; } } } diff --git a/src/Nest/Cluster/NodesInfo/NodesInfoResponse.cs b/src/Nest/Cluster/NodesInfo/NodesInfoResponse.cs index bd220661d73..41b21d856c4 100644 --- a/src/Nest/Cluster/NodesInfo/NodesInfoResponse.cs +++ b/src/Nest/Cluster/NodesInfo/NodesInfoResponse.cs @@ -12,10 +12,10 @@ public interface INodesInfoResponse : IResponse [JsonObject] public class NodesInfoResponse : ResponseBase, INodesInfoResponse { - [JsonProperty(PropertyName = "cluster_name")] + [JsonProperty("cluster_name")] public string ClusterName { get; internal set; } - [JsonProperty(PropertyName = "nodes")] + [JsonProperty("nodes")] [JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter))] public IReadOnlyDictionary Nodes { get; internal set; } = EmptyReadOnly.Dictionary; } diff --git a/src/Nest/Cluster/NodesStats/NodeStatsResponse.cs b/src/Nest/Cluster/NodesStats/NodeStatsResponse.cs index cdb8b6042af..d111552d709 100644 --- a/src/Nest/Cluster/NodesStats/NodeStatsResponse.cs +++ b/src/Nest/Cluster/NodesStats/NodeStatsResponse.cs @@ -5,10 +5,10 @@ namespace Nest { public interface INodesStatsResponse : IResponse { - [JsonProperty(PropertyName = "cluster_name")] + [JsonProperty("cluster_name")] string ClusterName { get; } - [JsonProperty(PropertyName = "nodes")] + [JsonProperty("nodes")] [JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter))] IReadOnlyDictionary Nodes { get; } } diff --git a/src/Nest/Cluster/NodesUsage/NodeUsageResponse.cs b/src/Nest/Cluster/NodesUsage/NodeUsageResponse.cs index 4ed0d76b814..d9170ccafe0 100644 --- a/src/Nest/Cluster/NodesUsage/NodeUsageResponse.cs +++ b/src/Nest/Cluster/NodesUsage/NodeUsageResponse.cs @@ -4,7 +4,7 @@ namespace Nest { - public class NodesMetaData + public class NodesMetadata { [JsonProperty("total")] public int Total { get; internal set; } @@ -36,7 +36,7 @@ public interface INodesUsageResponse : IResponse IReadOnlyDictionary Nodes { get; } - NodesMetaData NodesMetaData { get; } + NodesMetadata NodesMetadata { get; } } public class NodesUsageResponse : ResponseBase, INodesUsageResponse @@ -48,6 +48,6 @@ public class NodesUsageResponse : ResponseBase, INodesUsageResponse public IReadOnlyDictionary Nodes { get; internal set; } = EmptyReadOnly.Dictionary; [JsonProperty("_nodes")] - public NodesMetaData NodesMetaData { get; internal set; } + public NodesMetadata NodesMetadata { get; internal set; } } } diff --git a/src/Nest/Cluster/RootNodeInfo/RootVersionInfoResponse.cs b/src/Nest/Cluster/RootNodeInfo/RootVersionInfoResponse.cs index 46aaf44ec36..c0999df2f05 100644 --- a/src/Nest/Cluster/RootNodeInfo/RootVersionInfoResponse.cs +++ b/src/Nest/Cluster/RootNodeInfo/RootVersionInfoResponse.cs @@ -12,14 +12,14 @@ public interface IRootNodeInfoResponse : IResponse [JsonObject] public class RootNodeInfoResponse : ResponseBase, IRootNodeInfoResponse { - [JsonProperty(PropertyName = "name")] + [JsonProperty("name")] public string Name { get; internal set; } - [JsonProperty(PropertyName = "tagline")] + [JsonProperty("tagline")] public string Tagline { get; internal set; } - - [JsonProperty(PropertyName = "version")] + + [JsonProperty("version")] public ElasticsearchVersionInfo Version { get; internal set; } } -} \ No newline at end of file +} diff --git a/src/Nest/CommonAbstractions/Response/ElasticsearchVersionInfo.cs b/src/Nest/CommonAbstractions/Response/ElasticsearchVersionInfo.cs index 0ba75b2d495..97bd7578018 100644 --- a/src/Nest/CommonAbstractions/Response/ElasticsearchVersionInfo.cs +++ b/src/Nest/CommonAbstractions/Response/ElasticsearchVersionInfo.cs @@ -7,10 +7,10 @@ public class ElasticsearchVersionInfo { public string Number { get; set; } - [JsonProperty(PropertyName = "snapshot_build")] + [JsonProperty("snapshot_build")] public bool IsSnapShotBuild { get; set; } - [JsonProperty(PropertyName = "lucene_version")] + [JsonProperty("lucene_version")] public string LuceneVersion { get; set; } } } diff --git a/src/Nest/CommonAbstractions/Response/IndicesResponseBase.cs b/src/Nest/CommonAbstractions/Response/IndicesResponseBase.cs index 595515cbeb7..8b414bce89a 100644 --- a/src/Nest/CommonAbstractions/Response/IndicesResponseBase.cs +++ b/src/Nest/CommonAbstractions/Response/IndicesResponseBase.cs @@ -5,16 +5,16 @@ namespace Nest public interface IIndicesResponse : IResponse { bool Acknowledged { get; } - ShardsMetaData ShardsHit { get; } + ShardsMetadata ShardsHit { get; } } [JsonObject] public abstract class IndicesResponseBase : ResponseBase, IIndicesResponse { - [JsonProperty(PropertyName = "acknowledged")] + [JsonProperty("acknowledged")] public bool Acknowledged { get; private set; } - [JsonProperty(PropertyName = "_shards")] - public ShardsMetaData ShardsHit { get; private set; } + [JsonProperty("_shards")] + public ShardsMetadata ShardsHit { get; private set; } } } diff --git a/src/Nest/CommonAbstractions/Response/ShardsOperationResponseBase.cs b/src/Nest/CommonAbstractions/Response/ShardsOperationResponseBase.cs index 87fa72aa6e2..44500544531 100644 --- a/src/Nest/CommonAbstractions/Response/ShardsOperationResponseBase.cs +++ b/src/Nest/CommonAbstractions/Response/ShardsOperationResponseBase.cs @@ -4,12 +4,12 @@ namespace Nest { public interface IShardsOperationResponse : IResponse { - ShardsMetaData Shards { get; } + ShardsMetadata Shards { get; } } public abstract class ShardsOperationResponseBase : ResponseBase, IShardsOperationResponse { [JsonProperty("_shards")] - public ShardsMetaData Shards { get; internal set; } + public ShardsMetadata Shards { get; internal set; } } -} \ No newline at end of file +} diff --git a/src/Nest/CommonOptions/Hit/ShardsMetaData.cs b/src/Nest/CommonOptions/Hit/ShardsMetaData.cs index 9ef41c67a68..670903f40c6 100644 --- a/src/Nest/CommonOptions/Hit/ShardsMetaData.cs +++ b/src/Nest/CommonOptions/Hit/ShardsMetaData.cs @@ -4,7 +4,7 @@ namespace Nest { [JsonObject] - public class ShardsMetaData + public class ShardsMetadata { [JsonProperty] public int Total { get; internal set; } diff --git a/src/Nest/CommonOptions/Range/AggregationRange.cs b/src/Nest/CommonOptions/Range/AggregationRange.cs index 674fddf2aa5..abfe7df5507 100644 --- a/src/Nest/CommonOptions/Range/AggregationRange.cs +++ b/src/Nest/CommonOptions/Range/AggregationRange.cs @@ -13,13 +13,13 @@ namespace Nest [Obsolete("Renamed to IAggregationRange scheduled for removal in 6.0")] public interface IRange { - [JsonProperty(PropertyName = "from")] + [JsonProperty("from")] double? From { get; set; } - [JsonProperty(PropertyName = "to")] + [JsonProperty("to")] double? To { get; set; } - [JsonProperty(PropertyName = "key")] + [JsonProperty("key")] string Key { get; set; } } diff --git a/src/Nest/CommonOptions/Stats/DocStats.cs b/src/Nest/CommonOptions/Stats/DocStats.cs index 9efaa5607d4..63d2f16b4c0 100644 --- a/src/Nest/CommonOptions/Stats/DocStats.cs +++ b/src/Nest/CommonOptions/Stats/DocStats.cs @@ -5,10 +5,10 @@ namespace Nest [JsonObject] public class DocStats { - [JsonProperty(PropertyName = "count")] + [JsonProperty("count")] public long Count { get; set; } - [JsonProperty(PropertyName = "deleted")] + [JsonProperty("deleted")] public long Deleted { get; set; } } } diff --git a/src/Nest/CommonOptions/Stats/FlushStats.cs b/src/Nest/CommonOptions/Stats/FlushStats.cs index 54c2ea90a3d..51bb633cb8c 100644 --- a/src/Nest/CommonOptions/Stats/FlushStats.cs +++ b/src/Nest/CommonOptions/Stats/FlushStats.cs @@ -5,13 +5,13 @@ namespace Nest [JsonObject] public class FlushStats { - - [JsonProperty(PropertyName = "total")] + + [JsonProperty("total")] public long Total { get; set; } - [JsonProperty(PropertyName = "total_time")] + [JsonProperty("total_time")] public string TotalTime { get; set; } - [JsonProperty(PropertyName = "total_time_in_millis")] + [JsonProperty("total_time_in_millis")] public long TotalTimeInMilliseconds { get; set; } } diff --git a/src/Nest/CommonOptions/Stats/GetStats.cs b/src/Nest/CommonOptions/Stats/GetStats.cs index 16ffdd9e7c6..4985a9f4036 100644 --- a/src/Nest/CommonOptions/Stats/GetStats.cs +++ b/src/Nest/CommonOptions/Stats/GetStats.cs @@ -5,31 +5,31 @@ namespace Nest [JsonObject] public class GetStats { - [JsonProperty(PropertyName = "current")] + [JsonProperty("current")] public long Current { get; set; } - [JsonProperty(PropertyName = "exists_time")] + [JsonProperty("exists_time")] public string ExistsTime { get; set; } - [JsonProperty(PropertyName = "exists_time_in_millis")] + [JsonProperty("exists_time_in_millis")] public long ExistsTimeInMilliseconds { get; set; } - [JsonProperty(PropertyName = "exists_total")] + [JsonProperty("exists_total")] public long ExistsTotal { get; set; } - [JsonProperty(PropertyName = "missing_time")] + [JsonProperty("missing_time")] public string MissingTime { get; set; } - [JsonProperty(PropertyName = "missing_time_in_millis")] + [JsonProperty("missing_time_in_millis")] public long MissingTimeInMilliseconds { get; set; } - [JsonProperty(PropertyName = "missing_total")] + [JsonProperty("missing_total")] public long MissingTotal { get; set; } - [JsonProperty(PropertyName = "time")] + [JsonProperty("time")] public string Time { get; set; } - [JsonProperty(PropertyName = "time_in_millis")] + [JsonProperty("time_in_millis")] public long TimeInMilliseconds { get; set; } - [JsonProperty(PropertyName = "total")] + [JsonProperty("total")] public long Total { get; set; } } diff --git a/src/Nest/CommonOptions/Stats/MergesStats.cs b/src/Nest/CommonOptions/Stats/MergesStats.cs index 66993027f59..3cd6d182bc8 100644 --- a/src/Nest/CommonOptions/Stats/MergesStats.cs +++ b/src/Nest/CommonOptions/Stats/MergesStats.cs @@ -5,47 +5,47 @@ namespace Nest [JsonObject] public class MergesStats { - - [JsonProperty(PropertyName = "current")] + + [JsonProperty("current")] public long Current { get; set; } - [JsonProperty(PropertyName = "current_docs")] + [JsonProperty("current_docs")] public long CurrentDocuments { get; set; } - [JsonProperty(PropertyName = "current_size")] + [JsonProperty("current_size")] public string CurrentSize { get; set; } - [JsonProperty(PropertyName = "current_size_in_bytes")] + [JsonProperty("current_size_in_bytes")] public long CurrentSizeInBytes { get; set; } - [JsonProperty(PropertyName = "total")] + [JsonProperty("total")] public long Total { get; set; } - [JsonProperty(PropertyName = "total_auto_throttle")] + [JsonProperty("total_auto_throttle")] public string TotalAutoThrottle { get; set; } - [JsonProperty(PropertyName = "total_auto_throttle_in_bytes")] + [JsonProperty("total_auto_throttle_in_bytes")] public long TotalAutoThrottleInBytes { get; set; } - [JsonProperty(PropertyName = "total_docs")] + [JsonProperty("total_docs")] public long TotalDocuments { get; set; } - [JsonProperty(PropertyName = "total_size")] + [JsonProperty("total_size")] public string TotalSize { get; set; } - [JsonProperty(PropertyName = "total_size_in_bytes")] + [JsonProperty("total_size_in_bytes")] public string TotalSizeInBytes { get; set; } - [JsonProperty(PropertyName = "total_stopped_time")] + [JsonProperty("total_stopped_time")] public string TotalStoppedTime { get; set; } - [JsonProperty(PropertyName = "total__stopped_time_in_millis")] + [JsonProperty("total__stopped_time_in_millis")] public long TotalStoppedTimeInMilliseconds { get; set; } - [JsonProperty(PropertyName = "total_throttled_time")] + [JsonProperty("total_throttled_time")] public string TotalThrottledTime { get; set; } - [JsonProperty(PropertyName = "total_throttled_time_in_millis")] + [JsonProperty("total_throttled_time_in_millis")] public long TotalThrottledTimeInMilliseconds { get; set; } - [JsonProperty(PropertyName = "total_time")] + [JsonProperty("total_time")] public string TotalTime { get; set; } - [JsonProperty(PropertyName = "total_time_in_millis")] + [JsonProperty("total_time_in_millis")] public long TotalTimeInMilliseconds { get; set; } } } diff --git a/src/Nest/CommonOptions/Stats/RefreshStats.cs b/src/Nest/CommonOptions/Stats/RefreshStats.cs index e9492ee2795..148a85982c6 100644 --- a/src/Nest/CommonOptions/Stats/RefreshStats.cs +++ b/src/Nest/CommonOptions/Stats/RefreshStats.cs @@ -5,13 +5,13 @@ namespace Nest [JsonObject] public class RefreshStats { - - [JsonProperty(PropertyName = "total")] + + [JsonProperty("total")] public long Total { get; set; } - [JsonProperty(PropertyName = "total_time")] + [JsonProperty("total_time")] public string TotalTime { get; set; } - [JsonProperty(PropertyName = "total_time_in_millis")] + [JsonProperty("total_time_in_millis")] public long TotalTimeInMilliseconds { get; set; } } diff --git a/src/Nest/CommonOptions/Stats/SearchStats.cs b/src/Nest/CommonOptions/Stats/SearchStats.cs index 6429871e998..24dce92911b 100644 --- a/src/Nest/CommonOptions/Stats/SearchStats.cs +++ b/src/Nest/CommonOptions/Stats/SearchStats.cs @@ -5,43 +5,43 @@ namespace Nest [JsonObject] public class SearchStats { - [JsonProperty(PropertyName = "open_contexts")] + [JsonProperty("open_contexts")] public long OpenContexts { get; set; } - [JsonProperty(PropertyName = "fetch_current")] + [JsonProperty("fetch_current")] public long FetchCurrent { get; set; } - [JsonProperty(PropertyName = "fetch_time_in_millis")] + [JsonProperty("fetch_time_in_millis")] public long FetchTimeInMilliseconds { get; set; } - [JsonProperty(PropertyName = "fetch_total")] + [JsonProperty("fetch_total")] public long FetchTotal { get; set; } - [JsonProperty(PropertyName = "query_current")] + [JsonProperty("query_current")] public long QueryCurrent { get; set; } - [JsonProperty(PropertyName = "query_time_in_millis")] + [JsonProperty("query_time_in_millis")] public long QueryTimeInMilliseconds { get; set; } - [JsonProperty(PropertyName = "query_total")] + [JsonProperty("query_total")] public long QueryTotal { get; set; } - [JsonProperty(PropertyName = "scroll_current")] + [JsonProperty("scroll_current")] public long ScrollCurrent { get; set; } - [JsonProperty(PropertyName = "scroll_time_in_millis")] + [JsonProperty("scroll_time_in_millis")] public long ScrollTimeInMilliseconds { get; set; } - [JsonProperty(PropertyName = "scroll_total")] + [JsonProperty("scroll_total")] public long ScrollTotal { get; set; } - [JsonProperty(PropertyName = "suggest_current")] + [JsonProperty("suggest_current")] public long SuggestCurrent { get; set; } - [JsonProperty(PropertyName = "suggest_time_in_millis")] + [JsonProperty("suggest_time_in_millis")] public long SuggestTimeInMilliseconds { get; set; } - [JsonProperty(PropertyName = "suggest_total")] + [JsonProperty("suggest_total")] public long SuggestTotal { get; set; } } } diff --git a/src/Nest/CommonOptions/Stats/StoreStats.cs b/src/Nest/CommonOptions/Stats/StoreStats.cs index 3dae480ae69..3953bdd45ae 100644 --- a/src/Nest/CommonOptions/Stats/StoreStats.cs +++ b/src/Nest/CommonOptions/Stats/StoreStats.cs @@ -5,10 +5,10 @@ namespace Nest [JsonObject] public class StoreStats { - [JsonProperty(PropertyName = "size")] + [JsonProperty("size")] public string Size { get; set; } - [JsonProperty(PropertyName = "size_in_bytes")] + [JsonProperty("size_in_bytes")] public double SizeInBytes { get; set; } [JsonProperty("throttle_time")] diff --git a/src/Nest/Document/Multiple/Bulk/BulkResponseItem/BulkIndexResponseItem.cs b/src/Nest/Document/Multiple/Bulk/BulkResponseItem/BulkIndexResponseItem.cs index 09ff590698d..8c900c68496 100644 --- a/src/Nest/Document/Multiple/Bulk/BulkResponseItem/BulkIndexResponseItem.cs +++ b/src/Nest/Document/Multiple/Bulk/BulkResponseItem/BulkIndexResponseItem.cs @@ -12,7 +12,7 @@ public class BulkIndexResponseItem : BulkResponseItemBase /// /// Null if Percolation was not requested while indexing this doc, otherwise returns the percolator _ids that matched (if any) /// - [JsonProperty(PropertyName = "matches")] + [JsonProperty("matches")] public IEnumerable Matches { get; internal set; } } } diff --git a/src/Nest/Document/Multiple/Bulk/BulkResponseItem/BulkResponseItemBase.cs b/src/Nest/Document/Multiple/Bulk/BulkResponseItem/BulkResponseItemBase.cs index cf16058ebbc..13aa2a3f3c1 100644 --- a/src/Nest/Document/Multiple/Bulk/BulkResponseItem/BulkResponseItemBase.cs +++ b/src/Nest/Document/Multiple/Bulk/BulkResponseItem/BulkResponseItemBase.cs @@ -54,7 +54,7 @@ public interface IBulkResponseItem /// The shards associated with the bulk operation /// [JsonProperty("_shards")] - ShardsMetaData Shards { get; } + ShardsMetadata Shards { get; } [JsonProperty("_seq_no")] long SequenceNumber { get; } @@ -93,7 +93,7 @@ public abstract class BulkResponseItemBase : IBulkResponseItem public BulkError Error { get; internal set; } /// - public ShardsMetaData Shards { get; internal set; } + public ShardsMetadata Shards { get; internal set; } /// public long SequenceNumber { get; internal set; } diff --git a/src/Nest/Document/Multiple/MultiGet/Request/IMultiGetOperation.cs b/src/Nest/Document/Multiple/MultiGet/Request/IMultiGetOperation.cs index 24ee54f6251..b372bb0adb0 100644 --- a/src/Nest/Document/Multiple/MultiGet/Request/IMultiGetOperation.cs +++ b/src/Nest/Document/Multiple/MultiGet/Request/IMultiGetOperation.cs @@ -7,22 +7,22 @@ namespace Nest [JsonConverter(typeof(ReadAsTypeJsonConverter>))] public interface IMultiGetOperation { - [JsonProperty(PropertyName = "_index")] + [JsonProperty("_index")] IndexName Index { get; set; } - [JsonProperty(PropertyName = "_type")] + [JsonProperty("_type")] TypeName Type { get; set; } - [JsonProperty(PropertyName = "_id")] + [JsonProperty("_id")] Id Id { get; set; } - [JsonProperty(PropertyName = "stored_fields")] + [JsonProperty("stored_fields")] Fields StoredFields { get; set; } - [JsonProperty(PropertyName = "_routing")] + [JsonProperty("_routing")] string Routing { get; set; } - [JsonProperty(PropertyName = "_source")] + [JsonProperty("_source")] Union Source { get; set; } Type ClrType { get; } diff --git a/src/Nest/Document/Single/Create/CreateResponse.cs b/src/Nest/Document/Single/Create/CreateResponse.cs index 0ef1da70c5f..3443d13ac02 100644 --- a/src/Nest/Document/Single/Create/CreateResponse.cs +++ b/src/Nest/Document/Single/Create/CreateResponse.cs @@ -9,7 +9,7 @@ public interface ICreateResponse : IResponse string Type { get; } long Version { get; } Result Result { get; } - ShardsMetaData Shards { get; } + ShardsMetadata Shards { get; } long SequenceNumber { get; } long PrimaryTerm { get; } } @@ -33,7 +33,7 @@ public class CreateResponse : ResponseBase, ICreateResponse public Result Result { get; internal set; } [JsonProperty("_shards")] - public ShardsMetaData Shards { get; internal set; } + public ShardsMetadata Shards { get; internal set; } [JsonProperty("_seq_no")] public long SequenceNumber { get; internal set; } diff --git a/src/Nest/Document/Single/Delete/DeleteResponse.cs b/src/Nest/Document/Single/Delete/DeleteResponse.cs index b9ce3840171..5a762b953f7 100644 --- a/src/Nest/Document/Single/Delete/DeleteResponse.cs +++ b/src/Nest/Document/Single/Delete/DeleteResponse.cs @@ -29,7 +29,7 @@ public interface IDeleteResponse : IResponse /// Result Result { get; } - ShardsMetaData Shards { get; } + ShardsMetadata Shards { get; } long SequenceNumber { get; } long PrimaryTerm { get; } } @@ -54,7 +54,7 @@ public class DeleteResponse : ResponseBase, IDeleteResponse public Result Result { get; internal set; } [JsonProperty("_shards")] - public ShardsMetaData Shards { get; internal set; } + public ShardsMetadata Shards { get; internal set; } [JsonProperty("_seq_no")] public long SequenceNumber { get; internal set; } diff --git a/src/Nest/Document/Single/Index/IndexResponse.cs b/src/Nest/Document/Single/Index/IndexResponse.cs index eef38f3760a..39823ddf98b 100644 --- a/src/Nest/Document/Single/Index/IndexResponse.cs +++ b/src/Nest/Document/Single/Index/IndexResponse.cs @@ -9,7 +9,7 @@ public interface IIndexResponse : IResponse string Type { get; } long Version { get; } Result Result { get; } - ShardsMetaData Shards { get; } + ShardsMetadata Shards { get; } long SequenceNumber { get; } long PrimaryTerm { get; } } @@ -33,7 +33,7 @@ public class IndexResponse : ResponseBase, IIndexResponse public Result Result { get; internal set; } [JsonProperty("_shards")] - public ShardsMetaData Shards { get; internal set; } + public ShardsMetadata Shards { get; internal set; } [JsonProperty("_seq_no")] public long SequenceNumber { get; internal set; } diff --git a/src/Nest/Document/Single/Update/UpdateRequest.cs b/src/Nest/Document/Single/Update/UpdateRequest.cs index 9f0a9a9ec3d..ed98a6e0d47 100644 --- a/src/Nest/Document/Single/Update/UpdateRequest.cs +++ b/src/Nest/Document/Single/Update/UpdateRequest.cs @@ -9,26 +9,26 @@ public partial interface IUpdateRequest where TDocument : class where TPartialDocument : class { - [JsonProperty(PropertyName = "script")] + [JsonProperty("script")] IScript Script { get; set; } - [JsonProperty(PropertyName = "upsert")] + [JsonProperty("upsert")] TDocument Upsert { get; set; } - [JsonProperty(PropertyName = "doc_as_upsert")] + [JsonProperty("doc_as_upsert")] bool? DocAsUpsert { get; set; } /// /// If you would like your script to run regardless of whether the document exists or not — i.e. the script handles /// initializing the document instead of the upsert element — then set scripted_upsert to true /// - [JsonProperty(PropertyName = "scripted_upsert")] + [JsonProperty("scripted_upsert")] bool? ScriptedUpsert { get; set; } - [JsonProperty(PropertyName = "doc")] + [JsonProperty("doc")] TPartialDocument Doc { get; set; } - [JsonProperty(PropertyName = "detect_noop")] + [JsonProperty("detect_noop")] bool? DetectNoop { get; set; } [JsonProperty("_source")] diff --git a/src/Nest/Document/Single/Update/UpdateResponse.cs b/src/Nest/Document/Single/Update/UpdateResponse.cs index 7ac1bd3f621..cdeabc01c7d 100644 --- a/src/Nest/Document/Single/Update/UpdateResponse.cs +++ b/src/Nest/Document/Single/Update/UpdateResponse.cs @@ -5,22 +5,22 @@ namespace Nest public interface IUpdateResponse : IResponse where T : class { - [JsonProperty(PropertyName = "_shards")] - ShardsMetaData ShardsHit { get; } + [JsonProperty("_shards")] + ShardsMetadata ShardsHit { get; } - [JsonProperty(PropertyName = "_index")] + [JsonProperty("_index")] string Index { get; } - [JsonProperty(PropertyName = "_type")] + [JsonProperty("_type")] string Type { get; } - [JsonProperty(PropertyName = "_id")] + [JsonProperty("_id")] string Id { get; } - [JsonProperty(PropertyName = "_version")] + [JsonProperty("_version")] long Version { get; } - [JsonProperty(PropertyName = "get")] + [JsonProperty("get")] InstantGet Get { get; } [JsonProperty("result")] @@ -31,7 +31,7 @@ public interface IUpdateResponse : IResponse public class UpdateResponse : ResponseBase, IUpdateResponse where T : class { - public ShardsMetaData ShardsHit { get; private set; } + public ShardsMetadata ShardsHit { get; private set; } public string Index { get; private set; } public string Type { get; private set; } public string Id { get; private set; } diff --git a/src/Nest/Indices/Analyze/AnalyzeResponse.cs b/src/Nest/Indices/Analyze/AnalyzeResponse.cs index a8d63e59d8e..db5ba29e86e 100644 --- a/src/Nest/Indices/Analyze/AnalyzeResponse.cs +++ b/src/Nest/Indices/Analyze/AnalyzeResponse.cs @@ -11,7 +11,7 @@ public interface IAnalyzeResponse : IResponse [JsonObject] public class AnalyzeResponse : ResponseBase, IAnalyzeResponse { - [JsonProperty(PropertyName = "tokens")] + [JsonProperty("tokens")] public IReadOnlyCollection Tokens { get; internal set; } = EmptyReadOnly.Collection; } } diff --git a/src/Nest/Indices/Monitoring/IndicesSegments/IndexSegment.cs b/src/Nest/Indices/Monitoring/IndicesSegments/IndexSegment.cs index f2dc6e57ef9..ed5a4b436d5 100644 --- a/src/Nest/Indices/Monitoring/IndicesSegments/IndexSegment.cs +++ b/src/Nest/Indices/Monitoring/IndicesSegments/IndexSegment.cs @@ -6,7 +6,7 @@ namespace Nest [JsonObject] public class IndexSegment { - [JsonProperty(PropertyName = "shards")] + [JsonProperty("shards")] [JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter))] public IReadOnlyDictionary Shards { get; internal set; } = EmptyReadOnly.Dictionary; diff --git a/src/Nest/Indices/Monitoring/IndicesSegments/Segment.cs b/src/Nest/Indices/Monitoring/IndicesSegments/Segment.cs index 80cf3a3c8d5..38032e28d36 100644 --- a/src/Nest/Indices/Monitoring/IndicesSegments/Segment.cs +++ b/src/Nest/Indices/Monitoring/IndicesSegments/Segment.cs @@ -5,25 +5,25 @@ namespace Nest [JsonObject] public class Segment { - [JsonProperty(PropertyName = "generation")] + [JsonProperty("generation")] public int Generation { get; internal set; } - [JsonProperty(PropertyName = "num_docs")] + [JsonProperty("num_docs")] public long TotalDocuments { get; internal set; } - [JsonProperty(PropertyName = "deleted_docs")] + [JsonProperty("deleted_docs")] public long DeletedDocuments { get; internal set; } - [JsonProperty(PropertyName = "size")] + [JsonProperty("size")] public string Size { get; internal set; } - [JsonProperty(PropertyName = "size_in_bytes")] + [JsonProperty("size_in_bytes")] public double SizeInBytes { get; internal set; } - [JsonProperty(PropertyName = "committed")] + [JsonProperty("committed")] public bool Committed { get; internal set; } - [JsonProperty(PropertyName = "Search")] + [JsonProperty("Search")] public bool Search { get; internal set; } } -} \ No newline at end of file +} diff --git a/src/Nest/Indices/Monitoring/IndicesSegments/SegmentsResponse.cs b/src/Nest/Indices/Monitoring/IndicesSegments/SegmentsResponse.cs index e697c48e085..395b224c2ce 100644 --- a/src/Nest/Indices/Monitoring/IndicesSegments/SegmentsResponse.cs +++ b/src/Nest/Indices/Monitoring/IndicesSegments/SegmentsResponse.cs @@ -5,7 +5,7 @@ namespace Nest { public interface ISegmentsResponse : IResponse { - ShardsMetaData Shards { get; } + ShardsMetadata Shards { get; } IReadOnlyDictionary Indices { get; } } @@ -13,10 +13,10 @@ public interface ISegmentsResponse : IResponse public class SegmentsResponse : ResponseBase, ISegmentsResponse { - [JsonProperty(PropertyName = "_shards")] - public ShardsMetaData Shards { get; internal set; } + [JsonProperty("_shards")] + public ShardsMetadata Shards { get; internal set; } - [JsonProperty(PropertyName = "indices")] + [JsonProperty("indices")] [JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter))] public IReadOnlyDictionary Indices { get; internal set; } = EmptyReadOnly.Dictionary; diff --git a/src/Nest/Indices/Monitoring/IndicesSegments/ShardSegmentRouting.cs b/src/Nest/Indices/Monitoring/IndicesSegments/ShardSegmentRouting.cs index 433a191c7a3..eb03707bdab 100644 --- a/src/Nest/Indices/Monitoring/IndicesSegments/ShardSegmentRouting.cs +++ b/src/Nest/Indices/Monitoring/IndicesSegments/ShardSegmentRouting.cs @@ -5,13 +5,13 @@ namespace Nest [JsonObject] public class ShardSegmentRouting { - [JsonProperty(PropertyName = "state")] + [JsonProperty("state")] public string State { get; internal set; } - [JsonProperty(PropertyName = "primary")] + [JsonProperty("primary")] public bool Primary { get; internal set; } - [JsonProperty(PropertyName = "node")] + [JsonProperty("node")] public string Node { get; internal set; } } } diff --git a/src/Nest/Indices/Monitoring/IndicesSegments/ShardsSegment.cs b/src/Nest/Indices/Monitoring/IndicesSegments/ShardsSegment.cs index f7c4e4d8ae1..3228b3887b2 100644 --- a/src/Nest/Indices/Monitoring/IndicesSegments/ShardsSegment.cs +++ b/src/Nest/Indices/Monitoring/IndicesSegments/ShardsSegment.cs @@ -9,13 +9,13 @@ namespace Nest [JsonConverter(typeof(ShardsSegment.Json))] public class ShardsSegment { - [JsonProperty(PropertyName = "num_committed_segments")] + [JsonProperty("num_committed_segments")] public int CommittedSegments { get; internal set; } - [JsonProperty(PropertyName = "num_search_segments")] + [JsonProperty("num_search_segments")] public int SearchSegments { get; internal set; } - [JsonProperty(PropertyName = "routing")] + [JsonProperty("routing")] public ShardSegmentRouting Routing { get; internal set; } [JsonProperty] diff --git a/src/Nest/Indices/Monitoring/IndicesShardStores/IndicesShardStoresResponse.cs b/src/Nest/Indices/Monitoring/IndicesShardStores/IndicesShardStoresResponse.cs index 70b57b259a3..b0683f0a8bc 100644 --- a/src/Nest/Indices/Monitoring/IndicesShardStores/IndicesShardStoresResponse.cs +++ b/src/Nest/Indices/Monitoring/IndicesShardStores/IndicesShardStoresResponse.cs @@ -7,7 +7,7 @@ namespace Nest { public interface IIndicesShardStoresResponse : IResponse { - [JsonProperty(PropertyName = "indices")] + [JsonProperty("indices")] [JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter))] IReadOnlyDictionary Indices { get; } } @@ -20,14 +20,14 @@ public class IndicesShardStoresResponse : ResponseBase, IIndicesShardStoresRespo public class IndicesShardStores { - [JsonProperty(PropertyName = "shards")] + [JsonProperty("shards")] [JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter))] public IReadOnlyDictionary Shards { get; internal set; } = EmptyReadOnly.Dictionary; } public class ShardStoreWrapper { - [JsonProperty(PropertyName = "stores")] + [JsonProperty("stores")] public IReadOnlyCollection Stores { get; internal set; } = EmptyReadOnly.Collection; } diff --git a/src/Nest/Indices/Monitoring/IndicesStats/IndexStats.cs b/src/Nest/Indices/Monitoring/IndicesStats/IndexStats.cs index c5e05450518..6412169e2d0 100644 --- a/src/Nest/Indices/Monitoring/IndicesStats/IndexStats.cs +++ b/src/Nest/Indices/Monitoring/IndicesStats/IndexStats.cs @@ -5,52 +5,52 @@ namespace Nest [JsonObject] public class IndexStats { - [JsonProperty(PropertyName = "docs")] + [JsonProperty("docs")] public DocStats Documents { get; set; } - [JsonProperty(PropertyName = "store")] + [JsonProperty("store")] public StoreStats Store { get; set; } - [JsonProperty(PropertyName = "indexing")] + [JsonProperty("indexing")] public IndexingStats Indexing { get; set; } - [JsonProperty(PropertyName = "get")] + [JsonProperty("get")] public GetStats Get { get; set; } - [JsonProperty(PropertyName = "search")] + [JsonProperty("search")] public SearchStats Search { get; set; } - [JsonProperty(PropertyName = "merges")] + [JsonProperty("merges")] public MergesStats Merges { get; set; } - [JsonProperty(PropertyName = "refresh")] + [JsonProperty("refresh")] public RefreshStats Refresh { get; set; } - [JsonProperty(PropertyName = "flush")] + [JsonProperty("flush")] public FlushStats Flush { get; set; } - [JsonProperty(PropertyName = "warmer")] + [JsonProperty("warmer")] public WarmerStats Warmer { get; set; } - [JsonProperty(PropertyName = "query_cache")] + [JsonProperty("query_cache")] public QueryCacheStats QueryCache { get; set; } - [JsonProperty(PropertyName = "fielddata")] + [JsonProperty("fielddata")] public FielddataStats Fielddata { get; set; } - [JsonProperty(PropertyName = "completion")] + [JsonProperty("completion")] public CompletionStats Completion { get; set; } - [JsonProperty(PropertyName = "segments")] + [JsonProperty("segments")] public SegmentsStats Segments { get; set; } - [JsonProperty(PropertyName = "translog")] + [JsonProperty("translog")] public TranslogStats Translog { get; set; } - [JsonProperty(PropertyName = "request_cache")] + [JsonProperty("request_cache")] public RequestCacheStats RequestCache { get; set; } - [JsonProperty(PropertyName = "recovery")] + [JsonProperty("recovery")] public RecoveryStats Recovery { get; set; } } } diff --git a/src/Nest/Indices/Monitoring/IndicesStats/IndicesStats.cs b/src/Nest/Indices/Monitoring/IndicesStats/IndicesStats.cs index e2ce302e1dd..6168d548558 100644 --- a/src/Nest/Indices/Monitoring/IndicesStats/IndicesStats.cs +++ b/src/Nest/Indices/Monitoring/IndicesStats/IndicesStats.cs @@ -5,9 +5,9 @@ namespace Nest [JsonObject] public class IndicesStats { - [JsonProperty(PropertyName = "primaries")] + [JsonProperty("primaries")] public IndexStats Primaries { get; set; } - [JsonProperty(PropertyName = "total")] + [JsonProperty("total")] public IndexStats Total { get; set; } } } diff --git a/src/Nest/Indices/Monitoring/IndicesStats/IndicesStatsResponse.cs b/src/Nest/Indices/Monitoring/IndicesStats/IndicesStatsResponse.cs index f719068feeb..118ca640f75 100644 --- a/src/Nest/Indices/Monitoring/IndicesStats/IndicesStatsResponse.cs +++ b/src/Nest/Indices/Monitoring/IndicesStats/IndicesStatsResponse.cs @@ -5,7 +5,7 @@ namespace Nest { public interface IIndicesStatsResponse : IResponse { - ShardsMetaData Shards { get; } + ShardsMetadata Shards { get; } IndicesStats Stats { get;} IReadOnlyDictionary Indices { get; } } @@ -14,13 +14,13 @@ public interface IIndicesStatsResponse : IResponse public class IndicesStatsResponse : ResponseBase, IIndicesStatsResponse { - [JsonProperty(PropertyName = "_shards")] - public ShardsMetaData Shards { get; internal set; } + [JsonProperty("_shards")] + public ShardsMetadata Shards { get; internal set; } - [JsonProperty(PropertyName = "_all")] + [JsonProperty("_all")] public IndicesStats Stats { get; internal set; } - [JsonProperty(PropertyName = "indices")] + [JsonProperty("indices")] [JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter))] public IReadOnlyDictionary Indices { get; internal set; } = EmptyReadOnly.Dictionary; diff --git a/src/Nest/Indices/StatusManagement/Upgrade/UpgradeResponse.cs b/src/Nest/Indices/StatusManagement/Upgrade/UpgradeResponse.cs index 3b39665cc8f..4d3b2d5756d 100644 --- a/src/Nest/Indices/StatusManagement/Upgrade/UpgradeResponse.cs +++ b/src/Nest/Indices/StatusManagement/Upgrade/UpgradeResponse.cs @@ -5,11 +5,11 @@ namespace Nest public interface IUpgradeResponse : IResponse { [JsonProperty("_shards")] - ShardsMetaData Shards { get; } + ShardsMetadata Shards { get; } } public class UpgradeResponse : ResponseBase, IUpgradeResponse { - public ShardsMetaData Shards { get; internal set; } + public ShardsMetadata Shards { get; internal set; } } } diff --git a/src/Nest/Modules/SnapshotAndRestore/Repositories/VerifyRepository/CompactNodeInfo.cs b/src/Nest/Modules/SnapshotAndRestore/Repositories/VerifyRepository/CompactNodeInfo.cs index ef5afea1aa1..f48eae392f4 100644 --- a/src/Nest/Modules/SnapshotAndRestore/Repositories/VerifyRepository/CompactNodeInfo.cs +++ b/src/Nest/Modules/SnapshotAndRestore/Repositories/VerifyRepository/CompactNodeInfo.cs @@ -5,7 +5,7 @@ namespace Nest [JsonObject] public class CompactNodeInfo { - [JsonProperty(PropertyName = "name")] + [JsonProperty("name")] public string Name { get; internal set; } } -} \ No newline at end of file +} diff --git a/src/Nest/Modules/SnapshotAndRestore/Repositories/VerifyRepository/VerifyRepositoryResponse.cs b/src/Nest/Modules/SnapshotAndRestore/Repositories/VerifyRepository/VerifyRepositoryResponse.cs index 89426fa7769..f94ba6bd2d1 100644 --- a/src/Nest/Modules/SnapshotAndRestore/Repositories/VerifyRepository/VerifyRepositoryResponse.cs +++ b/src/Nest/Modules/SnapshotAndRestore/Repositories/VerifyRepository/VerifyRepositoryResponse.cs @@ -9,7 +9,7 @@ public interface IVerifyRepositoryResponse : IResponse /// /// A dictionary of nodeId => nodeinfo of nodes that verified the repository /// - [JsonProperty(PropertyName = "nodes")] + [JsonProperty("nodes")] [JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter))] IReadOnlyDictionary Nodes { get; } } diff --git a/src/Nest/Modules/SnapshotAndRestore/Restore/SnapshotRestore.cs b/src/Nest/Modules/SnapshotAndRestore/Restore/SnapshotRestore.cs index dd9d08c8ba1..47d1b1635d9 100644 --- a/src/Nest/Modules/SnapshotAndRestore/Restore/SnapshotRestore.cs +++ b/src/Nest/Modules/SnapshotAndRestore/Restore/SnapshotRestore.cs @@ -13,6 +13,6 @@ public class SnapshotRestore EmptyReadOnly.Collection; [JsonProperty("shards")] - public ShardsMetaData Shards { get; internal set; } + public ShardsMetadata Shards { get; internal set; } } } diff --git a/src/Nest/Modules/SnapshotAndRestore/Snapshot/Snapshot.cs b/src/Nest/Modules/SnapshotAndRestore/Snapshot/Snapshot.cs index 1010acddffc..6e0a4e7857c 100644 --- a/src/Nest/Modules/SnapshotAndRestore/Snapshot/Snapshot.cs +++ b/src/Nest/Modules/SnapshotAndRestore/Snapshot/Snapshot.cs @@ -32,7 +32,7 @@ public class Snapshot public long DurationInMilliseconds { get; internal set; } [JsonProperty("shards")] - public ShardsMetaData Shards { get; internal set; } + public ShardsMetadata Shards { get; internal set; } [JsonProperty("failures")] public IReadOnlyCollection Failures { get; internal set; } diff --git a/src/Nest/QueryDsl/Abstractions/Query/QueryBase.cs b/src/Nest/QueryDsl/Abstractions/Query/QueryBase.cs index fb1294fcbf7..5a708b63af7 100644 --- a/src/Nest/QueryDsl/Abstractions/Query/QueryBase.cs +++ b/src/Nest/QueryDsl/Abstractions/Query/QueryBase.cs @@ -9,10 +9,10 @@ public interface IQuery /// /// The _name of the query. this allows you to retrieve for each document what part of the query it matched on /// - [JsonProperty(PropertyName = "_name")] + [JsonProperty("_name")] string Name { get; set; } - [JsonProperty(PropertyName = "boost")] + [JsonProperty("boost")] double? Boost { get; set; } [JsonIgnore] diff --git a/src/Nest/QueryDsl/Compound/ConstantScore/ConstantScoreQuery.cs b/src/Nest/QueryDsl/Compound/ConstantScore/ConstantScoreQuery.cs index d0abca50e98..c9c0b39f586 100644 --- a/src/Nest/QueryDsl/Compound/ConstantScore/ConstantScoreQuery.cs +++ b/src/Nest/QueryDsl/Compound/ConstantScore/ConstantScoreQuery.cs @@ -8,7 +8,7 @@ namespace Nest [JsonConverter(typeof(ReadAsTypeJsonConverter>))] public interface IConstantScoreQuery : IQuery { - [JsonProperty(PropertyName = "filter")] + [JsonProperty("filter")] QueryContainer Filter { get; set; } } diff --git a/src/Nest/QueryDsl/Compound/Dismax/DismaxQuery.cs b/src/Nest/QueryDsl/Compound/Dismax/DismaxQuery.cs index c38cfefac01..32a5a872ca1 100644 --- a/src/Nest/QueryDsl/Compound/Dismax/DismaxQuery.cs +++ b/src/Nest/QueryDsl/Compound/Dismax/DismaxQuery.cs @@ -9,10 +9,10 @@ namespace Nest [JsonConverter(typeof(ReadAsTypeJsonConverter))] public interface IDisMaxQuery : IQuery { - [JsonProperty(PropertyName = "tie_breaker")] + [JsonProperty("tie_breaker")] double? TieBreaker { get; set; } - [JsonProperty(PropertyName = "queries")] + [JsonProperty("queries")] IEnumerable Queries { get; set; } } diff --git a/src/Nest/QueryDsl/Compound/FunctionScore/Functions/Decay/DecayFunctionBase.cs b/src/Nest/QueryDsl/Compound/FunctionScore/Functions/Decay/DecayFunctionBase.cs index c5af913c094..f8c8c8d66c7 100644 --- a/src/Nest/QueryDsl/Compound/FunctionScore/Functions/Decay/DecayFunctionBase.cs +++ b/src/Nest/QueryDsl/Compound/FunctionScore/Functions/Decay/DecayFunctionBase.cs @@ -10,10 +10,10 @@ public interface IDecayFunction : IScoreFunction Field Field { get; set; } - [JsonProperty(PropertyName = "decay")] + [JsonProperty("decay")] double? Decay { get; set; } - [JsonProperty(PropertyName = "multi_value_mode")] + [JsonProperty("multi_value_mode")] MultiValueMode? MultiValueMode { get; set; } @@ -21,13 +21,13 @@ public interface IDecayFunction : IScoreFunction public interface IDecayFunction : IDecayFunction { - [JsonProperty(PropertyName = "origin")] + [JsonProperty("origin")] TOrigin Origin { get; set; } - [JsonProperty(PropertyName = "scale")] + [JsonProperty("scale")] TScale Scale { get; set; } - [JsonProperty(PropertyName = "offset")] + [JsonProperty("offset")] TScale Offset { get; set; } } diff --git a/src/Nest/QueryDsl/Compound/FunctionScore/Functions/Random/RandomScoreFunction.cs b/src/Nest/QueryDsl/Compound/FunctionScore/Functions/Random/RandomScoreFunction.cs index 2da34ff9522..b45d85c54f8 100644 --- a/src/Nest/QueryDsl/Compound/FunctionScore/Functions/Random/RandomScoreFunction.cs +++ b/src/Nest/QueryDsl/Compound/FunctionScore/Functions/Random/RandomScoreFunction.cs @@ -8,10 +8,10 @@ namespace Nest [JsonConverter(typeof(ReadAsTypeJsonConverter))] public interface IRandomScoreFunction : IScoreFunction { - [JsonProperty(PropertyName = "seed")] + [JsonProperty("seed")] Union Seed { get; set; } - [JsonProperty(PropertyName = "field")] + [JsonProperty("field")] Field Field { get; set; } } diff --git a/src/Nest/QueryDsl/Compound/FunctionScore/Functions/ScriptScore/ScriptScoreFunction.cs b/src/Nest/QueryDsl/Compound/FunctionScore/Functions/ScriptScore/ScriptScoreFunction.cs index 9610a400b5a..736a66f8733 100644 --- a/src/Nest/QueryDsl/Compound/FunctionScore/Functions/ScriptScore/ScriptScoreFunction.cs +++ b/src/Nest/QueryDsl/Compound/FunctionScore/Functions/ScriptScore/ScriptScoreFunction.cs @@ -6,7 +6,7 @@ namespace Nest [JsonObject(MemberSerialization = MemberSerialization.OptIn)] public interface IScriptScoreFunction : IScoreFunction { - [JsonProperty(PropertyName = "script")] + [JsonProperty("script")] IScriptQuery Script { get; set; } } diff --git a/src/Nest/QueryDsl/FullText/CommonTerms/CommonTermsQuery.cs b/src/Nest/QueryDsl/FullText/CommonTerms/CommonTermsQuery.cs index a9c102e1fad..4ef8979ef23 100644 --- a/src/Nest/QueryDsl/FullText/CommonTerms/CommonTermsQuery.cs +++ b/src/Nest/QueryDsl/FullText/CommonTerms/CommonTermsQuery.cs @@ -7,27 +7,27 @@ namespace Nest [JsonConverter(typeof (FieldNameQueryJsonConverter))] public interface ICommonTermsQuery : IFieldNameQuery { - [JsonProperty(PropertyName = "query")] + [JsonProperty("query")] string Query { get; set; } - [JsonProperty(PropertyName = "cutoff_frequency")] + [JsonProperty("cutoff_frequency")] double? CutoffFrequency { get; set; } - [JsonProperty(PropertyName = "low_freq_operator")] + [JsonProperty("low_freq_operator")] [JsonConverter(typeof (StringEnumConverter))] Operator? LowFrequencyOperator { get; set; } - [JsonProperty(PropertyName = "high_freq_operator")] + [JsonProperty("high_freq_operator")] [JsonConverter(typeof (StringEnumConverter))] Operator? HighFrequencyOperator { get; set; } - [JsonProperty(PropertyName = "minimum_should_match")] + [JsonProperty("minimum_should_match")] MinimumShouldMatch MinimumShouldMatch { get; set; } - [JsonProperty(PropertyName = "analyzer")] + [JsonProperty("analyzer")] string Analyzer { get; set; } - [JsonProperty(PropertyName = "disable_coord")] + [JsonProperty("disable_coord")] bool? DisableCoord { get; set; } } diff --git a/src/Nest/QueryDsl/FullText/MatchPhrase/MatchPhraseQuery.cs b/src/Nest/QueryDsl/FullText/MatchPhrase/MatchPhraseQuery.cs index 02d669c46eb..28b2056fb0a 100644 --- a/src/Nest/QueryDsl/FullText/MatchPhrase/MatchPhraseQuery.cs +++ b/src/Nest/QueryDsl/FullText/MatchPhrase/MatchPhraseQuery.cs @@ -7,13 +7,13 @@ namespace Nest [JsonConverter(typeof(FieldNameQueryJsonConverter))] public interface IMatchPhraseQuery : IFieldNameQuery { - [JsonProperty(PropertyName = "query")] + [JsonProperty("query")] string Query { get; set; } - [JsonProperty(PropertyName = "analyzer")] + [JsonProperty("analyzer")] string Analyzer { get; set; } - [JsonProperty(PropertyName = "slop")] + [JsonProperty("slop")] int? Slop { get; set; } } diff --git a/src/Nest/QueryDsl/FullText/MatchPhrasePrefix/MatchPhrasePrefixQuery.cs b/src/Nest/QueryDsl/FullText/MatchPhrasePrefix/MatchPhrasePrefixQuery.cs index 5e23472b008..2038a5d0ae2 100644 --- a/src/Nest/QueryDsl/FullText/MatchPhrasePrefix/MatchPhrasePrefixQuery.cs +++ b/src/Nest/QueryDsl/FullText/MatchPhrasePrefix/MatchPhrasePrefixQuery.cs @@ -7,16 +7,16 @@ namespace Nest [JsonConverter(typeof(FieldNameQueryJsonConverter))] public interface IMatchPhrasePrefixQuery : IFieldNameQuery { - [JsonProperty(PropertyName = "query")] + [JsonProperty("query")] string Query { get; set; } - [JsonProperty(PropertyName = "analyzer")] + [JsonProperty("analyzer")] string Analyzer { get; set; } - [JsonProperty(PropertyName = "max_expansions")] + [JsonProperty("max_expansions")] int? MaxExpansions { get; set; } - [JsonProperty(PropertyName = "slop")] + [JsonProperty("slop")] int? Slop { get; set; } } diff --git a/src/Nest/QueryDsl/FullText/SimpleQueryString/SimpleQueryStringQuery.cs b/src/Nest/QueryDsl/FullText/SimpleQueryString/SimpleQueryStringQuery.cs index 2d7b35841d8..369ffa564f1 100644 --- a/src/Nest/QueryDsl/FullText/SimpleQueryString/SimpleQueryStringQuery.cs +++ b/src/Nest/QueryDsl/FullText/SimpleQueryString/SimpleQueryStringQuery.cs @@ -7,33 +7,33 @@ namespace Nest [JsonConverter(typeof(ReadAsTypeJsonConverter>))] public interface ISimpleQueryStringQuery : IQuery { - [JsonProperty(PropertyName = "fields")] + [JsonProperty("fields")] Fields Fields { get; set; } - [JsonProperty(PropertyName = "query")] + [JsonProperty("query")] string Query { get; set; } - [JsonProperty(PropertyName = "analyzer")] + [JsonProperty("analyzer")] string Analyzer { get; set; } - [JsonProperty(PropertyName = "default_operator")] + [JsonProperty("default_operator")] Operator? DefaultOperator { get; set; } - [JsonProperty(PropertyName = "flags")] + [JsonProperty("flags")] SimpleQueryStringFlags? Flags { get; set; } - [JsonProperty(PropertyName = "locale")] + [JsonProperty("locale")] [Obsolete("Deprecated in Elasticsearch 5.1.1. Can be performed by the analyzer applied")] string Locale { get; set; } - [JsonProperty(PropertyName = "lowercase_expanded_terms")] + [JsonProperty("lowercase_expanded_terms")] [Obsolete("Deprecated in Elasticsearch 5.1.1. Can be performed by the analyzer applied")] bool? LowercaseExpandedTerms { get; set; } - [JsonProperty(PropertyName = "lenient")] + [JsonProperty("lenient")] bool? Lenient { get; set; } - [JsonProperty(PropertyName = "analyze_wildcard")] + [JsonProperty("analyze_wildcard")] bool? AnalyzeWildcard { get; set; } [JsonProperty("minimum_should_match")] diff --git a/src/Nest/QueryDsl/MatchAllQuery.cs b/src/Nest/QueryDsl/MatchAllQuery.cs index 3ba944fef3b..a5707432bdc 100644 --- a/src/Nest/QueryDsl/MatchAllQuery.cs +++ b/src/Nest/QueryDsl/MatchAllQuery.cs @@ -12,7 +12,7 @@ public interface IMatchAllQuery : IQuery /// boosting into account, the norms_field needs to be provided in order to explicitly specify which /// field the boosting will be done on (Note, this will result in slower execution time). /// - [JsonProperty(PropertyName = "norm_field")] + [JsonProperty("norm_field")] string NormField { get; set; } } diff --git a/src/Nest/QueryDsl/Span/Containing/SpanContainingQuery.cs b/src/Nest/QueryDsl/Span/Containing/SpanContainingQuery.cs index a44e0139da9..76f909f97e8 100644 --- a/src/Nest/QueryDsl/Span/Containing/SpanContainingQuery.cs +++ b/src/Nest/QueryDsl/Span/Containing/SpanContainingQuery.cs @@ -7,10 +7,10 @@ namespace Nest [JsonConverter(typeof(ReadAsTypeJsonConverter))] public interface ISpanContainingQuery : ISpanSubQuery { - [JsonProperty(PropertyName = "little")] + [JsonProperty("little")] ISpanQuery Little { get; set; } - [JsonProperty(PropertyName = "big")] + [JsonProperty("big")] ISpanQuery Big { get; set; } } diff --git a/src/Nest/QueryDsl/Span/First/SpanFirstQuery.cs b/src/Nest/QueryDsl/Span/First/SpanFirstQuery.cs index a3af39ad402..af02740d554 100644 --- a/src/Nest/QueryDsl/Span/First/SpanFirstQuery.cs +++ b/src/Nest/QueryDsl/Span/First/SpanFirstQuery.cs @@ -7,10 +7,10 @@ namespace Nest [JsonConverter(typeof(ReadAsTypeJsonConverter>))] public interface ISpanFirstQuery : ISpanSubQuery { - [JsonProperty(PropertyName = "match")] + [JsonProperty("match")] ISpanQuery Match { get; set; } - [JsonProperty(PropertyName = "end")] + [JsonProperty("end")] int? End { get; set; } } @@ -24,11 +24,11 @@ public class SpanFirstQuery : QueryBase, ISpanFirstQuery internal static bool IsConditionless(ISpanFirstQuery q) => q.Match == null || q.Match.Conditionless; } - public class SpanFirstQueryDescriptor + public class SpanFirstQueryDescriptor : QueryDescriptorBase, ISpanFirstQuery> , ISpanFirstQuery where T : class { - protected override bool Conditionless => SpanFirstQuery.IsConditionless(this); + protected override bool Conditionless => SpanFirstQuery.IsConditionless(this); ISpanQuery ISpanFirstQuery.Match { get; set; } int? ISpanFirstQuery.End { get; set; } diff --git a/src/Nest/QueryDsl/Span/Near/SpanNearQuery.cs b/src/Nest/QueryDsl/Span/Near/SpanNearQuery.cs index 9fd869e588c..5eda9d2317c 100644 --- a/src/Nest/QueryDsl/Span/Near/SpanNearQuery.cs +++ b/src/Nest/QueryDsl/Span/Near/SpanNearQuery.cs @@ -9,17 +9,17 @@ namespace Nest [JsonConverter(typeof(ReadAsTypeJsonConverter>))] public interface ISpanNearQuery : ISpanSubQuery { - [JsonProperty(PropertyName = "clauses")] + [JsonProperty("clauses")] IEnumerable Clauses { get; set; } - [JsonProperty(PropertyName = "slop")] + [JsonProperty("slop")] int? Slop { get; set; } - [JsonProperty(PropertyName = "in_order")] + [JsonProperty("in_order")] bool? InOrder { get; set; } #pragma warning disable 618 - [JsonProperty(PropertyName = "collect_payloads")] + [JsonProperty("collect_payloads")] [Obsolete("Payloads will be loaded when needed")] bool? CollectPayloads { get; set; } #pragma warning restore 618 diff --git a/src/Nest/QueryDsl/Span/Not/SpanNotQuery.cs b/src/Nest/QueryDsl/Span/Not/SpanNotQuery.cs index 2797f760e12..7a017c814a9 100644 --- a/src/Nest/QueryDsl/Span/Not/SpanNotQuery.cs +++ b/src/Nest/QueryDsl/Span/Not/SpanNotQuery.cs @@ -7,19 +7,19 @@ namespace Nest [JsonConverter(typeof(ReadAsTypeJsonConverter))] public interface ISpanNotQuery : ISpanSubQuery { - [JsonProperty(PropertyName = "include")] + [JsonProperty("include")] ISpanQuery Include { get; set; } - [JsonProperty(PropertyName = "exclude")] + [JsonProperty("exclude")] ISpanQuery Exclude { get; set; } - [JsonProperty(PropertyName = "pre")] + [JsonProperty("pre")] int? Pre { get; set; } - [JsonProperty(PropertyName = "post")] + [JsonProperty("post")] int? Post { get; set; } - [JsonProperty(PropertyName = "dist")] + [JsonProperty("dist")] int? Dist { get; set; } } diff --git a/src/Nest/QueryDsl/Span/Or/SpanOrQuery.cs b/src/Nest/QueryDsl/Span/Or/SpanOrQuery.cs index 02b1e93d9ca..50b8f29a638 100644 --- a/src/Nest/QueryDsl/Span/Or/SpanOrQuery.cs +++ b/src/Nest/QueryDsl/Span/Or/SpanOrQuery.cs @@ -9,7 +9,7 @@ namespace Nest [JsonConverter(typeof(ReadAsTypeJsonConverter))] public interface ISpanOrQuery : ISpanSubQuery { - [JsonProperty(PropertyName = "clauses")] + [JsonProperty("clauses")] IEnumerable Clauses { get; set; } } @@ -22,7 +22,7 @@ public class SpanOrQuery : QueryBase, ISpanOrQuery internal static bool IsConditionless(ISpanOrQuery q) => !q.Clauses.HasAny() || q.Clauses.Cast().All(qq => qq.Conditionless); } - public class SpanOrQueryDescriptor + public class SpanOrQueryDescriptor : QueryDescriptorBase, ISpanOrQuery> , ISpanOrQuery where T : class { diff --git a/src/Nest/QueryDsl/Span/Within/SpanWithinQuery.cs b/src/Nest/QueryDsl/Span/Within/SpanWithinQuery.cs index f826e449f19..030774772ff 100644 --- a/src/Nest/QueryDsl/Span/Within/SpanWithinQuery.cs +++ b/src/Nest/QueryDsl/Span/Within/SpanWithinQuery.cs @@ -7,10 +7,10 @@ namespace Nest [JsonConverter(typeof(ReadAsTypeJsonConverter))] public interface ISpanWithinQuery : ISpanSubQuery { - [JsonProperty(PropertyName = "little")] + [JsonProperty("little")] ISpanQuery Little { get; set; } - [JsonProperty(PropertyName = "big")] + [JsonProperty("big")] ISpanQuery Big { get; set; } } diff --git a/src/Nest/QueryDsl/Specialized/MoreLikeThis/Like/LikeDocument.cs b/src/Nest/QueryDsl/Specialized/MoreLikeThis/Like/LikeDocument.cs index cd57cf7cf3e..1fff15332b5 100644 --- a/src/Nest/QueryDsl/Specialized/MoreLikeThis/Like/LikeDocument.cs +++ b/src/Nest/QueryDsl/Specialized/MoreLikeThis/Like/LikeDocument.cs @@ -7,25 +7,25 @@ namespace Nest [JsonConverter(typeof(ReadAsTypeJsonConverter>))] public interface ILikeDocument { - [JsonProperty(PropertyName = "_index")] + [JsonProperty("_index")] IndexName Index { get; set; } - [JsonProperty(PropertyName = "_type")] + [JsonProperty("_type")] TypeName Type { get; set; } - [JsonProperty(PropertyName = "_id")] + [JsonProperty("_id")] Id Id { get; set; } - [JsonProperty(PropertyName = "fields")] + [JsonProperty("fields")] Fields Fields { get; set; } - [JsonProperty(PropertyName = "_routing")] + [JsonProperty("_routing")] string Routing { get; set; } - [JsonProperty(PropertyName = "doc")] + [JsonProperty("doc")] object Document { get; set; } - [JsonProperty(PropertyName = "per_field_analyzer")] + [JsonProperty("per_field_analyzer")] IPerFieldAnalyzer PerFieldAnalyzer { get; set; } Type ClrType { get; } diff --git a/src/Nest/QueryDsl/Specialized/MoreLikeThis/MoreLikeThisQuery.cs b/src/Nest/QueryDsl/Specialized/MoreLikeThis/MoreLikeThisQuery.cs index d6b24248d82..24f81cefb19 100644 --- a/src/Nest/QueryDsl/Specialized/MoreLikeThis/MoreLikeThisQuery.cs +++ b/src/Nest/QueryDsl/Specialized/MoreLikeThis/MoreLikeThisQuery.cs @@ -9,46 +9,46 @@ namespace Nest [JsonConverter(typeof(ReadAsTypeJsonConverter>))] public interface IMoreLikeThisQuery : IQuery { - [JsonProperty(PropertyName = "fields")] + [JsonProperty("fields")] Fields Fields { get; set; } - [JsonProperty(PropertyName = "like")] + [JsonProperty("like")] IEnumerable Like { get; set; } - [JsonProperty(PropertyName = "unlike")] + [JsonProperty("unlike")] IEnumerable Unlike { get; set; } - [JsonProperty(PropertyName = "max_query_terms")] + [JsonProperty("max_query_terms")] int? MaxQueryTerms { get; set; } - [JsonProperty(PropertyName = "min_term_freq")] + [JsonProperty("min_term_freq")] int? MinTermFrequency { get; set; } - [JsonProperty(PropertyName = "min_doc_freq")] + [JsonProperty("min_doc_freq")] int? MinDocumentFrequency { get; set; } - [JsonProperty(PropertyName = "max_doc_freq")] + [JsonProperty("max_doc_freq")] int? MaxDocumentFrequency { get; set; } - [JsonProperty(PropertyName = "min_word_len")] + [JsonProperty("min_word_len")] int? MinWordLength { get; set; } - [JsonProperty(PropertyName = "max_word_len")] + [JsonProperty("max_word_len")] int? MaxWordLength { get; set; } - [JsonProperty(PropertyName = "stop_words")] + [JsonProperty("stop_words")] StopWords StopWords { get; set; } - [JsonProperty(PropertyName = "analyzer")] + [JsonProperty("analyzer")] string Analyzer { get; set; } - [JsonProperty(PropertyName = "minimum_should_match")] + [JsonProperty("minimum_should_match")] MinimumShouldMatch MinimumShouldMatch { get; set; } - [JsonProperty(PropertyName = "boost_terms")] + [JsonProperty("boost_terms")] double? BoostTerms { get; set; } - [JsonProperty(PropertyName = "include")] + [JsonProperty("include")] bool? Include { get; set; } diff --git a/src/Nest/QueryDsl/Specialized/Percolate/PercolateQuery.cs b/src/Nest/QueryDsl/Specialized/Percolate/PercolateQuery.cs index b840eaa213e..0a45f82ddf7 100644 --- a/src/Nest/QueryDsl/Specialized/Percolate/PercolateQuery.cs +++ b/src/Nest/QueryDsl/Specialized/Percolate/PercolateQuery.cs @@ -20,56 +20,56 @@ public interface IPercolateQuery : IQuery /// /// The type / mapping of the document to percolate. This is a required parameter. /// - [JsonProperty(PropertyName = "document_type")] + [JsonProperty("document_type")] [Obsolete("Deprecated in 6.x, types are gone from indices created as of Elasticsearch 6.x")] TypeName DocumentType { get; set; } /// /// The source of the document to percolate. /// - [JsonProperty(PropertyName = "document")] + [JsonProperty("document")] object Document { get; set; } /// /// The id of the document to fetch for percolation. /// Can be specified to percolate an existing document instead of providing /// - [JsonProperty(PropertyName = "id")] + [JsonProperty("id")] Id Id { get; set; } /// /// The index the document resides in for percolation. /// Can be specified to percolate an existing document instead of providing /// - [JsonProperty(PropertyName = "index")] + [JsonProperty("index")] IndexName Index { get; set; } /// /// The type of the document to fetch for percolation. /// Can be specified to percolate an existing document instead of providing /// - [JsonProperty(PropertyName = "type")] + [JsonProperty("type")] TypeName Type { get; set; } /// /// Routing to be used to fetch the document to percolate. /// Can be specified to percolate an existing document instead of providing /// - [JsonProperty(PropertyName = "routing")] + [JsonProperty("routing")] string Routing { get; set; } /// /// Preference to be used to fetch the document to percolate. /// Can be specified to percolate an existing document instead of providing /// - [JsonProperty(PropertyName = "preference")] + [JsonProperty("preference")] string Preference { get; set; } /// /// The expected version of the document to be fetched for percolation. /// Can be specified to percolate an existing document instead of providing /// - [JsonProperty(PropertyName = "version")] + [JsonProperty("version")] long? Version { get; set; } } diff --git a/src/Nest/QueryDsl/Specialized/Script/ScriptQuery.cs b/src/Nest/QueryDsl/Specialized/Script/ScriptQuery.cs index 7741de6cd1d..bac219f7d4f 100644 --- a/src/Nest/QueryDsl/Specialized/Script/ScriptQuery.cs +++ b/src/Nest/QueryDsl/Specialized/Script/ScriptQuery.cs @@ -10,24 +10,24 @@ namespace Nest [JsonObject(MemberSerialization = MemberSerialization.OptIn)] public interface IScriptQuery : IQuery { - [JsonProperty(PropertyName = "source")] + [JsonProperty("source")] string Source { get; set; } [Obsolete("Inline is being deprecated for Source and will be removed in Elasticsearch 7.0")] [JsonIgnore] string Inline { get; set; } - [JsonProperty(PropertyName = "id")] + [JsonProperty("id")] Id Id { get; set; } [JsonProperty("file")] string File { get; set; } - [JsonProperty(PropertyName = "params")] + [JsonProperty("params")] [JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter))] Dictionary Params { get; set; } - [JsonProperty(PropertyName = "lang")] + [JsonProperty("lang")] string Lang { get; set; } } diff --git a/src/Nest/QueryDsl/TermLevel/Ids/IdsQuery.cs b/src/Nest/QueryDsl/TermLevel/Ids/IdsQuery.cs index 81c5284437b..e1b768a8b7e 100644 --- a/src/Nest/QueryDsl/TermLevel/Ids/IdsQuery.cs +++ b/src/Nest/QueryDsl/TermLevel/Ids/IdsQuery.cs @@ -9,10 +9,10 @@ namespace Nest [JsonConverter(typeof(ReadAsTypeJsonConverter))] public interface IIdsQuery : IQuery { - [JsonProperty(PropertyName = "type")] + [JsonProperty("type")] Types Types { get; set; } - [JsonProperty(PropertyName = "values")] + [JsonProperty("values")] IEnumerable Values { get; set; } } diff --git a/src/Nest/QueryDsl/TermLevel/Regexp/RegexpQuery.cs b/src/Nest/QueryDsl/TermLevel/Regexp/RegexpQuery.cs index ff7a44f4e01..9daf91b6610 100644 --- a/src/Nest/QueryDsl/TermLevel/Regexp/RegexpQuery.cs +++ b/src/Nest/QueryDsl/TermLevel/Regexp/RegexpQuery.cs @@ -12,7 +12,7 @@ public interface IRegexpQuery : IFieldNameQuery [JsonProperty("flags")] string Flags { get; set; } - [JsonProperty(PropertyName = "max_determinized_states")] + [JsonProperty("max_determinized_states")] int? MaximumDeterminizedStates { get; set; } } @@ -27,7 +27,7 @@ public class RegexpQuery : FieldNameQueryBase, IRegexpQuery internal static bool IsConditionless(IRegexpQuery q) => q.Field.IsConditionless() || q.Value.IsNullOrEmpty(); } - public class RegexpQueryDescriptor + public class RegexpQueryDescriptor : FieldNameQueryDescriptorBase, IRegexpQuery, T> , IRegexpQuery where T : class { diff --git a/src/Nest/QueryDsl/TermLevel/Type/TypeQuery.cs b/src/Nest/QueryDsl/TermLevel/Type/TypeQuery.cs index a2c4ce622f3..6956689495e 100644 --- a/src/Nest/QueryDsl/TermLevel/Type/TypeQuery.cs +++ b/src/Nest/QueryDsl/TermLevel/Type/TypeQuery.cs @@ -6,7 +6,7 @@ namespace Nest [JsonObject(MemberSerialization = MemberSerialization.OptIn)] public interface ITypeQuery : IQuery { - [JsonProperty(PropertyName = "value")] + [JsonProperty("value")] TypeName Value { get; set; } } @@ -18,14 +18,14 @@ public class TypeQuery : QueryBase, ITypeQuery internal override void InternalWrapInContainer(IQueryContainer c) => c.Type = this; internal static bool IsConditionless(ITypeQuery q) => q.Value.IsConditionless(); } - - public class TypeQueryDescriptor + + public class TypeQueryDescriptor : QueryDescriptorBase , ITypeQuery { protected override bool Conditionless => TypeQuery.IsConditionless(this); - [JsonProperty(PropertyName = "value")] + [JsonProperty("value")] TypeName ITypeQuery.Value { get; set; } public TypeQueryDescriptor Value() => Assign(a => a.Value = typeof(T)); diff --git a/src/Nest/Search/Count/CountResponse.cs b/src/Nest/Search/Count/CountResponse.cs index 34775cc9d7c..e18a27ce59b 100644 --- a/src/Nest/Search/Count/CountResponse.cs +++ b/src/Nest/Search/Count/CountResponse.cs @@ -5,16 +5,16 @@ namespace Nest public interface ICountResponse : IResponse { long Count { get; } - ShardsMetaData Shards { get; } + ShardsMetadata Shards { get; } } [JsonObject] public class CountResponse : ResponseBase, ICountResponse { - [JsonProperty(PropertyName = "count")] + [JsonProperty("count")] public long Count { get; internal set; } - [JsonProperty(PropertyName = "_shards")] - public ShardsMetaData Shards { get; internal set; } + [JsonProperty("_shards")] + public ShardsMetadata Shards { get; internal set; } } } diff --git a/src/Nest/Search/Explain/ExplainGet.cs b/src/Nest/Search/Explain/ExplainGet.cs index c95a0d90612..afe649b2be9 100644 --- a/src/Nest/Search/Explain/ExplainGet.cs +++ b/src/Nest/Search/Explain/ExplainGet.cs @@ -6,13 +6,13 @@ namespace Nest [JsonObject] public class InstantGet where T : class { - [JsonProperty(PropertyName = "found")] + [JsonProperty("found")] public bool Found { get; internal set; } - [JsonProperty(PropertyName = "_source")] + [JsonProperty("_source")] public T Source { get; internal set; } - [JsonProperty(PropertyName = "fields")] + [JsonProperty("fields")] public FieldValues Fields { get; internal set; } } diff --git a/src/Nest/Search/Explain/ExplainResponse.cs b/src/Nest/Search/Explain/ExplainResponse.cs index c3917e843c1..71a40ef01ed 100644 --- a/src/Nest/Search/Explain/ExplainResponse.cs +++ b/src/Nest/Search/Explain/ExplainResponse.cs @@ -15,13 +15,13 @@ public interface IExplainResponse : IResponse public class ExplainResponse : ResponseBase, IExplainResponse where T : class { - [JsonProperty(PropertyName = "matched")] + [JsonProperty("matched")] public bool Matched { get; internal set; } - [JsonProperty(PropertyName = "explanation")] + [JsonProperty("explanation")] public ExplanationDetail Explanation { get; internal set; } - [JsonProperty(PropertyName = "get")] + [JsonProperty("get")] public InstantGet Get { get; internal set; } } -} \ No newline at end of file +} diff --git a/src/Nest/Search/Explain/Explanation.cs b/src/Nest/Search/Explain/Explanation.cs index c069e0b1396..299bd949ed0 100644 --- a/src/Nest/Search/Explain/Explanation.cs +++ b/src/Nest/Search/Explain/Explanation.cs @@ -6,12 +6,12 @@ namespace Nest [JsonObject] public class Explanation { - [JsonProperty(PropertyName = "value")] + [JsonProperty("value")] public float Value { get; internal set; } - [JsonProperty(PropertyName = "description")] + [JsonProperty("description")] public string Description { get; internal set; } - [JsonProperty(PropertyName = "details")] + [JsonProperty("details")] public IReadOnlyCollection Details { get; internal set; } = EmptyReadOnly.Collection; } } diff --git a/src/Nest/Search/Explain/ExplanationDetail.cs b/src/Nest/Search/Explain/ExplanationDetail.cs index eb5968b2e50..2699b7a010d 100644 --- a/src/Nest/Search/Explain/ExplanationDetail.cs +++ b/src/Nest/Search/Explain/ExplanationDetail.cs @@ -6,13 +6,13 @@ namespace Nest [JsonObject] public class ExplanationDetail { - [JsonProperty(PropertyName = "value")] + [JsonProperty("value")] public float Value { get; internal set; } - [JsonProperty(PropertyName = "description")] + [JsonProperty("description")] public string Description { get; internal set; } - [JsonProperty(PropertyName = "details")] + [JsonProperty("details")] public IReadOnlyCollection Details { get; internal set; } = EmptyReadOnly.Collection; } } diff --git a/src/Nest/Search/FieldCapabilities/FieldCapabilitiesResponse.cs b/src/Nest/Search/FieldCapabilities/FieldCapabilitiesResponse.cs index d8d0334fc66..5bc55e263b6 100644 --- a/src/Nest/Search/FieldCapabilities/FieldCapabilitiesResponse.cs +++ b/src/Nest/Search/FieldCapabilities/FieldCapabilitiesResponse.cs @@ -12,7 +12,7 @@ public interface IFieldCapabilitiesResponse : IResponse public class FieldCapabilitiesResponse : ResponseBase, IFieldCapabilitiesResponse { - public ShardsMetaData Shards { get; internal set; } + public ShardsMetadata Shards { get; internal set; } public IReadOnlyDictionary Fields { get; internal set; } = EmptyReadOnly.Dictionary; } diff --git a/src/Nest/Search/Search/Highlighting/Highlight.cs b/src/Nest/Search/Search/Highlighting/Highlight.cs index a9a637575ed..bef1cd018fa 100644 --- a/src/Nest/Search/Search/Highlighting/Highlight.cs +++ b/src/Nest/Search/Search/Highlighting/Highlight.cs @@ -91,7 +91,7 @@ public interface IHighlight [JsonProperty("tags_schema")] string TagsSchema { get; set; } - [JsonProperty(PropertyName = "fields")] + [JsonProperty("fields")] [JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter))] Dictionary Fields { get; set; } diff --git a/src/Nest/Search/Search/Hits/HitsMetaData.cs b/src/Nest/Search/Search/Hits/HitsMetaData.cs index ba906b39bd7..152dfb2b7b4 100644 --- a/src/Nest/Search/Search/Hits/HitsMetaData.cs +++ b/src/Nest/Search/Search/Hits/HitsMetaData.cs @@ -4,7 +4,7 @@ namespace Nest { [JsonObject] - public class HitsMetaData where T : class + public class HitsMetadata where T : class { [JsonProperty("total")] public long Total { get; internal set; } diff --git a/src/Nest/Search/Search/Hits/InnerHitsMetaData.cs b/src/Nest/Search/Search/Hits/InnerHitsMetaData.cs index b84053476d0..a5cc0357a07 100644 --- a/src/Nest/Search/Search/Hits/InnerHitsMetaData.cs +++ b/src/Nest/Search/Search/Hits/InnerHitsMetaData.cs @@ -4,7 +4,7 @@ namespace Nest { - public class InnerHitsMetaData + public class InnerHitsMetadata { [JsonProperty("total")] public long Total { get; internal set; } @@ -22,4 +22,4 @@ public IEnumerable Documents() where T : class return this.Hits.Select(hit => hit.Source.As()).ToList(); } } -} \ No newline at end of file +} diff --git a/src/Nest/Search/Search/Hits/InnerHitsResult.cs b/src/Nest/Search/Search/Hits/InnerHitsResult.cs index bc76e7d0dd9..ae5da3d3a94 100644 --- a/src/Nest/Search/Search/Hits/InnerHitsResult.cs +++ b/src/Nest/Search/Search/Hits/InnerHitsResult.cs @@ -7,14 +7,14 @@ namespace Nest public class InnerHitsResult { [JsonProperty("hits")] - public InnerHitsMetaData Hits { get; internal set; } + public InnerHitsMetadata Hits { get; internal set; } /// /// Retrieve documents as a strongly typed /// collection /// /// The hits document type - public IEnumerable Documents() where T : class => + public IEnumerable Documents() where T : class => this.Hits == null ? Enumerable.Empty() : this.Hits.Documents(); } -} \ No newline at end of file +} diff --git a/src/Nest/Search/Search/InnerHits/InnerHits.cs b/src/Nest/Search/Search/InnerHits/InnerHits.cs index 42f413b17bc..be638d71ae8 100644 --- a/src/Nest/Search/Search/InnerHits/InnerHits.cs +++ b/src/Nest/Search/Search/InnerHits/InnerHits.cs @@ -18,22 +18,22 @@ public interface IInnerHits [JsonProperty("size")] int? Size { get; set; } - [JsonProperty(PropertyName = "sort")] + [JsonProperty("sort")] IList Sort { get; set; } - [JsonProperty(PropertyName = "highlight")] + [JsonProperty("highlight")] IHighlight Highlight { get; set; } - [JsonProperty(PropertyName = "explain")] + [JsonProperty("explain")] bool? Explain { get; set; } - [JsonProperty(PropertyName = "_source")] + [JsonProperty("_source")] Union Source { get; set; } - [JsonProperty(PropertyName = "version")] + [JsonProperty("version")] bool? Version { get; set; } - [JsonProperty(PropertyName = "script_fields")] + [JsonProperty("script_fields")] IScriptFields ScriptFields { get; set; } } diff --git a/src/Nest/Search/Search/SearchRequest.cs b/src/Nest/Search/Search/SearchRequest.cs index 870e24f8b7e..a9ed01159e8 100644 --- a/src/Nest/Search/Search/SearchRequest.cs +++ b/src/Nest/Search/Search/SearchRequest.cs @@ -263,12 +263,12 @@ public SearchDescriptor Source(Func, ISourceFilter> /// /// Enables explanation for each hit on how its score was computed. - /// (Use .DocumentsWithMetaData on the return results) + /// (Use .DocumentsWithMetadata on the return results) /// public SearchDescriptor Explain(bool explain = true) => Assign(a => a.Explain = explain); /// - /// Returns a version for each search hit. (Use .DocumentsWithMetaData on the return results) + /// Returns a version for each search hit. (Use .DocumentsWithMetadata on the return results) /// public SearchDescriptor Version(bool version = true) => Assign(a => a.Version = version); diff --git a/src/Nest/Search/Search/SearchResponse.cs b/src/Nest/Search/Search/SearchResponse.cs index ce96fa62a08..d54962bce44 100644 --- a/src/Nest/Search/Search/SearchResponse.cs +++ b/src/Nest/Search/Search/SearchResponse.cs @@ -11,12 +11,12 @@ public interface ISearchResponse : IResponse where T : class /// /// Gets the meta data about the shards on which the search query was executed. /// - ShardsMetaData Shards { get; } + ShardsMetadata Shards { get; } /// /// Gets the meta data about the hits that match the search query criteria. /// - HitsMetaData HitsMetaData { get; } + HitsMetadata HitsMetadata { get; } /// /// Gets the collection of aggregations @@ -109,14 +109,14 @@ public class SearchResponse : ResponseBase, ISearchResponse where T : clas internal ServerError MultiSearchError { get; set; } protected override IApiCallDetails ApiCall => MultiSearchError != null ? new ApiCallDetailsOverride(base.ApiCall, MultiSearchError) : base.ApiCall; - [JsonProperty(PropertyName = "_shards")] - public ShardsMetaData Shards { get; internal set; } + [JsonProperty("_shards")] + public ShardsMetadata Shards { get; internal set; } - [JsonProperty(PropertyName = "aggregations")] + [JsonProperty("aggregations")] [JsonConverter(typeof(VerbatimDictionaryKeysJsonConverter))] public IReadOnlyDictionary Aggregations { get; internal set; } = EmptyReadOnly.Dictionary; - [JsonProperty(PropertyName = "profile")] + [JsonProperty("profile")] public Profile Profile { get; internal set; } private AggregationsHelper _agg; @@ -124,11 +124,11 @@ public class SearchResponse : ResponseBase, ISearchResponse where T : clas [JsonIgnore] public AggregationsHelper Aggs => _agg ?? (_agg = new AggregationsHelper(this.Aggregations)); - [JsonProperty(PropertyName = "suggest")] + [JsonProperty("suggest")] public IReadOnlyDictionary[]> Suggest { get; internal set; } = EmptyReadOnly[]>.Dictionary; - [JsonProperty(PropertyName = "took")] + [JsonProperty("took")] public long Took { get; internal set; } [JsonProperty("timed_out")] @@ -140,20 +140,20 @@ public class SearchResponse : ResponseBase, ISearchResponse where T : clas /// /// Only set when search type = scan and scroll specified /// - [JsonProperty(PropertyName = "_scroll_id")] + [JsonProperty("_scroll_id")] public string ScrollId { get; internal set; } - [JsonProperty(PropertyName = "hits")] - public HitsMetaData HitsMetaData { get; internal set; } + [JsonProperty("hits")] + public HitsMetadata HitsMetadata { get; internal set; } - [JsonProperty(PropertyName = "num_reduce_phases")] + [JsonProperty("num_reduce_phases")] public long NumberOfReducePhases { get; internal set; } [JsonIgnore] - public long Total => this.HitsMetaData?.Total ?? 0; + public long Total => this.HitsMetadata?.Total ?? 0; [JsonIgnore] - public double MaxScore => this.HitsMetaData?.MaxScore ?? 0; + public double MaxScore => this.HitsMetadata?.MaxScore ?? 0; private IReadOnlyCollection _documents; @@ -168,7 +168,7 @@ public class SearchResponse : ResponseBase, ISearchResponse where T : clas [JsonIgnore] public IReadOnlyCollection> Hits => - this._hits ?? (this._hits = this.HitsMetaData?.Hits ?? EmptyReadOnly>.Collection); + this._hits ?? (this._hits = this.HitsMetadata?.Hits ?? EmptyReadOnly>.Collection); private IReadOnlyCollection _fields; diff --git a/src/Nest/Search/Search/Sort/SortGeoDistance.cs b/src/Nest/Search/Search/Sort/SortGeoDistance.cs index 98a103fcfe9..d35027ffaa6 100644 --- a/src/Nest/Search/Search/Sort/SortGeoDistance.cs +++ b/src/Nest/Search/Search/Sort/SortGeoDistance.cs @@ -10,10 +10,10 @@ public interface IGeoDistanceSort : ISort Field Field { get; set; } IEnumerable Points { get; set; } - [JsonProperty(PropertyName = "unit")] + [JsonProperty("unit")] DistanceUnit? GeoUnit { get; set; } - [JsonProperty(PropertyName = "distance_type")] + [JsonProperty("distance_type")] GeoDistanceType? DistanceType { get; set; } } @@ -27,7 +27,7 @@ public class GeoDistanceSort : SortBase, IGeoDistanceSort } - public class SortGeoDistanceDescriptor : SortDescriptorBase, IGeoDistanceSort, T>, IGeoDistanceSort + public class SortGeoDistanceDescriptor : SortDescriptorBase, IGeoDistanceSort, T>, IGeoDistanceSort where T : class { diff --git a/src/Nest/Search/Search/Sort/SortScript.cs b/src/Nest/Search/Search/Sort/SortScript.cs index 1e2faf46de9..07af4b267af 100644 --- a/src/Nest/Search/Search/Sort/SortScript.cs +++ b/src/Nest/Search/Search/Sort/SortScript.cs @@ -5,10 +5,10 @@ namespace Nest { public interface IScriptSort : ISort { - [JsonProperty(PropertyName = "type")] + [JsonProperty("type")] string Type { get; set; } - [JsonProperty(PropertyName = "script")] + [JsonProperty("script")] IScript Script { get; set; } } @@ -22,7 +22,7 @@ public class ScriptSort : SortBase, IScriptSort public string Language { get; set; } } - public class SortScriptDescriptor : SortDescriptorBase, IScriptSort, T>, IScriptSort + public class SortScriptDescriptor : SortDescriptorBase, IScriptSort, T>, IScriptSort where T : class { protected override Field SortKey => "_script"; diff --git a/src/Nest/Search/Suggesters/CompletionSuggester/FuzzySuggest.cs b/src/Nest/Search/Suggesters/CompletionSuggester/FuzzySuggest.cs index 3d335671165..f81bb730f9d 100644 --- a/src/Nest/Search/Suggesters/CompletionSuggester/FuzzySuggest.cs +++ b/src/Nest/Search/Suggesters/CompletionSuggester/FuzzySuggest.cs @@ -6,19 +6,19 @@ namespace Nest [JsonConverter(typeof(ReadAsTypeJsonConverter))] public interface IFuzzySuggester { - [JsonProperty(PropertyName = "transpositions")] + [JsonProperty("transpositions")] bool? Transpositions { get; set; } - [JsonProperty(PropertyName = "min_length")] + [JsonProperty("min_length")] int? MinLength { get; set; } - [JsonProperty(PropertyName = "prefix_length")] + [JsonProperty("prefix_length")] int? PrefixLength { get; set; } - [JsonProperty(PropertyName = "fuzziness")] + [JsonProperty("fuzziness")] IFuzziness Fuzziness { get; set; } - [JsonProperty(PropertyName = "unicode_aware")] + [JsonProperty("unicode_aware")] bool? UnicodeAware { get; set; } } @@ -31,7 +31,7 @@ public class FuzzySuggester : IFuzzySuggester public bool? UnicodeAware { get; set; } } - public class FuzzySuggestDescriptor : DescriptorBase, IFuzzySuggester>, IFuzzySuggester + public class FuzzySuggestDescriptor : DescriptorBase, IFuzzySuggester>, IFuzzySuggester where T : class { bool? IFuzzySuggester.Transpositions { get; set; } diff --git a/src/Nest/Search/Suggesters/PhraseSuggester/DirectGenerator.cs b/src/Nest/Search/Suggesters/PhraseSuggester/DirectGenerator.cs index 62a8fc071b3..4d38aee9e2c 100644 --- a/src/Nest/Search/Suggesters/PhraseSuggester/DirectGenerator.cs +++ b/src/Nest/Search/Suggesters/PhraseSuggester/DirectGenerator.cs @@ -10,38 +10,38 @@ namespace Nest [JsonConverter(typeof(ReadAsTypeJsonConverter))] public interface IDirectGenerator { - [JsonProperty(PropertyName = "field")] + [JsonProperty("field")] Field Field { get; set; } - [JsonProperty(PropertyName = "size")] + [JsonProperty("size")] int? Size { get; set; } - [JsonProperty(PropertyName = "prefix_length")] + [JsonProperty("prefix_length")] int? PrefixLength { get; set; } - [JsonProperty(PropertyName = "suggest_mode")] + [JsonProperty("suggest_mode")] [JsonConverter(typeof(StringEnumConverter))] SuggestMode? SuggestMode { get; set; } - [JsonProperty(PropertyName = "min_word_length")] + [JsonProperty("min_word_length")] int? MinWordLength { get; set; } - [JsonProperty(PropertyName = "max_edits")] + [JsonProperty("max_edits")] int? MaxEdits { get; set; } - [JsonProperty(PropertyName = "max_inspections")] + [JsonProperty("max_inspections")] decimal? MaxInspections { get; set; } - [JsonProperty(PropertyName = "min_doc_freq")] + [JsonProperty("min_doc_freq")] decimal? MinDocFrequency { get; set; } - [JsonProperty(PropertyName = "max_term_freq")] + [JsonProperty("max_term_freq")] decimal? MaxTermFrequency { get; set; } - [JsonProperty(PropertyName = "pre_filter")] + [JsonProperty("pre_filter")] string PreFilter { get; set; } - [JsonProperty(PropertyName = "post_filter")] + [JsonProperty("post_filter")] string PostFilter { get; set; } } diff --git a/src/Nest/Search/Suggesters/PhraseSuggester/PhraseSuggestCollate.cs b/src/Nest/Search/Suggesters/PhraseSuggester/PhraseSuggestCollate.cs index da28bd30669..d6aba8633ae 100644 --- a/src/Nest/Search/Suggesters/PhraseSuggester/PhraseSuggestCollate.cs +++ b/src/Nest/Search/Suggesters/PhraseSuggester/PhraseSuggestCollate.cs @@ -8,10 +8,10 @@ namespace Nest [JsonConverter(typeof(ReadAsTypeJsonConverter))] public interface IPhraseSuggestCollate { - [JsonProperty(PropertyName = "query")] + [JsonProperty("query")] ITemplateQuery Query { get; set; } - [JsonProperty(PropertyName = "prune")] + [JsonProperty("prune")] bool? Prune { get; set; } } diff --git a/src/Nest/Search/Suggesters/PhraseSuggester/PhraseSuggestHighlight.cs b/src/Nest/Search/Suggesters/PhraseSuggester/PhraseSuggestHighlight.cs index f508b0859e4..fce910de237 100644 --- a/src/Nest/Search/Suggesters/PhraseSuggester/PhraseSuggestHighlight.cs +++ b/src/Nest/Search/Suggesters/PhraseSuggester/PhraseSuggestHighlight.cs @@ -5,10 +5,10 @@ namespace Nest [JsonObject(MemberSerialization = MemberSerialization.OptIn)] public interface IPhraseSuggestHighlight { - [JsonProperty(PropertyName = "pre_tag")] + [JsonProperty("pre_tag")] string PreTag { get; set; } - [JsonProperty(PropertyName = "post_tag")] + [JsonProperty("post_tag")] string PostTag { get; set; } } diff --git a/src/Nest/Search/Validate/ValidateQueryResponse.cs b/src/Nest/Search/Validate/ValidateQueryResponse.cs index 0856afde43b..573d7594494 100644 --- a/src/Nest/Search/Validate/ValidateQueryResponse.cs +++ b/src/Nest/Search/Validate/ValidateQueryResponse.cs @@ -7,23 +7,23 @@ namespace Nest public interface IValidateQueryResponse : IResponse { bool Valid { get; } - ShardsMetaData Shards { get; } + ShardsMetadata Shards { get; } IReadOnlyCollection Explanations { get; } } [JsonObject] public class ValidateQueryResponse : ResponseBase, IValidateQueryResponse { - [JsonProperty(PropertyName = "valid")] + [JsonProperty("valid")] public bool Valid { get; internal set; } - [JsonProperty(PropertyName = "_shards")] - public ShardsMetaData Shards { get; internal set; } + [JsonProperty("_shards")] + public ShardsMetadata Shards { get; internal set; } /// /// Gets the explanations if Explain() was set. /// - [JsonProperty(PropertyName = "explanations")] + [JsonProperty("explanations")] public IReadOnlyCollection Explanations { get; internal set; } = EmptyReadOnly.Collection; } } diff --git a/src/Nest/Search/Validate/ValidationExplanation.cs b/src/Nest/Search/Validate/ValidationExplanation.cs index a21928599df..8714a9933f0 100644 --- a/src/Nest/Search/Validate/ValidationExplanation.cs +++ b/src/Nest/Search/Validate/ValidationExplanation.cs @@ -5,16 +5,16 @@ namespace Nest [JsonObject] public class ValidationExplanation { - [JsonProperty(PropertyName = "index")] + [JsonProperty("index")] public string Index { get; internal set; } - [JsonProperty(PropertyName = "valid")] + [JsonProperty("valid")] public bool Valid { get; internal set; } - - [JsonProperty(PropertyName = "error")] + + [JsonProperty("error")] public string Error { get; internal set; } - - [JsonProperty(PropertyName = "explanation")] + + [JsonProperty("explanation")] public string Explanation { get; internal set; } } } diff --git a/src/Tests/Cluster/NodesUsage/NodesUsageApiTests.cs b/src/Tests/Cluster/NodesUsage/NodesUsageApiTests.cs index 9e48c2a890e..bd036461122 100644 --- a/src/Tests/Cluster/NodesUsage/NodesUsageApiTests.cs +++ b/src/Tests/Cluster/NodesUsage/NodesUsageApiTests.cs @@ -29,10 +29,10 @@ protected override void ExpectResponse(INodesUsageResponse response) { response.ClusterName.Should().NotBeEmpty(); - response.NodesMetaData.Should().NotBeNull(); - response.NodesMetaData.Total.Should().Be(1); - response.NodesMetaData.Successful.Should().Be(1); - response.NodesMetaData.Failed.Should().Be(0); + response.NodesMetadata.Should().NotBeNull(); + response.NodesMetadata.Total.Should().Be(1); + response.NodesMetadata.Successful.Should().Be(1); + response.NodesMetadata.Failed.Should().Be(0); response.Nodes.Should().NotBeNull(); response.Nodes.Should().HaveCount(1); diff --git a/src/Tests/Cluster/NodesUsage/NodesUsageUnitTests.cs b/src/Tests/Cluster/NodesUsage/NodesUsageUnitTests.cs index 78f8f8988c2..f39292e1e6d 100644 --- a/src/Tests/Cluster/NodesUsage/NodesUsageUnitTests.cs +++ b/src/Tests/Cluster/NodesUsage/NodesUsageUnitTests.cs @@ -43,10 +43,10 @@ public void ShouldDeserialize() response.ClusterName.Should().Be("my_cluster"); - response.NodesMetaData.Should().NotBeNull(); - response.NodesMetaData.Total.Should().Be(1); - response.NodesMetaData.Successful.Should().Be(1); - response.NodesMetaData.Failed.Should().Be(0); + response.NodesMetadata.Should().NotBeNull(); + response.NodesMetadata.Total.Should().Be(1); + response.NodesMetadata.Successful.Should().Be(1); + response.NodesMetadata.Failed.Should().Be(0); response.Nodes.Should().NotBeNull(); response.Nodes.Should().HaveCount(1); diff --git a/src/Tests/Search/Search/Collapsing/FieldCollapseUsageTests.cs b/src/Tests/Search/Search/Collapsing/FieldCollapseUsageTests.cs index 155b00f962c..42998cc1320 100644 --- a/src/Tests/Search/Search/Collapsing/FieldCollapseUsageTests.cs +++ b/src/Tests/Search/Search/Collapsing/FieldCollapseUsageTests.cs @@ -63,7 +63,7 @@ public FieldCollapseUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : b protected override void ExpectResponse(ISearchResponse response) { var numberOfStates = Enum.GetValues(typeof(StateOfBeing)).Length; - response.HitsMetaData.Total.Should().BeGreaterThan(numberOfStates); + response.HitsMetadata.Total.Should().BeGreaterThan(numberOfStates); response.Hits.Count.Should().Be(numberOfStates); foreach (var hit in response.Hits) { diff --git a/src/Tests/Search/WritingQueries.doc.cs b/src/Tests/Search/WritingQueries.doc.cs index 930c836c603..2545521f0a4 100644 --- a/src/Tests/Search/WritingQueries.doc.cs +++ b/src/Tests/Search/WritingQueries.doc.cs @@ -460,13 +460,13 @@ public void GettingDocuments() /** * `.Documents` is a convenient shorthand for */ - searchResponse.HitsMetaData.Hits.Select(h => h.Source); + searchResponse.HitsMetadata.Hits.Select(h => h.Source); /** * and it's possible to retrieve other metadata about each hit from the hits collection. Here's * an example that retrieves the highlights for a hit, when using <> */ - var highlights = searchResponse.HitsMetaData.Hits.Select(h => h + var highlights = searchResponse.HitsMetadata.Hits.Select(h => h .Highlights // <1> Get the highlights for the hit, when using highlighting ); }