From cbe869533dac7a5c04ce1841c06f3ecba9b2e057 Mon Sep 17 00:00:00 2001 From: Matthias Andreas Benkard Date: Mon, 26 Aug 2024 20:13:27 +0200 Subject: fix!: Move from @ConfigRoot/@ConfigItem to @ConfigMapping. The old way is deprecated. BREAKING CHANGE: This makes GoogleCloudJsonLoggingConfiguration into an interface (it was a class before) and its 'enabled' field into a method. Change-Id: I1a5db74e009ad5427ab7348ab6a6c34b970d4148 --- .../runtime/GoogleCloudJsonLoggingConfiguration.java | 17 +++++++++++------ .../runtime/GoogleCloudJsonLoggingRecorder.java | 2 +- 2 files changed, 12 insertions(+), 7 deletions(-) (limited to 'runtime/src/main/java') diff --git a/runtime/src/main/java/eu/mulk/quarkus/googlecloud/jsonlogging/runtime/GoogleCloudJsonLoggingConfiguration.java b/runtime/src/main/java/eu/mulk/quarkus/googlecloud/jsonlogging/runtime/GoogleCloudJsonLoggingConfiguration.java index 21a4ca9..72d1cfa 100644 --- a/runtime/src/main/java/eu/mulk/quarkus/googlecloud/jsonlogging/runtime/GoogleCloudJsonLoggingConfiguration.java +++ b/runtime/src/main/java/eu/mulk/quarkus/googlecloud/jsonlogging/runtime/GoogleCloudJsonLoggingConfiguration.java @@ -4,19 +4,24 @@ package eu.mulk.quarkus.googlecloud.jsonlogging.runtime; -import io.quarkus.runtime.annotations.ConfigItem; -import io.quarkus.runtime.annotations.ConfigPhase; +import static io.quarkus.runtime.annotations.ConfigPhase.RUN_TIME; + import io.quarkus.runtime.annotations.ConfigRoot; +import io.smallrye.config.ConfigMapping; +import io.smallrye.config.WithDefault; +import io.smallrye.config.WithParentName; /** Configuration for console logging in Google Cloud Logging JSON format. */ -@ConfigRoot(prefix = "quarkus.log.console", name = "google", phase = ConfigPhase.RUN_TIME) -public class GoogleCloudJsonLoggingConfiguration { +@ConfigMapping(prefix = "quarkus.log.console.google") +@ConfigRoot(phase = RUN_TIME) +public interface GoogleCloudJsonLoggingConfiguration { /** * Whether to enable Google Cloud Logging JSON logging to stdout/stderr. * *

Replaces the regular plain-text format for console logs. */ - @ConfigItem(defaultValue = "true", name = ConfigItem.PARENT) - public boolean enabled; + @WithDefault("true") + @WithParentName + boolean enabled(); } diff --git a/runtime/src/main/java/eu/mulk/quarkus/googlecloud/jsonlogging/runtime/GoogleCloudJsonLoggingRecorder.java b/runtime/src/main/java/eu/mulk/quarkus/googlecloud/jsonlogging/runtime/GoogleCloudJsonLoggingRecorder.java index af09231..74b63c6 100644 --- a/runtime/src/main/java/eu/mulk/quarkus/googlecloud/jsonlogging/runtime/GoogleCloudJsonLoggingRecorder.java +++ b/runtime/src/main/java/eu/mulk/quarkus/googlecloud/jsonlogging/runtime/GoogleCloudJsonLoggingRecorder.java @@ -28,7 +28,7 @@ public class GoogleCloudJsonLoggingRecorder { */ public RuntimeValue> initialize( GoogleCloudJsonLoggingConfiguration configuration) { - if (!configuration.enabled) { + if (!configuration.enabled()) { return new RuntimeValue<>(Optional.empty()); } -- cgit v1.2.3