From 01c0b0e0dc2ce357be9430abd095176dec40fc68 Mon Sep 17 00:00:00 2001 From: Ashley Mannix Date: Tue, 25 Aug 2015 12:25:24 +1000 Subject: [PATCH 1/2] add store to timestamp field mapping --- .../Mapping/SpecialFields/TimestampFieldMapping.cs | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/Nest/Domain/Mapping/SpecialFields/TimestampFieldMapping.cs b/src/Nest/Domain/Mapping/SpecialFields/TimestampFieldMapping.cs index 4311fc96be0..e5e7fa380d2 100644 --- a/src/Nest/Domain/Mapping/SpecialFields/TimestampFieldMapping.cs +++ b/src/Nest/Domain/Mapping/SpecialFields/TimestampFieldMapping.cs @@ -22,6 +22,9 @@ public interface ITimestampFieldMapping : ISpecialField [JsonProperty("ignore_missing")] bool? IgnoreMissing { get; set; } + + [JsonProperty("store")] + bool Store { get; set; } } public class TimestampFieldMapping : ITimestampFieldMapping @@ -33,6 +36,7 @@ public class TimestampFieldMapping : ITimestampFieldMapping public string Format { get; set; } public string Default { get; set; } public bool? IgnoreMissing { get; set; } + public bool Store { get; set; } } @@ -47,12 +51,20 @@ public class TimestampFieldMappingDescriptor : ITimestampFieldMapping string ITimestampFieldMapping.Format { get; set; } string ITimestampFieldMapping.Default { get; set; } bool? ITimestampFieldMapping.IgnoreMissing { get; set; } + bool ITimestampFieldMapping.Store { get; set; } public TimestampFieldMappingDescriptor Enabled(bool enabled = true) { Self.Enabled = enabled; return this; } + + public TimestampFieldMappingDescriptor Store(bool store = false) + { + Self.Store = store; + return this; + } + public TimestampFieldMappingDescriptor Path(string path) { Self.Path = path; @@ -85,4 +97,4 @@ public TimestampFieldMappingDescriptor IgnoreMissing(bool ignoreMissing = tru } -} \ No newline at end of file +} From 07472c16cda49b2708a037a532308655133e1070 Mon Sep 17 00:00:00 2001 From: Ashley Mannix Date: Tue, 25 Aug 2015 13:28:36 +1000 Subject: [PATCH 2/2] Include store in unit tests for timestampfieldmapping --- .../Domain/Mapping/SpecialFields/TimestampFieldMapping.cs | 8 ++++---- .../Core/Map/TimestampField/TimestampFieldTests.cs | 1 + .../Map/TimestampField/TimestampFieldUsingString.json | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Nest/Domain/Mapping/SpecialFields/TimestampFieldMapping.cs b/src/Nest/Domain/Mapping/SpecialFields/TimestampFieldMapping.cs index e5e7fa380d2..6fa8eafb288 100644 --- a/src/Nest/Domain/Mapping/SpecialFields/TimestampFieldMapping.cs +++ b/src/Nest/Domain/Mapping/SpecialFields/TimestampFieldMapping.cs @@ -24,7 +24,7 @@ public interface ITimestampFieldMapping : ISpecialField bool? IgnoreMissing { get; set; } [JsonProperty("store")] - bool Store { get; set; } + bool? Store { get; set; } } public class TimestampFieldMapping : ITimestampFieldMapping @@ -36,7 +36,7 @@ public class TimestampFieldMapping : ITimestampFieldMapping public string Format { get; set; } public string Default { get; set; } public bool? IgnoreMissing { get; set; } - public bool Store { get; set; } + public bool? Store { get; set; } } @@ -51,7 +51,7 @@ public class TimestampFieldMappingDescriptor : ITimestampFieldMapping string ITimestampFieldMapping.Format { get; set; } string ITimestampFieldMapping.Default { get; set; } bool? ITimestampFieldMapping.IgnoreMissing { get; set; } - bool ITimestampFieldMapping.Store { get; set; } + bool? ITimestampFieldMapping.Store { get; set; } public TimestampFieldMappingDescriptor Enabled(bool enabled = true) { @@ -59,7 +59,7 @@ public TimestampFieldMappingDescriptor Enabled(bool enabled = true) return this; } - public TimestampFieldMappingDescriptor Store(bool store = false) + public TimestampFieldMappingDescriptor Store(bool store = true) { Self.Store = store; return this; diff --git a/src/Tests/Nest.Tests.Unit/Core/Map/TimestampField/TimestampFieldTests.cs b/src/Tests/Nest.Tests.Unit/Core/Map/TimestampField/TimestampFieldTests.cs index cd097a6a540..2230ef96bfd 100644 --- a/src/Tests/Nest.Tests.Unit/Core/Map/TimestampField/TimestampFieldTests.cs +++ b/src/Tests/Nest.Tests.Unit/Core/Map/TimestampField/TimestampFieldTests.cs @@ -25,6 +25,7 @@ public void TimestampFieldUsingString() .TimestampField(a => a .Path("my_difficult_field_name") .Enabled() + .Store() ) ); this.JsonEquals(result.ConnectionStatus.Request, MethodInfo.GetCurrentMethod()); diff --git a/src/Tests/Nest.Tests.Unit/Core/Map/TimestampField/TimestampFieldUsingString.json b/src/Tests/Nest.Tests.Unit/Core/Map/TimestampField/TimestampFieldUsingString.json index c21fbaabc97..eac7dae27b9 100644 --- a/src/Tests/Nest.Tests.Unit/Core/Map/TimestampField/TimestampFieldUsingString.json +++ b/src/Tests/Nest.Tests.Unit/Core/Map/TimestampField/TimestampFieldUsingString.json @@ -2,7 +2,8 @@ "elasticsearchprojects": { "_timestamp": { "enabled": true, - "path": "my_difficult_field_name" + "path": "my_difficult_field_name", + "store": true } } } \ No newline at end of file