From dcbcdc190091c5d2fac1eaefd5d50271efe486bc Mon Sep 17 00:00:00 2001 From: Martin Polden Date: Mon, 11 Feb 2019 11:53:27 +0100 Subject: Never persist deployment spec for manual environments --- config-model-api/abi-spec.json | 2 ++ .../config/application/api/DeploymentSpec.java | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+) (limited to 'config-model-api') diff --git a/config-model-api/abi-spec.json b/config-model-api/abi-spec.json index c932958b58b..0b36ea3bee2 100644 --- a/config-model-api/abi-spec.json +++ b/config-model-api/abi-spec.json @@ -303,6 +303,8 @@ "public static java.lang.String toMessageString(java.lang.Throwable)", "public java.util.Optional athenzDomain()", "public java.util.Optional athenzService(com.yahoo.config.provision.Environment, com.yahoo.config.provision.RegionName)", + "public boolean equals(java.lang.Object)", + "public int hashCode()", "public static void main(java.lang.String[])" ], "fields": [ 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 a6cecefe940..d15d76fd11b 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 @@ -267,6 +267,27 @@ public class DeploymentSpec { return Optional.ofNullable(athenzService); } + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + DeploymentSpec that = (DeploymentSpec) o; + return globalServiceId.equals(that.globalServiceId) && + upgradePolicy == that.upgradePolicy && + majorVersion.equals(that.majorVersion) && + changeBlockers.equals(that.changeBlockers) && + steps.equals(that.steps) && + xmlForm.equals(that.xmlForm) && + athenzDomain.equals(that.athenzDomain) && + athenzService.equals(that.athenzService) && + notifications.equals(that.notifications); + } + + @Override + public int hashCode() { + return Objects.hash(globalServiceId, upgradePolicy, majorVersion, changeBlockers, steps, xmlForm, athenzDomain, athenzService, notifications); + } + /** This may be invoked by a continuous build */ public static void main(String[] args) { if (args.length != 2 && args.length != 3) { -- cgit v1.2.3