avoid module re-exports

Signed-off-by: Christian Poveda <[email protected]>

Author: pvdrz

cyclonedx-bom/src/specs/common/code.rs

@@ -872,7 +872,7 @@ impl FromXml for Source {
 #[cfg(test)]
 pub(crate) mod test {
     use crate::{
-        specs::v1_3::attached_text::test::{corresponding_attached_text, example_attached_text},
+        specs::common::attached_text::test::{corresponding_attached_text, example_attached_text},
         xml::test::{read_element_from_string, write_element_to_string},
     };
 

cyclonedx-bom/src/specs/common/tool.rs

@@ -220,7 +220,7 @@ impl FromXml for Tool {
 #[cfg(test)]
 pub(crate) mod test {
     use crate::{
-        specs::v1_3::hash::test::{corresponding_hashes, example_hashes},
+        specs::common::hash::test::{corresponding_hashes, example_hashes},
         xml::test::{read_element_from_string, write_element_to_string},
     };
 

cyclonedx-bom/src/specs/v1_3/bom.rs

@@ -28,10 +28,10 @@ use crate::{
     },
 };
 use crate::{
+    specs::common::{dependency::Dependencies, property::Properties},
     specs::v1_3::{
-        component::Components, composition::Compositions, dependency::Dependencies,
-        external_reference::ExternalReferences, metadata::Metadata, property::Properties,
-        service::Services,
+        component::Components, composition::Compositions, external_reference::ExternalReferences,
+        metadata::Metadata, service::Services,
     },
     xml::ToXml,
 };
@@ -337,15 +337,17 @@ impl From<UrnUuid> for models::bom::UrnUuid {
 #[cfg(test)]
 pub(crate) mod test {
     use crate::{
+        specs::common::{
+            dependency::test::{corresponding_dependencies, example_dependencies},
+            property::test::{corresponding_properties, example_properties},
+        },
         specs::v1_3::{
             component::test::{corresponding_components, example_components},
             composition::test::{corresponding_compositions, example_compositions},
-            dependency::test::{corresponding_dependencies, example_dependencies},
             external_reference::test::{
                 corresponding_external_references, example_external_references,
             },
             metadata::test::{corresponding_metadata, example_metadata},
-            property::test::{corresponding_properties, example_properties},
             service::test::{corresponding_services, example_services},
         },
         xml::test::{read_document_from_string, write_element_to_string},

cyclonedx-bom/src/specs/v1_3/component.rs

@@ -27,11 +27,11 @@ use crate::{
         normalized_string::NormalizedString,
         uri::{Purl, Uri},
     },
-    specs::v1_3::{
-        attached_text::AttachedText, code::Commits, code::Patches,
-        external_reference::ExternalReferences, hash::Hashes, license::Licenses,
+    specs::common::{
+        attached_text::AttachedText, code::Commits, code::Patches, hash::Hashes,
         organization::OrganizationalEntity, property::Properties,
     },
+    specs::v1_3::{external_reference::ExternalReferences, license::Licenses},
     xml::{
         attribute_or_error, optional_attribute, read_boolean_tag, read_lax_validation_list_tag,
         read_lax_validation_tag, read_list_tag, read_simple_tag, to_xml_read_error,
@@ -1176,18 +1176,20 @@ impl From<MimeType> for models::component::MimeType {
 pub(crate) mod test {
     use crate::{
         models::bom::SpecVersion,
-        specs::v1_3::{
+        specs::common::{
             attached_text::test::{corresponding_attached_text, example_attached_text},
             code::test::{
                 corresponding_commits, corresponding_patches, example_commits, example_patches,
             },
+            hash::test::{corresponding_hashes, example_hashes},
+            organization::test::{corresponding_entity, example_entity},
+            property::test::{corresponding_properties, example_properties},
+        },
+        specs::v1_3::{
             external_reference::test::{
                 corresponding_external_references, example_external_references,
             },
-            hash::test::{corresponding_hashes, example_hashes},
             license::test::{corresponding_licenses, example_licenses},
-            organization::test::{corresponding_entity, example_entity},
-            property::test::{corresponding_properties, example_properties},
         },
         xml::test::{read_element_from_string, write_element_to_string},
     };

cyclonedx-bom/src/specs/v1_3/external_reference.rs

@@ -28,7 +28,7 @@ use crate::{
     models,
     utilities::{convert_optional, convert_vec},
 };
-use crate::{specs::v1_3::hash::Hashes, xml::to_xml_write_error};
+use crate::{specs::common::hash::Hashes, xml::to_xml_write_error};
 use serde::{Deserialize, Serialize};
 use xml::{reader, writer::XmlEvent};
 
@@ -213,7 +213,7 @@ impl FromXml for ExternalReference {
 pub(crate) mod test {
     use super::*;
     use crate::{
-        specs::v1_3::hash::test::{corresponding_hashes, example_hashes},
+        specs::common::hash::test::{corresponding_hashes, example_hashes},
         xml::test::{read_element_from_string, write_element_to_string},
     };
 

cyclonedx-bom/src/specs/v1_3/license.rs

@@ -32,7 +32,7 @@ use crate::{
         ToXml,
     },
 };
-use crate::{specs::v1_3::attached_text::AttachedText, utilities::convert_optional};
+use crate::{specs::common::attached_text::AttachedText, utilities::convert_optional};
 use serde::{Deserialize, Serialize};
 use xml::{name::OwnedName, reader, writer};
 
@@ -415,7 +415,7 @@ pub(crate) mod test {
     use super::*;
     use crate::{
         external_models::spdx::SpdxExpression,
-        specs::v1_3::attached_text::test::{corresponding_attached_text, example_attached_text},
+        specs::common::attached_text::test::{corresponding_attached_text, example_attached_text},
         xml::test::{read_element_from_string, write_element_to_string},
     };
 

cyclonedx-bom/src/specs/v1_3/metadata.rs

@@ -20,10 +20,11 @@ use crate::errors::BomError;
 use crate::{
     external_models::date_time::DateTime,
     models,
-    specs::v1_3::{
-        component::Component, license::Licenses, organization::OrganizationalContact,
-        organization::OrganizationalEntity, property::Properties, tool::Tools,
+    specs::common::{
+        organization::OrganizationalContact, organization::OrganizationalEntity,
+        property::Properties, tool::Tools,
     },
+    specs::v1_3::{component::Component, license::Licenses},
     utilities::{convert_optional, convert_optional_vec, try_convert_optional},
     xml::{
         read_lax_validation_tag, read_list_tag, read_simple_tag, to_xml_read_error,
@@ -295,15 +296,17 @@ impl FromXml for Metadata {
 #[cfg(test)]
 pub(crate) mod test {
     use crate::{
-        specs::v1_3::{
-            component::test::{corresponding_component, example_component},
-            license::test::{corresponding_licenses, example_licenses},
+        specs::common::{
             organization::test::{
                 corresponding_contact, corresponding_entity, example_contact, example_entity,
             },
             property::test::{corresponding_properties, example_properties},
             tool::test::{corresponding_tools, example_tools},
         },
+        specs::v1_3::{
+            component::test::{corresponding_component, example_component},
+            license::test::{corresponding_licenses, example_licenses},
+        },
         xml::test::{read_element_from_string, write_element_to_string},
     };
 

cyclonedx-bom/src/specs/v1_3/mod.rs

@@ -23,7 +23,3 @@ pub(crate) mod external_reference;
 pub(crate) mod license;
 pub(crate) mod metadata;
 pub(crate) mod service;
-
-pub(crate) use super::common::{
-    attached_text, code, dependency, hash, organization, property, tool,
-};

cyclonedx-bom/src/specs/v1_3/service.rs

@@ -30,10 +30,8 @@ use crate::{
 use serde::{Deserialize, Serialize};
 use xml::{reader, writer::XmlEvent};
 
-use crate::specs::v1_3::{
-    external_reference::ExternalReferences, license::Licenses, organization::OrganizationalEntity,
-    property::Properties,
-};
+use crate::specs::common::{organization::OrganizationalEntity, property::Properties};
+use crate::specs::v1_3::{external_reference::ExternalReferences, license::Licenses};
 
 #[derive(Debug, Deserialize, Serialize, PartialEq)]
 #[serde(transparent)]
@@ -487,13 +485,15 @@ impl FromXml for DataClassification {
 pub(crate) mod test {
     use super::*;
     use crate::{
+        specs::common::{
+            organization::test::{corresponding_entity, example_entity},
+            property::test::{corresponding_properties, example_properties},
+        },
         specs::v1_3::{
             external_reference::test::{
                 corresponding_external_references, example_external_references,
             },
             license::test::{corresponding_licenses, example_licenses},
-            organization::test::{corresponding_entity, example_entity},
-            property::test::{corresponding_properties, example_properties},
         },
         xml::test::{read_element_from_string, write_element_to_string},
     };

cyclonedx-bom/src/specs/v1_4/bom.rs

@@ -26,10 +26,11 @@ use crate::{
     },
 };
 use crate::{
+    specs::common::{dependency::Dependencies, property::Properties},
     specs::v1_4::{
-        component::Components, composition::Compositions, dependency::Dependencies,
-        external_reference::ExternalReferences, metadata::Metadata, property::Properties,
-        service::Services, signature::Signature, vulnerability::Vulnerabilities,
+        component::Components, composition::Compositions, external_reference::ExternalReferences,
+        metadata::Metadata, service::Services, signature::Signature,
+        vulnerability::Vulnerabilities,
     },
     xml::ToXml,
 };
@@ -370,15 +371,17 @@ pub(crate) mod test {
         corresponding_vulnerabilities, example_vulnerabilities,
     };
     use crate::{
+        specs::common::{
+            dependency::test::{corresponding_dependencies, example_dependencies},
+            property::test::{corresponding_properties, example_properties},
+        },
         specs::v1_4::{
             component::test::{corresponding_components, example_components},
             composition::test::{corresponding_compositions, example_compositions},
-            dependency::test::{corresponding_dependencies, example_dependencies},
             external_reference::test::{
                 corresponding_external_references, example_external_references,
             },
             metadata::test::{corresponding_metadata, example_metadata},
-            property::test::{corresponding_properties, example_properties},
             service::test::{corresponding_services, example_services},
             signature::test::{corresponding_signature, example_signature},
         },