Fix sonar

Author: ComputerDaddyGuy

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

@@ -14,6 +14,7 @@
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
 import org.jspecify.annotations.NullMarked;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Utility class providing factory and composition methods for {@link PathMatcher}s.
@@ -192,13 +193,15 @@ public static PathMatcher anyOf(Iterable<PathMatcher> matchers) {
 		return combineMatchers(matchers, Mode.ANY);
 	}
 
-	private static List<PathMatcher> buildSafeList(PathMatcher matcher, PathMatcher... matchers) {
+	private static List<PathMatcher> buildSafeList(PathMatcher matcher, @Nullable PathMatcher... matchers) {
 		Objects.requireNonNull(matcher, "matcher is null");
 		var list = new ArrayList<PathMatcher>(1 + (matchers == null ? 0 : matchers.length));
 		list.add(matcher);
-		for (PathMatcher m : matchers) {
-			Objects.requireNonNull(m, "some matcher is null");
-			list.add(m);
+		if (matchers != null) {
+			for (PathMatcher m : matchers) {
+				Objects.requireNonNull(m, "some matcher is null");
+				list.add(m);
+			}
 		}
 		return List.copyOf(list);
 	}
@@ -219,32 +222,37 @@ private static PathMatcher combineMatchers(Iterable<PathMatcher> matchers, Mode
 		if (list.isEmpty()) {
 			throw new IllegalArgumentException("No matcher provided");
 		}
-		return path -> {
-			switch (mode) {
-				case ALL:
-					for (PathMatcher m : list) {
-						if (!m.matches(path))
-							return false;
-					}
-					return true;
-				case ANY:
-					for (PathMatcher m : list) {
-						if (m.matches(path))
-							return true;
-					}
-					return false;
-				case NONE:
-					for (PathMatcher m : list) {
-						if (m.matches(path))
-							return false;
-					}
-					return true;
-				default:
-					throw new AssertionError("Unknown mode: " + mode);
-			}
+		return switch (mode) {
+			case ALL -> path -> all(path, list);
+			case ANY -> path -> any(path, list);
+			case NONE -> path -> none(path, list);
 		};
 	}
 
+	private static boolean all(Path path, List<PathMatcher> matchers) {
+		for (PathMatcher m : matchers) {
+			if (!m.matches(path))
+				return false;
+		}
+		return true;
+	}
+
+	private static boolean any(Path path, List<PathMatcher> matchers) {
+		for (PathMatcher m : matchers) {
+			if (m.matches(path))
+				return true;
+		}
+		return false;
+	}
+
+	private static boolean none(Path path, List<PathMatcher> matchers) {
+		for (PathMatcher m : matchers) {
+			if (m.matches(path))
+				return false;
+		}
+		return true;
+	}
+
 	/**
 	 * Returns a conditional matcher.
 	 *
@@ -589,7 +597,7 @@ public static PathMatcher isRegularFile() {
 	 * @return matcher returning {@code true} if the path is a symbolic link
 	 */
 	public static PathMatcher isSymbolicLink() {
-		return path -> Files.isSymbolicLink(path);
+		return Files::isSymbolicLink;
 	}
 
 	// ---------- Hierarchy ----------
@@ -688,7 +696,7 @@ private static final boolean testDescendants(Path path, int depth, PathMatcher d
 			return stream
 				.skip(1) // skip the root path itself
 				.filter(inclusionFilter)
-				.anyMatch(p -> descendantMatcher.matches(p));
+				.anyMatch(descendantMatcher::matches);
 		} catch (IOException e) {
 			throw new UncheckedIOException("Exception while walking files of " + path, e);
 		}

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

@@ -52,7 +52,7 @@ private TreeEntry handleDirectory(Path root, int depth, Path dir, PathMatcher fi
 
 		List<TreeEntry> childEntries;
 
-		try (var childrenStream = Files.newDirectoryStream(dir, path -> filter.matches(path))) {
+		try (var childrenStream = Files.newDirectoryStream(dir, filter::matches)) {
 			var it = directoryStreamToIterator(childrenStream);
 			childEntries = handleDirectoryChildren(root, depth, dir, it, filter);
 		} catch (IOException e) {

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

@@ -56,7 +56,8 @@ void shouldThrowOnNullFirstArg() {
 
 		@Test
 		void shouldThrowIfIterableEmpty() {
-			assertThatThrownBy(() -> PathMatchers.allOf(Collections.<PathMatcher> emptyList()))
+			var emptyList = Collections.<PathMatcher> emptyList();
+			assertThatThrownBy(() -> PathMatchers.allOf(emptyList))
 				.isInstanceOf(IllegalArgumentException.class)
 				.hasMessageContaining("No matcher provided");
 		}
@@ -85,7 +86,8 @@ void shouldThrowOnNullFirstArg() {
 
 		@Test
 		void shouldThrowIfIterableEmpty() {
-			assertThatThrownBy(() -> PathMatchers.anyOf(Collections.<PathMatcher> emptyList()))
+			var emptyList = Collections.<PathMatcher> emptyList();
+			assertThatThrownBy(() -> PathMatchers.anyOf(emptyList))
 				.isInstanceOf(IllegalArgumentException.class)
 				.hasMessageContaining("No matcher provided");
 		}
@@ -114,7 +116,8 @@ void shouldThrowOnNullFirstArg() {
 
 		@Test
 		void shouldThrowIfIterableEmpty() {
-			assertThatThrownBy(() -> PathMatchers.noneOf(Collections.<PathMatcher> emptyList()))
+			var emptyList = Collections.<PathMatcher> emptyList();
+			assertThatThrownBy(() -> PathMatchers.noneOf(emptyList))
 				.isInstanceOf(IllegalArgumentException.class)
 				.hasMessageContaining("No matcher provided");
 		}
@@ -202,7 +205,8 @@ void shouldThrowOnNulls() {
 				.isInstanceOf(NullPointerException.class)
 				.hasMessageContaining("ref is null");
 
-			assertThatThrownBy(() -> PathMatchers.hasRelativePathMatchingGlob(Paths.get("."), null))
+			var path = Paths.get(".");
+			assertThatThrownBy(() -> PathMatchers.hasRelativePathMatchingGlob(path, null))
 				.isInstanceOf(NullPointerException.class)
 				.hasMessageContaining("glob is null");
 		}
@@ -254,11 +258,13 @@ class hasRelativePathMatching {
 
 		@Test
 		void shouldThrowOnNulls() {
-			assertThatThrownBy(() -> PathMatchers.hasRelativePathMatching(null, PathMatchers.hasName("x")))
+			var matcher = PathMatchers.hasName("x");
+			assertThatThrownBy(() -> PathMatchers.hasRelativePathMatching(null, matcher))
 				.isInstanceOf(NullPointerException.class)
 				.hasMessageContaining("ref is null");
 
-			assertThatThrownBy(() -> PathMatchers.hasRelativePathMatching(Paths.get("."), null))
+			var path = Paths.get(".");
+			assertThatThrownBy(() -> PathMatchers.hasRelativePathMatching(path, null))
 				.isInstanceOf(NullPointerException.class)
 				.hasMessageContaining("matcher is null");
 		}