Remove unused and undocumented support for permanent-services.xml

3 files changed, 0 insertions, 42 deletions

diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ModelContextImplTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ModelContextImplTest.java
index 8848beb3821..2ef9a41a967 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/ModelContextImplTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ModelContextImplTest.java
@@ -53,7 +53,6 @@ public class ModelContextImplTest {
         ModelContext context = new ModelContextImpl(
                 applicationPackage,
                 Optional.empty(),
-                Optional.empty(),
                 new BaseDeployLogger(),
                 new StaticConfigDefinitionRepo(),
                 new MockFileRegistry(),
@@ -83,7 +82,6 @@ public class ModelContextImplTest {
                 new Version(8));
         assertTrue(context.applicationPackage() instanceof MockApplicationPackage);
         assertEquals(hostProvisioner, context.getHostProvisioner());
-        assertFalse(context.permanentApplicationPackage().isPresent());
         assertFalse(context.previousModel().isPresent());
         assertTrue(context.getFileRegistry() instanceof MockFileRegistry);
         assertTrue(context.configDefinitionRepo() instanceof StaticConfigDefinitionRepo);
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/PermanentApplicationPackageTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/PermanentApplicationPackageTest.java
deleted file mode 100644
index 678b7506a9d..00000000000
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/PermanentApplicationPackageTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.config.server.application;
-
-import com.yahoo.cloud.config.ConfigserverConfig;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-
-import java.io.File;
-import java.io.IOException;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-/**
- * @author Ulf Lilleengen
- * @since 5.15
- */
-public class PermanentApplicationPackageTest {
-    @Test
-    public void testNonexistingApplication() {
-        PermanentApplicationPackage permanentApplicationPackage = new PermanentApplicationPackage(
-                new ConfigserverConfig(new ConfigserverConfig.Builder().applicationDirectory("_no_such_dir")));
-        assertFalse(permanentApplicationPackage.applicationPackage().isPresent());
-    }
-
-    @Rule
-    public TemporaryFolder folder = new TemporaryFolder();
-
-    @Test
-    public void testExistingApplication() throws IOException {
-        File tmpDir = folder.newFolder();
-        PermanentApplicationPackage permanentApplicationPackage = new PermanentApplicationPackage(
-                new ConfigserverConfig(new ConfigserverConfig.Builder().applicationDirectory(tmpDir.getAbsolutePath())));
-        assertTrue(permanentApplicationPackage.applicationPackage().isPresent());
-    }
-}
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java
index eabcd5dce45..26fa26b67c3 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java
@@ -31,7 +31,6 @@ import com.yahoo.vespa.config.server.MockProvisioner;
 import com.yahoo.vespa.config.server.MockSecretStore;
 import com.yahoo.vespa.config.server.TestConfigDefinitionRepo;
 import com.yahoo.vespa.config.server.TimeoutBudgetTest;
-import com.yahoo.vespa.config.server.application.PermanentApplicationPackage;
 import com.yahoo.vespa.config.server.deploy.DeployHandlerLogger;
 import com.yahoo.vespa.config.server.filedistribution.FileDirectory;
 import com.yahoo.vespa.config.server.filedistribution.MockFileDistributionFactory;
@@ -53,7 +52,6 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
-
 import javax.security.auth.x500.X500Principal;
 import java.io.File;
 import java.io.IOException;
@@ -130,7 +128,6 @@ public class SessionPreparerTest {
                 new MockFileDistributionFactory(configserverConfig, new FileDirectory(configserverConfig, flagSource)),
                 new InThreadExecutorService(),
                 hostProvisionerProvider,
-                new PermanentApplicationPackage(configserverConfig),
                 configserverConfig,
                 new TestConfigDefinitionRepo(),
                 curator,