diff options
| author | Valerij Fredriksen <freva@users.noreply.github.com> | 2021-11-15 14:49:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-15 14:49:50 +0100 |
| commit | 7cc4b6f7b9c796b235048d0ffb1729ba622a5928 (patch) | |
| tree | 0eb586162b57d3df674813c3df787c8ebd501f26 /controller-server | |
| parent | a729c7dca0efcbbf0de590b42cd931f0c3fa13bf (diff) | |
| parent | 5afcac52c9e22341e02332e27537cb1520917678 (diff) | |
Merge pull request #20011 from vespa-engine/freva/simplify
Simplify deployedDirectly serialization
Diffstat (limited to 'controller-server')
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); |