From 0bd182d00f96ad3d3137679c19d7fdcda66e7e83 Mon Sep 17 00:00:00 2001
From: Jon Bratseth <bratseth@oath.com>
Date: Tue, 13 Nov 2018 16:23:58 +0100
Subject: Do TODOs

---
 .../searchdefinition/processing/SummaryDiskAccessValidator.java  | 9 ++++-----
 config-model/src/main/resources/schema/services.rnc              | 1 -
 .../test/java/com/yahoo/searchdefinition/SummaryTestCase.java    | 2 +-
 .../src/main/resources/configdefinitions/access-log.def          | 3 +--
 document/src/main/java/com/yahoo/document/DocumentUpdate.java    | 7 ++-----
 .../src/main/java/com/yahoo/vespa/http/client/FeedClient.java    | 1 -
 vespaclient-container-plugin/pom.xml                             | 2 +-
 7 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryDiskAccessValidator.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryDiskAccessValidator.java
index d30006a753e..8c0c6a74037 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryDiskAccessValidator.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/SummaryDiskAccessValidator.java
@@ -42,11 +42,10 @@ public class SummaryDiskAccessValidator extends Processor {
                         throw new IllegalArgumentException(summaryField + " in " + summary + " references " +
                                                            source + ", but this field does not exist");
                     if ( ! isInMemory(field) && ! summary.isFromDisk()) {
-                        // TODO: Set to warning on vespa 7
-                        deployLogger.log(Level.FINE, summaryField + " in " + summary + " references " +
-                                                     source + ", which is not an attribute: Using this " +
-                                                     "summary will cause disk accesses. " +
-                                                     "Set 'from-disk' on this summary class to silence this warning.");
+                        deployLogger.log(Level.WARNING, summaryField + " in " + summary + " references " +
+                                                        source + ", which is not an attribute: Using this " +
+                                                        "summary will cause disk accesses. " +
+                                                        "Set 'from-disk' on this summary class to silence this warning.");
                     }
                 }
             }
diff --git a/config-model/src/main/resources/schema/services.rnc b/config-model/src/main/resources/schema/services.rnc
index c4eb7435ca6..fe728506124 100644
--- a/config-model/src/main/resources/schema/services.rnc
+++ b/config-model/src/main/resources/schema/services.rnc
@@ -11,7 +11,6 @@ include "legacygenericcluster.rnc"
 
 start = element services {
    attribute version { "1.0" }? &
-   attribute major-version { text }? & # TODO: Remove on Vespa 7
    attribute application-type { "hosted-infrastructure" }? &
    LegacyGenericCluster* &
    GenericCluster* &
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/SummaryTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/SummaryTestCase.java
index de2a904cc48..9c0a1a209b4 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/SummaryTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/SummaryTestCase.java
@@ -60,7 +60,7 @@ public class SummaryTestCase {
         DeployLoggerStub logger = new DeployLoggerStub();
         SearchBuilder.createFromString(sd, logger);
         assertEquals(1, logger.entries.size());
-        assertEquals(Level.FINE, logger.entries.get(0).level);
+        assertEquals(Level.WARNING, logger.entries.get(0).level);
         assertEquals("summary field 'ondisk' in document summary 'default' references source field 'ondisk', " +
                      "which is not an attribute: Using this summary will cause disk accesses. " +
                      "Set 'from-disk' on this summary class to silence this warning.",
diff --git a/container-accesslogging/src/main/resources/configdefinitions/access-log.def b/container-accesslogging/src/main/resources/configdefinitions/access-log.def
index 755f7968e2e..788fadcdf90 100644
--- a/container-accesslogging/src/main/resources/configdefinitions/access-log.def
+++ b/container-accesslogging/src/main/resources/configdefinitions/access-log.def
@@ -14,5 +14,4 @@ fileHandler.rotation string default="0 60 ..."
 fileHandler.symlink string default=""
 
 # compress the previous access log after rotation
-# TODO change to "true" for Vespa 7
-fileHandler.compressOnRotation bool default=false
+fileHandler.compressOnRotation bool default=true
diff --git a/document/src/main/java/com/yahoo/document/DocumentUpdate.java b/document/src/main/java/com/yahoo/document/DocumentUpdate.java
index 8ae8fa60861..a1408fc4a46 100644
--- a/document/src/main/java/com/yahoo/document/DocumentUpdate.java
+++ b/document/src/main/java/com/yahoo/document/DocumentUpdate.java
@@ -38,8 +38,7 @@ import java.util.Optional;
  * @see com.yahoo.document.update.FieldUpdate
  * @see com.yahoo.document.update.ValueUpdate
  */
-//TODO Vespa 7 use a map to avoid quadratic scaling on insert/update/remove
-
+// TODO: Use a map to avoid quadratic scaling on insert/update/remove
 public class DocumentUpdate extends DocumentOperation implements Iterable<FieldPathUpdate> {
 
     //see src/vespa/document/util/identifiableid.h
@@ -424,7 +423,6 @@ public class DocumentUpdate extends DocumentOperation implements Iterable<FieldP
      * Sets whether this update should create the document it updates if that document does not exist.
      * In this case an empty document is created before the update is applied.
      *
-     * @since 5.17
      * @param value Whether the document it updates should be created.
      */
     public void setCreateIfNonExistent(boolean value) {
@@ -434,8 +432,7 @@ public class DocumentUpdate extends DocumentOperation implements Iterable<FieldP
     /**
      * Gets whether this update should create the document it updates if that document does not exist.
      *
-     * @since 5.17
-     * @return Whether the document it updates should be created.
+     * @return whether the document it updates should be created.
      */
     public boolean getCreateIfNonExistent() {
         return createIfNonExistent != null && createIfNonExistent;
diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/FeedClient.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/FeedClient.java
index 18267e5209e..e800fbea584 100644
--- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/FeedClient.java
+++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/FeedClient.java
@@ -79,7 +79,6 @@ public interface FeedClient extends AutoCloseable {
          * @see FeedEndpointException
          * @param exception An exception specifying endpoint and cause. See {@link FeedEndpointException} for details.
          */
-        // TODO Vespa 7: Remove empty default implementation
         default void onEndpointException(FeedEndpointException exception) {}
 
     }
diff --git a/vespaclient-container-plugin/pom.xml b/vespaclient-container-plugin/pom.xml
index 3d131c76861..3567e6ed1e6 100644
--- a/vespaclient-container-plugin/pom.xml
+++ b/vespaclient-container-plugin/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <!-- Implementation of document-api in the container. -->
-<!-- TODO: Rename to container-documentapi on Vespa 7 -->
+<!-- TODO: Rename to container-documentapi -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-- 
cgit v1.2.3