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

Remove xsi attribute handling

This commit is contained in:
Nicholas Rempel 2021-11-08 16:57:27 -08:00 committed by masalachai
parent cf8f11c35b
commit 69a8fe40d2
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
epp-client/src/epp/object.rs
View File

@ -6,7 +6,7 @@ use epp_client_macros::*;
use serde::{ser::SerializeStruct, Deserialize, Serialize, Serializer}; use serde::{ser::SerializeStruct, Deserialize, Serialize, Serializer};
use std::fmt::Display; use std::fmt::Display;
use crate::epp::xml::{EPP_XMLNS, EPP_XMLNS_XSI, EPP_XSI_SCHEMA_LOCATION}; use crate::epp::xml::EPP_XMLNS;
/// Wraps String for easier serialization to and from values that are inner text /// Wraps String for easier serialization to and from values that are inner text
/// for tags rather than attributes /// for tags rather than attributes
@ -59,12 +59,6 @@ pub struct EmptyTag;
pub struct EppObject<T: ElementName> { pub struct EppObject<T: ElementName> {
/// XML namespace for the &lt;epp&gt; tag /// XML namespace for the &lt;epp&gt; tag
pub xmlns: String, pub xmlns: String,
/// Schema namespace for the &lt;epp&gt; tag
#[serde(rename = "xmlns:xsi")]
pub xmlns_xsi: String,
/// Schema location attribute for &lt;epp&gt;
#[serde(rename = "xsi:schemaLocation")]
pub xsi_schema_location: String,
/// the request or response object that is set or received in the EPP XML document /// the request or response object that is set or received in the EPP XML document
#[serde(alias = "greeting", alias = "response")] #[serde(alias = "greeting", alias = "response")]
pub data: T, pub data: T,
@ -82,8 +76,6 @@ impl<T: ElementName + Serialize> Serialize for EppObject<T> {
let mut state = serializer.serialize_struct("epp", 4)?; let mut state = serializer.serialize_struct("epp", 4)?;
state.serialize_field("xmlns", &self.xmlns)?; state.serialize_field("xmlns", &self.xmlns)?;
state.serialize_field("xmlns:xsi", &self.xmlns_xsi)?;
state.serialize_field("xsi:schemaLocation", &self.xsi_schema_location)?;
state.serialize_field(data_name, &self.data)?; state.serialize_field(data_name, &self.data)?;
state.end() state.end()
} }
@ -158,8 +150,6 @@ impl<T: ElementName> EppObject<T> {
// xml: None, // xml: None,
data, data,
xmlns: EPP_XMLNS.to_string(), xmlns: EPP_XMLNS.to_string(),
xmlns_xsi: EPP_XMLNS_XSI.to_string(),
xsi_schema_location: EPP_XSI_SCHEMA_LOCATION.to_string(),
} }
} }
} }

2
epp-client/src/epp/xml.rs
View File

@ -8,8 +8,6 @@ use crate::error;
pub const EPP_XML_HEADER: &str = r#"<?xml version="1.0" encoding="UTF-8" standalone="no"?>"#; pub const EPP_XML_HEADER: &str = r#"<?xml version="1.0" encoding="UTF-8" standalone="no"?>"#;
pub const EPP_XMLNS: &str = "urn:ietf:params:xml:ns:epp-1.0"; pub const EPP_XMLNS: &str = "urn:ietf:params:xml:ns:epp-1.0";
pub const EPP_XMLNS_XSI: &str = "http://www.w3.org/2001/XMLSchema-instance";
pub const EPP_XSI_SCHEMA_LOCATION: &str = "urn:ietf:params:xml:ns:epp-1.0 epp-1.0.xsd";
pub const EPP_DOMAIN_XMLNS: &str = "urn:ietf:params:xml:ns:domain-1.0"; pub const EPP_DOMAIN_XMLNS: &str = "urn:ietf:params:xml:ns:domain-1.0";
pub const EPP_CONTACT_XMLNS: &str = "urn:ietf:params:xml:ns:contact-1.0"; pub const EPP_CONTACT_XMLNS: &str = "urn:ietf:params:xml:ns:contact-1.0";