Use serde Value instead of RawValue

- Value works with 'flatten' while deserializing.
- Value allows to directly check whether the json is null.

Author: joseivanlopez

rust/agama-manager/Cargo.toml

@@ -13,7 +13,7 @@ tokio = { version = "1.40.0", features = ["macros", "rt-multi-thread", "sync"] }
 async-trait = "0.1.83"
 zbus = { version = "5", default-features = false, features = ["tokio"] }
 merge-struct = "0.1.0"
-serde_json = { version = "1.0.140", features = ["raw_value"] }
+serde_json = "1.0.140"
 
 [dev-dependencies]
 tokio-test = "0.4.4"

rust/agama-manager/src/message.rs

@@ -22,7 +22,7 @@ use agama_utils::{
     actor::Message,
     api::{Action, Config, IssueMap, Proposal, Status, SystemInfo},
 };
-use serde_json::value::RawValue;
+use serde_json::Value;
 
 /// Gets the installation status.
 pub struct GetStatus;
@@ -124,16 +124,16 @@ impl Message for RunAction {
 pub struct GetStorageModel;
 
 impl Message for GetStorageModel {
-    type Reply = Option<Box<RawValue>>;
+    type Reply = Option<Value>;
 }
 
 // Sets the storage model.
 pub struct SetStorageModel {
-    pub model: Box<RawValue>,
+    pub model: Value,
 }
 
 impl SetStorageModel {
-    pub fn new(model: Box<RawValue>) -> Self {
+    pub fn new(model: Value) -> Self {
         Self { model }
     }
 }

rust/agama-manager/src/service.rs

@@ -29,7 +29,7 @@ use agama_utils::{
 };
 use async_trait::async_trait;
 use merge_struct::merge;
-use serde_json::value::RawValue;
+use serde_json::Value;
 use tokio::sync::broadcast;
 
 #[derive(Debug, thiserror::Error)]
@@ -163,8 +163,7 @@ impl MessageHandler<message::GetExtendedConfig> for Service {
         Ok(Config {
             l10n: Some(l10n),
             questions: Some(questions),
-            storage: storage.as_ref().and_then(|c| c.storage.clone()),
-            legacy_autoyast_storage: storage.and_then(|c| c.legacy_autoyast_storage),
+            storage,
         })
     }
 }
@@ -194,7 +193,7 @@ impl MessageHandler<message::SetConfig> for Service {
             .await?;
 
         self.storage
-            .call(storage::message::SetConfig::new((&config).try_into().ok()))
+            .call(storage::message::SetConfig::new(config.storage.clone()))
             .await?;
 
         self.config = config;
@@ -223,9 +222,9 @@ impl MessageHandler<message::UpdateConfig> for Service {
                 .await?;
         }
 
-        if let Some(storage) = (&config).try_into().ok() {
+        if let Some(storage) = &config.storage {
             self.storage
-                .call(storage::message::SetConfig::with(storage))
+                .call(storage::message::SetConfig::with(storage.clone()))
                 .await?;
         }
 
@@ -277,10 +276,7 @@ impl MessageHandler<message::RunAction> for Service {
 #[async_trait]
 impl MessageHandler<message::GetStorageModel> for Service {
     /// It returns the storage model.
-    async fn handle(
-        &mut self,
-        _message: message::GetStorageModel,
-    ) -> Result<Option<Box<RawValue>>, Error> {
+    async fn handle(&mut self, _message: message::GetStorageModel) -> Result<Option<Value>, Error> {
         Ok(self.storage.call(storage::message::GetConfigModel).await?)
     }
 }

rust/agama-server/src/server/web.rs

@@ -40,7 +40,7 @@ use axum::{
 };
 use hyper::StatusCode;
 use serde::Serialize;
-use serde_json::{json, value::RawValue, Value};
+use serde_json::{json, Value};
 
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
@@ -352,9 +352,7 @@ async fn run_action(
         (status = 400, description = "Not possible to retrieve the storage model.")
     )
 )]
-async fn get_storage_model(
-    State(state): State<ServerState>,
-) -> ServerResult<Json<Option<Box<RawValue>>>> {
+async fn get_storage_model(State(state): State<ServerState>) -> ServerResult<Json<Option<Value>>> {
     let model = state.manager.call(message::GetStorageModel).await?;
     Ok(Json(model))
 }
@@ -371,7 +369,7 @@ async fn get_storage_model(
 )]
 async fn set_storage_model(
     State(state): State<ServerState>,
-    Json(model): Json<Box<RawValue>>,
+    Json(model): Json<Value>,
 ) -> ServerResult<()> {
     state
         .manager

rust/agama-storage/Cargo.toml

@@ -12,4 +12,4 @@ zbus = "5.7.1"
 tokio = { version = "1.47.1", features = ["macros", "rt-multi-thread", "sync"] }
 tokio-stream = "0.1.16"
 serde = { version = "1.0.228" }
-serde_json = { version = "1.0.140", features = ["raw_value"] }
+serde_json = "1.0.140"

rust/agama-storage/src/client.rs

@@ -20,9 +20,8 @@
 
 //! Implements a client to access Agama's storage service.
 
-use crate::config::Config;
-use agama_utils::api::Issue;
-use serde_json::{value::RawValue, Value};
+use agama_utils::api::{storage::Config, Issue};
+use serde_json::Value;
 use zbus::{names::BusName, zvariant::OwnedObjectPath, Connection, Message};
 
 const SERVICE_NAME: &str = "org.opensuse.Agama.Storage1";
@@ -72,7 +71,7 @@ impl Client {
         Ok(())
     }
 
-    pub async fn get_system(&self) -> Result<Option<Box<RawValue>>, Error> {
+    pub async fn get_system(&self) -> Result<Option<Value>, Error> {
         let message = self.call("GetSystem", &()).await?;
         try_from_message(message)
     }
@@ -82,12 +81,12 @@ impl Client {
         try_from_message(message)
     }
 
-    pub async fn get_config_model(&self) -> Result<Option<Box<RawValue>>, Error> {
+    pub async fn get_config_model(&self) -> Result<Option<Value>, Error> {
         let message = self.call("GetConfigModel", &()).await?;
         try_from_message(message)
     }
 
-    pub async fn get_proposal(&self) -> Result<Option<Box<RawValue>>, Error> {
+    pub async fn get_proposal(&self) -> Result<Option<Value>, Error> {
         let message = self.call("GetProposal", &()).await?;
         try_from_message(message)
     }
@@ -104,21 +103,18 @@ impl Client {
     }
 
     pub async fn set_config(&self, config: Option<Config>) -> Result<(), Error> {
-        let config = config.filter(|c| c.is_some());
+        let config = config.filter(|c| c.has_value());
         let json = serde_json::to_string(&config)?;
         self.call("SetConfig", &(json)).await?;
         Ok(())
     }
 
-    pub async fn set_config_model(&self, model: Box<RawValue>) -> Result<(), Error> {
+    pub async fn set_config_model(&self, model: Value) -> Result<(), Error> {
         self.call("SetConfigModel", &(model.to_string())).await?;
         Ok(())
     }
 
-    pub async fn solve_config_model(
-        &self,
-        model: Box<RawValue>,
-    ) -> Result<Option<Box<RawValue>>, Error> {
+    pub async fn solve_config_model(&self, model: Value) -> Result<Option<Value>, Error> {
         let message = self.call("SolveConfigModel", &(model.to_string())).await?;
         try_from_message(message)
     }
@@ -145,19 +141,11 @@ impl Client {
 fn try_from_message<T: serde::de::DeserializeOwned + Default>(
     message: Message,
 ) -> Result<T, Error> {
-    let json: String = message.body().deserialize()?;
-    if is_json_null(&json) {
+    let raw_json: String = message.body().deserialize()?;
+    let json: Value = serde_json::from_str(&raw_json)?;
+    if json.is_null() {
         return Ok(T::default());
     }
-    let value = serde_json::from_str(&json)?;
+    let value = serde_json::from_value(json)?;
     Ok(value)
 }
-
-fn is_json_null(value: &str) -> bool {
-    let value = serde_json::from_str::<Value>(value);
-    match value {
-        Ok(Value::Null) => true,
-        Ok(_) => false,
-        Err(_) => false,
-    }
-}

rust/agama-storage/src/lib.rs

@@ -24,9 +24,6 @@ pub use start::start;
 pub mod service;
 pub use service::Service;
 
-mod config;
-pub use config::Config;
-
 mod client;
 pub mod message;
 mod monitor;

rust/agama-storage/src/message.rs

@@ -18,9 +18,11 @@
 // To contact SUSE LLC about this file by physical or electronic mail, you may
 // find current contact information at www.suse.com.
 
-use crate::config::Config;
-use agama_utils::{actor::Message, api::Issue};
-use serde_json::value::RawValue;
+use agama_utils::{
+    actor::Message,
+    api::{storage::Config, Issue},
+};
+use serde_json::Value;
 
 #[derive(Clone)]
 pub struct Activate;
@@ -54,7 +56,7 @@ impl Message for Finish {
 pub struct GetSystem;
 
 impl Message for GetSystem {
-    type Reply = Option<Box<RawValue>>;
+    type Reply = Option<Value>;
 }
 
 #[derive(Clone)]
@@ -68,14 +70,14 @@ impl Message for GetConfig {
 pub struct GetConfigModel;
 
 impl Message for GetConfigModel {
-    type Reply = Option<Box<RawValue>>;
+    type Reply = Option<Value>;
 }
 
 #[derive(Clone)]
 pub struct GetProposal;
 
 impl Message for GetProposal {
-    type Reply = Option<Box<RawValue>>;
+    type Reply = Option<Value>;
 }
 
 #[derive(Clone)]
@@ -123,11 +125,11 @@ impl Message for SetConfig {
 
 #[derive(Clone)]
 pub struct SetConfigModel {
-    pub model: Box<RawValue>,
+    pub model: Value,
 }
 
 impl SetConfigModel {
-    pub fn new(model: Box<RawValue>) -> Self {
+    pub fn new(model: Value) -> Self {
         Self { model }
     }
 }
@@ -138,17 +140,17 @@ impl Message for SetConfigModel {
 
 #[derive(Clone)]
 pub struct SolveConfigModel {
-    pub model: Box<RawValue>,
+    pub model: Value,
 }
 
 impl SolveConfigModel {
-    pub fn new(model: Box<RawValue>) -> Self {
+    pub fn new(model: Value) -> Self {
         Self { model }
     }
 }
 
 impl Message for SolveConfigModel {
-    type Reply = Option<Box<RawValue>>;
+    type Reply = Option<Value>;
 }
 
 #[derive(Clone)]

rust/agama-storage/src/service.rs

@@ -20,16 +20,15 @@
 
 use crate::{
     client::{self, Client},
-    config::Config,
     message,
 };
 use agama_utils::{
     actor::{self, Actor, Handler, MessageHandler},
-    api::{Issue, Scope},
+    api::{storage::Config, Issue, Scope},
     issue,
 };
 use async_trait::async_trait;
-use serde_json::value::RawValue;
+use serde_json::Value;
 
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
@@ -102,10 +101,7 @@ impl MessageHandler<message::Finish> for Service {
 
 #[async_trait]
 impl MessageHandler<message::GetSystem> for Service {
-    async fn handle(
-        &mut self,
-        _message: message::GetSystem,
-    ) -> Result<Option<Box<RawValue>>, Error> {
+    async fn handle(&mut self, _message: message::GetSystem) -> Result<Option<Value>, Error> {
         self.client.get_system().await.map_err(|e| e.into())
     }
 }
@@ -119,20 +115,14 @@ impl MessageHandler<message::GetConfig> for Service {
 
 #[async_trait]
 impl MessageHandler<message::GetConfigModel> for Service {
-    async fn handle(
-        &mut self,
-        _message: message::GetConfigModel,
-    ) -> Result<Option<Box<RawValue>>, Error> {
+    async fn handle(&mut self, _message: message::GetConfigModel) -> Result<Option<Value>, Error> {
         self.client.get_config_model().await.map_err(|e| e.into())
     }
 }
 
 #[async_trait]
 impl MessageHandler<message::GetProposal> for Service {
-    async fn handle(
-        &mut self,
-        _message: message::GetProposal,
-    ) -> Result<Option<Box<RawValue>>, Error> {
+    async fn handle(&mut self, _message: message::GetProposal) -> Result<Option<Value>, Error> {
         self.client.get_proposal().await.map_err(|e| e.into())
     }
 }
@@ -169,10 +159,7 @@ impl MessageHandler<message::SetConfigModel> for Service {
 }
 #[async_trait]
 impl MessageHandler<message::SolveConfigModel> for Service {
-    async fn handle(
-        &mut self,
-        message: message::SolveConfigModel,
-    ) -> Result<Option<Box<RawValue>>, Error> {
+    async fn handle(&mut self, message: message::SolveConfigModel) -> Result<Option<Value>, Error> {
         self.client
             .solve_config_model(message.model)
             .await

rust/agama-utils/Cargo.toml

@@ -8,7 +8,7 @@ edition.workspace = true
 agama-locale-data = { path = "../agama-locale-data" }
 async-trait = "0.1.89"
 serde = { version = "1.0.228", features = ["derive"] }
-serde_json = { version = "1.0.140", features = ["raw_value"] }
+serde_json = "1.0.140"
 serde_with = "3.14.0"
 strum = { version = "0.27.2", features = ["derive"] }
 thiserror = "2.0.16"