From 181b263160ba8651dd7d986abe3c1139f6d0c477 Mon Sep 17 00:00:00 2001 From: Yury-Fridlyand Date: Wed, 21 Sep 2022 10:17:42 -0700 Subject: [PATCH] Rename `DateFormatters` -> `DateTimeFormatters`. Signed-off-by: Yury-Fridlyand --- .../java/org/opensearch/sql/data/model/ExprTimeValue.java | 2 +- .../org/opensearch/sql/data/model/ExprTimestampValue.java | 4 ++-- .../sql/expression/datetime/DateTimeFunction.java | 8 ++++---- .../{DateFormatters.java => DateTimeFormatters.java} | 2 +- .../opensearch/data/value/OpenSearchExprValueFactory.java | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) rename core/src/main/java/org/opensearch/sql/utils/{DateFormatters.java => DateTimeFormatters.java} (99%) diff --git a/core/src/main/java/org/opensearch/sql/data/model/ExprTimeValue.java b/core/src/main/java/org/opensearch/sql/data/model/ExprTimeValue.java index 335e1ed1ff..9c5f5c5d55 100644 --- a/core/src/main/java/org/opensearch/sql/data/model/ExprTimeValue.java +++ b/core/src/main/java/org/opensearch/sql/data/model/ExprTimeValue.java @@ -6,7 +6,7 @@ package org.opensearch.sql.data.model; -import static org.opensearch.sql.utils.DateFormatters.TIME_FORMATTER_VARIABLE_NANOS; +import static org.opensearch.sql.utils.DateTimeFormatters.TIME_FORMATTER_VARIABLE_NANOS; import java.time.LocalTime; import java.time.format.DateTimeFormatter; diff --git a/core/src/main/java/org/opensearch/sql/data/model/ExprTimestampValue.java b/core/src/main/java/org/opensearch/sql/data/model/ExprTimestampValue.java index 3cf8e9d25b..219a4c2663 100644 --- a/core/src/main/java/org/opensearch/sql/data/model/ExprTimestampValue.java +++ b/core/src/main/java/org/opensearch/sql/data/model/ExprTimestampValue.java @@ -6,8 +6,8 @@ package org.opensearch.sql.data.model; -import static org.opensearch.sql.utils.DateFormatters.DATE_TIME_FORMATTER_VARIABLE_NANOS; -import static org.opensearch.sql.utils.DateFormatters.DATE_TIME_FORMATTER_WITHOUT_NANO; +import static org.opensearch.sql.utils.DateTimeFormatters.DATE_TIME_FORMATTER_VARIABLE_NANOS; +import static org.opensearch.sql.utils.DateTimeFormatters.DATE_TIME_FORMATTER_WITHOUT_NANO; import java.time.Instant; import java.time.LocalDate; diff --git a/core/src/main/java/org/opensearch/sql/expression/datetime/DateTimeFunction.java b/core/src/main/java/org/opensearch/sql/expression/datetime/DateTimeFunction.java index 5390f16477..732585d99a 100644 --- a/core/src/main/java/org/opensearch/sql/expression/datetime/DateTimeFunction.java +++ b/core/src/main/java/org/opensearch/sql/expression/datetime/DateTimeFunction.java @@ -18,10 +18,10 @@ import static org.opensearch.sql.expression.function.FunctionDSL.define; import static org.opensearch.sql.expression.function.FunctionDSL.impl; import static org.opensearch.sql.expression.function.FunctionDSL.nullMissingHandling; -import static org.opensearch.sql.utils.DateFormatters.DATE_FORMATTER_LONG_YEAR; -import static org.opensearch.sql.utils.DateFormatters.DATE_FORMATTER_SHORT_YEAR; -import static org.opensearch.sql.utils.DateFormatters.DATE_TIME_FORMATTER_LONG_YEAR; -import static org.opensearch.sql.utils.DateFormatters.DATE_TIME_FORMATTER_SHORT_YEAR; +import static org.opensearch.sql.utils.DateTimeFormatters.DATE_FORMATTER_LONG_YEAR; +import static org.opensearch.sql.utils.DateTimeFormatters.DATE_FORMATTER_SHORT_YEAR; +import static org.opensearch.sql.utils.DateTimeFormatters.DATE_TIME_FORMATTER_LONG_YEAR; +import static org.opensearch.sql.utils.DateTimeFormatters.DATE_TIME_FORMATTER_SHORT_YEAR; import java.math.BigDecimal; import java.math.RoundingMode; diff --git a/core/src/main/java/org/opensearch/sql/utils/DateFormatters.java b/core/src/main/java/org/opensearch/sql/utils/DateTimeFormatters.java similarity index 99% rename from core/src/main/java/org/opensearch/sql/utils/DateFormatters.java rename to core/src/main/java/org/opensearch/sql/utils/DateTimeFormatters.java index 8b15f90b3b..ecb52f7f98 100644 --- a/core/src/main/java/org/opensearch/sql/utils/DateFormatters.java +++ b/core/src/main/java/org/opensearch/sql/utils/DateTimeFormatters.java @@ -27,7 +27,7 @@ * Reference org.opensearch.common.time.DateFormatters. */ @UtilityClass -public class DateFormatters { +public class DateTimeFormatters { public static final DateTimeFormatter TIME_ZONE_FORMATTER_NO_COLON = new DateTimeFormatterBuilder() diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprValueFactory.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprValueFactory.java index b6b256c940..008cbb7ec3 100644 --- a/opensearch/src/main/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprValueFactory.java +++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/data/value/OpenSearchExprValueFactory.java @@ -25,7 +25,7 @@ import static org.opensearch.sql.opensearch.data.type.OpenSearchDataType.OPENSEARCH_IP; import static org.opensearch.sql.opensearch.data.type.OpenSearchDataType.OPENSEARCH_TEXT; import static org.opensearch.sql.opensearch.data.type.OpenSearchDataType.OPENSEARCH_TEXT_KEYWORD; -import static org.opensearch.sql.utils.DateFormatters.DATE_TIME_FORMATTER; +import static org.opensearch.sql.utils.DateTimeFormatters.DATE_TIME_FORMATTER; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper;