diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2019-11-05 11:11:36 +0100 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2019-11-06 12:08:46 +0100 |
commit | fbc72ee2e4a9f8a9f24772ba19839ddc73a59fbc (patch) | |
tree | 87ed7ca78db1680ce9c3bd6594eee205702b72e3 /config-model-api/src | |
parent | 6db5e61af135bf448351b4332cf3db9a94798892 (diff) |
Remove deprecated includes(...)
Diffstat (limited to 'config-model-api/src')
2 files changed, 0 insertions, 48 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 25fd766c8c2..006d535b5e1 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 @@ -222,11 +222,6 @@ public class DeploymentSpec { public String xmlForm() { return xmlForm; } // TODO: Remove after November 2019 - public boolean includes(Environment environment, Optional<RegionName> region) { - return singleInstance().deploysTo(environment, region); - } - - // TODO: Remove after November 2019 private static boolean hasSingleInstance(List<DeploymentSpec.Step> steps) { return instances(steps).size() == 1; } @@ -328,29 +323,6 @@ public class DeploymentSpec { return Objects.hash(majorVersion, steps, xmlForm); } - /** This may be invoked by a continuous build */ - public static void main(String[] args) { - if (args.length != 2 && args.length != 3) { - System.err.println("Usage: DeploymentSpec [file] [environment] [region]?" + - "Returns 0 if the specified zone matches the deployment spec, 1 otherwise"); - System.exit(1); - } - - try (BufferedReader reader = new BufferedReader(new FileReader(args[0]))) { - DeploymentSpec spec = DeploymentSpec.fromXml(reader); - Environment environment = Environment.from(args[1]); - Optional<RegionName> region = args.length == 3 ? Optional.of(RegionName.from(args[2])) : Optional.empty(); - if (spec.includes(environment, region)) - System.exit(0); - else - System.exit(1); - } - catch (Exception e) { - System.err.println("Exception checking deployment spec: " + toMessageString(e)); - System.exit(1); - } - } - /** A deployment step */ public abstract static class Step { diff --git a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecDeprecatedAPITest.java b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecDeprecatedAPITest.java index 317a4224726..036adcae927 100644 --- a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecDeprecatedAPITest.java +++ b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecDeprecatedAPITest.java @@ -41,10 +41,6 @@ public class DeploymentSpecDeprecatedAPITest { assertEquals(1, spec.steps().size()); assertFalse(spec.majorVersion().isPresent()); assertTrue(spec.steps().get(0).deploysTo(Environment.test)); - assertTrue(spec.includes(Environment.test, Optional.empty())); - assertFalse(spec.includes(Environment.test, Optional.of(RegionName.from("region1")))); - assertFalse(spec.includes(Environment.staging, Optional.empty())); - assertFalse(spec.includes(Environment.prod, Optional.empty())); } @Test @@ -73,10 +69,6 @@ public class DeploymentSpecDeprecatedAPITest { assertEquals(2, spec.steps().size()); assertTrue(spec.steps().get(0).deploysTo(Environment.test)); assertTrue(spec.steps().get(1).deploysTo(Environment.staging)); - assertTrue(spec.includes(Environment.test, Optional.empty())); - assertFalse(spec.includes(Environment.test, Optional.of(RegionName.from("region1")))); - assertTrue(spec.includes(Environment.staging, Optional.empty())); - assertFalse(spec.includes(Environment.prod, Optional.empty())); } @Test @@ -103,12 +95,6 @@ public class DeploymentSpecDeprecatedAPITest { assertTrue(spec.steps().get(3).deploysTo(Environment.prod, Optional.of(RegionName.from("us-west1")))); assertTrue(((DeploymentSpec.DeclaredZone)spec.steps().get(3)).active()); - assertTrue(spec.includes(Environment.test, Optional.empty())); - assertFalse(spec.includes(Environment.test, Optional.of(RegionName.from("region1")))); - assertTrue(spec.includes(Environment.staging, Optional.empty())); - assertTrue(spec.includes(Environment.prod, Optional.of(RegionName.from("us-east1")))); - assertTrue(spec.includes(Environment.prod, Optional.of(RegionName.from("us-west1")))); - assertFalse(spec.includes(Environment.prod, Optional.of(RegionName.from("no-such-region")))); } @Test @@ -197,12 +183,6 @@ public class DeploymentSpecDeprecatedAPITest { assertTrue(spec.steps().get(4).deploysTo(Environment.prod, Optional.of(RegionName.from("us-west1")))); assertTrue(((DeploymentSpec.DeclaredZone)spec.steps().get(4)).active()); - assertTrue(spec.includes(Environment.test, Optional.empty())); - assertFalse(spec.includes(Environment.test, Optional.of(RegionName.from("region1")))); - assertTrue(spec.includes(Environment.staging, Optional.empty())); - assertTrue(spec.includes(Environment.prod, Optional.of(RegionName.from("us-east1")))); - assertTrue(spec.includes(Environment.prod, Optional.of(RegionName.from("us-west1")))); - assertFalse(spec.includes(Environment.prod, Optional.of(RegionName.from("no-such-region")))); } @Test |