Revert "Rename collect_smartrest_messages to collect_c8y_messages"

This reverts commit 6748f0e.

crates/core/c8y_api/src/smartrest/message.rs

@@ -78,13 +78,13 @@ pub fn get_failure_reason_for_smartrest(input: &[u8], max_size: usize) -> String
 /// Split MQTT message payload to multiple SmartREST messages.
 ///
 /// ```
-/// use c8y_api::smartrest::message::collect_c8y_messages;
+/// use c8y_api::smartrest::message::collect_smartrest_messages;
 /// let data = "511,device,echo hello\n511,device,\"echo hello\necho world\"";
-/// let messages = collect_c8y_messages(data);
+/// let messages = collect_smartrest_messages(data);
 /// assert_eq!(messages[0], "511,device,echo hello");
 /// assert_eq!(messages[1], "511,device,\"echo hello\necho world\"");
 /// ```
-pub fn collect_c8y_messages(data: &str) -> Vec<String> {
+pub fn collect_smartrest_messages(data: &str) -> Vec<String> {
     let mut stack: Vec<char> = Vec::new();
     let mut smartrest_messages: Vec<String> = Vec::new();
     let mut is_inside = false; // Inside an outermost double quote block or not.
@@ -228,7 +228,7 @@ mod tests {
     #[test]
     fn split_single_smartrest_message() {
         let data = r#"528,DeviceSerial,softwareA,1.0,url1,install,softwareB,2.0,url2,install"#;
-        let message = collect_c8y_messages(data);
+        let message = collect_smartrest_messages(data);
         assert_eq!(
             message[0],
             r#"528,DeviceSerial,softwareA,1.0,url1,install,softwareB,2.0,url2,install"#
@@ -250,7 +250,7 @@ echo world"
 524,DeviceSerial,"something",http://www.my.url,type
 511,device,511,rina0005,echo \\\"#;
 
-        let messages = collect_c8y_messages(data);
+        let messages = collect_smartrest_messages(data);
 
         assert_eq!(messages[0], r#"511,device,echo hello"#);
         assert_eq!(

crates/extensions/c8y_firmware_manager/src/actor.rs

@@ -8,7 +8,7 @@ use crate::worker::IdDownloadRequest;
 use crate::worker::IdDownloadResult;
 use crate::worker::OperationOutcome;
 use async_trait::async_trait;
-use c8y_api::smartrest::message::collect_c8y_messages;
+use c8y_api::smartrest::message::collect_smartrest_messages;
 use c8y_api::smartrest::message::get_smartrest_template_id;
 use c8y_api::smartrest::message_ids::FIRMWARE;
 use c8y_api::smartrest::smartrest_deserializer::SmartRestFirmwareRequest;
@@ -131,7 +131,7 @@ impl FirmwareManagerActor {
         &mut self,
         message: MqttMessage,
     ) -> Result<(), FirmwareManagementError> {
-        for smartrest_message in collect_c8y_messages(message.payload_str()?) {
+        for smartrest_message in collect_smartrest_messages(message.payload_str()?) {
             let smartrest_template_id = get_smartrest_template_id(&smartrest_message);
             let result = match smartrest_template_id.as_str().parse::<usize>() {
                 Ok(id) if id == FIRMWARE => {

crates/extensions/c8y_mapper_ext/src/converter.rs

@@ -28,7 +28,7 @@ use c8y_api::json_c8y_deserializer::C8ySoftwareUpdate;
 use c8y_api::smartrest::error::SmartRestDeserializerError;
 use c8y_api::smartrest::inventory::child_device_creation_message;
 use c8y_api::smartrest::inventory::service_creation_message;
-use c8y_api::smartrest::message::collect_c8y_messages;
+use c8y_api::smartrest::message::collect_smartrest_messages;
 use c8y_api::smartrest::message::get_failure_reason_for_smartrest;
 use c8y_api::smartrest::message::get_smartrest_device_id;
 use c8y_api::smartrest::message::get_smartrest_template_id;
@@ -634,7 +634,7 @@ impl CumulocityConverter {
     ) -> Result<Vec<MqttMessage>, ConversionError> {
         // JSON over MQTT messages on c8y/devicecontrol/notifications can contain multiple operations in a single MQTT
         // message, so split them
-        let operation_payloads = collect_c8y_messages(message.payload_str()?);
+        let operation_payloads = collect_smartrest_messages(message.payload_str()?);
 
         let mut output = vec![];
         for operation_payload in operation_payloads {
@@ -884,7 +884,7 @@ impl CumulocityConverter {
         message: &MqttMessage,
     ) -> Result<Vec<MqttMessage>, ConversionError> {
         let mut output: Vec<MqttMessage> = Vec::new();
-        for smartrest_message in collect_c8y_messages(message.payload_str()?) {
+        for smartrest_message in collect_smartrest_messages(message.payload_str()?) {
             let result = self.process_smartrest(smartrest_message.as_str()).await;
             let mut msgs = self.handle_c8y_operation_result(&result, None);
             output.append(&mut msgs)