From 2f77fe8209bd5a16ca023a777fd615524dc1cb9d Mon Sep 17 00:00:00 2001 From: insou22 Date: Fri, 15 Jan 2016 01:41:48 +0200 Subject: [PATCH] Fix FileFunctions Final class - utility. Private constructor - utility. Use org.apache.commons.io.FileNameUtils to find file extension. Check if folder is a directory before calling listFiles() --- .../srclibrary/functions/FileFunctions.java | 31 ++++++++++++------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/src/net/src_dev/srclibrary/functions/FileFunctions.java b/src/net/src_dev/srclibrary/functions/FileFunctions.java index c32e86c..aecbea8 100644 --- a/src/net/src_dev/srclibrary/functions/FileFunctions.java +++ b/src/net/src_dev/srclibrary/functions/FileFunctions.java @@ -1,18 +1,27 @@ package net.src_dev.srclibrary.functions; +import org.apache.commons.io.FilenameUtils; + import java.io.File; import java.util.ArrayList; import java.util.List; -public class FileFunctions { - public static List getYmlFiles(File folder){ - List ymlFiles = new ArrayList(); - for(File f:folder.listFiles()){ - String[] splitName = f.getName().split("."); - if(splitName.length != 2) continue; - if(!(splitName[1].equalsIgnoreCase("yml") || splitName[1].equalsIgnoreCase("yaml"))) continue; - ymlFiles.add(f); - } - return ymlFiles; - } +public final class FileFunctions { + + private FileFunctions() {} + + public static List getYmlFiles(File folder) { + List files = new ArrayList<>(); + if (!folder.isDirectory()) { + return files; + } + for (File file : folder.listFiles()) { + String extension = FilenameUtils.getExtension(file.getName()); + if (extension.equalsIgnoreCase("yml") || extension.equalsIgnoreCase("yaml")) { + files.add(file); + } + } + return files; + } + }