Skip to content

Commit c9f26ae

Browse files
committed
introduce LoggerCarrier
1 parent f1658cb commit c9f26ae

File tree

3 files changed

+16
-9
lines changed

3 files changed

+16
-9
lines changed

src/main/java/org/comroid/api/ContextualProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
@Experimental
1616
@MustExtend(ContextualProvider.Base.class)
17-
public interface ContextualProvider extends Named, Upgradeable<ContextualProvider> {
17+
public interface ContextualProvider extends Named, Upgradeable<ContextualProvider>, LoggerCarrier {
1818
@Internal
1919
default @Nullable ContextualProvider getParentContext() {
2020
return null;
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package org.comroid.api;
2+
3+
import org.apache.logging.log4j.LogManager;
4+
import org.apache.logging.log4j.Logger;
5+
import org.comroid.util.StackTraceUtils;
6+
import org.jetbrains.annotations.ApiStatus.OverrideOnly;
7+
8+
public interface LoggerCarrier {
9+
@OverrideOnly
10+
default Logger getLogger() {
11+
return LogManager.getLogger(StackTraceUtils.callerClass(1));
12+
}
13+
}

src/main/java/org/comroid/api/Upgradeable.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
package org.comroid.api;
22

3-
import org.apache.logging.log4j.LogManager;
4-
import org.apache.logging.log4j.Logger;
53
import org.comroid.annotations.Upgrade;
64
import org.jetbrains.annotations.ApiStatus.Experimental;
7-
import org.jetbrains.annotations.ApiStatus.Internal;
85
import org.jetbrains.annotations.NotNull;
96

107
import java.lang.reflect.InvocationTargetException;
@@ -14,10 +11,7 @@
1411
import java.util.Optional;
1512

1613
@Experimental
17-
public interface Upgradeable<T> extends Specifiable<T> {
18-
@Internal
19-
Logger logger = LogManager.getLogger();
20-
14+
public interface Upgradeable<T> extends Specifiable<T>, LoggerCarrier {
2115
@SuppressWarnings("unchecked")
2216
@Experimental
2317
default <R extends T> @NotNull R upgrade(Class<? super R> target) {
@@ -55,7 +49,7 @@ default <R extends T> Optional<R> as(Class<R> type) {
5549
try {
5650
return Optional.of(upgrade(type));
5751
} catch (Throwable t) {
58-
logger.warn("Could not upgrade to type {} when specifying", type, t);
52+
getLogger().warn("Could not upgrade to type {} when specifying", type, t);
5953
return Optional.empty();
6054
}
6155
});

0 commit comments

Comments
 (0)