removed guess encoding (#244)

eclipse-zenoh · Oct 11, 2024 · 77371cd · 77371cd
1 parent 3cbaa37
commit 77371cd
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 87 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/zenoh-plugin-mqtt/src/mqtt_helpers.rs b/zenoh-plugin-mqtt/src/mqtt_helpers.rs
@@ -17,7 +17,6 @@ use std::convert::TryInto;
 use ntex::util::{ByteString, Bytes};
 use ntex_mqtt::{error::SendPacketError, v3, v5};
 use zenoh::{
-    bytes::Encoding,
     internal::bail,
     key_expr::{KeyExpr, OwnedKeyExpr},
     Result as ZResult,
@@ -104,22 +103,6 @@ pub(crate) fn is_allowed(mqtt_topic: &str, config: &Config) -> bool {
     }
 }
 
-pub(crate) fn guess_encoding(payload: &[u8]) -> Encoding {
-    if serde_json::from_slice::<serde_json::Value>(payload).is_ok() {
-        Encoding::APPLICATION_JSON
-    } else if let Ok(s) = std::str::from_utf8(payload) {
-        if s.parse::<i64>().is_ok() {
-            Encoding::ZENOH_INT64
-        } else if s.parse::<f64>().is_ok() {
-            Encoding::ZENOH_FLOAT64
-        } else {
-            Encoding::TEXT_PLAIN
-        }
-    } else {
-        Encoding::default()
-    }
-}
-
 #[derive(Clone, Debug)]
 pub(crate) enum MqttSink {
     V3(v3::MqttSink),

diff --git a/zenoh-plugin-mqtt/src/mqtt_session_state.rs b/zenoh-plugin-mqtt/src/mqtt_session_state.rs
@@ -121,18 +121,15 @@ impl MqttSessionState {
         } else {
             topic.try_into()?
         };
-        let encoding = guess_encoding(payload.deref());
         // TODO: check allow/deny
         tracing::trace!(
-            "MQTT client {}: route from MQTT '{}' to Zenoh '{}' (encoding={})",
+            "MQTT client {}: route from MQTT '{}' to Zenoh '{}'",
             self.client_id,
             topic,
             ke,
-            encoding
         );
         self.zsession
             .put(ke, payload.deref())
-            .encoding(encoding)
             .allowed_destination(destination)
             .await
     }