Skip to content

Commit a2b79eb

Browse files
authored
Consistent use of TimeZone (#3645)
This commit updates usage of Timezone to TimeZone, for consistency. Fixes #3622
1 parent 2a901e2 commit a2b79eb

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

src/Nest/Aggregations/Bucket/Composite/DateHistogramCompositeAggregationSource.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public interface IDateHistogramCompositeAggregationSource : ICompositeAggregatio
2828
/// or as a timezone id, an identifier used in the TZ database like America/Los_Angeles.
2929
/// </summary>
3030
[DataMember(Name ="time_zone")]
31-
string Timezone { get; set; }
31+
string TimeZone { get; set; }
3232
}
3333

3434
/// <inheritdoc cref="IDateHistogramCompositeAggregationSource" />
@@ -43,7 +43,7 @@ public DateHistogramCompositeAggregationSource(string name) : base(name) { }
4343
public Union<DateInterval?, Time> Interval { get; set; }
4444

4545
/// <inheritdoc />
46-
public string Timezone { get; set; }
46+
public string TimeZone { get; set; }
4747

4848
/// <inheritdoc />
4949
protected override string SourceType => "date_histogram";
@@ -58,7 +58,7 @@ public DateHistogramCompositeAggregationSourceDescriptor(string name) : base(nam
5858

5959
string IDateHistogramCompositeAggregationSource.Format { get; set; }
6060
Union<DateInterval?, Time> IDateHistogramCompositeAggregationSource.Interval { get; set; }
61-
string IDateHistogramCompositeAggregationSource.Timezone { get; set; }
61+
string IDateHistogramCompositeAggregationSource.TimeZone { get; set; }
6262

6363
/// <inheritdoc cref="IDateHistogramCompositeAggregationSource.Interval" />
6464
public DateHistogramCompositeAggregationSourceDescriptor<T> Interval(DateInterval? interval) =>
@@ -68,10 +68,10 @@ public DateHistogramCompositeAggregationSourceDescriptor<T> Interval(DateInterva
6868
public DateHistogramCompositeAggregationSourceDescriptor<T> Interval(Time interval) =>
6969
Assign(interval, (a, v) => a.Interval = v);
7070

71-
/// <inheritdoc cref="IDateHistogramCompositeAggregationSource.Timezone" />
72-
public DateHistogramCompositeAggregationSourceDescriptor<T> Timezone(string timezone) => Assign(timezone, (a, v) => a.Timezone = v);
71+
/// <inheritdoc cref="IDateHistogramCompositeAggregationSource.TimeZone" />
72+
public DateHistogramCompositeAggregationSourceDescriptor<T> TimeZone(string timezone) => Assign(timezone, (a, v) => a.TimeZone = v);
7373

74-
/// <inheritdoc cref="IDateHistogramCompositeAggregationSource.Timezone" />
74+
/// <inheritdoc cref="IDateHistogramCompositeAggregationSource.TimeZone" />
7575
public DateHistogramCompositeAggregationSourceDescriptor<T> Format(string format) => Assign(format, (a, v) => a.Format = v);
7676
}
7777
}

src/Nest/Ingest/Processors/DateProcessor.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public interface IDateProcessor : IProcessor
2222
Field TargetField { get; set; }
2323

2424
[DataMember(Name ="timezone")]
25-
string Timezone { get; set; }
25+
string TimeZone { get; set; }
2626
}
2727

2828
public class DateProcessor : ProcessorBase, IDateProcessor
@@ -35,7 +35,7 @@ public class DateProcessor : ProcessorBase, IDateProcessor
3535

3636
public Field TargetField { get; set; }
3737

38-
public string Timezone { get; set; }
38+
public string TimeZone { get; set; }
3939
protected override string Name => "date";
4040
}
4141

@@ -49,7 +49,7 @@ public class DateProcessorDescriptor<T>
4949
IEnumerable<string> IDateProcessor.Formats { get; set; }
5050
string IDateProcessor.Locale { get; set; }
5151
Field IDateProcessor.TargetField { get; set; }
52-
string IDateProcessor.Timezone { get; set; }
52+
string IDateProcessor.TimeZone { get; set; }
5353

