summaryrefslogtreecommitdiffstats
path: root/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Change.java
diff options
context:
space:
mode:
Diffstat (limited to 'controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Change.java')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Change.java23
1 files changed, 14 insertions, 9 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Change.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Change.java
index 00db08c668a..16159268f63 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Change.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/Change.java
@@ -100,22 +100,27 @@ public final class Change {
}
@Override
- public int hashCode() { return Objects.hash(platform, application); }
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof Change)) return false;
+ Change change = (Change) o;
+ return pinning == change.pinning &&
+ Objects.equals(platform, change.platform) &&
+ Objects.equals(application, change.application);
+ }
@Override
- public boolean equals(Object other) {
- if (other == this) return true;
- if ( ! (other instanceof Change)) return false;
- Change o = (Change)other;
- if ( ! o.platform.equals(this.platform)) return false;
- if ( ! o.application.equals(this.application)) return false;
- return true;
+ public int hashCode() {
+ return Objects.hash(platform, application, pinning);
}
@Override
public String toString() {
StringJoiner changes = new StringJoiner(" and ");
- platform.ifPresent(version -> changes.add("upgrade to " + version.toString()));
+ if (pinning)
+ changes.add("pin to " + platform.map(Version::toString).orElse("current platform"));
+ else
+ platform.ifPresent(version -> changes.add("upgrade to " + version.toString()));
application.ifPresent(version -> changes.add("application change to " + version.id()));
changes.setEmptyValue("no change");
return changes.toString();