summaryrefslogtreecommitdiffstats
path: root/config-application-package
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2018-08-21 09:38:31 +0200
committerJon Bratseth <bratseth@oath.com>2018-08-21 09:38:31 +0200
commit6110db7eb9e5ca01e6cc9426e68e74232004ae63 (patch)
treee8eb26a98ab9d283b184db9a8246a5edc4b1ff23 /config-application-package
parent51318703c054e71ce575d5edde90c6f84c3fedfd (diff)
Revert "Merge pull request #6635 from vespa-engine/bratseth/generate-rank-profiles-for-all-models-part-2-4"
This reverts commit 3f91e18528b4982398332a30728eed8f7d2b580c, reversing changes made to 8e3ba08f1d3b79e573864726c6c03e58862feee6.
Diffstat (limited to 'config-application-package')
-rw-r--r--config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java
index 36009682022..7ca9bcf48f3 100644
--- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java
+++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationPackage.java
@@ -45,6 +45,7 @@ import java.security.MessageDigest;
import java.util.*;
import java.util.jar.JarFile;
import java.util.logging.Logger;
+import java.util.stream.Collectors;
import static com.yahoo.text.Lowercase.toLowerCase;
@@ -164,7 +165,7 @@ public class FilesApplicationPackage implements ApplicationPackage {
return metaData;
}
- private List<NamedReader> getFiles(Path relativePath,String namePrefix,String suffix,boolean recurse) {
+ private List<NamedReader> getFiles(Path relativePath, String namePrefix, String suffix, boolean recurse) {
try {
List<NamedReader> readers=new ArrayList<>();
File dir = new File(appDir, relativePath.getRelative());