Make the empty deployment spec really empty

4 files changed, 7 insertions, 20 deletions

diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java b/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java
index 170547430cb..f778c2c2d0e 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java
@@ -35,15 +35,7 @@ import java.util.stream.Stream;
 public class DeploymentSpec {
 
     /** The empty deployment spec, specifying no zones or rotation, and defaults for all settings */
-    public static final DeploymentSpec empty = new DeploymentSpec(List.of(new DeploymentInstanceSpec(InstanceName.from("default"),
-                                                                                                     Collections.emptyList(),
-                                                                                                     UpgradePolicy.defaultPolicy,
-                                                                                                     Collections.emptyList(),
-                                                                                                     Optional.empty(),
-                                                                                                     Optional.empty(),
-                                                                                                     Optional.empty(),
-                                                                                                     Notifications.none(),
-                                                                                                     List.of())),
+    public static final DeploymentSpec empty = new DeploymentSpec(List.of(),
                                                                   Optional.empty(),
                                                                   Optional.empty(),
                                                                   Optional.empty(),
diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java b/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java
index c14e6ce5966..6f49f4e86fc 100644
--- a/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java
+++ b/config-model-api/src/main/java/com/yahoo/config/application/api/xml/DeploymentSpecXmlReader.java
@@ -92,6 +92,9 @@ public class DeploymentSpecXmlReader {
 
     /** Reads a deployment spec from XML */
     public DeploymentSpec read(String xmlForm) {
+        if (DeploymentSpec.empty.xmlForm().equals(xmlForm))
+            return DeploymentSpec.empty;
+
         Element root = XML.getDocument(xmlForm).getDocumentElement();
 
         List<Step> steps = new ArrayList<>();
diff --git a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java
index ac605add892..d0740b3e9b9 100644
--- a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java
+++ b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java
@@ -422,14 +422,6 @@ public class DeploymentSpecTest {
     }
 
     @Test
-    public void testEmpty() {
-        assertFalse(DeploymentSpec.empty.requireInstance("default").globalServiceId().isPresent());
-        assertTrue(DeploymentSpec.empty.requireInstance("default").steps().isEmpty());
-        assertEquals(1, DeploymentSpec.empty.steps().size());
-        assertEquals("<deployment version='1.0'/>", DeploymentSpec.empty.xmlForm());
-    }
-
-    @Test
     public void productionSpecWithParallelDeployments() {
         StringReader r = new StringReader(
                 "<deployment>" +
diff --git a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java
index 50999759b77..b36c8299e66 100644
--- a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java
+++ b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithoutInstanceTest.java
@@ -317,9 +317,9 @@ public class DeploymentSpecWithoutInstanceTest {
 
     @Test
     public void testEmpty() {
-        assertFalse(DeploymentSpec.empty.requireInstance("default").globalServiceId().isPresent());
-        assertEquals(1, DeploymentSpec.empty.steps().size());
-        assertTrue(DeploymentSpec.empty.requireInstance("default").steps().isEmpty());
+        assertEquals(0, DeploymentSpec.empty.steps().size());
+        assertTrue(DeploymentSpec.empty.athenzDomain().isEmpty());
+        assertTrue(DeploymentSpec.empty.athenzService().isEmpty());
         assertEquals("<deployment version='1.0'/>", DeploymentSpec.empty.xmlForm());
     }