Merge pull request #10 from CycloneDX/external-reference-json-bugfix

Fix JSON serialization/deserialization of external references
CycloneDX · Nov 3, 2020 · 6f68501 · 6f68501
2 parents c533fbc + 459a0b5
commit 6f68501
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/CycloneDX.Json.Tests/Resources/bom.json b/CycloneDX.Json.Tests/Resources/bom.json
@@ -23,6 +23,10 @@
         {
           "url": "https://github.com/natemcmaster/CommandLineUtils",
           "type": "website"
+        },
+        {
+          "url": "https://github.com/natemcmaster/CommandLineUtils/issues",
+          "type": "issue-tracker"
         }
       ]
     },

diff --git a/CycloneDX.Json.Tests/__snapshots__/Tests.JsonRoundTripTest_bom.snap b/CycloneDX.Json.Tests/__snapshots__/Tests.JsonRoundTripTest_bom.snap
@@ -23,6 +23,10 @@
         {
           "url": "https://github.com/natemcmaster/CommandLineUtils",
           "type": "website"
+        },
+        {
+          "url": "https://github.com/natemcmaster/CommandLineUtils/issues",
+          "type": "issue-tracker"
         }
       ]
     },

diff --git a/CycloneDX.Json/Converters/ExternalReferenceTypeConverter.cs b/CycloneDX.Json/Converters/ExternalReferenceTypeConverter.cs
@@ -16,6 +16,7 @@
 
 using System;
 using System.Diagnostics.Contracts;
+using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using ExternalReferenceType = CycloneDX.Models.ExternalReference.ExternalReferenceType;
@@ -36,7 +37,7 @@ public override ExternalReferenceType Read(
                 throw new JsonException();
             }
 
-            var externalReferenceTypeString = reader.GetString().Replace('-', '_');
+            var externalReferenceTypeString = reader.GetString().Replace("-", "");
 
             ExternalReferenceType externalReferenceType;
             var success = Enum.TryParse<ExternalReferenceType>(externalReferenceTypeString, ignoreCase: true, out externalReferenceType);
@@ -56,7 +57,19 @@ public override void Write(
             JsonSerializerOptions options)
         {
             Contract.Requires(writer != null);
-            writer.WriteStringValue(value.ToString().ToLowerInvariant().Replace('_', '-'));
+
+            var s = value.ToString();
+            var sb = new StringBuilder();
+            for (var i=0; i<s.Length; i++)
+            {
+                if (i != 0 && s[i] == char.ToUpperInvariant(s[i]))
+                {
+                    sb.Append('-');
+                }
+                sb.Append(char.ToLowerInvariant(s[i]));
+            }
+
+            writer.WriteStringValue(sb.ToString());
         }
     }
 }