Fix sonar

Author: ComputerDaddyGuy

src/example/java/io/github/computerdaddyguy/jfiletreeprettyprinter/example/CompleteExample.java

@@ -11,8 +11,6 @@ public class CompleteExample {
 
 	public static void main(String[] args) {
 
-		var rootFolder = "JFileTreePrettyPrinter";
-
 		var filterDir = PathPredicates.builder()
 			.pathTest(path -> !PathPredicates.hasName(path, ".git"))
 			.pathTest(path -> !PathPredicates.hasFullPathMatchingGlob(path, "**/.git"))

src/main/java/io/github/computerdaddyguy/jfiletreeprettyprinter/renderer/DefaultTreeEntryRenderer.java

@@ -13,6 +13,7 @@
 import java.util.Objects;
 import java.util.Optional;
 import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 @NullMarked
 class DefaultTreeEntryRenderer implements TreeEntryRenderer {
@@ -41,25 +42,28 @@ private String renderTree(TreeEntry entry, Depth depth) {
 
 	private String renderDirectory(Depth depth, DirectoryEntry dirEntry, List<Path> compactPaths) {
 
-		Optional<String> extension = null;
+		boolean extensionEvaluated = false;
+		String extension = null;
+
 		if (options.areCompactDirectoriesUsed()
 			&& !depth.isRoot()
 			&& dirEntry.getEntries().size() == 1
 			&& dirEntry.getEntries().get(0) instanceof DirectoryEntry childDirEntry) {
 
 			extension = computeLineExtension(dirEntry.getDir());
-			if (extension.isEmpty()) {
+			extensionEvaluated = true;
+			if (extension == null) {
 				var newCompactPaths = new ArrayList<>(compactPaths);
 				newCompactPaths.add(childDirEntry.getDir());
 				return renderDirectory(depth, childDirEntry, newCompactPaths);
 			}
 		}
 
 		var line = lineRenderer.renderDirectoryBegin(depth, dirEntry, compactPaths);
-		if (extension == null) {
+		if (!extensionEvaluated) {
 			extension = computeLineExtension(dirEntry.getDir());
 		}
-		line += extension.orElse("");
+		line += Optional.ofNullable(extension).orElse("");
 
 		var childIt = dirEntry.getEntries().iterator();
 
@@ -81,16 +85,17 @@ private String renderDirectory(Depth depth, DirectoryEntry dirEntry, List<Path>
 		return line + childLines.toString();
 	}
 
-	private Optional<String> computeLineExtension(Path path) {
+	@Nullable
+	private String computeLineExtension(Path path) {
 		if (options.getLineExtension() == null) {
-			return Optional.empty();
+			return null;
 		}
-		return Optional.ofNullable(options.getLineExtension().apply(path));
+		return options.getLineExtension().apply(path);
 	}
 
 	private String renderFile(Depth depth, FileEntry fileEntry) {
 		var line = lineRenderer.renderFile(depth, fileEntry);
-		line += computeLineExtension(fileEntry.getFile()).orElse("");
+		line += Optional.ofNullable(computeLineExtension(fileEntry.getFile())).orElse("");
 		return line;
 	}
 

src/main/java/io/github/computerdaddyguy/jfiletreeprettyprinter/scanner/DefaultPathToTreeScanner.java

@@ -57,11 +57,6 @@ private TreeEntry handleDirectory(int depth, Path dir, Predicate<Path> filter) {
 			throw new UncheckedIOException("Unable to list files for directory: " + dir, e);
 		}
 
-//		// Filter is active and no children match
-//		if (depth > 0 && filter != null && childEntries.isEmpty() && !filter.test(dir)) {
-//			return null; // Do no show this directory at all
-//		}
-
 		return new DirectoryEntry(dir, childEntries);
 	}
 
@@ -97,24 +92,17 @@ private List<TreeEntry> handleDirectoryChildren(int depth, Path dir, Iterator<Pa
 	private List<TreeEntry> handleLeftOverChildren(int depth, Iterator<Path> pathIterator, Predicate<Path> filter) {
 		var childEntries = new ArrayList<TreeEntry>();
 
-		if (filter == null) {
-			var skippedChildren = new ArrayList<Path>();
-			pathIterator.forEachRemaining(skippedChildren::add);
+		var skippedChildren = new ArrayList<Path>();
+		while (pathIterator.hasNext()) {
+			var child = pathIterator.next();
+			var childEntry = handle(depth + 1, child, filter);
+			if (childEntry != null) { // Is null if no children file is retained by filter
+				skippedChildren.add(child);
+			}
+		}
+		if (!skippedChildren.isEmpty()) {
 			var childrenSkippedEntry = new SkippedChildrenEntry(skippedChildren);
 			childEntries.add(childrenSkippedEntry);
-		} else {
-			var skippedChildren = new ArrayList<Path>();
-			while (pathIterator.hasNext()) {
-				var child = pathIterator.next();
-				var childEntry = handle(depth + 1, child, filter);
-				if (childEntry != null) { // Is null if no children file is retained by filter
-					skippedChildren.add(child);
-				}
-			}
-			if (!skippedChildren.isEmpty()) {
-				var childrenSkippedEntry = new SkippedChildrenEntry(skippedChildren);
-				childEntries.add(childrenSkippedEntry);
-			}
 		}
 
 		return childEntries;

src/test/java/io/github/computerdaddyguy/jfiletreeprettyprinter/LineExtensionTest.java

@@ -88,6 +88,28 @@ void compact_dir_first_dir() {
 		compact_dir(lineExtension, expected);
 	}
 
+	@Test
+	void compact_dir_empty_string_workds() {
+
+		Function<Path, String> lineExtension = p -> {
+			if (PathPredicates.hasName(p, "dirA")) {
+				return "";
+			}
+			return null;
+		};
+
+		var expected = """
+			targetPath/
+			├─ dirA/
+			│  └─ dirB/dirC/
+			│     ├─ file1
+			│     ├─ file2
+			│     └─ file3
+			└─ dirX/""";
+
+		compact_dir(lineExtension, expected);
+	}
+
 	@Test
 	void compact_dir_middle_dir() {