diff options
author | Valerij Fredriksen <valerijf@yahooinc.com> | 2021-11-15 12:49:33 +0100 |
---|---|---|
committer | Valerij Fredriksen <valerijf@yahooinc.com> | 2021-11-15 12:49:33 +0100 |
commit | 5afcac52c9e22341e02332e27537cb1520917678 (patch) | |
tree | 9ebaa749e888d53f3305a82ee487df6f81bcbe1a | |
parent | 958567df05ad3b168a0a1f83813d1385a18b5122 (diff) |
Simplify deployedDirectly serialization
2 files changed, 2 insertions, 8 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java index 2f9c8488668..e8a7f7729fb 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java @@ -423,10 +423,7 @@ public class ApplicationSerializer { Optional<Instant> buildTime = SlimeUtils.optionalInstant(object.field(buildTimeField)); Optional<String> sourceUrl = SlimeUtils.optionalString(object.field(sourceUrlField)); Optional<String> commit = SlimeUtils.optionalString(object.field(commitField)); - - // TODO (freva): Simplify once this has rolled out everywhere - Inspector deployedDirectlyInspector = object.field(deployedDirectlyField); - boolean deployedDirectly = deployedDirectlyInspector.valid() && deployedDirectlyInspector.asBool(); + boolean deployedDirectly = object.field(deployedDirectlyField).asBool(); return new ApplicationVersion(sourceRevision, applicationBuildNumber, authorEmail, compileVersion, buildTime, sourceUrl, commit, deployedDirectly); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/RunSerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/RunSerializer.java index 6af3978d0cd..289d6c3a99d 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/RunSerializer.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/RunSerializer.java @@ -177,10 +177,7 @@ class RunSerializer { Optional<Instant> buildTime = SlimeUtils.optionalInstant(versionObject.field(buildTimeField)); Optional<String> sourceUrl = SlimeUtils.optionalString(versionObject.field(sourceUrlField)); Optional<String> commit = SlimeUtils.optionalString(versionObject.field(commitField)); - - // TODO (freva): Simplify once this has rolled out everywhere - Inspector deployedDirectlyInspector = versionObject.field(deployedDirectlyField); - boolean deployedDirectly = deployedDirectlyInspector.valid() && deployedDirectlyInspector.asBool(); + boolean deployedDirectly = versionObject.field(deployedDirectlyField).asBool(); return new ApplicationVersion(source, OptionalLong.of(buildNumber), authorEmail, compileVersion, buildTime, sourceUrl, commit, deployedDirectly); |