new overloads for build method of UMessageBuilder to avoid copy

Author: MaximilianToe

include/up-cpp/datamodel/builder/UMessage.h

@@ -234,6 +234,16 @@ struct UMessageBuilder {
 	/// @return A built message with no payload populated.
 	[[nodiscard]] v1::UMessage build() const;
 
+	/// @brief Creates a UMessage based on the builder's current state.
+	///
+	/// @param A UUri of the method that should be called
+	///
+	/// @throws UnexpectedFormat if withPayloadFormat() has been previously
+	///         called.
+	///
+	/// @return A built message with no payload populated.
+	[[nodiscard]] v1::UMessage build(const v1::UUri&) const;
+
 	/// @brief Creates a UMessage with a provided payload based on the
 	///        builder's current state.
 	///
@@ -247,6 +257,21 @@ struct UMessageBuilder {
 	/// @return A built message with the provided payload data embedded.
 	[[nodiscard]] v1::UMessage build(builder::Payload&&) const;
 
+	/// @brief Creates a UMessage with a provided payload based on the
+	///        builder's current state.
+	///
+	/// @param A UUri of the method that should be called
+	///
+	/// @param A Payload builder containing a payload to embed in the message.
+	///
+	/// @note The contents of the payload builder will be moved.
+	///
+	/// @throws UnexpectedFormat if withPayloadFormat() has been previously
+	///         called and the format in the payload builder does not match.
+	///
+	/// @return A built message with the provided payload data embedded.
+	[[nodiscard]] v1::UMessage build(const v1::UUri&, builder::Payload&&) const;
+
 	/// @brief Access the attributes of the message being built.
 	/// @return A reference to the attributes of the message being built.
 	[[deprecated(

src/communication/RpcClient.cpp

@@ -208,19 +208,13 @@ RpcClient::InvokeHandle RpcClient::invokeMethod(v1::UMessage&& request,
 RpcClient::InvokeHandle RpcClient::invokeMethod(
     const v1::UUri& method, datamodel::builder::Payload&& payload,
     Callback&& callback) {
-	// makes a local copy of the builder to make this call thread safe
-	auto local_builder = builder_;
-	return invokeMethod(
-	    local_builder.withMethod(method).build(std::move(payload)),
-	    std::move(callback));
+	return invokeMethod(builder_.build(method, std::move(payload)),
+	                    std::move(callback));
 }
 
 RpcClient::InvokeHandle RpcClient::invokeMethod(const v1::UUri& method,
                                                 Callback&& callback) {
-	// makes a local copy of the builder to make this call thread safe
-	auto local_builder = builder_;
-	return invokeMethod(local_builder.withMethod(method).build(),
-	                    std::move(callback));
+	return invokeMethod(builder_.build(method), std::move(callback));
 }
 
 RpcClient::InvokeFuture RpcClient::invokeMethod(

src/datamodel/builder/UMessage.cpp

@@ -218,6 +218,21 @@ v1::UMessage UMessageBuilder::build() const {
 	return message;
 }
 
+v1::UMessage UMessageBuilder::build(const v1::UUri& method) const {
+	v1::UMessage message;
+	if (expectedPayloadFormat_.has_value()) {
+		throw UnexpectedFormat(
+		    "Tried to build with no payload when a payload format has been set "
+		    "using withPayloadFormat()");
+	}
+
+	*message.mutable_attributes() = attributes_;
+	*message.mutable_attributes()->mutable_sink() = method;
+	*(message.mutable_attributes()->mutable_id()) = uuidBuilder_.build();
+
+	return message;
+}
+
 v1::UMessage UMessageBuilder::build(builder::Payload&& payload) const {
 	v1::UMessage message;
 
@@ -236,6 +251,26 @@ v1::UMessage UMessageBuilder::build(builder::Payload&& payload) const {
 	return message;
 }
 
+v1::UMessage UMessageBuilder::build(const v1::UUri& method,
+                                    builder::Payload&& payload) const {
+	v1::UMessage message;
+
+	*message.mutable_attributes() = attributes_;
+	*message.mutable_attributes()->mutable_sink() = method;
+	*(message.mutable_attributes()->mutable_id()) = uuidBuilder_.build();
+	auto [payloadData, payloadFormat] = std::move(payload).buildMove();
+	if (expectedPayloadFormat_.has_value()) {
+		if (payloadFormat != expectedPayloadFormat_) {
+			throw UnexpectedFormat(
+			    "Payload format does not match the expected format");
+		}
+	}
+	*message.mutable_payload() = std::move(payloadData);
+	message.mutable_attributes()->set_payload_format(payloadFormat);
+
+	return message;
+}
+
 UMessageBuilder::UMessageBuilder(v1::UMessageType msg_type, v1::UUri&& source,
                                  std::optional<v1::UUri>&& sink,
                                  std::optional<v1::UUID>&& request_id)