From fce6c7a2ebf9b9f59fd3b2413998e27cb9c1a6ff Mon Sep 17 00:00:00 2001
From: Nicholas Rempel <nick@lucent.is>
Date: Fri, 26 Nov 2021 11:20:25 -0800
Subject: [PATCH] Refactor object::data into common module

---
 .../src/{epp/object/data.rs => common.rs}     | 139 ++++++++++++++++-
 epp-client/src/contact/check.rs               |   2 +-
 epp-client/src/contact/create.rs              |  21 ++-
 epp-client/src/contact/delete.rs              |   2 +-
 epp-client/src/contact/info.rs                |   5 +-
 epp-client/src/contact/update.rs              |   7 +-
 epp-client/src/domain/check.rs                |   2 +-
 epp-client/src/domain/create.rs               |   8 +-
 epp-client/src/domain/delete.rs               |   2 +-
 epp-client/src/domain/info.rs                 |   5 +-
 epp-client/src/domain/renew.rs                |   3 +-
 epp-client/src/domain/rgp/report.rs           |   2 +-
 epp-client/src/domain/rgp/request.rs          |   2 +-
 epp-client/src/domain/transfer.rs             |   3 +-
 epp-client/src/domain/update.rs               |   8 +-
 epp-client/src/epp.rs                         |   1 -
 epp-client/src/epp/object.rs                  | 140 ------------------
 epp-client/src/epp/request.rs                 |   9 +-
 epp-client/src/epp/response.rs                |   2 +-
 epp-client/src/epp/xml.rs                     |   1 -
 epp-client/src/epp/xml/quick_xml.rs           |   2 +-
 epp-client/src/host/check.rs                  |   2 +-
 epp-client/src/host/create.rs                 |   5 +-
 epp-client/src/host/delete.rs                 |   2 +-
 epp-client/src/host/info.rs                   |   3 +-
 epp-client/src/host/update.rs                 |   5 +-
 epp-client/src/lib.rs                         |   1 +
 epp-client/src/message/ack.rs                 |   2 +-
 epp-client/src/message/poll.rs                |   2 +-
 epp-client/src/tests/de.rs                    |   1 -
 epp-client/src/tests/se.rs                    |   9 +-
 31 files changed, 196 insertions(+), 202 deletions(-)
 rename epp-client/src/{epp/object/data.rs => common.rs} (65%)
 delete mode 100644 epp-client/src/epp/object.rs

diff --git a/epp-client/src/epp/object/data.rs b/epp-client/src/common.rs
similarity index 65%
rename from epp-client/src/epp/object/data.rs
rename to epp-client/src/common.rs
index f8b901e..ff484ca 100644
--- a/epp-client/src/epp/object/data.rs
+++ b/epp-client/src/common.rs
@@ -1,7 +1,142 @@
 //! Common data types included in EPP Requests and Responses
 
