Refactor DateProcessor to encapsulate the templates

Author: joegallo

modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/DateProcessor.java

@@ -116,8 +116,8 @@ public IngestDocument execute(IngestDocument document) {
         final ZoneId documentTimezone;
         final Locale documentLocale;
         try {
-            documentTimezone = newDateTimeZone(timezone == null ? null : document.renderTemplate(timezone));
-            documentLocale = newLocale(locale == null ? null : document.renderTemplate(locale));
+            documentTimezone = getTimezone(document);
+            documentLocale = getLocale(document);
         } catch (Exception e) {
             throw new IllegalArgumentException("unable to parse date [" + value + "]", e);
         }
@@ -147,12 +147,14 @@ public String getType() {
         return TYPE;
     }
 
-    TemplateScript.Factory getTimezone() {
-        return timezone;
+    // visible for testing
+    ZoneId getTimezone(IngestDocument document) {
+        return newDateTimeZone(timezone == null ? null : document.renderTemplate(timezone));
     }
 
-    TemplateScript.Factory getLocale() {
-        return locale;
+    // visible for testing
+    Locale getLocale(IngestDocument document) {
+        return newLocale(locale == null ? null : document.renderTemplate(locale));
     }
 
     String getField() {

modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/DateProcessorFactoryTests.java

@@ -10,11 +10,14 @@
 package org.elasticsearch.ingest.common;
 
 import org.elasticsearch.ElasticsearchParseException;
+import org.elasticsearch.ingest.IngestDocument;
+import org.elasticsearch.ingest.RandomDocumentPicks;
 import org.elasticsearch.ingest.TestTemplateService;
 import org.elasticsearch.test.ESTestCase;
 import org.junit.Before;
 
 import java.time.ZoneId;
+import java.time.ZoneOffset;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -43,8 +46,8 @@ public void testBuildDefaults() throws Exception {
         assertThat(processor.getField(), equalTo(sourceField));
         assertThat(processor.getTargetField(), equalTo(DateProcessor.DEFAULT_TARGET_FIELD));
         assertThat(processor.getFormats(), equalTo(List.of("dd/MM/yyyyy")));
-        assertNull(processor.getLocale());
-        assertNull(processor.getTimezone());
+        assertThat(processor.getTimezone(null), equalTo(ZoneOffset.UTC));
+        assertThat(processor.getLocale(null), equalTo(Locale.ENGLISH));
     }
 
     public void testMatchFieldIsMandatory() throws Exception {
@@ -85,7 +88,8 @@ public void testParseLocale() throws Exception {
         config.put("locale", locale.toLanguageTag());
 
         DateProcessor processor = factory.create(null, null, null, config, null);
-        assertThat(processor.getLocale().newInstance(Map.of()).execute(), equalTo(locale.toLanguageTag()));
+        IngestDocument document = RandomDocumentPicks.randomIngestDocument(random(), Map.of());
+        assertThat(processor.getLocale(document), equalTo(locale));
     }
 
     public void testParseTimezone() throws Exception {
@@ -97,7 +101,8 @@ public void testParseTimezone() throws Exception {
         ZoneId timezone = randomZone();
         config.put("timezone", timezone.getId());
         DateProcessor processor = factory.create(null, null, null, config, null);
-        assertThat(processor.getTimezone().newInstance(Map.of()).execute(), equalTo(timezone.getId()));
+        IngestDocument document = RandomDocumentPicks.randomIngestDocument(random(), Map.of());
+        assertThat(processor.getTimezone(document), equalTo(timezone));
     }
 
     public void testParseMatchFormats() throws Exception {