masalachai
/
epp-client
mirror of https://github.com/masalachai/epp-client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename CommandWithExtension to Command

This commit is contained in:
Dirkjan Ochtman 2021-12-02 14:18:21 +01:00 committed by masalachai
parent 8f43800a3d
commit 140f6830a9
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
epp-client/src/request.rs
View File

@ -25,7 +25,7 @@ pub trait EppRequest<E: EppExtension>: Sized + Debug {
fn serialize_request(self, client_tr_id: &str) -> Result<String, Box<dyn std::error::Error>> { fn serialize_request(self, client_tr_id: &str) -> Result<String, Box<dyn std::error::Error>> {
let (command, extension) = self.into_parts(); let (command, extension) = self.into_parts();
let extension = extension.map(|data| Extension { data }); let extension = extension.map(|data| Extension { data });
EppXml::serialize(&EppObject::build(CommandWithExtension { EppXml::serialize(&EppObject::build(Command {
command, command,
extension, extension,
client_tr_id: client_tr_id.into(), client_tr_id: client_tr_id.into(),
@ -54,7 +54,7 @@ pub trait EppExtension: ElementName + DeserializeOwned + Serialize + Sized + Deb
#[element_name(name = "command")] #[element_name(name = "command")]
/// Type corresponding to the &lt;command&gt; tag in an EPP XML request /// Type corresponding to the &lt;command&gt; tag in an EPP XML request
/// with an &lt;extension&gt; tag /// with an &lt;extension&gt; tag
pub struct CommandWithExtension<T: ElementName, E: ElementName> { pub struct Command<T: ElementName, E: ElementName> {
/// The instance that will be used to populate the &lt;command&gt; tag /// The instance that will be used to populate the &lt;command&gt; tag
pub command: T, pub command: T,
/// The client TRID /// The client TRID
@ -63,9 +63,7 @@ pub struct CommandWithExtension<T: ElementName, E: ElementName> {
pub client_tr_id: StringValue, pub client_tr_id: StringValue,
} }
impl<T: ElementName + Serialize, E: ElementName + Serialize> Serialize impl<T: ElementName + Serialize, E: ElementName + Serialize> Serialize for Command<T, E> {
for CommandWithExtension<T, E>
{
/// Serializes the generic type T to the proper XML tag (set by the `#[element_name(name = <tagname>)]` attribute) for the request /// Serializes the generic type T to the proper XML tag (set by the `#[element_name(name = <tagname>)]` attribute) for the request
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where where
@ -79,10 +77,10 @@ impl<T: ElementName + Serialize, E: ElementName + Serialize> Serialize
} }
} }
impl<T: ElementName, E: ElementName> CommandWithExtension<T, E> { impl<T: ElementName, E: ElementName> Command<T, E> {
/// Creates a new &lt;command&gt; tag for an EPP document with a containing &lt;extension&gt; tag /// Creates a new &lt;command&gt; tag for an EPP document with a containing &lt;extension&gt; tag
pub fn build(command: T, ext: E, client_tr_id: &str) -> CommandWithExtension<T, E> { pub fn build(command: T, ext: E, client_tr_id: &str) -> Command<T, E> {
CommandWithExtension { Command {
command, command,
extension: Some(Extension { data: ext }), extension: Some(Extension { data: ext }),
client_tr_id: client_tr_id.into(), client_tr_id: client_tr_id.into(),