feat: bom-refs for known models

Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>

Author: jkowalleck

cyclonedx/model/contact.py

@@ -167,7 +167,7 @@ def __comparable_tuple(self) -> _ComparableTuple:
             self.country, self.region, self.locality, self.postal_code,
             self.post_office_box_number,
             self.street_address,
-            None if self.bom_ref is None else self.bom_ref.value,
+            self._bom_ref.value,
         ))
 
     def __eq__(self, other: object) -> bool:
@@ -277,7 +277,7 @@ def phone(self, phone: Optional[str]) -> None:
     def __comparable_tuple(self) -> _ComparableTuple:
         return _ComparableTuple((
             self.name, self.email, self.phone,
-            self.bom_ref
+            self._bom_ref.value,
         ))
 
     def __eq__(self, other: object) -> bool:
@@ -406,7 +406,8 @@ def contacts(self, contacts: Iterable[OrganizationalContact]) -> None:
 
     def __comparable_tuple(self) -> _ComparableTuple:
         return _ComparableTuple((
-            self.name, _ComparableTuple(self.urls), _ComparableTuple(self.contacts)
+            self.name, _ComparableTuple(self.urls), _ComparableTuple(self.contacts),
+            self._bom_ref.value,
         ))
 
     def __eq__(self, other: object) -> bool:

cyclonedx/model/license.py

@@ -238,7 +238,7 @@ def __comparable_tuple(self) -> _ComparableTuple:
             self._id, self._name,
             self._url,
             self._text,
-            self._bom_ref,
+            self._bom_ref.value,
         ))
 
     def __eq__(self, other: object) -> bool:
@@ -347,7 +347,7 @@ def __comparable_tuple(self) -> _ComparableTuple:
         return _ComparableTuple((
             self._acknowledgement,
             self._value,
-            self.bom_ref,
+            self._bom_ref.value,
         ))
 
     def __hash__(self) -> int: