Remove all xsi location attributes

This commit is contained in:
Nicholas Rempel 2021-11-18 15:55:20 -08:00 committed by masalachai
parent 09f0719b4f
commit 8462a872cd
30 changed files with 17 additions and 69 deletions

View File

@ -5,9 +5,7 @@ use epp_client_macros::*;
use crate::epp::object::{ElementName, EppObject, StringValue, StringValueTrait};
use crate::epp::request::domain::update::{DomainChangeInfo, DomainUpdate, DomainUpdateData};
use crate::epp::request::{CommandWithExtension, Extension};
use crate::epp::xml::{
EPP_DOMAIN_RGP_EXT_SCHEMA_LOCATION, EPP_DOMAIN_RGP_EXT_XMLNS, EPP_DOMAIN_XMLNS,
};
use crate::epp::xml::{EPP_DOMAIN_RGP_EXT_XMLNS, EPP_DOMAIN_XMLNS};
use chrono::{DateTime, SecondsFormat, Utc};
use serde::{Deserialize, Serialize};
@ -125,9 +123,6 @@ pub struct RgpRestoreReportSection {
pub struct RgpRestoreReport {
/// XML namespace for the RGP restore extension
xmlns: String,
/// XML schema location for the RGP restore extension
#[serde(rename = "xsi:schemaLocation")]
schema_location: String,
/// The object holding the list of domains to be checked
restore: RgpRestoreReportSection,
}
@ -167,7 +162,6 @@ impl EppDomainRgpRestoreReport {
extension: Some(Extension {
data: RgpRestoreReport {
xmlns: EPP_DOMAIN_RGP_EXT_XMLNS.to_string(),
schema_location: EPP_DOMAIN_RGP_EXT_SCHEMA_LOCATION.to_string(),
restore: RgpRestoreReportSection {
op: "report".to_string(),
report: RgpRestoreReportData {

View File

@ -5,9 +5,7 @@ use epp_client_macros::*;
use crate::epp::object::{ElementName, EppObject, StringValueTrait};
use crate::epp::request::domain::update::{DomainChangeInfo, DomainUpdate, DomainUpdateData};
use crate::epp::request::{CommandWithExtension, Extension};
use crate::epp::xml::{
EPP_DOMAIN_RGP_EXT_SCHEMA_LOCATION, EPP_DOMAIN_RGP_EXT_XMLNS, EPP_DOMAIN_XMLNS,
};
use crate::epp::xml::{EPP_DOMAIN_RGP_EXT_XMLNS, EPP_DOMAIN_XMLNS};
use serde::{Deserialize, Serialize};
/// Type that represents the <epp> request for a domain rgp restore request command
@ -75,9 +73,6 @@ pub struct RgpRestoreRequestData {
pub struct RgpRestoreRequest {
/// XML namespace for the RGP restore extension
xmlns: String,
/// XML schema location for the RGP restore extension
#[serde(rename = "xsi:schemaLocation")]
schema_location: String,
/// The object holding the list of domains to be checked
restore: RgpRestoreRequestData,
}
@ -101,7 +96,6 @@ impl EppDomainRgpRestoreRequest {
extension: Some(Extension {
data: RgpRestoreRequest {
xmlns: EPP_DOMAIN_RGP_EXT_XMLNS.to_string(),
schema_location: EPP_DOMAIN_RGP_EXT_SCHEMA_LOCATION.to_string(),
restore: RgpRestoreRequestData {
op: "request".to_string(),
},

View File

@ -35,9 +35,6 @@ pub struct ContactCheckData {
/// XML namespace for contact response data
#[serde(rename = "xmlns:contact")]
xmlns: String,
/// XML schema location for contact response data
#[serde(rename = "xsi:schemaLocation")]
schema_location: String,
/// Data under the <cd> tag
#[serde(rename = "cd")]
pub contact_list: Vec<ContactCheckDataItem>,

View File

@ -14,9 +14,6 @@ pub struct ContactCreateData {
/// XML namespace for contact response data
#[serde(rename = "xmlns:contact")]
xmlns: String,
/// XML schema location for contact response data
#[serde(rename = "xsi:schemaLocation")]
schema_location: String,
/// The contact id
pub id: StringValue,
#[serde(rename = "crDate")]

View File

@ -15,9 +15,6 @@ pub struct ContactInfoData {
/// XML namespace for contact response data
#[serde(rename = "xmlns:contact")]
xmlns: String,
/// XML schema location for contact response data
#[serde(rename = "xsi:schemaLocation")]
schema_location: String,
/// The contact id
pub id: StringValue,
/// The contact ROID

View File

@ -35,9 +35,6 @@ pub struct DomainCheckData {
/// XML namespace for domain response data
#[serde(rename = "xmlns:domain")]
xmlns: String,
/// XML schema location for domain response data
#[serde(rename = "xsi:schemaLocation")]
schema_location: String,
/// Data under the &lt;cd&gt; tag
#[serde(rename = "cd")]
pub domain_list: Vec<DomainCheckDataItem>,

View File

@ -14,9 +14,6 @@ pub struct DomainCreateData {
/// XML namespace for domain response data
#[serde(rename = "xmlns:domain")]
xmlns: String,
/// XML schema location for domain response data
#[serde(rename = "xsi:schemaLocation")]
schema_location: String,
/// The domain name
pub name: StringValue,
/// The creation date

View File

@ -28,9 +28,6 @@ pub struct DomainInfoData {
/// XML namespace for domain response data
#[serde(rename = "xmlns:domain")]
xmlns: String,
/// XML schema location for domain response data
#[serde(rename = "xsi:schemaLocation")]
schema_location: String,
/// The domain name
pub name: StringValue,
/// The domain ROID

View File

@ -13,9 +13,6 @@ pub struct DomainRenewData {
/// XML namespace for domain response data
#[serde(rename = "xmlns:domain")]
xmlns: String,
/// XML schema location for domain response data
#[serde(rename = "xsi:schemaLocation")]
schema_location: String,
/// The name of the domain
pub name: StringValue,
/// The new expiry date after renewal

View File

@ -23,9 +23,6 @@ pub struct RgpStatus {
pub struct RgpRequestResult {
#[serde(rename = "xmlns:rgp")]
xmlns: String,
/// XML schema location for domain response data
#[serde(rename = "xsi:schemaLocation")]
schema_location: String,
/// Data under the &lt;rgpStatus&gt; tag
#[serde(rename = "rgpStatus")]
pub rgp_status: RgpStatus,

View File

@ -22,9 +22,6 @@ pub struct DomainTransferData {
/// XML namespace for domain response data
#[serde(rename = "xmlns:domain")]
xmlns: String,
/// XML schema location for domain response data
#[serde(rename = "xsi:schemaLocation")]
schema_location: String,
/// The domain name
pub name: StringValue,
/// The domain transfer status

View File

@ -35,9 +35,6 @@ pub struct HostCheckData {
/// XML namespace for host response data
#[serde(rename = "xmlns:host")]
xmlns: String,
/// XML schema location for host response data
#[serde(rename = "xsi:schemaLocation")]
schema_location: String,
/// Data under the &lt;cd&gt; tag
#[serde(rename = "cd")]
pub host_list: Vec<HostCheckDataItem>,

View File

@ -14,9 +14,6 @@ pub struct HostCreateData {
/// XML namespace for host response data
#[serde(rename = "xmlns:host")]
xmlns: String,
/// XML schema location for host response data
#[serde(rename = "xsi:schemaLocation")]
schema_location: String,
/// The host name
pub name: StringValue,
/// The host creation date

View File

@ -15,9 +15,6 @@ pub struct HostInfoData {
/// XML namespace for host response data
#[serde(rename = "xmlns:host")]
xmlns: String,
/// XML schema location for host response data
#[serde(rename = "xsi:schemaLocation")]
schema_location: String,
/// The host name
pub name: StringValue,
/// The host ROID

View File

@ -13,11 +13,7 @@ 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_HOST_XMLNS: &str = "urn:ietf:params:xml:ns:host-1.0";
pub const EPP_CONTACT_SCHEMA_LOCATION: &str = "urn:ietf:params:xml:ns:contact-1.0 contact-1.0.xsd";
pub const EPP_DOMAIN_SCHEMA_LOCATION: &str = "urn:ietf:params:xml:ns:domain-1.0 domain-1.0.xsd";
pub const EPP_DOMAIN_RGP_EXT_XMLNS: &str = "urn:ietf:params:xml:ns:rgp-1.0";
pub const EPP_DOMAIN_RGP_EXT_SCHEMA_LOCATION: &str = "urn:ietf:params:xml:ns:rgp-1.0 rgp-1.0.xsd";
pub const EPP_VERSION: &str = "1.0";
pub const EPP_LANG: &str = "en";

View File

@ -8,7 +8,7 @@
</update>
</update>
<extension>
<update xmlns="urn:ietf:params:xml:ns:rgp-1.0" xsi:schemaLocation="urn:ietf:params:xml:ns:rgp-1.0 rgp-1.0.xsd">
<update xmlns="urn:ietf:params:xml:ns:rgp-1.0">
<restore op="report">
<report>
<preData>Pre-delete registration data goes here. Both XML and free text are allowed.</preData>

View File

@ -8,7 +8,7 @@
</update>
</update>
<extension>
<update xmlns="urn:ietf:params:xml:ns:rgp-1.0" xsi:schemaLocation="urn:ietf:params:xml:ns:rgp-1.0 rgp-1.0.xsd">
<update xmlns="urn:ietf:params:xml:ns:rgp-1.0">
<restore op="request"/>
</update>
</extension>

View File

@ -5,7 +5,7 @@
<msg>Command completed successfully</msg>
</result>
<resData>
<contact:chkData xmlns:contact="urn:ietf:params:xml:ns:contact-1.0" xsi:schemaLocation="urn:ietf:params:xml:ns:contact-1.0 contact-1.0.xsd">
<contact:chkData xmlns:contact="urn:ietf:params:xml:ns:contact-1.0">
<contact:cd>
<contact:id avail="0">eppdev-contact-1</contact:id>
</contact:cd>

View File

@ -5,7 +5,7 @@
<msg>Command completed successfully</msg>
</result>
<resData>
<contact:creData xmlns:contact="urn:ietf:params:xml:ns:contact-1.0" xsi:schemaLocation="urn:ietf:params:xml:ns:contact-1.0 contact-1.0.xsd">
<contact:creData xmlns:contact="urn:ietf:params:xml:ns:contact-1.0">
<contact:id>eppdev-contact-4</contact:id>
<contact:crDate>2021-07-25T16:05:32.0Z</contact:crDate>
</contact:creData>

View File

@ -5,7 +5,7 @@
<msg>Command completed successfully</msg>
</result>
<resData>
<contact:infData xmlns:contact="urn:ietf:params:xml:ns:contact-1.0" xsi:schemaLocation="urn:ietf:params:xml:ns:contact-1.0 contact-1.0.xsd">
<contact:infData xmlns:contact="urn:ietf:params:xml:ns:contact-1.0">
<contact:id>eppdev-contact-3</contact:id>
<contact:roid>UNDEF-ROID</contact:roid>
<contact:status s="ok"/>

View File

@ -5,7 +5,7 @@
<msg>Command completed successfully</msg>
</result>
<resData>
<domain:chkData xmlns:domain="urn:ietf:params:xml:ns:domain-1.0" xsi:schemaLocation="urn:ietf:params:xml:ns:domain-1.0 domain-1.0.xsd">
<domain:chkData xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
<domain:cd>
<domain:name avail="1">eppdev.com</domain:name>
</domain:cd>

View File

@ -11,7 +11,7 @@
</extValue>
</result>
<resData>
<domain:creData xmlns:domain="urn:ietf:params:xml:ns:domain-1.0" xsi:schemaLocation="urn:ietf:params:xml:ns:domain-1.0 domain-1.0.xsd">
<domain:creData xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
<domain:name>eppdev-2.com</domain:name>
<domain:crDate>2021-07-25T18:11:35.0Z</domain:crDate>
<domain:exDate>2022-07-25T18:11:34.0Z</domain:exDate>

View File

@ -5,7 +5,7 @@
<msg>Command completed successfully</msg>
</result>
<resData>
<domain:infData xmlns:domain="urn:ietf:params:xml:ns:domain-1.0" xsi:schemaLocation="urn:ietf:params:xml:ns:domain-1.0 domain-1.0.xsd">
<domain:infData xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
<domain:name>eppdev-1.com</domain:name>
<domain:roid>125899511_DOMAIN_COM-VRSN</domain:roid>
<domain:status s="ok"/>

View File

@ -11,7 +11,7 @@
</extValue>
</result>
<resData>
<domain:renData xmlns:domain="urn:ietf:params:xml:ns:domain-1.0" xsi:schemaLocation="urn:ietf:params:xml:ns:domain-1.0 domain-1.0.xsd">
<domain:renData xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
<domain:name>eppdev-1.com</domain:name>
<domain:exDate>2024-07-23T15:31:20.0Z</domain:exDate>
</domain:renData>

View File

@ -5,7 +5,7 @@
<msg lang="en">Command completed successfully</msg>
</result>
<extension>
<rgp:upData xmlns:rgp="urn:ietf:params:xml:ns:rgp-1.0" xsi:schemaLocation="urn:ietf:params:xml:ns:rgp-1.0 rgp-1.0.xsd">
<rgp:upData xmlns:rgp="urn:ietf:params:xml:ns:rgp-1.0">
<rgp:rgpStatus s="pendingRestore"/>
</rgp:upData>
</extension>

View File

@ -5,7 +5,7 @@
<msg>Command completed successfully</msg>
</result>
<resData>
<domain:trnData xmlns:domain="urn:ietf:params:xml:ns:domain-1.0" xsi:schemaLocation="urn:ietf:params:xml:ns:domain-1.0 domain-1.0.xsd">
<domain:trnData xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
<domain:name>eppdev-transfer.com</domain:name>
<domain:trStatus>pending</domain:trStatus>
<domain:reID>eppdev</domain:reID>

View File

@ -5,7 +5,7 @@
<msg>Command completed successfully; action pending</msg>
</result>
<resData>
<domain:trnData xmlns:domain="urn:ietf:params:xml:ns:domain-1.0" xsi:schemaLocation="urn:ietf:params:xml:ns:domain-1.0 domain-1.0.xsd">
<domain:trnData xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
<domain:name>eppdev-transfer.com</domain:name>
<domain:trStatus>pending</domain:trStatus>
<domain:reID>eppdev</domain:reID>

View File

@ -5,7 +5,7 @@
<msg>Command completed successfully</msg>
</result>
<resData>
<host:chkData xmlns:host="urn:ietf:params:xml:ns:host-1.0" xsi:schemaLocation="urn:ietf:params:xml:ns:host-1.0 host-1.0.xsd">
<host:chkData xmlns:host="urn:ietf:params:xml:ns:host-1.0">
<host:cd>
<host:name avail="1">host1.eppdev-1.com</host:name>
</host:cd>

View File

@ -5,7 +5,7 @@
<msg>Command completed successfully</msg>
</result>
<resData>
<host:creData xmlns:host="urn:ietf:params:xml:ns:host-1.0" xsi:schemaLocation="urn:ietf:params:xml:ns:host-1.0 host-1.0.xsd">
<host:creData xmlns:host="urn:ietf:params:xml:ns:host-1.0">
<host:name>host2.eppdev-1.com</host:name>
<host:crDate>2021-07-26T05:28:55.0Z</host:crDate>
</host:creData>

View File

@ -5,7 +5,7 @@
<msg>Command completed successfully</msg>
</result>
<resData>
<host:infData xmlns:host="urn:ietf:params:xml:ns:host-1.0" xsi:schemaLocation="urn:ietf:params:xml:ns:host-1.0 host-1.0.xsd">
<host:infData xmlns:host="urn:ietf:params:xml:ns:host-1.0">
<host:name>host2.eppdev-1.com</host:name>
<host:roid>UNDEF-ROID</host:roid>
<host:status s="ok"/>