From 584a971d35758c0e6fecb25879adb2b45e16b8eb Mon Sep 17 00:00:00 2001 From: Dennis Oberst Date: Wed, 22 May 2024 12:49:51 +0200 Subject: [PATCH] QGrpc{Channel, Call}Options: prefer 'set~()' over 'with~()' It was concluded that we will use the 'set~()' syntax in our options but still return a reference to allow chaining. Task-number: QTBUG-123625 Change-Id: I00838465b485d096b4b7bd3d691d24385543d662 Reviewed-by: Alexey Edelev --- .../grpc/chat/client/simplechatengine.cpp | 2 +- src/grpc/qgrpccalloptions.cpp | 8 +- src/grpc/qgrpccalloptions.h | 6 +- src/grpc/qgrpcchanneloptions.cpp | 8 +- src/grpc/qgrpcchanneloptions.h | 8 +- src/grpc/qgrpchttp2channel.cpp | 10 +-- src/grpcquick/qqmlgrpccalloptions.cpp | 6 +- src/grpcquick/qqmlgrpcchanneloptions.cpp | 10 +-- .../deadline/tst_grpc_client_deadline.cpp | 2 +- .../tst_grpc_client_serverstream.cpp | 2 +- .../client_test_common/grpcclienttestbase.cpp | 6 +- .../unarycall/tst_grpc_client_unarycall.cpp | 7 +- .../tst_qgrpchttp2channel.cpp | 75 +++++++++---------- 13 files changed, 76 insertions(+), 74 deletions(-) diff --git a/examples/grpc/chat/client/simplechatengine.cpp b/examples/grpc/chat/client/simplechatengine.cpp index 455aaa01..488a6d04 100644 --- a/examples/grpc/chat/client/simplechatengine.cpp +++ b/examples/grpc/chat/client/simplechatengine.cpp @@ -50,7 +50,7 @@ void SimpleChatEngine::login(const QString &name, const QString &password) { "user-name", { name.toUtf8() } }, { "user-password", { password.toUtf8() } }, }; - channelOptions.withMetadata(metadata); + channelOptions.setMetadata(metadata); std::shared_ptr channel = std::make_shared( channelOptions); // ![0] diff --git a/src/grpc/qgrpccalloptions.cpp b/src/grpc/qgrpccalloptions.cpp index 1a4b2a43..45b3f665 100644 --- a/src/grpc/qgrpccalloptions.cpp +++ b/src/grpc/qgrpccalloptions.cpp @@ -65,7 +65,7 @@ QGrpcCallOptions &QGrpcCallOptions::operator=(QGrpcCallOptions &&other) noexcept /*! Sets deadline value with \a deadline and returns updated QGrpcCallOptions object. */ -QGrpcCallOptions &QGrpcCallOptions::withDeadline(QGrpcDuration deadline) +QGrpcCallOptions &QGrpcCallOptions::setDeadline(QGrpcDuration deadline) { dPtr->deadline = deadline; return *this; @@ -77,7 +77,7 @@ QGrpcCallOptions &QGrpcCallOptions::withDeadline(QGrpcDuration deadline) For HTTP2-based channels, \a metadata is converted into HTTP/2 headers, that added to the corresponding HTTP/2 request. */ -QGrpcCallOptions &QGrpcCallOptions::withMetadata(const QGrpcMetadata &metadata) +QGrpcCallOptions &QGrpcCallOptions::setMetadata(const QGrpcMetadata &metadata) { dPtr->metadata = metadata; return *this; @@ -86,9 +86,9 @@ QGrpcCallOptions &QGrpcCallOptions::withMetadata(const QGrpcMetadata &metadata) /*! Sets \a metadata for a call and returns updated QGrpcCallOptions object. - \sa withMetadata() + \sa setMetadata() */ -QGrpcCallOptions &QGrpcCallOptions::withMetadata(QGrpcMetadata &&metadata) noexcept +QGrpcCallOptions &QGrpcCallOptions::setMetadata(QGrpcMetadata &&metadata) noexcept { dPtr->metadata = std::move(metadata); return *this; diff --git a/src/grpc/qgrpccalloptions.h b/src/grpc/qgrpccalloptions.h index d0f0c168..86221f67 100644 --- a/src/grpc/qgrpccalloptions.h +++ b/src/grpc/qgrpccalloptions.h @@ -26,9 +26,9 @@ public: Q_GRPC_EXPORT QGrpcCallOptions(QGrpcCallOptions &&other) noexcept; Q_GRPC_EXPORT QGrpcCallOptions &operator=(QGrpcCallOptions &&other) noexcept; - Q_GRPC_EXPORT QGrpcCallOptions &withDeadline(QGrpcDuration deadline); - Q_GRPC_EXPORT QGrpcCallOptions &withMetadata(const QGrpcMetadata &metadata); - Q_GRPC_EXPORT QGrpcCallOptions &withMetadata(QGrpcMetadata &&metadata) noexcept; + Q_GRPC_EXPORT QGrpcCallOptions &setDeadline(QGrpcDuration deadline); + Q_GRPC_EXPORT QGrpcCallOptions &setMetadata(const QGrpcMetadata &metadata); + Q_GRPC_EXPORT QGrpcCallOptions &setMetadata(QGrpcMetadata &&metadata) noexcept; [[nodiscard]] Q_GRPC_EXPORT std::optional deadline() const noexcept; [[nodiscard]] Q_GRPC_EXPORT const QGrpcMetadata &metadata() const & noexcept; diff --git a/src/grpc/qgrpcchanneloptions.cpp b/src/grpc/qgrpcchanneloptions.cpp index 9561e55e..3e45f09b 100644 --- a/src/grpc/qgrpcchanneloptions.cpp +++ b/src/grpc/qgrpcchanneloptions.cpp @@ -84,7 +84,7 @@ QGrpcChannelOptions::~QGrpcChannelOptions() = default; /*! Sets host value with \a host and returns updated QGrpcChannelOptions object. */ -QGrpcChannelOptions &QGrpcChannelOptions::withHost(const QUrl &host) +QGrpcChannelOptions &QGrpcChannelOptions::setHost(const QUrl &host) { dPtr->host = host; return *this; @@ -93,7 +93,7 @@ QGrpcChannelOptions &QGrpcChannelOptions::withHost(const QUrl &host) /*! Sets deadline value with \a deadline and returns updated QGrpcChannelOptions object. */ -QGrpcChannelOptions &QGrpcChannelOptions::withDeadline(QGrpcDuration deadline) +QGrpcChannelOptions &QGrpcChannelOptions::setDeadline(QGrpcDuration deadline) { dPtr->deadline = deadline; return *this; @@ -105,7 +105,7 @@ QGrpcChannelOptions &QGrpcChannelOptions::withDeadline(QGrpcDuration deadline) For HTTP2-based channels, \a metadata is converted into HTTP/2 headers, that added to each HTTP/2 request. */ -QGrpcChannelOptions &QGrpcChannelOptions::withMetadata(const QGrpcMetadata &metadata) +QGrpcChannelOptions &QGrpcChannelOptions::setMetadata(const QGrpcMetadata &metadata) { dPtr->metadata = metadata; return *this; @@ -120,7 +120,7 @@ QGrpcChannelOptions &QGrpcChannelOptions::withMetadata(const QGrpcMetadata &meta implementations. */ QGrpcChannelOptions & -QGrpcChannelOptions::withSerializationFormat(const QGrpcSerializationFormat &format) +QGrpcChannelOptions::setSerializationFormat(const QGrpcSerializationFormat &format) { dPtr->serializationFormat = format; return *this; diff --git a/src/grpc/qgrpcchanneloptions.h b/src/grpc/qgrpcchanneloptions.h index 05ef770f..5ac1f9eb 100644 --- a/src/grpc/qgrpcchanneloptions.h +++ b/src/grpc/qgrpcchanneloptions.h @@ -31,10 +31,10 @@ public: QGrpcChannelOptions(QGrpcChannelOptions &&other) noexcept; QGrpcChannelOptions &operator=(QGrpcChannelOptions &&other) noexcept; - QGrpcChannelOptions &withHost(const QUrl &host); - QGrpcChannelOptions &withDeadline(QGrpcDuration deadline); - QGrpcChannelOptions &withMetadata(const QGrpcMetadata &metadata); - QGrpcChannelOptions &withSerializationFormat(const QGrpcSerializationFormat &format); + QGrpcChannelOptions &setHost(const QUrl &host); + QGrpcChannelOptions &setDeadline(QGrpcDuration deadline); + QGrpcChannelOptions &setMetadata(const QGrpcMetadata &metadata); + QGrpcChannelOptions &setSerializationFormat(const QGrpcSerializationFormat &format); [[nodiscard]] QUrl host() const noexcept; [[nodiscard]] std::optional deadline() const noexcept; diff --git a/src/grpc/qgrpchttp2channel.cpp b/src/grpc/qgrpchttp2channel.cpp index faac627c..70fea891 100644 --- a/src/grpc/qgrpchttp2channel.cpp +++ b/src/grpc/qgrpchttp2channel.cpp @@ -61,7 +61,7 @@ using namespace Qt::StringLiterals; \code auto channelJson = std::make_shared< QGrpcHttp2Channel>(QGrpcChannelOptions{ QUrl("http://localhost:50051", QUrl::StrictMode) } - .withMetadata({ { "content-type"_ba, + .setMetadata({ { "content-type"_ba, "application/grpc+json"_ba } })); \endcode @@ -73,7 +73,7 @@ using namespace Qt::StringLiterals; }; auto channel = std::make_shared< QGrpcHttp2Channel>(QGrpcChannelOptions{ QUrl("http://localhost:50051", QUrl::StrictMode) } - .withSerializationFormat(QGrpcSerializationFormat{ "dummy", + .setSerializationFormat(QGrpcSerializationFormat{ "dummy", std::make_shared() })); \endcode @@ -593,15 +593,15 @@ QGrpcHttp2ChannelPrivate::QGrpcHttp2ChannelPrivate(const QGrpcChannelOptions &op if (it != channelOptions.metadata().end()) { if (formatSuffix.isEmpty() && it->second != DefaultContentType) { if (it->second == "application/grpc+json") { - channelOptions.withSerializationFormat(QGrpcSerializationFormat{ + channelOptions.setSerializationFormat(QGrpcSerializationFormat{ QGrpcSerializationFormat::Format::Json }); } else if (it->second == "application/grpc+proto" || it->second == DefaultContentType) { - channelOptions.withSerializationFormat(QGrpcSerializationFormat{ + channelOptions.setSerializationFormat(QGrpcSerializationFormat{ QGrpcSerializationFormat::Format::Protobuf }); } else { qGrpcWarning() << "Cannot choose the serializer for " << ContentTypeHeader << it->second << ". Using protobuf format as the default one."; - channelOptions.withSerializationFormat(QGrpcSerializationFormat{ + channelOptions.setSerializationFormat(QGrpcSerializationFormat{ QGrpcSerializationFormat::Format::Default }); } } else if (it->second != contentTypeFromOptions) { diff --git a/src/grpcquick/qqmlgrpccalloptions.cpp b/src/grpcquick/qqmlgrpccalloptions.cpp index d4013e66..d646dda3 100644 --- a/src/grpcquick/qqmlgrpccalloptions.cpp +++ b/src/grpcquick/qqmlgrpccalloptions.cpp @@ -24,7 +24,7 @@ qint64 QQmlGrpcCallOptions::deadline() const void QQmlGrpcCallOptions::setDeadline(qint64 value) { QGrpcDuration ms(value); - m_options.withDeadline(ms); + m_options.setDeadline(ms); emit deadlineChanged(); } @@ -43,9 +43,9 @@ void QQmlGrpcCallOptions::setMetadata(QQmlGrpcMetadata *value) if (m_metadata != value) { m_metadata = value; if (m_metadata) - m_options.withMetadata(m_metadata->metadata()); + m_options.setMetadata(m_metadata->metadata()); else - m_options.withMetadata(QGrpcMetadata()); + m_options.setMetadata(QGrpcMetadata()); emit metadataChanged(); } } diff --git a/src/grpcquick/qqmlgrpcchanneloptions.cpp b/src/grpcquick/qqmlgrpcchanneloptions.cpp index a08d769a..bef5fea0 100644 --- a/src/grpcquick/qqmlgrpcchanneloptions.cpp +++ b/src/grpcquick/qqmlgrpcchanneloptions.cpp @@ -41,7 +41,7 @@ QUrl QQmlGrpcChannelOptions::host() const void QQmlGrpcChannelOptions::setHost(const QUrl &newUrl) { Q_D(QQmlGrpcChannelOptions); - d->m_options.withHost(newUrl); + d->m_options.setHost(newUrl); emit hostChanged(); } @@ -56,7 +56,7 @@ void QQmlGrpcChannelOptions::setDeadline(qint64 value) { Q_D(QQmlGrpcChannelOptions); QGrpcDuration ms(value); - d->m_options.withDeadline(ms); + d->m_options.setDeadline(ms); emit deadlineChanged(); } @@ -76,9 +76,9 @@ void QQmlGrpcChannelOptions::setMetadata(QQmlGrpcMetadata *value) if (d->m_metadata != value) { d->m_metadata = value; if (d->m_metadata) - d->m_options.withMetadata(d->m_metadata->metadata()); + d->m_options.setMetadata(d->m_metadata->metadata()); else - d->m_options.withMetadata(QGrpcMetadata()); + d->m_options.setMetadata(QGrpcMetadata()); emit metadataChanged(); } } @@ -94,7 +94,7 @@ void QQmlGrpcChannelOptions::setSerializationFormat(QQmlSerializationFormat::Grp Q_D(QQmlGrpcChannelOptions); if (d->m_format != format) { d->m_format = format; - d->m_options.withSerializationFormat(QGrpcSerializationFormat{ + d->m_options.setSerializationFormat(QGrpcSerializationFormat{ static_cast(format) }); emit serializationFormatChanged(); } diff --git a/tests/auto/grpc/client/deadline/tst_grpc_client_deadline.cpp b/tests/auto/grpc/client/deadline/tst_grpc_client_deadline.cpp index b3035f8b..38bfe303 100644 --- a/tests/auto/grpc/client/deadline/tst_grpc_client_deadline.cpp +++ b/tests/auto/grpc/client/deadline/tst_grpc_client_deadline.cpp @@ -44,7 +44,7 @@ void QtGrpcClientDeadlineTest::channelAndCallDeadlineTest() const auto maxTimeoutDuration = QGrpcDuration(static_cast(MessageLatency * maxTimeout)); QGrpcCallOptions callOpts; - callOpts.withDeadline(minTimeoutDuration); + callOpts.setDeadline(minTimeoutDuration); SimpleStringMessage request; request.setTestFieldString("sleep"); diff --git a/tests/auto/grpc/client/serverstream/tst_grpc_client_serverstream.cpp b/tests/auto/grpc/client/serverstream/tst_grpc_client_serverstream.cpp index 16ef843f..c30c6997 100644 --- a/tests/auto/grpc/client/serverstream/tst_grpc_client_serverstream.cpp +++ b/tests/auto/grpc/client/serverstream/tst_grpc_client_serverstream.cpp @@ -395,7 +395,7 @@ void QtGrpcClientServerStreamTest::deadline() QFETCH(const int, ExpectedMessageCount); QGrpcCallOptions opt; - opt.withDeadline(timeout); + opt.setDeadline(timeout); SimpleStringMessage request; request.setTestFieldString("Stream"); diff --git a/tests/auto/grpc/client/shared/client_test_common/grpcclienttestbase.cpp b/tests/auto/grpc/client/shared/client_test_common/grpcclienttestbase.cpp index e068c6ba..04bd0730 100644 --- a/tests/auto/grpc/client/shared/client_test_common/grpcclienttestbase.cpp +++ b/tests/auto/grpc/client/shared/client_test_common/grpcclienttestbase.cpp @@ -34,13 +34,13 @@ void GrpcClientTestBase::initTestCase_data() << QFlags{ Channel::Qt } << std::shared_ptr(new QGrpcHttp2Channel(QGrpcChannelOptions{ QUrl("http://localhost:50051", QUrl::StrictMode) } - .withMetadata(md))); + .setMetadata(md))); QTest::newRow("Http2ClientJsonUnix") << QFlags{ Channel::Qt } << std::shared_ptr(new QGrpcHttp2Channel(QGrpcChannelOptions{ QUrl("unix:///tmp/qtgrpc_test.sock", QUrl::StrictMode) } - .withMetadata(md))); + .setMetadata(md))); } #endif @@ -81,7 +81,7 @@ void GrpcClientTestBase::initTestCase_data() << std::shared_ptr< QAbstractGrpcChannel>(new QGrpcHttp2Channel(QGrpcChannelOptions{ QUrl("http://localhost:50051", QUrl::StrictMode) } - .withDeadline(channelTimeout))); + .setDeadline(channelTimeout))); } } diff --git a/tests/auto/grpc/client/unarycall/tst_grpc_client_unarycall.cpp b/tests/auto/grpc/client/unarycall/tst_grpc_client_unarycall.cpp index af3060b0..7b9be4ab 100644 --- a/tests/auto/grpc/client/unarycall/tst_grpc_client_unarycall.cpp +++ b/tests/auto/grpc/client/unarycall/tst_grpc_client_unarycall.cpp @@ -228,7 +228,10 @@ void QtGrpcClientUnaryCallTest::metadata() QVERIFY(clientErrorSpy.isValid()); QGrpcCallOptions opt; - opt.withMetadata({ { "client_header", "1" }, { "client_return_header", "valid_value" } }); + opt.setMetadata({ + { "client_header", "1" }, + { "client_return_header", "valid_value" } + }); auto reply = client()->testMetadata({}, opt); QGrpcMetadata metadata; @@ -269,7 +272,7 @@ void QtGrpcClientUnaryCallTest::deadline() QFETCH(const QGrpcDuration, timeout); QGrpcCallOptions opt; - opt.withDeadline(timeout); + opt.setDeadline(timeout); SimpleStringMessage request; request.setTestFieldString("sleep"); diff --git a/tests/auto/grpc/qgrpchttp2channel/tst_qgrpchttp2channel.cpp b/tests/auto/grpc/qgrpchttp2channel/tst_qgrpchttp2channel.cpp index 8ceef8c9..1de84d3c 100644 --- a/tests/auto/grpc/qgrpchttp2channel/tst_qgrpchttp2channel.cpp +++ b/tests/auto/grpc/qgrpchttp2channel/tst_qgrpchttp2channel.cpp @@ -123,20 +123,20 @@ void QGrpcHttp2ChannelTest::serializationFormat() channel = std::make_shared< QGrpcHttp2Channel>(QGrpcChannelOptions{ QUrl("http://localhost:50051", QUrl::StrictMode) } - .withSerializationFormat(QGrpcSerializationFormat{ + .setSerializationFormat(QGrpcSerializationFormat{ QGrpcSerializationFormat::Format::Json })); QVERIFY(dynamic_cast(channel->serializer().get()) != nullptr); channel = std::make_shared< QGrpcHttp2Channel>(QGrpcChannelOptions{ QUrl("http://localhost:50051", QUrl::StrictMode) } - .withSerializationFormat(QGrpcSerializationFormat{ + .setSerializationFormat(QGrpcSerializationFormat{ QGrpcSerializationFormat::Format::Protobuf })); QVERIFY(dynamic_cast(channel->serializer().get()) != nullptr); channel = std::make_shared< QGrpcHttp2Channel>(QGrpcChannelOptions{ QUrl("http://localhost:50051", QUrl::StrictMode) } - .withSerializationFormat({ "dummy", - std::make_shared() })); + .setSerializationFormat({ "dummy", + std::make_shared() })); QVERIFY(dynamic_cast(channel->serializer().get()) != nullptr); } @@ -146,7 +146,7 @@ void QGrpcHttp2ChannelTest::serializationFormatWithHeaders() QGrpcHttp2Channel>(QGrpcChannelOptions{ QUrl("http://localhost:50051", QUrl::StrictMode) } - .withMetadata({ { "content-type"_ba, "application/grpc"_ba } })); + .setMetadata({ { "content-type"_ba, "application/grpc"_ba } })); QVERIFY(dynamic_cast(channel->serializer().get()) != nullptr); // Initialize with various content-type headers @@ -154,41 +154,40 @@ void QGrpcHttp2ChannelTest::serializationFormatWithHeaders() QGrpcHttp2Channel>(QGrpcChannelOptions{ QUrl("http://localhost:50051", QUrl::StrictMode) } - .withMetadata({ { "content-type"_ba, - "application/grpc+json"_ba } })); + .setMetadata({ { "content-type"_ba, "application/grpc+json"_ba } })); QVERIFY(dynamic_cast(channel->serializer().get()) != nullptr); channel = std::make_shared< QGrpcHttp2Channel>(QGrpcChannelOptions{ QUrl("http://localhost:50051", QUrl::StrictMode) } - .withMetadata({ { "content-type"_ba, - "application/grpc+proto"_ba } })); + .setMetadata({ { "content-type"_ba, + "application/grpc+proto"_ba } })); QVERIFY(dynamic_cast(channel->serializer().get()) != nullptr); channel = std::make_shared< QGrpcHttp2Channel>(QGrpcChannelOptions{ QUrl("http://localhost:50051", QUrl::StrictMode) } - .withMetadata({ { "content-type"_ba, - "application/grpc+unknown"_ba } })); + .setMetadata({ { "content-type"_ba, + "application/grpc+unknown"_ba } })); QVERIFY(dynamic_cast(channel->serializer().get()) != nullptr); // Initialize with the default content-type header and various serialization formats - channel = std::make_shared(QGrpcChannelOptions{ + channel = std::make_shared< + QGrpcHttp2Channel>(QGrpcChannelOptions{ QUrl("http://localhost:50051", QUrl::StrictMode) } - .withMetadata({ { "content-type"_ba, - "application/grpc"_ba } }) - .withSerializationFormat(QGrpcSerializationFormat{})); + .setMetadata({ { "content-type"_ba, "application/grpc"_ba } }) + .setSerializationFormat(QGrpcSerializationFormat{})); QVERIFY(dynamic_cast(channel->serializer().get()) != nullptr); channel = std::make_shared< QGrpcHttp2Channel>(QGrpcChannelOptions{ QUrl("http://localhost:50051", QUrl::StrictMode) } - .withMetadata({ { "content-type"_ba, "application/grpc"_ba } }) - .withSerializationFormat(QGrpcSerializationFormat{ + .setMetadata({ { "content-type"_ba, "application/grpc"_ba } }) + .setSerializationFormat(QGrpcSerializationFormat{ QGrpcSerializationFormat::Format::Json })); QVERIFY(dynamic_cast(channel->serializer().get()) != nullptr); @@ -196,8 +195,8 @@ void QGrpcHttp2ChannelTest::serializationFormatWithHeaders() QGrpcHttp2Channel>(QGrpcChannelOptions{ QUrl("http://localhost:50051", QUrl::StrictMode) } - .withMetadata({ { "content-type"_ba, "application/grpc"_ba } }) - .withSerializationFormat(QGrpcSerializationFormat{ + .setMetadata({ { "content-type"_ba, "application/grpc"_ba } }) + .setSerializationFormat(QGrpcSerializationFormat{ QGrpcSerializationFormat::Format::Protobuf })); QVERIFY(dynamic_cast(channel->serializer().get()) != nullptr); @@ -205,9 +204,9 @@ void QGrpcHttp2ChannelTest::serializationFormatWithHeaders() QGrpcHttp2Channel>(QGrpcChannelOptions{ QUrl("http://localhost:50051", QUrl::StrictMode) } - .withMetadata({ { "content-type"_ba, "application/grpc"_ba } }) - .withSerializationFormat({ "dummy", - std::make_shared() })); + .setMetadata({ { "content-type"_ba, "application/grpc"_ba } }) + .setSerializationFormat({ "dummy", + std::make_shared() })); QVERIFY(dynamic_cast(channel->serializer().get()) != nullptr); // Initialize with the content-type header incompatible with serialization format @@ -215,8 +214,8 @@ void QGrpcHttp2ChannelTest::serializationFormatWithHeaders() QGrpcHttp2Channel>(QGrpcChannelOptions{ QUrl("http://localhost:50051", QUrl::StrictMode) } - .withMetadata({ { "content-type"_ba, "application/grpc+json"_ba } }) - .withSerializationFormat(QGrpcSerializationFormat{ + .setMetadata({ { "content-type"_ba, "application/grpc+json"_ba } }) + .setSerializationFormat(QGrpcSerializationFormat{ QGrpcSerializationFormat::Format::Protobuf })); QVERIFY(dynamic_cast(channel->serializer().get()) != nullptr); @@ -224,17 +223,17 @@ void QGrpcHttp2ChannelTest::serializationFormatWithHeaders() QGrpcHttp2Channel>(QGrpcChannelOptions{ QUrl("http://localhost:50051", QUrl::StrictMode) } - .withMetadata({ { "content-type"_ba, "application/grpc+json"_ba } }) - .withSerializationFormat(QGrpcSerializationFormat{})); + .setMetadata({ { "content-type"_ba, "application/grpc+json"_ba } }) + .setSerializationFormat(QGrpcSerializationFormat{})); QVERIFY(dynamic_cast(channel->serializer().get()) != nullptr); channel = std::make_shared< QGrpcHttp2Channel>(QGrpcChannelOptions{ QUrl("http://localhost:50051", QUrl::StrictMode) } - .withMetadata({ { "content-type"_ba, "application/grpc+json"_ba } }) - .withSerializationFormat({ "dummy", - std::make_shared() })); + .setMetadata({ { "content-type"_ba, "application/grpc+json"_ba } }) + .setSerializationFormat({ "dummy", + std::make_shared() })); QVERIFY(dynamic_cast(channel->serializer().get()) != nullptr); // Initialize with the content-type header matching the serialization format @@ -242,8 +241,8 @@ void QGrpcHttp2ChannelTest::serializationFormatWithHeaders() QGrpcHttp2Channel>(QGrpcChannelOptions{ QUrl("http://localhost:50051", QUrl::StrictMode) } - .withMetadata({ { "content-type"_ba, "application/grpc+proto"_ba } }) - .withSerializationFormat(QGrpcSerializationFormat{ + .setMetadata({ { "content-type"_ba, "application/grpc+proto"_ba } }) + .setSerializationFormat(QGrpcSerializationFormat{ QGrpcSerializationFormat::Format::Protobuf })); QVERIFY(dynamic_cast(channel->serializer().get()) != nullptr); @@ -251,8 +250,8 @@ void QGrpcHttp2ChannelTest::serializationFormatWithHeaders() QGrpcHttp2Channel>(QGrpcChannelOptions{ QUrl("http://localhost:50051", QUrl::StrictMode) } - .withMetadata({ { "content-type"_ba, "application/grpc+json"_ba } }) - .withSerializationFormat(QGrpcSerializationFormat{ + .setMetadata({ { "content-type"_ba, "application/grpc+json"_ba } }) + .setSerializationFormat(QGrpcSerializationFormat{ QGrpcSerializationFormat::Format::Json })); QVERIFY(dynamic_cast(channel->serializer().get()) != nullptr); @@ -260,17 +259,17 @@ void QGrpcHttp2ChannelTest::serializationFormatWithHeaders() QGrpcHttp2Channel>(QGrpcChannelOptions{ QUrl("http://localhost:50051", QUrl::StrictMode) } - .withMetadata({ { "content-type"_ba, "application/grpc"_ba } }) - .withSerializationFormat(QGrpcSerializationFormat{})); + .setMetadata({ { "content-type"_ba, "application/grpc"_ba } }) + .setSerializationFormat(QGrpcSerializationFormat{})); QVERIFY(dynamic_cast(channel->serializer().get()) != nullptr); channel = std::make_shared< QGrpcHttp2Channel>(QGrpcChannelOptions{ QUrl("http://localhost:50051", QUrl::StrictMode) } - .withMetadata({ { "content-type"_ba, "application/grpc+dummy"_ba } }) - .withSerializationFormat({ "dummy", - std::make_shared() })); + .setMetadata({ { "content-type"_ba, "application/grpc+dummy"_ba } }) + .setSerializationFormat({ "dummy", + std::make_shared() })); QVERIFY(dynamic_cast(channel->serializer().get()) != nullptr); }