You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by yu...@apache.org on 2022/06/02 08:58:22 UTC
[rocketmq-connect] 05/10: update eventTime
This is an automated email from the ASF dual-hosted git repository.
yukon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/rocketmq-connect.git
commit 5228be05556811c2e80c8b64cd5174066efce98e
Author: zh378814 <wb...@alibaba-inc.com>
AuthorDate: Tue May 31 11:18:55 2022 +0800
update eventTime
---
.../eventbridge/sink/EventBridgeSinkConnector.java | 4 ++--
.../eventbridge/sink/EventBridgeSinkTask.java | 3 +--
.../connect/eventbridge/sink/utils/DateUtils.java | 25 ++++++++++++++++------
3 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/connectors/aliyun/rocketmq-connect-eventbridge/src/main/java/org/apache/rocketmq/connect/eventbridge/sink/EventBridgeSinkConnector.java b/connectors/aliyun/rocketmq-connect-eventbridge/src/main/java/org/apache/rocketmq/connect/eventbridge/sink/EventBridgeSinkConnector.java
index cc0d0a5..7a22997 100644
--- a/connectors/aliyun/rocketmq-connect-eventbridge/src/main/java/org/apache/rocketmq/connect/eventbridge/sink/EventBridgeSinkConnector.java
+++ b/connectors/aliyun/rocketmq-connect-eventbridge/src/main/java/org/apache/rocketmq/connect/eventbridge/sink/EventBridgeSinkConnector.java
@@ -6,9 +6,9 @@ import io.openmessaging.connector.api.component.task.sink.SinkConnector;
import io.openmessaging.internal.DefaultKeyValue;
import org.apache.commons.lang3.StringUtils;
import org.apache.rocketmq.connect.eventbridge.sink.constant.EventBridgeConstant;
+import org.apache.rocketmq.connect.eventbridge.sink.utils.DateUtils;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
public class EventBridgeSinkConnector extends SinkConnector {
@@ -86,7 +86,7 @@ public class EventBridgeSinkConnector extends SinkConnector {
accessKeySecret = config.getString(EventBridgeConstant.ACCESS_KEY_SECRET);
roleArn = config.getString(EventBridgeConstant.ROLE_ARN);
roleSessionName = config.getString(EventBridgeConstant.ROLE_SESSION_NAME);
- eventTime = config.getString(EventBridgeConstant.EVENT_TIME, new Date().toString());
+ eventTime = config.getString(EventBridgeConstant.EVENT_TIME, DateUtils.getDate());
eventSubject = config.getString(EventBridgeConstant.EVENT_SUBJECT);
aliyuneventbusname = config.getString(EventBridgeConstant.ALIYUN_EVENT_BUS_NAME);
accountEndpoint = config.getString(EventBridgeConstant.ACCOUNT_ENDPOINT);
diff --git a/connectors/aliyun/rocketmq-connect-eventbridge/src/main/java/org/apache/rocketmq/connect/eventbridge/sink/EventBridgeSinkTask.java b/connectors/aliyun/rocketmq-connect-eventbridge/src/main/java/org/apache/rocketmq/connect/eventbridge/sink/EventBridgeSinkTask.java
index c1ce188..4a4fc74 100644
--- a/connectors/aliyun/rocketmq-connect-eventbridge/src/main/java/org/apache/rocketmq/connect/eventbridge/sink/EventBridgeSinkTask.java
+++ b/connectors/aliyun/rocketmq-connect-eventbridge/src/main/java/org/apache/rocketmq/connect/eventbridge/sink/EventBridgeSinkTask.java
@@ -24,7 +24,6 @@ import org.slf4j.LoggerFactory;
import java.net.URI;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
public class EventBridgeSinkTask extends SinkTask {
@@ -94,7 +93,7 @@ public class EventBridgeSinkTask extends SinkTask {
accessKeySecret = config.getString(EventBridgeConstant.ACCESS_KEY_SECRET);
roleArn = config.getString(EventBridgeConstant.ROLE_ARN);
roleSessionName = config.getString(EventBridgeConstant.ROLE_SESSION_NAME);
- eventTime = config.getString(EventBridgeConstant.EVENT_TIME, new Date().toString());
+ eventTime = config.getString(EventBridgeConstant.EVENT_TIME, DateUtils.getDate());
eventSubject = config.getString(EventBridgeConstant.EVENT_SUBJECT);
aliyuneventbusname = config.getString(EventBridgeConstant.ALIYUN_EVENT_BUS_NAME);
accountEndpoint = config.getString(EventBridgeConstant.ACCOUNT_ENDPOINT);
diff --git a/connectors/aliyun/rocketmq-connect-eventbridge/src/main/java/org/apache/rocketmq/connect/eventbridge/sink/utils/DateUtils.java b/connectors/aliyun/rocketmq-connect-eventbridge/src/main/java/org/apache/rocketmq/connect/eventbridge/sink/utils/DateUtils.java
index c361653..380f14e 100644
--- a/connectors/aliyun/rocketmq-connect-eventbridge/src/main/java/org/apache/rocketmq/connect/eventbridge/sink/utils/DateUtils.java
+++ b/connectors/aliyun/rocketmq-connect-eventbridge/src/main/java/org/apache/rocketmq/connect/eventbridge/sink/utils/DateUtils.java
@@ -1,16 +1,29 @@
package org.apache.rocketmq.connect.eventbridge.sink.utils;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
import java.util.Date;
public class DateUtils {
+ private static final Logger log = LoggerFactory.getLogger(DateUtils.class);
public static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
- public static Date getDate(String date, String dateFormat) {
- final LocalDateTime parse = LocalDateTime.parse(date, DateTimeFormatter.ofPattern(dateFormat));
- return Date.from(parse.atZone(ZoneId.systemDefault()).toInstant());
+ public static synchronized Date getDate(String date, String dateFormat) {
+ try {
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat(dateFormat);
+ return simpleDateFormat.parse(date);
+ } catch (Exception e) {
+ log.error("DateUtils | getDate | error => ", e);
+ }
+ return null;
+ }
+
+ public static String getDate() {
+ DateFormat dateFormat = new SimpleDateFormat(DEFAULT_DATE_FORMAT);
+ return dateFormat.format(new Date());
}
}