- Optimize includes.

- Move htmltable code to implementation file and add add override.
- No virtual on override.

7 files changed, 7 insertions, 31 deletions

diff --git a/storage/src/tests/persistence/bucketownershipnotifiertest.cpp b/storage/src/tests/persistence/bucketownershipnotifiertest.cpp
index 8553795db71..5f675c1d551 100644
--- a/storage/src/tests/persistence/bucketownershipnotifiertest.cpp
+++ b/storage/src/tests/persistence/bucketownershipnotifiertest.cpp
@@ -1,6 +1,5 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <vespa/fastos/fastos.h>
 #include <vespa/vdstestlib/cppunit/macros.h>
 #include <tests/distributor/messagesenderstub.h>
 #include <tests/common/teststorageapp.h>
diff --git a/storage/src/tests/persistence/filestorage/filestormanagertest.cpp b/storage/src/tests/persistence/filestorage/filestormanagertest.cpp
index e21d367370b..e2f41aa5b3e 100644
--- a/storage/src/tests/persistence/filestorage/filestormanagertest.cpp
+++ b/storage/src/tests/persistence/filestorage/filestormanagertest.cpp
@@ -9,7 +9,6 @@
 #include <vespa/document/select/parser.h>
 #include <vespa/vdslib/state/random.h>
 #include <vespa/vdslib/container/mutabledocumentlist.h>
-#include <vespa/vdslib/container/operationlist.h>
 #include <vespa/vdstestlib/cppunit/macros.h>
 #include <vespa/vespalib/io/fileutil.h>
 #include <vespa/storageapi/message/bucket.h>
@@ -18,25 +17,17 @@
 #include <vespa/storageapi/message/persistence.h>
 #include <vespa/storageapi/message/removelocation.h>
 #include <vespa/storage/bucketdb/bucketmanager.h>
-#include <vespa/storage/bucketdb/storbucketdb.h>
-#include <vespa/storage/common/bucketmessages.h>
-#include <vespa/storageframework/storageframework.h>
 #include <vespa/storage/persistence/persistencethread.h>
-#include <vespa/storage/persistence/messages.h>
 #include <vespa/storage/persistence/filestorage/filestormanager.h>
 #include <vespa/storage/persistence/filestorage/modifiedbucketchecker.h>
 #include <tests/common/testhelper.h>
 #include <tests/common/storagelinktest.h>
 #include <tests/common/teststorageapp.h>
-#include <tests/common/dummystoragelink.h>
 #include <tests/persistence/filestorage/forwardingmessagesender.h>
 #include <vespa/persistence/dummyimpl/dummypersistence.h>
 #include <vespa/storageapi/message/batch.h>
 #include <vespa/storage/storageserver/statemanager.h>
 #include <vespa/fastos/file.h>
-#include <fstream>
-#include <memory>
-#include <atomic>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".filestormanagertest");
@@ -2364,10 +2355,8 @@ namespace {
             closeNextLink();
         }
 
