Skip to content

Commit 8eb2dc3

Browse files
gmarzgmarz
committed
Merge branch '5.x' of https://github.com/elastic/elasticsearch-net into 5.x
2 parents a821e84 + d55b52a commit 8eb2dc3

File tree

14 files changed

+39
-1
lines changed

14 files changed

+39
-1
lines changed

‎src/Nest/Mapping/Types/Core/Date/DateAttribute.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ public DateAttribute() : base(FieldType.Date) { }
1111
bool? IDateProperty.Index { get; set; }
1212
double? IDateProperty.Boost { get; set; }
1313
DateTime? IDateProperty.NullValue { get; set; }
14+
[Obsolete("Scheduled to be removed in Elasticsearch 6.0")]
1415
bool? IDateProperty.IncludeInAll { get; set; }
1516
bool? IDateProperty.IgnoreMalformed { get; set; }
1617
string IDateProperty.Format { get; set; }
@@ -19,6 +20,7 @@ public DateAttribute() : base(FieldType.Date) { }
1920
public bool Index { get { return Self.Index.GetValueOrDefault(); } set { Self.Index = value; } }
2021
public double Boost { get { return Self.Boost.GetValueOrDefault(); } set { Self.Boost = value; } }
2122
public DateTime NullValue { get { return Self.NullValue.GetValueOrDefault(); } set { Self.NullValue = value; } }
23+
[Obsolete("Scheduled to be removed in Elasticsearch 6.0")]
2224
public bool IncludeInAll { get { return Self.IncludeInAll.GetValueOrDefault(); } set { Self.IncludeInAll = value; } }
2325
public bool IgnoreMalformed { get { return Self.IgnoreMalformed.GetValueOrDefault(); } set { Self.IgnoreMalformed = value; } }
2426
public string Format { get { return Self.Format; } set { Self.Format = value; } }

‎src/Nest/Mapping/Types/Core/Date/DateProperty.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ public interface IDateProperty : IDocValuesProperty
2828
DateTime? NullValue { get; set; }
2929

3030
[JsonProperty("include_in_all")]
31+
[Obsolete("Scheduled to be removed in 6.0")]
3132
bool? IncludeInAll { get; set; }
3233

3334
/// <summary>
@@ -60,6 +61,7 @@ public DateProperty() : base(FieldType.Date) { }
6061
/// <inheritdoc/>
6162
public DateTime? NullValue { get; set; }
6263
/// <inheritdoc/>
64+
[Obsolete("Scheduled to be removed in 6.0")]
6365
public bool? IncludeInAll { get; set; }
6466
/// <inheritdoc/>
6567
public int? PrecisionStep { get; set; }
@@ -93,6 +95,7 @@ public DatePropertyDescriptor() : base(FieldType.Date) { }
9395
/// <inheritdoc/>
9496
public DatePropertyDescriptor<T> NullValue(DateTime nullValue) => Assign(a => a.NullValue = nullValue);
9597
/// <inheritdoc/>
98+
[Obsolete("Scheduled to be removed in 6.0")]
9699
public DatePropertyDescriptor<T> IncludeInAll(bool includeInAll = true) => Assign(a => a.IncludeInAll = includeInAll);
97100
/// <inheritdoc/>
98101
public DatePropertyDescriptor<T> IgnoreMalformed(bool ignoreMalformed = true) => Assign(a => a.IgnoreMalformed = ignoreMalformed);

