Merge documentapi routable factories classes (C++).

11 files changed, 1274 insertions, 1553 deletions

diff --git a/documentapi/src/tests/routablefactory/routablefactory.cpp b/documentapi/src/tests/routablefactory/routablefactory.cpp
index 1abecdbf6c5..63d37de8c65 100644
--- a/documentapi/src/tests/routablefactory/routablefactory.cpp
+++ b/documentapi/src/tests/routablefactory/routablefactory.cpp
@@ -1,7 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/documentapi/messagebus/documentprotocol.h>
-#include <vespa/documentapi/messagebus/routablefactories51.h>
+#include <vespa/documentapi/messagebus/routablefactories52.h>
 #include <vespa/messagebus/testlib/receptor.h>
 #include <vespa/messagebus/testlib/slobrok.h>
 #include <vespa/messagebus/testlib/testserver.h>
@@ -48,7 +48,7 @@ public:
     }
 };
 
-class MyMessageFactory : public RoutableFactories51::DocumentMessageFactory {
+class MyMessageFactory : public RoutableFactories52::DocumentMessageFactory {
 protected:
     DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override {
         (void)buf;
@@ -62,7 +62,7 @@ protected:
     }
 };
 
-class MyReplyFactory : public RoutableFactories51::DocumentReplyFactory {
+class MyReplyFactory : public RoutableFactories52::DocumentReplyFactory {
 protected:
     DocumentReply::UP doDecode(document::ByteBuffer &buf) const override {
         (void)buf;
diff --git a/documentapi/src/vespa/documentapi/messagebus/CMakeLists.txt b/documentapi/src/vespa/documentapi/messagebus/CMakeLists.txt
index 1df761b8af5..6f65b3c67a9 100644
--- a/documentapi/src/vespa/documentapi/messagebus/CMakeLists.txt
+++ b/documentapi/src/vespa/documentapi/messagebus/CMakeLists.txt
@@ -3,10 +3,6 @@ vespa_add_library(documentapi_documentapimessagebus OBJECT
     SOURCES
     documentprotocol.cpp
     replymerger.cpp
-    routablefactories41.cpp
-    routablefactories42.cpp
-    routablefactories50.cpp
-    routablefactories51.cpp
     routablefactories52.cpp
     routablefactories60.cpp
     routablerepository.cpp
diff --git a/documentapi/src/vespa/documentapi/messagebus/routablefactories41.cpp b/documentapi/src/vespa/documentapi/messagebus/routablefactories41.cpp
deleted file mode 100644
index a77f793ae89..00000000000
--- a/documentapi/src/vespa/documentapi/messagebus/routablefactories41.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-#include "routablefactories41.h"
-#include <vespa/document/document.h>
-#include <vespa/documentapi/documentapi.h>
-#include <vespa/vespalib/objects/nbostream.h>
-
-using vespalib::nbostream;
-
-namespace documentapi {
-
-string
-RoutableFactories41::decodeString(document::ByteBuffer &in)
-{
-    int32_t len = decodeInt(in);
-    string ret = string(in.getBufferAtPos(), len);
-    in.incPos(len);
-    return ret;
-}
-
-bool
-RoutableFactories41::decodeBoolean(document::ByteBuffer &in)
-{
-    char ret;
-    in.getBytes(&ret, 1);
-    return (bool)ret;
-}
-
-int32_t
-RoutableFactories41::decodeInt(document::ByteBuffer &in)
-{
-    int32_t ret;
-    in.getIntNetwork(ret);
-    return ret;
-}
-
-int64_t
-RoutableFactories41::decodeLong(document::ByteBuffer &in)
-{
-    int64_t ret;
-    in.getLongNetwork(ret);
-    return ret;
-}
-
-document::DocumentId
-RoutableFactories41::decodeDocumentId(document::ByteBuffer &in)
-{
-    nbostream stream(in.getBufferAtPos(), in.getRemaining());
-    document::DocumentId ret(stream);
-    in.incPos(stream.rp());
-    return ret;
-}
-
-void
-RoutableFactories41::encodeDocumentId(const document::DocumentId &id, vespalib::GrowableByteBuffer &out)
-{
-    string str = id.toString();
-    out.putBytes(str.c_str(), str.size() + 1);
-}
-
-}
diff --git a/documentapi/src/vespa/documentapi/messagebus/routablefactories41.h b/documentapi/src/vespa/documentapi/messagebus/routablefactories41.h
deleted file mode 100644
index aecf0f73892..00000000000
--- a/documentapi/src/vespa/documentapi/messagebus/routablefactories41.h
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#pragma once
-
-#include <vespa/documentapi/messagebus/messages/feedmessage.h>
-#include <vespa/documentapi/messagebus/messages/feedreply.h>
-#include <vespa/messagebus/routable.h>
-#include <vespa/messagebus/blob.h>
-#include <vespa/messagebus/blobref.h>
-#include <vespa/document/base/documentid.h>
-#include <vespa/document/util/bytebuffer.h>
-#include <vespa/vespalib/util/growablebytebuffer.h>
-
-namespace documentapi {
-
-/**
- * This class encapsulates all the {@link RoutableFactory} classes needed to implement factories for the document
- * routable. When adding new factories to this class, please KEEP THE THEM ORDERED alphabetically like they are now.
- */
-class RoutableFactories41 {
-private:
-    RoutableFactories41() { /* abstract */ }
-
-public:
-
-    ///////////////////////////////////////////////////////////////////////////
-    //
-    // Utilities
-    //
-    ///////////////////////////////////////////////////////////////////////////
-
-    /**
-     * This is a complement for the vespalib::GrowableByteBuffer.putString() method.
-     *
-     * @param in The byte buffer to read from.
-     * @return The decoded string.
-     */
-    static string decodeString(document::ByteBuffer &in);
-
-    /**
-     * This is a complement for the vespalib::GrowableByteBuffer.putBoolean() method.
-     *
-     * @param in The byte buffer to read from.
-     * @return The decoded bool.
-     */
-    static bool decodeBoolean(document::ByteBuffer &in);
-
-    /**
-     * Convenience method to decode a 32-bit int from the given byte buffer.
-     *
-     * @param in The byte buffer to read from.
-     * @return The decoded int.
-     */
-    static int32_t decodeInt(document::ByteBuffer &in);
-
-    /**
-     * Convenience method to decode a 64-bit int from the given byte buffer.
-     *
-     * @param in The byte buffer to read from.
-     * @return The decoded int.
-     */
-    static int64_t decodeLong(document::ByteBuffer &in);
-
-    /**
-     * Convenience method to decode a document id from the given byte buffer.
-     *
-     * @param in The byte buffer to read from.
-     * @return The decoded document id.
-     */
-    static document::DocumentId decodeDocumentId(document::ByteBuffer &in);
-
-    /**
-     * Convenience method to encode a document id to the given byte buffer.
-     *
-     * @param id  The document id to encode.
-     * @param out The byte buffer to write to.
-     */
-    static void encodeDocumentId(const document::DocumentId &id, vespalib::GrowableByteBuffer &out);
-};
-
-}
-
diff --git a/documentapi/src/vespa/documentapi/messagebus/routablefactories42.cpp b/documentapi/src/vespa/documentapi/messagebus/routablefactories42.cpp
deleted file mode 100644
index 20f1f241900..00000000000
--- a/documentapi/src/vespa/documentapi/messagebus/routablefactories42.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-#include "routablefactories42.h"
-#include <vespa/document/document.h>
-#include <vespa/documentapi/documentapi.h>
-#include <vespa/vespalib/objects/nbostream.h>
-
-using vespalib::nbostream;
-
-namespace documentapi {
-
-}
diff --git a/documentapi/src/vespa/documentapi/messagebus/routablefactories42.h b/documentapi/src/vespa/documentapi/messagebus/routablefactories42.h
deleted file mode 100644
index ede108f5157..00000000000
--- a/documentapi/src/vespa/documentapi/messagebus/routablefactories42.h
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#pragma once
-
-#include "routablefactories41.h"
-
-namespace document { class DocumentTypeRepo; }
-
-namespace documentapi {
-/**
- * This class encapsulates all the {@link RoutableFactory} classes needed to implement factories for the document
- * routable. When adding new factories to this class, please KEEP THE THEM ORDERED alphabetically like they are now.
- */
-class RoutableFactories42 {
-private:
-    RoutableFactories42() { /* abstract */ }
-    typedef RoutableFactories41 RF41;
-
-public:
-
-    ///////////////////////////////////////////////////////////////////////////
-    //
-    // Utilities
-    //
-    ///////////////////////////////////////////////////////////////////////////
-
-    /**
-     * This is a complement for the vespalib::GrowableByteBuffer.putString() method.
-     *
-     * @param in The byte buffer to read from.
-     * @return The decoded string.
-     */
-    static string decodeString(document::ByteBuffer &in)
-    { return RF41::decodeString(in); }
-
-    /**
-     * This is a complement for the vespalib::GrowableByteBuffer.putBoolean() method.
-     *
-     * @param in The byte buffer to read from.
-     * @return The decoded bool.
-     */
-    static bool decodeBoolean(document::ByteBuffer &in)
-    { return RF41::decodeBoolean(in); }
-
-    /**
-     * Convenience method to decode a 32-bit int from the given byte buffer.
-     *
-     * @param in The byte buffer to read from.
-     * @return The decoded int.
-     */
-    static int32_t decodeInt(document::ByteBuffer &in)
-    { return RF41::decodeInt(in); }
-
-    /**
-     * Convenience method to decode a 64-bit int from the given byte buffer.
-     *
-     * @param in The byte buffer to read from.
-     * @return The decoded int.
-     */
-    static int64_t decodeLong(document::ByteBuffer &in)
-    { return RF41::decodeLong(in); }
-
-
-    /**
-     * Convenience method to decode a document id from the given byte buffer.
-     *
-     * @param in The byte buffer to read from.
-     * @return The decoded document id.
-     */
-    static document::DocumentId decodeDocumentId(document::ByteBuffer &in)
-    { return RF41::decodeDocumentId(in); }
-
-    /**
-     * Convenience method to encode a document id to the given byte buffer.
-     *
-     * @param id  The document id to encode.
-     * @param out The byte buffer to write to.
-     */
-    static void encodeDocumentId(const document::DocumentId &id,
-                                 vespalib::GrowableByteBuffer &out)
-    { return RF41::encodeDocumentId(id, out); }
-};
-
-}
-
diff --git a/documentapi/src/vespa/documentapi/messagebus/routablefactories50.cpp b/documentapi/src/vespa/documentapi/messagebus/routablefactories50.cpp
deleted file mode 100644
index bb0d8a2e26c..00000000000
--- a/documentapi/src/vespa/documentapi/messagebus/routablefactories50.cpp
+++ /dev/null
@@ -1,855 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-#include "routablefactories50.h"
-#include <vespa/document/bucket/bucketidfactory.h>
-#include <vespa/document/bucket/fixed_bucket_spaces.h>
-#include <vespa/document/select/parser.h>
-#include <vespa/document/update/documentupdate.h>
-#include <vespa/documentapi/documentapi.h>
-#include <vespa/documentapi/loadtypes/loadtypeset.h>
-#include <vespa/vespalib/objects/nbostream.h>
-
-using document::FixedBucketSpaces;
-using vespalib::nbostream;
-using std::make_unique;
-using std::make_shared;
-
-namespace documentapi {
-
-bool
-RoutableFactories50::DocumentMessageFactory::encode(const mbus::Routable &obj, vespalib::GrowableByteBuffer &out) const
-{
-    const DocumentMessage &msg = static_cast<const DocumentMessage&>(obj);
-    out.putByte(msg.getPriority());
-    out.putInt(msg.getLoadType().getId());
-    return doEncode(msg, out);
-}
-
-mbus::Routable::UP
-RoutableFactories50::DocumentMessageFactory::decode(document::ByteBuffer &in, const LoadTypeSet& loadTypes) const
-{
-    uint8_t pri;
-    in.getByte(pri);
-    uint32_t loadClass = decodeInt(in);
-
-    DocumentMessage::UP msg = doDecode(in);
-    if (msg) {
-        msg->setPriority((Priority::Value)pri);
-        msg->setLoadType(loadTypes[loadClass]);
-    }
-
-    return mbus::Routable::UP(msg.release());
-}
-
-bool
-RoutableFactories50::DocumentReplyFactory::encode(const mbus::Routable &obj, vespalib::GrowableByteBuffer &out) const
-{
-    const DocumentReply &msg = static_cast<const DocumentReply&>(obj);
-    out.putByte(msg.getPriority());
-    return doEncode(msg, out);
-}
-
-mbus::Routable::UP
-RoutableFactories50::DocumentReplyFactory::decode(document::ByteBuffer &in, const LoadTypeSet&) const
-{
-    uint8_t pri;
-    in.getByte(pri);
-    DocumentReply::UP reply = doDecode(in);
-    if (reply) {
-        reply->setPriority((Priority::Value)pri);
-    }
-    return mbus::Routable::UP(reply.release());
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//
-// Factories
-//
-////////////////////////////////////////////////////////////////////////////////
-
-DocumentMessage::UP
-RoutableFactories50::CreateVisitorMessageFactory::doDecode(document::ByteBuffer &buf) const
-{
-    auto msg = std::make_unique<CreateVisitorMessage>();
-
-    msg->setLibraryName(decodeString(buf));
-    msg->setInstanceId(decodeString(buf));
-    msg->setControlDestination(decodeString(buf));
-    msg->setDataDestination(decodeString(buf));
-    msg->setDocumentSelection(decodeString(buf));
-    msg->setMaximumPendingReplyCount(decodeInt(buf));
-
-    int32_t len = decodeInt(buf);
-    for (int32_t i = 0; i < len; i++) {
-        int64_t val;
-        buf.getLong(val); // NOT using getLongNetwork
-        msg->getBuckets().push_back(document::BucketId(val));
-    }
-
-    msg->setFromTimestamp(decodeLong(buf));
-    msg->setToTimestamp(decodeLong(buf));
-    msg->setVisitRemoves(decodeBoolean(buf));
-    msg->setVisitHeadersOnly(decodeBoolean(buf));
-    msg->setVisitInconsistentBuckets(decodeBoolean(buf));
-    msg->getParameters().deserialize(_repo, buf);
-    msg->setVisitorDispatcherVersion(50);
-    msg->setVisitorOrdering((document::OrderingSpecification::Order)decodeInt(buf));
-    msg->setMaxBucketsPerVisitor(decodeInt(buf));
-
-    return msg;
-}
-
-bool
-RoutableFactories50::CreateVisitorMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
-{
-    const CreateVisitorMessage &msg = static_cast<const CreateVisitorMessage&>(obj);
-
-    buf.putString(msg.getLibraryName());
-    buf.putString(msg.getInstanceId());
-    buf.putString(msg.getControlDestination());
-    buf.putString(msg.getDataDestination());
-    buf.putString(msg.getDocumentSelection());
-    buf.putInt(msg.getMaximumPendingReplyCount());
-    buf.putInt(msg.getBuckets().size());
-
-    for (const auto & bucketId : msg.getBuckets()) {
-        uint64_t val = bucketId.getRawId();
-        buf.putBytes((const char*)&val, 8);
-    }
-
-    buf.putLong(msg.getFromTimestamp());
-    buf.putLong(msg.getToTimestamp());
-    buf.putBoolean(msg.visitRemoves());
-    buf.putBoolean(msg.visitHeadersOnly());
-    buf.putBoolean(msg.visitInconsistentBuckets());
-
-    int len = msg.getParameters().getSerializedSize();
-    char *tmp = buf.allocate(len);
-    document::ByteBuffer dbuf(tmp, len);
-    msg.getParameters().serialize(dbuf);
-
-    buf.putInt(msg.getVisitorOrdering());
-    buf.putInt(msg.getMaxBucketsPerVisitor());
-
-    return true;
-}
-
-DocumentReply::UP
-RoutableFactories50::CreateVisitorReplyFactory::doDecode(document::ByteBuffer &buf) const
-{
-    auto reply = std::make_unique<CreateVisitorReply>(DocumentProtocol::REPLY_CREATEVISITOR);
-    reply->setLastBucket(document::BucketId((uint64_t)decodeLong(buf)));
-    vdslib::VisitorStatistics vs;
-    vs.setBucketsVisited(decodeInt(buf));
-    vs.setDocumentsVisited(decodeLong(buf));
-    vs.setBytesVisited(decodeLong(buf));
-    vs.setDocumentsReturned(decodeLong(buf));
-    vs.setBytesReturned(decodeLong(buf));
-    vs.setSecondPassDocumentsReturned(decodeLong(buf));
-    vs.setSecondPassBytesReturned(decodeLong(buf));
-    reply->setVisitorStatistics(vs);
-
-    return reply;
-}
-
-bool
-RoutableFactories50::CreateVisitorReplyFactory::doEncode(const DocumentReply &obj, vespalib::GrowableByteBuffer &buf) const
-{
-    const CreateVisitorReply &reply = static_cast<const CreateVisitorReply&>(obj);
-    buf.putLong(reply.getLastBucket().getRawId());
-    buf.putInt(reply.getVisitorStatistics().getBucketsVisited());
-    buf.putLong(reply.getVisitorStatistics().getDocumentsVisited());
-    buf.putLong(reply.getVisitorStatistics().getBytesVisited());
-    buf.putLong(reply.getVisitorStatistics().getDocumentsReturned());
-    buf.putLong(reply.getVisitorStatistics().getBytesReturned());
-    buf.putLong(reply.getVisitorStatistics().getSecondPassDocumentsReturned());
-    buf.putLong(reply.getVisitorStatistics().getSecondPassBytesReturned());
-    return true;
-}
-
-DocumentMessage::UP
-RoutableFactories50::DestroyVisitorMessageFactory::doDecode(document::ByteBuffer &buf) const
-{
-    auto msg = std::make_unique<DestroyVisitorMessage>();
-    msg->setInstanceId(decodeString(buf));
-    return msg;
-}
-
-bool
-RoutableFactories50::DestroyVisitorMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
-{
-    const DestroyVisitorMessage &msg = static_cast<const DestroyVisitorMessage&>(obj);
-    buf.putString(msg.getInstanceId());
-    return true;
-}
-
-DocumentReply::UP
-RoutableFactories50::DestroyVisitorReplyFactory::doDecode(document::ByteBuffer &) const
-{
-    return std::make_unique<VisitorReply>(DocumentProtocol::REPLY_DESTROYVISITOR);
-}
-
-bool
-RoutableFactories50::DestroyVisitorReplyFactory::doEncode(const DocumentReply &, vespalib::GrowableByteBuffer &) const
-{
-    return true;
-}
-
-DocumentMessage::UP
-RoutableFactories50::DocumentListMessageFactory::doDecode(document::ByteBuffer &buf) const
-{
-    auto msg = std::make_unique<DocumentListMessage>();
-    msg->setBucketId(document::BucketId(decodeLong(buf)));
-
-    int32_t len = decodeInt(buf);
-    for (int32_t i = 0; i < len; i++) {
-        DocumentListMessage::Entry entry(_repo, buf);
-        msg->getDocuments().push_back(entry);
-    }
-
-    return msg;
-}
-
-bool
-RoutableFactories50::DocumentListMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
-{
-    const DocumentListMessage &msg = static_cast<const DocumentListMessage&>(obj);
-
-    buf.putLong(msg.getBucketId().getRawId());
-    buf.putInt(msg.getDocuments().size());
-    for (const auto & document : msg.getDocuments()) {
-        int len = document.getSerializedSize();
-        char *tmp = buf.allocate(len);
-        document::ByteBuffer dbuf(tmp, len);
-        document.serialize(dbuf);
-    }
-
-    return true;
-}
-
-DocumentReply::UP
-RoutableFactories50::DocumentListReplyFactory::doDecode(document::ByteBuffer &) const
-{
-    return std::make_unique<VisitorReply>(DocumentProtocol::REPLY_DOCUMENTLIST);
-}
-
-bool
-RoutableFactories50::DocumentListReplyFactory::doEncode(const DocumentReply &, vespalib::GrowableByteBuffer &) const
-{
-    return true;
-}
-
-DocumentMessage::UP
-RoutableFactories50::DocumentSummaryMessageFactory::doDecode(document::ByteBuffer &buf) const
-{
-    auto msg = std::make_unique<DocumentSummaryMessage>();
-
-    msg->deserialize(buf);
-
-    return msg;
-}
-
-bool
-RoutableFactories50::DocumentSummaryMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
-{
-    const DocumentSummaryMessage &msg = static_cast<const DocumentSummaryMessage&>(obj);
-
-    int32_t len = msg.getSerializedSize();
-    char *tmp = buf.allocate(len);
-    document::ByteBuffer dbuf(tmp, len);
-    msg.serialize(dbuf);
-
-    return true;
-}
-
-DocumentReply::UP
-RoutableFactories50::DocumentSummaryReplyFactory::doDecode(document::ByteBuffer &) const
-{
-    return std::make_unique<VisitorReply>(DocumentProtocol::REPLY_DOCUMENTSUMMARY);
-}
-
-bool
-RoutableFactories50::DocumentSummaryReplyFactory::doEncode(const DocumentReply &, vespalib::GrowableByteBuffer &) const
-{
-    return true;
-}
-
-DocumentMessage::UP
-RoutableFactories50::EmptyBucketsMessageFactory::doDecode(document::ByteBuffer &buf) const
-{
-    auto msg = std::make_unique<EmptyBucketsMessage>();
-
-    int32_t len = decodeInt(buf);
-    std::vector<document::BucketId> buckets(len);
-    for (int32_t i = 0; i < len; ++i) {
-        buckets[i] = document::BucketId(decodeLong(buf));
-    }
-    msg->getBucketIds().swap(buckets);
-
-    return msg;
-}
-
-bool
-RoutableFactories50::EmptyBucketsMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
-{
-    const EmptyBucketsMessage &msg = static_cast<const EmptyBucketsMessage&>(obj);
-
-    buf.putInt(msg.getBucketIds().size());
-    for (const auto & bucketId : msg.getBucketIds()) {
-        buf.putLong(bucketId.getRawId());
-    }
-
-    return true;
-}
-
-DocumentReply::UP
-RoutableFactories50::EmptyBucketsReplyFactory::doDecode(document::ByteBuffer &) const
-{
-    return std::make_unique<VisitorReply>(DocumentProtocol::REPLY_EMPTYBUCKETS);
-}
-
-bool
-RoutableFactories50::EmptyBucketsReplyFactory::doEncode(const DocumentReply &, vespalib::GrowableByteBuffer &) const
-{
-    return true;
-}
-
-bool RoutableFactories50::GetBucketListMessageFactory::encodeBucketSpace(vespalib::stringref bucketSpace,
-                                                                         vespalib::GrowableByteBuffer& ) const
-{
-    return (bucketSpace == FixedBucketSpaces::default_space_name());
-}
-
-string RoutableFactories50::GetBucketListMessageFactory::decodeBucketSpace(document::ByteBuffer&) const {
-    return FixedBucketSpaces::default_space_name();
-}
-
-DocumentMessage::UP
-RoutableFactories50::GetBucketListMessageFactory::doDecode(document::ByteBuffer &buf) const
-{
-    document::BucketId bucketId(decodeLong(buf));
-    auto msg = std::make_unique<GetBucketListMessage>(bucketId);
-    msg->setBucketSpace(decodeBucketSpace(buf));
-    return msg;
-}
-
-bool
-RoutableFactories50::GetBucketListMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
-{
-    const GetBucketListMessage &msg = static_cast<const GetBucketListMessage&>(obj);
-    buf.putLong(msg.getBucketId().getRawId());
-    return encodeBucketSpace(msg.getBucketSpace(), buf);
-}
-
-DocumentReply::UP
-RoutableFactories50::GetBucketListReplyFactory::doDecode(document::ByteBuffer &buf) const
-{
-    auto reply = std::make_unique<GetBucketListReply>();
-
-    int32_t len = decodeInt(buf);
-    reply->getBuckets().reserve(len);
-    for (int32_t i = 0; i < len; i++) {
-        GetBucketListReply::BucketInfo info;
-        info._bucket = document::BucketId((uint64_t)decodeLong(buf));
-        info._bucketInformation = decodeString(buf);
-        reply->getBuckets().push_back(info);
-    }
-
-    return reply;
-}
-
-bool
-RoutableFactories50::GetBucketListReplyFactory::doEncode(const DocumentReply &obj, vespalib::GrowableByteBuffer &buf) const
-{
-    const GetBucketListReply &reply = static_cast<const GetBucketListReply&>(obj);
-
-    const std::vector<GetBucketListReply::BucketInfo> &buckets = reply.getBuckets();
-    buf.putInt(buckets.size());
-    for (const auto & bucketInfo : buckets) {
-        buf.putLong(bucketInfo._bucket.getRawId());
-        buf.putString(bucketInfo._bucketInformation);
-    }
-
-    return true;
-}
-
-DocumentMessage::UP
-RoutableFactories50::GetBucketStateMessageFactory::doDecode(document::ByteBuffer &buf) const
-{
-    auto msg = std::make_unique<GetBucketStateMessage>();
-
-    msg->setBucketId(document::BucketId((uint64_t)decodeLong(buf)));
-
-    return msg;
-}
-
-bool
-RoutableFactories50::GetBucketStateMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
-{
-    const GetBucketStateMessage &msg = static_cast<const GetBucketStateMessage&>(obj);
-    buf.putLong(msg.getBucketId().getRawId());
-    return true;
-}
-
-DocumentReply::UP
-RoutableFactories50::GetBucketStateReplyFactory::doDecode(document::ByteBuffer &buf) const
-{
-    auto reply = std::make_unique<GetBucketStateReply>();
-
-    int32_t len = decodeInt(buf);
-    reply->getBucketState().reserve(len);
-    for (int32_t i = 0; i < len; i++) {
-        reply->getBucketState().emplace_back(buf);
-    }
-
-    return reply;
-}
-
-bool
-RoutableFactories50::GetBucketStateReplyFactory::doEncode(const DocumentReply &obj, vespalib::GrowableByteBuffer &buf) const
-{
-    const GetBucketStateReply &reply = static_cast<const GetBucketStateReply&>(obj);
-
-    buf.putInt(reply.getBucketState().size());
-    for (const auto & state : reply.getBucketState()) {
-        state.serialize(buf);
-    }
-
-    return true;
-}
-
-DocumentMessage::UP
-RoutableFactories50::GetDocumentMessageFactory::doDecode(document::ByteBuffer &buf) const
-{
-    auto msg = std::make_unique<GetDocumentMessage>();
-    msg->setDocumentId(decodeDocumentId(buf));
-    msg->setFlags(decodeInt(buf));
-
-    return msg;
-}
-
-bool
-RoutableFactories50::GetDocumentMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
-{
-    const GetDocumentMessage &msg = static_cast<const GetDocumentMessage&>(obj);
-
-    encodeDocumentId(msg.getDocumentId(), buf);
-    buf.putInt(msg.getFlags());
-
-    return true;
-}
-
-DocumentReply::UP
-RoutableFactories50::GetDocumentReplyFactory::doDecode(document::ByteBuffer &buf) const
-{
-    auto reply = std::make_unique<GetDocumentReply>();
-
-    bool hasDocument = decodeBoolean(buf);
-    document::Document * document = nullptr;
-    if (hasDocument) {
-        auto doc = std::make_shared<document::Document>(_repo, buf);
-        document = doc.get();
-        reply->setDocument(std::move(doc));
-    }
-    int64_t lastModified = decodeLong(buf);
-    reply->setLastModified(lastModified);
-    if (hasDocument) {
-        document->setLastModified(lastModified);
-    }
-
-    return reply;
-}
-
-bool
-RoutableFactories50::GetDocumentReplyFactory::doEncode(const DocumentReply &obj, vespalib::GrowableByteBuffer &buf) const
-{
-    const GetDocumentReply &reply = static_cast<const GetDocumentReply&>(obj);
-
-    buf.putByte(reply.hasDocument() ? 1 : 0);
-    if (reply.hasDocument()) {
-        nbostream stream;
-        reply.getDocument().serialize(stream);
-        buf.putBytes(stream.peek(), stream.size());
-    }
-    buf.putLong(reply.getLastModified());
-
-    return true;
-}
-
-DocumentMessage::UP
-RoutableFactories50::MapVisitorMessageFactory::doDecode(document::ByteBuffer &buf) const
-{
-    auto msg = std::make_unique<MapVisitorMessage>();
-    msg->getData().deserialize(_repo, buf);
-    return msg;
-}
-
-bool
-RoutableFactories50::MapVisitorMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
-{
-    const MapVisitorMessage &msg = static_cast<const MapVisitorMessage&>(obj);
-
-    int32_t len = msg.getData().getSerializedSize();
-    char *tmp = buf.allocate(len);
-    document::ByteBuffer dbuf(tmp, len);
-    msg.getData().serialize(dbuf);
-
-    return true;
-}
-
-DocumentReply::UP
-RoutableFactories50::MapVisitorReplyFactory::doDecode(document::ByteBuffer &) const
-{
-    return std::make_unique<VisitorReply>(DocumentProtocol::REPLY_MAPVISITOR);
-}
-
-bool
-RoutableFactories50::MapVisitorReplyFactory::doEncode(const DocumentReply &, vespalib::GrowableByteBuffer &) const
-{
-    return true;
-}
-
-void
-RoutableFactories50::PutDocumentMessageFactory::decodeInto(PutDocumentMessage & msg, document::ByteBuffer & buf) const {
-    msg.setDocument(make_shared<document::Document>(_repo, buf));
-    msg.setTimestamp(static_cast<uint64_t>(decodeLong(buf)));
-}
-
-bool
-RoutableFactories50::PutDocumentMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
-{
-    auto & msg = static_cast<const PutDocumentMessage &>(obj);
-    nbostream stream;
-
-    msg.getDocument().serialize(stream);
-    buf.putBytes(stream.peek(), stream.size());
-    buf.putLong(static_cast<int64_t>(msg.getTimestamp()));
-
-    return true;
-}
-
-DocumentReply::UP
-RoutableFactories50::PutDocumentReplyFactory::doDecode(document::ByteBuffer &buf) const
-{
-    auto reply = make_unique<WriteDocumentReply>(DocumentProtocol::REPLY_PUTDOCUMENT);
-    reply->setHighestModificationTimestamp(decodeLong(buf));
-
-    // Doing an explicit move here to force converting result to an rvalue.
-    // This is done automatically in GCC >= 5.
-    return std::move(reply);
-}
-
-bool
-RoutableFactories50::PutDocumentReplyFactory::doEncode(const DocumentReply &obj, vespalib::GrowableByteBuffer &buf) const
-{
-    const WriteDocumentReply& reply = (const WriteDocumentReply&)obj;
-    buf.putLong(reply.getHighestModificationTimestamp());
-    return true;
-}
-        
-void
-RoutableFactories50::RemoveDocumentMessageFactory::decodeInto(RemoveDocumentMessage & msg, document::ByteBuffer & buf) const {
-    msg.setDocumentId(decodeDocumentId(buf));
-}
-
-bool
-RoutableFactories50::RemoveDocumentMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
-{
-    const RemoveDocumentMessage &msg = static_cast<const RemoveDocumentMessage&>(obj);
-    encodeDocumentId(msg.getDocumentId(), buf);
-    return true;
-}
-
-DocumentReply::UP
-RoutableFactories50::RemoveDocumentReplyFactory::doDecode(document::ByteBuffer &buf) const
-{
-    auto reply = std::make_unique<RemoveDocumentReply>();
-    reply->setWasFound(decodeBoolean(buf));
-    reply->setHighestModificationTimestamp(decodeLong(buf));
-    return reply;
-}
-
-bool
-RoutableFactories50::RemoveDocumentReplyFactory::doEncode(const DocumentReply &obj, vespalib::GrowableByteBuffer &buf) const
-{
-    const RemoveDocumentReply &reply = static_cast<const RemoveDocumentReply&>(obj);
-    buf.putBoolean(reply.getWasFound());
-    buf.putLong(reply.getHighestModificationTimestamp());
-    return true;
-}
-
-DocumentMessage::UP
-RoutableFactories50::RemoveLocationMessageFactory::doDecode(document::ByteBuffer &buf) const
-{
-    string selection = decodeString(buf);
-
-    document::BucketIdFactory factory;
-    document::select::Parser parser(_repo, factory);
-
-    auto msg = std::make_unique<RemoveLocationMessage>(factory, parser, selection);
-    // FIXME bucket space not part of wire format, implicitly limiting to only default space for now.
-    msg->setBucketSpace(document::FixedBucketSpaces::default_space_name());
-    return msg;
-}
-
-bool
-RoutableFactories50::RemoveLocationMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
-{
-    const RemoveLocationMessage &msg = static_cast<const RemoveLocationMessage&>(obj);
-    buf.putString(msg.getDocumentSelection());
-    return true;
-}
-
-DocumentReply::UP
-RoutableFactories50::RemoveLocationReplyFactory::doDecode(document::ByteBuffer &) const
-{
-    return std::make_unique<DocumentReply>(DocumentProtocol::REPLY_REMOVELOCATION);
-}
-
-bool
-RoutableFactories50::RemoveLocationReplyFactory::doEncode(const DocumentReply &, vespalib::GrowableByteBuffer &) const
-{
-    return true;
-}
-
-DocumentMessage::UP
-RoutableFactories50::SearchResultMessageFactory::doDecode(document::ByteBuffer &buf) const
-{
-    auto msg = std::make_unique<SearchResultMessage>();
-    msg->deserialize(buf);
-    return msg;
-}
-
-bool
-RoutableFactories50::SearchResultMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
-{
-    const SearchResultMessage &msg = static_cast<const SearchResultMessage&>(obj);
-
-    int len = msg.getSerializedSize();
-    char *tmp = buf.allocate(len);
-    document::ByteBuffer dbuf(tmp, len);
-    msg.serialize(dbuf);
-
-    return true;
-}
-
-DocumentMessage::UP
-RoutableFactories50::QueryResultMessageFactory::doDecode(document::ByteBuffer &buf) const
-{
-    auto msg = std::make_unique<QueryResultMessage>();
-    msg->getSearchResult().deserialize(buf);
-    msg->getDocumentSummary().deserialize(buf);
-
-    return msg;
-}
-
-bool
-RoutableFactories50::QueryResultMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
-{
-    const QueryResultMessage &msg = static_cast<const QueryResultMessage&>(obj);
-
-    int len = msg.getSearchResult().getSerializedSize() + msg.getDocumentSummary().getSerializedSize();
-    char *tmp = buf.allocate(len);
-    document::ByteBuffer dbuf(tmp, len);
-    msg.getSearchResult().serialize(dbuf);
-    msg.getDocumentSummary().serialize(dbuf);
-
-    return true;
-}
-
-DocumentReply::UP
-RoutableFactories50::SearchResultReplyFactory::doDecode(document::ByteBuffer &) const
-{
-    return std::make_unique<VisitorReply>(DocumentProtocol::REPLY_SEARCHRESULT);
-}
-
-bool
-RoutableFactories50::SearchResultReplyFactory::doEncode(const DocumentReply &, vespalib::GrowableByteBuffer &) const
-{
-    return true;
-}
-
-DocumentReply::UP
-RoutableFactories50::QueryResultReplyFactory::doDecode(document::ByteBuffer &) const
-{
-    return std::make_unique<VisitorReply>(DocumentProtocol::REPLY_QUERYRESULT);
-}
-
-bool
-RoutableFactories50::QueryResultReplyFactory::doEncode(const DocumentReply &, vespalib::GrowableByteBuffer &) const
-{
-    return true;
-}
-
-bool RoutableFactories50::StatBucketMessageFactory::encodeBucketSpace(vespalib::stringref bucketSpace,
-                                                                      vespalib::GrowableByteBuffer& ) const
-{
-    return (bucketSpace == FixedBucketSpaces::default_space_name());
-}
-
-string RoutableFactories50::StatBucketMessageFactory::decodeBucketSpace(document::ByteBuffer&) const {
-    return FixedBucketSpaces::default_space_name();
-}
-
-DocumentMessage::UP
-RoutableFactories50::StatBucketMessageFactory::doDecode(document::ByteBuffer &buf) const
-{
-    auto msg = std::make_unique<StatBucketMessage>();
-
-    msg->setBucketId(document::BucketId(decodeLong(buf)));
-    msg->setDocumentSelection(decodeString(buf));
-    msg->setBucketSpace(decodeBucketSpace(buf));
-
-    return msg;
-}
-
-bool
-RoutableFactories50::StatBucketMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
-{
-    const StatBucketMessage &msg = static_cast<const StatBucketMessage&>(obj);
-
-    buf.putLong(msg.getBucketId().getRawId());
-    buf.putString(msg.getDocumentSelection());
-    return encodeBucketSpace(msg.getBucketSpace(), buf);
-}
-
-DocumentReply::UP
-RoutableFactories50::StatBucketReplyFactory::doDecode(document::ByteBuffer &buf) const
-{
-    auto reply = std::make_unique<StatBucketReply>();
-    reply->setResults(decodeString(buf));
-    return reply;
-}
-
-bool
-RoutableFactories50::StatBucketReplyFactory::doEncode(const DocumentReply &obj, vespalib::GrowableByteBuffer &buf) const
-{
-    const StatBucketReply &reply = static_cast<const StatBucketReply&>(obj);
-    buf.putString(reply.getResults());
-    return true;
-}
-
-DocumentMessage::UP
-RoutableFactories50::StatDocumentMessageFactory::doDecode(document::ByteBuffer &) const
-{
-    return DocumentMessage::UP(); // TODO: remove message type
-}
-
-bool
-RoutableFactories50::StatDocumentMessageFactory::doEncode(const DocumentMessage &, vespalib::GrowableByteBuffer &) const
-{
-    return false;
-}
-
-DocumentReply::UP
-RoutableFactories50::StatDocumentReplyFactory::doDecode(document::ByteBuffer &) const
-{
-    return DocumentReply::UP(); // TODO: remove reply type
-}
-
-bool
-RoutableFactories50::StatDocumentReplyFactory::doEncode(const DocumentReply &, vespalib::GrowableByteBuffer &) const
-{
-    return false;
-}
-
-void
-RoutableFactories50::UpdateDocumentMessageFactory::decodeInto(UpdateDocumentMessage & msg, document::ByteBuffer & buf) const {
-    msg.setDocumentUpdate(document::DocumentUpdate::createHEAD(_repo, buf));
-    msg.setOldTimestamp(static_cast<uint64_t>(decodeLong(buf)));
-    msg.setNewTimestamp(static_cast<uint64_t>(decodeLong(buf)));
-}
-
-bool
-RoutableFactories50::UpdateDocumentMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
-{
-    const UpdateDocumentMessage &msg = static_cast<const UpdateDocumentMessage&>(obj);
-
-    vespalib::nbostream stream;
-    msg.getDocumentUpdate().serializeHEAD(stream);
-    buf.putBytes(stream.peek(), stream.size());
-    buf.putLong((int64_t)msg.getOldTimestamp());
-    buf.putLong((int64_t)msg.getNewTimestamp());
-
-    return true;
-}
-
-DocumentReply::UP
-RoutableFactories50::UpdateDocumentReplyFactory::doDecode(document::ByteBuffer &buf) const
-{
-    auto reply = std::make_unique<UpdateDocumentReply>();
-    reply->setWasFound(decodeBoolean(buf));
-    reply->setHighestModificationTimestamp(decodeLong(buf));
-    return reply;
-}
-
-bool
-RoutableFactories50::UpdateDocumentReplyFactory::doEncode(const DocumentReply &obj, vespalib::GrowableByteBuffer &buf) const
-{
-    const UpdateDocumentReply &reply = static_cast<const UpdateDocumentReply&>(obj);
-    buf.putBoolean(reply.getWasFound());
-    buf.putLong(reply.getHighestModificationTimestamp());
-    return true;
-}
-
-DocumentMessage::UP
-RoutableFactories50::VisitorInfoMessageFactory::doDecode(document::ByteBuffer &buf) const
-{
-    auto msg = std::make_unique<VisitorInfoMessage>();
-
-    int32_t len = decodeInt(buf);
-    msg->getFinishedBuckets().reserve(len);
-    for (int32_t i = 0; i < len; i++) {
-        int64_t val;
-        buf.getLong(val); // NOT using getLongNetwork
-        msg->getFinishedBuckets().emplace_back(val);
-    }
-    msg->setErrorMessage(decodeString(buf));
-
-    return msg;
-}
-
-bool
-RoutableFactories50::VisitorInfoMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
-{
-    const VisitorInfoMessage &msg = static_cast<const VisitorInfoMessage&>(obj);
-
-    buf.putInt(msg.getFinishedBuckets().size());
-    for (const auto & bucketId : msg.getFinishedBuckets()) {
-        uint64_t val = bucketId.getRawId();
-        buf.putBytes((const char*)&val, 8);
-    }
-    buf.putString(msg.getErrorMessage());
-
-    return true;
-}
-
-DocumentReply::UP
-RoutableFactories50::VisitorInfoReplyFactory::doDecode(document::ByteBuffer &) const
-{
-    return std::make_unique<VisitorReply>(DocumentProtocol::REPLY_VISITORINFO);
-}
-
-bool
-RoutableFactories50::VisitorInfoReplyFactory::doEncode(const DocumentReply &, vespalib::GrowableByteBuffer &) const
-{
-    return true;
-}
-
-DocumentReply::UP
-RoutableFactories50::WrongDistributionReplyFactory::doDecode(document::ByteBuffer &buf) const
-{
-    auto reply = std::make_unique<WrongDistributionReply>();
-    reply->setSystemState(decodeString(buf));
-    return reply;
-}
-
-bool
-RoutableFactories50::WrongDistributionReplyFactory::doEncode(const DocumentReply &obj, vespalib::GrowableByteBuffer &buf) const
-{
-    const WrongDistributionReply &reply = static_cast<const WrongDistributionReply&>(obj);
-    buf.putString(reply.getSystemState());
-    return true;
-}
-
-}
diff --git a/documentapi/src/vespa/documentapi/messagebus/routablefactories50.h b/documentapi/src/vespa/documentapi/messagebus/routablefactories50.h
deleted file mode 100644
index d947cb73cde..00000000000
--- a/documentapi/src/vespa/documentapi/messagebus/routablefactories50.h
+++ /dev/null
@@ -1,415 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#pragma once
-
-#include "routablefactories42.h"
-#include "iroutablefactory.h"
-#include <vespa/documentapi/messagebus/messages/putdocumentmessage.h>
-#include <vespa/documentapi/messagebus/messages/removedocumentmessage.h>
-#include <vespa/documentapi/messagebus/messages/updatedocumentmessage.h>
-
-namespace document { class DocumentTypeRepo; }
-
-/**
- * Utility class for invoking setApproxSize on a DocumentMessage with the delta
- * between the read position of a ByteBuffer at construction and destruction
- * time. The assumption being made is that the in-memory footprint of a message
- * is reasonably close to its wire-serialized form.
- */
-class ScopedApproxSizeSetter {
-public:
-    ScopedApproxSizeSetter(documentapi::DocumentMessage& msg,
-                           const document::ByteBuffer& buf)
-        : _msg(msg),
-          _buf(buf),
-          _posBefore(_buf.getPos())
-    {
-    }
-
-    ~ScopedApproxSizeSetter() {
-        _msg.setApproxSize(static_cast<uint32_t>(_buf.getPos() - _posBefore));
-    }
-
-private:
-    documentapi::DocumentMessage& _msg;
-    const document::ByteBuffer& _buf;
-    const size_t _posBefore;
-};
-
-namespace documentapi {
-
-template<typename MessageType, typename FactoryType>
-DocumentMessage::UP
-decodeMessage(const FactoryType * self, document::ByteBuffer & buf) {
-    auto msg = std::make_unique<MessageType>();
-    ScopedApproxSizeSetter sizeSetter(*msg, buf);
-    self->decodeInto(*msg, buf);
-    return msg;
-}
-
-/**
- * This class encapsulates all the {@link RoutableFactory} classes needed to implement factories for the document
- * routable. When adding new factories to this class, please KEEP THE THEM ORDERED alphabetically like they are now.
- */
-class RoutableFactories50 {
-public:
-    RoutableFactories50() = delete;
-
-    /**
-     * Implements the shared factory logic required for {@link DocumentMessage} objects, and it offers a more
-     * convenient interface for implementing {@link RoutableFactory}.
-     */
-    class DocumentMessageFactory : public IRoutableFactory {
-    protected:
-        /**
-         * This method encodes the given message into the given byte buffer. You are guaranteed to only receive messages of
-         * the type that this factory was registered for.
-         *
-         * This method is NOT exception safe. Return false to signal failure.
-         *
-         * @param msg The message to encode.
-         * @param buf The byte buffer to write to.
-         * @return True if the message was encoded.
-         */
-        virtual bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const = 0;
-
-        /**
-         * This method decodes a message from the given byte buffer. You are guaranteed to only receive byte buffers
-         * generated by a previous call to {@link #doEncode(DocumentMessage, GrowableByteBuffer)}.
-         *
-         * This method is NOT exception safe. Return null to signal failure.
-         *
-         * @param buf The byte buffer to read from.
-         * @return The decoded message.
-         */
-        virtual DocumentMessage::UP doDecode(document::ByteBuffer &buf) const = 0;
-
-    public:
-        bool encode(const mbus::Routable &obj, vespalib::GrowableByteBuffer &out) const override;
-        mbus::Routable::UP decode(document::ByteBuffer &in, const LoadTypeSet& loadTypes) const override;
-    };
-
-    /**
-     * Implements the shared factory logic required for {@link DocumentReply} objects, and it offers a more
-     * convenient interface for implementing {@link RoutableFactory}.
-     */
-    class DocumentReplyFactory : public IRoutableFactory {
-    protected:
-        /**
-         * This method encodes the given reply into the given byte buffer. You are guaranteed to only receive
-         * replies of the type that this factory was registered for.
-         *
-         * This method is NOT exception safe. Return false to signal failure.
-         *
-         * @param reply The reply to encode.
-         * @param buf The byte buffer to write to.
-         * @return True if the message was encoded.
-         */
-        virtual bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const = 0;
-
-        /**
-         * This method decodes a reply from the given byte buffer. You are guaranteed to only receive byte buffers
-         * generated by a previous call to {@link #doEncode(DocumentReply, GrowableByteBuffer)}.
-         *
-         * This method is NOT exception safe. Return null to signal failure.
-         *
-         * @param buf The byte buffer to read from.
-         * @return The decoded reply.
-         */
-        virtual DocumentReply::UP doDecode(document::ByteBuffer &buf) const = 0;
-
-    public:
-        bool encode(const mbus::Routable &obj, vespalib::GrowableByteBuffer &out) const override;
-        mbus::Routable::UP decode(document::ByteBuffer &in, const LoadTypeSet& loadTypes) const override;
-    };
-
-    ////////////////////////////////////////////////////////////////////////////////
-    //
-    // Factories
-    //
-    ////////////////////////////////////////////////////////////////////////////////
-    class CreateVisitorMessageFactory : public DocumentMessageFactory {
-        const document::DocumentTypeRepo &_repo;
-    protected:
-        DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override;
-        bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override;
-    public:
-        CreateVisitorMessageFactory(const document::DocumentTypeRepo &r) : _repo(r) {}
-    };
-    class CreateVisitorReplyFactory : public DocumentReplyFactory {
-    protected:
-        DocumentReply::UP doDecode(document::ByteBuffer &buf) const override;
-        bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override;
-    };
-    class DestroyVisitorMessageFactory : public DocumentMessageFactory {
-    protected:
-        DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override;
-        bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override;
-    };
-    class DestroyVisitorReplyFactory : public DocumentReplyFactory {
-    protected:
-        DocumentReply::UP doDecode(document::ByteBuffer &buf) const override;
-        bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override;
-    };
-    class DocumentListMessageFactory : public DocumentMessageFactory {
-        const document::DocumentTypeRepo &_repo;
-        DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override;
-        bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override;
-    public:
-        DocumentListMessageFactory(const document::DocumentTypeRepo &r)
-            : _repo(r) {}
-    };
-    class DocumentListReplyFactory : public DocumentReplyFactory {
-    protected:
-        DocumentReply::UP doDecode(document::ByteBuffer &buf) const override;
-        bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override;
-    };
-    class DocumentSummaryMessageFactory : public DocumentMessageFactory {
-    protected:
-        DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override;
-        bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override;
-    };
-    class DocumentSummaryReplyFactory : public DocumentReplyFactory {
-    protected:
-        DocumentReply::UP doDecode(document::ByteBuffer &buf) const override;
-        bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override;
-    };
-    class EmptyBucketsMessageFactory : public DocumentMessageFactory {
-    protected:
-        DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override;
-        bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override;
-    };
-    class EmptyBucketsReplyFactory : public DocumentReplyFactory {
-    protected:
-        DocumentReply::UP doDecode(document::ByteBuffer &buf) const override;
-        bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override;
-    };
-    class GetBucketListMessageFactory : public DocumentMessageFactory {
-        virtual bool encodeBucketSpace(vespalib::stringref bucketSpace, vespalib::GrowableByteBuffer& buf) const;
-        virtual string decodeBucketSpace(document::ByteBuffer&) const;
-    protected:
-        DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override;
-        bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override;
-    };
-    class GetBucketListReplyFactory : public DocumentReplyFactory {
-    protected:
-        DocumentReply::UP doDecode(document::ByteBuffer &buf) const override;
-        bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override;
-    };
-    class GetBucketStateMessageFactory : public DocumentMessageFactory {
-    protected:
-        DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override;
-        bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override;
-    };
-    class GetBucketStateReplyFactory : public DocumentReplyFactory {
-    protected:
-        DocumentReply::UP doDecode(document::ByteBuffer &buf) const override;
-        bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override;
-    };
-    class GetDocumentMessageFactory : public DocumentMessageFactory {
-    protected:
-        DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override;
-        bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override;
-    };
-    class GetDocumentReplyFactory : public DocumentReplyFactory {
-        const document::DocumentTypeRepo &_repo;
-        DocumentReply::UP doDecode(document::ByteBuffer &buf) const override;
-        bool doEncode(const DocumentReply &msg, vespalib::GrowableByteBuffer &buf) const override;
-    public:
-        GetDocumentReplyFactory(const document::DocumentTypeRepo &r) : _repo(r) {}
-    };
-    class MapVisitorMessageFactory : public DocumentMessageFactory {
-        const document::DocumentTypeRepo &_repo;
-    protected:
-        DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override;
-        bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override;
-    public:
-        MapVisitorMessageFactory(const document::DocumentTypeRepo &r) : _repo(r) {}
-    };
-    class MapVisitorReplyFactory : public DocumentReplyFactory {
-    protected:
-        DocumentReply::UP doDecode(document::ByteBuffer &buf) const override;
-        bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override;
-    };
-    class PutDocumentMessageFactory : public DocumentMessageFactory {
-    protected:
-        const document::DocumentTypeRepo &_repo;
-        DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override {
-            return decodeMessage<PutDocumentMessage>(this, buf);
-        }
-
-        bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override;
-    public:
-        void decodeInto(PutDocumentMessage & msg, document::ByteBuffer & buf) const;
-        PutDocumentMessageFactory(const document::DocumentTypeRepo &r) : _repo(r) {}
-    };
-    class PutDocumentReplyFactory : public DocumentReplyFactory {
-    protected:
-        DocumentReply::UP doDecode(document::ByteBuffer &buf) const override;
-        bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override;
-    };
-    class RemoveDocumentMessageFactory : public DocumentMessageFactory {
-    protected:
-        DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override {
-            return decodeMessage<RemoveDocumentMessage>(this, buf);
-        }
-
-        bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override;
-    public:
-        void decodeInto(RemoveDocumentMessage & msg, document::ByteBuffer & buf) const;
-    };
-    class RemoveDocumentReplyFactory : public DocumentReplyFactory {
-    protected:
-        DocumentReply::UP doDecode(document::ByteBuffer &buf) const override;
-        bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override;
-    };
-    class RemoveLocationMessageFactory : public DocumentMessageFactory {
-        const document::DocumentTypeRepo &_repo;
-        DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override;
-        bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override;
-    public:
-        RemoveLocationMessageFactory(const document::DocumentTypeRepo &r) : _repo(r) {}
-    };
-    class RemoveLocationReplyFactory : public DocumentReplyFactory {
-    protected:
-        DocumentReply::UP doDecode(document::ByteBuffer &buf) const override;
-        bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override;
-    };
-    class SearchResultMessageFactory : public DocumentMessageFactory {
-    protected:
-        DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override;
-        bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override;
-    };
-    class SearchResultReplyFactory : public DocumentReplyFactory {
-    protected:
-        DocumentReply::UP doDecode(document::ByteBuffer &buf) const override;
-        bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override;
-    };
-    class StatBucketMessageFactory : public DocumentMessageFactory {
-        virtual bool encodeBucketSpace(vespalib::stringref bucketSpace, vespalib::GrowableByteBuffer& buf) const;
-        virtual string decodeBucketSpace(document::ByteBuffer&) const;
-    protected:
-        DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override;
-        bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override;
-    };
-    class StatBucketReplyFactory : public DocumentReplyFactory {
-    protected:
-        DocumentReply::UP doDecode(document::ByteBuffer &buf) const override;
-        bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override;
-    };
-    class StatDocumentMessageFactory : public DocumentMessageFactory {
-    protected:
-        DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override;
-        bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override;
-    };
-    class StatDocumentReplyFactory : public DocumentReplyFactory {
-    protected:
-        DocumentReply::UP doDecode(document::ByteBuffer &buf) const override;
-        bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override;
-    };
-    class UpdateDocumentMessageFactory : public DocumentMessageFactory {
-    protected:
-        const document::DocumentTypeRepo &_repo;
-        DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override {
-            return decodeMessage<UpdateDocumentMessage>(this, buf);
-        }
-
-        bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override;
-    public:
-        void decodeInto(UpdateDocumentMessage & msg, document::ByteBuffer & buf) const;
-        UpdateDocumentMessageFactory(const document::DocumentTypeRepo &r) : _repo(r) {}
-    };
-    class UpdateDocumentReplyFactory : public DocumentReplyFactory {
-    protected:
-        DocumentReply::UP doDecode(document::ByteBuffer &buf) const override;
-        bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override;
-    };
-    class VisitorInfoMessageFactory : public DocumentMessageFactory {
-    protected:
-        DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override;
-        bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override;
-    };
-    class VisitorInfoReplyFactory : public DocumentReplyFactory {
-    protected:
-        DocumentReply::UP doDecode(document::ByteBuffer &buf) const override;
-        bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override;
-    };
-    class WrongDistributionReplyFactory : public DocumentReplyFactory {
-    protected:
-        DocumentReply::UP doDecode(document::ByteBuffer &buf) const override;
-        bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override;
-    };
-    class QueryResultMessageFactory : public DocumentMessageFactory {
-    protected:
-        DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override;
-        bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override;
-    };
-    class QueryResultReplyFactory : public DocumentReplyFactory {
-    protected:
-        DocumentReply::UP doDecode(document::ByteBuffer &buf) const override;
-        bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override;
-    };
-
-    ///////////////////////////////////////////////////////////////////////////
-    //
-    // Utilities
-    //
-    ///////////////////////////////////////////////////////////////////////////
-
-    /**
-     * This is a complement for the vespalib::GrowableByteBuffer.putString() method.
-     *
-     * @param in The byte buffer to read from.
-     * @return The decoded string.
-     */
-    static string decodeString(document::ByteBuffer &in)
-    { return RoutableFactories42::decodeString(in); }
-
-    /**
-     * This is a complement for the vespalib::GrowableByteBuffer.putBoolean() method.
-     *
-     * @param in The byte buffer to read from.
-     * @return The decoded bool.
-     */
-    static bool decodeBoolean(document::ByteBuffer &in)
-    { return RoutableFactories42::decodeBoolean(in); }
-
-    /**
-     * Convenience method to decode a 32-bit int from the given byte buffer.
-     *
-     * @param in The byte buffer to read from.
-     * @return The decoded int.
-     */
-    static int32_t decodeInt(document::ByteBuffer &in)
-    { return RoutableFactories42::decodeInt(in); }
-
-    /**
-     * Convenience method to decode a 64-bit int from the given byte buffer.
-     *
-     * @param in The byte buffer to read from.
-     * @return The decoded int.
-     */
-    static int64_t decodeLong(document::ByteBuffer &in)
-    { return RoutableFactories42::decodeLong(in); }
-
-
-    /**
-     * Convenience method to decode a document id from the given byte buffer.
-     *
-     * @param in The byte buffer to read from.
-     * @return The decoded document id.
-     */
-    static document::DocumentId decodeDocumentId(document::ByteBuffer &in)
-    { return RoutableFactories42::decodeDocumentId(in); }
-
-    /**
-     * Convenience method to encode a document id to the given byte buffer.
-     *
-     * @param id  The document id to encode.
-     * @param out The byte buffer to write to.
-     */
-    static void encodeDocumentId(const document::DocumentId &id,
-                                 vespalib::GrowableByteBuffer &out)
-    { return RoutableFactories42::encodeDocumentId(id, out); }
-};
-
-}
diff --git a/documentapi/src/vespa/documentapi/messagebus/routablefactories52.cpp b/documentapi/src/vespa/documentapi/messagebus/routablefactories52.cpp
index 89f6e9c1fe1..6a49d812957 100644
--- a/documentapi/src/vespa/documentapi/messagebus/routablefactories52.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/routablefactories52.cpp
@@ -2,67 +2,939 @@
 // @author Vegard Sjonfjell
 
 #include "routablefactories52.h"
+#include <vespa/document/bucket/bucketidfactory.h>
+#include <vespa/document/bucket/fixed_bucket_spaces.h>
+#include <vespa/document/select/parser.h>
+#include <vespa/document/update/documentupdate.h>
 #include <vespa/documentapi/documentapi.h>
+#include <vespa/documentapi/loadtypes/loadtypeset.h>
 #include <vespa/vespalib/objects/nbostream.h>
 
+using document::FixedBucketSpaces;
 using vespalib::nbostream;
 using std::make_shared;
 using std::make_unique;
 
 namespace documentapi {
 
+bool
+RoutableFactories52::DocumentMessageFactory::encode(const mbus::Routable &obj, vespalib::GrowableByteBuffer &out) const
+{
+    const DocumentMessage &msg = static_cast<const DocumentMessage&>(obj);
+    out.putByte(msg.getPriority());
+    out.putInt(msg.getLoadType().getId());
+    return doEncode(msg, out);
+}
+
+mbus::Routable::UP
+RoutableFactories52::DocumentMessageFactory::decode(document::ByteBuffer &in, const LoadTypeSet& loadTypes) const
+{
+    uint8_t pri;
+    in.getByte(pri);
+    uint32_t loadClass = decodeInt(in);
+
+    DocumentMessage::UP msg = doDecode(in);
+    if (msg) {
+        msg->setPriority((Priority::Value)pri);
+        msg->setLoadType(loadTypes[loadClass]);
+    }
+
+    return mbus::Routable::UP(msg.release());
+}
+
+bool
+RoutableFactories52::DocumentReplyFactory::encode(const mbus::Routable &obj, vespalib::GrowableByteBuffer &out) const
+{
+    const DocumentReply &msg = static_cast<const DocumentReply&>(obj);
+    out.putByte(msg.getPriority());
+    return doEncode(msg, out);
+}
+
+mbus::Routable::UP
+RoutableFactories52::DocumentReplyFactory::decode(document::ByteBuffer &in, const LoadTypeSet&) const
+{
+    uint8_t pri;
+    in.getByte(pri);
+    DocumentReply::UP reply = doDecode(in);
+    if (reply) {
+        reply->setPriority((Priority::Value)pri);
+    }
+    return mbus::Routable::UP(reply.release());
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+// Factories
+//
+////////////////////////////////////////////////////////////////////////////////
+
+DocumentMessage::UP
+RoutableFactories52::CreateVisitorMessageFactory::doDecode(document::ByteBuffer &buf) const
+{
+    auto msg = std::make_unique<CreateVisitorMessage>();
+
+    msg->setLibraryName(decodeString(buf));
+    msg->setInstanceId(decodeString(buf));
+    msg->setControlDestination(decodeString(buf));
+    msg->setDataDestination(decodeString(buf));
+    msg->setDocumentSelection(decodeString(buf));
+    msg->setMaximumPendingReplyCount(decodeInt(buf));
+
+    int32_t len = decodeInt(buf);
+    msg->getBuckets().reserve(len);
+    for (int32_t i = 0; i < len; i++) {
+        int64_t val;
+        buf.getLong(val); // NOT using getLongNetwork
+        msg->getBuckets().push_back(document::BucketId(val));
+    }
+
+    msg->setFromTimestamp(decodeLong(buf));
+    msg->setToTimestamp(decodeLong(buf));
+    msg->setVisitRemoves(decodeBoolean(buf));
+    msg->setFieldSet(decodeString(buf));
+    msg->setVisitInconsistentBuckets(decodeBoolean(buf));
+    msg->getParameters().deserialize(_repo, buf);
+    msg->setVisitorDispatcherVersion(50);
+    msg->setVisitorOrdering((document::OrderingSpecification::Order)decodeInt(buf));
+    msg->setMaxBucketsPerVisitor(decodeInt(buf));
+    msg->setBucketSpace(decodeBucketSpace(buf));
+
+    return msg;
+}
+
+bool
+RoutableFactories52::CreateVisitorMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
+{
+    const CreateVisitorMessage &msg = static_cast<const CreateVisitorMessage&>(obj);
+
+    buf.putString(msg.getLibraryName());
+    buf.putString(msg.getInstanceId());
+    buf.putString(msg.getControlDestination());
+    buf.putString(msg.getDataDestination());
+    buf.putString(msg.getDocumentSelection());
+    buf.putInt(msg.getMaximumPendingReplyCount());
+    buf.putInt(msg.getBuckets().size());
+
+    for (const auto & bucketId : msg.getBuckets()) {
+        uint64_t val = bucketId.getRawId();
+        buf.putBytes((const char*)&val, 8);
+    }
+
+    buf.putLong(msg.getFromTimestamp());
+    buf.putLong(msg.getToTimestamp());
+    buf.putBoolean(msg.visitRemoves());
+    buf.putString(msg.getFieldSet());
+    buf.putBoolean(msg.visitInconsistentBuckets());
+
+    int len = msg.getParameters().getSerializedSize();
+    char *tmp = buf.allocate(len);
+    document::ByteBuffer dbuf(tmp, len);
+    msg.getParameters().serialize(dbuf);
+
+    buf.putInt(msg.getVisitorOrdering());
+    buf.putInt(msg.getMaxBucketsPerVisitor());
+    return encodeBucketSpace(msg.getBucketSpace(), buf);
+}
+
+bool RoutableFactories52::CreateVisitorMessageFactory::encodeBucketSpace(
+        vespalib::stringref bucketSpace,
+        vespalib::GrowableByteBuffer& buf) const {
+    (void) buf;
+    return (bucketSpace == FixedBucketSpaces::default_space_name());
+}
+
+string RoutableFactories52::CreateVisitorMessageFactory::decodeBucketSpace(document::ByteBuffer&) const {
+    return FixedBucketSpaces::default_space_name();
+}
+
+DocumentMessage::UP
+RoutableFactories52::DestroyVisitorMessageFactory::doDecode(document::ByteBuffer &buf) const
+{
+    auto msg = std::make_unique<DestroyVisitorMessage>();
+    msg->setInstanceId(decodeString(buf));
+    return msg;
+}
+
+bool
+RoutableFactories52::DestroyVisitorMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
+{
+    const DestroyVisitorMessage &msg = static_cast<const DestroyVisitorMessage&>(obj);
+    buf.putString(msg.getInstanceId());
+    return true;
+}
+
+DocumentReply::UP
+RoutableFactories52::CreateVisitorReplyFactory::doDecode(document::ByteBuffer &buf) const
+{
+    auto reply = std::make_unique<CreateVisitorReply>(DocumentProtocol::REPLY_CREATEVISITOR);
+    reply->setLastBucket(document::BucketId((uint64_t)decodeLong(buf)));
+    vdslib::VisitorStatistics vs;
+    vs.setBucketsVisited(decodeInt(buf));
+    vs.setDocumentsVisited(decodeLong(buf));
+    vs.setBytesVisited(decodeLong(buf));
+    vs.setDocumentsReturned(decodeLong(buf));
+    vs.setBytesReturned(decodeLong(buf));
+    vs.setSecondPassDocumentsReturned(decodeLong(buf));
+    vs.setSecondPassBytesReturned(decodeLong(buf));
+    reply->setVisitorStatistics(vs);
+
+    return reply;
+}
+
+bool
+RoutableFactories52::CreateVisitorReplyFactory::doEncode(const DocumentReply &obj, vespalib::GrowableByteBuffer &buf) const
+{
+    const CreateVisitorReply &reply = static_cast<const CreateVisitorReply&>(obj);
+    buf.putLong(reply.getLastBucket().getRawId());
+    buf.putInt(reply.getVisitorStatistics().getBucketsVisited());
+    buf.putLong(reply.getVisitorStatistics().getDocumentsVisited());
+    buf.putLong(reply.getVisitorStatistics().getBytesVisited());
+    buf.putLong(reply.getVisitorStatistics().getDocumentsReturned());
+    buf.putLong(reply.getVisitorStatistics().getBytesReturned());
+    buf.putLong(reply.getVisitorStatistics().getSecondPassDocumentsReturned());
+    buf.putLong(reply.getVisitorStatistics().getSecondPassBytesReturned());
+    return true;
+}
+
+DocumentReply::UP
+RoutableFactories52::DestroyVisitorReplyFactory::doDecode(document::ByteBuffer &) const
+{
+    return std::make_unique<VisitorReply>(DocumentProtocol::REPLY_DESTROYVISITOR);
+}
+
+bool
+RoutableFactories52::DestroyVisitorReplyFactory::doEncode(const DocumentReply &, vespalib::GrowableByteBuffer &) const
+{
+    return true;
+}
+
+DocumentReply::UP
+RoutableFactories52::DocumentIgnoredReplyFactory::doDecode(document::ByteBuffer& buf) const
+{
+    (void) buf;
+    return DocumentReply::UP(new DocumentIgnoredReply());
+}
+
+bool
+RoutableFactories52::DocumentIgnoredReplyFactory::doEncode(
+        const DocumentReply& obj,
+        vespalib::GrowableByteBuffer& buf) const
+{
+    (void) obj;
+    (void) buf;
+    return true;
+}
+
+DocumentMessage::UP
+RoutableFactories52::DocumentListMessageFactory::doDecode(document::ByteBuffer &buf) const
+{
+    auto msg = std::make_unique<DocumentListMessage>();
+    msg->setBucketId(document::BucketId(decodeLong(buf)));
+
+    int32_t len = decodeInt(buf);
+    for (int32_t i = 0; i < len; i++) {
+        DocumentListMessage::Entry entry(_repo, buf);
+        msg->getDocuments().push_back(entry);
+    }
+
+    return msg;
+}
+
+bool
+RoutableFactories52::DocumentListMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
+{
+    const DocumentListMessage &msg = static_cast<const DocumentListMessage&>(obj);
+
+    buf.putLong(msg.getBucketId().getRawId());
+    buf.putInt(msg.getDocuments().size());
+    for (const auto & document : msg.getDocuments()) {
+        int len = document.getSerializedSize();
+        char *tmp = buf.allocate(len);
+        document::ByteBuffer dbuf(tmp, len);
+        document.serialize(dbuf);
+    }
+
+    return true;
+}
+
+DocumentReply::UP
+RoutableFactories52::DocumentListReplyFactory::doDecode(document::ByteBuffer &) const
+{
+    return std::make_unique<VisitorReply>(DocumentProtocol::REPLY_DOCUMENTLIST);
+}
+
+bool
+RoutableFactories52::DocumentListReplyFactory::doEncode(const DocumentReply &, vespalib::GrowableByteBuffer &) const
+{
+    return true;
+}
+
+DocumentMessage::UP
+RoutableFactories52::DocumentSummaryMessageFactory::doDecode(document::ByteBuffer &buf) const
+{
+    auto msg = std::make_unique<DocumentSummaryMessage>();
+
+    msg->deserialize(buf);
+
+    return msg;
+}
+
+bool
+RoutableFactories52::DocumentSummaryMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
+{
+    const DocumentSummaryMessage &msg = static_cast<const DocumentSummaryMessage&>(obj);
+
+    int32_t len = msg.getSerializedSize();
+    char *tmp = buf.allocate(len);
+    document::ByteBuffer dbuf(tmp, len);
+    msg.serialize(dbuf);
+
+    return true;
+}
+
+DocumentReply::UP
+RoutableFactories52::DocumentSummaryReplyFactory::doDecode(document::ByteBuffer &) const
+{
+    return std::make_unique<VisitorReply>(DocumentProtocol::REPLY_DOCUMENTSUMMARY);
+}
+
+bool
+RoutableFactories52::DocumentSummaryReplyFactory::doEncode(const DocumentReply &, vespalib::GrowableByteBuffer &) const
+{
+    return true;
+}
+
+DocumentMessage::UP
+RoutableFactories52::EmptyBucketsMessageFactory::doDecode(document::ByteBuffer &buf) const
+{
+    auto msg = std::make_unique<EmptyBucketsMessage>();
+
+    int32_t len = decodeInt(buf);
+    std::vector<document::BucketId> buckets(len);
+    for (int32_t i = 0; i < len; ++i) {
+        buckets[i] = document::BucketId(decodeLong(buf));
+    }
+    msg->getBucketIds().swap(buckets);
+
+    return msg;
+}
+
+bool
+RoutableFactories52::EmptyBucketsMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
+{
+    const EmptyBucketsMessage &msg = static_cast<const EmptyBucketsMessage&>(obj);
+
+    buf.putInt(msg.getBucketIds().size());
+    for (const auto & bucketId : msg.getBucketIds()) {
+        buf.putLong(bucketId.getRawId());
+    }
+
+    return true;
+}
+
+DocumentReply::UP
+RoutableFactories52::EmptyBucketsReplyFactory::doDecode(document::ByteBuffer &) const
+{
+    return std::make_unique<VisitorReply>(DocumentProtocol::REPLY_EMPTYBUCKETS);
+}
+
+bool
+RoutableFactories52::EmptyBucketsReplyFactory::doEncode(const DocumentReply &, vespalib::GrowableByteBuffer &) const
+{
+    return true;
+}
+
+bool RoutableFactories52::GetBucketListMessageFactory::encodeBucketSpace(vespalib::stringref bucketSpace,
+                                                                         vespalib::GrowableByteBuffer& ) const
+{
+    return (bucketSpace == FixedBucketSpaces::default_space_name());
+}
+
+string RoutableFactories52::GetBucketListMessageFactory::decodeBucketSpace(document::ByteBuffer&) const {
+    return FixedBucketSpaces::default_space_name();
+}
+
+DocumentMessage::UP
+RoutableFactories52::GetBucketListMessageFactory::doDecode(document::ByteBuffer &buf) const
+{
+    document::BucketId bucketId(decodeLong(buf));
+    auto msg = std::make_unique<GetBucketListMessage>(bucketId);
+    msg->setBucketSpace(decodeBucketSpace(buf));
+    return msg;
+}
+
+bool
+RoutableFactories52::GetBucketListMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
+{
+    const GetBucketListMessage &msg = static_cast<const GetBucketListMessage&>(obj);
+    buf.putLong(msg.getBucketId().getRawId());
+    return encodeBucketSpace(msg.getBucketSpace(), buf);
+}
+
+DocumentReply::UP
+RoutableFactories52::GetBucketListReplyFactory::doDecode(document::ByteBuffer &buf) const
+{
+    auto reply = std::make_unique<GetBucketListReply>();
+
+    int32_t len = decodeInt(buf);
+    reply->getBuckets().reserve(len);
+    for (int32_t i = 0; i < len; i++) {
+        GetBucketListReply::BucketInfo info;
+        info._bucket = document::BucketId((uint64_t)decodeLong(buf));
+        info._bucketInformation = decodeString(buf);
+        reply->getBuckets().push_back(info);
+    }
+
+    return reply;
+}
+
+bool
+RoutableFactories52::GetBucketListReplyFactory::doEncode(const DocumentReply &obj, vespalib::GrowableByteBuffer &buf) const
+{
+    const GetBucketListReply &reply = static_cast<const GetBucketListReply&>(obj);
+
+    const std::vector<GetBucketListReply::BucketInfo> &buckets = reply.getBuckets();
+    buf.putInt(buckets.size());
+    for (const auto & bucketInfo : buckets) {
+        buf.putLong(bucketInfo._bucket.getRawId());
+        buf.putString(bucketInfo._bucketInformation);
+    }
+
+    return true;
+}
+
+DocumentMessage::UP
+RoutableFactories52::GetBucketStateMessageFactory::doDecode(document::ByteBuffer &buf) const
+{
+    auto msg = std::make_unique<GetBucketStateMessage>();
+
+    msg->setBucketId(document::BucketId((uint64_t)decodeLong(buf)));
+
+    return msg;
+}
+
+bool
+RoutableFactories52::GetBucketStateMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
+{
+    const GetBucketStateMessage &msg = static_cast<const GetBucketStateMessage&>(obj);
+    buf.putLong(msg.getBucketId().getRawId());
+    return true;
+}
+
+DocumentReply::UP
+RoutableFactories52::GetBucketStateReplyFactory::doDecode(document::ByteBuffer &buf) const
+{
+    auto reply = std::make_unique<GetBucketStateReply>();
+
+    int32_t len = decodeInt(buf);
+    reply->getBucketState().reserve(len);
+    for (int32_t i = 0; i < len; i++) {
+        reply->getBucketState().emplace_back(buf);
+    }
+
+    return reply;
+}
+
+bool
+RoutableFactories52::GetBucketStateReplyFactory::doEncode(const DocumentReply &obj, vespalib::GrowableByteBuffer &buf) const
+{
+    const GetBucketStateReply &reply = static_cast<const GetBucketStateReply&>(obj);
+
+    buf.putInt(reply.getBucketState().size());
+    for (const auto & state : reply.getBucketState()) {
+        state.serialize(buf);
+    }
+
+    return true;
+}
+
+DocumentMessage::UP
+RoutableFactories52::GetDocumentMessageFactory::doDecode(document::ByteBuffer &buf) const
+{
+    return DocumentMessage::UP(
+            new GetDocumentMessage(decodeDocumentId(buf),
+                                   decodeString(buf)));
+}
+
+bool
+RoutableFactories52::GetDocumentMessageFactory::doEncode(const DocumentMessage &obj,
+                                                         vespalib::GrowableByteBuffer &buf) const
+{
+    const GetDocumentMessage &msg = static_cast<const GetDocumentMessage&>(obj);
+
+    encodeDocumentId(msg.getDocumentId(), buf);
+    buf.putString(msg.getFieldSet());
+    return true;
+}
+
+DocumentReply::UP
+RoutableFactories52::GetDocumentReplyFactory::doDecode(document::ByteBuffer &buf) const
+{
+    auto reply = std::make_unique<GetDocumentReply>();
+
+    bool hasDocument = decodeBoolean(buf);
+    document::Document * document = nullptr;
+    if (hasDocument) {
+        auto doc = std::make_shared<document::Document>(_repo, buf);
+        document = doc.get();
+        reply->setDocument(std::move(doc));
+    }
+    int64_t lastModified = decodeLong(buf);
+    reply->setLastModified(lastModified);
+    if (hasDocument) {
+        document->setLastModified(lastModified);
+    }
+
+    return reply;
+}
+
+bool
+RoutableFactories52::GetDocumentReplyFactory::doEncode(const DocumentReply &obj, vespalib::GrowableByteBuffer &buf) const
+{
+    const GetDocumentReply &reply = static_cast<const GetDocumentReply&>(obj);
+
+    buf.putByte(reply.hasDocument() ? 1 : 0);
+    if (reply.hasDocument()) {
+        nbostream stream;
+        reply.getDocument().serialize(stream);
+        buf.putBytes(stream.peek(), stream.size());
+    }
+    buf.putLong(reply.getLastModified());
+
+    return true;
+}
+
+DocumentMessage::UP
+RoutableFactories52::MapVisitorMessageFactory::doDecode(document::ByteBuffer &buf) const
+{
+    auto msg = std::make_unique<MapVisitorMessage>();
+    msg->getData().deserialize(_repo, buf);
+    return msg;
+}
+
+bool
+RoutableFactories52::MapVisitorMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
+{
+    const MapVisitorMessage &msg = static_cast<const MapVisitorMessage&>(obj);
+
+    int32_t len = msg.getData().getSerializedSize();
+    char *tmp = buf.allocate(len);
+    document::ByteBuffer dbuf(tmp, len);
+    msg.getData().serialize(dbuf);
+
+    return true;
+}
+
+DocumentReply::UP
+RoutableFactories52::MapVisitorReplyFactory::doDecode(document::ByteBuffer &) const
+{
+    return std::make_unique<VisitorReply>(DocumentProtocol::REPLY_MAPVISITOR);
+}
+
+bool
+RoutableFactories52::MapVisitorReplyFactory::doEncode(const DocumentReply &, vespalib::GrowableByteBuffer &) const
+{
+    return true;
+}
+
 void
 RoutableFactories52::PutDocumentMessageFactory::decodeInto(PutDocumentMessage & msg, document::ByteBuffer & buf) const {
-    super::decodeInto(msg, buf);
+    msg.setDocument(make_shared<document::Document>(_repo, buf));
+    msg.setTimestamp(static_cast<uint64_t>(decodeLong(buf)));
     decodeTasCondition(msg, buf);
 }
 
 bool
-RoutableFactories52::PutDocumentMessageFactory::doEncode(const DocumentMessage & msg, vespalib::GrowableByteBuffer & buf) const
+RoutableFactories52::PutDocumentMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
 {
-    if (! super::doEncode(msg, buf)) {
-        return false;
-    }
+    auto & msg = static_cast<const PutDocumentMessage &>(obj);
+    nbostream stream;
 
+    msg.getDocument().serialize(stream);
+    buf.putBytes(stream.peek(), stream.size());
+    buf.putLong(static_cast<int64_t>(msg.getTimestamp()));
     encodeTasCondition(buf, msg);
+
     return true;
 }
 
+DocumentReply::UP
+RoutableFactories52::PutDocumentReplyFactory::doDecode(document::ByteBuffer &buf) const
+{
+    auto reply = make_unique<WriteDocumentReply>(DocumentProtocol::REPLY_PUTDOCUMENT);
+    reply->setHighestModificationTimestamp(decodeLong(buf));
+
+    // Doing an explicit move here to force converting result to an rvalue.
+    // This is done automatically in GCC >= 5.
+    return std::move(reply);
+}
+
+bool
+RoutableFactories52::PutDocumentReplyFactory::doEncode(const DocumentReply &obj, vespalib::GrowableByteBuffer &buf) const
+{
+    const WriteDocumentReply& reply = (const WriteDocumentReply&)obj;
+    buf.putLong(reply.getHighestModificationTimestamp());
+    return true;
+}
+        
 void
 RoutableFactories52::RemoveDocumentMessageFactory::decodeInto(RemoveDocumentMessage & msg, document::ByteBuffer & buf) const {
-    super::decodeInto(msg, buf);
+    msg.setDocumentId(decodeDocumentId(buf));
     decodeTasCondition(msg, buf);
 }
 
+bool
+RoutableFactories52::RemoveDocumentMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
+{
+    const RemoveDocumentMessage &msg = static_cast<const RemoveDocumentMessage&>(obj);
+    encodeDocumentId(msg.getDocumentId(), buf);
+    encodeTasCondition(buf, msg);
+    return true;
+}
+
+DocumentReply::UP
+RoutableFactories52::RemoveDocumentReplyFactory::doDecode(document::ByteBuffer &buf) const
+{
+    auto reply = std::make_unique<RemoveDocumentReply>();
+    reply->setWasFound(decodeBoolean(buf));
+    reply->setHighestModificationTimestamp(decodeLong(buf));
+    return reply;
+}
 
 bool
-RoutableFactories52::RemoveDocumentMessageFactory::doEncode(const DocumentMessage & msg, vespalib::GrowableByteBuffer & buf) const
+RoutableFactories52::RemoveDocumentReplyFactory::doEncode(const DocumentReply &obj, vespalib::GrowableByteBuffer &buf) const
 {
-    if (! super::doEncode(msg, buf)) {
-        return false;
-    }
+    const RemoveDocumentReply &reply = static_cast<const RemoveDocumentReply&>(obj);
+    buf.putBoolean(reply.getWasFound());
+    buf.putLong(reply.getHighestModificationTimestamp());
+    return true;
+}
+
+DocumentMessage::UP
+RoutableFactories52::RemoveLocationMessageFactory::doDecode(document::ByteBuffer &buf) const
+{
+    string selection = decodeString(buf);
+
+    document::BucketIdFactory factory;
+    document::select::Parser parser(_repo, factory);
+
+    auto msg = std::make_unique<RemoveLocationMessage>(factory, parser, selection);
+    // FIXME bucket space not part of wire format, implicitly limiting to only default space for now.
+    msg->setBucketSpace(document::FixedBucketSpaces::default_space_name());
+    return msg;
+}
+
+bool
+RoutableFactories52::RemoveLocationMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
+{
+    const RemoveLocationMessage &msg = static_cast<const RemoveLocationMessage&>(obj);
+    buf.putString(msg.getDocumentSelection());
+    return true;
+}
+
+DocumentReply::UP
+RoutableFactories52::RemoveLocationReplyFactory::doDecode(document::ByteBuffer &) const
+{
+    return std::make_unique<DocumentReply>(DocumentProtocol::REPLY_REMOVELOCATION);
+}
+
+bool
+RoutableFactories52::RemoveLocationReplyFactory::doEncode(const DocumentReply &, vespalib::GrowableByteBuffer &) const
+{
+    return true;
+}
+
+DocumentMessage::UP
+RoutableFactories52::SearchResultMessageFactory::doDecode(document::ByteBuffer &buf) const
+{
+    auto msg = std::make_unique<SearchResultMessage>();
+    msg->deserialize(buf);
+    return msg;
+}
+
+bool
+RoutableFactories52::SearchResultMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
+{
+    const SearchResultMessage &msg = static_cast<const SearchResultMessage&>(obj);
+
+    int len = msg.getSerializedSize();
+    char *tmp = buf.allocate(len);
+    document::ByteBuffer dbuf(tmp, len);
+    msg.serialize(dbuf);
 
-    encodeTasCondition(buf, msg);
     return true;
 }
 
+DocumentMessage::UP
+RoutableFactories52::QueryResultMessageFactory::doDecode(document::ByteBuffer &buf) const
+{
+    auto msg = std::make_unique<QueryResultMessage>();
+    msg->getSearchResult().deserialize(buf);
+    msg->getDocumentSummary().deserialize(buf);
+
+    return msg;
+}
+
+bool
+RoutableFactories52::QueryResultMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
+{
+    const QueryResultMessage &msg = static_cast<const QueryResultMessage&>(obj);
+
+    int len = msg.getSearchResult().getSerializedSize() + msg.getDocumentSummary().getSerializedSize();
+    char *tmp = buf.allocate(len);
+    document::ByteBuffer dbuf(tmp, len);
+    msg.getSearchResult().serialize(dbuf);
+    msg.getDocumentSummary().serialize(dbuf);
+
+    return true;
+}
+
+DocumentReply::UP
+RoutableFactories52::SearchResultReplyFactory::doDecode(document::ByteBuffer &) const
+{
+    return std::make_unique<VisitorReply>(DocumentProtocol::REPLY_SEARCHRESULT);
+}
+
+bool
+RoutableFactories52::SearchResultReplyFactory::doEncode(const DocumentReply &, vespalib::GrowableByteBuffer &) const
+{
+    return true;
+}
+
+DocumentReply::UP
+RoutableFactories52::QueryResultReplyFactory::doDecode(document::ByteBuffer &) const
+{
+    return std::make_unique<VisitorReply>(DocumentProtocol::REPLY_QUERYRESULT);
+}
+
+bool
+RoutableFactories52::QueryResultReplyFactory::doEncode(const DocumentReply &, vespalib::GrowableByteBuffer &) const
+{
+    return true;
+}
+
+bool RoutableFactories52::StatBucketMessageFactory::encodeBucketSpace(vespalib::stringref bucketSpace,
+                                                                      vespalib::GrowableByteBuffer& ) const
+{
+    return (bucketSpace == FixedBucketSpaces::default_space_name());
+}
+
+string RoutableFactories52::StatBucketMessageFactory::decodeBucketSpace(document::ByteBuffer&) const {
+    return FixedBucketSpaces::default_space_name();
+}
+
+DocumentMessage::UP
+RoutableFactories52::StatBucketMessageFactory::doDecode(document::ByteBuffer &buf) const
+{
+    auto msg = std::make_unique<StatBucketMessage>();
+
+    msg->setBucketId(document::BucketId(decodeLong(buf)));
+    msg->setDocumentSelection(decodeString(buf));
+    msg->setBucketSpace(decodeBucketSpace(buf));
+
+    return msg;
+}
+
+bool
+RoutableFactories52::StatBucketMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
+{
+    const StatBucketMessage &msg = static_cast<const StatBucketMessage&>(obj);
+
+    buf.putLong(msg.getBucketId().getRawId());
+    buf.putString(msg.getDocumentSelection());
+    return encodeBucketSpace(msg.getBucketSpace(), buf);
+}
+
+DocumentReply::UP
+RoutableFactories52::StatBucketReplyFactory::doDecode(document::ByteBuffer &buf) const
+{
+    auto reply = std::make_unique<StatBucketReply>();
+    reply->setResults(decodeString(buf));
+    return reply;
+}
+
+bool
+RoutableFactories52::StatBucketReplyFactory::doEncode(const DocumentReply &obj, vespalib::GrowableByteBuffer &buf) const
+{
+    const StatBucketReply &reply = static_cast<const StatBucketReply&>(obj);
+    buf.putString(reply.getResults());
+    return true;
+}
+
+DocumentMessage::UP
+RoutableFactories52::StatDocumentMessageFactory::doDecode(document::ByteBuffer &) const
+{
+    return DocumentMessage::UP(); // TODO: remove message type
+}
+
+bool
+RoutableFactories52::StatDocumentMessageFactory::doEncode(const DocumentMessage &, vespalib::GrowableByteBuffer &) const
+{
+    return false;
+}
+
+DocumentReply::UP
+RoutableFactories52::StatDocumentReplyFactory::doDecode(document::ByteBuffer &) const
+{
+    return DocumentReply::UP(); // TODO: remove reply type
+}
+
+bool
+RoutableFactories52::StatDocumentReplyFactory::doEncode(const DocumentReply &, vespalib::GrowableByteBuffer &) const
+{
+    return false;
+}
+
 void
 RoutableFactories52::UpdateDocumentMessageFactory::decodeInto(UpdateDocumentMessage & msg, document::ByteBuffer & buf) const {
-    super::decodeInto(msg, buf);
+    msg.setDocumentUpdate(document::DocumentUpdate::createHEAD(_repo, buf));
+    msg.setOldTimestamp(static_cast<uint64_t>(decodeLong(buf)));
+    msg.setNewTimestamp(static_cast<uint64_t>(decodeLong(buf)));
     decodeTasCondition(msg, buf);
 }
 
 bool
-RoutableFactories52::UpdateDocumentMessageFactory::doEncode(const DocumentMessage & msg, vespalib::GrowableByteBuffer & buf) const
+RoutableFactories52::UpdateDocumentMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
 {
-    if (! super::doEncode(msg, buf)) {
-        return false;
-    }
+    const UpdateDocumentMessage &msg = static_cast<const UpdateDocumentMessage&>(obj);
 
+    vespalib::nbostream stream;
+    msg.getDocumentUpdate().serializeHEAD(stream);
+    buf.putBytes(stream.peek(), stream.size());
+    buf.putLong((int64_t)msg.getOldTimestamp());
+    buf.putLong((int64_t)msg.getNewTimestamp());
     encodeTasCondition(buf, msg);
+
+    return true;
+}
+
+DocumentReply::UP
+RoutableFactories52::UpdateDocumentReplyFactory::doDecode(document::ByteBuffer &buf) const
+{
+    auto reply = std::make_unique<UpdateDocumentReply>();
+    reply->setWasFound(decodeBoolean(buf));
+    reply->setHighestModificationTimestamp(decodeLong(buf));
+    return reply;
+}
+
+bool
+RoutableFactories52::UpdateDocumentReplyFactory::doEncode(const DocumentReply &obj, vespalib::GrowableByteBuffer &buf) const
+{
+    const UpdateDocumentReply &reply = static_cast<const UpdateDocumentReply&>(obj);
+    buf.putBoolean(reply.getWasFound());
+    buf.putLong(reply.getHighestModificationTimestamp());
+    return true;
+}
+
+DocumentMessage::UP
+RoutableFactories52::VisitorInfoMessageFactory::doDecode(document::ByteBuffer &buf) const
+{
+    auto msg = std::make_unique<VisitorInfoMessage>();
+
+    int32_t len = decodeInt(buf);
+    msg->getFinishedBuckets().reserve(len);
+    for (int32_t i = 0; i < len; i++) {
+        int64_t val;
+        buf.getLong(val); // NOT using getLongNetwork
+        msg->getFinishedBuckets().emplace_back(val);
+    }
+    msg->setErrorMessage(decodeString(buf));
+
+    return msg;
+}
+
+bool
+RoutableFactories52::VisitorInfoMessageFactory::doEncode(const DocumentMessage &obj, vespalib::GrowableByteBuffer &buf) const
+{
+    const VisitorInfoMessage &msg = static_cast<const VisitorInfoMessage&>(obj);
+
+    buf.putInt(msg.getFinishedBuckets().size());
+    for (const auto & bucketId : msg.getFinishedBuckets()) {
+        uint64_t val = bucketId.getRawId();
+        buf.putBytes((const char*)&val, 8);
+    }
+    buf.putString(msg.getErrorMessage());
+
+    return true;
+}
+
+DocumentReply::UP
+RoutableFactories52::VisitorInfoReplyFactory::doDecode(document::ByteBuffer &) const
+{
+    return std::make_unique<VisitorReply>(DocumentProtocol::REPLY_VISITORINFO);
+}
+
+bool
+RoutableFactories52::VisitorInfoReplyFactory::doEncode(const DocumentReply &, vespalib::GrowableByteBuffer &) const
+{
+    return true;
+}
+
+DocumentReply::UP
+RoutableFactories52::WrongDistributionReplyFactory::doDecode(document::ByteBuffer &buf) const
+{
+    auto reply = std::make_unique<WrongDistributionReply>();
+    reply->setSystemState(decodeString(buf));
+    return reply;
+}
+
+bool
+RoutableFactories52::WrongDistributionReplyFactory::doEncode(const DocumentReply &obj, vespalib::GrowableByteBuffer &buf) const
+{
+    const WrongDistributionReply &reply = static_cast<const WrongDistributionReply&>(obj);
+    buf.putString(reply.getSystemState());
     return true;
 }
 
+string
+RoutableFactories52::decodeString(document::ByteBuffer &in)
+{
+    int32_t len = decodeInt(in);
+    string ret = string(in.getBufferAtPos(), len);
+    in.incPos(len);
+    return ret;
+}
+
+bool
+RoutableFactories52::decodeBoolean(document::ByteBuffer &in)
+{
+    char ret;
+    in.getBytes(&ret, 1);
+    return (bool)ret;
+}
+
+int32_t
+RoutableFactories52::decodeInt(document::ByteBuffer &in)
+{
+    int32_t ret;
+    in.getIntNetwork(ret);
+    return ret;
+}
+
+int64_t
+RoutableFactories52::decodeLong(document::ByteBuffer &in)
+{
+    int64_t ret;
+    in.getLongNetwork(ret);
+    return ret;
+}
+
+document::DocumentId
+RoutableFactories52::decodeDocumentId(document::ByteBuffer &in)
+{
+    nbostream stream(in.getBufferAtPos(), in.getRemaining());
+    document::DocumentId ret(stream);
+    in.incPos(stream.rp());
+    return ret;
+}
+
+void
+RoutableFactories52::encodeDocumentId(const document::DocumentId &id, vespalib::GrowableByteBuffer &out)
+{
+    string str = id.toString();
+    out.putBytes(str.c_str(), str.size() + 1);
+}
+
 void RoutableFactories52::decodeTasCondition(DocumentMessage & docMsg, document::ByteBuffer & buf) {
     auto & msg = static_cast<TestAndSetMessage &>(docMsg);
     msg.setCondition(TestAndSetCondition(decodeString(buf)));
@@ -73,4 +945,5 @@ void RoutableFactories52::encodeTasCondition(vespalib::GrowableByteBuffer & buf,
     buf.putString(msg.getCondition().getSelection());
 }
 
+
 }
diff --git a/documentapi/src/vespa/documentapi/messagebus/routablefactories52.h b/documentapi/src/vespa/documentapi/messagebus/routablefactories52.h
index ac56dea8467..9c614bde487 100644
--- a/documentapi/src/vespa/documentapi/messagebus/routablefactories52.h
+++ b/documentapi/src/vespa/documentapi/messagebus/routablefactories52.h
@@ -2,57 +2,417 @@
 // @author Vegard Sjonfjell
 #pragma once
 
-#include "routablefactories51.h"
-#include <vespa/documentapi/messagebus/messages/testandsetmessage.h>
+#include <vespa/document/util/bytebuffer.h>
+#include <vespa/vespalib/util/growablebytebuffer.h>
+#include "iroutablefactory.h"
+#include <vespa/documentapi/messagebus/messages/putdocumentmessage.h>
+#include <vespa/documentapi/messagebus/messages/removedocumentmessage.h>
+#include <vespa/documentapi/messagebus/messages/updatedocumentmessage.h>
 
 namespace document { class DocumentTypeRepo; }
 
+/**
+ * Utility class for invoking setApproxSize on a DocumentMessage with the delta
+ * between the read position of a ByteBuffer at construction and destruction
+ * time. The assumption being made is that the in-memory footprint of a message
+ * is reasonably close to its wire-serialized form.
+ */
+class ScopedApproxSizeSetter {
+public:
+    ScopedApproxSizeSetter(documentapi::DocumentMessage& msg,
+                           const document::ByteBuffer& buf)
+        : _msg(msg),
+          _buf(buf),
+          _posBefore(_buf.getPos())
+    {
+    }
+
+    ~ScopedApproxSizeSetter() {
+        _msg.setApproxSize(static_cast<uint32_t>(_buf.getPos() - _posBefore));
+    }
+
+private:
+    documentapi::DocumentMessage& _msg;
+    const document::ByteBuffer& _buf;
+    const size_t _posBefore;
+};
+
 namespace documentapi {
+
+template<typename MessageType, typename FactoryType>
+DocumentMessage::UP
+decodeMessage(const FactoryType * self, document::ByteBuffer & buf) {
+    auto msg = std::make_unique<MessageType>();
+    ScopedApproxSizeSetter sizeSetter(*msg, buf);
+    self->decodeInto(*msg, buf);
+    return msg;
+}
+
 /**
  * This class encapsulates all the {@link RoutableFactory} classes needed to implement factories for the document
  * routable. When adding new factories to this class, please KEEP THE THEM ORDERED alphabetically like they are now.
  */
-class RoutableFactories52 : public RoutableFactories51 {
+class RoutableFactories52 {
 public:
     RoutableFactories52() = delete;
 
-    class PutDocumentMessageFactory : public RoutableFactories50::PutDocumentMessageFactory {
-        using super = RoutableFactories50::PutDocumentMessageFactory;
+    /**
+     * Implements the shared factory logic required for {@link DocumentMessage} objects, and it offers a more
+     * convenient interface for implementing {@link RoutableFactory}.
+     */
+    class DocumentMessageFactory : public IRoutableFactory {
+    protected:
+        /**
+         * This method encodes the given message into the given byte buffer. You are guaranteed to only receive messages of
+         * the type that this factory was registered for.
+         *
+         * This method is NOT exception safe. Return false to signal failure.
+         *
+         * @param msg The message to encode.
+         * @param buf The byte buffer to write to.
+         * @return True if the message was encoded.
+         */
+        virtual bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const = 0;
+
+        /**
+         * This method decodes a message from the given byte buffer. You are guaranteed to only receive byte buffers
+         * generated by a previous call to {@link #doEncode(DocumentMessage, GrowableByteBuffer)}.
+         *
+         * This method is NOT exception safe. Return null to signal failure.
+         *
+         * @param buf The byte buffer to read from.
+         * @return The decoded message.
+         */
+        virtual DocumentMessage::UP doDecode(document::ByteBuffer &buf) const = 0;
+
+    public:
+        bool encode(const mbus::Routable &obj, vespalib::GrowableByteBuffer &out) const override;
+        mbus::Routable::UP decode(document::ByteBuffer &in, const LoadTypeSet& loadTypes) const override;
+    };
+
+    /**
+     * Implements the shared factory logic required for {@link DocumentReply} objects, and it offers a more
+     * convenient interface for implementing {@link RoutableFactory}.
+     */
+    class DocumentReplyFactory : public IRoutableFactory {
+    protected:
+        /**
+         * This method encodes the given reply into the given byte buffer. You are guaranteed to only receive
+         * replies of the type that this factory was registered for.
+         *
+         * This method is NOT exception safe. Return false to signal failure.
+         *
+         * @param reply The reply to encode.
+         * @param buf The byte buffer to write to.
+         * @return True if the message was encoded.
+         */
+        virtual bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const = 0;
+
+        /**
+         * This method decodes a reply from the given byte buffer. You are guaranteed to only receive byte buffers
+         * generated by a previous call to {@link #doEncode(DocumentReply, GrowableByteBuffer)}.
+         *
+         * This method is NOT exception safe. Return null to signal failure.
+         *
+         * @param buf The byte buffer to read from.
+         * @return The decoded reply.
+         */
+        virtual DocumentReply::UP doDecode(document::ByteBuffer &buf) const = 0;
+
+    public:
+        bool encode(const mbus::Routable &obj, vespalib::GrowableByteBuffer &out) const override;
+        mbus::Routable::UP decode(document::ByteBuffer &in, const LoadTypeSet& loadTypes) const override;
+    };
+
+    ////////////////////////////////////////////////////////////////////////////////
+    //
+    // Factories
+    //
+    ////////////////////////////////////////////////////////////////////////////////
+    class CreateVisitorMessageFactory : public DocumentMessageFactory {
+        const document::DocumentTypeRepo &_repo;
+    protected:
+        DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override;
+        bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override;
+
+        virtual bool encodeBucketSpace(vespalib::stringref bucketSpace, vespalib::GrowableByteBuffer& buf) const;
+        virtual string decodeBucketSpace(document::ByteBuffer&) const;
+    public:
+        CreateVisitorMessageFactory(const document::DocumentTypeRepo &r) : _repo(r) {}
+    };
+    class CreateVisitorReplyFactory : public DocumentReplyFactory {
+    protected:
+        DocumentReply::UP doDecode(document::ByteBuffer &buf) const override;
+        bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override;
+    };
+    class DestroyVisitorMessageFactory : public DocumentMessageFactory {
+    protected:
+        DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override;
+        bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override;
+    };
+    class DestroyVisitorReplyFactory : public DocumentReplyFactory {
+    protected:
+        DocumentReply::UP doDecode(document::ByteBuffer &buf) const override;
+        bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override;
+    };
+    class DocumentIgnoredReplyFactory : public DocumentReplyFactory {
+    protected:
+        DocumentReply::UP doDecode(document::ByteBuffer &buf) const override;
+        bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override;
+    };
+    class DocumentListMessageFactory : public DocumentMessageFactory {
+        const document::DocumentTypeRepo &_repo;
+        DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override;
+        bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override;
+    public:
+        DocumentListMessageFactory(const document::DocumentTypeRepo &r)
+            : _repo(r) {}
+    };
+    class DocumentListReplyFactory : public DocumentReplyFactory {
+    protected:
+        DocumentReply::UP doDecode(document::ByteBuffer &buf) const override;
+        bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override;
+    };
+    class DocumentSummaryMessageFactory : public DocumentMessageFactory {
+    protected:
+        DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override;
+        bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override;
+    };
+    class DocumentSummaryReplyFactory : public DocumentReplyFactory {
+    protected:
+        DocumentReply::UP doDecode(document::ByteBuffer &buf) const override;
+        bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override;
+    };
+    class EmptyBucketsMessageFactory : public DocumentMessageFactory {
+    protected:
+        DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override;
+        bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override;
+    };
+    class EmptyBucketsReplyFactory : public DocumentReplyFactory {
+    protected:
+        DocumentReply::UP doDecode(document::ByteBuffer &buf) const override;
+        bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override;
+    };
+    class GetBucketListMessageFactory : public DocumentMessageFactory {
+        virtual bool encodeBucketSpace(vespalib::stringref bucketSpace, vespalib::GrowableByteBuffer& buf) const;
+        virtual string decodeBucketSpace(document::ByteBuffer&) const;
+    protected:
+        DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override;
+        bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override;
+    };
+    class GetBucketListReplyFactory : public DocumentReplyFactory {
+    protected:
+        DocumentReply::UP doDecode(document::ByteBuffer &buf) const override;
+        bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override;
+    };
+    class GetBucketStateMessageFactory : public DocumentMessageFactory {
+    protected:
+        DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override;
+        bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override;
+    };
+    class GetBucketStateReplyFactory : public DocumentReplyFactory {
     protected:
-        DocumentMessage::UP doDecode(document::ByteBuffer & buf) const override {
+        DocumentReply::UP doDecode(document::ByteBuffer &buf) const override;
+        bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override;
+    };
+    class GetDocumentMessageFactory : public DocumentMessageFactory {
+    protected:
+        DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override;
+        bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override;
+    };
+    class GetDocumentReplyFactory : public DocumentReplyFactory {
+        const document::DocumentTypeRepo &_repo;
+        DocumentReply::UP doDecode(document::ByteBuffer &buf) const override;
+        bool doEncode(const DocumentReply &msg, vespalib::GrowableByteBuffer &buf) const override;
+    public:
+        GetDocumentReplyFactory(const document::DocumentTypeRepo &r) : _repo(r) {}
+    };
+    class MapVisitorMessageFactory : public DocumentMessageFactory {
+        const document::DocumentTypeRepo &_repo;
+    protected:
+        DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override;
+        bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override;
+    public:
+        MapVisitorMessageFactory(const document::DocumentTypeRepo &r) : _repo(r) {}
+    };
+    class MapVisitorReplyFactory : public DocumentReplyFactory {
+    protected:
+        DocumentReply::UP doDecode(document::ByteBuffer &buf) const override;
+        bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override;
+    };
+    class PutDocumentMessageFactory : public DocumentMessageFactory {
+    protected:
+        const document::DocumentTypeRepo &_repo;
+        DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override {
             return decodeMessage<PutDocumentMessage>(this, buf);
         }
 
-        bool doEncode(const DocumentMessage & msg, vespalib::GrowableByteBuffer & buf) const override;
+        bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override;
     public:
         void decodeInto(PutDocumentMessage & msg, document::ByteBuffer & buf) const;
-        PutDocumentMessageFactory(const document::DocumentTypeRepo & r) : super::PutDocumentMessageFactory(r) {}
+        PutDocumentMessageFactory(const document::DocumentTypeRepo &r) : _repo(r) {}
     };
-
-    class RemoveDocumentMessageFactory : public RoutableFactories50::RemoveDocumentMessageFactory {
-        using super = RoutableFactories50::RemoveDocumentMessageFactory;
+    class PutDocumentReplyFactory : public DocumentReplyFactory {
+    protected:
+        DocumentReply::UP doDecode(document::ByteBuffer &buf) const override;
+        bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override;
+    };
+    class RemoveDocumentMessageFactory : public DocumentMessageFactory {
     protected:
-        DocumentMessage::UP doDecode(document::ByteBuffer & buf) const override {
+        DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override {
             return decodeMessage<RemoveDocumentMessage>(this, buf);
         }
 
-        bool doEncode(const DocumentMessage & msg, vespalib::GrowableByteBuffer & buf) const override;
+        bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override;
     public:
         void decodeInto(RemoveDocumentMessage & msg, document::ByteBuffer & buf) const;
     };
-
-    class UpdateDocumentMessageFactory : public RoutableFactories50::UpdateDocumentMessageFactory {
-        using super = RoutableFactories50::UpdateDocumentMessageFactory;
+    class RemoveDocumentReplyFactory : public DocumentReplyFactory {
+    protected:
+        DocumentReply::UP doDecode(document::ByteBuffer &buf) const override;
+        bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override;
+    };
+    class RemoveLocationMessageFactory : public DocumentMessageFactory {
+        const document::DocumentTypeRepo &_repo;
+        DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override;
+        bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override;
+    public:
+        RemoveLocationMessageFactory(const document::DocumentTypeRepo &r) : _repo(r) {}
+    };
+    class RemoveLocationReplyFactory : public DocumentReplyFactory {
+    protected:
+        DocumentReply::UP doDecode(document::ByteBuffer &buf) const override;
+        bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override;
+    };
+    class SearchResultMessageFactory : public DocumentMessageFactory {
+    protected:
+        DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override;
+        bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override;
+    };
+    class SearchResultReplyFactory : public DocumentReplyFactory {
+    protected:
+        DocumentReply::UP doDecode(document::ByteBuffer &buf) const override;
+        bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override;
+    };
+    class StatBucketMessageFactory : public DocumentMessageFactory {
+        virtual bool encodeBucketSpace(vespalib::stringref bucketSpace, vespalib::GrowableByteBuffer& buf) const;
+        virtual string decodeBucketSpace(document::ByteBuffer&) const;
+    protected:
+        DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override;
+        bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override;
+    };
+    class StatBucketReplyFactory : public DocumentReplyFactory {
+    protected:
+        DocumentReply::UP doDecode(document::ByteBuffer &buf) const override;
+        bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override;
+    };
+    class StatDocumentMessageFactory : public DocumentMessageFactory {
+    protected:
+        DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override;
+        bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override;
+    };
+    class StatDocumentReplyFactory : public DocumentReplyFactory {
+    protected:
+        DocumentReply::UP doDecode(document::ByteBuffer &buf) const override;
+        bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override;
+    };
+    class UpdateDocumentMessageFactory : public DocumentMessageFactory {
     protected:
-        DocumentMessage::UP doDecode(document::ByteBuffer & buf) const override {
+        const document::DocumentTypeRepo &_repo;
+        DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override {
             return decodeMessage<UpdateDocumentMessage>(this, buf);
         }
 
-        bool doEncode(const DocumentMessage & msg, vespalib::GrowableByteBuffer & buf) const override;
+        bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override;
     public:
         void decodeInto(UpdateDocumentMessage & msg, document::ByteBuffer & buf) const;
-        UpdateDocumentMessageFactory(const document::DocumentTypeRepo & r) : super::UpdateDocumentMessageFactory(r) {}
+        UpdateDocumentMessageFactory(const document::DocumentTypeRepo &r) : _repo(r) {}
+    };
+    class UpdateDocumentReplyFactory : public DocumentReplyFactory {
+    protected:
+        DocumentReply::UP doDecode(document::ByteBuffer &buf) const override;
+        bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override;
+    };
+    class VisitorInfoMessageFactory : public DocumentMessageFactory {
+    protected:
+        DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override;
+        bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override;
+    };
+    class VisitorInfoReplyFactory : public DocumentReplyFactory {
+    protected:
+        DocumentReply::UP doDecode(document::ByteBuffer &buf) const override;
+        bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override;
     };
+    class WrongDistributionReplyFactory : public DocumentReplyFactory {
+    protected:
+        DocumentReply::UP doDecode(document::ByteBuffer &buf) const override;
+        bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override;
+    };
+    class QueryResultMessageFactory : public DocumentMessageFactory {
+    protected:
+        DocumentMessage::UP doDecode(document::ByteBuffer &buf) const override;
+        bool doEncode(const DocumentMessage &msg, vespalib::GrowableByteBuffer &buf) const override;
+    };
+    class QueryResultReplyFactory : public DocumentReplyFactory {
+    protected:
+        DocumentReply::UP doDecode(document::ByteBuffer &buf) const override;
+        bool doEncode(const DocumentReply &reply, vespalib::GrowableByteBuffer &buf) const override;
+    };
+
+    ///////////////////////////////////////////////////////////////////////////
+    //
+    // Utilities
+    //
+    ///////////////////////////////////////////////////////////////////////////
+
+    /**
+     * This is a complement for the vespalib::GrowableByteBuffer.putString() method.
+     *
+     * @param in The byte buffer to read from.
+     * @return The decoded string.
+     */
+    static string decodeString(document::ByteBuffer &in);
+
+    /**
+     * This is a complement for the vespalib::GrowableByteBuffer.putBoolean() method.
+     *
+     * @param in The byte buffer to read from.
+     * @return The decoded bool.
+     */
+    static bool decodeBoolean(document::ByteBuffer &in);
+
+    /**
+     * Convenience method to decode a 32-bit int from the given byte buffer.
+     *
+     * @param in The byte buffer to read from.
+     * @return The decoded int.
+     */
+    static int32_t decodeInt(document::ByteBuffer &in);
+
+    /**
+     * Convenience method to decode a 64-bit int from the given byte buffer.
+     *
+     * @param in The byte buffer to read from.
+     * @return The decoded int.
+     */
+    static int64_t decodeLong(document::ByteBuffer &in);
+
+    /**
+     * Convenience method to decode a document id from the given byte buffer.
+     *
+     * @param in The byte buffer to read from.
+     * @return The decoded document id.
+     */
+    static document::DocumentId decodeDocumentId(document::ByteBuffer &in);
+
+    /**
+     * Convenience method to encode a document id to the given byte buffer.
+     *
+     * @param id  The document id to encode.
+     * @param out The byte buffer to write to.
+     */
+    static void encodeDocumentId(const document::DocumentId &id,
+                                 vespalib::GrowableByteBuffer &out);
 
     static void decodeTasCondition(DocumentMessage & docMsg, document::ByteBuffer & buf);
     static void encodeTasCondition(vespalib::GrowableByteBuffer & buf, const DocumentMessage & docMsg);
diff --git a/documentapi/src/vespa/documentapi/messagebus/routablefactories60.h b/documentapi/src/vespa/documentapi/messagebus/routablefactories60.h
index 26a8f0cb6d5..e91c9a773f2 100644
--- a/documentapi/src/vespa/documentapi/messagebus/routablefactories60.h
+++ b/documentapi/src/vespa/documentapi/messagebus/routablefactories60.h
@@ -22,14 +22,14 @@ public:
             : RoutableFactories52::CreateVisitorMessageFactory(r) {}
     };
 
-    class StatBucketMessageFactory : public RoutableFactories50::StatBucketMessageFactory {
+    class StatBucketMessageFactory : public RoutableFactories52::StatBucketMessageFactory {
         bool encodeBucketSpace(vespalib::stringref bucketSpace, vespalib::GrowableByteBuffer& buf) const override;
         string decodeBucketSpace(document::ByteBuffer&) const override;
     public:
         StatBucketMessageFactory() = default;
     };
 
-    class GetBucketListMessageFactory : public RoutableFactories50::GetBucketListMessageFactory {
+    class GetBucketListMessageFactory : public RoutableFactories52::GetBucketListMessageFactory {
         bool encodeBucketSpace(vespalib::stringref bucketSpace, vespalib::GrowableByteBuffer& buf) const override;
         string decodeBucketSpace(document::ByteBuffer&) const override;
     public:
@@ -40,4 +40,4 @@ public:
     static string doDecodeBucketSpace(document::ByteBuffer&);
 };
 
-}
\ No newline at end of file
+}