Remove unused and undocumented support for permanent-services.xml

2 files changed, 3 insertions, 17 deletions

diff --git a/config-model/src/test/java/com/yahoo/config/model/MockModelContext.java b/config-model/src/test/java/com/yahoo/config/model/MockModelContext.java
index 49b4e9820de..af05a144b79 100644
--- a/config-model/src/test/java/com/yahoo/config/model/MockModelContext.java
+++ b/config-model/src/test/java/com/yahoo/config/model/MockModelContext.java
@@ -47,11 +47,6 @@ public class MockModelContext implements ModelContext {
     }
 
     @Override
-    public Optional<ApplicationPackage> permanentApplicationPackage() {
-        return Optional.empty();
-    }
-
-    @Override
     public HostProvisioner getHostProvisioner() {
         return DeployState.getDefaultModelHostProvisioner(applicationPackage);
     }
diff --git a/config-model/src/test/java/com/yahoo/config/model/deploy/DeployStateTest.java b/config-model/src/test/java/com/yahoo/config/model/deploy/DeployStateTest.java
index f0b729a718c..e0726e9443c 100644
--- a/config-model/src/test/java/com/yahoo/config/model/deploy/DeployStateTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/deploy/DeployStateTest.java
@@ -16,16 +16,16 @@ import com.yahoo.vespa.config.ConfigDefinitionKey;
 import com.yahoo.vespa.model.VespaModel;
 import org.junit.jupiter.api.Test;
 import org.xml.sax.SAXException;
-
 import java.io.File;
 import java.io.IOException;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Set;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * @author Ulf Lilleengen
@@ -42,15 +42,6 @@ public class DeployStateTest {
     }
 
     @Test
-    void testBuilder() {
-        DeployState.Builder builder = new DeployState.Builder();
-        ApplicationPackage app = MockApplicationPackage.createEmpty();
-        builder.permanentApplicationPackage(Optional.of(app));
-        DeployState state = builder.build();
-        assertEquals(app, state.getPermanentApplicationPackage().get());
-    }
-
-    @Test
     void testPreviousModelIsProvided() throws IOException, SAXException {
         VespaModel prevModel = new VespaModel(MockApplicationPackage.createEmpty());
         DeployState.Builder builder = new DeployState.Builder();