Skip to content

Commit 8c4775b

Browse files
committed
Slf4j: Migrate all loggers to be initialized lazily and without the reference to the class (less clutter and less type usage).
1 parent 166ce3f commit 8c4775b

27 files changed

+64
-56
lines changed

jbake-core/src/main/java/org/jbake/app/Asset.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import org.apache.commons.io.FileUtils
55
import org.jbake.app.configuration.JBakeConfiguration
66
import org.jbake.app.configuration.JBakeConfigurationFactory
77
import org.slf4j.Logger
8-
import org.slf4j.LoggerFactory
8+
import org.jbake.util.Logging.logger
99
import java.io.File
1010
import java.io.FileFilter
1111
import java.io.IOException
@@ -135,5 +135,5 @@ class Asset {
135135
}
136136
}
137137

138-
private val log: Logger = LoggerFactory.getLogger(Asset::class.java)
138+
private val log: Logger by logger()
139139
}

jbake-core/src/main/java/org/jbake/app/ContentStore.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import org.jbake.model.DocumentModel
1414
import org.jbake.model.DocumentTypes
1515
import org.jbake.model.ModelAttributes
1616
import org.slf4j.Logger
17-
import org.slf4j.LoggerFactory
17+
import org.jbake.util.Logging.logger
1818
import java.io.File
1919
import java.util.*
2020

@@ -395,5 +395,5 @@ class ContentStore(private val type: String, private val name: String?) {
395395
private const val STATEMENT_GET_DOCUMENT_COUNT_BY_TYPE = "SELECT count(*) AS count FROM Documents WHERE type='%s'"
396396
}
397397

398-
private val log: Logger = LoggerFactory.getLogger(ContentStore::class.java)
398+
private val log: Logger by logger()
399399
}

jbake-core/src/main/java/org/jbake/app/Crawler.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import org.jbake.model.DocumentTypes
99
import org.jbake.model.ModelAttributes
1010
import org.jbake.util.HtmlUtil
1111
import org.slf4j.Logger
12-
import org.slf4j.LoggerFactory
12+
import org.jbake.util.Logging.logger
1313
import java.io.File
1414
import java.net.URLEncoder
1515
import java.nio.charset.StandardCharsets
@@ -220,5 +220,5 @@ class Crawler {
220220
else DocumentStatus.IDENTICAL
221221
}
222222

223-
private val log: Logger = LoggerFactory.getLogger(Crawler::class.java)
223+
private val log: Logger by logger()
224224
}

jbake-core/src/main/java/org/jbake/app/Oven.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import org.jbake.render.RenderingTool
1111
import org.jbake.template.ModelExtractors
1212
import org.jbake.template.ModelExtractorsDocumentTypeListener
1313
import org.jbake.template.RenderingException
14+
import org.jbake.util.logger
1415
import org.slf4j.Logger
15-
import org.slf4j.LoggerFactory
1616
import java.io.File
1717
import java.util.*
1818
import java.util.ServiceLoader.load
@@ -161,4 +161,4 @@ class Oven {
161161

162162
}
163163

164-
private val log: Logger = LoggerFactory.getLogger(Oven::class.java)
164+
private val log: Logger by logger<Oven>()

jbake-core/src/main/java/org/jbake/app/Parser.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import org.jbake.app.configuration.JBakeConfiguration
44
import org.jbake.model.DocumentModel
55
import org.jbake.parser.Engines
66
import org.slf4j.Logger
7-
import org.slf4j.LoggerFactory
7+
import org.jbake.util.Logging.logger
88
import java.io.File
99

1010
class Parser(private val config: JBakeConfiguration) {
@@ -17,5 +17,5 @@ class Parser(private val config: JBakeConfiguration) {
1717
return engine.parse(config, inputFile)
1818
}
1919

20-
private val log: Logger = LoggerFactory.getLogger(Parser::class.java)
20+
private val log: Logger by logger()
2121
}

jbake-core/src/main/java/org/jbake/app/Renderer.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import org.jbake.template.model.RenderContext
1111
import org.jbake.template.model.TemplateModel
1212
import org.jbake.util.PagingHelper
1313
import org.slf4j.Logger
14-
import org.slf4j.LoggerFactory
14+
import org.jbake.util.Logging.logger
1515
import java.io.*
1616
import java.nio.file.Files
1717
import java.util.*
@@ -413,5 +413,5 @@ class Renderer {
413413
private const val ERROR404_TEMPLATE_NAME = "error404"
414414
}
415415

