optimize include

10 files changed, 25 insertions, 38 deletions

diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/CMakeLists.txt b/documentapi/src/vespa/documentapi/messagebus/messages/CMakeLists.txt
index 943c32ee108..d589f55b0d5 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/CMakeLists.txt
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/CMakeLists.txt
@@ -1,6 +1,9 @@
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_library(documentapi_documentapimessages OBJECT
     SOURCES
+    batchdocumentupdatemessage.cpp
+    batchdocumentupdatereply.cpp
+    documentignoredreply.cpp
     documentmessage.cpp
     documentreply.cpp
     documentstate.cpp
@@ -24,12 +27,10 @@ vespa_add_library(documentapi_documentapimessages OBJECT
     searchresultmessage.cpp
     statbucketmessage.cpp
     statbucketreply.cpp
+    testandsetmessage.cpp
     updatedocumentmessage.cpp
+    updatedocumentreply.cpp
     visitor.cpp
     wrongdistributionreply.cpp
-    updatedocumentreply.cpp
-    batchdocumentupdatemessage.cpp
-    batchdocumentupdatereply.cpp
-    documentignoredreply.cpp
     DEPENDS
 )
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/putdocumentmessage.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/putdocumentmessage.cpp
index a1df5176dd8..d84d7a5c157 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/putdocumentmessage.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/putdocumentmessage.cpp
@@ -1,9 +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/vespalib/util/exceptions.h>
+#include "putdocumentmessage.h"
+#include "writedocumentreply.h"
 #include <vespa/documentapi/messagebus/documentprotocol.h>
-#include <vespa/documentapi/messagebus/messages/putdocumentmessage.h>
-#include <vespa/documentapi/messagebus/messages/writedocumentreply.h>
+#include <vespa/vespalib/util/exceptions.h>
 
 namespace documentapi {
 
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/queryresultmessage.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/queryresultmessage.cpp
index 656d11b769e..88e837e331b 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/queryresultmessage.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/queryresultmessage.cpp
@@ -1,7 +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/vespalib/util/exceptions.h>
-#include <vespa/documentapi/messagebus/messages/queryresultmessage.h>
+#include "queryresultmessage.h"
 
 namespace documentapi {
 
@@ -9,9 +7,7 @@ QueryResultMessage::QueryResultMessage() :
     VisitorMessage(),
     _searchResult(),
     _summary()
-{
-    // empty
-}
+{}
 
 QueryResultMessage::QueryResultMessage(const vdslib::SearchResult & result, const vdslib::DocumentSummary & summary) :
     VisitorMessage(),
@@ -40,4 +36,3 @@ QueryResultMessage::getType() const
 }
 
 }
-
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/queryresultmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/queryresultmessage.h
index c399501dfee..8c1fad3eb8a 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/queryresultmessage.h
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/queryresultmessage.h
@@ -1,9 +1,9 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
+#include "visitor.h"
 #include <vespa/vdslib/container/searchresult.h>
 #include <vespa/vdslib/container/documentsummary.h>
-#include <vespa/documentapi/messagebus/messages/visitor.h>
 
 namespace documentapi {
 
@@ -12,8 +12,7 @@ private:
     vdslib::SearchResult    _searchResult;
     vdslib::DocumentSummary _summary;
 protected:
-    // Implements VisitorMessage.
-    DocumentReply::UP doCreateReply() const;
+    DocumentReply::UP doCreateReply() const override;
 
 public:
     /**
@@ -34,11 +33,8 @@ public:
      */
     QueryResultMessage(const vdslib::SearchResult & result, const vdslib::DocumentSummary & summary);
 
-    // Overrides VisitorMessage.
-    uint32_t getApproxSize() const;
-
-    // Implements VisitorMessage.
-    uint32_t getType() const;
+    uint32_t getApproxSize() const override;
+    uint32_t getType() const override;
 
     // Accessors
     const vdslib::SearchResult & getSearchResult() const { return _searchResult; }
@@ -46,8 +42,7 @@ public:
     const vdslib::DocumentSummary & getDocumentSummary() const { return _summary; }
     vdslib::DocumentSummary & getDocumentSummary() { return _summary; }
 
-    string toString() const { return "queryresultmessage"; }
+    string toString() const override { return "queryresultmessage"; }
 };
 
 }
-
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/removedocumentmessage.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/removedocumentmessage.cpp
index f93405fdae0..0d83e0f085e 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/removedocumentmessage.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/removedocumentmessage.cpp
@@ -1,8 +1,7 @@
 // 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 "removedocumentmessage.h"
+#include "removedocumentreply.h"
 #include <vespa/documentapi/messagebus/documentprotocol.h>
-#include <vespa/documentapi/messagebus/messages/removedocumentmessage.h>
-#include <vespa/documentapi/messagebus/messages/removedocumentreply.h>
 
 namespace documentapi {
 
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/removedocumentreply.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/removedocumentreply.cpp
index 336aa7fb73b..48414046e0e 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/removedocumentreply.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/removedocumentreply.cpp
@@ -1,7 +1,6 @@
 // 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 "removedocumentreply.h"
 #include <vespa/documentapi/messagebus/documentprotocol.h>
-#include <vespa/documentapi/messagebus/messages/removedocumentreply.h>
 
 namespace documentapi {
 
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/removedocumentreply.h b/documentapi/src/vespa/documentapi/messagebus/messages/removedocumentreply.h
index 5e02fe336c9..85f70b4c7b3 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/removedocumentreply.h
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/removedocumentreply.h
@@ -1,7 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
-#include <vespa/documentapi/messagebus/messages/writedocumentreply.h>
+#include "writedocumentreply.h"
 
 namespace documentapi {
 
@@ -43,7 +43,7 @@ public:
      */
     bool getWasFound() const { return _found; }
 
-    string toString() const { return "removedocumentreply"; }
+    string toString() const override { return "removedocumentreply"; }
 };
 
 }
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/searchresultmessage.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/searchresultmessage.cpp
index 818f085c35b..82549209475 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/searchresultmessage.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/searchresultmessage.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/vespalib/util/exceptions.h>
+
 #include <vespa/documentapi/messagebus/messages/searchresultmessage.h>
 
 using vdslib::SearchResult;
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/testandsetmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/testandsetmessage.h
index 21d92385a64..e48099c1fdc 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/testandsetmessage.h
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/testandsetmessage.h
@@ -2,9 +2,8 @@
 // @author Vegard Sjonfjell
 #pragma once
 
-#include <vespa/documentapi/messagebus/messages/documentmessage.h>
-#include <vespa/documentapi/messagebus/messages/testandsetcondition.h>
-#include <string>
+#include "documentmessage.h"
+#include "testandsetcondition.h"
 
 namespace documentapi {
 
@@ -13,6 +12,7 @@ private:
     TestAndSetCondition _condition;
 
 public:
+    ~TestAndSetMessage();
     void setCondition(const TestAndSetCondition & condition) { _condition = condition; }
     const TestAndSetCondition & getCondition() const { return _condition; }
 };
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/writedocumentreply.h b/documentapi/src/vespa/documentapi/messagebus/messages/writedocumentreply.h
index 27d229d5f53..4189e66040f 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/writedocumentreply.h
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/writedocumentreply.h
@@ -1,7 +1,7 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
-#include <vespa/documentapi/messagebus/messages/documentacceptedreply.h>
+#include "documentacceptedreply.h"
 
 namespace documentapi {