‎src/Nest/Mapping/Types/Core/Keyword/KeywordAttribute.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ public KeywordAttribute() : base(FieldType.Keyword) { }
1515
double? IKeywordProperty.Boost { get; set; }
1616
bool? IKeywordProperty.EagerGlobalOrdinals { get; set; }
1717
int? IKeywordProperty.IgnoreAbove { get; set; }
18+
[Obsolete("Scheduled to be removed in 6.0")]
1819
bool? IKeywordProperty.IncludeInAll { get; set; }
1920
bool? IKeywordProperty.Index { get; set; }
2021
IndexOptions? IKeywordProperty.IndexOptions { get; set; }
@@ -25,6 +26,7 @@ public KeywordAttribute() : base(FieldType.Keyword) { }
2526
public double Boost { get { return Self.Boost.GetValueOrDefault(); } set { Self.Boost = value; } }
2627
public bool EagerGlobalOrdinals { get { return Self.EagerGlobalOrdinals.GetValueOrDefault(); } set { Self.EagerGlobalOrdinals = value; } }
2728
public int IgnoreAbove { get { return Self.IgnoreAbove.GetValueOrDefault(); } set { Self.IgnoreAbove = value; } }
29+
[Obsolete("Scheduled to be removed in 6.0")]
2830
public bool IncludeInAll { get { return Self.IncludeInAll.GetValueOrDefault(); } set { Self.IncludeInAll = value; } }
2931
public bool Index { get { return Self.Index.GetValueOrDefault(); } set { Self.Index = value; } }
3032
public IndexOptions IndexOptions { get { return Self.IndexOptions.GetValueOrDefault(); } set { Self.IndexOptions = value; } }

‎src/Nest/Mapping/Types/Core/Keyword/KeywordProperty.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ public interface IKeywordProperty : IDocValuesProperty
2121
int? IgnoreAbove { get; set; }
2222

2323
[JsonProperty("include_in_all")]
24+
[Obsolete("Scheduled to be removed in 6.0")]
2425
bool? IncludeInAll { get; set; }
2526

2627
[JsonProperty("index")]
@@ -47,6 +48,7 @@ public KeywordProperty() : base(FieldType.Keyword) { }
4748
public double? Boost { get; set; }
4849
public bool? EagerGlobalOrdinals { get; set; }
4950
public int? IgnoreAbove { get; set; }
51+
[Obsolete("Scheduled to be removed in 6.0")]
5052
public bool? IncludeInAll { get; set; }
5153
public bool? Index { get; set; }
5254
public IndexOptions? IndexOptions { get; set; }
@@ -75,6 +77,7 @@ public KeywordPropertyDescriptor() : base(FieldType.Keyword) { }
7577
public KeywordPropertyDescriptor<T> Boost(double boost) => Assign(a => a.Boost = boost);
7678
public KeywordPropertyDescriptor<T> EagerGlobalOrdinals(bool eagerGlobalOrdinals = true) => Assign(a => a.EagerGlobalOrdinals = eagerGlobalOrdinals);
7779
public KeywordPropertyDescriptor<T> IgnoreAbove(int ignoreAbove) => Assign(a => a.IgnoreAbove = ignoreAbove);
80+
[Obsolete("Scheduled to be removed in 6.0")]
7881
public KeywordPropertyDescriptor<T> IncludeInAll(bool includeInAll = true) => Assign(a => a.IncludeInAll = includeInAll);
7982
public KeywordPropertyDescriptor<T> Index(bool index = true) => Assign(a => a.Index = index);
8083
public KeywordPropertyDescriptor<T> IndexOptions(IndexOptions indexOptions) => Assign(a => a.IndexOptions = indexOptions);

‎src/Nest/Mapping/Types/Core/Number/NumberAttribute.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Elasticsearch.Net;
1+
using System;
2+
using Elasticsearch.Net;
23

