This is an automated email from the ASF dual-hosted git repository. rgoers pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/flume-search.git
commit 3106b4ba302da4e3adc843e54b76ec3f6ea9fab1 Author: xuwenping <[email protected]> AuthorDate: Wed Mar 29 23:09:21 2023 +0800 solve fastDateFormat unit test failed --- .../flume/sink/elasticsearch/TimeBasedIndexNameBuilder.java | 2 +- .../TestElasticSearchIndexRequestBuilderFactory.java | 7 ++++++- .../flume/sink/elasticsearch/TimeBasedIndexNameBuilderTest.java | 8 +++++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/flume-elasticsearch-sink/src/main/java/org/apache/flume/sink/elasticsearch/TimeBasedIndexNameBuilder.java b/flume-elasticsearch-sink/src/main/java/org/apache/flume/sink/elasticsearch/TimeBasedIndexNameBuilder.java index c651732..c4aa9c3 100644 --- a/flume-elasticsearch-sink/src/main/java/org/apache/flume/sink/elasticsearch/TimeBasedIndexNameBuilder.java +++ b/flume-elasticsearch-sink/src/main/java/org/apache/flume/sink/elasticsearch/TimeBasedIndexNameBuilder.java @@ -42,7 +42,7 @@ public class TimeBasedIndexNameBuilder implements public static final String DEFAULT_TIME_ZONE = "Etc/UTC"; private FastDateFormat fastDateFormat = FastDateFormat.getInstance("yyyy-MM-dd", - TimeZone.getTimeZone("Etc/UTC")); + TimeZone.getTimeZone(DEFAULT_TIME_ZONE)); private String indexPrefix; diff --git a/flume-elasticsearch-sink/src/test/java/org/apache/flume/sink/elasticsearch/TestElasticSearchIndexRequestBuilderFactory.java b/flume-elasticsearch-sink/src/test/java/org/apache/flume/sink/elasticsearch/TestElasticSearchIndexRequestBuilderFactory.java index b62254e..ee434f6 100644 --- a/flume-elasticsearch-sink/src/test/java/org/apache/flume/sink/elasticsearch/TestElasticSearchIndexRequestBuilderFactory.java +++ b/flume-elasticsearch-sink/src/test/java/org/apache/flume/sink/elasticsearch/TestElasticSearchIndexRequestBuilderFactory.java @@ -32,7 +32,9 @@ import org.junit.Before; import org.junit.Test; import java.io.IOException; +import java.util.Locale; import java.util.Map; +import java.util.TimeZone; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -63,7 +65,10 @@ public class TestElasticSearchIndexRequestBuilderFactory @Test public void shouldUseUtcAsBasisForDateFormat() { assertEquals("Coordinated Universal Time", - factory.fastDateFormat.getTimeZone().getDisplayName()); + factory.fastDateFormat.getTimeZone().getDisplayName( + false, + TimeZone.LONG, + Locale.ENGLISH)); } @Test diff --git a/flume-elasticsearch-sink/src/test/java/org/apache/flume/sink/elasticsearch/TimeBasedIndexNameBuilderTest.java b/flume-elasticsearch-sink/src/test/java/org/apache/flume/sink/elasticsearch/TimeBasedIndexNameBuilderTest.java index 678342a..ac867dc 100644 --- a/flume-elasticsearch-sink/src/test/java/org/apache/flume/sink/elasticsearch/TimeBasedIndexNameBuilderTest.java +++ b/flume-elasticsearch-sink/src/test/java/org/apache/flume/sink/elasticsearch/TimeBasedIndexNameBuilderTest.java @@ -25,8 +25,11 @@ import org.junit.Before; import org.junit.Test; import java.util.HashMap; +import java.util.Locale; import java.util.Map; +import java.util.TimeZone; +import static org.apache.flume.sink.elasticsearch.TimeBasedIndexNameBuilder.DEFAULT_TIME_ZONE; import static org.junit.Assert.assertEquals; public class TimeBasedIndexNameBuilderTest { @@ -44,7 +47,10 @@ public class TimeBasedIndexNameBuilderTest { @Test public void shouldUseUtcAsBasisForDateFormat() { assertEquals("Coordinated Universal Time", - indexNameBuilder.getFastDateFormat().getTimeZone().getDisplayName()); + indexNameBuilder.getFastDateFormat().getTimeZone().getDisplayName( + false, + TimeZone.LONG, + Locale.ENGLISH)); } @Test
