From 2acd0cff8ffe50cab70a6eb896457cc9605070ed Mon Sep 17 00:00:00 2001
From: Chris Bradley <chris.bradley@ecmwf.int>
Date: Tue, 14 Jan 2025 17:15:12 +0000
Subject: [PATCH] Rename to CallbackRegistry

---
 src/fdb5/api/FDBFactory.h             |  2 +-
 src/fdb5/api/helpers/Callback.h       | 10 +++++-----
 src/fdb5/remote/server/StoreHandler.h |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/fdb5/api/FDBFactory.h b/src/fdb5/api/FDBFactory.h
index f1057b2a9..6ec6e7b99 100644
--- a/src/fdb5/api/FDBFactory.h
+++ b/src/fdb5/api/FDBFactory.h
@@ -60,7 +60,7 @@ class FDBToolRequest;
 
 /// The base class that FDB implementations are derived from
 
-class FDBBase : private eckit::NonCopyable, public CallbackInterface {
+class FDBBase : private eckit::NonCopyable, public CallbackRegistry {
 
 public: // methods
 
diff --git a/src/fdb5/api/helpers/Callback.h b/src/fdb5/api/helpers/Callback.h
index 52545bb8a..a628eb8b7 100644
--- a/src/fdb5/api/helpers/Callback.h
+++ b/src/fdb5/api/helpers/Callback.h
@@ -21,20 +21,20 @@
 namespace fdb5 {
 
 class FDB;
-class CallbackInterface;
+class CallbackRegistry;
 
 using ArchiveCallback = std::function<void(const Key& key, const void* data, size_t length, std::future<std::shared_ptr<const FieldLocation>>)>;
 using FlushCallback = std::function<void()>;
-using ConstructorCallback = std::function<void(CallbackInterface&)>;
+using ConstructorCallback = std::function<void(CallbackRegistry&)>;
 
-static const ArchiveCallback CALLBACK_ARCHIVE_NOOP = [](const Key& key, const void* data, size_t length, std::future<std::shared_ptr<const FieldLocation>>) {};
+static const ArchiveCallback CALLBACK_ARCHIVE_NOOP = [](auto&&...) {};
 static const FlushCallback CALLBACK_FLUSH_NOOP = []() {};
-static const ConstructorCallback CALLBACK_CONSTRUCTOR_NOOP = [](CallbackInterface&) {};
+static const ConstructorCallback CALLBACK_CONSTRUCTOR_NOOP = [](auto&&...) {};
 
 // -------------------------------------------------------------------------------------------------
 
 // This class provides a common interface for registering callbacks with an FDB object or a Store/Catalogue Handler.
-class CallbackInterface {
+class CallbackRegistry {
 public:
 
     void registerFlushCallback(FlushCallback callback) {flushCallback_ = callback;}
diff --git a/src/fdb5/remote/server/StoreHandler.h b/src/fdb5/remote/server/StoreHandler.h
index df4b3305d..40362b09a 100644
--- a/src/fdb5/remote/server/StoreHandler.h
+++ b/src/fdb5/remote/server/StoreHandler.h
@@ -30,7 +30,7 @@ struct StoreHelper {
 };
 
 //----------------------------------------------------------------------------------------------------------------------
-class StoreHandler : public ServerConnection, public CallbackInterface {
+class StoreHandler : public ServerConnection, public CallbackRegistry {
 public:  // methods
 
     StoreHandler(eckit::net::TCPSocket& socket, const Config& config);