Remove support for top-level application/ in application package

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;
-    }
-
 }