summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2018-08-22 12:26:16 +0200
committerMartin Polden <mpolden@mpolden.no>2018-08-22 13:56:49 +0200
commit867abdae7b74053f20356a3f990631a96db816c4 (patch)
tree6f063803b05487a5d63f141dbd483e668d705e99 /controller-server
parent438084ecb4c0dd7fdf05bcce73348d1d9f8d5e50 (diff)
Remove compatibility with old serialization format
Old format is no longer in use.
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/OsVersionSerializer.java10
1 files changed, 1 insertions, 9 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/OsVersionSerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/OsVersionSerializer.java
index aee19644b82..0a4a13d3723 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/OsVersionSerializer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/OsVersionSerializer.java
@@ -47,16 +47,8 @@ public class OsVersionSerializer {
public OsVersion fromSlime(Inspector object) {
return new OsVersion(
Version.fromString(object.field(versionField).asString()),
- cloudFrom(object.field(cloudField))
+ CloudName.from(object.field(cloudField).asString())
);
}
- // TODO: Simplify and inline after 2018-09-01
- private static CloudName cloudFrom(Inspector field) {
- if (!field.valid()) {
- return CloudName.defaultName();
- }
- return CloudName.from(field.asString());
- }
-
}