5454
public DateProcessorDescriptor<T> Field(Field field) => Assign(field, (a, v) => a.Field = v);
5555

@@ -65,7 +65,7 @@ public DateProcessorDescriptor<T> TargetField(Expression<Func<T, object>> object
6565

6666
public DateProcessorDescriptor<T> Formats(params string[] matchFormats) => Assign(matchFormats, (a, v) => a.Formats = v);
6767

68-
public DateProcessorDescriptor<T> Timezone(string timezone) => Assign(timezone, (a, v) => a.Timezone = v);
68+
public DateProcessorDescriptor<T> TimeZone(string timezone) => Assign(timezone, (a, v) => a.TimeZone = v);
6969

7070
public DateProcessorDescriptor<T> Locale(string locale) => Assign(locale, (a, v) => a.Locale = v);
7171
}

src/Nest/QueryDsl/FullText/QueryString/QueryStringQuery.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ public interface IQueryStringQuery : IQuery
173173
/// Time Zone to be applied to any range query related to dates.
174174
/// </summary>
175175
[DataMember(Name = "time_zone")]
176-
string Timezone { get; set; }
176+
string TimeZone { get; set; }
177177

178178
/// <summary>
179179
/// How the fields should be combined to build the text query.
@@ -257,7 +257,7 @@ public class QueryStringQuery : QueryBase, IQueryStringQuery
257257
public double? TieBreaker { get; set; }
258258

259259
/// <inheritdoc />
260-
public string Timezone { get; set; }
260+
public string TimeZone { get; set; }
261261

262262
/// <inheritdoc />
263263
public TextQueryType? Type { get; set; }
@@ -299,7 +299,7 @@ public class QueryStringQueryDescriptor<T>
299299
string IQueryStringQuery.QuoteFieldSuffix { get; set; }
300300
MultiTermQueryRewrite IQueryStringQuery.Rewrite { get; set; }
301301
double? IQueryStringQuery.TieBreaker { get; set; }
302-
string IQueryStringQuery.Timezone { get; set; }
302+
string IQueryStringQuery.TimeZone { get; set; }
303303

304304
TextQueryType? IQueryStringQuery.Type { get; set; }
305305

@@ -385,8 +385,8 @@ public QueryStringQueryDescriptor<T> QuoteFieldSuffix(string quoteFieldSuffix) =
385385
public QueryStringQueryDescriptor<T> EnablePositionIncrements(bool? enablePositionIncrements = true) =>
386386
Assign(enablePositionIncrements, (a, v) => a.EnablePositionIncrements = v);
387387

388-
/// <inheritdoc cref="IQueryStringQuery.Timezone" />
389-
public QueryStringQueryDescriptor<T> Timezone(string timezone) => Assign(timezone, (a, v) => a.Timezone = v);
388+
/// <inheritdoc cref="IQueryStringQuery.TimeZone" />
389+
public QueryStringQueryDescriptor<T> TimeZone(string timezone) => Assign(timezone, (a, v) => a.TimeZone = v);
390390

391391
/// <inheritdoc cref="IQueryStringQuery.AutoGenerateSynonymsPhraseQuery" />
392392
public QueryStringQueryDescriptor<T> AutoGenerateSynonymsPhraseQuery(bool? autoGenerateSynonymsPhraseQuery = true) =>

src/Tests/Tests/Ingest/ProcessorAssertions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,15 +103,15 @@ public class Date : ProcessorAssertion
103103
.Field(p => p.StartedOn)
104104
.TargetField("timestamp")
105105
.Formats("dd/MM/yyyy hh:mm:ss")
106-
.Timezone("Europe/Amsterdam")
106+
.TimeZone("Europe/Amsterdam")
107107
);
108108

109109
public override IProcessor Initializer => new DateProcessor
110110
{
111111
Field = "startedOn",
112112
TargetField = "timestamp",
113113
Formats = new string[] { "dd/MM/yyyy hh:mm:ss" },
114-
Timezone = "Europe/Amsterdam"
114+
TimeZone = "Europe/Amsterdam"
115115
};
116116

117117
public override object Json => new

0 commit comments

Comments
 (0)