Remove UPayload

Cargo.toml

@@ -44,7 +44,7 @@ bytes = { version = "1.5" }
 chrono = { version = "0.4.32" }
 mediatype = "0.19"
 once_cell = { version = "1.19" }
-protobuf = { version = "3.3" }
+protobuf = { version = "3.3", features = ["with-bytes"] }
 rand = { version = "0.8" }
 regex = { version = "1.10" }
 url = { version = "2.5" }

build.rs

@@ -16,6 +16,8 @@ use std::fs;
 use std::path::Path;
 use std::path::PathBuf;
 
+use protobuf_codegen::Customize;
+
 const UPROTOCOL_BASE_URI: &str =
     "https://raw.githubusercontent.com/eclipse-uprotocol/up-spec/main/up-core-api/uprotocol";
 
@@ -26,7 +28,6 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
             format!("{}/uuid.proto", UPROTOCOL_BASE_URI).as_str(),
             format!("{}/uri.proto", UPROTOCOL_BASE_URI).as_str(),
             format!("{}/uattributes.proto", UPROTOCOL_BASE_URI).as_str(),
-            format!("{}/upayload.proto", UPROTOCOL_BASE_URI).as_str(),
             format!("{}/umessage.proto", UPROTOCOL_BASE_URI).as_str(),
             format!("{}/ustatus.proto", UPROTOCOL_BASE_URI).as_str(),
             // not used in the SDK yet, but for completeness sake
@@ -73,6 +74,7 @@ fn get_and_build_protos(
         .protoc()
         // use vendored protoc instead of relying on user provided protobuf installation
         .protoc_path(&protoc_bin_vendored::protoc_bin_path().unwrap())
+        .customize(Customize::default().tokio_bytes(true))
         .include(proto_folder)
         .inputs(proto_files)
         .cargo_out_dir(output_folder)

src/lib.rs

@@ -44,22 +44,17 @@
 
 // up_core_api types used and augmented by up_rust - symbols re-exported to toplevel, errors are module-specific
 mod rpc;
-pub use rpc::{RpcClient, RpcClientResult};
-pub use rpc::{RpcMapper, RpcMapperError};
-pub use rpc::{RpcPayload, RpcPayloadResult, RpcResult};
+pub use rpc::{RpcClient, RpcClientResult, RpcResult};
 
 mod uattributes;
 pub use uattributes::{
     PublishValidator, RequestValidator, ResponseValidator, UAttributesValidator,
     UAttributesValidators,
 };
-pub use uattributes::{UAttributes, UAttributesError, UMessageType, UPriority};
+pub use uattributes::{UAttributes, UAttributesError, UMessageType, UPayloadFormat, UPriority};
 
 mod umessage;
-pub use umessage::{UMessage, UMessageBuilder, UMessageBuilderError};
-
-mod upayload;
-pub use upayload::{UPayload, UPayloadError, UPayloadFormat};
+pub use umessage::{UMessage, UMessageBuilder, UMessageError};
 
 mod uri;
 pub use uri::{UUri, UUriError};

src/rpc.rs

@@ -12,9 +12,7 @@
  ********************************************************************************/
 
 mod rpcclient;
-mod rpcmapper;
 mod rpcresult;
 
 pub use rpcclient::*;
-pub use rpcmapper::*;
 pub use rpcresult::*;

src/rpc/rpcclient.rs

@@ -13,9 +13,9 @@
 
 use async_trait::async_trait;
 
-use crate::{RpcMapperError, UMessage, UPayload, UPriority, UUri};
+use crate::{UMessage, UMessageError, UUri};
 
-pub type RpcClientResult = Result<UMessage, RpcMapperError>;
+pub type RpcClientResult = Result<UMessage, UMessageError>;
 
 /// `RpcClient` is an interface used by code generators for uProtocol services defined in `.proto` files such as
 /// the core uProtocol services found in [uProtocol Core API](https://github.com/eclipse-uprotocol/up-spec/tree/main/up-core-api).
@@ -35,21 +35,10 @@ pub trait RpcClient: Send + Sync {
     ///
     /// * `method` - The URI of the method to be invoked. For example, in long form: "/example.hello_world/1/rpc.SayHello".
     /// * `request` - The request message to be sent to the server.
-    /// * `priority` - The priority to use for sending the request and corresponding response messages. Must be at least
-    ///                [`UPriority::UPRIORITY_CS4`], which is also the default if not specified explicitly.
-    /// * `ttl` - The request's time-to-live in milliseconds.
-    /// * `token` - The authorization token to use for TAP.
     ///
     /// # Returns
     ///
     /// Returns a `RpcClientResult` which contains the response message.
     /// If the invocation fails, it contains a `UStatus` detailing the failure reason.
-    async fn invoke_method(
-        &self,
-        method: UUri,
-        request: UPayload,
-        priority: Option<UPriority>,
-        ttl: Option<u32>,
-        token: Option<String>,
-    ) -> RpcClientResult;
+    async fn invoke_method(&self, method: UUri, request: UMessage) -> RpcClientResult;
 }