From 8462a872cddff391835bcc259535bcd904fe04ed Mon Sep 17 00:00:00 2001 From: Nicholas Rempel Date: Thu, 18 Nov 2021 15:55:20 -0800 Subject: [PATCH] Remove all xsi location attributes --- epp-client/src/epp/request/domain/rgp/report.rs | 8 +------- epp-client/src/epp/request/domain/rgp/request.rs | 8 +------- epp-client/src/epp/response/contact/check.rs | 3 --- epp-client/src/epp/response/contact/create.rs | 3 --- epp-client/src/epp/response/contact/info.rs | 3 --- epp-client/src/epp/response/domain/check.rs | 3 --- epp-client/src/epp/response/domain/create.rs | 3 --- epp-client/src/epp/response/domain/info.rs | 3 --- epp-client/src/epp/response/domain/renew.rs | 3 --- epp-client/src/epp/response/domain/rgp/request.rs | 3 --- epp-client/src/epp/response/domain/transfer.rs | 3 --- epp-client/src/epp/response/host/check.rs | 3 --- epp-client/src/epp/response/host/create.rs | 3 --- epp-client/src/epp/response/host/info.rs | 3 --- epp-client/src/epp/xml.rs | 4 ---- .../test/resources/request/domain/rgp_restore_report.xml | 2 +- .../test/resources/request/domain/rgp_restore_request.xml | 2 +- epp-client/test/resources/response/contact/check.xml | 2 +- epp-client/test/resources/response/contact/create.xml | 2 +- epp-client/test/resources/response/contact/info.xml | 2 +- epp-client/test/resources/response/domain/check.xml | 2 +- epp-client/test/resources/response/domain/create.xml | 2 +- epp-client/test/resources/response/domain/info.xml | 2 +- epp-client/test/resources/response/domain/renew.xml | 2 +- epp-client/test/resources/response/domain/rgp_restore.xml | 2 +- .../test/resources/response/domain/transfer_query.xml | 2 +- .../test/resources/response/domain/transfer_request.xml | 2 +- epp-client/test/resources/response/host/check.xml | 2 +- epp-client/test/resources/response/host/create.xml | 2 +- epp-client/test/resources/response/host/info.xml | 2 +- 30 files changed, 17 insertions(+), 69 deletions(-) diff --git a/epp-client/src/epp/request/domain/rgp/report.rs b/epp-client/src/epp/request/domain/rgp/report.rs index d80dd14..2beb552 100644 --- a/epp-client/src/epp/request/domain/rgp/report.rs +++ b/epp-client/src/epp/request/domain/rgp/report.rs @@ -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 { diff --git a/epp-client/src/epp/request/domain/rgp/request.rs b/epp-client/src/epp/request/domain/rgp/request.rs index 5030d4b..b96f0cc 100644 --- a/epp-client/src/epp/request/domain/rgp/request.rs +++ b/epp-client/src/epp/request/domain/rgp/request.rs @@ -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(), }, diff --git a/epp-client/src/epp/response/contact/check.rs b/epp-client/src/epp/response/contact/check.rs index b541799..2963112 100644 --- a/epp-client/src/epp/response/contact/check.rs +++ b/epp-client/src/epp/response/contact/check.rs @@ -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, diff --git a/epp-client/src/epp/response/contact/create.rs b/epp-client/src/epp/response/contact/create.rs index 2354915..a03fefc 100644 --- a/epp-client/src/epp/response/contact/create.rs +++ b/epp-client/src/epp/response/contact/create.rs @@ -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")] diff --git a/epp-client/src/epp/response/contact/info.rs b/epp-client/src/epp/response/contact/info.rs index 10fbb65..8a15402 100644 --- a/epp-client/src/epp/response/contact/info.rs +++ b/epp-client/src/epp/response/contact/info.rs @@ -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 diff --git a/epp-client/src/epp/response/domain/check.rs b/epp-client/src/epp/response/domain/check.rs index 2734e9d..7fda652 100644 --- a/epp-client/src/epp/response/domain/check.rs +++ b/epp-client/src/epp/response/domain/check.rs @@ -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 <cd> tag #[serde(rename = "cd")] pub domain_list: Vec, diff --git a/epp-client/src/epp/response/domain/create.rs b/epp-client/src/epp/response/domain/create.rs index 45db4a0..c6470ba 100644 --- a/epp-client/src/epp/response/domain/create.rs +++ b/epp-client/src/epp/response/domain/create.rs @@ -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 diff --git a/epp-client/src/epp/response/domain/info.rs b/epp-client/src/epp/response/domain/info.rs index 536dc53..b20f3df 100644 --- a/epp-client/src/epp/response/domain/info.rs +++ b/epp-client/src/epp/response/domain/info.rs @@ -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 diff --git a/epp-client/src/epp/response/domain/renew.rs b/epp-client/src/epp/response/domain/renew.rs index c935f88..17f71b0 100644 --- a/epp-client/src/epp/response/domain/renew.rs +++ b/epp-client/src/epp/response/domain/renew.rs @@ -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 diff --git a/epp-client/src/epp/response/domain/rgp/request.rs b/epp-client/src/epp/response/domain/rgp/request.rs index ea39767..3582897 100644 --- a/epp-client/src/epp/response/domain/rgp/request.rs +++ b/epp-client/src/epp/response/domain/rgp/request.rs @@ -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 <rgpStatus> tag #[serde(rename = "rgpStatus")] pub rgp_status: RgpStatus, diff --git a/epp-client/src/epp/response/domain/transfer.rs b/epp-client/src/epp/response/domain/transfer.rs index 4e4c96a..9f9f3bf 100644 --- a/epp-client/src/epp/response/domain/transfer.rs +++ b/epp-client/src/epp/response/domain/transfer.rs @@ -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 diff --git a/epp-client/src/epp/response/host/check.rs b/epp-client/src/epp/response/host/check.rs index 06b2bf3..4cbee92 100644 --- a/epp-client/src/epp/response/host/check.rs +++ b/epp-client/src/epp/response/host/check.rs @@ -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 <cd> tag #[serde(rename = "cd")] pub host_list: Vec, diff --git a/epp-client/src/epp/response/host/create.rs b/epp-client/src/epp/response/host/create.rs index a26e97a..75c609c 100644 --- a/epp-client/src/epp/response/host/create.rs +++ b/epp-client/src/epp/response/host/create.rs @@ -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 diff --git a/epp-client/src/epp/response/host/info.rs b/epp-client/src/epp/response/host/info.rs index 23e679c..071ed66 100644 --- a/epp-client/src/epp/response/host/info.rs +++ b/epp-client/src/epp/response/host/info.rs @@ -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 diff --git a/epp-client/src/epp/xml.rs b/epp-client/src/epp/xml.rs index 9f57080..8be5a8d 100644 --- a/epp-client/src/epp/xml.rs +++ b/epp-client/src/epp/xml.rs @@ -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"; diff --git a/epp-client/test/resources/request/domain/rgp_restore_report.xml b/epp-client/test/resources/request/domain/rgp_restore_report.xml index 7e36802..3471070 100644 --- a/epp-client/test/resources/request/domain/rgp_restore_report.xml +++ b/epp-client/test/resources/request/domain/rgp_restore_report.xml @@ -8,7 +8,7 @@ - + Pre-delete registration data goes here. Both XML and free text are allowed. diff --git a/epp-client/test/resources/request/domain/rgp_restore_request.xml b/epp-client/test/resources/request/domain/rgp_restore_request.xml index a5e2c2c..f79a009 100644 --- a/epp-client/test/resources/request/domain/rgp_restore_request.xml +++ b/epp-client/test/resources/request/domain/rgp_restore_request.xml @@ -8,7 +8,7 @@ - + diff --git a/epp-client/test/resources/response/contact/check.xml b/epp-client/test/resources/response/contact/check.xml index 5dc3b73..31d6281 100644 --- a/epp-client/test/resources/response/contact/check.xml +++ b/epp-client/test/resources/response/contact/check.xml @@ -5,7 +5,7 @@ Command completed successfully - + eppdev-contact-1 diff --git a/epp-client/test/resources/response/contact/create.xml b/epp-client/test/resources/response/contact/create.xml index e91163e..e19be18 100644 --- a/epp-client/test/resources/response/contact/create.xml +++ b/epp-client/test/resources/response/contact/create.xml @@ -5,7 +5,7 @@ Command completed successfully - + eppdev-contact-4 2021-07-25T16:05:32.0Z diff --git a/epp-client/test/resources/response/contact/info.xml b/epp-client/test/resources/response/contact/info.xml index e63f689..1e8cce0 100644 --- a/epp-client/test/resources/response/contact/info.xml +++ b/epp-client/test/resources/response/contact/info.xml @@ -5,7 +5,7 @@ Command completed successfully - + eppdev-contact-3 UNDEF-ROID diff --git a/epp-client/test/resources/response/domain/check.xml b/epp-client/test/resources/response/domain/check.xml index 08b6de1..c35b83a 100644 --- a/epp-client/test/resources/response/domain/check.xml +++ b/epp-client/test/resources/response/domain/check.xml @@ -5,7 +5,7 @@ Command completed successfully - + eppdev.com diff --git a/epp-client/test/resources/response/domain/create.xml b/epp-client/test/resources/response/domain/create.xml index 8c5df66..09315c9 100644 --- a/epp-client/test/resources/response/domain/create.xml +++ b/epp-client/test/resources/response/domain/create.xml @@ -11,7 +11,7 @@ - + eppdev-2.com 2021-07-25T18:11:35.0Z 2022-07-25T18:11:34.0Z diff --git a/epp-client/test/resources/response/domain/info.xml b/epp-client/test/resources/response/domain/info.xml index 4f8e974..1d6eef5 100644 --- a/epp-client/test/resources/response/domain/info.xml +++ b/epp-client/test/resources/response/domain/info.xml @@ -5,7 +5,7 @@ Command completed successfully - + eppdev-1.com 125899511_DOMAIN_COM-VRSN diff --git a/epp-client/test/resources/response/domain/renew.xml b/epp-client/test/resources/response/domain/renew.xml index 660b7d1..7bc4d38 100644 --- a/epp-client/test/resources/response/domain/renew.xml +++ b/epp-client/test/resources/response/domain/renew.xml @@ -11,7 +11,7 @@ - + eppdev-1.com 2024-07-23T15:31:20.0Z diff --git a/epp-client/test/resources/response/domain/rgp_restore.xml b/epp-client/test/resources/response/domain/rgp_restore.xml index f2c744b..da79fb1 100644 --- a/epp-client/test/resources/response/domain/rgp_restore.xml +++ b/epp-client/test/resources/response/domain/rgp_restore.xml @@ -5,7 +5,7 @@ Command completed successfully - + diff --git a/epp-client/test/resources/response/domain/transfer_query.xml b/epp-client/test/resources/response/domain/transfer_query.xml index 3dde52d..8e96f63 100644 --- a/epp-client/test/resources/response/domain/transfer_query.xml +++ b/epp-client/test/resources/response/domain/transfer_query.xml @@ -5,7 +5,7 @@ Command completed successfully - + eppdev-transfer.com pending eppdev diff --git a/epp-client/test/resources/response/domain/transfer_request.xml b/epp-client/test/resources/response/domain/transfer_request.xml index b19e831..5ae286a 100644 --- a/epp-client/test/resources/response/domain/transfer_request.xml +++ b/epp-client/test/resources/response/domain/transfer_request.xml @@ -5,7 +5,7 @@ Command completed successfully; action pending - + eppdev-transfer.com pending eppdev diff --git a/epp-client/test/resources/response/host/check.xml b/epp-client/test/resources/response/host/check.xml index 3a0c4a8..d876640 100644 --- a/epp-client/test/resources/response/host/check.xml +++ b/epp-client/test/resources/response/host/check.xml @@ -5,7 +5,7 @@ Command completed successfully - + host1.eppdev-1.com diff --git a/epp-client/test/resources/response/host/create.xml b/epp-client/test/resources/response/host/create.xml index f4cf304..fded4ac 100644 --- a/epp-client/test/resources/response/host/create.xml +++ b/epp-client/test/resources/response/host/create.xml @@ -5,7 +5,7 @@ Command completed successfully - + host2.eppdev-1.com 2021-07-26T05:28:55.0Z diff --git a/epp-client/test/resources/response/host/info.xml b/epp-client/test/resources/response/host/info.xml index e16db35..3959562 100644 --- a/epp-client/test/resources/response/host/info.xml +++ b/epp-client/test/resources/response/host/info.xml @@ -5,7 +5,7 @@ Command completed successfully - + host2.eppdev-1.com UNDEF-ROID