Refactor: keep single implementation

Author: ComputerDaddyGuy

README.md

@@ -10,7 +10,8 @@ A lightweight Java library for printing directory structures in a clean, tree-li
   - Compact directory chains
   - Maximum depth
 
-> **ℹ️ Was developed just for fun, has not been thoroughly tested! May not be suitable for production code 😊**
+> [!CAUTION]
+> This lib was developed just for fun, and has not been thoroughly tested! May not be suitable for production code 😊
 
 * [Usage](#usage)  
 * [Import dependency](#import-dependency)
@@ -53,7 +54,7 @@ For Maven, import this dependency to your `pom.xml`:
 <dependency>
   <groupId>com.github.computerdaddyguy</groupId>
   <artifactId>jfiletreeprettyprinter</artifactId>
-  <version>0.1.0</version>
+  <version>0.0.1</version>
 </dependency>
 ```
 
@@ -91,7 +92,8 @@ tree_format/
     `-- subFile_2
 ```
 
-💡 *Idea for a future version: option to allow usage of custom format*
+> [!TIP]
+> *Idea for a future version: option to allow usage of custom format*
 
 
 ## Emojis ❤️
@@ -122,7 +124,8 @@ var prettyPrinter = FileTreePrettyPrinter.builder()
 └─ 🎬 file.avi
 ```
 
-💡 *Idea for a future version: option to allow custom emoji mapping*
+> [!TIP]
+> *Idea for a future version: option to allow custom emoji mapping*
 
 ## Children limit
 You can set a fixed limit to the number of children displayed for each directory.
@@ -176,7 +179,8 @@ children_limit_dynamic/
    └─ ... (9 files skipped)
 ```
 
-💡 *Idea for a future version: helper for custom basic functions (by name, prefix, regex, etc.)*
+> [!TIP]
+> *Idea for a future version: helper for custom basic functions (by name, prefix, regex, etc.)*
 
 ## Compact directories
 Directories chain with single directory child are fully expanded by default, but you can compact them into a single tree entry.

ROADMAP.md

@@ -1,26 +1,27 @@
 # Roadmap
 
-## Next version
+## Initial version
 - [x] Use JSpecify annotations
 - [x] Regroup all formatting work under single "LineFormatter"
 - [x] Builder with options (depth symbols, emoji, child limit)
 - [x] Unit tests, using @TempDir
-- [x] Better "isLastChild" detection algorithm
 - [x] Pre-defined Path predicates
 - [x] Add examples & README
 - [x] Implement emojis for files
 - [x] Unify dir-in-a-row into a single entry option
 - [x] Max depth options
 - [x] Alternative implementation option, just for fun (using DirectoryStream instead of Files.walkFileTree's Visitor)
-- [ ] Cleaner code
-- [ ] Refactor unit tests (custom assert?)
+- [x] Cleaner code
 - [ ] Publish on Maven Central!
 
 ## Other ideas
+- [ ] Directory children limitation function helper
 - [ ] Custom tree format option
 - [ ] Custom emojis option
 - [ ] Color option
 - [ ] Filtering
 - [ ] Follow symlink option
 - [ ] Print optional legend for symlink/other file types symbols (at the end of the tree)
 - [ ] File attributes LineRenderer (size, author, createAt, etc.)
+- [ ] Refactor unit tests (custom assert?)
+- [ ] Mutation testing

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

@@ -1,7 +1,7 @@
 package io.github.computerdaddyguy.jfiletreeprettyprinter.example;
 
 import io.github.computerdaddyguy.jfiletreeprettyprinter.FileTreePrettyPrinter;
-import io.github.computerdaddyguy.jfiletreeprettyprinter.options.RenderingOptions.TreeFormat;
+import io.github.computerdaddyguy.jfiletreeprettyprinter.renderer.RenderingOptions.TreeFormat;
 
 public class FileTreeFormat {
 

src/main/java/io/github/computerdaddyguy/jfiletreeprettyprinter/DefaultFileTreePrettyPrinter.java

@@ -0,0 +1,26 @@
+package io.github.computerdaddyguy.jfiletreeprettyprinter;
+
+import io.github.computerdaddyguy.jfiletreeprettyprinter.renderer.TreeEntryRenderer;
+import io.github.computerdaddyguy.jfiletreeprettyprinter.scanner.PathToTreeScanner;
+import java.nio.file.Path;
+import java.util.Objects;
+import org.jspecify.annotations.NullMarked;
+
+@NullMarked
+class DefaultFileTreePrettyPrinter implements FileTreePrettyPrinter {
+
+	private final PathToTreeScanner scanner;
+	private final TreeEntryRenderer renderer;
+
+	public DefaultFileTreePrettyPrinter(PathToTreeScanner scanner, TreeEntryRenderer renderer) {
+		this.scanner = Objects.requireNonNull(scanner, "scanner cannot be null");
+		this.renderer = Objects.requireNonNull(renderer, "renderer cannot be null");
+	}
+
+	@Override
+	public String prettyPrint(Path path) {
+		var tree = scanner.scan(path);
+		return renderer.renderTree(tree);
+	}
+
+}

src/main/java/io/github/computerdaddyguy/jfiletreeprettyprinter/FileTreePrettyPrinter.java

@@ -27,11 +27,6 @@ default String prettyPrint(String path) {
 		return prettyPrint(Path.of(path));
 	}
 
-	/**
-	 * Get the options of this pretty printer.
-	 */
-	PrettyPrintOptions getOptions();
-
 	/**
 	 * Create a pretty printer with default options.
 	 * 

src/main/java/io/github/computerdaddyguy/jfiletreeprettyprinter/FileTreePrettyPrinterBuilder.java

@@ -1,7 +1,7 @@
 package io.github.computerdaddyguy.jfiletreeprettyprinter;
 
-import io.github.computerdaddyguy.jfiletreeprettyprinter.impl.recursive.RecursiveFileTreePrettyPrinter;
-import io.github.computerdaddyguy.jfiletreeprettyprinter.impl.visitor.VisitingFileTreePrettyPrinter;
+import io.github.computerdaddyguy.jfiletreeprettyprinter.renderer.TreeEntryRenderer;
+import io.github.computerdaddyguy.jfiletreeprettyprinter.scanner.PathToTreeScanner;
 import java.util.Objects;
 import java.util.function.Function;
 import org.jspecify.annotations.NullMarked;
@@ -12,10 +12,9 @@ public class FileTreePrettyPrinterBuilder {
 	private PrettyPrintOptions options = PrettyPrintOptions.createDefault();
 
 	public FileTreePrettyPrinter build() {
-		return switch (options.getImplementation()) {
-			case VISITOR -> new VisitingFileTreePrettyPrinter(options);
-			case RECURSIVE -> new RecursiveFileTreePrettyPrinter(options);
-		};
+		var scanner = PathToTreeScanner.create(options);
+		var renderer = TreeEntryRenderer.create(options);
+		return new DefaultFileTreePrettyPrinter(scanner, renderer);
 	}
 
 	public FileTreePrettyPrinterBuilder withOptions(PrettyPrintOptions options) {

src/main/java/io/github/computerdaddyguy/jfiletreeprettyprinter/PathPredicates.java

@@ -3,7 +3,9 @@
 import java.nio.file.Path;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
+import org.jspecify.annotations.NullMarked;
 
+@NullMarked
 public final class PathPredicates {
 
 	private PathPredicates() {

src/main/java/io/github/computerdaddyguy/jfiletreeprettyprinter/PrettyPrintOptions.java

@@ -1,21 +1,17 @@
 package io.github.computerdaddyguy.jfiletreeprettyprinter;
 
-import io.github.computerdaddyguy.jfiletreeprettyprinter.options.ImplementationOptions;
-import io.github.computerdaddyguy.jfiletreeprettyprinter.options.RenderingOptions;
-import io.github.computerdaddyguy.jfiletreeprettyprinter.options.VisitingOptions;
+import io.github.computerdaddyguy.jfiletreeprettyprinter.renderer.RenderingOptions;
+import io.github.computerdaddyguy.jfiletreeprettyprinter.scanner.ScanningOptions;
 import java.nio.file.Path;
 import java.util.Objects;
 import java.util.function.Function;
 import org.jspecify.annotations.NullMarked;
 
 @NullMarked
-public class PrettyPrintOptions implements VisitingOptions, RenderingOptions, ImplementationOptions {
+public class PrettyPrintOptions implements ScanningOptions, RenderingOptions {
 
 	private Function<Path, Integer> childrenLimitFunction = p -> -1;
 
-	private Implementation impl = Implementation.RECURSIVE;
-//	private Implementation impl = Implementation.VISITOR;
-
 	private TreeFormat treeFormat = TreeFormat.UNICODE_BOX_DRAWING;
 	private boolean emojis = false;
 	private boolean compactDirectories = false;
@@ -34,23 +30,6 @@ public static PrettyPrintOptions createDefault() {
 
 	// ----------------------------------------------
 
-	public enum Implementation {
-		VISITOR,
-		RECURSIVE;
-	}
-
-	@Override
-	public Implementation getImplementation() {
-		return impl;
-	}
-
-	public PrettyPrintOptions withImplementation(Implementation impl) {
-		this.impl = Objects.requireNonNull(impl, "implementation is null");
-		return this;
-	}
-
-	// ----------------------------------------------
-
 	@Override
 	public Function<Path, Integer> getChildrenLimitFunction() {
 		return childrenLimitFunction;