diff --git a/src/main/java/it/unibz/inf/isochrone/config/ConfigDataset.java b/src/main/java/it/unibz/inf/isochrone/config/ConfigDataset.java index 22b2945d27241912a5db007f14103aaa73354f56..e99648a8c10af79713c881fcff1c9023ec0d1362 100644 --- a/src/main/java/it/unibz/inf/isochrone/config/ConfigDataset.java +++ b/src/main/java/it/unibz/inf/isochrone/config/ConfigDataset.java @@ -37,9 +37,7 @@ import java.util.regex.Pattern; import javax.validation.constraints.NotNull; -import org.apache.commons.io.Charsets; import org.apache.commons.io.FileUtils; -import org.apache.commons.io.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -388,15 +386,7 @@ public class ConfigDataset { } // find resources on classpath (in jar files...) and add to available ones - r2 = cLoader.getResourceAsStream(""); - if (r2 != null) { - final Collection<String> files = IOUtils.readLines(r2, Charsets.UTF_8); - for (String filename : files) { - if (dsConfigPattern.matcher(filename).matches()) { - resources.add(filename); - } - } - } + resources.addAll(ResourceHelper.findFilesInClassPath(dsConfigPattern)); // find resources on webapp resources (in tomcat lib folder, in WEB-INF...) and add to available ones final Enumeration<URL> e = cLoader.getResources("../lib"); diff --git a/src/main/java/it/unibz/inf/isochrone/util/ResourceHelper.java b/src/main/java/it/unibz/inf/isochrone/util/ResourceHelper.java index 2a6c23f256ac3b2e543d88727bf67b04f5bf78c1..a6b98a920e5cbcf3ac335b9bd3b22c1c45e6e8e0 100644 --- a/src/main/java/it/unibz/inf/isochrone/util/ResourceHelper.java +++ b/src/main/java/it/unibz/inf/isochrone/util/ResourceHelper.java @@ -36,7 +36,7 @@ public final class ResourceHelper { } public static Set<String> findFilesInResources(final String[] pathElements, final Pattern fileNamePattern) throws IOException { - Set<String> result = new HashSet<String>(); + final Set<String> result = new HashSet<String>(); for (String element : pathElements) { final File newFile = new File(element); if (newFile.isDirectory()) {