Fix Sonar

Author: ComputerDaddyGuy

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

@@ -28,7 +28,8 @@ public static String toTextBlock(@Nullable Record rec) {
 	private static void toTextBlock(List<String> lines, String shift, @Nullable String attrName, @Nullable Object value, String indent) {
 		if (value == null) {
 			return; // do not print null objects, just ignore them
-		} else if (value.getClass().isRecord()) {
+		}
+		if (value.getClass().isRecord()) {
 			toTextBlockRecord(lines, shift, attrName, (Record) value, indent);
 		} else if (value instanceof Collection<?> coll) {
 			toTextBlockCollection(lines, shift, attrName, coll, indent);

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

@@ -70,7 +70,7 @@ private void printErr(String msg, Object... args) {
 	}
 
 	private void printfln(PrintStream dest, String msg, Object... args) {
-		dest.printf(msg + "\n", args);// Because "printf" does not print line return
+		dest.printf("%s%s", msg, System.lineSeparator(), args);// Because "printf" does not print line return
 	}
 
 }

src/main/java/io/github/computerdaddyguy/jfiletreeprettyprinter/cli/options/mapper/DefaultExternalOptionsMapper.java

@@ -39,8 +39,9 @@ private PrettyPrintOptions mapCompactDirectories(PrettyPrintOptions options, Ext
 	}
 
 	private PrettyPrintOptions mapMaxDepth(PrettyPrintOptions options, ExternalOptions externalOptions) {
-		if (externalOptions.maxDepth() != null) {
-			return options.withMaxDepth(externalOptions.maxDepth());
+		var max = externalOptions.maxDepth();
+		if (max != null) {
+			return options.withMaxDepth(max);
 		}
 		return options;
 	}

src/test/java/io/github/computerdaddyguy/jfiletreeprettyprinter/cli/FileTreePrettyPrinterCommandLineTest.java

@@ -9,8 +9,8 @@
 import io.github.computerdaddyguy.jfiletreeprettyprinter.cli.options.OptionsLoader;
 import io.github.computerdaddyguy.jfiletreeprettyprinter.options.ChildLimits;
 import io.github.computerdaddyguy.jfiletreeprettyprinter.options.PathMatchers;
+import io.github.computerdaddyguy.jfiletreeprettyprinter.options.PrettyPrintOptions;
 import java.io.ByteArrayOutputStream;
-import java.io.IOException;
 import java.io.PrintStream;
 import java.nio.file.Path;
 import java.util.function.Consumer;
@@ -53,7 +53,7 @@ private void runErrorTest(FileTreePrettyPrinterCommandLine cli, String[] args, C
 	}
 
 	@Test
-	void no_options() throws IOException {
+	void no_options() {
 		String targetPath = "src/test/resources/cli/base";
 		String optionsPath = null;
 		String[] args = buildCliArgs(targetPath, optionsPath);
@@ -68,7 +68,7 @@ void no_options() throws IOException {
 	}
 
 	@Test
-	void unexisting_options() throws IOException {
+	void unexisting_options() {
 		String targetPath = "src/test/resources/cli/base";
 		String optionsPath = "not_existing";
 		String[] args = buildCliArgs(targetPath, optionsPath);
@@ -82,7 +82,7 @@ void unexisting_options() throws IOException {
 	}
 
 	@Test
-	void malformed_options() throws IOException {
+	void malformed_options() {
 		String targetPath = "src/test/resources/cli/base";
 		String optionsPath = "src/test/resources/cli/options/malformed.yaml";
 		String[] args = buildCliArgs(targetPath, optionsPath);
@@ -96,7 +96,7 @@ void malformed_options() throws IOException {
 	}
 
 	@Test
-	void invalid_options() throws IOException {
+	void invalid_options() {
 		String targetPath = "src/test/resources/cli/base";
 		String optionsPath = "src/test/resources/cli/options/invalid.yaml";
 		String[] args = buildCliArgs(targetPath, optionsPath);
@@ -116,7 +116,7 @@ void invalid_options() throws IOException {
 	class Emojis {
 
 		@Test
-		void emojis() throws IOException {
+		void nominal() {
 			String targetPath = "src/test/resources/cli/base";
 			String optionsPath = "src/test/resources/cli/options/emojis.yaml";
 			String[] args = buildCliArgs(targetPath, optionsPath);
@@ -126,7 +126,7 @@ void emojis() throws IOException {
 			var cli = new FileTreePrettyPrinterCommandLine(output, optionsLoader, exHandler);
 
 			var ref = FileTreePrettyPrinter.builder()
-				.customizeOptions(options -> options.withDefaultEmojis())
+				.customizeOptions(PrettyPrintOptions::withDefaultEmojis)
 				.build();
 
 			runSuccessTest(cli, args, ref, targetPath);
@@ -138,7 +138,7 @@ void emojis() throws IOException {
 	class CompactDirectories {
 
 		@Test
-		void emojis() throws IOException {
+		void nominal() {
 			String targetPath = "src/test/resources/cli/base";
 			String optionsPath = "src/test/resources/cli/options/compactDirectories.yaml";
 			String[] args = buildCliArgs(targetPath, optionsPath);
@@ -160,7 +160,7 @@ void emojis() throws IOException {
 	class MaxDepth {
 
 		@Test
-		void emojis() throws IOException {
+		void nominal() {
 			String targetPath = "src/test/resources/cli/base";
 			String optionsPath = "src/test/resources/cli/options/maxDepth.yaml";
 			String[] args = buildCliArgs(targetPath, optionsPath);
@@ -182,7 +182,7 @@ void emojis() throws IOException {
 	class ChildLimit {
 
 		@Test
-		void static_limit() throws IOException {
+		void static_limit() {
 			String targetPath = "src/test/resources/cli/base";
 			String optionsPath = "src/test/resources/cli/options/childLimit_static.yaml";
 			String[] args = buildCliArgs(targetPath, optionsPath);
@@ -199,7 +199,7 @@ void static_limit() throws IOException {
 		}
 
 		@Test
-		void dynamic_limit_glob() throws IOException {
+		void dynamic_limit_glob() {
 			String targetPath = "src/test/resources/cli/base";
 			String optionsPath = "src/test/resources/cli/options/childLimit_dynamic_glob.yaml";
 			String[] args = buildCliArgs(targetPath, optionsPath);
@@ -220,7 +220,7 @@ void dynamic_limit_glob() throws IOException {
 		}
 
 		@Test
-		void dynamic_limit_everything() throws IOException {
+		void dynamic_limit_everything() {
 			String targetPath = "src/test/resources/cli/base";
 			String optionsPath = "src/test/resources/cli/options/childLimit_dynamic_everything.yaml";
 			String[] args = buildCliArgs(targetPath, optionsPath);
@@ -240,7 +240,7 @@ void dynamic_limit_everything() throws IOException {
 		}
 
 		@Test
-		void dynamic_limit_allOf() throws IOException {
+		void dynamic_limit_allOf() {
 			String targetPath = "src/test/resources/cli/base";
 			String optionsPath = "src/test/resources/cli/options/childLimit_dynamic_allOf.yaml";
 			String[] args = buildCliArgs(targetPath, optionsPath);
@@ -261,7 +261,7 @@ void dynamic_limit_allOf() throws IOException {
 		}
 
 		@Test
-		void dynamic_limit_anyOf() throws IOException {
+		void dynamic_limit_anyOf() {
 			String targetPath = "src/test/resources/cli/base";
 			String optionsPath = "src/test/resources/cli/options/childLimit_dynamic_anyOf.yaml";
 			String[] args = buildCliArgs(targetPath, optionsPath);
@@ -282,7 +282,7 @@ void dynamic_limit_anyOf() throws IOException {
 		}
 
 		@Test
-		void dynamic_limit_noneOf() throws IOException {
+		void dynamic_limit_noneOf() {
 			String targetPath = "src/test/resources/cli/base";
 			String optionsPath = "src/test/resources/cli/options/childLimit_dynamic_noneOf.yaml";
 			String[] args = buildCliArgs(targetPath, optionsPath);
@@ -308,7 +308,7 @@ void dynamic_limit_noneOf() throws IOException {
 	class Filter {
 
 		@Test
-		void nominal() throws IOException {
+		void nominal() {
 			String targetPath = "src/test/resources/cli/base";
 			String optionsPath = "src/test/resources/cli/options/filter.yaml";
 			String[] args = buildCliArgs(targetPath, optionsPath);
@@ -331,7 +331,7 @@ void nominal() throws IOException {
 	class LineExtensions {
 
 		@Test
-		void nominal() throws IOException {
+		void nominal() {
 			String targetPath = "src/test/resources/cli/base";
 			String optionsPath = "src/test/resources/cli/options/lineExtensions.yaml";
 			String[] args = buildCliArgs(targetPath, optionsPath);