34
namespace Nest
45
{
@@ -19,6 +20,7 @@ protected NumberAttribute(string type) : base(type) { }
1920
bool? INumberProperty.Index { get; set; }
2021
double? INumberProperty.Boost { get; set; }
2122
double? INumberProperty.NullValue { get; set; }
23+
[Obsolete("Scheduled to be removed in 6.0")]
2224
bool? INumberProperty.IncludeInAll { get; set; }
2325
bool? INumberProperty.IgnoreMalformed { get; set; }
2426
bool? INumberProperty.Coerce { get; set; }
@@ -28,6 +30,7 @@ protected NumberAttribute(string type) : base(type) { }
2830
public bool Index { get { return Self.Index.GetValueOrDefault(); } set { Self.Index = value; } }
2931
public double Boost { get { return Self.Boost.GetValueOrDefault(); } set { Self.Boost = value; } }
3032
public double NullValue { get { return Self.NullValue.GetValueOrDefault(); } set { Self.NullValue = value; } }
33+
[Obsolete("Scheduled to be removed in 6.0")]
3134
public bool IncludeInAll { get { return Self.IncludeInAll.GetValueOrDefault(); } set { Self.IncludeInAll = value; } }
3235
public bool IgnoreMalformed { get { return Self.IgnoreMalformed.GetValueOrDefault(); } set { Self.IgnoreMalformed = value; } }
3336
public bool Coerce { get { return Self.Coerce.GetValueOrDefault(); } set { Self.Coerce = value; } }

‎src/Nest/Mapping/Types/Core/Number/NumberProperty.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ public interface INumberProperty : IDocValuesProperty
1818
double? NullValue { get; set; }
1919

2020
[JsonProperty("include_in_all")]
21+
[Obsolete("Scheduled to be removed in 6.0")]
2122
bool? IncludeInAll { get; set; }
2223

2324
[JsonProperty("ignore_malformed")]
@@ -44,6 +45,7 @@ protected NumberProperty(string type) : base(type) { }
4445
public bool? Index { get; set; }
4546
public double? Boost { get; set; }
4647
public double? NullValue { get; set; }
48+
[Obsolete("Scheduled to be removed in 6.0")]
4749
public bool? IncludeInAll { get; set; }
4850
public bool? IgnoreMalformed { get; set; }
4951
public bool? Coerce { get; set; }
@@ -80,6 +82,7 @@ protected NumberPropertyDescriptorBase(string type) : base(type) { }
8082

8183
public TDescriptor NullValue(double nullValue) => Assign(a => a.NullValue = nullValue);
8284

85+
[Obsolete("Scheduled to be removed in 6.0")]
8386
public TDescriptor IncludeInAll(bool includeInAll = true) => Assign(a => a.IncludeInAll = includeInAll);
8487

8588
public TDescriptor IgnoreMalformed(bool ignoreMalformed = true) => Assign(a => a.IgnoreMalformed = ignoreMalformed);

‎src/Nest/Mapping/Types/Core/Range/RangePropertyAttributeBase.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@ protected RangePropertyAttributeBase(RangeType type) : base(type.ToFieldType())
1111

1212
public bool Index { get { return Self.Index.GetValueOrDefault(); } set { Self.Index = value; } }
1313
public double Boost { get { return Self.Boost.GetValueOrDefault(); } set { Self.Boost = value; } }
14+
[Obsolete("Scheduled to be removed in 6.0")]
1415
public bool IncludeInAll { get { return Self.IncludeInAll.GetValueOrDefault(); } set { Self.IncludeInAll = value; } }
1516
public bool Coerce { get { return Self.Coerce.GetValueOrDefault(); } set { Self.Coerce = value; } }
1617

1718
bool? IRangeProperty.Coerce { get; set; }
1819
double? IRangeProperty.Boost { get; set; }
20+
[Obsolete("Scheduled to be removed in 6.0")]
1921
bool? IRangeProperty.IncludeInAll { get; set; }
2022
bool? IRangeProperty.Index { get; set; }
2123
}

‎src/Nest/Mapping/Types/Core/Range/RangePropertyBase.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public interface IRangeProperty : IDocValuesProperty
2626
/// Otherwise defaults to true.
2727
/// </summary>
2828
[JsonProperty("include_in_all")]
29+
[Obsolete("Scheduled to be removed in 6.0")]
2930
bool? IncludeInAll { get; set; }
3031

