From bca2f90f96f09ba0321848cc4f8e1865562eaa9b Mon Sep 17 00:00:00 2001 From: Ruben Nijveld Date: Tue, 28 May 2024 11:04:21 +0200 Subject: [PATCH] Format code --- src/generated/mod.rs | 2 +- src/generated/models/notification_object.rs | 9 ++------- src/generated/models/object_types.rs | 9 ++------- src/generated/models/point.rs | 11 ++--------- .../subscription_object_operations_inner.rs | 15 ++++++++------- src/wire/event.rs | 4 ++-- src/wire/interval.rs | 2 +- src/wire/program.rs | 2 +- src/wire/report.rs | 4 ++-- 9 files changed, 21 insertions(+), 37 deletions(-) diff --git a/src/generated/mod.rs b/src/generated/mod.rs index ff92946..c446ac8 100644 --- a/src/generated/mod.rs +++ b/src/generated/mod.rs @@ -1 +1 @@ -pub mod models; \ No newline at end of file +pub mod models; diff --git a/src/generated/models/notification_object.rs b/src/generated/models/notification_object.rs index 6e366ed..b6ff20e 100644 --- a/src/generated/models/notification_object.rs +++ b/src/generated/models/notification_object.rs @@ -1,7 +1,7 @@ /* * OpenADR 3 API * - * The OpenADR 3 API supports energy retailer to energy customer Demand Response programs. The API includes the following capabilities and operations: __Manage programs:__ * Create/Update/Delete a program * Search programs __Manage events:__ * Create/Update/Delete an event * Search events __Manage reports:__ * Create/Update/Delete a report * Search reports __Manage subscriptions:__ * Create/Update/Delete subscriptions to programs, events, and reports * Search subscriptions * Subscriptions allows clients to register a callback URL (webhook) to be notified on the change of state of a resource __Manage vens:__ * Create/Update/Delete vens and ven resources * Search ven and ven resources __Manage tokens:__ * Obtain an access token * This endpoint is provided as a convenience and may be neglected in a commercial implementation + * The OpenADR 3 API supports energy retailer to energy customer Demand Response programs. The API includes the following capabilities and operations: __Manage programs:__ * Create/Update/Delete a program * Search programs __Manage events:__ * Create/Update/Delete an event * Search events __Manage reports:__ * Create/Update/Delete a report * Search reports __Manage subscriptions:__ * Create/Update/Delete subscriptions to programs, events, and reports * Search subscriptions * Subscriptions allows clients to register a callback URL (webhook) to be notified on the change of state of a resource __Manage vens:__ * Create/Update/Delete vens and ven resources * Search ven and ven resources __Manage tokens:__ * Obtain an access token * This endpoint is provided as a convenience and may be neglected in a commercial implementation * * The version of the OpenAPI document: 3.0.1 * Contact: frank@pajaritotech.com @@ -12,13 +12,9 @@ use serde::{Deserialize, Serialize}; /// NotificationObject : the object that is the subject of the notification. - #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)] #[serde(tag = "objecttype")] -pub struct NotificationObject { -} - - +pub struct NotificationObject {} /// Used as discriminator, e.g. notification.object #[derive(Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize, Deserialize)] @@ -32,4 +28,3 @@ impl Default for ObjectType { Self::Resource } } - diff --git a/src/generated/models/object_types.rs b/src/generated/models/object_types.rs index e51e0e8..2178fd1 100644 --- a/src/generated/models/object_types.rs +++ b/src/generated/models/object_types.rs @@ -1,15 +1,15 @@ /* * OpenADR 3 API * - * The OpenADR 3 API supports energy retailer to energy customer Demand Response programs. The API includes the following capabilities and operations: __Manage programs:__ * Create/Update/Delete a program * Search programs __Manage events:__ * Create/Update/Delete an event * Search events __Manage reports:__ * Create/Update/Delete a report * Search reports __Manage subscriptions:__ * Create/Update/Delete subscriptions to programs, events, and reports * Search subscriptions * Subscriptions allows clients to register a callback URL (webhook) to be notified on the change of state of a resource __Manage vens:__ * Create/Update/Delete vens and ven resources * Search ven and ven resources __Manage tokens:__ * Obtain an access token * This endpoint is provided as a convenience and may be neglected in a commercial implementation + * The OpenADR 3 API supports energy retailer to energy customer Demand Response programs. The API includes the following capabilities and operations: __Manage programs:__ * Create/Update/Delete a program * Search programs __Manage events:__ * Create/Update/Delete an event * Search events __Manage reports:__ * Create/Update/Delete a report * Search reports __Manage subscriptions:__ * Create/Update/Delete subscriptions to programs, events, and reports * Search subscriptions * Subscriptions allows clients to register a callback URL (webhook) to be notified on the change of state of a resource __Manage vens:__ * Create/Update/Delete vens and ven resources * Search ven and ven resources __Manage tokens:__ * Obtain an access token * This endpoint is provided as a convenience and may be neglected in a commercial implementation * * The version of the OpenAPI document: 3.0.1 * Contact: frank@pajaritotech.com * Generated by: https://openapi-generator.tech */ -use std::fmt::Display; use serde::{Deserialize, Serialize}; +use std::fmt::Display; /// ObjectTypes : Types of objects addressable through API. @@ -28,7 +28,6 @@ pub enum ObjectTypes { Ven, #[serde(rename = "RESOURCE")] Resource, - } impl Display for ObjectTypes { @@ -50,7 +49,3 @@ impl Default for ObjectTypes { Self::Program } } - - - - diff --git a/src/generated/models/point.rs b/src/generated/models/point.rs index 0873fd9..cde003d 100644 --- a/src/generated/models/point.rs +++ b/src/generated/models/point.rs @@ -1,7 +1,7 @@ /* * OpenADR 3 API * - * The OpenADR 3 API supports energy retailer to energy customer Demand Response programs. The API includes the following capabilities and operations: __Manage programs:__ * Create/Update/Delete a program * Search programs __Manage events:__ * Create/Update/Delete an event * Search events __Manage reports:__ * Create/Update/Delete a report * Search reports __Manage subscriptions:__ * Create/Update/Delete subscriptions to programs, events, and reports * Search subscriptions * Subscriptions allows clients to register a callback URL (webhook) to be notified on the change of state of a resource __Manage vens:__ * Create/Update/Delete vens and ven resources * Search ven and ven resources __Manage tokens:__ * Obtain an access token * This endpoint is provided as a convenience and may be neglected in a commercial implementation + * The OpenADR 3 API supports energy retailer to energy customer Demand Response programs. The API includes the following capabilities and operations: __Manage programs:__ * Create/Update/Delete a program * Search programs __Manage events:__ * Create/Update/Delete an event * Search events __Manage reports:__ * Create/Update/Delete a report * Search reports __Manage subscriptions:__ * Create/Update/Delete subscriptions to programs, events, and reports * Search subscriptions * Subscriptions allows clients to register a callback URL (webhook) to be notified on the change of state of a resource __Manage vens:__ * Create/Update/Delete vens and ven resources * Search ven and ven resources __Manage tokens:__ * Obtain an access token * This endpoint is provided as a convenience and may be neglected in a commercial implementation * * The version of the OpenAPI document: 3.0.1 * Contact: frank@pajaritotech.com @@ -12,8 +12,6 @@ use serde::{Deserialize, Serialize}; /// Point : A pair of floats typically used as a point on a 2 dimensional grid. - - #[derive(Clone, Debug, PartialEq, Default, Serialize, Deserialize)] pub struct Point { /// A value on an x axis. @@ -27,11 +25,6 @@ pub struct Point { impl Point { /// A pair of floats typically used as a point on a 2 dimensional grid. pub fn new(x: f32, y: f32) -> Point { - Point { - x, - y, - } + Point { x, y } } } - - diff --git a/src/generated/models/subscription_object_operations_inner.rs b/src/generated/models/subscription_object_operations_inner.rs index 3301395..bc6be41 100644 --- a/src/generated/models/subscription_object_operations_inner.rs +++ b/src/generated/models/subscription_object_operations_inner.rs @@ -1,20 +1,18 @@ /* * OpenADR 3 API * - * The OpenADR 3 API supports energy retailer to energy customer Demand Response programs. The API includes the following capabilities and operations: __Manage programs:__ * Create/Update/Delete a program * Search programs __Manage events:__ * Create/Update/Delete an event * Search events __Manage reports:__ * Create/Update/Delete a report * Search reports __Manage subscriptions:__ * Create/Update/Delete subscriptions to programs, events, and reports * Search subscriptions * Subscriptions allows clients to register a callback URL (webhook) to be notified on the change of state of a resource __Manage vens:__ * Create/Update/Delete vens and ven resources * Search ven and ven resources __Manage tokens:__ * Obtain an access token * This endpoint is provided as a convenience and may be neglected in a commercial implementation + * The OpenADR 3 API supports energy retailer to energy customer Demand Response programs. The API includes the following capabilities and operations: __Manage programs:__ * Create/Update/Delete a program * Search programs __Manage events:__ * Create/Update/Delete an event * Search events __Manage reports:__ * Create/Update/Delete a report * Search reports __Manage subscriptions:__ * Create/Update/Delete subscriptions to programs, events, and reports * Search subscriptions * Subscriptions allows clients to register a callback URL (webhook) to be notified on the change of state of a resource __Manage vens:__ * Create/Update/Delete vens and ven resources * Search ven and ven resources __Manage tokens:__ * Obtain an access token * This endpoint is provided as a convenience and may be neglected in a commercial implementation * * The version of the OpenAPI document: 3.0.1 * Contact: frank@pajaritotech.com * Generated by: https://openapi-generator.tech */ -use serde::{Deserialize, Serialize}; use crate::generated::models::ObjectTypes; +use serde::{Deserialize, Serialize}; /// SubscriptionObjectOperationsInner : object type, operations, and callbackUrl. - - #[derive(Clone, Debug, PartialEq, Default, Serialize, Deserialize)] pub struct SubscriptionObjectOperationsInner { /// list of objects to subscribe to. @@ -26,14 +24,18 @@ pub struct SubscriptionObjectOperationsInner { /// User provided webhook URL. #[serde(rename = "callbackUrl")] pub callback_url: String, - /// User provided token. To avoid custom integrations, callback endpoints should accept the provided bearer token to authenticate VTN requests. + /// User provided token. To avoid custom integrations, callback endpoints should accept the provided bearer token to authenticate VTN requests. #[serde(rename = "bearerToken", skip_serializing_if = "Option::is_none")] pub bearer_token: Option, } impl SubscriptionObjectOperationsInner { /// object type, operations, and callbackUrl. - pub fn new(objects: Vec, operations: Vec, callback_url: String) -> SubscriptionObjectOperationsInner { + pub fn new( + objects: Vec, + operations: Vec, + callback_url: String, + ) -> SubscriptionObjectOperationsInner { SubscriptionObjectOperationsInner { objects, operations, @@ -61,4 +63,3 @@ impl Default for Operations { Self::Get } } - diff --git a/src/wire/event.rs b/src/wire/event.rs index 89672b6..4a90902 100644 --- a/src/wire/event.rs +++ b/src/wire/event.rs @@ -2,11 +2,11 @@ use serde::{Deserialize, Serialize}; -use crate::wire::{Currency, DateTime, PayloadType, Unit}; use crate::wire::interval::{Interval, IntervalPeriod}; use crate::wire::program::ProgramId; use crate::wire::report::ReportDescriptor; use crate::wire::values_map::ValuesMap; +use crate::wire::{Currency, DateTime, PayloadType, Unit}; /// Event object to communicate a Demand Response request to VEN. If intervalPeriod is present, sets /// start time and duration of intervals. @@ -120,8 +120,8 @@ impl EventPayloadDescriptor { #[cfg(test)] mod tests { - use crate::wire::Duration; use crate::wire::values_map::{Value, ValueType}; + use crate::wire::Duration; use super::*; diff --git a/src/wire/interval.rs b/src/wire/interval.rs index f95920b..8b6c45a 100644 --- a/src/wire/interval.rs +++ b/src/wire/interval.rs @@ -2,8 +2,8 @@ use serde::{Deserialize, Serialize}; -use crate::wire::{DateTime, Duration}; use crate::wire::values_map::ValuesMap; +use crate::wire::{DateTime, Duration}; /// An object defining a temporal window and a list of valuesMaps. if intervalPeriod present may set /// temporal aspects of interval or override event.intervalPeriod. diff --git a/src/wire/program.rs b/src/wire/program.rs index edda18c..e1fddb5 100644 --- a/src/wire/program.rs +++ b/src/wire/program.rs @@ -2,11 +2,11 @@ use serde::{Deserialize, Serialize}; -use crate::wire::{DateTime, Duration}; use crate::wire::event::EventPayloadDescriptor; use crate::wire::interval::IntervalPeriod; use crate::wire::report::ReportPayloadDescriptor; use crate::wire::values_map::ValuesMap; +use crate::wire::{DateTime, Duration}; pub type Programs = Vec; diff --git a/src/wire/report.rs b/src/wire/report.rs index c9809e0..1ca3a6c 100644 --- a/src/wire/report.rs +++ b/src/wire/report.rs @@ -2,11 +2,11 @@ use serde::{Deserialize, Serialize}; -use crate::wire::{DateTime, PayloadType, Unit}; use crate::wire::event::EventId; use crate::wire::interval::{Interval, IntervalPeriod}; use crate::wire::program::ProgramId; use crate::wire::values_map::ValuesMap; +use crate::wire::{DateTime, PayloadType, Unit}; /// report object. #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] @@ -233,8 +233,8 @@ pub struct Confidence(u8); #[cfg(test)] mod tests { - use crate::wire::Duration; use crate::wire::values_map::{Value, ValueType}; + use crate::wire::Duration; use super::*;