refactor: extract logging config into mixin

Author: simschla

README.md

@@ -126,7 +126,10 @@ Runs spotless
   -p, --parallelity=N        The number of parallel formatter threads to run.
                                (default: #cores * 0.5)
   -q, --quiet                Disable as much output as possible.
+  -q, --quiet                Disable as much output as possible.
   -t, --target=<targets>     The target files to format.
+  -v                         Enable verbose output. Multiple -v options
+                               increase the verbosity (max 5).
   -v                         Enable verbose output. Multiple -v options
                                increase the verbosity (max 5).
   -V, --version              Print version information and exit.

app/src/main/java/com/diffplug/spotless/cli/LoggingOptions.java

@@ -0,0 +1,69 @@
+/*
+ * Copyright 2024 DiffPlug
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.diffplug.spotless.cli;
+
+import java.io.File;
+
+import com.diffplug.spotless.cli.logging.output.LoggingConfigurer;
+
+import picocli.CommandLine;
+
+class LoggingOptions {
+
+    @CommandLine.ArgGroup(exclusive = true, multiplicity = "0..1")
+    LoggingLevelOptions loggingLevelOptions;
+
+    static class LoggingLevelOptions {
+        @CommandLine.Spec(CommandLine.Spec.Target.MIXEE)
+        CommandLine.Model.CommandSpec spec;
+
+        private boolean[] verbosity;
+
+        @CommandLine.Option(
+                names = {"-v"},
+                description = "Enable verbose output. Multiple -v options increase the verbosity (max 5).",
+                arity = "0")
+        public void setVerbose(boolean[] verbosity) {
+            if (verbosity.length > 5) {
+                throw new CommandLine.ParameterException(
+                        spec.commandLine(), "Error: --verbose can be used at most 5 times");
+            }
+            this.verbosity = verbosity;
+        }
+
+        @CommandLine.Option(
+                names = {"--quiet", "-q"},
+                description = "Disable as much output as possible.",
+                arity = "0")
+        boolean quiet;
+
+        LoggingConfigurer.CLIOutputLevel toCliOutputLevel() {
+            if (quiet) {
+                return LoggingConfigurer.CLIOutputLevel.QUIET;
+            }
+            if (verbosity == null) {
+                return LoggingConfigurer.CLIOutputLevel.DEFAULT;
+            }
+            int verbosityCount = this.verbosity.length;
+            return LoggingConfigurer.CLIOutputLevel.verbosity(verbosityCount);
+        }
+    }
+
+    @CommandLine.Option(
+            names = {"--log-file"},
+            description = "The log file to write the output to.")
+    File logFile;
+}

app/src/main/java/com/diffplug/spotless/cli/SpotlessCLI.java

@@ -15,7 +15,6 @@
  */
 package com.diffplug.spotless.cli;
 
-import java.io.File;
 import java.nio.charset.Charset;
 import java.nio.file.Path;
 import java.util.List;
@@ -119,55 +118,16 @@ public void setParallelity(int parallelity) {
         this.parallelity = parallelity;
     }
 
-    @CommandLine.ArgGroup(exclusive = true, multiplicity = "0..1")
-    LoggingLevelOptions loggingLevelOptions;
-
-    class LoggingLevelOptions {
-
-        private boolean[] verbosity;
-
-        @CommandLine.Option(
-                names = {"-v"},
-                description = "Enable verbose output. Multiple -v options increase the verbosity (max 5).",
-                arity = "0")
-        public void setVerbose(boolean[] verbosity) {
-            if (verbosity.length > 5) {
-                throw new CommandLine.ParameterException(
-                        spec.commandLine(), "Error: --verbose can be used at most 5 times");
-            }
-            this.verbosity = verbosity;
-        }
-
-        @CommandLine.Option(
-                names = {"--quiet", "-q"},
-                description = "Disable as much output as possible.",
-                arity = "0")
-        boolean quiet;
-
-        LoggingConfigurer.CLIOutputLevel toCliOutputLevel() {
-            if (quiet) {
-                return LoggingConfigurer.CLIOutputLevel.QUIET;
-            }
-            if (verbosity == null) {
-                return LoggingConfigurer.CLIOutputLevel.DEFAULT;
-            }
-            int verbosityCount = this.verbosity.length;
-            return LoggingConfigurer.CLIOutputLevel.verbosity(verbosityCount);
-        }
-    }
-
-    @CommandLine.Option(
-            names = {"--log-file"},
-            description = "The log file to write the output to.")
-    File logFile;
+    @CommandLine.Mixin
+    LoggingOptions loggingOptions;
 
     @Override
     public void setupLogging() {
         LoggingConfigurer.configureLogging(
-                loggingLevelOptions != null
-                        ? loggingLevelOptions.toCliOutputLevel()
+                loggingOptions.loggingLevelOptions != null
+                        ? loggingOptions.loggingLevelOptions.toCliOutputLevel()
                         : LoggingConfigurer.CLIOutputLevel.DEFAULT,
-                logFile);
+                loggingOptions.logFile);
     }
 
     @Override