Skip to content

mark IMappingTransform as deprecated (obsolete) #2051

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
Apr 20, 2016
Merged

mark IMappingTransform as deprecated (obsolete) #2051

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
26 changes: 16 additions & 10 deletions src/Nest/Indices/MappingManagement/PutMapping/PutMappingRequest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,12 @@ internal PutMappingRequest() { }
public ISizeField SizeField { get; set; }
/// <inheritdoc/>
public ISourceField SourceField { get; set; }

#pragma warning disable 618
/// <inheritdoc/>
[Obsolete("Deprecated in 2.0. Will be removed in the next major version release.")]
public IList<IMappingTransform> Transform { get; set; }

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

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

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

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

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

/// <inheritdoc/>
public PutMappingDescriptor<T> Transform(IEnumerable<IMappingTransform> transforms) => Assign(a => a.Transform = transforms.ToListOrNullIfEmpty());

/// <inheritdoc/>
public PutMappingDescriptor<T> Transform(Func<MappingTransformsDescriptor, IPromise<IList<IMappingTransform>>> selector) =>
Assign(a => a.Transform = selector?.Invoke(new MappingTransformsDescriptor())?.Value);

/// <inheritdoc/>
public PutMappingDescriptor<T> SourceField(Func<SourceFieldDescriptor, ISourceField> sourceFieldSelector) => Assign(a => a.SourceField = sourceFieldSelector?.Invoke(new SourceFieldDescriptor()));

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

#pragma warning disable 618
/// <inheritdoc/>
[Obsolete("Deprecated in 2.0. Will be removed in the next major version release.")]
public PutMappingDescriptor<T> Transform(IEnumerable<IMappingTransform> transforms) => Assign(a => a.Transform = transforms.ToListOrNullIfEmpty());

/// <inheritdoc/>
[Obsolete("Deprecated in 2.0. Will be removed in the next major version release.")]
public PutMappingDescriptor<T> Transform(Func<MappingTransformsDescriptor, IPromise<IList<IMappingTransform>>> selector) =>
Assign(a => a.Transform = selector?.Invoke(new MappingTransformsDescriptor())?.Value);

/// <inheritdoc/>
[Obsolete("use a normal date field and set its value explicitly")]
public PutMappingDescriptor<T> TimestampField(Func<TimestampFieldDescriptor<T>, ITimestampField> timestampFieldSelector) => Assign(a => a.TimestampField = timestampFieldSelector?.Invoke(new TimestampFieldDescriptor<T>()));
Expand Down
4 changes: 4 additions & 0 deletions src/Nest/Mapping/Transform/MappingTransform.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
namespace Nest
{
[JsonConverter(typeof(ReadAsTypeJsonConverter<MappingTransform>))]
[Obsolete("Deprecated in 2.0. Will be removed in the next major version release.")]
public interface IMappingTransform
{
[JsonProperty("script")]
Expand All @@ -20,6 +21,7 @@ public interface IMappingTransform
string Language { get; set; }
}

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

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

}

[Obsolete("Deprecated in 2.0. Will be removed in the next major version release.")]
public class MappingTransformsDescriptor: DescriptorPromiseBase<MappingTransformsDescriptor, IList<IMappingTransform>>
{
public MappingTransformsDescriptor() : base(new List<IMappingTransform>()) { }
Expand Down
2 changes: 2 additions & 0 deletions src/Nest/Mapping/Transform/MappingTransformJsonConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;

#pragma warning disable 618 // IMappingTransform

namespace Nest
{
internal class MappingTransformCollectionJsonConverter : JsonConverter
Expand Down
21 changes: 12 additions & 9 deletions src/Nest/Mapping/TypeMapping.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ public interface ITypeMapping

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

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

/// <inheritdoc/>
public TypeMappingDescriptor<T> Transform(IEnumerable<IMappingTransform> transforms) => Assign(a => a.Transform = transforms.ToListOrNullIfEmpty());

/// <inheritdoc/>
public TypeMappingDescriptor<T> Transform(Func<MappingTransformsDescriptor, IPromise<IList<IMappingTransform>>> selector) =>
Assign(a => a.Transform = selector?.Invoke(new MappingTransformsDescriptor())?.Value);
public TypeMappingDescriptor<T> RoutingField(Func<RoutingFieldDescriptor<T>, IRoutingField> routingFieldSelector) => Assign(a => a.RoutingField = routingFieldSelector?.Invoke(new RoutingFieldDescriptor<T>()));

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

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

/// <inheritdoc/>
public TypeMappingDescriptor<T> FieldNamesField(Func<FieldNamesFieldDescriptor<T>, IFieldNamesField> fieldNamesFieldSelector) => Assign(a => a.FieldNamesField = fieldNamesFieldSelector.Invoke(new FieldNamesFieldDescriptor<T>()));
[Obsolete("Deprecated in 2.0. Will be removed in the next major version release.")]
public TypeMappingDescriptor<T> Transform(IEnumerable<IMappingTransform> transforms) => Assign(a => a.Transform = transforms.ToListOrNullIfEmpty());

/// <inheritdoc/>
[Obsolete("Deprecated in 2.0. Will be removed in the next major version release.")]
public TypeMappingDescriptor<T> Transform(Func<MappingTransformsDescriptor, IPromise<IList<IMappingTransform>>> selector) =>
Assign(a => a.Transform = selector?.Invoke(new MappingTransformsDescriptor())?.Value);

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