Be a lot more consistent in config regarding enabled

We get rid of .enable= configuration properties in favor of enabled= as
most of our properties were already using this pattern.

Author: gsmet

core/deployment/src/main/java/io/quarkus/deployment/SnapStartConfig.java

@@ -23,6 +23,17 @@ public interface SnapStartConfig {
      * Default value is dependent on extensions deployed
      * (i.e. when using AWS Lambda extensions, this will be set to true by default)
      */
+    Optional<Boolean> enabled();
+
+    /**
+     * Enable/Disable SnapStart integration
+     * <p>
+     * Default value is dependent on extensions deployed
+     * (i.e. when using AWS Lambda extensions, this will be set to true by default)
+     *
+     * @deprecated use {@code quarkus.snapstart.enabled} instead
+     */
+    @Deprecated(since = "3.26", forRemoval = true)
     Optional<Boolean> enable();
 
     /**

core/deployment/src/main/java/io/quarkus/deployment/SnapStartProcessor.java

@@ -32,8 +32,10 @@ public void processSnapStart(BuildProducer<PreloadClassesEnabledBuildItem> prelo
             SnapStartRecorder recorder,
             SnapStartConfig config,
             Optional<SnapStartDefaultValueBuildItem> defaultVal) {
-        if (config.enable().isPresent()) {
-            if (!config.enable().get().booleanValue()) {
+        Optional<Boolean> snapstartEnabled = config.enable().isPresent() ? config.enable() : config.enabled();
+
+        if (snapstartEnabled.isPresent()) {
+            if (!snapstartEnabled.get().booleanValue()) {
                 return;
             }
 
@@ -54,8 +56,10 @@ public void generateClassListFromApplication(
             TransformedClassesBuildItem transformedClasses,
             ApplicationArchivesBuildItem applicationArchivesBuildItem,
             List<GeneratedClassBuildItem> generatedClasses) {
-        if (config.enable().isPresent()) {
-            if (!config.enable().get()) {
+        Optional<Boolean> snapstartEnabled = config.enable().isPresent() ? config.enable() : config.enabled();
+
+        if (snapstartEnabled.isPresent()) {
+            if (!snapstartEnabled.get().booleanValue()) {
                 return;
             }
         } else if (defaultVal == null || !defaultVal.isPresent() || !defaultVal.get().isDefaultValue()) {

core/runtime/src/main/java/io/quarkus/runtime/logging/LogRuntimeConfig.java

@@ -178,7 +178,16 @@ interface FileConfig {
          * If file logging should be enabled
          */
         @WithDefault("false")
-        boolean enable();
+        boolean enabled();
+
+        /**
+         * If file logging should be enabled
+         *
+         * @deprecated use {@code quarkus.log.file.enabled} instead
+         */
+        // when dropping this property also adjust OpenTelemetryLogHandler
+        @Deprecated(since = "3.26", forRemoval = true)
+        Optional<Boolean> enable();
 
         /**
          * The log format
@@ -269,11 +278,20 @@ interface RotationConfig {
     }
 
     interface ConsoleConfig {
+
         /**
          * If console logging should be enabled
          */
         @WithDefault("true")
-        boolean enable();
+        boolean enabled();
+
+        /**
+         * If console logging should be enabled
+         *
+         * @deprecated use {@code quarkus.log.console.enabled} instead
+         */
+        @Deprecated(since = "3.26", forRemoval = true)
+        Optional<Boolean> enable();
 
         /**
          * If console logging should go to {@link System#err} instead of {@link System#out}.
@@ -331,7 +349,15 @@ interface SyslogConfig {
          * If syslog logging should be enabled
          */
         @WithDefault("false")
-        boolean enable();
+        boolean enabled();
+
+        /**
+         * If syslog logging should be enabled
+         *
+         * @deprecated use {@code quarkus.log.syslog.enabled} instead
+         */
+        @Deprecated(since = "3.26", forRemoval = true)
+        Optional<Boolean> enable();
 
         /**
          *
@@ -442,7 +468,15 @@ interface SocketConfig {
          * If socket logging should be enabled
          */
         @WithDefault("false")
-        boolean enable();
+        boolean enabled();
+
+        /**
+         * If socket logging should be enabled
+         *
+         * @deprecated use {@code quarkus.log.socket.enabled} instead
+         */
+        @Deprecated(since = "3.26", forRemoval = true)
+        Optional<Boolean> enable();
 
         /**
          *
@@ -507,10 +541,18 @@ interface CleanupFilterConfig {
     interface AsyncConfig {
 
         /**
-         * Indicates whether to log asynchronously
+         * Whether to log asynchronously
          */
         @WithDefault("false")
-        boolean enable();
+        boolean enabled();
+
+        /**
+         * Whether to log asynchronously
+         *
+         * @deprecated use {@code .enabled} instead
+         */
+        @Deprecated(since = "3.26", forRemoval = true)
+        Optional<Boolean> enable();
 
         /**
          * Indicates whether to log asynchronously

core/runtime/src/main/java/io/quarkus/runtime/logging/LoggingSetupRecorder.java

@@ -185,7 +185,7 @@ public void accept(String loggerName, CleanupFilterConfig config) {
         ArrayList<Handler> handlers = new ArrayList<>(
                 3 + additionalHandlers.size() + (config.handlers().isPresent() ? config.handlers().get().size() : 0));
 
-        if (config.console().enable()) {
+        if (config.console().enable().orElse(config.console().enabled())) {
             Handler consoleHandler = configureConsoleHandler(config.console(), consoleRuntimeConfig.getValue(), errorManager,
                     cleanupFiler,
                     namedFilters, possibleConsoleFormatters, possibleBannerSupplier, launchMode, includeFilters);
@@ -211,20 +211,20 @@ public void close() throws SecurityException {
             });
         }
 
-        if (config.file().enable()) {
+        if (config.file().enable().orElse(config.file().enabled())) {
             handlers.add(configureFileHandler(config.file(), errorManager, cleanupFiler, namedFilters, possibleFileFormatters,
                     includeFilters));
         }
 
-        if (config.syslog().enable()) {
+        if (config.syslog().enable().orElse(config.syslog().enabled())) {
             Handler syslogHandler = configureSyslogHandler(config.syslog(), errorManager, cleanupFiler, namedFilters,
                     possibleSyslogFormatters, includeFilters);
             if (syslogHandler != null) {
                 handlers.add(syslogHandler);
             }
         }
 
-        if (config.socket().enable()) {
+        if (config.socket().enable().orElse(config.socket().enabled())) {
             final Handler socketHandler = configureSocketHandler(config.socket(), errorManager, cleanupFiler,
                     namedFilters, possibleSocketFormatters, includeFilters);
             if (socketHandler != null) {
@@ -342,7 +342,7 @@ public static void initializeBuildTimeLogging(
         LogCleanupFilter logCleanupFilter = new LogCleanupFilter(filterElements, dummy);
 
         ArrayList<Handler> handlers = new ArrayList<>(3);
-        if (config.console().enable()) {
+        if (config.console().enable().orElse(config.console().enabled())) {
             Handler consoleHandler = configureConsoleHandler(config.console(), consoleConfig, errorManager, logCleanupFilter,
                     emptyMap(), emptyList(), new RuntimeValue<>(Optional.empty()), launchMode, false);
             errorManager = consoleHandler.getErrorManager();
@@ -417,7 +417,7 @@ private static Map<String, Handler> createNamedHandlers(
         Map<String, Handler> namedHandlers = new HashMap<>();
         for (Entry<String, ConsoleConfig> consoleConfigEntry : config.consoleHandlers().entrySet()) {
             ConsoleConfig namedConsoleConfig = consoleConfigEntry.getValue();
-            if (!namedConsoleConfig.enable()) {
+            if (!namedConsoleConfig.enable().orElse(namedConsoleConfig.enabled())) {
                 continue;
             }
             final Handler consoleHandler = configureConsoleHandler(namedConsoleConfig, consoleRuntimeConfig,
@@ -427,7 +427,7 @@ private static Map<String, Handler> createNamedHandlers(
         }
         for (Entry<String, FileConfig> fileConfigEntry : config.fileHandlers().entrySet()) {
             FileConfig namedFileConfig = fileConfigEntry.getValue();
-            if (!namedFileConfig.enable()) {
+            if (!namedFileConfig.enable().orElse(namedFileConfig.enabled())) {
                 continue;
             }
             final Handler fileHandler = configureFileHandler(namedFileConfig, errorManager, cleanupFilter, namedFilters,
@@ -436,7 +436,7 @@ private static Map<String, Handler> createNamedHandlers(
         }
         for (Entry<String, LogRuntimeConfig.SyslogConfig> sysLogConfigEntry : config.syslogHandlers().entrySet()) {
             LogRuntimeConfig.SyslogConfig namedSyslogConfig = sysLogConfigEntry.getValue();
-            if (!namedSyslogConfig.enable()) {
+            if (!namedSyslogConfig.enable().orElse(namedSyslogConfig.enabled())) {
                 continue;
             }
             final Handler syslogHandler = configureSyslogHandler(namedSyslogConfig, errorManager, cleanupFilter,
@@ -447,7 +447,7 @@ private static Map<String, Handler> createNamedHandlers(
         }
         for (Entry<String, SocketConfig> socketConfigEntry : config.socketHandlers().entrySet()) {
             SocketConfig namedSocketConfig = socketConfigEntry.getValue();
-            if (!namedSocketConfig.enable()) {
+            if (!namedSocketConfig.enable().orElse(namedSocketConfig.enabled())) {
                 continue;
             }
             final Handler socketHandler = configureSocketHandler(namedSocketConfig, errorManager, cleanupFilter,
@@ -621,11 +621,13 @@ private static Handler configureConsoleHandler(
         consoleHandler.setErrorManager(defaultErrorManager);
         applyFilter(includeFilters, defaultErrorManager, cleanupFilter, config.filter(), namedFilters, consoleHandler);
 
-        Handler handler = config.async().legacyEnable().orElse(config.async().enable())
+        boolean asyncEnabled = config.async().legacyEnable().orElse(config.async().enable().orElse(config.async().enabled()));
+
+        Handler handler = asyncEnabled
                 ? createAsyncHandler(config.async(), config.level(), consoleHandler)
                 : consoleHandler;
 
-        if (color && launchMode.isDevOrTest() && !config.async().enable()) {
+        if (color && launchMode.isDevOrTest() && !asyncEnabled) {
             final Handler delegate = handler;
             handler = new ExtHandler() {
                 @Override
@@ -717,7 +719,7 @@ private static Handler configureFileHandler(final FileConfig config, final Error
             handler.getErrorManager().error("Multiple file formatters were activated", null, ErrorManager.GENERIC_FAILURE);
         }
 
-        if (config.async().legacyEnable().orElse(config.async().enable())) {
+        if (config.async().legacyEnable().orElse(config.async().enable().orElse(config.async().enabled()))) {
             return createAsyncHandler(config.async(), config.level(), handler);
         }
         return handler;
@@ -804,7 +806,7 @@ private static Handler configureSyslogHandler(final LogRuntimeConfig.SyslogConfi
                         ErrorManager.GENERIC_FAILURE);
             }
 
-            if (config.async().legacyEnable().orElse(config.async().enable())) {
+            if (config.async().legacyEnable().orElse(config.async().enable().orElse(config.async().enabled()))) {
                 return createAsyncHandler(config.async(), config.level(), handler);
             }
             return handler;
@@ -851,7 +853,7 @@ private static Handler configureSocketHandler(final LogRuntimeConfig.SocketConfi
                         ErrorManager.GENERIC_FAILURE);
             }
 
-            if (config.async().legacyEnable().orElse(config.async().enable())) {
+            if (config.async().legacyEnable().orElse(config.async().enable().orElse(config.async().enabled()))) {
                 return createAsyncHandler(config.async(), config.level(), handler);
             }
             return handler;

extensions/elytron-security-properties-file/deployment/src/test/resources/application-form-auth.properties

@@ -1,8 +1,8 @@
 # Logging
 #quarkus.log.level=DEBUG
-#quarkus.log.console.enable=true
+#quarkus.log.console.enabled=true
 #quarkus.log.console.level=DEBUG
-#quarkus.log.file.enable=true
+#quarkus.log.file.enabled=true
 #quarkus.log.file.path=/tmp/trace.log
 #quarkus.log.file.level=TRACE
 #quarkus.log.file.format=%d{HH:mm:ss} %-5p [%c{2.}]] (%t) %s%e%n

extensions/elytron-security-properties-file/deployment/src/test/resources/application.properties

@@ -4,9 +4,9 @@ quarkus.security.users.file.roles=test-roles.properties
 quarkus.security.users.file.plain-text=true
 
 #quarkus.log.level=DEBUG
-#quarkus.log.console.enable=true
+#quarkus.log.console.enabled=true
 #quarkus.log.console.level=DEBUG
-#quarkus.log.file.enable=true
+#quarkus.log.file.enabled=true
 # Send output to a trace.log file under the /tmp directory
 #quarkus.log.file.path=/tmp/trace.log
 #quarkus.log.file.level=TRACE

extensions/keycloak-authorization/deployment/src/main/java/io/quarkus/keycloak/pep/deployment/KeycloakPolicyEnforcerBuildStep.java

@@ -49,7 +49,7 @@ public static class IsEnabled implements BooleanSupplier {
         KeycloakPolicyEnforcerBuildTimeConfig config;
 
         public boolean getAsBoolean() {
-            return config.policyEnforcer().enable();
+            return config.policyEnforcer().enable().orElse(config.policyEnforcer().enabled());
         }
     }
 }

extensions/keycloak-authorization/runtime/src/main/java/io/quarkus/keycloak/pep/runtime/KeycloakPolicyEnforcerBuildTimeConfig.java

@@ -1,5 +1,7 @@
 package io.quarkus.keycloak.pep.runtime;
 
+import java.util.Optional;
+
 import io.quarkus.runtime.annotations.ConfigGroup;
 import io.quarkus.runtime.annotations.ConfigRoot;
 import io.smallrye.config.ConfigMapping;
@@ -24,6 +26,14 @@ interface KeycloakPolicyEnforcerEnableStatus {
          * Enables policy enforcement.
          */
         @WithDefault("false")
-        boolean enable();
+        boolean enabled();
+
+        /**
+         * Enables policy enforcement.
+         *
+         * @deprecated use {@code quarkus.keycloak.policy-enforcer.enabled} instead
+         */
+        @Deprecated(since = "3.26", forRemoval = true)
+        Optional<Boolean> enable();
     }
 }

extensions/logging-json/deployment/src/test/resources/application-console-json-formatter-custom.properties

@@ -1,5 +1,5 @@
 quarkus.log.level=INFO
-quarkus.log.console.enable=true
+quarkus.log.console.enabled=true
 quarkus.log.console.level=WARNING
 quarkus.log.console.json.enabled=true
 quarkus.log.console.json.pretty-print=true

extensions/logging-json/deployment/src/test/resources/application-console-json-formatter-default.properties

@@ -1,5 +1,5 @@
 quarkus.log.level=INFO
-quarkus.log.console.enable=true
+quarkus.log.console.enabled=true
 quarkus.log.console.level=WARNING
 quarkus.log.console.format=%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c{3.}] (%t) %s%e%n
 quarkus.log.console.json.enabled=true