Skip to content

Commit 3c463a7

Browse files
russcamMpdreamz
authored andcommitted
1 parent b4a7cd4 commit 3c463a7

File tree

4 files changed

+34
-19
lines changed

4 files changed

+34
-19
lines changed

src/Nest/Indices/MappingManagement/PutMapping/PutMappingRequest.cs

+16-10
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,12 @@ internal PutMappingRequest() { }
4848
public ISizeField SizeField { get; set; }
4949
/// <inheritdoc/>
5050
public ISourceField SourceField { get; set; }
51+
52+
#pragma warning disable 618
5153
/// <inheritdoc/>
54+
[Obsolete("Deprecated in 2.0. Will be removed in the next major version release.")]
5255
public IList<IMappingTransform> Transform { get; set; }
5356

54-
#pragma warning disable 618
5557
/// <inheritdoc/>
5658
[Obsolete("use a normal date field and set its value explicitly")]
5759
public ITimestampField TimestampField { get; set; }
@@ -98,10 +100,11 @@ public PutMappingRequest() : this(typeof(T), typeof(T)) { }
98100
public ISizeField SizeField { get; set; }
99101
/// <inheritdoc/>
100102
public ISourceField SourceField { get; set; }
103+
#pragma warning disable 618
101104
/// <inheritdoc/>
105+
[Obsolete("Deprecated in 2.0. Will be removed in the next major version release.")]
102106
public IList<IMappingTransform> Transform { get; set; }
103107

