Remove load type from documentapi interface.

4 files changed, 6 insertions, 23 deletions

diff --git a/documentapi/src/tests/messages/messages60test.cpp b/documentapi/src/tests/messages/messages60test.cpp
index fddb7357ebf..5d25002021b 100644
--- a/documentapi/src/tests/messages/messages60test.cpp
+++ b/documentapi/src/tests/messages/messages60test.cpp
@@ -89,16 +89,13 @@ bool
 Messages60Test::testGetBucketListMessage()
 {
     GetBucketListMessage msg(document::BucketId(16, 123));
-    msg.setLoadType(_loadTypes["foo"]);
     msg.setBucketSpace("beartato");
-    EXPECT_EQUAL(string("foo"), msg.getLoadType().getName());
     EXPECT_EQUAL(MESSAGE_BASE_LENGTH + 12u + serializedLength("beartato"), serialize("GetBucketListMessage", msg));
 
     for (uint32_t lang = 0; lang < NUM_LANGUAGES; ++lang) {
         mbus::Routable::UP obj = deserialize("GetBucketListMessage", DocumentProtocol::MESSAGE_GETBUCKETLIST, lang);
         if (EXPECT_TRUE(obj)) {
             GetBucketListMessage &ref = static_cast<GetBucketListMessage&>(*obj);
-            EXPECT_EQUAL(string("foo"), ref.getLoadType().getName());
             EXPECT_EQUAL(document::BucketId(16, 123), ref.getBucketId());
             EXPECT_EQUAL("beartato", ref.getBucketSpace());
         }
@@ -323,7 +320,7 @@ Messages60Test::testGetDocumentMessage()
 {
     GetDocumentMessage tmp(document::DocumentId("id:ns:testdoc::"), "foo bar");
 
-    EXPECT_EQUAL(360u, sizeof(GetDocumentMessage));
+    EXPECT_EQUAL(280u, sizeof(GetDocumentMessage));
     EXPECT_EQUAL(MESSAGE_BASE_LENGTH + (size_t)31, serialize("GetDocumentMessage", tmp));
 
     for (uint32_t lang = 0; lang < NUM_LANGUAGES; ++lang) {
@@ -403,7 +400,7 @@ Messages60Test::testPutDocumentMessage()
 
     EXPECT_EQUAL(64u, sizeof(vespalib::string));
     EXPECT_EQUAL(sizeof(std::string), sizeof(TestAndSetCondition));
-    EXPECT_EQUAL(192u, sizeof(DocumentMessage));
+    EXPECT_EQUAL(112u, sizeof(DocumentMessage));
     EXPECT_EQUAL(sizeof(TestAndSetCondition) + sizeof(DocumentMessage), sizeof(TestAndSetMessage));
     EXPECT_EQUAL(sizeof(TestAndSetMessage) + 24, sizeof(PutDocumentMessage));
     EXPECT_EQUAL(MESSAGE_BASE_LENGTH +
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/documentmessage.cpp b/documentapi/src/vespa/documentapi/messagebus/messages/documentmessage.cpp
index 892562ccd3a..2bd832a5855 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/documentmessage.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/documentmessage.cpp
@@ -7,7 +7,6 @@ namespace documentapi {
 
 DocumentMessage::DocumentMessage() :
     mbus::Message(),
-    _loadType(LoadType::DEFAULT),
     _priority(Priority::PRI_NORMAL_3),
     _approxSize(1024)
 {}
diff --git a/documentapi/src/vespa/documentapi/messagebus/messages/documentmessage.h b/documentapi/src/vespa/documentapi/messagebus/messages/documentmessage.h
index 77a4cc23b69..d2b8f74f716 100644
--- a/documentapi/src/vespa/documentapi/messagebus/messages/documentmessage.h
+++ b/documentapi/src/vespa/documentapi/messagebus/messages/documentmessage.h
@@ -2,14 +2,12 @@
 #pragma once
 
 #include "documentreply.h"
-#include <vespa/documentapi/loadtypes/loadtype.h>
 #include <vespa/messagebus/message.h>
 
 namespace documentapi {
 
 class DocumentMessage : public mbus::Message {
 private:
-    LoadType        _loadType;
     Priority::Value _priority;
     uint32_t        _approxSize; // Not sent on wire; set by deserializer or by caller.
 
@@ -57,16 +55,6 @@ public:
      */
     void setPriority(Priority::Value p) { _priority = p; };
 
-    /**
-     * @return Returns the load type for this message.
-     */
-    const LoadType& getLoadType() const { return _loadType; }
-
-    /**
-     * Sets the load type for this message.
-     */
-    void setLoadType(const LoadType& loadType) { _loadType = loadType; }
-
     uint32_t getApproxSize() const override;
 
     void setApproxSize(uint32_t approxSize) {
diff --git a/documentapi/src/vespa/documentapi/messagebus/routablefactories60.cpp b/documentapi/src/vespa/documentapi/messagebus/routablefactories60.cpp
index 7bae7dd7e77..26e609c79fa 100644
--- a/documentapi/src/vespa/documentapi/messagebus/routablefactories60.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/routablefactories60.cpp
@@ -22,24 +22,23 @@ RoutableFactories60::DocumentMessageFactory::encode(const mbus::Routable &obj, v
 {
     const auto &msg = static_cast<const DocumentMessage&>(obj);
     out.putByte(msg.getPriority());
-    out.putInt(msg.getLoadType().getId());
+    out.putInt(LoadType::DEFAULT.getId());
     return doEncode(msg, out);
 }
 
 mbus::Routable::UP
-RoutableFactories60::DocumentMessageFactory::decode(document::ByteBuffer &in, const LoadTypeSet& loadTypes) const
+RoutableFactories60::DocumentMessageFactory::decode(document::ByteBuffer &in, const LoadTypeSet&) const
 {
     uint8_t pri;
     in.getByte(pri);
-    uint32_t loadClass = decodeInt(in);
+    (void) decodeInt(in);
 
     DocumentMessage::UP msg = doDecode(in);
     if (msg) {
         msg->setPriority((Priority::Value)pri);
-        msg->setLoadType(loadTypes[loadClass]);
     }
 
-    return mbus::Routable::UP(msg.release());
+    return msg;
 }
 
 bool