diff options
| -rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java | 14 | ||||
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java | 8 |
2 files changed, 15 insertions, 7 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java index 9972b39b9f9..6ff26d0aad7 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java @@ -70,6 +70,20 @@ public class Zone { public String toString() { return "zone " + environment + "." + region; } + + @Override + public int hashCode() { return environment().hashCode() + 7 * region.hashCode();} + + @Override + public boolean equals(Object o) { + if (o == this) return true; + if ( ! (o instanceof Zone)) return false; + + Zone other = (Zone)o; + if ( this.environment() != other.environment()) return false; + if ( ! this.region.equals(other.region)) return false; + return true; + } private static class FlavorDefaults { diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java index 44b5160c61d..cc9cd292cbc 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java @@ -1,8 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.provision.persistence; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.datatype.joda.JodaModule; import com.google.common.util.concurrent.UncheckedTimeoutException; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.ApplicationLockException; @@ -48,9 +46,6 @@ public class CuratorDatabaseClient { private final CuratorDatabase curatorDatabase; - /** Used to serialize and de-serialize JSON data stored in ZK */ - private final ObjectMapper jsonMapper = new ObjectMapper(); - private final Clock clock; private final Zone zone; @@ -58,8 +53,7 @@ public class CuratorDatabaseClient { public CuratorDatabaseClient(NodeFlavors flavors, Curator curator, Clock clock, Zone zone) { this.nodeSerializer = new NodeSerializer(flavors); this.zone = zone; - jsonMapper.registerModule(new JodaModule()); - this.curatorDatabase = new CuratorDatabase(curator, root, /* useCache: */ false); + this.curatorDatabase = new CuratorDatabase(curator, root, false); this.clock = clock; initZK(); } |