ExternalVendorCode/chirpstack
1
0
Fork 0
mirror of https://github.com/chirpstack/chirpstack.git synced 2025-06-14 21:48:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

backend: Skip serde serialization for Option<T> fields with None value. (#316)

Browse Source
This commit is contained in:
Conny Andersson
2023-11-06 10:23:22 +01:00
committed by GitHub
parent 575cf45953
commit 3f86bf6e71
1 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
backend/src/lib.rs
View File

@ -678,17 +678,17 @@ pub struct JoinAnsPayload {
pub base: BasePayloadResult, pub base: BasePayloadResult,
#[serde(rename = "PHYPayload", with = "hex_encode")] #[serde(rename = "PHYPayload", with = "hex_encode")]
pub phy_payload: Vec<u8>, pub phy_payload: Vec<u8>,
#[serde(rename = "Lifetime")] #[serde(rename = "Lifetime", skip_serializing_if = "Option::is_none")]
pub lifetime: Option<usize>, pub lifetime: Option<usize>,
#[serde(rename = "SNwkSIntKey")] #[serde(rename = "SNwkSIntKey", skip_serializing_if = "Option::is_none")]
pub s_nwk_s_int_key: Option<KeyEnvelope>, pub s_nwk_s_int_key: Option<KeyEnvelope>,
#[serde(rename = "FNwkSIntKey")] #[serde(rename = "FNwkSIntKey", skip_serializing_if = "Option::is_none")]
pub f_nwk_s_int_key: Option<KeyEnvelope>, pub f_nwk_s_int_key: Option<KeyEnvelope>,
#[serde(rename = "NwkSEncKey")] #[serde(rename = "NwkSEncKey", skip_serializing_if = "Option::is_none")]
pub nwk_s_enc_key: Option<KeyEnvelope>, pub nwk_s_enc_key: Option<KeyEnvelope>,
#[serde(rename = "NwkSKey")] #[serde(rename = "NwkSKey", skip_serializing_if = "Option::is_none")]
pub nwk_s_key: Option<KeyEnvelope>, pub nwk_s_key: Option<KeyEnvelope>,
#[serde(rename = "AppSKey")] #[serde(rename = "AppSKey", skip_serializing_if = "Option::is_none")]
pub app_s_key: Option<KeyEnvelope>, pub app_s_key: Option<KeyEnvelope>,
#[serde( #[serde(
default, default,
@ -742,17 +742,17 @@ pub struct RejoinAnsPayload {
pub base: BasePayloadResult, pub base: BasePayloadResult,
#[serde(rename = "PHYPayload", with = "hex_encode")] #[serde(rename = "PHYPayload", with = "hex_encode")]
pub phy_payload: Vec<u8>, pub phy_payload: Vec<u8>,
#[serde(rename = "Lifetime")] #[serde(rename = "Lifetime", skip_serializing_if = "Option::is_none")]
pub lifetime: Option<usize>, pub lifetime: Option<usize>,
#[serde(rename = "SNwkSIntKey")] #[serde(rename = "SNwkSIntKey", skip_serializing_if = "Option::is_none")]
pub s_nwk_s_int_key: Option<KeyEnvelope>, pub s_nwk_s_int_key: Option<KeyEnvelope>,
#[serde(rename = "FNwkSIntKey")] #[serde(rename = "FNwkSIntKey", skip_serializing_if = "Option::is_none")]
pub f_nwk_s_int_key: Option<KeyEnvelope>, pub f_nwk_s_int_key: Option<KeyEnvelope>,
#[serde(rename = "NwkSEncKey")] #[serde(rename = "NwkSEncKey", skip_serializing_if = "Option::is_none")]
pub nwk_s_enc_key: Option<KeyEnvelope>, pub nwk_s_enc_key: Option<KeyEnvelope>,
#[serde(rename = "NwkSKey")] #[serde(rename = "NwkSKey", skip_serializing_if = "Option::is_none")]
pub nwk_s_key: Option<KeyEnvelope>, pub nwk_s_key: Option<KeyEnvelope>,
#[serde(rename = "AppSKey")] #[serde(rename = "AppSKey", skip_serializing_if = "Option::is_none")]
pub app_s_key: Option<KeyEnvelope>, pub app_s_key: Option<KeyEnvelope>,
#[serde( #[serde(
default, default,
@ -791,7 +791,7 @@ pub struct AppSKeyAnsPayload {
pub base: BasePayloadResult, pub base: BasePayloadResult,
#[serde(rename = "DevEUI", with = "hex_encode")] #[serde(rename = "DevEUI", with = "hex_encode")]
pub dev_eui: Vec<u8>, pub dev_eui: Vec<u8>,
#[serde(rename = "AppSKey")] #[serde(rename = "AppSKey", skip_serializing_if = "Option::is_none")]
pub app_s_key: Option<KeyEnvelope>, pub app_s_key: Option<KeyEnvelope>,
#[serde(rename = "SessionKeyID", with = "hex_encode")] #[serde(rename = "SessionKeyID", with = "hex_encode")]
pub session_key_id: Vec<u8>, pub session_key_id: Vec<u8>,
@ -837,17 +837,17 @@ pub struct PRStartAnsPayload {
skip_serializing_if = "Vec::is_empty" skip_serializing_if = "Vec::is_empty"
)] )]
pub dev_eui: Vec<u8>, pub dev_eui: Vec<u8>,
#[serde(rename = "Lifetime")] #[serde(rename = "Lifetime", skip_serializing_if = "Option::is_none")]
pub lifetime: Option<usize>, pub lifetime: Option<usize>,
#[serde(rename = "FNwkSIntKey")] #[serde(rename = "FNwkSIntKey", skip_serializing_if = "Option::is_none")]
pub f_nwk_s_int_key: Option<KeyEnvelope>, pub f_nwk_s_int_key: Option<KeyEnvelope>,
#[serde(rename = "NwkSKey")] #[serde(rename = "NwkSKey", skip_serializing_if = "Option::is_none")]
pub nwk_s_key: Option<KeyEnvelope>, pub nwk_s_key: Option<KeyEnvelope>,
#[serde(rename = "FCntUp")] #[serde(rename = "FCntUp", skip_serializing_if = "Option::is_none")]
pub f_cnt_up: Option<u32>, pub f_cnt_up: Option<u32>,
#[serde(rename = "ServiceProfile")] #[serde(rename = "ServiceProfile", skip_serializing_if = "Option::is_none")]
pub service_profile: Option<ServiceProfile>, pub service_profile: Option<ServiceProfile>,
#[serde(rename = "DLMetaData")] #[serde(rename = "DLMetaData", skip_serializing_if = "Option::is_none")]
pub dl_meta_data: Option<DLMetaData>, pub dl_meta_data: Option<DLMetaData>,
#[serde( #[serde(
default, default,
@ -870,7 +870,7 @@ pub struct PRStopReqPayload {
pub base: BasePayload, pub base: BasePayload,
#[serde(rename = "DevEUI", with = "hex_encode")] #[serde(rename = "DevEUI", with = "hex_encode")]
pub dev_eui: Vec<u8>, pub dev_eui: Vec<u8>,
#[serde(rename = "Lifetime")] #[serde(rename = "Lifetime", skip_serializing_if = "Option::is_none")]
pub lifetime: Option<usize>, pub lifetime: Option<usize>,
} }
@ -910,9 +910,9 @@ pub struct XmitDataReqPayload {
skip_serializing_if = "Vec::is_empty" skip_serializing_if = "Vec::is_empty"
)] )]
pub frm_payload: Vec<u8>, pub frm_payload: Vec<u8>,
#[serde(rename = "ULMetaData")] #[serde(rename = "ULMetaData", skip_serializing_if = "Option::is_none")]
pub ul_meta_data: Option<ULMetaData>, pub ul_meta_data: Option<ULMetaData>,
#[serde(rename = "DLMetaData")] #[serde(rename = "DLMetaData", skip_serializing_if = "Option::is_none")]
pub dl_meta_data: Option<DLMetaData>, pub dl_meta_data: Option<DLMetaData>,
} }
@ -983,21 +983,21 @@ pub struct ULMetaData {
skip_serializing_if = "Vec::is_empty" skip_serializing_if = "Vec::is_empty"
)] )]
pub dev_addr: Vec<u8>, pub dev_addr: Vec<u8>,
#[serde(rename = "FPort")] #[serde(rename = "FPort", skip_serializing_if = "Option::is_none")]
pub f_port: Option<u8>, pub f_port: Option<u8>,
#[serde(rename = "FCntDown")] #[serde(rename = "FCntDown", skip_serializing_if = "Option::is_none")]
pub f_cnt_down: Option<u32>, pub f_cnt_down: Option<u32>,
#[serde(rename = "FCntUp")] #[serde(rename = "FCntUp", skip_serializing_if = "Option::is_none")]
pub f_cnt_up: Option<u32>, pub f_cnt_up: Option<u32>,
#[serde(rename = "Confirmed")] #[serde(rename = "Confirmed", skip_serializing_if = "Option::is_none")]
pub confirmed: Option<bool>, pub confirmed: Option<bool>,
#[serde(rename = "DataRate")] #[serde(rename = "DataRate", skip_serializing_if = "Option::is_none")]
pub data_rate: Option<u8>, pub data_rate: Option<u8>,
#[serde(rename = "ULFreq")] #[serde(rename = "ULFreq", skip_serializing_if = "Option::is_none")]
pub ul_freq: Option<f64>, pub ul_freq: Option<f64>,
#[serde(rename = "Margin")] #[serde(rename = "Margin", skip_serializing_if = "Option::is_none")]
pub margin: Option<isize>, pub margin: Option<isize>,
#[serde(rename = "Battery")] #[serde(rename = "Battery", skip_serializing_if = "Option::is_none")]
pub battery: Option<isize>, pub battery: Option<isize>,
#[serde( #[serde(
default, default,
@ -1015,7 +1015,7 @@ pub struct ULMetaData {
skip_serializing_if = "String::is_empty" skip_serializing_if = "String::is_empty"
)] )]
pub rf_region: String, pub rf_region: String,
#[serde(rename = "GWCnt")] #[serde(rename = "GWCnt", skip_serializing_if = "Option::is_none")]
pub gw_cnt: Option<usize>, pub gw_cnt: Option<usize>,
#[serde(rename = "GWInfo")] #[serde(rename = "GWInfo")]
pub gw_info: Vec<GWInfoElement>, pub gw_info: Vec<GWInfoElement>,
@ -1052,7 +1052,7 @@ pub struct GWInfoElement {
skip_serializing_if = "Vec::is_empty" skip_serializing_if = "Vec::is_empty"
)] )]
pub id: Vec<u8>, pub id: Vec<u8>,
#[serde(rename = "FineRecvTime")] #[serde(rename = "FineRecvTime", skip_serializing_if = "Option::is_none")]
pub fine_recv_time: Option<usize>, pub fine_recv_time: Option<usize>,
#[serde( #[serde(
default, default,
@ -1061,13 +1061,13 @@ pub struct GWInfoElement {
skip_serializing_if = "String::is_empty" skip_serializing_if = "String::is_empty"
)] )]
pub rf_region: String, pub rf_region: String,
#[serde(rename = "RSSI")] #[serde(rename = "RSSI", skip_serializing_if = "Option::is_none")]
pub rssi: Option<isize>, pub rssi: Option<isize>,
#[serde(rename = "SNR")] #[serde(rename = "SNR", skip_serializing_if = "Option::is_none")]
pub snr: Option<f32>, pub snr: Option<f32>,
#[serde(rename = "Lat")] #[serde(rename = "Lat", skip_serializing_if = "Option::is_none")]
pub lat: Option<f64>, pub lat: Option<f64>,
#[serde(rename = "Lon")] #[serde(rename = "Lon", skip_serializing_if = "Option::is_none")]
pub lon: Option<f64>, pub lon: Option<f64>,
#[serde( #[serde(
default, default,
@ -1076,7 +1076,7 @@ pub struct GWInfoElement {
skip_serializing_if = "Vec::is_empty" skip_serializing_if = "Vec::is_empty"
)] )]
pub ul_token: Vec<u8>, pub ul_token: Vec<u8>,
#[serde(rename = "DLAllowed")] #[serde(rename = "DLAllowed", skip_serializing_if = "Option::is_none")]
pub dl_allowed: Option<bool>, pub dl_allowed: Option<bool>,
} }
@ -1133,23 +1133,23 @@ pub struct DLMetaData {
skip_serializing_if = "Vec::is_empty" skip_serializing_if = "Vec::is_empty"
)] )]
pub dev_eui: Vec<u8>, pub dev_eui: Vec<u8>,
#[serde(rename = "FPort")] #[serde(rename = "FPort", skip_serializing_if = "Option::is_none")]
pub f_port: Option<u8>, pub f_port: Option<u8>,
#[serde(rename = "FCntDown")] #[serde(rename = "FCntDown", skip_serializing_if = "Option::is_none")]
pub f_cnt_down: Option<u32>, pub f_cnt_down: Option<u32>,
#[serde(default, rename = "Confirmed")] #[serde(default, rename = "Confirmed")]
pub confirmed: bool, pub confirmed: bool,
#[serde(rename = "DLFreq1")] #[serde(rename = "DLFreq1", skip_serializing_if = "Option::is_none")]
pub dl_freq_1: Option<f64>, pub dl_freq_1: Option<f64>,
#[serde(rename = "DLFreq2")] #[serde(rename = "DLFreq2", skip_serializing_if = "Option::is_none")]
pub dl_freq_2: Option<f64>, pub dl_freq_2: Option<f64>,
#[serde(rename = "RXDelay1")] #[serde(rename = "RXDelay1", skip_serializing_if = "Option::is_none")]
pub rx_delay_1: Option<usize>, pub rx_delay_1: Option<usize>,
#[serde(rename = "ClassMode")] #[serde(rename = "ClassMode", skip_serializing_if = "Option::is_none")]
pub class_mode: Option<String>, pub class_mode: Option<String>,
#[serde(rename = "DataRate1")] #[serde(rename = "DataRate1", skip_serializing_if = "Option::is_none")]
pub data_rate_1: Option<u8>, pub data_rate_1: Option<u8>,
#[serde(rename = "DataRate2")] #[serde(rename = "DataRate2", skip_serializing_if = "Option::is_none")]
pub data_rate_2: Option<u8>, pub data_rate_2: Option<u8>,
#[serde( #[serde(
default, default,