Remove application/ subdir support on Vespa 8

8 files changed, 2 insertions, 28 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackage.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackage.java
index 91f141f880b..4bc9aeb00e4 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackage.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackage.java
@@ -20,7 +20,6 @@ import com.yahoo.security.X509CertificateUtils;
 import com.yahoo.slime.Inspector;
 import com.yahoo.slime.Slime;
 import com.yahoo.slime.SlimeUtils;
-import com.yahoo.slime.Type;
 import com.yahoo.vespa.hosted.controller.Application;
 import com.yahoo.vespa.hosted.controller.deployment.ZipBuilder;
 import com.yahoo.yolean.Exceptions;
@@ -277,14 +276,6 @@ public class ApplicationPackage {
         /** Max size of each extracted file */
         private static final int maxSize = 10 << 20; // 10 Mb
 
-        // TODO: Vespa 8: Remove application/ directory support
-        private static final String applicationDir = "application/";
-
-        private static String withoutLegacyDir(String name) {
-            if (name.startsWith(applicationDir)) return name.substring(applicationDir.length());
-            return name;
-        }
-
         private final byte[] zip;
         private final Map<Path, Optional<byte[]>> cache;
 
@@ -310,11 +301,11 @@ public class ApplicationPackage {
 
         private Map<Path, Optional<byte[]>> read(Collection<String> names) {
             var entries = ZipEntries.from(zip,
-                                          name -> names.contains(withoutLegacyDir(name)),
+                                          name -> names.contains(name),
                                           maxSize,
                                           true)
                                     .asList().stream()
-                                    .collect(toMap(entry -> Paths.get(withoutLegacyDir(entry.name())).normalize(),
+                                    .collect(toMap(entry -> Paths.get(entry.name()).normalize(),
                                                    ZipEntries.ZipEntryWithContent::content));
             names.stream().map(Paths::get).forEach(path -> entries.putIfAbsent(path.normalize(), Optional.empty()));
             return entries;
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageTest.java
index 99e22302c73..0458f77fc00 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/pkg/ApplicationPackageTest.java
@@ -81,23 +81,6 @@ public class ApplicationPackageTest {
     }
 
     @Test
-    public void testMetaDataWithLegacyApplicationDirectory() {
-        byte[] zip = ApplicationPackage.filesZip(Map.of("application/deployment.xml", deploymentXml.getBytes(UTF_8),
-                                                        "application/services.xml", servicesXml.getBytes(UTF_8),
-                                                        "application/jdisc.xml", jdiscXml.getBytes(UTF_8),
-                                                        "application/content/content.xml", contentXml.getBytes(UTF_8),
-                                                        "application/content/nodes.xml", nodesXml.getBytes(UTF_8),
-                                                        "application/gurba", "gurba".getBytes(UTF_8)));
-
-        assertEquals(Map.of("deployment.xml", deploymentXml,
-                            "services.xml", servicesXml,
-                            "jdisc.xml", jdiscXml,
-                            "content/content.xml", contentXml,
-                            "content/nodes.xml", nodesXml),
-                     unzip(new ApplicationPackage(zip, false).metaDataZip()));
-    }
-
-    @Test
     public void testMetaDataWithMissingFiles() {
         byte[] zip = ApplicationPackage.filesZip(Map.of("services.xml", servicesXml.getBytes(UTF_8)));
 
diff --git a/controller-server/src/test/resources/application-packages/changed-deployment-xml.zip b/controller-server/src/test/resources/application-packages/changed-deployment-xml.zip
index e4ec61c50ab..e6482904b22 100644
--- a/controller-server/src/test/resources/application-packages/changed-deployment-xml.zip
+++ b/controller-server/src/test/resources/application-packages/changed-deployment-xml.zip
diff --git a/controller-server/src/test/resources/application-packages/changed-services-xml.zip b/controller-server/src/test/resources/application-packages/changed-services-xml.zip
index daaa1bd9e3c..e11b1ef162e 100644
--- a/controller-server/src/test/resources/application-packages/changed-services-xml.zip
+++ b/controller-server/src/test/resources/application-packages/changed-services-xml.zip
diff --git a/controller-server/src/test/resources/application-packages/include-absolute.zip b/controller-server/src/test/resources/application-packages/include-absolute.zip
index 3b30cd8265a..49c99ff5da9 100644
--- a/controller-server/src/test/resources/application-packages/include-absolute.zip
+++ b/controller-server/src/test/resources/application-packages/include-absolute.zip
diff --git a/controller-server/src/test/resources/application-packages/include-parent.zip b/controller-server/src/test/resources/application-packages/include-parent.zip
index 18c1b0f5e37..8702b512c98 100644
--- a/controller-server/src/test/resources/application-packages/include-parent.zip
+++ b/controller-server/src/test/resources/application-packages/include-parent.zip
diff --git a/controller-server/src/test/resources/application-packages/original.zip b/controller-server/src/test/resources/application-packages/original.zip
index 3963527a6cd..cabac1999c3 100644
--- a/controller-server/src/test/resources/application-packages/original.zip
+++ b/controller-server/src/test/resources/application-packages/original.zip
diff --git a/controller-server/src/test/resources/application-packages/similar-deployment-xml.zip b/controller-server/src/test/resources/application-packages/similar-deployment-xml.zip
index 4075ee08ce3..67c38c344c0 100644
--- a/controller-server/src/test/resources/application-packages/similar-deployment-xml.zip
+++ b/controller-server/src/test/resources/application-packages/similar-deployment-xml.zip