Minor adjustments based on review feedback.

6 files changed, 12 insertions, 14 deletions

diff --git a/storage/src/tests/storageserver/rpc/caching_rpc_target_resolver_test.cpp b/storage/src/tests/storageserver/rpc/caching_rpc_target_resolver_test.cpp
index bdf0aaee610..9a2eb4d5c64 100644
--- a/storage/src/tests/storageserver/rpc/caching_rpc_target_resolver_test.cpp
+++ b/storage/src/tests/storageserver/rpc/caching_rpc_target_resolver_test.cpp
@@ -34,8 +34,8 @@ private:
     bool& _valid;
 public:
     MockWrappedFrtTarget(bool& valid) : _valid(valid) {}
-    FRT_Target* get() override { return nullptr; }
-    bool is_valid() const override { return _valid; }
+    FRT_Target* get() noexcept override { return nullptr; }
+    bool is_valid() const noexcept override { return _valid; }
 };
 
 class MockTargetFactory : public RpcTargetFactory {
@@ -73,7 +73,7 @@ public:
     void add_mapping(const StorageMessageAddress& address, const vespalib::string& connection_spec) {
         mirror.mappings[to_slobrok_id(address)] = {{to_slobrok_id(address), connection_spec}};
     }
-    vespalib::string to_slobrok_id(const storage::api::StorageMessageAddress& address) const {
+    static vespalib::string to_slobrok_id(const storage::api::StorageMessageAddress& address) {
         return CachingRpcTargetResolver::address_to_slobrok_id(address);
     }
 };
diff --git a/storage/src/vespa/storage/storageserver/rpc/caching_rpc_target_resolver.cpp b/storage/src/vespa/storage/storageserver/rpc/caching_rpc_target_resolver.cpp
index 14c435a8663..5957cd33954 100644
--- a/storage/src/vespa/storage/storageserver/rpc/caching_rpc_target_resolver.cpp
+++ b/storage/src/vespa/storage/storageserver/rpc/caching_rpc_target_resolver.cpp
@@ -48,8 +48,7 @@ std::shared_ptr<RpcTarget>
 CachingRpcTargetResolver::consider_update_target(const vespalib::string& slobrok_id,
                                                  const vespalib::string& connection_spec,
                                                  uint32_t curr_slobrok_gen,
-                                                 const UniqueLock& targets_lock) {
-    (void) targets_lock;
+                                                 [[maybe_unused]] const UniqueLock& targets_lock) {
     // If address has the same spec as the existing target, just reuse it.
     auto itr = _targets.find(slobrok_id);
     if ((itr != _targets.end())
@@ -68,8 +67,7 @@ std::shared_ptr<RpcTarget>
 CachingRpcTargetResolver::insert_new_target_mapping(const vespalib::string& slobrok_id,
                                                     const vespalib::string& connection_spec,
                                                     uint32_t curr_slobrok_gen,
-                                                    const UniqueLock& targets_lock) {
-    (void) targets_lock;
+                                                    [[maybe_unused]] const UniqueLock& targets_lock) {
     auto target = _target_factory.make_target(connection_spec, curr_slobrok_gen); // TODO expensive inside lock?
     assert(target);
     std::shared_ptr<RpcTarget> rpc_target(std::move(target));
diff --git a/storage/src/vespa/storage/storageserver/rpc/caching_rpc_target_resolver.h b/storage/src/vespa/storage/storageserver/rpc/caching_rpc_target_resolver.h
index e9a2aece4c5..cf94f7545bc 100644
--- a/storage/src/vespa/storage/storageserver/rpc/caching_rpc_target_resolver.h
+++ b/storage/src/vespa/storage/storageserver/rpc/caching_rpc_target_resolver.h
@@ -40,8 +40,8 @@ private:
                                                          const UniqueLock& targets_lock);
 
 public:
-    explicit CachingRpcTargetResolver(const slobrok::api::IMirrorAPI& slobrok_mirror,
-                                      const RpcTargetFactory& target_factory);
+    CachingRpcTargetResolver(const slobrok::api::IMirrorAPI& slobrok_mirror,
+                             const RpcTargetFactory& target_factory);
     ~CachingRpcTargetResolver();
 
     static vespalib::string address_to_slobrok_id(const api::StorageMessageAddress& address);
diff --git a/storage/src/vespa/storage/storageserver/rpc/rpc_target.h b/storage/src/vespa/storage/storageserver/rpc/rpc_target.h
index 52356454685..0f2dec4269c 100644
--- a/storage/src/vespa/storage/storageserver/rpc/rpc_target.h
+++ b/storage/src/vespa/storage/storageserver/rpc/rpc_target.h
@@ -14,8 +14,8 @@ namespace storage::rpc {
 class WrappedFrtTarget {
 public:
     virtual ~WrappedFrtTarget() = default;
-    virtual FRT_Target* get() = 0;
-    virtual bool is_valid() const = 0;
+    virtual FRT_Target* get() noexcept = 0;
+    virtual bool is_valid() const noexcept = 0;
 };
 
 struct RpcTarget {
diff --git a/storage/src/vespa/storage/storageserver/rpc/rpc_target_factory.h b/storage/src/vespa/storage/storageserver/rpc/rpc_target_factory.h
index 20744d94a1f..8411a273dc2 100644
--- a/storage/src/vespa/storage/storageserver/rpc/rpc_target_factory.h
+++ b/storage/src/vespa/storage/storageserver/rpc/rpc_target_factory.h
@@ -13,7 +13,7 @@ class RpcTarget;
  */
 class RpcTargetFactory {
 public:
-    virtual ~RpcTargetFactory() {}
+    virtual ~RpcTargetFactory() = default;
     virtual std::unique_ptr<RpcTarget> make_target(const vespalib::string& connection_spec, uint32_t slobrok_gen) const = 0;
 };
 
diff --git a/storage/src/vespa/storage/storageserver/rpc/shared_rpc_resources.cpp b/storage/src/vespa/storage/storageserver/rpc/shared_rpc_resources.cpp
index 03575987560..32025f917d0 100644
--- a/storage/src/vespa/storage/storageserver/rpc/shared_rpc_resources.cpp
+++ b/storage/src/vespa/storage/storageserver/rpc/shared_rpc_resources.cpp
@@ -33,8 +33,8 @@ public:
     ~WrappedFrtTargetImpl() override {
         _target->SubRef();
     }
-    FRT_Target* get() override { return _target; }
-    bool is_valid() const override { return _target->IsValid(); }
+    FRT_Target* get() noexcept override { return _target; }
+    bool is_valid() const noexcept override { return _target->IsValid(); }
 };
 
 }