Rewrite LogUtils call sites

This commit contains exclusively code changes performed by Error Prone
and rewrites all the callsites to `LogUtils` to use the `Logger` object
directly.

eventmesh-common/src/main/java/org/apache/eventmesh/common/file/WatchFileManager.java

@@ -17,8 +17,6 @@
 
 package org.apache.eventmesh.common.file;
 
-import org.apache.eventmesh.common.utils.LogUtils;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -62,10 +60,10 @@ private static void shutdown() {
             return;
         }
 
-        LogUtils.info(log, "[WatchFileManager] start close");
+        log.info("[WatchFileManager] start close");
 
         for (Map.Entry<String, WatchFileTask> entry : WATCH_FILE_TASK_MAP.entrySet()) {
-            LogUtils.info(log, "[WatchFileManager] start to shutdown : {}", entry.getKey());
+            log.info("[WatchFileManager] start to shutdown : {}", entry.getKey());
 
             try {
                 entry.getValue().shutdown();

eventmesh-common/src/main/java/org/apache/eventmesh/common/file/WatchFileTask.java

@@ -17,8 +17,6 @@
 
 package org.apache.eventmesh.common.file;
 
-import org.apache.eventmesh.common.utils.LogUtils;
-
 import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;
 import java.nio.file.Path;
@@ -89,15 +87,15 @@ public void run() {
                 for (WatchEvent<?> event : events) {
                     WatchEvent.Kind<?> kind = event.kind();
                     if (kind.equals(StandardWatchEventKinds.OVERFLOW)) {
-                        LogUtils.warn(log, "[WatchFileTask] file overflow: {}", event.context());
+                        log.warn("[WatchFileTask] file overflow: {}", event.context());
                         continue;
                     }
                     precessWatchEvent(event);
                 }
             } catch (InterruptedException ex) {
                 boolean interrupted = Thread.interrupted();
                 if (interrupted) {
-                    LogUtils.debug(log, "[WatchFileTask] file watch is interrupted");
+                    log.debug("[WatchFileTask] file watch is interrupted");
                 }
             } catch (Exception ex) {
                 log.error("[WatchFileTask] an exception occurred during file listening : ", ex);

eventmesh-common/src/main/java/org/apache/eventmesh/common/protocol/tcp/codec/Codec.java

@@ -25,7 +25,6 @@
 import org.apache.eventmesh.common.protocol.tcp.Subscription;
 import org.apache.eventmesh.common.protocol.tcp.UserAgent;
 import org.apache.eventmesh.common.utils.JsonUtils;
-import org.apache.eventmesh.common.utils.LogUtils;
 
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -39,7 +38,6 @@
 import io.netty.handler.codec.MessageToByteEncoder;
 import io.netty.handler.codec.ReplayingDecoder;
 
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.google.common.base.Preconditions;
 
@@ -161,7 +159,7 @@ private Header parseHeader(ByteBuf in, int headerLength) throws JsonProcessingEx
             }
             final byte[] headerData = new byte[headerLength];
             in.readBytes(headerData);
-            LogUtils.debug(log, "Decode headerJson={}", deserializeBytes(headerData));
+            log.debug("Decode headerJson={}", deserializeBytes(headerData));
             return JsonUtils.parseObject(headerData, Header.class);
         }
 
@@ -171,7 +169,7 @@ private Object parseBody(ByteBuf in, Header header, int bodyLength) throws JsonP
             }
             final byte[] bodyData = new byte[bodyLength];
             in.readBytes(bodyData);
-            LogUtils.debug(log, "Decode bodyJson={}", deserializeBytes(bodyData));
+            log.debug("Decode bodyJson={}", deserializeBytes(bodyData));
             return deserializeBody(deserializeBytes(bodyData), header);
         }
 
@@ -223,7 +221,7 @@ private static Object deserializeBody(String bodyJsonString, Header header) thro
             case REDIRECT_TO_CLIENT:
                 return JsonUtils.parseObject(bodyJsonString, RedirectInfo.class);
             default:
-                LogUtils.warn(log, "Invalidate TCP command: {}", command);
+                log.warn("Invalidate TCP command: {}", command);
                 return null;
         }
     }

