GC unused parameter. No need to say maybe when it is definitive.

7 files changed, 9 insertions, 11 deletions

diff --git a/config/src/apps/vespa-get-config/getconfig.cpp b/config/src/apps/vespa-get-config/getconfig.cpp
index 65dc800c275..e8ef1765473 100644
--- a/config/src/apps/vespa-get-config/getconfig.cpp
+++ b/config/src/apps/vespa-get-config/getconfig.cpp
@@ -216,8 +216,7 @@ GetConfig::Main()
         vespaVersion = VespaVersion::fromString(vespaVersionString);
     }
 
-    int protocolVersion = config::protocol::readProtocolVersion();
-    FRTConfigRequestFactory requestFactory(protocolVersion, traceLevel, vespaVersion, config::protocol::readProtocolCompressionType());
+    FRTConfigRequestFactory requestFactory(traceLevel, vespaVersion, config::protocol::readProtocolCompressionType());
     FRTConnection connection(spec, _server->supervisor(), TimingValues());
     ConfigKey key(configId, defName, defNamespace, defMD5, defSchema);
     ConfigState state(configMD5, generation, false);
diff --git a/config/src/tests/frt/frt.cpp b/config/src/tests/frt/frt.cpp
index 0d70605fa62..6cffe079dae 100644
--- a/config/src/tests/frt/frt.cpp
+++ b/config/src/tests/frt/frt.cpp
@@ -218,7 +218,7 @@ namespace {
 
         FRTFixture(SourceFixture & f1)
             : result(2000, 10000),
-              requestFactory(1, 3, VespaVersion::fromString("1.2.3"), CompressionType::UNCOMPRESSED),
+              requestFactory(3, VespaVersion::fromString("1.2.3"), CompressionType::UNCOMPRESSED),
               src(ConnectionFactory::SP(new FactoryMock(&f1.conn)),
                   requestFactory,
                   ConfigAgent::UP(new AgentFixture(&result)),
diff --git a/config/src/vespa/config/frt/frtconfigrequestfactory.cpp b/config/src/vespa/config/frt/frtconfigrequestfactory.cpp
index d32ae411125..fbc13556d14 100644
--- a/config/src/vespa/config/frt/frtconfigrequestfactory.cpp
+++ b/config/src/vespa/config/frt/frtconfigrequestfactory.cpp
@@ -10,7 +10,7 @@ namespace config {
 /**
  * Factory for creating config requests depending on protocol version;
  */
-FRTConfigRequestFactory::FRTConfigRequestFactory([[maybe_unused]] int protocolVersion, int traceLevel, const VespaVersion & vespaVersion, const CompressionType & compressionType)
+FRTConfigRequestFactory::FRTConfigRequestFactory(int traceLevel, const VespaVersion & vespaVersion, const CompressionType & compressionType)
     : _traceLevel(traceLevel),
       _vespaVersion(vespaVersion),
       _hostName(vespalib::HostName::get()),
@@ -18,8 +18,7 @@ FRTConfigRequestFactory::FRTConfigRequestFactory([[maybe_unused]] int protocolVe
 {
 }
 
-FRTConfigRequestFactory::~FRTConfigRequestFactory() {
-}
+FRTConfigRequestFactory::~FRTConfigRequestFactory() = default;
 
 FRTConfigRequest::UP
 FRTConfigRequestFactory::createConfigRequest(const ConfigKey & key, Connection * connection,
diff --git a/config/src/vespa/config/frt/frtconfigrequestfactory.h b/config/src/vespa/config/frt/frtconfigrequestfactory.h
index c70b8920fdd..7c37ecd76b2 100644
--- a/config/src/vespa/config/frt/frtconfigrequestfactory.h
+++ b/config/src/vespa/config/frt/frtconfigrequestfactory.h
@@ -18,7 +18,7 @@ namespace config {
 class FRTConfigRequestFactory
 {
 public:
-    FRTConfigRequestFactory(int protocolVersion, int traceLevel, const VespaVersion & vespaVersion, const CompressionType & compressionType);
+    FRTConfigRequestFactory(int traceLevel, const VespaVersion & vespaVersion, const CompressionType & compressionType);
     ~FRTConfigRequestFactory();
 
     FRTConfigRequest::UP createConfigRequest(const ConfigKey & key, Connection * connection, const ConfigState & state, int64_t serverTimeout) const;
diff --git a/config/src/vespa/config/frt/frtsourcefactory.cpp b/config/src/vespa/config/frt/frtsourcefactory.cpp
index c58571e3ac4..67e973562db 100644
--- a/config/src/vespa/config/frt/frtsourcefactory.cpp
+++ b/config/src/vespa/config/frt/frtsourcefactory.cpp
@@ -4,9 +4,9 @@
 
 namespace config {
 
-FRTSourceFactory::FRTSourceFactory(ConnectionFactory::UP connectionFactory, const TimingValues & timingValues, int protocolVersion, int traceLevel, const VespaVersion & vespaVersion, const CompressionType & compressionType)
+FRTSourceFactory::FRTSourceFactory(ConnectionFactory::UP connectionFactory, const TimingValues & timingValues, int traceLevel, const VespaVersion & vespaVersion, const CompressionType & compressionType)
     : _connectionFactory(std::move(connectionFactory)),
-      _requestFactory(protocolVersion, traceLevel, vespaVersion, compressionType),
+      _requestFactory(traceLevel, vespaVersion, compressionType),
       _timingValues(timingValues)
 {
 }
diff --git a/config/src/vespa/config/frt/frtsourcefactory.h b/config/src/vespa/config/frt/frtsourcefactory.h
index 23596c1c6cd..4bbcbcb366d 100644
--- a/config/src/vespa/config/frt/frtsourcefactory.h
+++ b/config/src/vespa/config/frt/frtsourcefactory.h
@@ -14,7 +14,7 @@ namespace config {
 class FRTSourceFactory : public SourceFactory
 {
 public:
-    FRTSourceFactory(ConnectionFactory::UP connectionFactory, const TimingValues & timingValues, int protocolVersion, int traceLevel, const VespaVersion & vespaVersion, const CompressionType & compressionType);
+    FRTSourceFactory(ConnectionFactory::UP connectionFactory, const TimingValues & timingValues, int traceLevel, const VespaVersion & vespaVersion, const CompressionType & compressionType);
 
     /**
      * Create source handling config described by key.
diff --git a/config/src/vespa/config/subscription/sourcespec.cpp b/config/src/vespa/config/subscription/sourcespec.cpp
index 326b3191fd0..e355e0c1bd6 100644
--- a/config/src/vespa/config/subscription/sourcespec.cpp
+++ b/config/src/vespa/config/subscription/sourcespec.cpp
@@ -121,7 +121,7 @@ ServerSpec::createSourceFactory(const TimingValues & timingValues) const
 {
     const auto vespaVersion = VespaVersion::getCurrentVersion();
     return std::make_unique<FRTSourceFactory>(std::make_unique<FRTConnectionPool>(*this, timingValues), timingValues,
-                                              _protocolVersion, _traceLevel, vespaVersion, _compressionType);
+                                              _traceLevel, vespaVersion, _compressionType);
 }