-        virtual void print(std::ostream& out, bool, const std::string&) const override
-            { out << "MidLink"; }
-
-        virtual bool onUp(const std::shared_ptr<api::StorageMessage> & msg) override {
+        void print(std::ostream& out, bool, const std::string&) const override { out << "MidLink"; }
+        bool onUp(const std::shared_ptr<api::StorageMessage> & msg) override {
             if (!StorageLinkTest::callOnUp(_up, msg)) _up.sendUp(msg);
             return true;
         }
@@ -2395,10 +2384,9 @@ namespace {
               _leftAddr(leftAddr),
               _rightAddr(rightAddr) {}
 
-        virtual void print(std::ostream& out, bool, const std::string&) const override
-            { out << "BinaryStorageLink"; }
+        void print(std::ostream& out, bool, const std::string&) const override { out << "BinaryStorageLink"; }
 
-        virtual bool onDown(const std::shared_ptr<api::StorageMessage> & msg) override {
+        bool onDown(const std::shared_ptr<api::StorageMessage> & msg) override {
 //            LOG(debug, "onDown Received msg: ->%s, %s %llu\n", msg->getAddress() ? msg->getAddress()->toString().c_str() : "(null)", msg->toString().c_str(), msg->getMsgId());
 
             vespalib::LockGuard lock(_lock);
@@ -2432,7 +2420,7 @@ namespace {
             return true;
         }
 
-        virtual bool onUp(const std::shared_ptr<api::StorageMessage> & msg) override {
+        bool onUp(const std::shared_ptr<api::StorageMessage> & msg) override {
             // LOG(debug, "onUp Received msg: ->%s, %s %llu\n", msg->getAddress() ? msg->getAddress()->toString().c_str() : "(null)", msg->toString().c_str(), msg->getMsgId());
 
             vespalib::LockGuard lock(_lock);
diff --git a/storage/src/tests/persistence/filestorage/filestormodifiedbucketstest.cpp b/storage/src/tests/persistence/filestorage/filestormodifiedbucketstest.cpp
index d608bef3307..1409445b96b 100644
--- a/storage/src/tests/persistence/filestorage/filestormodifiedbucketstest.cpp
+++ b/storage/src/tests/persistence/filestorage/filestormodifiedbucketstest.cpp
@@ -1,6 +1,5 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
-#include <memory>
+
 #include <vespa/vdstestlib/cppunit/macros.h>
 #include <vespa/storageapi/message/bucket.h>
 #include <vespa/storage/persistence/filestorage/modifiedbucketchecker.h>
diff --git a/storage/src/tests/persistence/filestorage/modifiedbucketcheckertest.cpp b/storage/src/tests/persistence/filestorage/modifiedbucketcheckertest.cpp
index 2dc60594c45..58b4ae4d475 100644
--- a/storage/src/tests/persistence/filestorage/modifiedbucketcheckertest.cpp
+++ b/storage/src/tests/persistence/filestorage/modifiedbucketcheckertest.cpp
@@ -1,14 +1,11 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
 
 #include <vespa/vdstestlib/cppunit/macros.h>
 #include <tests/common/testhelper.h>
 #include <tests/common/storagelinktest.h>
 #include <tests/common/teststorageapp.h>
-#include <tests/common/dummystoragelink.h>
 #include <vespa/persistence/dummyimpl/dummypersistence.h>
 #include <vespa/storage/persistence/filestorage/modifiedbucketchecker.h>
-#include <vespa/storage/persistence/messages.h>
 
 namespace storage {
 
diff --git a/storage/src/tests/persistence/legacyoperationhandlertest.cpp b/storage/src/tests/persistence/legacyoperationhandlertest.cpp
index df262501299..353a8d24ec5 100644
--- a/storage/src/tests/persistence/legacyoperationhandlertest.cpp
+++ b/storage/src/tests/persistence/legacyoperationhandlertest.cpp
@@ -1,15 +1,12 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <vespa/fastos/fastos.h>
 #include <vespa/document/base/testdocrepo.h>
-#include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/documentapi/loadtypes/loadtype.h>
 #include <vespa/storage/persistence/messages.h>
 #include <vespa/vdstestlib/cppunit/macros.h>
 #include <vespa/storageapi/message/multioperation.h>
 #include <vespa/persistence/dummyimpl/dummypersistence.h>
 #include <tests/persistence/persistencetestutils.h>
-#include <vespa/storage/persistence/types.h>
 
 using document::DocumentTypeRepo;
 using document::TestDocRepo;
diff --git a/storage/src/tests/persistence/mergehandlertest.cpp b/storage/src/tests/persistence/mergehandlertest.cpp
index 8147992a516..3f0623fbef0 100644
--- a/storage/src/tests/persistence/mergehandlertest.cpp
+++ b/storage/src/tests/persistence/mergehandlertest.cpp
@@ -3,15 +3,13 @@
 #include <vespa/document/base/testdocman.h>
 #include <vespa/storage/persistence/mergehandler.h>
 #include <vespa/vdstestlib/cppunit/macros.h>
-#include <vespa/storageapi/message/bucket.h>
-#include <vespa/log/log.h>
 #include <tests/persistence/persistencetestutils.h>
 #include <tests/persistence/common/persistenceproviderwrapper.h>
 #include <tests/distributor/messagesenderstub.h>
-#include <vespa/storageframework/defaultimplementation/clock/fakeclock.h>
 #include <vespa/vespalib/objects/nbostream.h>
 #include <cmath>
 
+#include <vespa/log/log.h>
 LOG_SETUP(".test.persistence.handler.merge");
 
 namespace storage {
diff --git a/storage/src/tests/persistence/providershutdownwrappertest.cpp b/storage/src/tests/persistence/providershutdownwrappertest.cpp
index 8b1ef88aa2c..c7f60a39cc8 100644
--- a/storage/src/tests/persistence/providershutdownwrappertest.cpp
+++ b/storage/src/tests/persistence/providershutdownwrappertest.cpp
@@ -1,10 +1,8 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <vespa/fastos/fastos.h>
 #include <vespa/vdstestlib/cppunit/macros.h>
 #include <tests/persistence/persistencetestutils.h>
 #include <tests/persistence/common/persistenceproviderwrapper.h>
-#include <vespa/storage/persistence/providershutdownwrapper.h>
 
 namespace storage {