Inline deprecated constructor

2 files changed, 10 insertions, 32 deletions

diff --git a/config-model-api/abi-spec.json b/config-model-api/abi-spec.json
index 45d9741382d..46c1b5b9cba 100644
--- a/config-model-api/abi-spec.json
+++ b/config-model-api/abi-spec.json
@@ -329,7 +329,6 @@
     ],
     "methods": [
       "public void <init>(java.util.List, java.util.Optional, java.util.Optional, java.util.Optional, java.lang.String)",
-      "public void <init>(java.util.Optional, com.yahoo.config.application.api.DeploymentSpec$UpgradePolicy, java.util.Optional, java.util.List, java.util.List, java.lang.String, java.util.Optional, java.util.Optional, com.yahoo.config.application.api.Notifications, java.util.List)",
       "public java.util.Optional majorVersion()",
       "public java.util.List steps()",
       "public java.util.List zones()",
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 3d095d09066..d29d8b8199d 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
@@ -9,11 +9,8 @@ import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.InstanceName;
 import com.yahoo.config.provision.RegionName;
 
-import java.io.BufferedReader;
-import java.io.FileReader;
 import java.io.Reader;
 import java.time.Duration;
-import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -36,16 +33,19 @@ import java.util.stream.Collectors;
 public class DeploymentSpec {
 
     /** The empty deployment spec, specifying no zones or rotation, and defaults for all settings */
-    public static final DeploymentSpec empty = new DeploymentSpec(Optional.empty(),
-                                                                  UpgradePolicy.defaultPolicy,
+    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())),
                                                                   Optional.empty(),
-                                                                  Collections.emptyList(),
-                                                                  Collections.emptyList(),
-                                                                  "<deployment version='1.0'/>",
                                                                   Optional.empty(),
                                                                   Optional.empty(),
-                                                                  Notifications.none(),
-                                                                  List.of());
+                                                                  "<deployment version='1.0'/>");
 
     private final List<Step> steps;
 
@@ -76,27 +76,6 @@ public class DeploymentSpec {
         validateUpgradePoliciesOfIncreasingConservativeness(steps);
     }
 
-    // TODO: Remove after October 2019
-    public DeploymentSpec(Optional<String> globalServiceId, UpgradePolicy upgradePolicy, Optional<Integer> majorVersion,
-                          List<ChangeBlocker> changeBlockers, List<Step> steps, String xmlForm,
-                          Optional<AthenzDomain> athenzDomain, Optional<AthenzService> athenzService,
-                          Notifications notifications,
-                          List<Endpoint> endpoints) {
-        this(List.of(new DeploymentInstanceSpec(InstanceName.from("default"),
-                                                steps,
-                                                upgradePolicy,
-                                                changeBlockers,
-                                                globalServiceId,
-                                                athenzDomain,
-                                                athenzService,
-                                                notifications,
-                                                endpoints)),
-             majorVersion,
-             athenzDomain,
-             athenzService,
-             xmlForm);
-    }
-
     /** Adds missing required steps and reorders steps to a permissible order */
     private static List<DeploymentSpec.Step> completeSteps(List<DeploymentSpec.Step> inputSteps) {
         List<Step> steps = new ArrayList<>(inputSteps);