[incubator-seatunnel] branch dev updated: Replace plain string with constants (#2308)

[kirs]

This is an automated email from the ASF dual-hosted git repository.

kirs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-seatunnel.git


The following commit(s) were added to refs/heads/dev by this push:
     new 3c0415e56 Replace plain string with constants (#2308)
3c0415e56 is described below

commit 3c0415e56e42d79b403164897724a0199fe0443c
Author: Xiao Zhao <zhaomin1...@163.com>
AuthorDate: Mon Aug 1 09:05:22 2022 +0800

    Replace plain string with constants (#2308)
---
 .../src/main/java/org/apache/seatunnel/common/Constants.java        | 4 ++++
 .../java/org/apache/seatunnel/common/utils/VariablesSubstitute.java | 6 ++++--
 .../file/sink/writer/FileSinkTransactionFileNameGenerator.java      | 5 +++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git 
a/seatunnel-common/src/main/java/org/apache/seatunnel/common/Constants.java 
b/seatunnel-common/src/main/java/org/apache/seatunnel/common/Constants.java
index d75131b83..8e700d89a 100644
--- a/seatunnel-common/src/main/java/org/apache/seatunnel/common/Constants.java
+++ b/seatunnel-common/src/main/java/org/apache/seatunnel/common/Constants.java
@@ -41,6 +41,10 @@ public final class Constants {
 
     public static final String CHECKPOINT_ID = "checkpoint.id";
 
+    public static final String UUID = "uuid";
+
+    public static final String NOW = "now";
+
     private Constants() {
     }
 }
diff --git 
a/seatunnel-common/src/main/java/org/apache/seatunnel/common/utils/VariablesSubstitute.java
 
b/seatunnel-common/src/main/java/org/apache/seatunnel/common/utils/VariablesSubstitute.java
index 671d9eef1..45e62ae4a 100644
--- 
a/seatunnel-common/src/main/java/org/apache/seatunnel/common/utils/VariablesSubstitute.java
+++ 
b/seatunnel-common/src/main/java/org/apache/seatunnel/common/utils/VariablesSubstitute.java
@@ -17,6 +17,8 @@
 
 package org.apache.seatunnel.common.utils;
 
+import org.apache.seatunnel.common.Constants;
+
 import org.apache.commons.lang3.text.StrSubstitutor;
 
 import java.time.ZonedDateTime;
@@ -40,8 +42,8 @@ public final class VariablesSubstitute {
         final String formattedDate = df.format(ZonedDateTime.now());
 
         final Map<String, String> valuesMap = new HashMap<>(3);
-        valuesMap.put("uuid", UUID.randomUUID().toString());
-        valuesMap.put("now", formattedDate);
+        valuesMap.put(Constants.UUID, UUID.randomUUID().toString());
+        valuesMap.put(Constants.NOW, formattedDate);
         valuesMap.put(timeFormat, formattedDate);
         return substitute(text, valuesMap);
     }
diff --git 
a/seatunnel-connectors-v2/connector-file/connector-file-base/src/main/java/org/apache/seatunnel/connectors/seatunnel/file/sink/writer/FileSinkTransactionFileNameGenerator.java
 
b/seatunnel-connectors-v2/connector-file/connector-file-base/src/main/java/org/apache/seatunnel/connectors/seatunnel/file/sink/writer/FileSinkTransactionFileNameGenerator.java
index 1c253cc5d..92285217b 100644
--- 
a/seatunnel-connectors-v2/connector-file/connector-file-base/src/main/java/org/apache/seatunnel/connectors/seatunnel/file/sink/writer/FileSinkTransactionFileNameGenerator.java
+++ 
b/seatunnel-connectors-v2/connector-file/connector-file-base/src/main/java/org/apache/seatunnel/connectors/seatunnel/file/sink/writer/FileSinkTransactionFileNameGenerator.java
@@ -17,6 +17,7 @@
 
 package org.apache.seatunnel.connectors.seatunnel.file.sink.writer;
 
+import org.apache.seatunnel.common.Constants;
 import org.apache.seatunnel.common.utils.VariablesSubstitute;
 import org.apache.seatunnel.connectors.seatunnel.file.config.Constant;
 import org.apache.seatunnel.connectors.seatunnel.file.config.FileFormat;
@@ -57,8 +58,8 @@ public class FileSinkTransactionFileNameGenerator implements 
TransactionFileName
         final String formattedDate = df.format(ZonedDateTime.now());
 
         final Map<String, String> valuesMap = new HashMap<>(4);
-        valuesMap.put("uuid", UUID.randomUUID().toString());
-        valuesMap.put("now", formattedDate);
+        valuesMap.put(Constants.UUID, UUID.randomUUID().toString());
+        valuesMap.put(Constants.NOW, formattedDate);
         valuesMap.put(timeFormat, formattedDate);
         valuesMap.put(Constant.TRANSACTION_EXPRESSION, transactionId);
         String substitute = VariablesSubstitute.substitute(fileNameExpression, 
valuesMap);