merge attestations and standards

Signed-off-by: MTsfoni <[email protected]>

src/CycloneDX.Core/Json/Serializer.Serialization.cs

@@ -108,5 +108,32 @@ internal static string Serialize(Models.ExternalReference externalReference)
             return JsonSerializer.Serialize(externalReference, _options);
         }
 
+        internal static string Serialize(Models.Standard standard)
+        {
+            Contract.Requires(standard != null);
+            return JsonSerializer.Serialize(standard, _options);
+        }
+
+        internal static string Serialize(Models.OrganizationalEntity organization)
+        {
+            Contract.Requires(organization != null);
+            return JsonSerializer.Serialize(organization, _options);
+        }
+
+        internal static string Serialize(Models.Claim obj)
+        {
+            Contract.Requires(obj != null);
+            return JsonSerializer.Serialize(obj, _options);
+        }
+        internal static string Serialize(Models.Assessor obj)
+        {
+            Contract.Requires(obj != null);
+            return JsonSerializer.Serialize(obj, _options);
+        }
+        internal static string Serialize(Models.Attestation obj)
+        {
+            Contract.Requires(obj != null);
+            return JsonSerializer.Serialize(obj, _options);
+        }
     }
 }

src/CycloneDX.Core/Models/Component.cs

@@ -31,7 +31,7 @@ namespace CycloneDX.Models
     [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
     [XmlType("component")]
     [ProtoContract]
-    public class Component: IEquatable<Component>
+    public class Component: IEquatable<Component>, IHasBomRef
     {
         [ProtoContract]
         public enum Classification

src/CycloneDX.Core/Models/Declarations/Assessor.cs

@@ -15,15 +15,17 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright (c) OWASP Foundation. All Rights Reserved.
 
+using CycloneDX.Core.Models;
 using ProtoBuf;
+using System;
 using System.Text.Json.Serialization;
 using System.Xml;
 using System.Xml.Serialization;
 
 namespace CycloneDX.Models
 {
     [ProtoContract]
-    public class Assessor
+    public class Assessor : IEquatable<Assessor>, IHasBomRef
     {
         [XmlAttribute("bom-ref")]
         [JsonPropertyName("bom-ref")]
@@ -36,5 +38,26 @@ public class Assessor
         [XmlElement("organization")]
         [ProtoMember(3)]
         public OrganizationalEntity Organization { get; set; }
+
+        public override bool Equals(object obj)
+        {
+            var other = obj as Assessor;
+            if (other == null)
+            {
+                return false;
+            }
+
+            return Json.Serializer.Serialize(this) == Json.Serializer.Serialize(other);
+        }
+
+        public bool Equals(Assessor obj)
+        {
+            return Json.Serializer.Serialize(this) == Json.Serializer.Serialize(obj);
+        }
+
+        public override int GetHashCode()
+        {
+            return Json.Serializer.Serialize(this).GetHashCode();
+        }
     }
 }

src/CycloneDX.Core/Models/Declarations/Attestation.cs

@@ -16,6 +16,7 @@
 // Copyright (c) OWASP Foundation. All Rights Reserved.
 
 using ProtoBuf;
+using System;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 using System.Xml;
@@ -24,7 +25,7 @@
 namespace CycloneDX.Models
 {
     [ProtoContract]
-    public class Attestation
+    public class Attestation : IEquatable<Attestation>
     {
         [XmlElement("summary")]
         [ProtoMember(1)]
@@ -45,5 +46,26 @@ public class Attestation
         [XmlIgnore]
         public Signature Signature { get; set; }
 
+        public override bool Equals(object obj)
+        {
+            var other = obj as Attestation;
+            if (other == null)
+            {
+                return false;
+            }
+
+            return Json.Serializer.Serialize(this) == Json.Serializer.Serialize(other);
+        }
+
+        public bool Equals(Attestation obj)
+        {
+            return Json.Serializer.Serialize(this) == Json.Serializer.Serialize(obj);
+        }
+
+        public override int GetHashCode()
+        {
+            return Json.Serializer.Serialize(this).GetHashCode();
+        }
+
     }
 }

src/CycloneDX.Core/Models/Declarations/Claim.cs

@@ -15,7 +15,10 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright (c) OWASP Foundation. All Rights Reserved.
 
+using CycloneDX.Core.Models;
+using CycloneDX.Models.Vulnerabilities;
 using ProtoBuf;
+using System;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 using System.Xml;
@@ -24,7 +27,7 @@
 namespace CycloneDX.Models
 {
     [ProtoContract]
-    public class Claim
+    public class Claim : IEquatable<Claim>, IHasBomRef
     {
         [XmlAttribute("bom-ref")]
         [JsonPropertyName("bom-ref")]
@@ -66,5 +69,26 @@ public class Claim
         public XmlElement XmlSignature { get; set; }
         [XmlIgnore]
         public Signature Signature { get; set; }
+
+        public override bool Equals(object obj)
+        {
+            var other = obj as Claim;
+            if (other == null)
+            {
+                return false;
+            }
+
+            return Json.Serializer.Serialize(this) == Json.Serializer.Serialize(other);
+        }
+
+        public bool Equals(Claim obj)
+        {
+            return CycloneDX.Json.Serializer.Serialize(this) == CycloneDX.Json.Serializer.Serialize(obj);
+        }
+
+        public override int GetHashCode()
+        {
+            return CycloneDX.Json.Serializer.Serialize(this).GetHashCode();
+        }
     }
 }

src/CycloneDX.Core/Models/Declarations/DeclarationsEvidence.cs

@@ -15,6 +15,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright (c) OWASP Foundation. All Rights Reserved.
 
+using CycloneDX.Core.Models;
 using ProtoBuf;
 using System;
 using System.Collections.Generic;
@@ -25,7 +26,7 @@
 namespace CycloneDX.Models
 {
     [ProtoContract]
-    public class DeclarationsEvidence
+    public class DeclarationsEvidence : IHasBomRef
     {
         [XmlAttribute("bom-ref")]
         [JsonPropertyName("bom-ref")]

src/CycloneDX.Core/Models/Definitions/Level.cs

@@ -23,7 +23,7 @@
 namespace CycloneDX.Models
 {
     [ProtoContract]
-    public class Level
+    public class Level : IHasBomRef
     {
         [XmlAttribute("bom-ref")]
         [JsonPropertyName("bom-ref")]

src/CycloneDX.Core/Models/Definitions/Requirement.cs

@@ -15,6 +15,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright (c) OWASP Foundation. All Rights Reserved.
 
+
 using ProtoBuf;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
@@ -23,7 +24,7 @@
 namespace CycloneDX.Models
 {
     [ProtoContract]
-    public class Requirement
+    public class Requirement : IHasBomRef
     {
         [XmlAttribute("bom-ref")]
         [JsonPropertyName("bom-ref")]

src/CycloneDX.Core/Models/Definitions/Standard.cs

@@ -16,14 +16,15 @@
 // Copyright (c) OWASP Foundation. All Rights Reserved.
 
 using ProtoBuf;
+using System;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 using System.Xml.Serialization;
 
 namespace CycloneDX.Models
 {
     [ProtoContract]
-    public class Standard
+    public class Standard : IEquatable<Standard>, IHasBomRef
     {
         [XmlAttribute("bom-ref")]
         [JsonPropertyName("bom-ref")]
@@ -62,6 +63,8 @@ public class Standard
         public List<ExternalReference> ExternalReferences { get; set; }
         public bool ShouldSerializeExternalReferences() => ExternalReferences?.Count > 0;
 
+
+
         [XmlAnyElement]
         public List<System.Xml.XmlElement> Any { get; set; }
 
@@ -70,5 +73,29 @@ public class Standard
 
         [XmlIgnore]
         public Signature signature { get; set; }
+
+
+
+
+        public override bool Equals(object obj)
+        {
+            var other = obj as Standard;
+            if (other == null)
+            {
+                return false;
+            }
+
+            return Json.Serializer.Serialize(this) == Json.Serializer.Serialize(other);
+        }
+
+        public bool Equals(Standard obj)
+        {
+            return Json.Serializer.Serialize(this) == Json.Serializer.Serialize(obj);
+        }
+
+        public override int GetHashCode()
+        {
+            return Json.Serializer.Serialize(this).GetHashCode();
+        }
     }
 }

src/CycloneDX.Core/Models/OrganizationalEntity.cs

@@ -15,6 +15,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright (c) OWASP Foundation. All Rights Reserved.
 
+using System;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 using System.Xml.Serialization;
@@ -23,7 +24,7 @@
 namespace CycloneDX.Models
 {
     [ProtoContract]
-    public class OrganizationalEntity
+    public class OrganizationalEntity : IEquatable<OrganizationalEntity>, IHasBomRef
     {
         [XmlElement("name")]
         [ProtoMember(1)]
@@ -45,5 +46,26 @@ public class OrganizationalEntity
         [XmlElement("address")]
         [ProtoMember(5)]
         public PostalAddress Address { get; set; }
+
+        public override bool Equals(object obj)
+        {
+            var other = obj as OrganizationalEntity;
+            if (other == null)
+            {
+                return false;
+            }
+
+            return Json.Serializer.Serialize(this) == Json.Serializer.Serialize(other);
+        }
+
+        public bool Equals(OrganizationalEntity obj)
+        {
+            return Json.Serializer.Serialize(this) == Json.Serializer.Serialize(obj);
+        }
+
+        public override int GetHashCode()
+        {
+            return Json.Serializer.Serialize(this).GetHashCode();
+        }
     }
 }

src/CycloneDX.Core/Models/Service.cs

@@ -26,7 +26,7 @@
 namespace CycloneDX.Models
 {
     [ProtoContract]
-    public class Service: IEquatable<Service>
+    public class Service: IEquatable<Service>, IHasBomRef
     {
         public Service()
         {