Skip to content

Commit

Permalink
Merge pull request #841 from KyoriPowered/revert/slf4j-2
Browse files Browse the repository at this point in the history
fix(text-logger-slf4j): Remove bin dependency on SLF4J2 at runtime
  • Loading branch information
zml2008 committed Nov 27, 2022
2 parents 1ac3426 + 5a2ebc8 commit 3d2012d
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 627 deletions.
Expand Up @@ -28,7 +28,6 @@
import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.Marker;
import org.slf4j.event.Level;

import static java.util.Objects.requireNonNull;

Expand Down Expand Up @@ -199,19 +198,6 @@ public interface ComponentLogger extends Logger {
*/
void trace(final @NotNull Marker marker, final @NotNull Component msg, final @Nullable Throwable t);

/**
* Entry point for fluent-logging for {@link Level#TRACE} level.
*
* <p><b>Warning:</b> This method is only available when running with SLF4J 2.0+</p>
*
* @return LoggingEventBuilder instance as appropriate for level TRACE
* @since 4.12.0
*/
@Override
default ComponentLoggingEventBuilder atTrace() {
return this.atLevel(Level.TRACE);
}

/**
* Log a message at the DEBUG level.
*
Expand Down Expand Up @@ -330,19 +316,6 @@ default ComponentLoggingEventBuilder atTrace() {
*/
void debug(final @NotNull Marker marker, final @NotNull Component msg, final @Nullable Throwable t);

/**
* Entry point for fluent-logging for {@link Level#DEBUG} level.
*
* <p><b>Warning:</b> This method is only available when running with SLF4J 2.0+</p>
*
* @return LoggingEventBuilder instance as appropriate for level DEBUG
* @since 4.12.0
*/
@Override
default ComponentLoggingEventBuilder atDebug() {
return this.atLevel(Level.DEBUG);
}

/**
* Log a message at the INFO level.
*
Expand Down Expand Up @@ -461,19 +434,6 @@ default ComponentLoggingEventBuilder atDebug() {
*/
void info(final @NotNull Marker marker, final @NotNull Component msg, final @NotNull Throwable t);

/**
* Entry point for fluent-logging for {@link Level#INFO} level.
*
* <p><b>Warning:</b> This method is only available when running with SLF4J 2.0+</p>
*
* @return LoggingEventBuilder instance as appropriate for level INFO
* @since 4.12.0
*/
@Override
default ComponentLoggingEventBuilder atInfo() {
return this.atLevel(Level.INFO);
}

/**
* Log a message at the WARN level.
*
Expand Down Expand Up @@ -592,19 +552,6 @@ default ComponentLoggingEventBuilder atInfo() {
*/
void warn(final @NotNull Marker marker, final @NotNull Component msg, final @NotNull Throwable t);

/**
* Entry point for fluent-logging for {@link Level#WARN} level.
*
* <p><b>Warning:</b> This method is only available when running with SLF4J 2.0+</p>
*
* @return LoggingEventBuilder instance as appropriate for level WARN
* @since 4.12.0
*/
@Override
default ComponentLoggingEventBuilder atWarn() {
return this.atLevel(Level.WARN);
}

/**
* Log a message at the ERROR level.
*
Expand Down Expand Up @@ -723,43 +670,4 @@ default ComponentLoggingEventBuilder atWarn() {
* @since 4.11.0
*/
void error(final @NotNull Marker marker, final @NotNull Component msg, final @NotNull Throwable t);

/**
* Entry point for fluent-logging for {@link Level#ERROR} level.
*
* <p><b>Warning:</b> This method is only available when running with SLF4J 2.0+</p>
*
* @return LoggingEventBuilder instance as appropriate for level ERROR
* @since 4.12.0
*/
@Override
default @NotNull ComponentLoggingEventBuilder atError() {
return this.atLevel(Level.ERROR);
}

/**
* Unconditionally create a new logging event builder.
*
* <p><b>Warning:</b> This method is only available when running with SLF4J 2.0+</p>
*
* @param level desired level for the event builder
* @return a new event builder
* @since 4.12.0
*/
@Override
@NotNull ComponentLoggingEventBuilder makeLoggingEventBuilder(final @NotNull Level level);

/**
* Create the appropriate builder for the supplied level.
*
* <p>This may be a no-op if the passed level is disabled.</p>
*
* <p><b>Warning:</b> This method is only available when running with SLF4J 2.0+</p>
*
* @param level desired level for the event builder
* @return a new event builder
* @since 4.12.0
*/
@Override
@NotNull ComponentLoggingEventBuilder atLevel(final @NotNull Level level);
}

This file was deleted.

0 comments on commit 3d2012d

Please sign in to comment.