natas_hw
/
slf4j
mirror of https://github.com/qos-ch/slf4j
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ongoing work on fluent api

This commit is contained in:
Ceki Gulcu 2019-04-28 23:49:20 +02:00
parent 8c51d8ea7c
commit 1f3b8726d1
8 changed files with 234 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
slf4j-api/src/main/java/org/slf4j/Logger.java
View File

@ -25,7 +25,11 @@
package org.slf4j;
import static org.slf4j.event.Level.DEBUG;
import static org.slf4j.event.Level.ERROR;
import static org.slf4j.event.Level.INFO;
import static org.slf4j.event.Level.TRACE;
import static org.slf4j.event.Level.WARN;
import org.slf4j.spi.DefaultLoggingEventBuilder;
import org.slf4j.spi.LoggingEventBuilder;
@ -165,7 +169,7 @@ public interface Logger {
public boolean isTraceEnabled(Marker marker);
/**
*
* Entry point for fluent-logging for {@link TRACE} level.
*
* @return LoggingEventBuilder instance as appropriate for level TRACE
*/
@ -359,6 +363,20 @@ public interface Logger {
*/
public void debug(Marker marker, String msg, Throwable t);
/**
* Entry point for fluent-logging for {@link DEBUG} level.
*
* @return LoggingEventBuilder instance as appropriate for level DEBUG
*/
default public LoggingEventBuilder atDebug() {
if(isDebugEnabled()) {
return new DefaultLoggingEventBuilder(DEBUG, this);
} else {
return NOPLoggingEventBuilder.singleton();
}
}
/**
* Is the logger instance enabled for the INFO level?
*
@ -484,6 +502,20 @@ public interface Logger {
*/
public void info(Marker marker, String msg, Throwable t);
/**
* Entry point for fluent-logging for {@link INFO} level.
*
* @return LoggingEventBuilder instance as appropriate for level INFO
*/
default public LoggingEventBuilder atInfo() {
if(isInfoEnabled()) {
return new DefaultLoggingEventBuilder(INFO, this);
} else {
return NOPLoggingEventBuilder.singleton();
}
}
/**
* Is the logger instance enabled for the WARN level?
*
@ -610,6 +642,21 @@ public interface Logger {
*/
public void warn(Marker marker, String msg, Throwable t);
/**
* Entry point for fluent-logging for {@link WARN} level.
*
* @return LoggingEventBuilder instance as appropriate for level WARN
*/
default public LoggingEventBuilder atWarn() {
if(isWarnEnabled()) {
return new DefaultLoggingEventBuilder(WARN, this);
} else {
return NOPLoggingEventBuilder.singleton();
}
}
/**
* Is the logger instance enabled for the ERROR level?
*
@ -736,5 +783,20 @@ public interface Logger {
* @param t the exception (throwable) to log
*/
public void error(Marker marker, String msg, Throwable t);
/**
* Entry point for fluent-logging for {@link ERROR} level.
*
* @return LoggingEventBuilder instance as appropriate for level ERROR
*/
default public LoggingEventBuilder atError() {
if(isErrorEnabled()) {
return new DefaultLoggingEventBuilder(ERROR, this);
} else {
return NOPLoggingEventBuilder.singleton();
}
}
}

117
slf4j-api/src/main/java/org/slf4j/event/DefaultLoggingEvent.java Executable file
View File

@ -0,0 +1,117 @@
package org.slf4j.event;
import java.util.ArrayList;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.Marker;
public class DefaultLoggingEvent implements LoggingEvent {
Logger logger;
Level level;
List<Marker> markers;
List<Object> parameters;
List<KeyValuePair> keyValuePairs;
Throwable cause;
String threadName;
public DefaultLoggingEvent(Level level, Logger logger) {
this.logger = logger;
this.level = level;
}
public void addMarker(Marker marker) {
getMarkers().add(marker);
}
@Override
public List<Marker> getMarkers() {
if(markers == null) {
markers = new ArrayList<>(5);
}
return markers;
}
public void addParameter(Object p) {
getParameters().add(p);
}
private List<Object> getParameters() {
if(parameters == null) {
parameters = new ArrayList<>(5);
}
return parameters;
}
public void addKeyValue(String key, Object value) {
getKeyValuePairs().add(new KeyValuePair(key, value));
}
private List<KeyValuePair> getKeyValuePairs() {
if(keyValuePairs == null) {
keyValuePairs = new ArrayList<>(4);
}
return keyValuePairs;
}
public void setCause(Throwable cause) {
this.cause = cause;
}
@Override
public Level getLevel() {
return level;
}
public void setThreadName(String threadName) {
this.threadName = threadName;
}
@Override
public String getThreadName() {
return threadName;
}
@Override
public String getLoggerName() {
return logger.getName();
}
@Override
public String getMessage() {
// TODO Auto-generated method stub
return null;
}
@Override
public Object[] getArgumentArray() {
// TODO Auto-generated method stub
return null;
}
@Override
public long getTimeStamp() {
// TODO Auto-generated method stub
return 0;
}
@Override
public Throwable getThrowable() {
// TODO Auto-generated method stub
return null;
}
}

14
slf4j-api/src/main/java/org/slf4j/event/KeyValuePair.java Executable file
View File

@ -0,0 +1,14 @@
package org.slf4j.event;
public class KeyValuePair {
final String key;
final Object value;
public KeyValuePair(String key, Object value) {
this.key = key;
this.value = value;
}
}

4
slf4j-api/src/main/java/org/slf4j/event/LoggingEvent.java
View File

@ -1,5 +1,7 @@
package org.slf4j.event;
import java.util.List;
import org.slf4j.Marker;
/**
@ -11,7 +13,7 @@ public interface LoggingEvent {
Level getLevel();
Marker getMarker();
List<Marker> getMarkers();
String getLoggerName();

16
slf4j-api/src/main/java/org/slf4j/event/SubstituteLoggingEvent.java
View File

@ -1,12 +1,15 @@
package org.slf4j.event;
import java.util.ArrayList;
import java.util.List;
import org.slf4j.Marker;
import org.slf4j.helpers.SubstituteLogger;
public class SubstituteLoggingEvent implements LoggingEvent {
Level level;
Marker marker;
List<Marker> markers;
String loggerName;
SubstituteLogger logger;
String threadName;
@ -23,12 +26,15 @@ public class SubstituteLoggingEvent implements LoggingEvent {
this.level = level;
}
public Marker getMarker() {
return marker;
public List<Marker> getMarkers() {
if(markers == null) {
markers = new ArrayList<>(5);
}
return markers;
}
public void setMarker(Marker marker) {
this.marker = marker;
public void addMarker(Marker marker) {
getMarkers().add(marker);
}
public String getLoggerName() {

39
slf4j-api/src/main/java/org/slf4j/spi/DefaultLoggingEventBuilder.java
View File

@ -4,60 +4,69 @@ import java.util.function.Supplier;
import org.slf4j.Logger;
import org.slf4j.Marker;
import org.slf4j.event.DefaultLoggingEvent;
import org.slf4j.event.Level;
public class DefaultLoggingEventBuilder implements LoggingEventBuilder {
Logger logger;
Level level;
Marker marker;
Throwable cause;
Object parameter;
DefaultLoggingEvent logggingEvent;
public DefaultLoggingEventBuilder(Level level, Logger logger) {
this.logger = logger;
this.level = level;
logggingEvent = new DefaultLoggingEvent(level, logger);
logggingEvent.setThreadName(Thread.currentThread().getName());
}
/**
* Add a marker to the current logging event being built.
*
* It is possible to add multiple markers to the same logging event.
*
* @param marker the marker to add
*/
@Override
public LoggingEventBuilder addMarker(Marker marker) {
this.marker = marker;
logggingEvent.addMarker(marker);
return this;
}
@Override
public LoggingEventBuilder setCause(Throwable cause) {
this.cause = cause;
logggingEvent.setCause(cause);
return this;
}
@Override
public LoggingEventBuilder addParameter(Object p) {
this.parameter = p;
logggingEvent.addParameter(p);
return this;
}
@Override
public void log(String message) {
}
@Override
public void log(Supplier<String> messageSupplier) {
}
@Override
public LoggingEventBuilder addParameter(Supplier<Object> objectSupplier) {
logggingEvent.addParameter(objectSupplier.get());
return this;
}
@Override
public LoggingEventBuilder addKeyValue(String key, Object value) {
// TODO Auto-generated method stub
logggingEvent.addKeyValue(key, value);
return this;
}
@Override
public LoggingEventBuilder addKeyValue(String key, Supplier<Object> value) {
// TODO Auto-generated method stub
logggingEvent.addKeyValue(key, value.get());
return this;
}

2
slf4j-api/src/test/java/org/slf4j/LoggerUsage.java
View File

@ -7,7 +7,7 @@ public class LoggerUsage {
@Test
public void test() {
org.slf4j.Logger logger = LoggerFactory.getLogger("aa");
logger.atTrace().setCause(new Throwable()).addKeyValue("a", "n").log("aa");;
logger.atTrace().addKeyValue("a", "n").setCause(new Throwable()).log("aa");
}
}

2
slf4j-api/src/test/java/org/slf4j/helpers/SubstitutableLoggerTest.java
View File

@ -47,7 +47,7 @@ import org.slf4j.helpers.SubstituteLogger;
*/
public class SubstitutableLoggerTest {
// atTrace excluded during development of 2.0 API
private static final Set<String> EXCLUDED_METHODS = new HashSet<String>(Arrays.asList("getName", "atTrace"));
private static final Set<String> EXCLUDED_METHODS = new HashSet<String>(Arrays.asList("getName", "atTrace", "atDebug", "atInfo", "atWarn", "atError"));
@Test
public void testDelegate() throws Exception {