eventmesh-common/src/main/java/org/apache/eventmesh/common/utils/LogUtils.java

@@ -44,49 +44,49 @@ public static boolean isTraceEnabled(Logger logger, Marker marker) {
 
     @InlineMe(replacement = "logger.trace(msg)")
     public static void trace(Logger logger, String msg) {
-        if (isTraceEnabled(logger)) {
+        if (logger.isTraceEnabled()) {
             logger.trace(msg);
         }
     }
 
     @InlineMe(replacement = "logger.trace(format, arg)")
     public static void trace(Logger logger, String format, Object arg) {
-        if (isTraceEnabled(logger)) {
+        if (logger.isTraceEnabled()) {
             logger.trace(format, arg);
         }
     }
 
     @InlineMe(replacement = "logger.trace(msg, t)")
     public static void trace(Logger logger, String msg, Throwable t) {
-        if (isTraceEnabled(logger)) {
+        if (logger.isTraceEnabled()) {
             logger.trace(msg, t);
         }
     }
 
     @InlineMe(replacement = "logger.trace(format, arguments)")
     public static void trace(Logger logger, String format, Object... arguments) {
-        if (isTraceEnabled(logger)) {
+        if (logger.isTraceEnabled()) {
             logger.trace(format, arguments);
         }
     }
 
     @InlineMe(replacement = "logger.trace(format, arg1, arg2)")
     public static void trace(Logger logger, String format, Object arg1, Object arg2) {
-        if (isTraceEnabled(logger)) {
+        if (logger.isTraceEnabled()) {
             logger.trace(format, arg1, arg2);
         }
     }
 
     @InlineMe(replacement = "logger.trace(marker, msg)")
     public static void trace(Logger logger, Marker marker, String msg) {
-        if (isTraceEnabled(logger, marker)) {
+        if (logger.isTraceEnabled(marker)) {
             logger.trace(marker, msg);
         }
     }
 
     @InlineMe(replacement = "logger.trace(marker, format, arg)")
     public static void trace(Logger logger, Marker marker, String format, Object arg) {
-        if (isTraceEnabled(logger, marker)) {
+        if (logger.isTraceEnabled(marker)) {
             logger.trace(marker, format, arg);
         }
     }
@@ -98,35 +98,35 @@ public static boolean isDebugEnabled(Logger logger) {
 
     @InlineMe(replacement = "logger.debug(msg)")
     public static void debug(Logger logger, String msg) {
-        if (isDebugEnabled(logger)) {
+        if (logger.isDebugEnabled()) {
             logger.debug(msg);
         }
     }
 
     @InlineMe(replacement = "logger.debug(format, arg)")
     public static void debug(Logger logger, String format, Object arg) {
-        if (isDebugEnabled(logger)) {
+        if (logger.isDebugEnabled()) {
             logger.debug(format, arg);
         }
     }
 
     @InlineMe(replacement = "logger.debug(format, arg1, arg2)")
     public static void debug(Logger logger, String format, Object arg1, Object arg2) {
-        if (isDebugEnabled(logger)) {
+        if (logger.isDebugEnabled()) {
             logger.debug(format, arg1, arg2);
         }
     }
 
     @InlineMe(replacement = "logger.debug(format, arguments)")
     public static void debug(Logger logger, String format, Object... arguments) {
-        if (isDebugEnabled(logger)) {
+        if (logger.isDebugEnabled()) {
             logger.debug(format, arguments);
         }
     }
 
     @InlineMe(replacement = "logger.debug(msg, t)")
     public static void debug(Logger logger, String msg, Throwable t) {
-        if (isDebugEnabled(logger)) {
+        if (logger.isDebugEnabled()) {
             logger.debug(msg, t);
         }
     }
@@ -138,35 +138,35 @@ public static boolean isInfoEnabled(Logger logger) {
 
     @InlineMe(replacement = "logger.info(msg)")
     public static void info(Logger logger, String msg) {
-        if (isInfoEnabled(logger)) {
+        if (logger.isInfoEnabled()) {
             logger.info(msg);
         }
     }
 
     @InlineMe(replacement = "logger.info(format, arg)")
     public static void info(Logger logger, String format, Object arg) {
-        if (isInfoEnabled(logger)) {
+        if (logger.isInfoEnabled()) {
             logger.info(format, arg);
         }
     }
 
     @InlineMe(replacement = "logger.info(format, arg1, arg2)")
     public static void info(Logger logger, String format, Object arg1, Object arg2) {
-        if (isInfoEnabled(logger)) {
+        if (logger.isInfoEnabled()) {
             logger.info(format, arg1, arg2);
         }
     }
 
     @InlineMe(replacement = "logger.info(format, arguments)")
     public static void info(Logger logger, String format, Object... arguments) {
-        if (isInfoEnabled(logger)) {
+        if (logger.isInfoEnabled()) {
             logger.info(format, arguments);
         }
     }
 
     @InlineMe(replacement = "logger.info(msg, t)")
     public static void info(Logger logger, String msg, Throwable t) {
-        if (isInfoEnabled(logger)) {
+        if (logger.isInfoEnabled()) {
             logger.info(msg, t);
         }
     }
@@ -178,35 +178,35 @@ public static boolean isWarnEnabled(Logger logger) {
 
     @InlineMe(replacement = "logger.warn(msg)")
     public static void warn(Logger logger, String msg) {
-        if (isWarnEnabled(logger)) {
+        if (logger.isWarnEnabled()) {
             logger.warn(msg);
         }
     }
 
     @InlineMe(replacement = "logger.warn(format, arg)")
     public static void warn(Logger logger, String format, Object arg) {
-        if (isWarnEnabled(logger)) {
+        if (logger.isWarnEnabled()) {
             logger.warn(format, arg);
         }
     }
 
     @InlineMe(replacement = "logger.warn(format, arg1, arg2)")
     public static void warn(Logger logger, String format, Object arg1, Object arg2) {
-        if (isWarnEnabled(logger)) {
+        if (logger.isWarnEnabled()) {
             logger.warn(format, arg1, arg2);
         }
     }
 
     @InlineMe(replacement = "logger.warn(format, arguments)")
     public static void warn(Logger logger, String format, Object... arguments) {
-        if (isWarnEnabled(logger)) {
+        if (logger.isWarnEnabled()) {
             logger.warn(format, arguments);
         }
     }
 
     @InlineMe(replacement = "logger.warn(msg, t)")
     public static void warn(Logger logger, String msg, Throwable t) {
-        if (isWarnEnabled(logger)) {
+        if (logger.isWarnEnabled()) {
             logger.warn(msg, t);
         }
     }
@@ -218,35 +218,35 @@ public static boolean isErrorEnabled(Logger logger) {
 
     @InlineMe(replacement = "logger.error(msg)")
     public static void error(Logger logger, String msg) {
-        if (isErrorEnabled(logger)) {
+        if (logger.isErrorEnabled()) {
             logger.error(msg);
         }
     }
 
     @InlineMe(replacement = "logger.error(format, arg)")
     public static void error(Logger logger, String format, Object arg) {
-        if (isErrorEnabled(logger)) {
+        if (logger.isErrorEnabled()) {
             logger.error(format, arg);
         }
     }
 
     @InlineMe(replacement = "logger.error(format, arg1, arg2)")
     public static void error(Logger logger, String format, Object arg1, Object arg2) {
-        if (isErrorEnabled(logger)) {
+        if (logger.isErrorEnabled()) {
             logger.error(format, arg1, arg2);
         }
     }
 
     @InlineMe(replacement = "logger.error(format, arguments)")
     public static void error(Logger logger, String format, Object... arguments) {
-        if (isErrorEnabled(logger)) {
+        if (logger.isErrorEnabled()) {
             logger.error(format, arguments);
         }
     }
 
     @InlineMe(replacement = "logger.error(msg, t)")
     public static void error(Logger logger, String msg, Throwable t) {
-        if (isErrorEnabled(logger)) {
+        if (logger.isErrorEnabled()) {
             logger.error(msg, t);
         }
     }

eventmesh-connectors/eventmesh-connector-jdbc/src/main/java/org/apache/eventmesh/connector/jdbc/connection/JdbcConnection.java

@@ -17,7 +17,6 @@
 
 package org.apache.eventmesh.connector.jdbc.connection;
 
-import org.apache.eventmesh.common.utils.LogUtils;
 import org.apache.eventmesh.connector.jdbc.JdbcDriverMetaData;
 import org.apache.eventmesh.connector.jdbc.config.JdbcConfig;
 
@@ -182,7 +181,7 @@ public JdbcConnection execute(String... sqlStatements) throws SQLException {
         return execute(statement -> {
             for (String sqlStatement : sqlStatements) {
                 if (sqlStatement != null) {
-                    LogUtils.debug(log, "Executing '{}'", sqlStatement);
+                    log.debug("Executing '{}'", sqlStatement);
                     statement.execute(sqlStatement);
                 }
             }
@@ -220,7 +219,7 @@ public JdbcConnection executeWithoutCommitting(String... sqlStatements) throws S
 
         try (Statement statement = conn.createStatement()) {
             for (String sqlStatement : sqlStatements) {
-                LogUtils.debug(log, "Executing sql statement: {}", sqlStatement);
+                log.debug("Executing sql statement: {}", sqlStatement);
                 statement.execute(sqlStatement);
             }
         }
@@ -293,7 +292,7 @@ public JdbcConnection query(String sql, JdbcResultSetConsumer resultConsumer) th
     public JdbcConnection query(String sql, StatementFactory statementFactory, JdbcResultSetConsumer resultConsumer) throws SQLException {
         Connection conn = connection();
         try (Statement statement = statementFactory.createStatement(conn)) {
-            LogUtils.debug(log, "Query sql '{}'", sql);
+            log.debug("Query sql '{}'", sql);
             try (ResultSet resultSet = statement.executeQuery(sql)) {
                 if (resultConsumer != null) {
                     resultConsumer.accept(resultSet);
@@ -331,7 +330,7 @@ public <T> T query(String sql, ResultSetMapper<T> resultSetMapper) throws SQLExc
     public <T> T query(String sql, StatementFactory statementFactory, ResultSetMapper<T> resultSetMapper) throws SQLException {
         Connection conn = connection();
         try (Statement statement = statementFactory.createStatement(conn)) {
-            LogUtils.debug(log, "Query sql '{}'", sql);
+            log.debug("Query sql '{}'", sql);
             try (ResultSet resultSet = statement.executeQuery(sql)) {
                 if (resultSetMapper != null) {
                     return resultSetMapper.map(resultSet);
@@ -374,7 +373,7 @@ public JdbcConnection preparedQuery(String sql, PreparedStatementFactory prepare
 
         Connection conn = connection();
         try (PreparedStatement preparedStatement = preparedStatementFactory.createPreparedStatement(conn, sql)) {
-            LogUtils.debug(log, "Query sql '{}'", sql);
+            log.debug("Query sql '{}'", sql);
             if (preparedParameters != null) {
                 for (int index = 0; index < preparedParameters.length; ++index) {
                     final PreparedParameter preparedParameter = preparedParameters[index];
@@ -427,7 +426,7 @@ public <T> T preparedQuery(String sql, PreparedStatementFactory preparedStatemen
 
         Connection conn = connection();
         try (PreparedStatement preparedStatement = preparedStatementFactory.createPreparedStatement(conn, sql)) {
-            LogUtils.debug(log, "Query sql '{}'", sql);
+            log.debug("Query sql '{}'", sql);
             if (preparedParameters != null) {
                 for (int index = 0; index < preparedParameters.length; ++index) {
                     final PreparedParameter preparedParameter = preparedParameters[index];
@@ -568,9 +567,9 @@ public static ConnectionFactory createPatternConnectionFactory(String urlWithPla
             } else {
                 url = urlWithPlaceholder;
             }
-            LogUtils.debug(log, "URL: {}", url);
+            log.debug("URL: {}", url);
             Connection connection = DriverManager.getConnection(url, config.asProperties());
-            LogUtils.debug(log, "User [{}] Connected to {}", config.getUser(), url);
+            log.debug("User [{}] Connected to {}", config.getUser(), url);
             return connection;
         };
     }