Use shared ptr and Idesructorcallback to make it more flexible.

5 files changed, 24 insertions, 30 deletions

diff --git a/searchcore/src/tests/proton/documentdb/documentdb_test.cpp b/searchcore/src/tests/proton/documentdb/documentdb_test.cpp
index 5e3e5cd78be..eb2ffff620d 100644
--- a/searchcore/src/tests/proton/documentdb/documentdb_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/documentdb_test.cpp
@@ -46,7 +46,7 @@ using vespalib::Slime;
 
 namespace {
 
-class LocalTransport : public FeedToken::ITransport {
+class LocalTransport : public feedtoken::ITransport {
     mbus::Receptor _receptor;
 
 public:
diff --git a/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp b/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp
index e70e83fd61e..dc63f5329ce 100644
--- a/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp
@@ -295,7 +295,7 @@ struct UpdateContext {
 };
 
 
-struct MyTransport : public FeedToken::ITransport {
+struct MyTransport : public feedtoken::ITransport {
     vespalib::Gate gate;
     ResultUP result;
     bool documentWasFound;
@@ -309,7 +309,7 @@ struct MyTransport : public FeedToken::ITransport {
 };
 
 MyTransport::MyTransport() : gate(), result(), documentWasFound(false) {}
-MyTransport::~MyTransport() {}
+MyTransport::~MyTransport() = default;
 
 struct FeedTokenContext {
     MyTransport transport;
@@ -322,13 +322,13 @@ struct FeedTokenContext {
         if (transport.result.get()) {
             return transport.result.get();
         }
-        return &token.getResult();
+        return &token->getResult();
     }
 };
 
 FeedTokenContext::FeedTokenContext()
     : transport(),
-      token(transport)
+      token(feedtoken::make(transport))
 {}
 
 FeedTokenContext::~FeedTokenContext() = default;
diff --git a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp
index 548ce8ba20d..78f3d37675f 100644
--- a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp
@@ -405,7 +405,7 @@ MyAttributeWriter::MyAttributeWriter(MyTracer &tracer)
 }
 MyAttributeWriter::~MyAttributeWriter() {}
 
-struct MyTransport : public FeedToken::ITransport
+struct MyTransport : public feedtoken::ITransport
 {
     ResultUP lastResult;
     vespalib::Gate _gate;
@@ -421,7 +421,7 @@ struct MyTransport : public FeedToken::ITransport
 };
 
 MyTransport::MyTransport(MyTracer &tracer) : lastResult(), _gate(), _tracer(tracer) {}
-MyTransport::~MyTransport() {}
+MyTransport::~MyTransport() = default;
 
 struct MyResultHandler : public IGenericResultHandler
 {
@@ -491,7 +491,7 @@ struct FeedTokenContext
 };
 
 FeedTokenContext::FeedTokenContext(MyTracer &tracer)
-    : mt(tracer), ft(mt)
+    : mt(tracer), ft(feedtoken::make(mt))
 {}
 FeedTokenContext::~FeedTokenContext() = default;
 
diff --git a/searchcore/src/tests/proton/feedtoken/feedtoken.cpp b/searchcore/src/tests/proton/feedtoken/feedtoken.cpp
index 0fea9501d93..8bd1d92657f 100644
--- a/searchcore/src/tests/proton/feedtoken/feedtoken.cpp
+++ b/searchcore/src/tests/proton/feedtoken/feedtoken.cpp
@@ -5,7 +5,7 @@
 
 using namespace proton;
 
-class LocalTransport : public FeedToken::ITransport {
+class LocalTransport : public feedtoken::ITransport {
 private:
     size_t _receivedCount;
 
@@ -46,7 +46,7 @@ Test::testAck()
 {
     LocalTransport transport;
     {
-        FeedToken token(transport);
+        FeedToken token = feedtoken::make(transport);
     }
     EXPECT_EQUAL(1u, transport.getReceivedCount());
 }
@@ -55,8 +55,8 @@ void
 Test::testFail()
 {
     LocalTransport transport;
-    FeedToken token(transport);
-    token.fail();
+    FeedToken token = feedtoken::make(transport);
+    token->fail();
     EXPECT_EQUAL(1u, transport.getReceivedCount());
 }
 
@@ -72,7 +72,7 @@ Test::testHandover()
     LocalTransport transport;
 
     {
-        FeedToken token(transport);
+        FeedToken token = feedtoken::make(transport);
         token = MyHandover::handover(token);
     }
     EXPECT_EQUAL(1u, transport.getReceivedCount());
diff --git a/searchcore/src/tests/proton/persistenceengine/persistenceengine_test.cpp b/searchcore/src/tests/proton/persistenceengine/persistenceengine_test.cpp
index 38d4d809d60..f7b35851696 100644
--- a/searchcore/src/tests/proton/persistenceengine/persistenceengine_test.cpp
+++ b/searchcore/src/tests/proton/persistenceengine/persistenceengine_test.cpp
@@ -214,13 +214,13 @@ struct MyHandler : public IPersistenceHandler, IBucketFreezer {
 
     void handlePut(FeedToken token, const Bucket& bucket,
                    Timestamp timestamp, const document::Document::SP& doc) override {
-        token.setResult(ResultUP(new storage::spi::Result()), false);
+        token->setResult(ResultUP(new storage::spi::Result()), false);
         handle(token, bucket, timestamp, doc->getId());
     }
 
     void handleUpdate(FeedToken token, const Bucket& bucket,
                       Timestamp timestamp, const document::DocumentUpdate::SP& upd) override {
-        token.setResult(ResultUP(new storage::spi::UpdateResult(existingTimestamp)),
+        token->setResult(ResultUP(new storage::spi::UpdateResult(existingTimestamp)),
                         existingTimestamp > 0);
         handle(token, bucket, timestamp, upd->getId());
     }
@@ -228,7 +228,7 @@ struct MyHandler : public IPersistenceHandler, IBucketFreezer {
     void handleRemove(FeedToken token, const Bucket& bucket,
                       Timestamp timestamp, const DocumentId& id) override {
         bool wasFound = existingTimestamp > 0;
-        token.setResult(ResultUP(new storage::spi::RemoveResult(wasFound)), wasFound);
+        token->setResult(ResultUP(new storage::spi::RemoveResult(wasFound)), wasFound);
         handle(token, bucket, timestamp, id);
     }
 
@@ -253,33 +253,27 @@ struct MyHandler : public IPersistenceHandler, IBucketFreezer {
     }
 
     void handleCreateBucket(FeedToken token, const storage::spi::Bucket &) override {
-        token.setResult(ResultUP(new Result(_createBucketResult)), true);
+        token->setResult(ResultUP(new Result(_createBucketResult)), true);
     }
 
     void handleDeleteBucket(FeedToken token, const storage::spi::Bucket &) override {
-        token.setResult(ResultUP(new Result(deleteBucketResult)), true);
+        token->setResult(ResultUP(new Result(deleteBucketResult)), true);
     }
 
     void handleGetModifiedBuckets(IBucketIdListResultHandler &resultHandler) override {
         resultHandler.handle(BucketIdListResult(modBucketList));
     }
 
-    void handleSplit(FeedToken token, const storage::spi::Bucket &source, const storage::spi::Bucket &target1,
-                     const storage::spi::Bucket &target2) override
+    void handleSplit(FeedToken token, const storage::spi::Bucket &, const storage::spi::Bucket &,
+                     const storage::spi::Bucket &) override
     {
-        (void) source;
-        (void) target1;
-        (void) target2;
-        token.setResult(ResultUP(new Result(_splitResult)), true);
+        token->setResult(ResultUP(new Result(_splitResult)), true);
     }
 
-    void handleJoin(FeedToken token, const storage::spi::Bucket &source1, const storage::spi::Bucket &source2,
-               const storage::spi::Bucket &target) override
+    void handleJoin(FeedToken token, const storage::spi::Bucket &, const storage::spi::Bucket &,
+               const storage::spi::Bucket &) override
     {
-        (void) source1;
-        (void) source2;
-        (void) target;
-        token.setResult(ResultUP(new Result(_joinResult)), true);
+        token->setResult(ResultUP(new Result(_joinResult)), true);
     }
 
     RetrieversSP getDocumentRetrievers(storage::spi::ReadConsistency) override {