Fix TODO

2 files changed, 1 insertions, 43 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 014c63a6779..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
@@ -241,14 +241,7 @@ public class ApplicationSerializer {
     
     private List<JobStatus> jobStatusListFromSlime(Inspector array) {
         List<JobStatus> jobStatusList = new ArrayList<>();
-        array.traverse((ArrayTraverser) (int i, Inspector item) -> {
-            // TODO: This zone has been removed. Remove after Aug 2017
-            String jobId = item.field(jobTypeField).asString();
-            if ("production-ap-aue-1".equals(jobId)) {
-                return;
-            }
-            jobStatusList.add(jobStatusFromSlime(item));
-        });
+        array.traverse((ArrayTraverser) (int i, Inspector item) -> jobStatusList.add(jobStatusFromSlime(item)));
         return jobStatusList;
     }
     
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 645e38d0f2d..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,41 +133,6 @@ public class ApplicationSerializerTest {
         assertEquals(JobError.unknown, applicationWithFailingJob.deploymentJobs().jobStatus().get(DeploymentJobs.JobType.systemTest).jobError().get());
     }
 
-    // TODO: Remove after Aug 2017
-    @Test
-    public void serializeWithRemovedZone() throws Exception {
-        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-ap-aue-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" +
-                "}\n";
-        Application app = applicationSerializer.fromSlime(SlimeUtils.jsonToSlime(json.getBytes(StandardCharsets.UTF_8)));
-        assertEquals(2, app.deploymentJobs().jobStatus().size());
-    }
-
     private Slime applicationSlime(boolean error) {
         return SlimeUtils.jsonToSlime(applicationJson(error).getBytes(StandardCharsets.UTF_8));
     }