3132
/// <summary>
@@ -44,6 +45,7 @@ protected RangePropertyBase(RangeType rangeType) : base(rangeType.ToFieldType())
4445
/// <inheritdoc/>
4546
public double? Boost { get; set; }
4647
/// <inheritdoc/>
48+
[Obsolete("Scheduled to be removed in 6.0")]
4749
public bool? IncludeInAll { get; set; }
4850
/// <inheritdoc/>
4951
public bool? Index { get; set; }
@@ -67,6 +69,7 @@ protected RangePropertyDescriptorBase(RangeType type) : base(type.ToFieldType())
6769
/// <inheritdoc/>
6870
public TDescriptor Boost(double boost) => Assign(a => a.Boost = boost);
6971
/// <inheritdoc/>
72+
[Obsolete("Scheduled to be removed in 6.0")]
7073
public TDescriptor IncludeInAll(bool includeInAll = true) => Assign(a => a.IncludeInAll = includeInAll);
7174
/// <inheritdoc/>
7275
public TDescriptor Index(bool index = true) => Assign(a => a.Index = index);

‎src/Nest/Mapping/Types/Core/String/StringProperty.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ public interface IStringProperty : IDocValuesProperty
3333
string SearchAnalyzer { get; set; }
3434

3535
[JsonProperty("include_in_all")]
36+
[Obsolete("Scheduled to be removed in 6.0")]
3637
bool? IncludeInAll { get; set; }
3738

3839
[JsonProperty("ignore_above")]
@@ -59,6 +60,7 @@ public StringProperty() : base("string") { }
5960
public IndexOptions? IndexOptions { get; set; }
6061
public string Analyzer { get; set; }
6162
public string SearchAnalyzer { get; set; }
63+
[Obsolete("Scheduled to be removed in 6.0")]
6264
public bool? IncludeInAll { get; set; }
6365
public int? IgnoreAbove { get; set; }
6466
public int? PositionIncrementGap { get; set; }
@@ -109,6 +111,7 @@ public StringPropertyDescriptor() : base("string") { }
109111

110112
public StringPropertyDescriptor<T> IgnoreAbove(int ignoreAbove) => Assign(a => a.IgnoreAbove = ignoreAbove);
111113

114+
[Obsolete("Scheduled to be removed in 6.0")]
112115
public StringPropertyDescriptor<T> IncludeInAll(bool includeInAll = true) => Assign(a => a.IncludeInAll = includeInAll);
113116

114117
public StringPropertyDescriptor<T> PositionIncrementGap(int positionIncrementGap) => Assign(a => a.PositionIncrementGap = positionIncrementGap);

‎src/Nest/Mapping/Types/Core/Text/TextAttribute.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ public TextAttribute() : base(FieldType.Text) { }
1717
bool? ITextProperty.EagerGlobalOrdinals { get; set; }
1818
bool? ITextProperty.Fielddata { get; set; }
1919
IFielddataFrequencyFilter ITextProperty.FielddataFrequencyFilter { get; set; }
20+
[Obsolete("Scheduled to be removed in 6.0")]
2021
bool? ITextProperty.IncludeInAll { get; set; }
2122
bool? ITextProperty.Index { get; set; }
2223
IndexOptions? ITextProperty.IndexOptions { get; set; }
@@ -30,6 +31,7 @@ public TextAttribute() : base(FieldType.Text) { }
3031
public double Boost { get { return Self.Boost.GetValueOrDefault(); } set { Self.Boost = value; } }
3132
public bool EagerGlobalOrdinals { get { return Self.EagerGlobalOrdinals.GetValueOrDefault(); } set { Self.EagerGlobalOrdinals = value; } }
3233
public bool Fielddata { get { return Self.Fielddata.GetValueOrDefault(); } set { Self.Fielddata = value; } }
34+
[Obsolete("Scheduled to be removed in 6.0")]
3335
public bool IncludeInAll { get { return Self.IncludeInAll.GetValueOrDefault(); } set { Self.IncludeInAll = value; } }
3436
public bool Index { get { return Self.Index.GetValueOrDefault(); } set { Self.Index = value; } }
3537
public IndexOptions IndexOptions { get { return Self.IndexOptions.GetValueOrDefault(); } set { Self.IndexOptions = value; } }

0 commit comments

Comments
 (0)