Skip to content

Commit a5b1081

Browse files
committed
Code style fix and cleaner log messages
1 parent 83e4607 commit a5b1081

File tree

3 files changed

+17
-9
lines changed

3 files changed

+17
-9
lines changed

src/main/java/org/radarbase/output/path/FixedPathFormatterPlugin.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ package org.radarbase.output.path
33
import org.radarbase.output.path.RecordPathFactory.Companion.sanitizeId
44

55
class FixedPathFormatterPlugin : PathFormatterPlugin() {
6+
override val name: String = "fixed"
7+
68
override val allowedFormats: String = allowedParamNames.joinToString(separator = ", ")
79

810
override fun lookup(parameterContents: String): PathFormatParameters.() -> String = when (parameterContents) {

src/main/java/org/radarbase/output/path/FormattedPathFactory.kt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ open class FormattedPathFactory : RecordPathFactory() {
3333
override fun init(properties: Map<String, String>) {
3434
super.init(properties)
3535

36-
format = properties["format"] ?: DEFAULT_FORMAT
37-
val pluginClassNames = properties["plugins"] ?: DEFAULT_FORMAT_PLUGINS
36+
format = properties["format"] ?: DEFAULT_FORMAT
3837

39-
logger.info("Path formatter uses format '{}' with plugins '{}'", format, pluginClassNames)
38+
plugins = instantiatePlugins(properties["plugins"] ?: DEFAULT_FORMAT_PLUGINS, properties)
39+
40+
logger.info("Path formatter uses format '{}' with plugins '{}'", format, plugins.map { it.name })
4041

41-
plugins = instantiatePlugins(pluginClassNames, properties)
4242
formatter = PathFormatter(format, plugins)
4343
}
4444

@@ -58,17 +58,17 @@ open class FormattedPathFactory : RecordPathFactory() {
5858
val topicFormat = config.pathProperties.getOrDefault("format", format)
5959
val pluginClassNames = config.pathProperties["plugins"]
6060

61+
val topicPlugins = if (pluginClassNames != null) {
62+
instantiatePlugins(pluginClassNames, properties + config.pathProperties)
63+
} else plugins
64+
6165
logger.info(
6266
"Path formatter of topic {} uses format {} with plugins {}",
6367
topic,
6468
topicFormat,
65-
pluginClassNames
69+
topicPlugins.map { it.name }
6670
)
6771

68-
val topicPlugins = if (pluginClassNames != null) {
69-
instantiatePlugins(pluginClassNames, properties + config.pathProperties)
70-
} else plugins
71-
7272
PathFormatter(topicFormat, topicPlugins)
7373
}
7474
}

src/main/java/org/radarbase/output/path/PathFormatterPlugin.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ package org.radarbase.output.path
33
import org.radarbase.output.Plugin
44

55
abstract class PathFormatterPlugin : Plugin {
6+
/**
7+
* Short name to reference this plugin by.
8+
*/
9+
open val name: String
10+
get() = prefix ?: javaClass.canonicalName
11+
612
/**
713
* Prefix for parameter names covered by this plugin. If null, [extractParamContents] must be
814
* overridden to cover only supported parameters.

0 commit comments

Comments
 (0)