lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2026-02-09 09:16:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly
2025-10-27 00:31:51 +08:00
parent 3cd7435541
commit ac50c13f4f
115 changed files with 685 additions and 1129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
hutool-log/src/main/java/cn/hutool/v7/log/engine/log4j/Log4jLog.java
View File

@@ -129,26 +129,14 @@ public class Log4jLog extends AbstractLog {
// ------------------------------------------------------------------------- Log
@Override
public void log(final String fqcn, final cn.hutool.v7.log.level.Level level, final Throwable t, final String format, final Object... arguments) {
final Level log4jLevel;
switch (level) {
case TRACE:
log4jLevel = Level.TRACE;
break;
case DEBUG:
log4jLevel = Level.DEBUG;
break;
case INFO:
log4jLevel = Level.INFO;
break;
case WARN:
log4jLevel = Level.WARN;
break;
case ERROR:
log4jLevel = Level.ERROR;
break;
default:
throw new Error(StrUtil.format("Can not identify level: {}", level));
}
final Level log4jLevel = switch (level) {
case TRACE -> Level.TRACE;
case DEBUG -> Level.DEBUG;
case INFO -> Level.INFO;
case WARN -> Level.WARN;
case ERROR -> Level.ERROR;
default -> throw new Error(StrUtil.format("Can not identify level: {}", level));
};
if(logger.isEnabled(log4jLevel)) {
//Log4j2的API设计已内置类名自动获取能力

28
hutool-log/src/main/java/cn/hutool/v7/log/engine/log4j2/Log4j2Log.java
View File

@@ -128,26 +128,14 @@ public class Log4j2Log extends AbstractLog {
// ------------------------------------------------------------------------- Log
@Override
public void log(final String fqcn, final cn.hutool.v7.log.level.Level level, final Throwable t, final String format, final Object... arguments) {
final Level log4j2Level;
switch (level) {
case TRACE:
log4j2Level = Level.TRACE;
break;
case DEBUG:
log4j2Level = Level.DEBUG;
break;
case INFO:
log4j2Level = Level.INFO;
break;
case WARN:
log4j2Level = Level.WARN;
break;
case ERROR:
log4j2Level = Level.ERROR;
break;
default:
throw new Error(StrUtil.format("Can not identify level: {}", level));
}
final Level log4j2Level = switch (level) {
case TRACE -> Level.TRACE;
case DEBUG -> Level.DEBUG;
case INFO -> Level.INFO;
case WARN -> Level.WARN;
case ERROR -> Level.ERROR;
default -> throw new Error(StrUtil.format("Can not identify level: {}", level));
};
logIfEnabled(fqcn, log4j2Level, t, format, arguments);
}

25
hutool-log/src/main/java/cn/hutool/v7/log/engine/slf4j/Slf4jLogEngine.java
View File

@@ -16,15 +16,14 @@
package cn.hutool.v7.log.engine.slf4j;
import java.io.OutputStream;
import java.io.PrintStream;
import java.io.UnsupportedEncodingException;
import cn.hutool.v7.core.util.CharsetUtil;
import cn.hutool.v7.log.AbsLogEngine;
import cn.hutool.v7.log.Log;
import org.slf4j.LoggerFactory;
import org.slf4j.helpers.NOPLoggerFactory;
import cn.hutool.v7.log.Log;
import java.io.OutputStream;
import java.io.PrintStream;
/**
* <a href="http://www.slf4j.org/">SLF4J</a> log.<br>
@@ -57,16 +56,12 @@ public class Slf4jLogEngine extends AbsLogEngine {
// the console during automatic detection.
final StringBuilder buf = new StringBuilder();
final PrintStream err = System.err;
try {
System.setErr(new PrintStream(new OutputStream() {
@Override
public void write(final int b) {
buf.append((char) b);
}
}, true, "US-ASCII"));
} catch (final UnsupportedEncodingException e) {
throw new Error(e);
}
System.setErr(new PrintStream(new OutputStream() {
@Override
public void write(final int b) {
buf.append((char) b);
}
}, true, CharsetUtil.US_ASCII));
try {
if (LoggerFactory.getILoggerFactory() instanceof NOPLoggerFactory) {

33
hutool-log/src/main/java/cn/hutool/v7/log/engine/tinylog/TinyLog.java
View File

@@ -172,30 +172,15 @@ public class TinyLog extends AbstractLog {
* @since 4.0.3
*/
private Level toTinyLevel(final cn.hutool.v7.log.level.Level level) {
final Level tinyLevel;
switch (level) {
case TRACE:
tinyLevel = Level.TRACE;
break;
case DEBUG:
tinyLevel = Level.DEBUG;
break;
case INFO:
tinyLevel = Level.INFO;
break;
case WARN:
tinyLevel = Level.WARN;
break;
case ERROR:
tinyLevel = Level.ERROR;
break;
case OFF:
tinyLevel = Level.OFF;
break;
default:
throw new Error(StrUtil.format("Can not identify level: {}", level));
}
return tinyLevel;
return switch (level) {
case TRACE -> Level.TRACE;
case DEBUG -> Level.DEBUG;
case INFO -> Level.INFO;
case WARN -> Level.WARN;
case ERROR -> Level.ERROR;
case OFF -> Level.OFF;
default -> throw new Error(StrUtil.format("Can not identify level: {}", level));
};
}
/**