diff options
3 files changed, 0 insertions, 37 deletions
diff --git a/config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java b/config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java index 15b775a4543..23273f9f1bf 100644 --- a/config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java +++ b/config-application-package/src/main/java/com/yahoo/config/application/OverrideProcessor.java @@ -47,11 +47,6 @@ class OverrideProcessor implements PreProcessor { private static final String ENVIRONMENT_ATTRIBUTE = "environment"; private static final String REGION_ATTRIBUTE = "region"; - // TODO: Remove after September 2019 - public OverrideProcessor(Environment environment, RegionName region) { - this(InstanceName.from("default"), environment, region); - } - public OverrideProcessor(InstanceName instance, Environment environment, RegionName region) { this.instance = instance; this.environment = environment; diff --git a/config-application-package/src/main/java/com/yahoo/config/application/XmlPreProcessor.java b/config-application-package/src/main/java/com/yahoo/config/application/XmlPreProcessor.java index 73f97cf516f..c49a799f2b7 100644 --- a/config-application-package/src/main/java/com/yahoo/config/application/XmlPreProcessor.java +++ b/config-application-package/src/main/java/com/yahoo/config/application/XmlPreProcessor.java @@ -38,20 +38,10 @@ public class XmlPreProcessor { private final RegionName region; private final List<PreProcessor> chain; - // TODO: Remove after September 2019 - public XmlPreProcessor(File applicationDir, File xmlInput, Environment environment, RegionName region) throws IOException { - this(applicationDir, new FileReader(xmlInput), InstanceName.from("default"), environment, region); - } - public XmlPreProcessor(File applicationDir, File xmlInput, InstanceName instance, Environment environment, RegionName region) throws IOException { this(applicationDir, new FileReader(xmlInput), instance, environment, region); } - // TODO: Remove after September 2019 - public XmlPreProcessor(File applicationDir, Reader xmlInput, Environment environment, RegionName region) throws IOException { - this(applicationDir, xmlInput, InstanceName.from("default"), environment, region); - } - public XmlPreProcessor(File applicationDir, Reader xmlInput, InstanceName instance, Environment environment, RegionName region) { this.applicationDir = applicationDir; this.xmlInput = xmlInput; diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/DeployData.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/DeployData.java index 344035745f8..82da1e2c6ea 100644 --- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/DeployData.java +++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/DeployData.java @@ -2,9 +2,6 @@ package com.yahoo.config.model.application.provider; import com.yahoo.config.provision.ApplicationId; -import com.yahoo.config.provision.ApplicationName; -import com.yahoo.config.provision.InstanceName; -import com.yahoo.config.provision.TenantName; /** * Data generated or computed during deployment @@ -31,22 +28,6 @@ public class DeployData { private final long generation; private final long currentlyActiveGeneration; - // TODO: Remove after September 2019 - public DeployData(String deployedByUser, - String deployedFromDir, - String applicationName, - Long deployTimestamp, - boolean internalRedeploy, - Long generation, - long currentlyActiveGeneration) { - this(deployedByUser, - deployedFromDir, - ApplicationId.from(TenantName.defaultName(), ApplicationName.from(applicationName), InstanceName.from("default")), - deployTimestamp, - internalRedeploy, - generation, currentlyActiveGeneration); - } - public DeployData(String deployedByUser, String deployedFromDir, ApplicationId applicationId, @@ -77,7 +58,4 @@ public class DeployData { public ApplicationId getApplicationId() { return applicationId; } - // TODO: remove after September 2019 - public String getApplicationName() { return applicationId.application().toString(); } - } |