diff --git a/src/Nest/Mapping/DynamicTemplate/SingleMapping.cs b/src/Nest/Mapping/DynamicTemplate/SingleMapping.cs index be72f29cf0d..a575003ba35 100644 --- a/src/Nest/Mapping/DynamicTemplate/SingleMapping.cs +++ b/src/Nest/Mapping/DynamicTemplate/SingleMapping.cs @@ -250,30 +250,6 @@ public IProperty Scalar(Expression>> field, ) => selector.InvokeOrDefault(new DatePropertyDescriptor().Name(field)); - public IProperty ScalarNanos(Expression> field, Func, IDateNanosProperty> selector = null) => - selector.InvokeOrDefault(new DateNanosPropertyDescriptor().Name(field)); - - public IProperty ScalarNanos(Expression> field, Func, IDateNanosProperty> selector = null) => - selector.InvokeOrDefault(new DateNanosPropertyDescriptor().Name(field)); - - public IProperty ScalarNanos(Expression>> field, Func, IDateNanosProperty> selector = null) => - selector.InvokeOrDefault(new DateNanosPropertyDescriptor().Name(field)); - - public IProperty ScalarNanos(Expression>> field, Func, IDateNanosProperty> selector = null) => - selector.InvokeOrDefault(new DateNanosPropertyDescriptor().Name(field)); - - public IProperty ScalarNanos(Expression> field, Func, IDateNanosProperty> selector = null) => - selector.InvokeOrDefault(new DateNanosPropertyDescriptor().Name(field)); - - public IProperty ScalarNanos(Expression> field, Func, IDateNanosProperty> selector = null) => - selector.InvokeOrDefault(new DateNanosPropertyDescriptor().Name(field)); - - public IProperty ScalarNanos(Expression>> field, Func, IDateNanosProperty> selector = null - ) => selector.InvokeOrDefault(new DateNanosPropertyDescriptor().Name(field)); - - public IProperty ScalarNanos(Expression>> field, Func, IDateNanosProperty> selector = null - ) => selector.InvokeOrDefault(new DateNanosPropertyDescriptor().Name(field)); - public IProperty Scalar(Expression> field, Func, IBooleanProperty> selector = null) => selector.InvokeOrDefault(new BooleanPropertyDescriptor().Name(field)); diff --git a/src/Nest/Mapping/Types/Properties-Scalar.cs b/src/Nest/Mapping/Types/Properties-Scalar.cs index dfc970c21e5..99997efb8bb 100644 --- a/src/Nest/Mapping/Types/Properties-Scalar.cs +++ b/src/Nest/Mapping/Types/Properties-Scalar.cs @@ -115,22 +115,6 @@ public partial interface IPropertiesDescriptor TReturnType Scalar(Expression>> field, Func, IDateProperty> selector = null); - TReturnType ScalarNanos(Expression> field, Func, IDateNanosProperty> selector = null); - - TReturnType ScalarNanos(Expression> field, Func, IDateNanosProperty> selector = null); - - TReturnType ScalarNanos(Expression>> field, Func, IDateNanosProperty> selector = null); - - TReturnType ScalarNanos(Expression>> field, Func, IDateNanosProperty> selector = null); - - TReturnType ScalarNanos(Expression> field, Func, IDateNanosProperty> selector = null); - - TReturnType ScalarNanos(Expression> field, Func, IDateNanosProperty> selector = null); - - TReturnType ScalarNanos(Expression>> field, Func, IDateNanosProperty> selector = null); - - TReturnType ScalarNanos(Expression>> field, Func, IDateNanosProperty> selector = null); - TReturnType Scalar(Expression> field, Func, IBooleanProperty> selector = null); TReturnType Scalar(Expression> field, Func, IBooleanProperty> selector = null); @@ -404,42 +388,6 @@ public PropertiesDescriptor Scalar(Expression SetProperty(selector.InvokeOrDefault(new DatePropertyDescriptor().Name(field))); - public PropertiesDescriptor ScalarNanos(Expression> field, Func, IDateNanosProperty> selector = null) => - SetProperty(selector.InvokeOrDefault(new DateNanosPropertyDescriptor().Name(field))); - - public PropertiesDescriptor ScalarNanos(Expression> field, Func, IDateNanosProperty> selector = null) => - SetProperty(selector.InvokeOrDefault(new DateNanosPropertyDescriptor().Name(field))); - - public PropertiesDescriptor ScalarNanos(Expression>> field, - Func, IDateNanosProperty> selector = null - ) => - SetProperty(selector.InvokeOrDefault(new DateNanosPropertyDescriptor().Name(field))); - - public PropertiesDescriptor ScalarNanos(Expression>> field, - Func, IDateNanosProperty> selector = null - ) => - SetProperty(selector.InvokeOrDefault(new DateNanosPropertyDescriptor().Name(field))); - - public PropertiesDescriptor ScalarNanos(Expression> field, - Func, IDateNanosProperty> selector = null - ) => - SetProperty(selector.InvokeOrDefault(new DateNanosPropertyDescriptor().Name(field))); - - public PropertiesDescriptor ScalarNanos(Expression> field, - Func, IDateNanosProperty> selector = null - ) => - SetProperty(selector.InvokeOrDefault(new DateNanosPropertyDescriptor().Name(field))); - - public PropertiesDescriptor ScalarNanos(Expression>> field, - Func, IDateNanosProperty> selector = null - ) => - SetProperty(selector.InvokeOrDefault(new DateNanosPropertyDescriptor().Name(field))); - - public PropertiesDescriptor ScalarNanos(Expression>> field, - Func, IDateNanosProperty> selector = null - ) => - SetProperty(selector.InvokeOrDefault(new DateNanosPropertyDescriptor().Name(field))); - public PropertiesDescriptor Scalar(Expression> field, Func, IBooleanProperty> selector = null ) => SetProperty(selector.InvokeOrDefault(new BooleanPropertyDescriptor().Name(field))); diff --git a/src/Tests/Tests/Mapping/Scalar/ScalarUsageTests.cs b/src/Tests/Tests/Mapping/Scalar/ScalarUsageTests.cs index 39b0d85a9a5..d86f7a49e27 100644 --- a/src/Tests/Tests/Mapping/Scalar/ScalarUsageTests.cs +++ b/src/Tests/Tests/Mapping/Scalar/ScalarUsageTests.cs @@ -36,14 +36,6 @@ public enum ScalarEnum dateTimeOffsets = new { type = "date" }, dateTimeOffsetNullable = new { type = "date" }, dateTimeOffsetNullables = new { type = "date" }, - dateTimeNanos = new { type = "date_nanos" }, - dateTimeNanoss = new { type = "date_nanos" }, - dateTimeNanosNullable = new { type = "date_nanos" }, - dateTimeNanosNullables = new { type = "date_nanos" }, - dateTimeNanosOffset = new { type = "date_nanos" }, - dateTimeNanosOffsets = new { type = "date_nanos" }, - dateTimeNanosOffsetNullable = new { type = "date_nanos" }, - dateTimeNanosOffsetNullables = new { type = "date_nanos" }, @decimal = new { type = "double" }, decimals = new { type = "double" }, decimalNullable = new { type = "double" }, @@ -153,14 +145,6 @@ public enum ScalarEnum .Scalar(p => p.DateTimeOffsets, m => m) .Scalar(p => p.DateTimeOffsetNullable, m => m) .Scalar(p => p.DateTimeOffsetNullables, m => m) - .ScalarNanos(p => p.DateTimeNanos, m => m) - .ScalarNanos(p => p.DateTimeNanoss, m => m) - .ScalarNanos(p => p.DateTimeNanosNullable, m => m) - .ScalarNanos(p => p.DateTimeNanosNullables, m => m) - .ScalarNanos(p => p.DateTimeNanosOffset, m => m) - .ScalarNanos(p => p.DateTimeNanosOffsets, m => m) - .ScalarNanos(p => p.DateTimeNanosOffsetNullable, m => m) - .ScalarNanos(p => p.DateTimeNanosOffsetNullables, m => m) .Scalar(p => p.Bool, m => m) .Scalar(p => p.Bools, m => m) .Scalar(p => p.BoolNullable, m => m) @@ -216,16 +200,6 @@ public class ScalarPoco public IEnumerable DateTimeOffsets { get; set; } public IEnumerable DateTimes { get; set; } - public DateTime DateTimeNanos { get; set; } - public DateTime? DateTimeNanosNullable { get; set; } - public IEnumerable DateTimeNanosNullables { get; set; } - - public DateTimeOffset DateTimeNanosOffset { get; set; } - public DateTimeOffset? DateTimeNanosOffsetNullable { get; set; } - public IEnumerable DateTimeNanosOffsetNullables { get; set; } - public IEnumerable DateTimeNanosOffsets { get; set; } - public IEnumerable DateTimeNanoss { get; set; } - public decimal Decimal { get; set; } public decimal? DecimalNullable { get; set; } public IEnumerable DecimalNullables { get; set; }