104-
#pragma warning disable 618
105108
/// <inheritdoc/>
106109
[Obsolete("use a normal date field and set its value explicitly")]
107110
public ITimestampField TimestampField { get; set; }
@@ -137,9 +140,10 @@ public PutMappingDescriptor(IndexName index, TypeName type) : base(r=>r.Required
137140
ISizeField ITypeMapping.SizeField { get; set; }
138141
ISourceField ITypeMapping.SourceField { get; set; }
139142

143+
#pragma warning disable 618
144+
[Obsolete("Deprecated in 2.0. Will be removed in the next major version release.")]
140145
IList<IMappingTransform> ITypeMapping.Transform { get; set; }
141146

142-
#pragma warning disable 618
143147
[Obsolete("use a normal date field and set its value explicitly")]
144148
ITimestampField ITypeMapping.TimestampField { get; set; }
145149

@@ -201,13 +205,6 @@ public PutMappingDescriptor<T> AutoMap(IPropertyVisitor visitor = null, int maxR
201205
/// <inheritdoc/>
202206
public PutMappingDescriptor<T> NumericDetection(bool detect = true) => Assign(a => a.NumericDetection = detect);
203207

204-
/// <inheritdoc/>
205-
public PutMappingDescriptor<T> Transform(IEnumerable<IMappingTransform> transforms) => Assign(a => a.Transform = transforms.ToListOrNullIfEmpty());
206-
207-
/// <inheritdoc/>
208-
public PutMappingDescriptor<T> Transform(Func<MappingTransformsDescriptor, IPromise<IList<IMappingTransform>>> selector) =>
209-
Assign(a => a.Transform = selector?.Invoke(new MappingTransformsDescriptor())?.Value);
210-
211208
/// <inheritdoc/>
212209
public PutMappingDescriptor<T> SourceField(Func<SourceFieldDescriptor, ISourceField> sourceFieldSelector) => Assign(a => a.SourceField = sourceFieldSelector?.Invoke(new SourceFieldDescriptor()));
213210

@@ -218,6 +215,15 @@ public PutMappingDescriptor<T> Transform(Func<MappingTransformsDescriptor, IProm
218215
public PutMappingDescriptor<T> FieldNamesField(Func<FieldNamesFieldDescriptor<T>, IFieldNamesField> fieldNamesFieldSelector) => Assign(a => a.FieldNamesField = fieldNamesFieldSelector.Invoke(new FieldNamesFieldDescriptor<T>()));
219216

220217
#pragma warning disable 618
218+
/// <inheritdoc/>
219+
[Obsolete("Deprecated in 2.0. Will be removed in the next major version release.")]
220+
public PutMappingDescriptor<T> Transform(IEnumerable<IMappingTransform> transforms) => Assign(a => a.Transform = transforms.ToListOrNullIfEmpty());
221+
222+
/// <inheritdoc/>
223+
[Obsolete("Deprecated in 2.0. Will be removed in the next major version release.")]
224+
public PutMappingDescriptor<T> Transform(Func<MappingTransformsDescriptor, IPromise<IList<IMappingTransform>>> selector) =>
225+
Assign(a => a.Transform = selector?.Invoke(new MappingTransformsDescriptor())?.Value);
226+
221227
/// <inheritdoc/>
222228
[Obsolete("use a normal date field and set its value explicitly")]
223229
public PutMappingDescriptor<T> TimestampField(Func<TimestampFieldDescriptor<T>, ITimestampField> timestampFieldSelector) => Assign(a => a.TimestampField = timestampFieldSelector?.Invoke(new TimestampFieldDescriptor<T>()));

src/Nest/Mapping/Transform/MappingTransform.cs

+4
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
namespace Nest
66
{
77
[JsonConverter(typeof(ReadAsTypeJsonConverter<MappingTransform>))]
8+
[Obsolete("Deprecated in 2.0. Will be removed in the next major version release.")]
89
public interface IMappingTransform
910
{
1011
[JsonProperty("script")]
@@ -20,6 +21,7 @@ public interface IMappingTransform
2021
string Language { get; set; }
2122
}
2223

24+
[Obsolete("Deprecated in 2.0. Will be removed in the next major version release.")]
2325
public class MappingTransform: IMappingTransform
2426
{
2527
public string Script { get; set; }
@@ -31,6 +33,7 @@ public class MappingTransform: IMappingTransform
3133
public string Language { get; set; }
3234
}
3335

36+
[Obsolete("Deprecated in 2.0. Will be removed in the next major version release.")]
3437
public class MappingTransformDescriptor : DescriptorBase<MappingTransformDescriptor, IMappingTransform>, IMappingTransform
3538
{
3639
string IMappingTransform.Script { get; set; }
@@ -53,6 +56,7 @@ public class MappingTransformDescriptor : DescriptorBase<MappingTransformDescrip
5356

5457
}
5558

59+
[Obsolete("Deprecated in 2.0. Will be removed in the next major version release.")]
5660
public class MappingTransformsDescriptor: DescriptorPromiseBase<MappingTransformsDescriptor, IList<IMappingTransform>>
5761
{
5862
public MappingTransformsDescriptor() : base(new List<IMappingTransform>()) { }

src/Nest/Mapping/Transform/MappingTransformJsonConverter.cs

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
using Newtonsoft.Json;
44
using Newtonsoft.Json.Linq;
55

6+
#pragma warning disable 618 // IMappingTransform
7+
68
namespace Nest
79
{
810
internal class MappingTransformCollectionJsonConverter : JsonConverter

src/Nest/Mapping/TypeMapping.cs

+12-9
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ public interface ITypeMapping
1919

2020
[JsonProperty("transform")]
2121
[JsonConverter(typeof(MappingTransformCollectionJsonConverter))]
22+
[Obsolete("Deprecated in 2.0. Will be removed in the next major version release.")]
2223
IList<IMappingTransform> Transform { get; set; }
2324

2425
[JsonProperty("analyzer")]
@@ -108,6 +109,7 @@ public class TypeMapping : ITypeMapping
108109
[Obsolete("use a normal date field and set its value explicitly")]
109110
public ITimestampField TimestampField { get; set; }
110111
/// <inheritdoc/>
112+
[Obsolete("Deprecated in 2.0. Will be removed in the next major version release.")]
111113
public IList<IMappingTransform> Transform { get; set; }
112114
/// <inheritdoc/>
113115
[Obsolete("will be replaced with a different implementation in a future version of Elasticsearch")]
@@ -136,6 +138,7 @@ public class TypeMappingDescriptor<T> : DescriptorBase<TypeMappingDescriptor<T>,
136138
ISourceField ITypeMapping.SourceField { get; set; }
137139
[Obsolete("use a normal date field and set its value explicitly")]
138140
ITimestampField ITypeMapping.TimestampField { get; set; }
141+
[Obsolete("Deprecated in 2.0. Will be removed in the next major version release.")]
139142
IList<IMappingTransform> ITypeMapping.Transform { get; set; }
140143
[Obsolete("will be replaced with a different implementation in a future version of Elasticsearch")]
141144
ITtlField ITypeMapping.TtlField { get; set; }
@@ -198,25 +201,25 @@ public TypeMappingDescriptor<T> AutoMap(IPropertyVisitor visitor = null, int max
198201
public TypeMappingDescriptor<T> NumericDetection(bool detect = true) => Assign(a => a.NumericDetection = detect);
199202

200203
/// <inheritdoc/>
201-
public TypeMappingDescriptor<T> Transform(IEnumerable<IMappingTransform> transforms) => Assign(a => a.Transform = transforms.ToListOrNullIfEmpty());
202-
203-
/// <inheritdoc/>
204-
public TypeMappingDescriptor<T> Transform(Func<MappingTransformsDescriptor, IPromise<IList<IMappingTransform>>> selector) =>
205-
Assign(a => a.Transform = selector?.Invoke(new MappingTransformsDescriptor())?.Value);
204+
public TypeMappingDescriptor<T> RoutingField(Func<RoutingFieldDescriptor<T>, IRoutingField> routingFieldSelector) => Assign(a => a.RoutingField = routingFieldSelector?.Invoke(new RoutingFieldDescriptor<T>()));
206205

207206
/// <inheritdoc/>
208-
public TypeMappingDescriptor<T> RoutingField(Func<RoutingFieldDescriptor<T>, IRoutingField> routingFieldSelector) => Assign(a => a.RoutingField = routingFieldSelector?.Invoke(new RoutingFieldDescriptor<T>()));
207+
public TypeMappingDescriptor<T> FieldNamesField(Func<FieldNamesFieldDescriptor<T>, IFieldNamesField> fieldNamesFieldSelector) => Assign(a => a.FieldNamesField = fieldNamesFieldSelector.Invoke(new FieldNamesFieldDescriptor<T>()));
209208

210209
#pragma warning disable 618
211210
/// <inheritdoc/>
212211
[Obsolete("use a normal date field and set its value explicitly")]
213212
public TypeMappingDescriptor<T> TimestampField(Func<TimestampFieldDescriptor<T>, ITimestampField> timestampFieldSelector) => Assign(a => a.TimestampField = timestampFieldSelector?.Invoke(new TimestampFieldDescriptor<T>()));
214-
#pragma warning restore 618
215213

216214
/// <inheritdoc/>
217-
public TypeMappingDescriptor<T> FieldNamesField(Func<FieldNamesFieldDescriptor<T>, IFieldNamesField> fieldNamesFieldSelector) => Assign(a => a.FieldNamesField = fieldNamesFieldSelector.Invoke(new FieldNamesFieldDescriptor<T>()));
215+
[Obsolete("Deprecated in 2.0. Will be removed in the next major version release.")]
216+
public TypeMappingDescriptor<T> Transform(IEnumerable<IMappingTransform> transforms) => Assign(a => a.Transform = transforms.ToListOrNullIfEmpty());
217+
218+
/// <inheritdoc/>
219+
[Obsolete("Deprecated in 2.0. Will be removed in the next major version release.")]
220+
public TypeMappingDescriptor<T> Transform(Func<MappingTransformsDescriptor, IPromise<IList<IMappingTransform>>> selector) =>
221+
Assign(a => a.Transform = selector?.Invoke(new MappingTransformsDescriptor())?.Value);
218222

219-
#pragma warning disable 618
220223
/// <inheritdoc/>
221224
[Obsolete("will be replaced with a different implementation in a future version of Elasticsearch")]
222225
public TypeMappingDescriptor<T> TtlField(Func<TtlFieldDescriptor, ITtlField> ttlFieldSelector) => Assign(a => a.TtlField = ttlFieldSelector?.Invoke(new TtlFieldDescriptor()));

0 commit comments

Comments
 (0)