From be6e72bad3789562a7ca8ee2bc0772df73235119 Mon Sep 17 00:00:00 2001
From: Aakash Hemadri <aakashhemadri123@gmail.com>
Date: Thu, 25 Mar 2021 12:29:39 +0530
Subject: [PATCH] fix: Replace Option<Vec<T>> with Vec<T>

Signed-off-by: Aakash Hemadri <aakashhemadri123@gmail.com>
---
 influxdb2_client/src/models/bucket.rs       | 8 ++++----
 influxdb2_client/src/models/organization.rs | 4 ++--
 influxdb2_client/src/models/user.rs         | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/influxdb2_client/src/models/bucket.rs b/influxdb2_client/src/models/bucket.rs
index 80f9ad11a0..9b24c987f6 100644
--- a/influxdb2_client/src/models/bucket.rs
+++ b/influxdb2_client/src/models/bucket.rs
@@ -35,8 +35,8 @@ pub struct Bucket {
     /// Rules to expire or retain data. No rules means data never expires.
     pub retention_rules: Vec<crate::models::RetentionRule>,
     /// Bucket labels
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub labels: Option<Vec<crate::models::Label>>,
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub labels: Vec<crate::models::Label>,
 }
 
 impl Bucket {
@@ -99,8 +99,8 @@ pub struct Buckets {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub links: Option<crate::models::Links>,
     /// Buckets
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub buckets: Option<Vec<crate::models::Bucket>>,
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub buckets: Vec<crate::models::Bucket>,
 }
 
 impl Buckets {
diff --git a/influxdb2_client/src/models/organization.rs b/influxdb2_client/src/models/organization.rs
index 26d84c1d7f..f116cfb4ba 100644
--- a/influxdb2_client/src/models/organization.rs
+++ b/influxdb2_client/src/models/organization.rs
@@ -91,8 +91,8 @@ pub struct Organizations {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub links: Option<crate::models::Links>,
     /// List of organizations
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub orgs: Option<Vec<crate::models::Organization>>,
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub orgs: Vec<crate::models::Organization>,
 }
 
 impl Organizations {
diff --git a/influxdb2_client/src/models/user.rs b/influxdb2_client/src/models/user.rs
index a51aa556de..2ed69734ff 100644
--- a/influxdb2_client/src/models/user.rs
+++ b/influxdb2_client/src/models/user.rs
@@ -63,8 +63,8 @@ pub struct Users {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub links: Option<crate::models::UsersLinks>,
     /// List of users
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub users: Option<Vec<crate::models::User>>,
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub users: Vec<crate::models::User>,
 }
 
 impl Users {