Skip to content

Commit 87c85b3

Browse files
authored
Merge pull request #369 from IvanPuntev/fix/runtime-config-in-build-steps
Moving the runtime config from the build steps.
2 parents 69cb1c6 + 5f5b67e commit 87c85b3

File tree

2 files changed

+19
-20
lines changed

2 files changed

+19
-20
lines changed

deployment/src/main/java/io/quarkiverse/loggingjson/deployment/LoggingJsonProcessor.java

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
import io.quarkiverse.loggingjson.JsonFactory;
88
import io.quarkiverse.loggingjson.LoggingJsonRecorder;
9-
import io.quarkiverse.loggingjson.config.Config;
109
import io.quarkiverse.loggingjson.jackson.JacksonJsonFactory;
1110
import io.quarkiverse.loggingjson.jsonb.JsonbJsonFactory;
1211
import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
@@ -33,23 +32,20 @@ FeatureBuildItem feature() {
3332

3433
@BuildStep
3534
@Record(ExecutionTime.RUNTIME_INIT)
36-
LogConsoleFormatBuildItem setUpConsoleFormatter(Capabilities capabilities, LoggingJsonRecorder recorder,
37-
Config config) {
38-
return new LogConsoleFormatBuildItem(recorder.initializeConsoleJsonLogging(config, jsonFactory(capabilities)));
35+
LogConsoleFormatBuildItem setUpConsoleFormatter(Capabilities capabilities, LoggingJsonRecorder recorder) {
36+
return new LogConsoleFormatBuildItem(recorder.initializeConsoleJsonLogging(jsonFactory(capabilities)));
3937
}
4038

4139
@BuildStep
4240
@Record(ExecutionTime.RUNTIME_INIT)
43-
LogFileFormatBuildItem setUpFileFormatter(Capabilities capabilities, LoggingJsonRecorder recorder,
44-
Config config) {
45-
return new LogFileFormatBuildItem(recorder.initializeFileJsonLogging(config, jsonFactory(capabilities)));
41+
LogFileFormatBuildItem setUpFileFormatter(Capabilities capabilities, LoggingJsonRecorder recorder) {
42+
return new LogFileFormatBuildItem(recorder.initializeFileJsonLogging(jsonFactory(capabilities)));
4643
}
4744

4845
@BuildStep
4946
@Record(ExecutionTime.RUNTIME_INIT)
50-
LogSocketFormatBuildItem setUpSocketFormatter(Capabilities capabilities, LoggingJsonRecorder recorder,
51-
Config config) {
52-
return new LogSocketFormatBuildItem(recorder.initializeSocketJsonLogging(config, jsonFactory(capabilities)));
47+
LogSocketFormatBuildItem setUpSocketFormatter(Capabilities capabilities, LoggingJsonRecorder recorder) {
48+
return new LogSocketFormatBuildItem(recorder.initializeSocketJsonLogging(jsonFactory(capabilities)));
5349
}
5450

5551
private JsonFactory jsonFactory(Capabilities capabilities) {
@@ -67,7 +63,7 @@ private JsonFactory jsonFactory(Capabilities capabilities) {
6763
void discoverJsonProviders(BuildProducer<AdditionalBeanBuildItem> beans,
6864
CombinedIndexBuildItem combinedIndexBuildItem) {
6965
Collection<ClassInfo> jsonProviders = combinedIndexBuildItem.getIndex()
70-
.getAllKnownImplementors(LoggingJsonDotNames.JSON_PROVIDER);
66+
.getAllKnownImplementations(LoggingJsonDotNames.JSON_PROVIDER);
7167
for (ClassInfo provider : jsonProviders) {
7268
beans.produce(AdditionalBeanBuildItem.unremovableOf(provider.name().toString()));
7369
}

runtime/src/main/java/io/quarkiverse/loggingjson/LoggingJsonRecorder.java

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,22 @@
2121
public class LoggingJsonRecorder {
2222
private static final Logger log = LoggerFactory.getLogger(LoggingJsonRecorder.class);
2323

24-
public RuntimeValue<Optional<Formatter>> initializeConsoleJsonLogging(Config config,
25-
JsonFactory jsonFactory) {
26-
return initializeJsonLogging(config.console(), config, jsonFactory);
24+
private final RuntimeValue<Config> config;
25+
26+
public LoggingJsonRecorder(RuntimeValue<Config> config) {
27+
this.config = config;
2728
}
2829

29-
public RuntimeValue<Optional<Formatter>> initializeFileJsonLogging(Config config,
30-
JsonFactory jsonFactory) {
31-
return initializeJsonLogging(config.file(), config, jsonFactory);
30+
public RuntimeValue<Optional<Formatter>> initializeConsoleJsonLogging(JsonFactory jsonFactory) {
31+
return initializeJsonLogging(config.getValue().console(), config.getValue(), jsonFactory);
3232
}
3333

34-
public RuntimeValue<Optional<Formatter>> initializeSocketJsonLogging(Config config,
35-
JsonFactory jsonFactory) {
36-
return initializeJsonLogging(config.socket(), config, jsonFactory);
34+
public RuntimeValue<Optional<Formatter>> initializeFileJsonLogging(JsonFactory jsonFactory) {
35+
return initializeJsonLogging(config.getValue().file(), config.getValue(), jsonFactory);
36+
}
37+
38+
public RuntimeValue<Optional<Formatter>> initializeSocketJsonLogging(JsonFactory jsonFactory) {
39+
return initializeJsonLogging(config.getValue().socket(), config.getValue(), jsonFactory);
3740
}
3841

3942
public RuntimeValue<Optional<Formatter>> initializeJsonLogging(ConfigFormatter formatter, Config config,

0 commit comments

Comments
 (0)