Resolve a few TODOs

2 files changed, 2 insertions, 7 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobProfile.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobProfile.java
index 0cad9e98d5d..f7794747db9 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobProfile.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobProfile.java
@@ -15,7 +15,6 @@ import static com.yahoo.vespa.hosted.controller.deployment.Step.*;
  */
 public enum JobProfile {
 
-    // TODO jvenstad: runTests is not a run-always step, as it really means: check if tests are done, and store whatever is ready.
     systemTest(EnumSet.of(deployReal,
                           installReal,
                           deployTester,
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/LogSerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/LogSerializer.java
index 457ef761c0f..17b4a42fb91 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/LogSerializer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/LogSerializer.java
@@ -27,7 +27,6 @@ import java.util.stream.Collectors;
 class LogSerializer {
 
     private static final String idField = "id";
-    private static final String levelField = "level";
     private static final String typeField = "type";
     private static final String timestampField = "at";
     private static final String messageField = "message";
@@ -54,7 +53,6 @@ class LogSerializer {
     private void toSlime(LogEntry entry, Cursor entryObject) {
         entryObject.setLong(idField, entry.id());
         entryObject.setLong(timestampField, entry.at());
-        entryObject.setString(levelField, valueOf(entry.type())); // TODO jvenstad: Remove after one deployment.
         entryObject.setString(typeField, valueOf(entry.type()));
         entryObject.setString(messageField, entry.message());
     }
@@ -87,9 +85,7 @@ class LogSerializer {
     private LogEntry fromSlime(Inspector entryObject) {
         return new LogEntry(entryObject.field(idField).asLong(),
                             entryObject.field(timestampField).asLong(),
-                            entryObject.field(typeField).valid() // TODO jvenstad: Remove after one deployment.
-                                    ? typeOf(entryObject.field(typeField).asString())
-                                    : typeOf(entryObject.field(levelField).asString()),
+                            typeOf(entryObject.field(typeField).asString()),
                             entryObject.field(messageField).asString());
     }
 
@@ -105,7 +101,7 @@ class LogSerializer {
     }
 
     static Type typeOf(String type) {
-        switch (type.toLowerCase()) { // TODO jvenstad: Remove lowercasing after this has been deployed.
+        switch (type) {
             case "debug": return Type.debug;
             case "info": return Type.info;
             case "warning": return Type.warning;