-use crate::epp::object::StringValue;
-use serde::{Deserialize, Serialize};
+use std::fmt::Display;
+
+use epp_client_macros::ElementName;
+use serde::{ser::SerializeStruct, Deserialize, Serialize, Serializer};
+
+const EPP_XMLNS: &str = "urn:ietf:params:xml:ns:epp-1.0";
+
+/// Wraps String for easier serialization to and from values that are inner text
+/// for tags rather than attributes
+#[derive(Default, Serialize, Deserialize, Debug, PartialEq, Clone)]
+pub struct StringValue(String);
+
+impl Display for StringValue {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+impl From<&str> for StringValue {
+    fn from(s: &str) -> Self {
+        Self(s.to_owned())
+    }
+}
+
+impl From<String> for StringValue {
+    fn from(s: String) -> Self {
+        Self(s)
+    }
+}
+
+/// Trait to set correct value for xml tags when tags are being generated from generic types
+pub trait ElementName {
+    const ELEMENT: &'static str;
+}
+
+#[derive(Serialize, Deserialize, Debug, PartialEq, ElementName)]
+#[element_name(name = "empty")]
+/// An empty placeholder tag. To be refactored to something more compliant later.
+pub struct EmptyTag;
+
+/// An EPP XML Document that is used either as an EPP XML request or
+/// an EPP XML response
+#[derive(Deserialize, Debug, PartialEq)]
+#[serde(rename = "epp")]
+pub struct EppObject<T: ElementName> {
+    /// XML namespace for the &lt;epp&gt; tag
+    pub xmlns: String,
+    /// the request or response object that is set or received in the EPP XML document
+    #[serde(alias = "greeting", alias = "response")]
+    pub data: T,
+    // TODO: save serialized xml in the instance for debugging or client logging purposes
+    // #[serde(skip)]
+    // pub xml: Option<String>,
+}
+
+impl<T: ElementName + Serialize> Serialize for EppObject<T> {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        let mut state = serializer.serialize_struct("epp", 4)?;
+        state.serialize_field("xmlns", &self.xmlns)?;
+        state.serialize_field(T::ELEMENT, &self.data)?;
+        state.end()
+    }
+}
+
+/// The <option> type in EPP XML login requests
+#[derive(Serialize, Deserialize, Debug, PartialEq)]
+#[serde(rename = "options")]
+pub struct Options {
+    /// The EPP version being used
+    pub version: StringValue,
+    /// The language that will be used during EPP transactions
+    pub lang: StringValue,
+}
+
+impl Options {
+    /// Creates an Options object with version and lang data
+    pub fn build(version: &str, lang: &str) -> Options {
+        Options {
+            version: version.into(),
+            lang: lang.into(),
+        }
+    }
+}
+
+/// Type representing the &lt;extension&gt; tag for an EPP document
+#[derive(Deserialize, Debug, PartialEq)]
+#[serde(rename = "extension")]
+pub struct Extension<E: ElementName> {
+    /// Data under the &lt;extension&gt; tag
+    #[serde(alias = "upData")]
+    pub data: E,
+}
+
+impl<E: ElementName + Serialize> Serialize for Extension<E> {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        let mut state = serializer.serialize_struct("extension", 1)?;
+        state.serialize_field(E::ELEMENT, &self.data)?;
+        state.end()
+    }
+}
+
+/// The <svcExtension> type in EPP XML
+#[derive(Serialize, Deserialize, Debug, PartialEq)]
+#[serde(rename = "svcExtension")]
+pub struct ServiceExtension {
+    /// The service extension URIs being represented by <extURI> in EPP XML
+    #[serde(rename = "extURI")]
+    pub ext_uris: Option<Vec<StringValue>>,
+}
+
+/// The <svcs> type in EPP XML
+#[derive(Serialize, Deserialize, Debug, PartialEq)]
+pub struct Services {
+    /// The service URIs being used by this EPP session represented by <objURI> in EPP XML
+    #[serde(rename = "objURI")]
+    pub obj_uris: Vec<StringValue>,
+    /// The <svcExtention> being used in this EPP session
+    #[serde(rename = "svcExtension")]
+    pub svc_ext: Option<ServiceExtension>,
+}
+
+impl<T: ElementName> EppObject<T> {
+    /// Create the enclosing EPP XML tag &lt;epp&gt; for data that represents an EPP XML request or response
+    pub fn build(data: T) -> EppObject<T> {
+        EppObject {
+            // xml: None,
+            data,
+            xmlns: EPP_XMLNS.to_string(),
+        }
+    }
+}
 
 /// The &lt;status&gt; attribute on EPP XML for domain transactions
 pub type DomainStatus = ContactStatus;
diff --git a/epp-client/src/contact/check.rs b/epp-client/src/contact/check.rs
index 71476b2..17f42aa 100644
--- a/epp-client/src/contact/check.rs
+++ b/epp-client/src/contact/check.rs
@@ -1,7 +1,7 @@
 /// Types for EPP contact check request
 use epp_client_macros::*;
 
-use crate::epp::object::{ElementName, EppObject, StringValue};
+use crate::common::{ElementName, EppObject, StringValue};
 use crate::epp::request::Command;
 use crate::epp::response::CommandResponse;
 use crate::epp::xml::EPP_CONTACT_XMLNS;
diff --git a/epp-client/src/contact/create.rs b/epp-client/src/contact/create.rs
index 038fe65..46dd93e 100644
--- a/epp-client/src/contact/create.rs
+++ b/epp-client/src/contact/create.rs
@@ -2,8 +2,7 @@
 
 use epp_client_macros::*;
 
-use crate::epp::object::data;
-use crate::epp::object::{ElementName, EppObject, StringValue};
+use crate::common::{ContactAuthInfo, ElementName, EppObject, Phone, PostalInfo, StringValue};
 use crate::epp::request::Command;
 use crate::epp::response::CommandResponse;
 use crate::epp::xml::EPP_CONTACT_XMLNS;
@@ -18,7 +17,7 @@ use serde::{Deserialize, Serialize};
 ///
 /// use epp_client::config::{EppClientConfig, EppClientConnection};
 /// use epp_client::EppClient;
-/// use epp_client::epp::object::data::{Address, Phone, PostalInfo};
+/// use epp_client::common::{Address, Phone, PostalInfo};
 /// use epp_client::contact::create::{EppContactCreate, EppContactCreateResponse};
 /// use epp_client::epp::generate_client_tr_id;
 ///
