diff options
author | Martin Polden <mpolden@mpolden.no> | 2017-08-29 18:18:22 +0200 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2017-08-29 18:18:22 +0200 |
commit | 9e888f43e7ac12308e54ff12daaa52ba313de187 (patch) | |
tree | 7efb4ab459fc433c83b4b6379ed6d91cd7183057 /controller-server | |
parent | a5fcace643ea80e5f1b4116e3bbade3db5fa5072 (diff) |
Revert "Fix serialization of legacy deploying value"
This reverts commit 44cd92e6ff96b2e40c990fc18cad8c56a85fe73d.
Diffstat (limited to 'controller-server')
2 files changed, 1 insertions, 39 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 96c2f8ebbb9..04999f9e1c3 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 @@ -12,7 +12,6 @@ import com.yahoo.slime.ArrayTraverser; import com.yahoo.slime.Cursor; import com.yahoo.slime.Inspector; import com.yahoo.slime.Slime; -import com.yahoo.slime.Type; import com.yahoo.vespa.config.SlimeUtils; import com.yahoo.vespa.hosted.controller.Application; import com.yahoo.vespa.hosted.controller.application.ApplicationRevision; @@ -230,8 +229,7 @@ public class ApplicationSerializer { } private Optional<Change> changeFromSlime(Inspector object) { - // TODO: Remove NIX check after Sep 2017 - if ( ! object.valid() || object.type() == Type.NIX) return Optional.empty(); + if ( ! object.valid()) return Optional.empty(); Inspector versionFieldValue = object.field(versionField); if (versionFieldValue.valid()) return Optional.of(new Change.VersionChange(Version.fromString(versionFieldValue.asString()))); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java index 836ea246f1a..20e3aae9114 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java @@ -133,42 +133,6 @@ public class ApplicationSerializerTest { assertEquals(JobError.unknown, applicationWithFailingJob.deploymentJobs().jobStatus().get(DeploymentJobs.JobType.systemTest).jobError().get()); } - // TODO: Tests NIX check: Remove after Sep 2017 - @Test - public void serializeLegacyDeployingField() { - String json = "{\n" + - " \"id\": \"t1:a1:i1\",\n" + - " \"deploymentSpecField\": \"<deployment version='1.0'/>\",\n" + - " \"deploymentJobs\": {\n" + - " \"projectId\": 123,\n" + - " \"jobStatus\": [\n" + - " {\n" + - " \"jobType\": \"system-test\",\n" + - " \"version\": \"5.6.7\",\n" + - " \"completionTime\": 7,\n" + - " \"lastTriggered\": 8\n" + - " },\n" + - " {\n" + - " \"jobType\": \"production-us-west-1\",\n" + - " \"version\": \"5.6.7\",\n" + - " \"completionTime\": 7,\n" + - " \"lastTriggered\": 8\n" + - " },\n" + - " {\n" + - " \"jobType\": \"staging-test\",\n" + - " \"version\": \"5.6.7\",\n" + - " \"completionTime\": 7,\n" + - " \"lastTriggered\": 8\n" + - " }\n" + - " ],\n" + - " \"selfTriggering\": false\n" + - " },\n" + - " \"deployingField\": null\n" + - "}\n"; - Application app = applicationSerializer.fromSlime(SlimeUtils.jsonToSlime(json.getBytes(StandardCharsets.UTF_8))); - assertFalse("No change present", app.deploying().isPresent()); - } - private Slime applicationSlime(boolean error) { return SlimeUtils.jsonToSlime(applicationJson(error).getBytes(StandardCharsets.UTF_8)); } |