zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly
2020-04-04 01:34:54 +08:00
parent 6b13cb5263
commit 24a300e348
36 changed files with 228 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
hutool-log/src/main/java/cn/hutool/log/GlobalLogFactory.java
View File

@@ -1,12 +1,5 @@
package cn.hutool.log;
import cn.hutool.log.dialect.commons.ApacheCommonsLogFactory;
import cn.hutool.log.dialect.console.ConsoleLogFactory;
import cn.hutool.log.dialect.jdk.JdkLogFactory;
import cn.hutool.log.dialect.log4j.Log4jLogFactory;
import cn.hutool.log.dialect.log4j2.Log4j2LogFactory;
import cn.hutool.log.dialect.slf4j.Slf4jLogFactory;
/**
* 全局日志工厂类<br>
* 用于减少日志工厂创建，减少日志库探测
@@ -37,12 +30,12 @@ public class GlobalLogFactory {
/**
* 自定义日志实现
*
* @see Slf4jLogFactory
* @see Log4jLogFactory
* @see Log4j2LogFactory
* @see ApacheCommonsLogFactory
* @see JdkLogFactory
* @see ConsoleLogFactory
* @see cn.hutool.log.dialect.slf4j.Slf4jLogFactory
* @see cn.hutool.log.dialect.log4j.Log4jLogFactory
* @see cn.hutool.log.dialect.log4j2.Log4j2LogFactory
* @see cn.hutool.log.dialect.commons.ApacheCommonsLogFactory
* @see cn.hutool.log.dialect.jdk.JdkLogFactory
* @see cn.hutool.log.dialect.console.ConsoleLogFactory
*
* @param logFactoryClass 日志工厂类
* @return 自定义的日志工厂类
@@ -57,14 +50,14 @@ public class GlobalLogFactory {
/**
* 自定义日志实现
*
* @see Slf4jLogFactory
* @see Log4jLogFactory
* @see Log4j2LogFactory
* @see ApacheCommonsLogFactory
* @see JdkLogFactory
* @see ConsoleLogFactory
*
*
* @see cn.hutool.log.dialect.slf4j.Slf4jLogFactory
* @see cn.hutool.log.dialect.log4j.Log4jLogFactory
* @see cn.hutool.log.dialect.log4j2.Log4j2LogFactory
* @see cn.hutool.log.dialect.commons.ApacheCommonsLogFactory
* @see cn.hutool.log.dialect.jdk.JdkLogFactory
* @see cn.hutool.log.dialect.console.ConsoleLogFactory
*
* @param logFactory 日志工厂类对象
* @return 自定义的日志工厂类
*/

48
hutool-log/src/main/java/cn/hutool/log/LogFactory.java
View File

@@ -3,14 +3,8 @@ package cn.hutool.log;
import cn.hutool.core.io.resource.ResourceUtil;
import cn.hutool.core.lang.caller.CallerUtil;
import cn.hutool.core.util.ServiceLoaderUtil;
import cn.hutool.log.dialect.commons.ApacheCommonsLogFactory;
import cn.hutool.log.dialect.console.ConsoleLogFactory;
import cn.hutool.log.dialect.jboss.JbossLogFactory;
import cn.hutool.log.dialect.jdk.JdkLogFactory;
import cn.hutool.log.dialect.log4j.Log4jLogFactory;
import cn.hutool.log.dialect.log4j2.Log4j2LogFactory;
import cn.hutool.log.dialect.slf4j.Slf4jLogFactory;
import cn.hutool.log.dialect.tinylog.TinyLogFactory;
import java.net.URL;
import java.util.Map;
@@ -20,14 +14,6 @@ import java.util.concurrent.ConcurrentHashMap;
* 日志工厂类
*
* @author Looly
* @see Slf4jLogFactory
* @see Log4j2LogFactory
* @see Log4jLogFactory
* @see ApacheCommonsLogFactory
* @see TinyLogFactory
* @see JbossLogFactory
* @see ConsoleLogFactory
* @see JdkLogFactory
*/
public abstract class LogFactory {
@@ -131,14 +117,6 @@ public abstract class LogFactory {
*
* @param logFactoryClass 日志工厂类
* @return 自定义的日志工厂类
* @see Slf4jLogFactory
* @see Log4j2LogFactory
* @see Log4jLogFactory
* @see ApacheCommonsLogFactory
* @see TinyLogFactory
* @see JbossLogFactory
* @see ConsoleLogFactory
* @see JdkLogFactory
*/
public static LogFactory setCurrentLogFactory(Class<? extends LogFactory> logFactoryClass) {
return GlobalLogFactory.set(logFactoryClass);
@@ -149,14 +127,6 @@ public abstract class LogFactory {
*
* @param logFactory 日志工厂类对象
* @return 自定义的日志工厂类
* @see Slf4jLogFactory
* @see Log4j2LogFactory
* @see Log4jLogFactory
* @see ApacheCommonsLogFactory
* @see TinyLogFactory
* @see JbossLogFactory
* @see ConsoleLogFactory
* @see JdkLogFactory
*/
public static LogFactory setCurrentLogFactory(LogFactory logFactory) {
return GlobalLogFactory.set(logFactory);
@@ -195,14 +165,6 @@ public abstract class LogFactory {
* 依次按照顺序检查日志库的jar是否被引入，如果未引入任何日志库，则检查ClassPath下的logging.properties，存在则使用JdkLogFactory，否则使用ConsoleLogFactory
*
* @return 日志实现类
* @see Slf4jLogFactory
* @see Log4j2LogFactory
* @see Log4jLogFactory
* @see ApacheCommonsLogFactory
* @see TinyLogFactory
* @see JbossLogFactory
* @see ConsoleLogFactory
* @see JdkLogFactory
*/
public static LogFactory create() {
final LogFactory factory = doCreate();
@@ -216,18 +178,10 @@ public abstract class LogFactory {
* 依次按照顺序检查日志库的jar是否被引入，如果未引入任何日志库，则检查ClassPath下的logging.properties，存在则使用JdkLogFactory，否则使用ConsoleLogFactory
*
* @return 日志实现类
* @see Slf4jLogFactory
* @see Log4j2LogFactory
* @see Log4jLogFactory
* @see ApacheCommonsLogFactory
* @see TinyLogFactory
* @see JbossLogFactory
* @see ConsoleLogFactory
* @see JdkLogFactory
*/
private static LogFactory doCreate() {
final LogFactory factory = ServiceLoaderUtil.loadFirstAvailable(LogFactory.class);
if(null != factory){
if (null != factory) {
return factory;
}