From 48f07466e311b720898fc428d352b83970525b48 Mon Sep 17 00:00:00 2001 From: Dave Parfitt Date: Tue, 28 Jul 2015 09:43:26 -0400 Subject: [PATCH] Use underscores for date formats @clintongormley Closes #12429 --- .../index/mapper/core/DateFieldMapper.java | 4 ++-- .../index/mapper/date/SimpleDateMappingTests.java | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/src/main/java/org/elasticsearch/index/mapper/core/DateFieldMapper.java b/core/src/main/java/org/elasticsearch/index/mapper/core/DateFieldMapper.java index c14b6b2ae1159..9e24b50cc04db 100644 --- a/core/src/main/java/org/elasticsearch/index/mapper/core/DateFieldMapper.java +++ b/core/src/main/java/org/elasticsearch/index/mapper/core/DateFieldMapper.java @@ -72,8 +72,8 @@ public class DateFieldMapper extends NumberFieldMapper { public static final String CONTENT_TYPE = "date"; public static class Defaults extends NumberFieldMapper.Defaults { - public static final FormatDateTimeFormatter DATE_TIME_FORMATTER = Joda.forPattern("strictDateOptionalTime||epoch_millis", Locale.ROOT); - public static final FormatDateTimeFormatter DATE_TIME_FORMATTER_BEFORE_2_0 = Joda.forPattern("dateOptionalTime", Locale.ROOT); + public static final FormatDateTimeFormatter DATE_TIME_FORMATTER = Joda.forPattern("strict_date_optional_time||epoch_millis", Locale.ROOT); + public static final FormatDateTimeFormatter DATE_TIME_FORMATTER_BEFORE_2_0 = Joda.forPattern("date_optional_time", Locale.ROOT); public static final TimeUnit TIME_UNIT = TimeUnit.MILLISECONDS; public static final DateFieldType FIELD_TYPE = new DateFieldType(); diff --git a/core/src/test/java/org/elasticsearch/index/mapper/date/SimpleDateMappingTests.java b/core/src/test/java/org/elasticsearch/index/mapper/date/SimpleDateMappingTests.java index 8db412ffc835b..ebc638b33f103 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/date/SimpleDateMappingTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/date/SimpleDateMappingTests.java @@ -495,7 +495,7 @@ public void testThatOlderIndicesAllowNonStrictDates() throws Exception { Version randomVersion = VersionUtils.randomVersionBetween(getRandom(), Version.V_0_90_0, Version.V_1_6_1); IndexService index = createIndex("test", settingsBuilder().put(IndexMetaData.SETTING_VERSION_CREATED, randomVersion).build()); client().admin().indices().preparePutMapping("test").setType("type").setSource(mapping).get(); - assertDateFormat("epoch_millis||dateOptionalTime"); + assertDateFormat("epoch_millis||date_optional_time"); DocumentMapper defaultMapper = index.mapperService().documentMapper("type"); defaultMapper.parse("test", "type", "1", XContentFactory.jsonBuilder() @@ -543,13 +543,13 @@ public void testThatNewIndicesOnlyAllowStrictDates() throws Exception { public void testThatUpgradingAnOlderIndexToStrictDateWorks() throws Exception { String mapping = XContentFactory.jsonBuilder().startObject().startObject("type") - .startObject("properties").startObject("date_field").field("type", "date").field("format", "dateOptionalTime").endObject().endObject() + .startObject("properties").startObject("date_field").field("type", "date").field("format", "date_optional_time").endObject().endObject() .endObject().endObject().string(); Version randomVersion = VersionUtils.randomVersionBetween(getRandom(), Version.V_0_90_0, Version.V_1_6_1); createIndex("test", settingsBuilder().put(IndexMetaData.SETTING_VERSION_CREATED, randomVersion).build()); client().admin().indices().preparePutMapping("test").setType("type").setSource(mapping).get(); - assertDateFormat("epoch_millis||dateOptionalTime"); + assertDateFormat("epoch_millis||date_optional_time"); // index doc client().prepareIndex("test", "type", "1").setSource(XContentFactory.jsonBuilder() @@ -561,12 +561,12 @@ public void testThatUpgradingAnOlderIndexToStrictDateWorks() throws Exception { String newMapping = XContentFactory.jsonBuilder().startObject().startObject("type") .startObject("properties").startObject("date_field") .field("type", "date") - .field("format", "strictDateOptionalTime||epoch_millis") + .field("format", "strict_date_optional_time||epoch_millis") .endObject().endObject().endObject().endObject().string(); PutMappingResponse putMappingResponse = client().admin().indices().preparePutMapping("test").setType("type").setSource(newMapping).get(); assertThat(putMappingResponse.isAcknowledged(), is(true)); - assertDateFormat("strictDateOptionalTime||epoch_millis"); + assertDateFormat("strict_date_optional_time||epoch_millis"); } private void assertDateFormat(String expectedFormat) throws IOException {