diff options
Diffstat (limited to 'config-application-package/src/main/java/com/yahoo/config/application')
2 files changed, 0 insertions, 15 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; |