Skip to content

Commit 382de47

Browse files
committed
Fix #762 added support for ignore_above and norms on string mapping
1 parent 4b7a425 commit 382de47

23 files changed

+86
-23
lines changed

src/Nest/Domain/Mapping/Descriptors/StringMappingDescriptor.cs

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,19 @@ public StringMappingDescriptor<T> IndexAnalyzer(string indexAnalyzer)
7878
this._Mapping.IndexAnalyzer = indexAnalyzer;
7979
return this;
8080
}
81-
public StringMappingDescriptor<T> SearchAnalyzer(string searchAnalyzer)
81+
public StringMappingDescriptor<T> SearchAnalyzer(string searchAnalyzer)
82+
{
83+
this._Mapping.SearchAnalyzer = searchAnalyzer;
84+
return this;
85+
}
86+
public StringMappingDescriptor<T> Norms(NormsMapping normsMapping)
87+
{
88+
this._Mapping.Norms = normsMapping;
89+
return this;
90+
}
91+
public StringMappingDescriptor<T> IgnoreAbove(string ignoreAbove)
8292
{
83-
this._Mapping.SearchAnalyzer = searchAnalyzer;
93+
this._Mapping.IgnoreAbove = ignoreAbove;
8494
return this;
8595
}
8696
public StringMappingDescriptor<T> DocValues(bool docValues = true)

src/Nest/Domain/Mapping/SpecialFields/IdFieldMapping.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public IdFieldMapping()
1515
[JsonProperty("index")]
1616
public string Index { get; internal set; }
1717

18-
[JsonProperty("store"), JsonConverter(typeof(YesNoBoolConverter))]
18+
[JsonProperty("store")]
1919
public bool? Store { get; internal set; }
2020

2121
public IdFieldMapping SetPath(string path)

src/Nest/Domain/Mapping/SpecialFields/TypeFieldMapping.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class TypeFieldMapping
99
[JsonProperty("index"), JsonConverter(typeof(StringEnumConverter))]
1010
public NonStringIndexOption? Index { get; internal set; }
1111

12-
[JsonProperty("store"), JsonConverter(typeof(YesNoBoolConverter))]
12+
[JsonProperty("store")]
1313
public bool? Store { get; internal set; }
1414

1515
public TypeFieldMapping SetIndexed(NonStringIndexOption index = NonStringIndexOption.Analyzed)
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
using System.Collections.Generic;
2+
using Newtonsoft.Json;
3+
using System;
4+
using Newtonsoft.Json.Converters;
5+
6+
namespace Nest
7+
{
8+
[JsonObject(MemberSerialization.OptIn)]
9+
public class NormsMapping
10+
{
11+
[JsonProperty("enabled")]
12+
public bool? Enabled { get; set; }
13+
14+
[JsonProperty("loading")]
15+
[JsonConverter(typeof(StringEnumConverter))]
16+
public NormsLoading? Loading { get; set; }
17+
18+
}
19+
}

src/Nest/Domain/Mapping/Types/BooleanMapping.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class BooleanMapping : IElasticType, IElasticCoreType
2525
[JsonProperty("index_name")]
2626
public string IndexName { get; set; }
2727

28-
[JsonProperty("store"), JsonConverter(typeof(YesNoBoolConverter))]
28+
[JsonProperty("store")]
2929
public bool? Store { get; set; }
3030

3131
[JsonProperty("index"), JsonConverter(typeof(StringEnumConverter))]

src/Nest/Domain/Mapping/Types/DateMapping.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public class DateMapping : IElasticType, IElasticCoreType
2424
[JsonProperty("index_name")]
2525
public string IndexName { get; set; }
2626

27-
[JsonProperty("store"), JsonConverter(typeof(YesNoBoolConverter))]
27+
[JsonProperty("store")]
2828
public bool? Store { get; set; }
2929

3030
[JsonProperty("index"), JsonConverter(typeof(StringEnumConverter))]

src/Nest/Domain/Mapping/Types/GenericMapping.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class GenericMapping : IElasticType, IElasticCoreType
2929
[JsonProperty("index_name")]
3030
public string IndexName { get; set; }
3131

32-
[JsonProperty("store"), JsonConverter(typeof(YesNoBoolConverter))]
32+
[JsonProperty("store")]
3333
public bool? Store { get; set; }
3434

3535
[JsonProperty("index")]

src/Nest/Domain/Mapping/Types/IPMapping.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class IPMapping : IElasticType
2020
[JsonProperty("similarity")]
2121
public string Similarity { get; set; }
2222

23-
[JsonProperty("store"), JsonConverter(typeof(YesNoBoolConverter))]
23+
[JsonProperty("store")]
2424
public bool? Store { get; set; }
2525

2626
[JsonProperty("index"), JsonConverter(typeof(YesNoBoolConverter))]

src/Nest/Domain/Mapping/Types/NumberMapping.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class NumberMapping : IElasticType, IElasticCoreType
2525
[JsonProperty("index_name")]
2626
public string IndexName { get; set; }
2727

28-
[JsonProperty("store"), JsonConverter(typeof(YesNoBoolConverter))]
28+
[JsonProperty("store")]
2929
public bool? Store { get; set; }
3030

3131
[JsonProperty("index"), JsonConverter(typeof(StringEnumConverter))]

src/Nest/Domain/Mapping/Types/StringMapping.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class StringMapping : IElasticType, IElasticCoreType
2828
[JsonProperty("analyzer")]
2929
public string Analyzer { get; set; }
3030

31-
[JsonProperty("store"), JsonConverter(typeof(YesNoBoolConverter))]
31+
[JsonProperty("store")]
3232
public bool? Store { get; set; }
3333

3434
[JsonProperty("index"), JsonConverter(typeof(StringEnumConverter))]
@@ -43,6 +43,9 @@ public class StringMapping : IElasticType, IElasticCoreType
4343
[JsonProperty("null_value")]
4444
public string NullValue { get; set; }
4545

46+
[JsonProperty("norms")]
47+
public NormsMapping Norms { get; set; }
48+
4649
[JsonProperty("omit_norms")]
4750
public bool? OmitNorms { get; set; }
4851

@@ -52,6 +55,9 @@ public class StringMapping : IElasticType, IElasticCoreType
5255
[JsonProperty("index_analyzer")]
5356
public string IndexAnalyzer { get; set; }
5457

58+
[JsonProperty("ignore_above")]
59+
public string IgnoreAbove { get; set; }
60+
5561
[JsonProperty("search_analyzer")]
5662
public string SearchAnalyzer { get; set; }
5763

0 commit comments

Comments
 (0)