diff options
author | Harald Musum <musum@yahooinc.com> | 2022-06-01 09:05:45 +0200 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2022-06-08 11:45:23 +0200 |
commit | ec3d9fb0563e40a7598be36fd88ed15f766ecbc9 (patch) | |
tree | d3dbb4a19a61a40f05b433616f0342538669098b /configserver | |
parent | de710ef8cc2055c338d6bf29243f74e40c36af91 (diff) |
Remove support for top-level application/ in application package
Diffstat (limited to 'configserver')
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/application/CompressedApplicationInputStream.java | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/CompressedApplicationInputStream.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/CompressedApplicationInputStream.java index 443ab47e786..1ac52213323 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/CompressedApplicationInputStream.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/CompressedApplicationInputStream.java @@ -72,7 +72,6 @@ public class CompressedApplicationInputStream implements AutoCloseable { public File decompress(File dir) throws IOException { decompressInto(dir.toPath()); - dir = findActualApplicationDir(dir); return dir; } @@ -109,14 +108,4 @@ public class CompressedApplicationInputStream implements AutoCloseable { return Files.createTempFile(applicationDir, "application", null); } - private File findActualApplicationDir(File application) { - // If application is in e.g. application/, use that as root for UnpackedApplication - // TODO: Vespa 8: Remove application/ directory support - File[] files = application.listFiles(); - if (files != null && files.length == 1 && files[0].isDirectory()) { - application = files[0]; - } - return application; - } - } |