-
-
Notifications
You must be signed in to change notification settings - Fork 107
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #757 from KyoriPowered/feature/slf4j-logger
text-logger-slf4j: introduce wrapper for formatted logging
- Loading branch information
Showing
15 changed files
with
3,208 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
plugins { | ||
id("adventure.common-conventions") | ||
} | ||
|
||
dependencies { | ||
api(projects.adventureApi) | ||
api(libs.slf4j) | ||
testImplementation(libs.slf4jtest) | ||
} | ||
|
||
sourceSets.main { | ||
multirelease { | ||
alternateVersions(9) | ||
} | ||
} | ||
|
||
applyJarMetadata("net.kyori.adventure.text.logger.slf4j") | ||
|
||
eclipse { | ||
// Make sure slf4j doesn't end up on the module path until we are actually a module | ||
classpath.file.whenMerged { | ||
(this as org.gradle.plugins.ide.eclipse.model.Classpath).entries.forEach { entry -> | ||
if (entry is org.gradle.plugins.ide.eclipse.model.Library) { | ||
entry.entryAttributes["module"] = false | ||
} | ||
} | ||
} | ||
} |
43 changes: 43 additions & 0 deletions
43
text-logger-slf4j/src/main/java/net/kyori/adventure/text/logger/slf4j/CallerClassFinder.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
/* | ||
* This file is part of adventure, licensed under the MIT License. | ||
* | ||
* Copyright (c) 2017-2022 KyoriPowered | ||
* | ||
* Permission is hereby granted, free of charge, to any person obtaining a copy | ||
* of this software and associated documentation files (the "Software"), to deal | ||
* in the Software without restriction, including without limitation the rights | ||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
* copies of the Software, and to permit persons to whom the Software is | ||
* furnished to do so, subject to the following conditions: | ||
* | ||
* The above copyright notice and this permission notice shall be included in all | ||
* copies or substantial portions of the Software. | ||
* | ||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
* SOFTWARE. | ||
*/ | ||
package net.kyori.adventure.text.logger.slf4j; | ||
|
||
// Java 8 version, see Java 9 version as well | ||
final class CallerClassFinder { | ||
private CallerClassFinder() { | ||
} | ||
|
||
static String callingClassName() { | ||
return callingClassName(2); // this, plus the calling method | ||
} | ||
|
||
static String callingClassName(final int elementsToSkip) { // elementsToSkip not counting this method | ||
final StackTraceElement[] elements = Thread.currentThread().getStackTrace(); // includes call to getStackTrace() | ||
if (elements.length <= elementsToSkip) { | ||
throw new IllegalArgumentException("Not enough stack elements to skip " + elementsToSkip + " elements"); | ||
} else { | ||
return elements[elementsToSkip + 2].getClassName(); | ||
} | ||
} | ||
} |
Oops, something went wrong.