Fix Sonar

Author: ComputerDaddyGuy

pom.xml

@@ -151,7 +151,6 @@
 				</executions>
 				<configuration>
 					<generateGitPropertiesFile>false</generateGitPropertiesFile>
-<!--					<generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>-->
 					<commitIdGenerationMode>full</commitIdGenerationMode>
 				</configuration>
 			</plugin>

src/main/java/io/github/computerdaddyguy/jfiletreeprettyprinter/cli/ConsoleOutput.java

@@ -23,21 +23,21 @@ private void disableAllLoggers() {
 	}
 
 	private void printOut(String msg, Object... args) {
-		printf(System.out, msg, args);
+		printfln(System.out, msg, args);
 	}
 
 	private void printErr(String msg, Object... args) {
-		printf(System.err, msg, args);
+		printfln(System.err, msg, args);
 	}
 
-	private void printf(PrintStream dest, String msg, Object... args) {
+	private void printfln(PrintStream dest, String msg, Object... args) {
 		dest.printf(msg, args);
 		dest.println(); // Because "printf" does not print line return
 	}
 
 	public void printDebug(String msg, Object... args) {
 		// Could not (yet) make Logger level work within native image, so fallback to plain console output (for now)
-		if (debug && msg != null) {
+		if (debug) {
 			printOut(msg, args);
 		}
 	}

src/main/java/io/github/computerdaddyguy/jfiletreeprettyprinter/cli/PrettyPrintCommand.java

@@ -24,6 +24,8 @@
 @NullMarked
 class PrettyPrintCommand implements Callable<Integer> {
 
+	private static final String DEFAULT_OPTION_FILENAME = ".prettyprint";
+
 	@Nullable
 	@Parameters(index = "0", description = "The path to pretty print", arity = "0..1")
 	private File target;
@@ -84,9 +86,9 @@ private PrettyPrintOptions detectOptions(Path targetPath, ConsoleOutput output)
 			return options;
 		} else {
 			var potentialOptions = new ArrayList<Path>();
-			potentialOptions.add(targetPath.resolve(".prettyprint"));
-			potentialOptions.add(Path.of(".").resolve(".prettyprint"));
-			potentialOptions.add(Path.of(System.getProperty("user.home")).resolve(".prettyprint"));
+			potentialOptions.add(targetPath.resolve(DEFAULT_OPTION_FILENAME));
+			potentialOptions.add(Path.of(".").resolve(DEFAULT_OPTION_FILENAME));
+			potentialOptions.add(Path.of(System.getProperty("user.home")).resolve(DEFAULT_OPTION_FILENAME));
 			var options = reader.readOptions(potentialOptions);
 			if (options != null) {
 				return options;

src/main/java/io/github/computerdaddyguy/jfiletreeprettyprinter/cli/options/ExternalOptions.java

@@ -1,14 +1,15 @@
 package io.github.computerdaddyguy.jfiletreeprettyprinter.cli.options;
 
 import jakarta.validation.Valid;
+import org.jspecify.annotations.Nullable;
 
 record ExternalOptions(
-	Boolean emojis,
-	@Valid ChildLimit childLimit
+	@Nullable Boolean emojis,
+	@Valid @Nullable ChildLimit childLimit
 ) {
 
 	public ExternalOptions(Boolean emojis, ChildLimit childLimit) {
-		this.emojis = emojis == null ? false : emojis;
+		this.emojis = emojis;
 		this.childLimit = childLimit;
 	}
 

src/main/java/io/github/computerdaddyguy/jfiletreeprettyprinter/cli/options/ExternalOptionsReader.java

@@ -113,7 +113,7 @@ private ExternalOptions loadAndValidate(Path optionsPath) {
 	private PrettyPrintOptions mapToOptions(ExternalOptions externalOptions) {
 		var options = PrettyPrintOptions.createDefault();
 
-		if (externalOptions.emojis()) {
+		if (Boolean.TRUE.equals(externalOptions.emojis())) {
 			options = options.withDefaultEmojis();
 		}
 

src/main/java/io/github/computerdaddyguy/jfiletreeprettyprinter/cli/options/RecordUtils.java

@@ -4,20 +4,28 @@
 import java.util.Collection;
 import java.util.List;
 import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 @NullMarked
 class RecordUtils {
 
+	private RecordUtils() {
+		// Helper class
+	}
+
 	/**
 	 * Inspired from: https://sormuras.github.io/blog/2020-05-06-records-to-text-block.html
 	 */
-	static String toTextBlock(Record rec) {
+	static String toTextBlock(@Nullable Record rec) {
+		if (rec == null) {
+			return "null";
+		}
 		var lines = new ArrayList<String>();
 		toTextBlock(lines, "", null, rec, "  ");
 		return String.join(System.lineSeparator(), lines);
 	}
 
-	private static void toTextBlock(List<String> lines, String shift, String attrName, Object value, String indent) {
+	private static void toTextBlock(List<String> lines, String shift, @Nullable String attrName, Object value, String indent) {
 		var nested = value.getClass();
 		if (nested.isRecord()) {
 			toTextBlockRecord(lines, shift, attrName, (Record) value, indent);
@@ -28,7 +36,7 @@ private static void toTextBlock(List<String> lines, String shift, String attrNam
 		}
 	}
 
-	private static void toTextBlockRecord(List<String> lines, String shift, String attrName, Record rec, String indent) {
+	private static void toTextBlockRecord(List<String> lines, String shift, @Nullable String attrName, Record rec, String indent) {
 		if (attrName == null) {
 			lines.add(String.format("%s%s", shift, rec.getClass().getSimpleName()));
 		} else {
@@ -48,7 +56,7 @@ private static void toTextBlockRecord(List<String> lines, String shift, String a
 		}
 	}
 
-	private static void toTextBlockCollection(List<String> lines, String shift, String attrName, Collection<?> coll, String indent) {
+	private static void toTextBlockCollection(List<String> lines, String shift, @Nullable String attrName, Collection<?> coll, String indent) {
 		if (attrName == null) {
 			lines.add(String.format("%s[", shift));
 		} else {