Skip to content

Elasticsearch 6 tidy #2896

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 14, 2017
Merged

Elasticsearch 6 tidy #2896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Nest/Aggregations/Bucket/DateRange/DateRangeAggregation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ public interface IDateRangeAggregation : IBucketAggregation
[JsonProperty("format")]
string Format { get; set; }

[JsonProperty(PropertyName = "ranges")]
[JsonProperty("ranges")]
IEnumerable<IDateRangeExpression> Ranges { get; set; }

[JsonProperty(PropertyName = "time_zone")]
[JsonProperty("time_zone")]
string TimeZone { get; set; }
}

Expand Down
10 changes: 5 additions & 5 deletions src/Nest/Aggregations/Bucket/DateRange/DateRangeExpression.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
namespace Nest
{
[JsonConverter(typeof(ReadAsTypeJsonConverter<DateRangeExpression>))]
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; }
}

Expand All @@ -36,4 +36,4 @@ public class DateRangeExpressionDescriptor
string IDateRangeExpression.Key { get; set; }
public DateRangeExpressionDescriptor Key(string key) => Assign(a => a.Key = key);
}
}
}
2 changes: 1 addition & 1 deletion src/Nest/Aggregations/Bucket/GeoDistance/GeoDistanceAggregation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<IRange> Ranges { get; set; }
#pragma warning restore 618
Expand Down
8 changes: 4 additions & 4 deletions src/Nest/Aggregations/Bucket/IpRange/IpRange.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ namespace Nest
{
[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
[JsonConverter(typeof(ReadAsTypeJsonConverter<IpRange>))]
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; }
}

Expand Down
2 changes: 1 addition & 1 deletion src/Nest/Aggregations/Bucket/IpRange/IpRangeAggregation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public interface IIpRangeAggregation : IBucketAggregation
[JsonProperty("field")]
Field Field { get; set; }

[JsonProperty(PropertyName = "ranges")]
[JsonProperty("ranges")]
IEnumerable<IIpRange> Ranges { get; set; }
}

Expand Down
2 changes: 1 addition & 1 deletion src/Nest/Aggregations/Bucket/Range/RangeAggregation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public interface IRangeAggregation : IBucketAggregation
[JsonProperty("script")]
IScript Script { get; set; }

[JsonProperty(PropertyName = "ranges")]
[JsonProperty("ranges")]
#pragma warning disable 618
IEnumerable<IRange> Ranges { get; set; }
#pragma warning restore 618
Expand Down
4 changes: 2 additions & 2 deletions src/Nest/Analysis/Analyzers/AnalyzerBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
}

Expand Down
4 changes: 2 additions & 2 deletions src/Nest/Analysis/Normalizers/NormalizerBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
}

Expand Down
6 changes: 3 additions & 3 deletions src/Nest/Analysis/Tokenizers/TokenizerBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
}

Expand All @@ -19,7 +19,7 @@ public abstract class TokenizerBase : ITokenizer
public string Type { get; protected set; }
}

public abstract class TokenizerDescriptorBase<TTokenizer, TTokenizerInterface>
public abstract class TokenizerDescriptorBase<TTokenizer, TTokenizerInterface>
: DescriptorBase<TTokenizer, TTokenizerInterface>, ITokenizer
where TTokenizer : TokenizerDescriptorBase<TTokenizer, TTokenizerInterface>, TTokenizerInterface
where TTokenizerInterface : class, ITokenizer
Expand Down
22 changes: 11 additions & 11 deletions src/Nest/Cluster/ClusterHealth/ClusterHealthResponse.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<string, IndexHealthStats>))]
public IReadOnlyDictionary<string, IndexHealthStats> Indices { get; internal set; } = EmptyReadOnly<string, IndexHealthStats>.Dictionary;
}
Expand Down
18 changes: 9 additions & 9 deletions src/Nest/Cluster/ClusterHealth/IndexHealthStats.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<string, ShardHealthStats>))]
public IReadOnlyDictionary<string, ShardHealthStats> Shards { get; internal set; } =
EmptyReadOnly<string, ShardHealthStats>.Dictionary;
Expand Down
12 changes: 6 additions & 6 deletions src/Nest/Cluster/ClusterHealth/ShardHealthStats.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
}
}
4 changes: 2 additions & 2 deletions src/Nest/Cluster/ClusterSettings/ClusterGetSettings/ClusterGetSettingsResponse.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ namespace Nest
{
public interface IClusterGetSettingsResponse : IResponse
{
[JsonProperty(PropertyName = "persistent")]
[JsonProperty("persistent")]
IReadOnlyDictionary<string, object> Persistent { get; }

[JsonProperty(PropertyName = "transient")]
[JsonProperty("transient")]
IReadOnlyDictionary<string, object> Transient { get; }
}

Expand Down
12 changes: 6 additions & 6 deletions src/Nest/Cluster/ClusterSettings/ClusterPutSettings/ClusterPutSettingsRequest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,25 @@

namespace Nest
{
public partial interface IClusterPutSettingsRequest
public partial interface IClusterPutSettingsRequest
{
[JsonProperty(PropertyName = "persistent")]
[JsonProperty("persistent")]
IDictionary<string, object> Persistent { get; set; }

[JsonProperty(PropertyName = "transient")]
[JsonProperty("transient")]
IDictionary<string, object> Transient { get; set; }

}
public partial class ClusterPutSettingsRequest

public partial class ClusterPutSettingsRequest
{
public IDictionary<string, object> Persistent { get; set; }

public IDictionary<string, object> Transient { get; set; }
}

[DescriptorFor("ClusterPutSettings")]
public partial class ClusterPutSettingsDescriptor
public partial class ClusterPutSettingsDescriptor
{
IDictionary<string, object> IClusterPutSettingsRequest.Persistent { get; set; }

Expand Down
6 changes: 3 additions & 3 deletions src/Nest/Cluster/ClusterSettings/ClusterPutSettings/ClusterPutSettingsResponse.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ namespace Nest
{
public interface IClusterPutSettingsResponse : IResponse
{
[JsonProperty(PropertyName = "acknowledged")]
[JsonProperty("acknowledged")]
bool Acknowledged { get; }

[JsonProperty(PropertyName = "persistent")]
[JsonProperty("persistent")]
IReadOnlyDictionary<string, object> Persistent { get; }

[JsonProperty(PropertyName = "transient")]
[JsonProperty("transient")]
IReadOnlyDictionary<string, object> Transient { get; }
}

Expand Down
Loading