summaryrefslogtreecommitdiffstats
path: root/config-application-package
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2018-08-20 08:56:52 +0200
committerJon Bratseth <bratseth@oath.com>2018-08-20 08:56:52 +0200
commit03e88f27bc2278fb711a8c4a8a85763b23067348 (patch)
tree3a325a5dc2f44ce7186ec202ea6b0fdc03b306ee /config-application-package
parente11152b73bb9f4a8020034a6bca63e82124f7b26 (diff)
Revert "Merge pull request #6619 from vespa-engine/revert-6611-revert-6596-revert-6584-bratseth/generate-rank-profiles-for-all-models-part-2"
This reverts commit 0437e8cc1d550fb8c6d24ffe4da813067c542f62, reversing changes made to 1715b8393827c159f8709033075066b29932f852.
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());