@@ -80,8 +79,8 @@ impl EppContactCreate {
     pub fn new(
         id: &str,
         email: &str,
-        postal_info: data::PostalInfo,
-        voice: data::Phone,
+        postal_info: PostalInfo,
+        voice: Phone,
         auth_password: &str,
         client_tr_id: &str,
     ) -> EppContactCreate {
@@ -93,7 +92,7 @@ impl EppContactCreate {
                 voice,
                 fax: None,
                 email: email.into(),
-                auth_info: data::ContactAuthInfo::new(auth_password),
+                auth_info: ContactAuthInfo::new(auth_password),
             },
         };
 
@@ -104,7 +103,7 @@ impl EppContactCreate {
     }
 
     /// Sets the &lt;fax&gt; data for the request
-    pub fn set_fax(&mut self, fax: data::Phone) {
+    pub fn set_fax(&mut self, fax: Phone) {
         self.data.command.contact.fax = Some(fax);
     }
 }
@@ -125,19 +124,19 @@ pub struct Contact {
     id: StringValue,
     /// Contact &lt;postalInfo&gt; tag
     #[serde(rename = "contact:postalInfo", alias = "postalInfo")]
-    postal_info: data::PostalInfo,
+    postal_info: PostalInfo,
     /// Contact &lt;voice&gt; tag
     #[serde(rename = "contact:voice", alias = "voice")]
-    voice: data::Phone,
+    voice: Phone,
     /// Contact &lt;fax&gt; tag,
     #[serde(rename = "contact:fax", alias = "fax")]
-    fax: Option<data::Phone>,
+    fax: Option<Phone>,
     /// Contact &lt;email&gt; tag
     #[serde(rename = "contact:email", alias = "email")]
     email: StringValue,
     /// Contact &lt;authInfo&gt; tag
     #[serde(rename = "contact:authInfo", alias = "authInfo")]
-    auth_info: data::ContactAuthInfo,
+    auth_info: ContactAuthInfo,
 }
 
 #[derive(Serialize, Deserialize, Debug, ElementName)]
diff --git a/epp-client/src/contact/delete.rs b/epp-client/src/contact/delete.rs
index a75f0f7..1bca940 100644
--- a/epp-client/src/contact/delete.rs
+++ b/epp-client/src/contact/delete.rs
@@ -2,7 +2,7 @@
 
 use epp_client_macros::*;
 
-use crate::epp::object::{ElementName, EppObject, StringValue};
+use crate::common::{ElementName, EppObject, StringValue};
 use crate::epp::request::Command;
 use crate::epp::response::EppCommandResponse;
 use crate::epp::xml::EPP_CONTACT_XMLNS;
diff --git a/epp-client/src/contact/info.rs b/epp-client/src/contact/info.rs
index 9d1ab04..2801d5e 100644
--- a/epp-client/src/contact/info.rs
+++ b/epp-client/src/contact/info.rs
@@ -2,8 +2,9 @@
 
 use epp_client_macros::*;
 
-use crate::epp::object::data::{ContactAuthInfo, ContactStatus, Phone, PostalInfo};
-use crate::epp::object::{ElementName, EppObject, StringValue};
+use crate::common::{
+    ContactAuthInfo, ContactStatus, ElementName, EppObject, Phone, PostalInfo, StringValue,
+};
 use crate::epp::request::Command;
 use crate::epp::response::CommandResponse;
 use crate::epp::xml::EPP_CONTACT_XMLNS;
diff --git a/epp-client/src/contact/update.rs b/epp-client/src/contact/update.rs
index 0f4cbd6..922436c 100644
--- a/epp-client/src/contact/update.rs
+++ b/epp-client/src/contact/update.rs
@@ -2,9 +2,10 @@
 
 use epp_client_macros::*;
 
+use crate::common::{
+    ContactAuthInfo, ContactStatus, ElementName, EppObject, Phone, PostalInfo, StringValue,
+};
 use crate::contact::info::EppContactInfoResponse;
-use crate::epp::object::data::{ContactAuthInfo, ContactStatus, Phone, PostalInfo};
-use crate::epp::object::{ElementName, EppObject, StringValue};
 use crate::epp::request::Command;
 use crate::epp::response::EppCommandResponse;
 use crate::epp::xml::EPP_CONTACT_XMLNS;
@@ -22,7 +23,7 @@ use serde::{Deserialize, Serialize};
 /// use epp_client::EppClient;
 /// use epp_client::contact::update::{EppContactUpdate, EppContactUpdateResponse};
 /// use epp_client::epp::generate_client_tr_id;
-/// use epp_client::epp::object::data::ContactStatus;
+/// use epp_client::common::ContactStatus;
 ///
 /// #[tokio::main]
 /// async fn main() {
diff --git a/epp-client/src/domain/check.rs b/epp-client/src/domain/check.rs
index d788b00..f133eae 100644
--- a/epp-client/src/domain/check.rs
+++ b/epp-client/src/domain/check.rs
@@ -2,7 +2,7 @@
 
 use epp_client_macros::*;
 
-use crate::epp::object::{ElementName, EppObject, StringValue};
+use crate::common::{ElementName, EppObject, StringValue};
 use crate::epp::request::Command;
 use crate::epp::response::CommandResponse;
 use crate::epp::xml::EPP_DOMAIN_XMLNS;
diff --git a/epp-client/src/domain/create.rs b/epp-client/src/domain/create.rs
index 5f09d00..f04f0b4 100644
--- a/epp-client/src/domain/create.rs
+++ b/epp-client/src/domain/create.rs
@@ -2,10 +2,10 @@
 
 use epp_client_macros::*;
 
-use crate::epp::object::data::{
-    DomainAuthInfo, DomainContact, HostAttr, HostAttrList, HostList, HostObjList, Period,
+use crate::common::{
+    DomainAuthInfo, DomainContact, ElementName, EppObject, HostAttr, HostAttrList, HostList,
+    HostObjList, Period, StringValue,
 };
-use crate::epp::object::{ElementName, EppObject, StringValue};
 use crate::epp::request::Command;
 use crate::epp::response::CommandResponse;
 use crate::epp::xml::EPP_DOMAIN_XMLNS;
@@ -21,7 +21,7 @@ use serde::{Deserialize, Serialize};
 ///
 /// use epp_client::config::{EppClientConfig, EppClientConnection};
 /// use epp_client::EppClient;
-/// use epp_client::epp::object::data::DomainContact;
+/// use epp_client::common::DomainContact;
 /// use epp_client::domain::create::{EppDomainCreate, EppDomainCreateResponse};
 /// use epp_client::epp::generate_client_tr_id;
 ///
diff --git a/epp-client/src/domain/delete.rs b/epp-client/src/domain/delete.rs
index e28b5ea..63ecad2 100644
--- a/epp-client/src/domain/delete.rs
+++ b/epp-client/src/domain/delete.rs
@@ -2,7 +2,7 @@
 
 use epp_client_macros::*;
 
-use crate::epp::object::{ElementName, EppObject, StringValue};
+use crate::common::{ElementName, EppObject, StringValue};
 use crate::epp::request::Command;
 use crate::epp::response::EppCommandResponse;
 use crate::epp::xml::EPP_DOMAIN_XMLNS;
diff --git a/epp-client/src/domain/info.rs b/epp-client/src/domain/info.rs
index 0c07a3f..d02369d 100644
--- a/epp-client/src/domain/info.rs
+++ b/epp-client/src/domain/info.rs
@@ -2,9 +2,10 @@
 
 use epp_client_macros::*;
 
+use crate::common::{
+    DomainAuthInfo, DomainContact, DomainStatus, ElementName, EppObject, HostAttr, StringValue,
+};
 use crate::domain::rgp::request::RgpRequestResponse;
-use crate::epp::object::data::{DomainAuthInfo, DomainContact, DomainStatus, HostAttr};
-use crate::epp::object::{ElementName, EppObject, StringValue};
 use crate::epp::request::Command;
 use crate::epp::response::CommandResponseWithExtension;
 use crate::epp::xml::EPP_DOMAIN_XMLNS;
diff --git a/epp-client/src/domain/renew.rs b/epp-client/src/domain/renew.rs
index 0607634..b5b471b 100644
--- a/epp-client/src/domain/renew.rs
+++ b/epp-client/src/domain/renew.rs
@@ -2,8 +2,7 @@
 
 use epp_client_macros::*;
 
-use crate::epp::object::data::Period;
-use crate::epp::object::{ElementName, EppObject, StringValue};
+use crate::common::{ElementName, EppObject, Period, StringValue};
 use crate::epp::request::Command;
 use crate::epp::response::CommandResponse;
 use crate::epp::xml::EPP_DOMAIN_XMLNS;
diff --git a/epp-client/src/domain/rgp/report.rs b/epp-client/src/domain/rgp/report.rs
index 2d5e873..9c45657 100644
--- a/epp-client/src/domain/rgp/report.rs
+++ b/epp-client/src/domain/rgp/report.rs
@@ -2,8 +2,8 @@
 
 use epp_client_macros::*;
 
+use crate::common::{ElementName, EppObject, Extension, StringValue};
 use crate::domain::update::{DomainChangeInfo, DomainUpdateRequest, DomainUpdateRequestData};
-use crate::epp::object::{ElementName, EppObject, Extension, StringValue};
 use crate::epp::request::CommandWithExtension;
 use crate::epp::response::EppCommandResponse;
 use crate::epp::xml::{EPP_DOMAIN_RGP_EXT_XMLNS, EPP_DOMAIN_XMLNS};
diff --git a/epp-client/src/domain/rgp/request.rs b/epp-client/src/domain/rgp/request.rs
index 9300eb1..16f2160 100644
--- a/epp-client/src/domain/rgp/request.rs
+++ b/epp-client/src/domain/rgp/request.rs
@@ -2,8 +2,8 @@
 
 use epp_client_macros::*;
 
+use crate::common::{ElementName, EmptyTag, EppObject, Extension};
 use crate::domain::update::{DomainChangeInfo, DomainUpdateRequest, DomainUpdateRequestData};
-use crate::epp::object::{ElementName, EmptyTag, EppObject, Extension};
 use crate::epp::request::CommandWithExtension;
 use crate::epp::response::CommandResponseWithExtension;
 use crate::epp::xml::{EPP_DOMAIN_RGP_EXT_XMLNS, EPP_DOMAIN_XMLNS};
diff --git a/epp-client/src/domain/transfer.rs b/epp-client/src/domain/transfer.rs
index a6d443f..8ee489c 100644
--- a/epp-client/src/domain/transfer.rs
+++ b/epp-client/src/domain/transfer.rs
@@ -2,8 +2,7 @@
 
 use epp_client_macros::*;
 
-use crate::epp::object::data::{DomainAuthInfo, Period};
-use crate::epp::object::{ElementName, EppObject, StringValue};
+use crate::common::{DomainAuthInfo, ElementName, EppObject, Period, StringValue};
 use crate::epp::request::Command;
 use crate::epp::response::{CommandResponse, EppCommandResponse};
 use crate::epp::xml::EPP_DOMAIN_XMLNS;
diff --git a/epp-client/src/domain/update.rs b/epp-client/src/domain/update.rs
index 5fa9bd6..089bd4c 100644
--- a/epp-client/src/domain/update.rs
+++ b/epp-client/src/domain/update.rs
@@ -2,8 +2,10 @@
 
 use epp_client_macros::*;
 
-use crate::epp::object::data::{DomainAuthInfo, DomainContact, DomainStatus, HostList};
-use crate::epp::object::{ElementName, EppObject, StringValue};
+use crate::common::{
+    DomainAuthInfo, DomainContact, DomainStatus, ElementName, EppObject, HostList, StringValue,
+};
+
 use crate::epp::request::Command;
 use crate::epp::response::EppCommandResponse;
 use crate::epp::xml::EPP_DOMAIN_XMLNS;
@@ -19,7 +21,7 @@ use serde::{Deserialize, Serialize};
 ///
 /// use epp_client::config::{EppClientConfig, EppClientConnection};
 /// use epp_client::EppClient;
-/// use epp_client::epp::object::data::{DomainStatus, DomainContact};
+/// use epp_client::common::{DomainStatus, DomainContact};
 /// use epp_client::domain::update::{EppDomainUpdate, EppDomainUpdateResponse, DomainAddRemove};
 /// use epp_client::epp::generate_client_tr_id;
 ///
diff --git a/epp-client/src/epp.rs b/epp-client/src/epp.rs
index 6fcdd9e..697e997 100644
--- a/epp-client/src/epp.rs
+++ b/epp-client/src/epp.rs
@@ -1,6 +1,5 @@
 //! Types for EPP requests and responses
 
-pub mod object;
 pub mod request;
 pub mod response;
 pub mod xml;
diff --git a/epp-client/src/epp/object.rs b/epp-client/src/epp/object.rs
deleted file mode 100644
index 477c9c5..0000000
--- a/epp-client/src/epp/object.rs
+++ /dev/null
@@ -1,140 +0,0 @@
-//! Data types common to EPP Requests and Responses
-
-pub mod data;
-
-use epp_client_macros::*;
-use serde::{ser::SerializeStruct, Deserialize, Serialize, Serializer};
-use std::fmt::Display;
-
-use crate::epp::xml::EPP_XMLNS;
-
-/// Wraps String for easier serialization to and from values that are inner text
-/// for tags rather than attributes
-#[derive(Default, Serialize, Deserialize, Debug, PartialEq, Clone)]
-pub struct StringValue(String);
-
-impl Display for StringValue {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-impl From<&str> for StringValue {
-    fn from(s: &str) -> Self {
-        Self(s.to_owned())
-    }
-}
-
-impl From<String> for StringValue {
-    fn from(s: String) -> Self {
-        Self(s)
-    }
-}
-
-/// Trait to set correct value for xml tags when tags are being generated from generic types
-pub trait ElementName {
-    const ELEMENT: &'static str;
-}
-
-#[derive(Serialize, Deserialize, Debug, PartialEq, ElementName)]
-#[element_name(name = "empty")]
-/// An empty placeholder tag. To be refactored to something more compliant later.
-pub struct EmptyTag;
-
-/// An EPP XML Document that is used either as an EPP XML request or
-/// an EPP XML response
-#[derive(Deserialize, Debug, PartialEq)]
-#[serde(rename = "epp")]
-pub struct EppObject<T: ElementName> {
-    /// XML namespace for the &lt;epp&gt; tag
-    pub xmlns: String,
-    /// the request or response object that is set or received in the EPP XML document
-    #[serde(alias = "greeting", alias = "response")]
-    pub data: T,
-    // TODO: save serialized xml in the instance for debugging or client logging purposes
-    // #[serde(skip)]
-    // pub xml: Option<String>,
-}
-
-impl<T: ElementName + Serialize> Serialize for EppObject<T> {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        let mut state = serializer.serialize_struct("epp", 4)?;
-        state.serialize_field("xmlns", &self.xmlns)?;
-        state.serialize_field(T::ELEMENT, &self.data)?;
-        state.end()
-    }
-}
-
-/// The <option> type in EPP XML login requests
-#[derive(Serialize, Deserialize, Debug, PartialEq)]
-#[serde(rename = "options")]
-pub struct Options {
-    /// The EPP version being used
-    pub version: StringValue,
-    /// The language that will be used during EPP transactions
-    pub lang: StringValue,
-}
-
-impl Options {
-    /// Creates an Options object with version and lang data
-    pub fn build(version: &str, lang: &str) -> Options {
-        Options {
-            version: version.into(),
-            lang: lang.into(),
-        }
-    }
-}
-
-/// Type representing the &lt;extension&gt; tag for an EPP document
-#[derive(Deserialize, Debug, PartialEq)]
-#[serde(rename = "extension")]
-pub struct Extension<E: ElementName> {
-    /// Data under the &lt;extension&gt; tag
-    #[serde(alias = "upData")]
-    pub data: E,
-}
-
-impl<E: ElementName + Serialize> Serialize for Extension<E> {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        let mut state = serializer.serialize_struct("extension", 1)?;
-        state.serialize_field(E::ELEMENT, &self.data)?;
-        state.end()
-    }
-}
-
-/// The <svcExtension> type in EPP XML
-#[derive(Serialize, Deserialize, Debug, PartialEq)]
-#[serde(rename = "svcExtension")]
-pub struct ServiceExtension {
-    /// The service extension URIs being represented by <extURI> in EPP XML
-    #[serde(rename = "extURI")]
-    pub ext_uris: Option<Vec<StringValue>>,
-}
-
-/// The <svcs> type in EPP XML
-#[derive(Serialize, Deserialize, Debug, PartialEq)]
-pub struct Services {
-    /// The service URIs being used by this EPP session represented by <objURI> in EPP XML
-    #[serde(rename = "objURI")]
-    pub obj_uris: Vec<StringValue>,
-    /// The <svcExtention> being used in this EPP session
-    #[serde(rename = "svcExtension")]
-    pub svc_ext: Option<ServiceExtension>,
-}
-
-impl<T: ElementName> EppObject<T> {
-    /// Create the enclosing EPP XML tag &lt;epp&gt; for data that represents an EPP XML request or response
-    pub fn build(data: T) -> EppObject<T> {
-        EppObject {
-            // xml: None,
-            data,
-            xmlns: EPP_XMLNS.to_string(),
-        }
-    }
-}
diff --git a/epp-client/src/epp/request.rs b/epp-client/src/epp/request.rs
index 77f61e4..a6397c9 100644
--- a/epp-client/src/epp/request.rs
+++ b/epp-client/src/epp/request.rs
@@ -4,10 +4,13 @@ use serde::{ser::SerializeStruct, ser::Serializer, Deserialize, Serialize};
 use std::error::Error;
 use std::time::SystemTime;
 
-use crate::epp::object::{
-    ElementName, EmptyTag, EppObject, Extension, Options, ServiceExtension, Services, StringValue,
+use crate::{
+    common::{
+        ElementName, EmptyTag, EppObject, Extension, Options, ServiceExtension, Services,
+        StringValue,
+    },
+    epp::xml::{EPP_CONTACT_XMLNS, EPP_DOMAIN_XMLNS, EPP_HOST_XMLNS, EPP_LANG, EPP_VERSION},
 };
-use crate::epp::xml::{EPP_CONTACT_XMLNS, EPP_DOMAIN_XMLNS, EPP_HOST_XMLNS, EPP_LANG, EPP_VERSION};
 use epp_client_macros::*;
 
 /// Type corresponding to the &lt;command&gt; tag in an EPP XML request
diff --git a/epp-client/src/epp/response.rs b/epp-client/src/epp/response.rs
index 7a6caa6..74343e2 100644
--- a/epp-client/src/epp/response.rs
+++ b/epp-client/src/epp/response.rs
@@ -4,7 +4,7 @@ use epp_client_macros::*;
 use serde::{Deserialize, Deserializer, Serialize};
 use std::fmt::Debug;
 
-use crate::epp::object::{
+use crate::common::{
     ElementName, EmptyTag, EppObject, Extension, Options, ServiceExtension, Services, StringValue,
 };
 
diff --git a/epp-client/src/epp/xml.rs b/epp-client/src/epp/xml.rs
index 8be5a8d..a61d65b 100644
--- a/epp-client/src/epp/xml.rs
+++ b/epp-client/src/epp/xml.rs
@@ -7,7 +7,6 @@ use std::{error::Error, fmt::Debug};
 use crate::error;
 
 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_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";
diff --git a/epp-client/src/epp/xml/quick_xml.rs b/epp-client/src/epp/xml/quick_xml.rs
index 266b147..935d07c 100644
--- a/epp-client/src/epp/xml/quick_xml.rs
+++ b/epp-client/src/epp/xml/quick_xml.rs
@@ -5,7 +5,7 @@ use quick_xml::se;
 use serde::{de::DeserializeOwned, Serialize};
 use std::{error::Error, fmt::Debug};
 
-use crate::epp::object::{ElementName, EppObject};
+use crate::common::{ElementName, EppObject};
 use crate::epp::xml::{EppXml, EPP_XML_HEADER};
 use crate::error;
 
diff --git a/epp-client/src/host/check.rs b/epp-client/src/host/check.rs
index 0d792a7..1ba5ae7 100644
--- a/epp-client/src/host/check.rs
+++ b/epp-client/src/host/check.rs
@@ -2,7 +2,7 @@
 
 use epp_client_macros::*;
 
-use crate::epp::object::{ElementName, EppObject, StringValue};
+use crate::common::{ElementName, EppObject, StringValue};
 use crate::epp::request::Command;
 use crate::epp::response::CommandResponse;
 use crate::epp::xml::EPP_HOST_XMLNS;
diff --git a/epp-client/src/host/create.rs b/epp-client/src/host/create.rs
index 17a410b..01a223b 100644
--- a/epp-client/src/host/create.rs
+++ b/epp-client/src/host/create.rs
@@ -2,8 +2,7 @@
 
 use epp_client_macros::*;
 
-use crate::epp::object::data::HostAddr;
-use crate::epp::object::{ElementName, EppObject, StringValue};
+use crate::common::{ElementName, EppObject, HostAddr, StringValue};
 use crate::epp::request::Command;
 use crate::epp::response::CommandResponse;
 use crate::epp::xml::EPP_HOST_XMLNS;
@@ -18,7 +17,7 @@ use serde::{Deserialize, Serialize};
 ///
 /// use epp_client::config::{EppClientConfig, EppClientConnection};
 /// use epp_client::EppClient;
-/// use epp_client::epp::object::data::HostAddr;
+/// use epp_client::common::HostAddr;
 /// use epp_client::host::create::{EppHostCreate, EppHostCreateResponse};
 /// use epp_client::epp::generate_client_tr_id;
 ///
diff --git a/epp-client/src/host/delete.rs b/epp-client/src/host/delete.rs
index 5932bad..ada94f6 100644
--- a/epp-client/src/host/delete.rs
+++ b/epp-client/src/host/delete.rs
@@ -2,7 +2,7 @@
 
 use epp_client_macros::*;
 
-use crate::epp::object::{ElementName, EppObject, StringValue};
+use crate::common::{ElementName, EppObject, StringValue};
 use crate::epp::request::Command;
 use crate::epp::response::EppCommandResponse;
 use crate::epp::xml::EPP_HOST_XMLNS;
diff --git a/epp-client/src/host/info.rs b/epp-client/src/host/info.rs
index bf2beba..06a296c 100644
--- a/epp-client/src/host/info.rs
+++ b/epp-client/src/host/info.rs
@@ -2,8 +2,7 @@
 
 use epp_client_macros::*;
 
-use crate::epp::object::data::{HostAddr, HostStatus};
-use crate::epp::object::{ElementName, EppObject, StringValue};
+use crate::common::{ElementName, EppObject, HostAddr, HostStatus, StringValue};
 use crate::epp::request::Command;
 use crate::epp::response::CommandResponse;
 use crate::epp::xml::EPP_HOST_XMLNS;
diff --git a/epp-client/src/host/update.rs b/epp-client/src/host/update.rs
index 9490ae6..36b7cff 100644
--- a/epp-client/src/host/update.rs
+++ b/epp-client/src/host/update.rs
@@ -2,8 +2,7 @@
 
 use epp_client_macros::*;
 
-use crate::epp::object::data::{HostAddr, HostStatus};
-use crate::epp::object::{ElementName, EppObject, StringValue};
+use crate::common::{ElementName, EppObject, HostAddr, HostStatus, StringValue};
 use crate::epp::request::Command;
 use crate::epp::response::EppCommandResponse;
 use crate::epp::xml::EPP_HOST_XMLNS;
@@ -18,7 +17,7 @@ use serde::{Deserialize, Serialize};
 ///
 /// use epp_client::config::{EppClientConfig, EppClientConnection};
 /// use epp_client::EppClient;
-/// use epp_client::epp::object::data::{HostAddr, HostStatus};
+/// use epp_client::common::{HostAddr, HostStatus};
 /// use epp_client::host::update::{EppHostUpdate, EppHostUpdateResponse, HostAddRemove, HostChangeInfo};
 /// use epp_client::epp::generate_client_tr_id;
 ///
diff --git a/epp-client/src/lib.rs b/epp-client/src/lib.rs
index 6e1fe38..9b2893e 100644
--- a/epp-client/src/lib.rs
+++ b/epp-client/src/lib.rs
@@ -100,6 +100,7 @@
 #[macro_use]
 extern crate log;
 
+pub mod common;
 pub mod config;
 pub mod connection;
 pub mod contact;
diff --git a/epp-client/src/message/ack.rs b/epp-client/src/message/ack.rs
index b9b2903..499168c 100644
--- a/epp-client/src/message/ack.rs
+++ b/epp-client/src/message/ack.rs
@@ -2,7 +2,7 @@
 
 use epp_client_macros::*;
 
-use crate::epp::object::{ElementName, EppObject};
+use crate::common::{ElementName, EppObject};
 use crate::epp::request::Command;
 use crate::epp::response::CommandResponse;
 use serde::{Deserialize, Serialize};
diff --git a/epp-client/src/message/poll.rs b/epp-client/src/message/poll.rs
index 5f04d11..501dd5d 100644
--- a/epp-client/src/message/poll.rs
+++ b/epp-client/src/message/poll.rs
@@ -2,7 +2,7 @@
 
 use epp_client_macros::*;
 
-use crate::epp::object::{ElementName, EppObject, StringValue};
+use crate::common::{ElementName, EppObject, StringValue};
 use crate::epp::request::Command;
 use crate::epp::response::CommandResponse;
 use serde::{Deserialize, Serialize};
diff --git a/epp-client/src/tests/de.rs b/epp-client/src/tests/de.rs
index e283359..30d037e 100644
--- a/epp-client/src/tests/de.rs
+++ b/epp-client/src/tests/de.rs
@@ -26,7 +26,6 @@ mod response {
         EppCommandResponseError, EppGreeting, EppLoginResponse, EppLogoutResponse,
     };
     use crate::epp::xml::EppXml;
-    use crate::epp::*;
     use crate::host::check::EppHostCheckResponse;
     use crate::host::create::EppHostCreateResponse;
     use crate::host::delete::EppHostDeleteResponse;
diff --git a/epp-client/src/tests/se.rs b/epp-client/src/tests/se.rs
index d7ad662..a62062d 100644
--- a/epp-client/src/tests/se.rs
+++ b/epp-client/src/tests/se.rs
@@ -3,6 +3,10 @@
 mod request {
     use super::super::get_xml;
     use super::super::CLTRID;
+    use crate::common::{
+        Address, ContactStatus, DomainAuthInfo, DomainContact, DomainStatus, HostAddr, HostAttr,
+        HostStatus, Phone, PostalInfo,
+    };
     use crate::contact::check::EppContactCheck;
     use crate::contact::create::EppContactCreate;
     use crate::contact::delete::EppContactDelete;
@@ -23,13 +27,8 @@ mod request {
     use crate::domain::update::DomainAddRemove;
     use crate::domain::update::DomainChangeInfo;
     use crate::domain::update::EppDomainUpdate;
-    use crate::epp::object::data::{
-        Address, ContactStatus, DomainAuthInfo, DomainContact, DomainStatus, HostAddr, HostAttr,
-        HostStatus, Phone, PostalInfo,
-    };
     use crate::epp::request::{EppHello, EppLogin, EppLogout};
     use crate::epp::xml::EppXml;
-    use crate::epp::*;
     use crate::host::check::EppHostCheck;
     use crate::host::create::EppHostCreate;
     use crate::host::delete::EppHostDelete;