MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-13 15:52:01 +07:00
Code Issues Packages Projects Releases Wiki Activity

[Java. Logging] Add id field to the JvmLogger

Browse Source 
IDEA-345098

GitOrigin-RevId: 8e4db43c54658ca573918527e2714bbb1e73d590
This commit is contained in:
Georgii Ustinov
2024-02-22 13:57:59 +02:00
committed by intellij-monorepo-bot
parent 4e10e49ad4
commit 3529ce4b26
13 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/java-impl/src/com/intellij/lang/logging/ApacheCommonsLogger.kt
View File

@@ -7,8 +7,9 @@ class ApacheCommonsLogger : JvmLogger by JvmLoggerFieldDelegate(
JavaLoggingUtils.COMMONS_LOGGING_FACTORY,
"getLog",
"%s.class",
"Apache Commons Logging",
JavaLoggingUtils.COMMONS_LOGGING,
100,
) {
override fun toString(): String = "Apache Commons Logging"
override fun toString(): String = id
}

4
java/java-impl/src/com/intellij/lang/logging/JvmLogger.kt
View File

@@ -15,6 +15,10 @@ import org.jetbrains.annotations.ApiStatus
*/
@ApiStatus.Internal
interface JvmLogger {
/**
* This field represents id of the logger which is used to save the logger the settings
*/
val id : String
/**
* This field represents fully qualified name of the logger's type
*/

1
java/java-impl/src/com/intellij/lang/logging/JvmLoggerFieldDelegate.kt
View File

@@ -21,6 +21,7 @@ class JvmLoggerFieldDelegate(
private val factoryName: String,
private val methodName: String,
private val classNamePattern: String,
override val id: String,
override val loggerTypeName: String,
override val priority: Int,
) : JvmLogger {

3
java/java-impl/src/com/intellij/lang/logging/Log4j2Logger.kt
View File

@@ -7,8 +7,9 @@ class Log4j2Logger : JvmLogger by JvmLoggerFieldDelegate(
JavaLoggingUtils.LOG4J2_FACTORY,
"getLogger",
"%s.class",
"Log4j2",
JavaLoggingUtils.LOG4J2,
200,
) {
override fun toString(): String = "Log4j2"
override fun toString(): String = id
}

3
java/java-impl/src/com/intellij/lang/logging/Log4jLogger.kt
View File

@@ -7,8 +7,9 @@ class Log4jLogger : JvmLogger by JvmLoggerFieldDelegate(
JavaLoggingUtils.LOG4J_FACTORY,
"getLogger",
"%s.class",
"Log4j",
JavaLoggingUtils.LOG4J,
0,
) {
override fun toString(): String = "Log4j"
override fun toString(): String = id
}

3
java/java-impl/src/com/intellij/lang/logging/Slf4jLogger.kt
View File

@@ -7,8 +7,9 @@ class Slf4jLogger : JvmLogger by JvmLoggerFieldDelegate(
JavaLoggingUtils.SLF4J_FACTORY,
"getLogger",
"%s.class",
"Slf4j",
JavaLoggingUtils.SLF4J,
300,
) {
override fun toString(): String = "Slf4j"
override fun toString(): String = id
}

4
java/java-impl/src/com/intellij/lang/logging/UnspecifiedLogger.kt
View File

@@ -1,6 +1,7 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package com.intellij.lang.logging
import com.intellij.java.JavaBundle
import com.intellij.openapi.module.Module
import com.intellij.openapi.project.Project
import com.intellij.psi.PsiClass
@@ -11,6 +12,7 @@ import com.intellij.psi.PsiElement
* "unspecified" state, e.g. where there is no preferred logger selected.
*/
class UnspecifiedLogger : JvmLogger {
override val id: String = UNSPECIFIED_LOGGER_NAME
override val loggerTypeName: String = "Unspecified"
override val priority: Int = 1000
@@ -27,7 +29,7 @@ class UnspecifiedLogger : JvmLogger {
override fun createLogger(project: Project, clazz: PsiClass): PsiElement = throw UnsupportedOperationException()
override fun toString(): String = UNSPECIFIED_LOGGER_NAME
override fun toString(): String = JavaBundle.message("java.configurable.logger.unspecified")
companion object {
const val UNSPECIFIED_LOGGER_NAME: String = "Unspecified"

1
java/openapi/resources/messages/JavaBundle.properties
View File

@@ -968,6 +968,7 @@ java.terms.of.interface={0} of interface {1}
java.terms.static.initializer=static initializer
java.terms.type.parameter=type parameter
java.terms.variable.of.method={0} of {1}
java.configurable.logger.unspecified = Unspecified
java.configurable.logger.not.found = Logger was not found inside the project
javadoc.candidates.not.found=<html>No candidates found for method call <b>{0}</b>.</html>
javadoc.constructor.candidates=<html>Candidates for new <b>{0}</b>() are:<br>{1}</html>

1
plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/JvmLoggerAnnotationDelegate.kt
View File

@@ -21,6 +21,7 @@ import de.plushnikov.intellij.plugin.util.LombokLibraryUtil
*/
class JvmLoggerAnnotationDelegate(
private val fieldLoggerName: String,
override val id: String,
override val loggerTypeName: String,
override val priority: Int
) : JvmLogger {

3
plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokApacheCommonsLogger.kt
View File

@@ -5,8 +5,9 @@ import com.siyeh.ig.psiutils.JavaLoggingUtils
class LombokApacheCommonsLogger : JvmLogger by JvmLoggerAnnotationDelegate(
JavaLoggingUtils.COMMONS_LOGGING,
"Lombok Apache Commons Logging",
LombokLoggingUtils.COMMONS_ANNOTATION,
500
) {
override fun toString(): String = "Lombok Apache Commons Logging"
override fun toString(): String = id
}

3
plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokLog4j2Logger.kt
View File

@@ -5,8 +5,9 @@ import com.siyeh.ig.psiutils.JavaLoggingUtils
class LombokLog4j2Logger : JvmLogger by JvmLoggerAnnotationDelegate(
JavaLoggingUtils.LOG4J2,
"Lombok Log4j2",
LombokLoggingUtils.LOG4J2_ANNOTATION,
600
) {
override fun toString(): String = "Lombok Log4j2"
override fun toString(): String = id
}

3
plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokLog4jLogger.kt
View File

@@ -5,8 +5,9 @@ import com.siyeh.ig.psiutils.JavaLoggingUtils
class LombokLog4jLogger : JvmLogger by JvmLoggerAnnotationDelegate(
JavaLoggingUtils.LOG4J,
"Lombok Log4j",
LombokLoggingUtils.LOG4J_ANNOTATION,
400
) {
override fun toString(): String = "Lombok Log4j"
override fun toString(): String = id
}

3
plugins/lombok/src/main/java/de/plushnikov/intellij/plugin/logging/LombokSlf4jLogger.kt
View File

@@ -5,8 +5,9 @@ import com.siyeh.ig.psiutils.JavaLoggingUtils
class LombokSlf4jLogger : JvmLogger by JvmLoggerAnnotationDelegate(
JavaLoggingUtils.SLF4J,
"Lombok Slf4j",
LombokLoggingUtils.SLF4J_ANNOTATION,
700
) {
override fun toString(): String = "Lombok SLf4j"
override fun toString(): String = id
}