416-
private val log: Logger = LoggerFactory.getLogger(Renderer::class.java)
416+
private val log: Logger by logger()
417417
}

jbake-core/src/main/java/org/jbake/app/configuration/ConfigUtil.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler
99
import org.apache.commons.configuration2.ex.ConfigurationException
1010
import org.jbake.app.JBakeException
1111
import org.jbake.launcher.SystemExit
12+
import org.jbake.util.Logging
13+
import org.jbake.util.Logging.logger
1214
import org.slf4j.Logger
13-
import org.slf4j.LoggerFactory
1415
import java.io.File
1516
import java.net.URL
1617
import java.nio.charset.Charset
@@ -113,7 +114,7 @@ class ConfigUtil {
113114
companion object {
114115
const val LIST_DELIMITER: Char = ','
115116
const val DEFAULT_ENCODING: String = "UTF-8"
116-
private val log: Logger = LoggerFactory.getLogger(ConfigUtil::class.java)
117+
private val log: Logger by Logging.logger()
117118
const val LEGACY_CONFIG_FILE: String = "custom.properties"
118119
const val CONFIG_FILE: String = "jbake.properties"
119120
const val DEFAULT_CONFIG_FILE: String = "default.properties"

jbake-core/src/main/java/org/jbake/app/configuration/DefaultJBakeConfiguration.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import org.apache.commons.lang3.StringUtils
77
import org.jbake.app.configuration.PropertyList.ASSET_IGNORE_HIDDEN
88
import org.jbake.app.configuration.PropertyList.TEMPLATE_FOLDER
99
import org.slf4j.Logger
10-
import org.slf4j.LoggerFactory
10+
import org.jbake.util.Logging.logger
1111
import java.io.File
1212
import java.util.*
1313
import java.util.regex.Matcher
@@ -532,5 +532,5 @@ class DefaultJBakeConfiguration : JBakeConfiguration {
532532
private const val DOCTYPE_TEMPLATE_PREFIX = "template."
533533
}
534534

535-
private val log: Logger = LoggerFactory.getLogger(DefaultJBakeConfiguration::class.java)
535+
private val log: Logger by logger()
536536
}

jbake-core/src/main/java/org/jbake/app/configuration/JBakeConfigurationInspector.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import org.jbake.app.FileUtil
44
import org.jbake.app.JBakeException
55
import org.jbake.launcher.SystemExit
66
import org.slf4j.Logger
7-
import org.slf4j.LoggerFactory
7+
import org.jbake.util.Logging.logger
88
import java.io.File
99

1010
class JBakeConfigurationInspector(private val configuration: JBakeConfiguration) {
@@ -70,5 +70,5 @@ class JBakeConfigurationInspector(private val configuration: JBakeConfiguration)
7070
throw JBakeException(SystemExit.CONFIGURATION_ERROR, "Error: Required dir cannot be found! Expected to find [" + folderName + "] at: " + path.absolutePath)
7171
}
7272

73-
private val log: Logger = LoggerFactory.getLogger(JBakeConfigurationInspector::class.java)
73+
private val log: Logger by logger()
7474
}

jbake-core/src/main/java/org/jbake/launcher/BakeWatcher.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import org.apache.commons.vfs2.impl.DefaultFileMonitor
77
import org.jbake.app.configuration.JBakeConfiguration
88
import org.jbake.app.configuration.JBakeConfigurationFactory
99
import org.slf4j.Logger
10-
import org.slf4j.LoggerFactory
10+
import org.jbake.util.Logging.logger
1111

1212
/**
1313
* Delegate responsible for watching the file system for changes.
@@ -46,5 +46,5 @@ class BakeWatcher {
4646
catch (e: FileSystemException) { log.error("Problems watching filesystem changes", e) }
4747
}
4848

49-
private val log: Logger = LoggerFactory.getLogger(BakeWatcher::class.java)
49+
private val log: Logger by logger()
5050
}

0 commit comments

Comments
 (0)