diff --git a/core/src/main/java/com/taobao/arthas/core/command/monitor200/TimeTunnelCommand.java b/core/src/main/java/com/taobao/arthas/core/command/monitor200/TimeTunnelCommand.java index 9c4f301c8e..700416165a 100644 --- a/core/src/main/java/com/taobao/arthas/core/command/monitor200/TimeTunnelCommand.java +++ b/core/src/main/java/com/taobao/arthas/core/command/monitor200/TimeTunnelCommand.java @@ -9,11 +9,7 @@ import com.taobao.arthas.core.command.Constants; import com.taobao.arthas.core.command.express.ExpressException; import com.taobao.arthas.core.command.express.ExpressFactory; -import com.taobao.arthas.core.command.model.MessageModel; -import com.taobao.arthas.core.command.model.ObjectVO; -import com.taobao.arthas.core.command.model.RowAffectModel; -import com.taobao.arthas.core.command.model.TimeFragmentVO; -import com.taobao.arthas.core.command.model.TimeTunnelModel; +import com.taobao.arthas.core.command.model.*; import com.taobao.arthas.core.shell.command.CommandProcess; import com.taobao.arthas.core.shell.handlers.command.CommandInterruptHandler; import com.taobao.arthas.core.shell.handlers.shell.QExitHandler; @@ -22,15 +18,10 @@ import com.taobao.arthas.core.util.StringUtils; import com.taobao.arthas.core.util.affect.RowAffect; import com.taobao.arthas.core.util.matcher.Matcher; -import com.taobao.middleware.cli.annotations.Description; -import com.taobao.middleware.cli.annotations.Name; -import com.taobao.middleware.cli.annotations.Option; -import com.taobao.middleware.cli.annotations.Summary; -import com.taobao.middleware.cli.annotations.Argument; +import com.taobao.middleware.cli.annotations.*; import java.time.LocalDateTime; import java.util.ArrayList; -import java.util.Date; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/com/taobao/arthas/core/command/monitor200/TimeTunnelTable.java b/core/src/main/java/com/taobao/arthas/core/command/monitor200/TimeTunnelTable.java index 22d238279c..bc759286bb 100644 --- a/core/src/main/java/com/taobao/arthas/core/command/monitor200/TimeTunnelTable.java +++ b/core/src/main/java/com/taobao/arthas/core/command/monitor200/TimeTunnelTable.java @@ -13,8 +13,7 @@ import java.io.PrintWriter; import java.io.StringWriter; import java.lang.reflect.InvocationTargetException; -import java.text.SimpleDateFormat; -import java.util.Date; +import java.time.LocalDateTime; import java.util.List; import java.util.Map; @@ -93,9 +92,8 @@ static TableElement fillTableRow(TableElement table, TimeFragmentVO tf) { } public static void drawTimeTunnel(TableElement table, TimeFragmentVO tf) { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); table.row("INDEX", "" + tf.getIndex()) - .row("GMT-CREATE", sdf.format(tf.getTimestamp())) + .row("GMT-CREATE", DateUtils.formatDateTime(tf.getTimestamp())) .row("COST(ms)", "" + tf.getCost()) .row("OBJECT", tf.getObject()) .row("CLASS", tf.getClassName()) @@ -161,9 +159,8 @@ public static void drawWatchResults(TableElement table, Map w public static TableElement drawPlayHeader(String className, String methodName, String objectAddress, int index, TableElement table) { - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); return table.row("RE-INDEX", "" + index) - .row("GMT-REPLAY", sdf.format(new Date())) + .row("GMT-REPLAY", DateUtils.formatDateTime(LocalDateTime.now())) .row("OBJECT", objectAddress) .row("CLASS", className) .row("METHOD", methodName); diff --git a/core/src/main/java/com/taobao/arthas/core/command/view/MonitorView.java b/core/src/main/java/com/taobao/arthas/core/command/view/MonitorView.java index 78be134a20..a5a644a608 100644 --- a/core/src/main/java/com/taobao/arthas/core/command/view/MonitorView.java +++ b/core/src/main/java/com/taobao/arthas/core/command/view/MonitorView.java @@ -9,7 +9,6 @@ import com.taobao.text.util.RenderUtil; import java.text.DecimalFormat; -import java.text.SimpleDateFormat; import static com.taobao.text.ui.Element.label; diff --git a/core/src/main/java/com/taobao/arthas/core/util/DateUtils.java b/core/src/main/java/com/taobao/arthas/core/util/DateUtils.java index 50bb357f8d..2efa0dedb2 100644 --- a/core/src/main/java/com/taobao/arthas/core/util/DateUtils.java +++ b/core/src/main/java/com/taobao/arthas/core/util/DateUtils.java @@ -12,7 +12,7 @@ private DateUtils() { throw new AssertionError(); } - public static DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS"); + private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS"); public static String getCurrentDateTime() { return DATE_TIME_FORMATTER.format(LocalDateTime.now());