Make code more readable.

jenkinsci · Sep 15, 2023 · 1778685 · 1778685
1 parent 70bece6
commit 1778685
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/src/main/java/io/jenkins/plugins/fontawesome/FontAwesomeIcons.java b/src/main/java/io/jenkins/plugins/fontawesome/FontAwesomeIcons.java
@@ -100,13 +100,12 @@ private static Map<String, String> getIconsFromClasspath(@CheckForNull final Fon
     }
 
     @SuppressFBWarnings("NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE")
-    private static Map<String, String> collectIcons(final Path path, @CheckForNull final FontAwesomeStyle filter)
-            throws IOException {
+    private static Map<String, String> collectIcons(
+            @CheckForNull final Path path, @CheckForNull final FontAwesomeStyle filter) throws IOException {
         Map<String, String> icons = new LinkedHashMap<>();
 
         if (path != null) {
-            try (Stream<Path> stream = filter == null ? Files.walk(path, 2) : Files.walk(
-                    path.resolve(filter.name().toLowerCase(Locale.ENGLISH)), 1)) {
+            try (Stream<Path> stream = findIcons(path, filter)) {
                 stream.filter(icon -> icon != null && icon.getFileName() != null && StringUtils.endsWith(
                                 icon.getFileName().toString(), SVG_FILE_ENDING))
                         .sorted().forEach(icon -> {
@@ -124,6 +123,14 @@ private static Map<String, String> collectIcons(final Path path, @CheckForNull f
         return icons;
     }
 
+    private static Stream<Path> findIcons(final Path path, @CheckForNull final FontAwesomeStyle filter) throws IOException {
+        if (filter == null) {
+            return Files.walk(path, 2);
+        }
+
+        return Files.walk(path.resolve(filter.name().toLowerCase(Locale.ENGLISH)), 1);
+    }
+
     private FontAwesomeIcons() {
         // hidden
     }